MDVA-275: Emails from admin being sent out using default config’s email, not the specific store email

isitnikov · isitnikov · commit 9fc059bc5b54 · 2016-05-17T21:27:08.000+03:00
diff --git a/app/code/Magento/Checkout/Helper/Data.php b/app/code/Magento/Checkout/Helper/Data.php
@@ -304,6 +304,8 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
                     'items' => nl2br($items),
                     'total' => $total,
                 ]
+            )->setScopeId(
+                $checkout->getStoreId()
             )->setFrom(
                 $this->scopeConfig->getValue(
                     'checkout/payment_failed/identity',
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -920,6 +920,7 @@ protected function sendEmailTemplate($customer, $template, $sender, $templatePar
         $transport = $this->transportBuilder->setTemplateIdentifier($templateId)
             ->setTemplateOptions(['area' => Area::AREA_FRONTEND, 'store' => $storeId])
             ->setTemplateVars($templateParams)
+            ->setScopeId($storeId)
             ->setFrom($this->scopeConfig->getValue($sender, ScopeInterface::SCOPE_STORE, $storeId))
             ->addTo($customer->getEmail(), $this->customerViewHelper->getCustomerName($customer))
             ->getTransport();
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
@@ -828,6 +828,8 @@ protected function _sendEmailTemplate($template, $sender, $templateParams = [],
             ['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => $storeId]
         )->setTemplateVars(
             $templateParams
+        )->setScopeId(
+            $storeId
         )->setFrom(
             $this->_scopeConfig->getValue($sender, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
         )->addTo(
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -654,6 +654,7 @@ public function sendConfirmationRequestEmail()
 
         $this->inlineTranslation->suspend();
 
+        $storeId = $this->_storeManager->getStore()->getId();
         $this->_transportBuilder->setTemplateIdentifier(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
@@ -662,10 +663,12 @@ public function sendConfirmationRequestEmail()
         )->setTemplateOptions(
             [
                 'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
-                'store' => $this->_storeManager->getStore()->getId(),
+                'store' => $storeId,
             ]
         )->setTemplateVars(
             ['subscriber' => $this, 'store' => $this->_storeManager->getStore()]
+        )->setScopeId(
+            $storeId
         )->setFrom(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_CONFIRM_EMAIL_IDENTITY,
@@ -707,6 +710,7 @@ public function sendConfirmationSuccessEmail()
 
         $this->inlineTranslation->suspend();
 
+        $storeId = $this->_storeManager->getStore()->getId();
         $this->_transportBuilder->setTemplateIdentifier(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_SUCCESS_EMAIL_TEMPLATE,
@@ -715,10 +719,12 @@ public function sendConfirmationSuccessEmail()
         )->setTemplateOptions(
             [
                 'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
-                'store' => $this->_storeManager->getStore()->getId(),
+                'store' => $storeId,
             ]
         )->setTemplateVars(
             ['subscriber' => $this]
+        )->setScopeId(
+            $storeId
         )->setFrom(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_SUCCESS_EMAIL_IDENTITY,
@@ -759,6 +765,7 @@ public function sendUnsubscriptionEmail()
 
         $this->inlineTranslation->suspend();
 
+        $storeId = $this->_storeManager->getStore()->getId();
         $this->_transportBuilder->setTemplateIdentifier(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_UNSUBSCRIBE_EMAIL_TEMPLATE,
@@ -767,10 +774,12 @@ public function sendUnsubscriptionEmail()
         )->setTemplateOptions(
             [
                 'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
-                'store' => $this->_storeManager->getStore()->getId(),
+                'store' => $storeId,
             ]
         )->setTemplateVars(
             ['subscriber' => $this]
+        )->setScopeId(
+            $storeId
         )->setFrom(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY,
diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
@@ -374,6 +374,8 @@ public function send()
                 'customerName' => $this->_customerHelper->getCustomerName($this->_customer),
                 'alertGrid' => $alertGrid,
             ]
+        )->setScopeId(
+            $storeId
         )->setFrom(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_EMAIL_IDENTITY,
diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -186,6 +186,7 @@ public function execute()
 
             try {
                 foreach ($emails as $email) {
+                    $storeId = $this->storeManager->getStore()->getStoreId();
                     $transport = $this->_transportBuilder->setTemplateIdentifier(
                         $this->scopeConfig->getValue(
                             'wishlist/email/email_template',
@@ -194,7 +195,7 @@ public function execute()
                     )->setTemplateOptions(
                         [
                             'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
-                            'store' => $this->storeManager->getStore()->getStoreId(),
+                            'store' => $storeId,
                         ]
                     )->setTemplateVars(
                         [
@@ -206,6 +207,8 @@ public function execute()
                             'message' => $message,
                             'store' => $this->storeManager->getStore(),
                         ]
+                    )->setScopeId(
+                        $storeId
                     )->setFrom(
                         $this->scopeConfig->getValue(
                             'wishlist/email/email_identity',
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -84,6 +84,9 @@ class TransportBuilder
      */
     protected $mailTransportFactory;
 
+    /** @var int|null */
+    private $scopeId;
+
     /**
      * @param FactoryInterface $templateFactory
      * @param MessageInterface $message
@@ -156,6 +159,18 @@ public function setReplyTo($email, $name = null)
         return $this;
     }
 
+    /**
+     * Set scope
+     *
+     * @param int $scopeId
+     * @return $this
+     */
+    public function setScopeId($scopeId)
+    {
+        $this->scopeId = $scopeId;
+        return $this;
+    }
+
     /**
      * Set mail from address
      *
@@ -164,7 +179,7 @@ public function setReplyTo($email, $name = null)
      */
     public function setFrom($from)
     {
-        $result = $this->_senderResolver->resolve($from);
+        $result = $this->_senderResolver->resolve($from, $this->scopeId);
         $this->message->setFrom($result['email'], $result['name']);
         return $this;
     }
@@ -242,6 +257,7 @@ protected function reset()
         $this->templateIdentifier = null;
         $this->templateVars = null;
         $this->templateOptions = null;
+        $this->scopeId = null;
         return $this;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,8 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one`
`304`	`304`	`'items' => nl2br($items),`
`305`	`305`	`'total' => $total,`
`306`	`306`	`]`
	`307`	`+ )->setScopeId(`
	`308`	`+ $checkout->getStoreId()`
`307`	`309`	`)->setFrom(`
`308`	`310`	`$this->scopeConfig->getValue(`
`309`	`311`	`'checkout/payment_failed/identity',`
Original file line number	Diff line number	Diff line change
`@@ -374,6 +374,8 @@ public function send()`
`374`	`374`	`'customerName' => $this->_customerHelper->getCustomerName($this->_customer),`
`375`	`375`	`'alertGrid' => $alertGrid,`
`376`	`376`	`]`
	`377`	`+ )->setScopeId(`
	`378`	`+ $storeId`
`377`	`379`	`)->setFrom(`
`378`	`380`	`$this->_scopeConfig->getValue(`
`379`	`381`	`self::XML_PATH_EMAIL_IDENTITY,`
Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,7 @@ public function execute()`
`186`	`186`
`187`	`187`	`try {`
`188`	`188`	`foreach ($emails as $email) {`
	`189`	`+ $storeId = $this->storeManager->getStore()->getStoreId();`
`189`	`190`	`$transport = $this->_transportBuilder->setTemplateIdentifier(`
`190`	`191`	`$this->scopeConfig->getValue(`
`191`	`192`	`'wishlist/email/email_template',`
`@@ -194,7 +195,7 @@ public function execute()`
`194`	`195`	`)->setTemplateOptions(`
`195`	`196`	`[`
`196`	`197`	`'area' => \Magento\Framework\App\Area::AREA_FRONTEND,`
`197`		`- 'store' => $this->storeManager->getStore()->getStoreId(),`
	`198`	`+ 'store' => $storeId,`
`198`	`199`	`]`
`199`	`200`	`)->setTemplateVars(`
`200`	`201`	`[`
`@@ -206,6 +207,8 @@ public function execute()`
`206`	`207`	`'message' => $message,`
`207`	`208`	`'store' => $this->storeManager->getStore(),`
`208`	`209`	`]`
	`210`	`+ )->setScopeId(`
	`211`	`+ $storeId`
`209`	`212`	`)->setFrom(`
`210`	`213`	`$this->scopeConfig->getValue(`
`211`	`214`	`'wishlist/email/email_identity',`