Explorar el Código

Merge branch 'develop'

master
Guillaume hace 4 años
padre
commit
e5e50bc5b9
Se han modificado 3 ficheros con 2 adiciones y 5 borrados
  1. +1
    -1
      ShopBundle/Resources/public/js/backend/script/supplier/vuejs-supplier.js
  2. +1
    -1
      ShopBundle/Resources/views/backend/default/block/form_address.html.twig
  3. +0
    -3
      ShopBundle/Resources/views/backend/supplier/panel_general.html.twig

+ 1
- 1
ShopBundle/Resources/public/js/backend/script/supplier/vuejs-supplier.js Ver fichero

@@ -23,7 +23,7 @@ appOrder = new Vue({
nameDisplay: 'SEO'
}
]
});
}, window.addressValues);
},
mounted: function () {},
methods: {

+ 1
- 1
ShopBundle/Resources/views/backend/default/block/form_address.html.twig Ver fichero

@@ -1,7 +1,7 @@
<div id="lc-user-address" class="row">
<script>
window.addressValues = {
{% if form.type.vars.value %}addressType: "{{ form.type.vars.value }}",{% endif %}
{% if form.type.vars.value %}addressType: '{{ form.type.vars.value }}'{% endif %}
};
</script>


+ 0
- 3
ShopBundle/Resources/views/backend/supplier/panel_general.html.twig Ver fichero

@@ -18,9 +18,6 @@
<div class="col-12">
{{ form_row(form.description) }}
</div>
<div class="col-12">
{{ form_row(form.user) }}
</div>
{{ macros.card_end() }}
</div>
</div>

Cargando…
Cancelar
Guardar