Merge branch 'develop'

ShopBundle/Controller/Backend/ProductFamilyController.php

@@ -139,7 +139,8 @@ class ProductFamilyController extends AdminController
                         '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_HVE => ProductFamily::PROPERTY_ORGANIC_LABEL_HVE,
+                                'field.ProductFamily.organicLabelOptions.' . ProductFamily::PROPERTY_ORGANIC_LABEL_TVVR => ProductFamily::PROPERTY_ORGANIC_LABEL_TVVR
                         ),
                         'translation_domain' => 'lcshop',
                         'multiple' => false,

ShopBundle/Model/ProductFamily.php

@@ -47,6 +47,7 @@ abstract class ProductFamily extends AbstractDocumentEntity implements ProductPr
         const PROPERTY_ORGANIC_LABEL_AB = 'ab';
         const PROPERTY_ORGANIC_LABEL_NP = 'nature-progres';
         const PROPERTY_ORGANIC_LABEL_HVE = 'hve';
+        const PROPERTY_ORGANIC_LABEL_TVVR = 'tvvr';
 
         const TYPE_EXPIRATION_DATE_DLC = 'dlc';
         const TYPE_EXPIRATION_DATE_DDM = 'ddm';

ShopBundle/Resources/translations/lcshop.fr.yaml

@@ -385,6 +385,7 @@ field:
             ab: Agriculture biologique
             hve: Haute valeur environnementale
             nature-progres: Nature & progrès
+            tvvr: "Terra Vitis : Viticulture Responsable"
         behaviorExpirationDate: Gèrer
         behaviorExpirationDateOptions:
             by-product-family: Par produit