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

Anna Bukatar · Anna Bukatar · commit 9fc4c15ea274 · 2016-06-17T18:56:20.000+03:00
- Fixed test case from MDVA-452: Issue with sender email addresses in admin sales for multiple stores and websites
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());

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());`