[Backend] Paramètres : ajout email from purchase order

ShopBundle/Resources/translations/lcshop.fr.yaml

@@ -267,6 +267,7 @@ field:
         emailFromName: "Email (From) : nom"
         emailSubjectPrefix: "Email : préfixe"
         emailContact: Email (contact)
+        emailFromPurchaseOrder: "Email (From) : bons de commande"
         order: Commande
         subject: Sujet
         metaTitle: Meta title

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

@@ -18,6 +18,9 @@
         <div class="col-12">
             {{ form_row(form.merchantConfigs['email-contact']) }}
         </div>
+        <div class="col-12">
+            {{ form_row(form.merchantConfigs['email-from-purchase-order']) }}
+        </div>
     {{ macros.card_end() }}
     </div>
 </div>

ShopBundle/Services/MailUtils.php

@@ -41,7 +41,7 @@ class MailUtils
                 $merchantCurrent = $this->merchantUtils->getMerchantCurrent();
 
                 $merchantConfigEmailFrom = $merchantCurrent->getMerchantConfig('email-from');
-                $emailFrom = isset($params[self::FROM_EMAIL]) ? $params[self::FROM_EMAIL] : $merchantConfigEmailFrom;
+                $emailFrom = (isset($params[self::FROM_EMAIL]) && $params[self::FROM_EMAIL] && strlen($params[self::FROM_EMAIL])) ? $params[self::FROM_EMAIL] : $merchantConfigEmailFrom;
 
                 $merchantConfigEmailFromName = $merchantCurrent->getMerchantConfig('email-from-name');
                 $emailFromName = isset($params[self::FROM_NAME]) ? $params[self::FROM_NAME] : $merchantConfigEmailFromName;