Merge branch 'develop'

ShopBundle/Form/Backend/Merchant/MerchantConfigType.php

@@ -7,6 +7,7 @@ use Lc\ShopBundle\Context\MerchantConfigInterface;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\AbstractType;
@@ -55,6 +56,11 @@ class MerchantConfigType extends AbstractType
                                                 'label' => $merchantConfig->getLabel(),
                                         ]);
                                 }
+                                elseif($merchantConfig->getFieldType() == 'textarea') {
+                                        $form->add('value', TextareaType::class, [
+                                                'label' => $merchantConfig->getLabel(),
+                                        ]);
+                                }
                                 else {
                                         if($merchantConfig->getOption()) {
                                                 $form->add('value', TextType::class, [

ShopBundle/Resources/translations/lcshop.fr.yaml

@@ -278,6 +278,7 @@ field:
         users: Utilisateurs
         total: Total
         products: Produits
+        purchaseOrderEmailContent: "Contenu par défaut de l'email envoyé aux producteurs"
 
     PointSale:
         code: Code

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

@@ -21,6 +21,11 @@
         <div class="col-12">
             {{ form_row(form.merchantConfigs['email-from-purchase-order']) }}
         </div>
+        {% if form.merchantConfigs['purchase-order-email-content'] is defined %}
+            <div class="col-12">
+                {{ form_row(form.merchantConfigs['purchase-order-email-content']) }}
+            </div>
+        {% endif %}
     {{ macros.card_end() }}
     </div>
 </div>