Merge branch 'MDVA-275' into 2-0-8-backlog

magento-services-vantiv-deploy · magento-services-vantiv-deploy · commit 9d8048f3b7e3 · 2016-07-01T19:09:15.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/Checkout/Test/Unit/Helper/DataTest.php b/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php
@@ -166,6 +166,16 @@ public function testSendPaymentFailedEmail()
             $this->returnSelf()
         );
 
+        $this->_transportBuilder->expects(
+            $this->once()
+        )->method(
+            'setScopeId'
+        )->with(
+            8
+        )->will(
+            $this->returnSelf()
+        );
+
         $this->_transportBuilder->expects(
             $this->once()
         )->method(
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/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
@@ -650,6 +650,10 @@ public function testCreateAccountWithoutPassword()
         $this->transportBuilder->expects($this->once())
             ->method('setTemplateVars')
             ->willReturnSelf();
+        $this->transportBuilder->expects($this->once())
+            ->method('setScopeId')
+            ->with($defaultStoreId)
+            ->willReturnSelf();
         $this->transportBuilder->expects($this->once())
             ->method('setFrom')
             ->with($sender)
@@ -799,6 +803,10 @@ function ($string) {
         $this->transportBuilder->expects($this->once())
             ->method('setTemplateVars')
             ->willReturnSelf();
+        $this->transportBuilder->expects($this->once())
+            ->method('setScopeId')
+            ->with($defaultStoreId)
+            ->willReturnSelf();
         $this->transportBuilder->expects($this->once())
             ->method('setFrom')
             ->with($sender)
@@ -901,6 +909,10 @@ public function testSendPasswordReminderEmail()
             ->method('setTemplateVars')
             ->with(['customer' => $this->customerSecure, 'store' => $this->store])
             ->willReturnSelf();
+        $this->transportBuilder->expects($this->once())
+            ->method('setScopeId')
+            ->with($customerStoreId)
+            ->willReturnSelf();
         $this->transportBuilder->expects($this->once())
             ->method('setFrom')
             ->with($sender)
@@ -1031,6 +1043,10 @@ protected function prepareEmailSend($email, $templateIdentifier, $sender, $store
             ->method('setTemplateVars')
             ->with(['customer' => $this->customerSecure, 'store' => $this->store])
             ->willReturnSelf();
+        $this->transportBuilder->expects($this->any())
+            ->method('setScopeId')
+            ->with($storeId)
+            ->willReturnSelf();
         $this->transportBuilder->expects($this->any())
             ->method('setFrom')
             ->with($sender)
diff --git a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
@@ -215,6 +215,7 @@ public function testSendNewAccountEmailWithoutStoreId()
             'setTemplateIdentifier',
             'setTemplateOptions',
             'setTemplateVars',
+            'setScopeId',
             'setFrom',
             '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/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -95,6 +95,7 @@ public function sendCopyTo()
      */
     protected function configureEmailTemplate()
     {
+        $this->transportBuilder->setScopeId($this->identityContainer->getStore()->getStoreId());
         $this->transportBuilder->setTemplateIdentifier($this->templateContainer->getTemplateId());
         $this->transportBuilder->setTemplateOptions($this->templateContainer->getTemplateOptions());
         $this->transportBuilder->setTemplateVars($this->templateContainer->getTemplateVars());
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
@@ -29,6 +29,11 @@ class SenderBuilderTest extends \PHPUnit_Framework_TestCase
      */
     protected $transportBuilder;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeMock;
+
     protected function setUp()
     {
         $templateId = 'test_template_id';
@@ -58,7 +63,7 @@ protected function setUp()
             [
                 'getEmailIdentity', 'getCustomerEmail',
                 'getCustomerName', 'getTemplateOptions', 'getEmailCopyTo',
-                'getCopyMethod'
+                'getCopyMethod', 'getStore'
             ],
             [],
             '',
@@ -99,6 +104,9 @@ protected function setUp()
         $this->identityContainerMock->expects($this->once())
             ->method('getEmailIdentity')
             ->will($this->returnValue($emailIdentity));
+        $this->identityContainerMock->expects($this->once())
+            ->method('getStore')
+            ->will($this->returnValue($this->storeMock));
         $this->transportBuilder->expects($this->once())
             ->method('setFrom')
             ->with($this->equalTo($emailIdentity));
diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -185,6 +185,8 @@ public function execute()
             $sharingCode = $wishlist->getSharingCode();
 
             try {
+                $storeId = $this->storeManager->getStore()->getStoreId();
+                
                 foreach ($emails as $email) {
                     $transport = $this->_transportBuilder->setTemplateIdentifier(
                         $this->scopeConfig->getValue(
@@ -194,7 +196,7 @@ public function execute()
                     )->setTemplateOptions(
                         [
                             'area' => \Magento\Framework\App\Area::AREA_FRONTEND,
-                            'store' => $this->storeManager->getStore()->getStoreId(),
+                            'store' => $storeId,
                         ]
                     )->setTemplateVars(
                         [
@@ -206,6 +208,8 @@ public function execute()
                             'message' => $message,
                             'store' => $this->storeManager->getStore(),
                         ]
+                    )->setScopeId(
+                        $storeId
                     )->setFrom(
                         $this->scopeConfig->getValue(
                             'wishlist/email/email_identity',
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/SendTest.php
@@ -662,6 +662,10 @@ public function testExecute()
                 'store' => $this->store,
             ])
             ->willReturnSelf();
+        $this->transportBuilder->expects($this->once())
+            ->method('setScopeId')
+            ->with($storeId)
+            ->willReturnSelf();
         $this->transportBuilder->expects($this->once())
             ->method('setFrom')
             ->with($from)
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
`@@ -95,6 +95,7 @@ public function sendCopyTo()`
`95`	`95`	`*/`
`96`	`96`	`protected function configureEmailTemplate()`
`97`	`97`	`{`
	`98`	`+ $this->transportBuilder->setScopeId($this->identityContainer->getStore()->getStoreId());`
`98`	`99`	`$this->transportBuilder->setTemplateIdentifier($this->templateContainer->getTemplateId());`
`99`	`100`	`$this->transportBuilder->setTemplateOptions($this->templateContainer->getTemplateOptions());`
`100`	`101`	`$this->transportBuilder->setTemplateVars($this->templateContainer->getTemplateVars());`