Merge branch 'develop' of https://gitea.laclic.fr/Laclic/LcShopBundle into develop

ShopBundle/Resources/translations/lcshop.fr.yaml

@@ -233,6 +233,7 @@ field:
             success: Succès (vert)
         warningMessage: Contenu du message d'avertissement
         newsletters: Newsletters
+        deliveryDepositoryOnly: Retrait au dépot uniquement
         isPublic: Publique
         isDepository: Dépôt
         productCategories: Catégories

ShopBundle/Resources/views/backend/merchant/panel_delivery.html.twig

@@ -5,6 +5,12 @@
 <div class="row">
     <div class="col-8">
         {{ macros.card_start('Merchant.delivery','light') }}
+
+        {% if form.merchantConfigs['delivery-depository-only'] is defined %}
+            <div class="col-12">
+                {{ form_row(form.merchantConfigs['delivery-depository-only']) }}
+            </div>
+        {% endif %}
         {% if form.merchantConfigs['image-zones'] is defined %}
             <div class="col-12">
                 {{ form_row(form.merchantConfigs['image-zones']) }}