Merge branch 'develop'

ShopBundle/Controller/Backend/ProductFamilyController.php

@@ -140,10 +140,10 @@ class ProductFamilyController extends AdminController
 
                 $formBuilder->add('propertyOrganicLabel', ChoiceType::class, array(
                         'choices' => array(
-                                'field.ProductFamily.organicLabelOptions.' . ProductFamily::PROPERTY_ORGANIC_LABEL_AB => ProductFamily::PROPERTY_ORGANIC_LABEL_AB,
-                                'field.ProductFamily.organicLabelOptions.' . ProductFamily::PROPERTY_ORGANIC_LABEL_NP => ProductFamily::PROPERTY_ORGANIC_LABEL_NP,
-                                'field.ProductFamily.organicLabelOptions.' . ProductFamily::PROPERTY_ORGANIC_LABEL_HVE => ProductFamily::PROPERTY_ORGANIC_LABEL_HVE,
-                                'field.ProductFamily.organicLabelOptions.' . ProductFamily::PROPERTY_ORGANIC_LABEL_TVVR => ProductFamily::PROPERTY_ORGANIC_LABEL_TVVR
+                                'field.ProductFamily.organicLabelOptions.' . ProductFamily::QUALITY_LABEL_AB => ProductFamily::QUALITY_LABEL_AB,
+                                'field.ProductFamily.organicLabelOptions.' . ProductFamily::QUALITY_LABEL_NP => ProductFamily::QUALITY_LABEL_NP,
+                                'field.ProductFamily.organicLabelOptions.' . ProductFamily::QUALITY_LABEL_HVE => ProductFamily::QUALITY_LABEL_HVE,
+                                'field.ProductFamily.organicLabelOptions.' . ProductFamily::QUALITY_LABEL_TVVR => ProductFamily::QUALITY_LABEL_TVVR
                         ),
                         'translation_domain' => 'lcshop',
                         'multiple' => false,

ShopBundle/Resources/public/js/backend/script/productfamily/vuejs-product-family.js

@@ -430,7 +430,7 @@ $(window).on('load', function () {
                     typeExpirationDate: null,
                     behaviorExpirationDate: null,
                     propertyAllergens: null,
-                    propertyOrganicLabelActive: false,
+                    propertyQualityLabelActive: false,
                     propertyOrganicLabel: null,
                     propertyNoveltyExpirationDateActive: false,
                     propertyNoveltyExpirationDate:null,
@@ -614,8 +614,8 @@ $(window).on('load', function () {
                     this.propertyNoveltyExpirationDate = null;
                 }
             },
-            propertyOrganicLabelActive: function () {
-                if(!this.propertyOrganicLabelActive){
+            propertyQualityLabelActive: function () {
+                if(!this.propertyQualityLabelActive){
                     this.propertyOrganicLabel = null;
                     $(this.$refs['propertyOrganicLabel']).val('').trigger('change');
                 }

ShopBundle/Resources/translations/lcshop.fr.yaml

@@ -351,7 +351,7 @@ field:
         differentSupplierTaxRate: TVA différente pour le producteur
         supplierTaxRate: TVA du producteur
         propertyNoveltyExpirationDateActive: Marquer le produit comme "nouveauté" jusqu'au
-        propertyOrganicLabelActive: Marquer le produit comme "labellisé"
+        propertyQualityLabelActive: Marquer le produit comme "labellisé"
         propertyLargeVolume: Marquer le produit comme "gros volume"
         propertyCharacteristics: Caractéristiques
         propertyPackaging: Conditionnement

ShopBundle/Resources/views/backend/productfamily/form.html.twig

@@ -36,8 +36,8 @@
                 {% if form.behaviorStockWeek.vars.value %}behaviorStockWeek: "{{ form.behaviorStockWeek.vars.value }}",{% endif %}
                 {% if formValues.availableQuantity %}availableQuantity: "{{ formValues.availableQuantity }}",{% endif %}
                 {% if formValues.availableQuantityDefault %}availableQuantityDefault: "{{ formValues.availableQuantityDefault }}",{% endif %}
-                {% if formValues.propertyOrganicLabel %}propertyOrganicLabelActive: true,{% endif %}
-                {% if formValues.propertyOrganicLabel %}propertyOrganicLabel: "{{ formValues.propertyOrganicLabel }}",{% endif %}
+                {% if formValues.qualityLabels %}propertyQualityLabelActive: true,{% endif %}
+                {% if formValues.qualityLabels %}qualityLabels: "",{% endif %}
 
                 {% if formValues.propertyNoveltyExpirationDate %}propertyNoveltyExpirationDateActive: true,{% endif %}
                 {% if formValues.propertyNoveltyExpirationDate %}propertyNoveltyExpirationDate: "{{ formValues.propertyNoveltyExpirationDate|date('Y-m-d') }}",{% endif %}

ShopBundle/Resources/views/backend/productfamily/panel_property.html.twig

@@ -22,10 +22,11 @@
             </td>
         </tr>
         <tr>
-            <td>{{ form_widget(form.propertyOrganicLabelActive, {"attr" : {'v-model' : 'propertyOrganicLabelActive' } }) }}</td>
+            {% do form.propertyOrganicLabel.setRendered %}
+            <td>{{ form_widget(form.propertyQualityLabelActive, {"attr" : {'v-model' : 'propertyQualityLabelActive' } }) }}</td>
             <td>
-                <div class="form-widget" v-show="propertyOrganicLabelActive == true">
-                {{ form_widget(form.propertyOrganicLabel, {"attr" : {'v-model' : 'propertyOrganicLabel', 'ref': 'propertyOrganicLabel'}}) }}
+                <div class="form-widget" v-show="propertyQualityLabelActive == true">
+                    {{ form_widget(form.qualityLabels) }}
                 </div>
             </td>
         </tr>