11740: Sending emails from Admin in Multi-Store Environment defaults …

…to Primary Store
magento · Nov 3, 2017 · 9193745 · 9193745
1 parent b61725e
commit 9193745
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 9 deletions.
diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -98,6 +98,9 @@ protected function configureEmailTemplate()
  $this->transportBuilder->setTemplateIdentifier($this->templateContainer->getTemplateId());
  $this->transportBuilder->setTemplateOptions($this->templateContainer->getTemplateOptions());
  $this->transportBuilder->setTemplateVars($this->templateContainer->getTemplateVars());
- $this->transportBuilder->setFrom($this->identityContainer->getEmailIdentity());
+ $this->transportBuilder->setFromByStore(
+ $this->identityContainer->getEmailIdentity(),
+ $this->identityContainer->getStore()->getId()
+ );
  }
 }
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
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Test\Unit\Model\Order\Email;
 
 use Magento\Sales\Model\Order\Email\SenderBuilder;
@@ -29,6 +30,11 @@ class SenderBuilderTest extends \PHPUnit\Framework\TestCase
  */
  protected $transportBuilder;
 
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $storeMock;
+
  protected function setUp()
  {
  $templateId = 'test_template_id';
@@ -42,7 +48,11 @@ protected function setUp()
  ['getTemplateVars', 'getTemplateOptions', 'getTemplateId']
  );
 
- $this->storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getStoreId', '__wakeup']);
+ $this->storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, [
+ 'getStoreId',
+ '__wakeup',
+ 'getId',
+ ]);
 
  $this->identityContainerMock = $this->createPartialMock(
  \Magento\Sales\Model\Order\Email\Container\ShipmentIdentity::class,
@@ -52,14 +62,20 @@ protected function setUp()
  'getCustomerName',
  'getTemplateOptions',
  'getEmailCopyTo',
- 'getCopyMethod'
+ 'getCopyMethod',
+ 'getStore',
  ]
  );
 
- $this->transportBuilder = $this->createPartialMock(\Magento\Framework\Mail\Template\TransportBuilder::class, [
- 'addTo', 'addBcc', 'getTransport',
- 'setTemplateIdentifier', 'setTemplateOptions', 'setTemplateVars',
- 'setFrom',
+ $this->transportBuilder = $this->createPartialMock(\Magento\Framework\Mail\Template\TransportBuilder::class,
+ [
+ 'addTo',
+ 'addBcc',
+ 'getTransport',
+ 'setTemplateIdentifier',
+ 'setTemplateOptions',
+ 'setTemplateVars',
+ 'setFromByStore',
  ]);
 
  $this->templateContainerMock->expects($this->once())
@@ -85,7 +101,7 @@ protected function setUp()
  ->method('getEmailIdentity')
  ->will($this->returnValue($emailIdentity));
  $this->transportBuilder->expects($this->once())
- ->method('setFrom')
+ ->method('setFromByStore')
  ->with($this->equalTo($emailIdentity));
 
  $this->identityContainerMock->expects($this->once())
@@ -119,6 +135,12 @@ public function testSend()
  $this->identityContainerMock->expects($this->once())
  ->method('getCustomerName')
  ->will($this->returnValue($customerName));
+ $this->identityContainerMock->expects($this->once())
+ ->method('getStore')
+ ->willReturn($this->storeMock);
+ $this->storeMock->expects($this->once())
+ ->method('getId')
+ ->willReturn(1);
  $this->transportBuilder->expects($this->once())
  ->method('addTo')
  ->with($this->equalTo($customerEmail), $this->equalTo($customerName));
@@ -145,7 +167,12 @@ public function testSendCopyTo()
  $this->transportBuilder->expects($this->once())
  ->method('addTo')
  ->with($this->equalTo('example@mail.com'));
-
+ $this->identityContainerMock->expects($this->once())
+ ->method('getStore')
+ ->willReturn($this->storeMock);
+ $this->storeMock->expects($this->once())
+ ->method('getId')
+ ->willReturn(1);
  $this->transportBuilder->expects($this->once())
  ->method('getTransport')
  ->will($this->returnValue($transportMock));

diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -171,6 +171,20 @@ public function setFrom($from)
  return $this;
  }
 
+ /**
+ * Set mail from address by store.
+ *
+ * @param string|array $from
+ * @param string|int $store
+ * @return $this
+ */
+ public function setFromByStore($from, $store)
+ {
+ $result = $this->_senderResolver->resolve($from, $store);
+ $this->message->setFrom($result['email'], $result['name']);
+ return $this;
+ }
+
  /**
  * Set template identifier
  *

diff --git a/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php b/lib/internal/Magento/Framework/Mail/Test/Unit/Template/TransportBuilderTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Mail\Test\Unit\Template;
 
 use Magento\Framework\App\TemplateTypesInterface;
@@ -167,6 +168,25 @@ public function testSetFrom()
  $this->builder->setFrom($sender);
  }
 
+ /**
+ * @return void
+ */
+ public function setFromByStore()
+ {
+ $sender = ['email' => 'from@example.com', 'name' => 'name'];
+ $store = 1;
+ $this->senderResolverMock->expects($this->once())
+ ->method('resolve')
+ ->with($sender, $store)
+ ->willReturn($sender);
+ $this->messageMock->expects($this->once())
+ ->method('setFrom')
+ ->with('from@example.com', 'name')
+ ->willReturnSelf();
+
+ $this->builder->setFromByStore($sender);
+ }
+
  /**
  * @return void
  */