From 6e2fc05e12fa04ece313d4055a78c380ea63c8e3 Mon Sep 17 00:00:00 2001 From: Rob Conings Date: Sat, 23 Jun 2018 09:12:57 +0200 Subject: [PATCH 1/3] Fix Email Sender issue 16355 https://github.com/magento/magento2/issues/16355 --- app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php index 7ec089b882972..f558ae4163053 100644 --- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php +++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php @@ -110,9 +110,6 @@ protected function configureEmailTemplate() $this->transportBuilder->setTemplateIdentifier($this->templateContainer->getTemplateId()); $this->transportBuilder->setTemplateOptions($this->templateContainer->getTemplateOptions()); $this->transportBuilder->setTemplateVars($this->templateContainer->getTemplateVars()); - $this->transportBuilderByStore->setFromByStore( - $this->identityContainer->getEmailIdentity(), - $this->identityContainer->getStore()->getId() - ); + $this->transportBuilder->setFrom($this->identityContainer->getEmailIdentity(), $this->identityContainer->getStore()->getId()); } } From 47d976e09b5ca7929df1ed4bb36f8047b868515c Mon Sep 17 00:00:00 2001 From: Rob Conings Date: Sat, 23 Jun 2018 09:31:42 +0200 Subject: [PATCH 2/3] Update TransportBuilder.php --- .../Magento/Framework/Mail/Template/TransportBuilder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php index 18b241d77a426..9feb1f0fb11f2 100644 --- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php +++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php @@ -164,9 +164,9 @@ public function setReplyTo($email, $name = null) * @param string|array $from * @return $this */ - public function setFrom($from) + public function setFrom($from, $store = null) { - $result = $this->_senderResolver->resolve($from); + $result = $this->_senderResolver->resolve($from, $store); $this->message->setFrom($result['email'], $result['name']); return $this; } From 2b1da9708d6a86fdf940786372b6edccd83347d5 Mon Sep 17 00:00:00 2001 From: Rob Conings Date: Tue, 26 Jun 2018 01:20:15 +0200 Subject: [PATCH 3/3] Update SenderBuilder.php --- app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php index f558ae4163053..d5f33a0a8e630 100644 --- a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php +++ b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php @@ -110,6 +110,8 @@ 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->identityContainer->getStore()->getId()); + $this->transportBuilder->setFrom( + $this->identityContainer->getEmailIdentity(), + $this->identityContainer->getStore()->getId()); } }