Skip to content

Commit 812faaf

Browse files
author
Cari Spruiell
committed
Merge remote-tracking branch 'remotes/classyllama/MAGETWO-37843-responsive-email-templates-in-blank-theme' into MAGETWO-37843-responsive-email-templates-in-blank-theme
# Conflicts: # dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
2 parents 93f097a + 9840dda commit 812faaf

File tree

4 files changed

+44
-55
lines changed

4 files changed

+44
-55
lines changed

‎app/code/Magento/User/Model/User.php

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
*/
66
namespace Magento\User\Model;
77

8+
use Magento\Backend\App\Area\FrontNameResolver;
89
use Magento\Backend\Model\Auth\Credential\StorageInterface;
910
use Magento\Framework\Model\AbstractModel;
1011
use Magento\Framework\Exception\AuthenticationException;
12+
use Magento\Store\Model\Store;
1113
use Magento\User\Api\Data\UserInterface;
1214

1315
/**
@@ -365,20 +367,13 @@ public function roleUserExists()
365367
*/
366368
public function sendPasswordResetConfirmationEmail()
367369
{
368-
// Set all required params and send emails
369-
/** @var \Magento\Framework\Mail\TransportInterface $transport */
370-
$transport = $this->_transportBuilder->setTemplateIdentifier(
371-
$this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_TEMPLATE)
372-
)->setTemplateOptions(
373-
['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => 0]
374-
)->setTemplateVars(
375-
['user' => $this, 'store' => $this->_storeManager->getStore(0)]
376-
)->setFrom(
377-
$this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY)
378-
)->addTo(
379-
$this->getEmail(),
380-
$this->getName()
381-
)->getTransport();
370+
$templateId = $this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_TEMPLATE);
371+
$transport = $this->_transportBuilder->setTemplateIdentifier($templateId)
372+
->setTemplateOptions(['area' => FrontNameResolver::AREA_CODE, 'store' => Store::DEFAULT_STORE_ID])
373+
->setTemplateVars(['user' => $this, 'store' => $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)])
374+
->setFrom($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY))
375+
->addTo($this->getEmail(), $this->getName())
376+
->getTransport();
382377

383378
$transport->sendMessage();
384379
return $this;
@@ -391,20 +386,13 @@ public function sendPasswordResetConfirmationEmail()
391386
*/
392387
public function sendPasswordResetNotificationEmail()
393388
{
394-
// Set all required params and send emails
395-
/** @var \Magento\Framework\Mail\TransportInterface $transport */
396-
$transport = $this->_transportBuilder->setTemplateIdentifier(
397-
$this->_config->getValue(self::XML_PATH_RESET_PASSWORD_TEMPLATE)
398-
)->setTemplateOptions(
399-
['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => 0]
400-
)->setTemplateVars(
401-
['user' => $this, 'store' => $this->_storeManager->getStore(0)]
402-
)->setFrom(
403-
$this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY)
404-
)->addTo(
405-
$this->getEmail(),
406-
$this->getName()
407-
)->getTransport();
389+
$templateId = $this->_config->getValue(self::XML_PATH_RESET_PASSWORD_TEMPLATE);
390+
$transport = $this->_transportBuilder->setTemplateIdentifier($templateId)
391+
->setTemplateOptions(['area' => FrontNameResolver::AREA_CODE, 'store' => Store::DEFAULT_STORE_ID])
392+
->setTemplateVars(['user' => $this, 'store' => $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)])
393+
->setFrom($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY))
394+
->addTo($this->getEmail(), $this->getName())
395+
->getTransport();
408396

409397
$transport->sendMessage();
410398
return $this;

‎app/code/Magento/User/view/adminhtml/email/password_reset.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@
1616

1717
{{trans "If you did not request this change, please contact us."}}
1818

19+
{{trans "Thank you,"}}
20+
{{var store.getFrontendName()}}

‎app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@
1919
{{store url="admin/auth/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}}
2020

2121
{{trans "If you did not make this request, you can ignore this email and your password will remain the same."}}
22+
23+
{{trans "Thank you,"}}
24+
{{var store.getFrontendName()}}

‎lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66
* See COPYING.txt for license details.
77
*/
88

9-
// @codingStandardsIgnoreFile
10-
119
namespace Magento\Framework\Mail\Template;
1210

11+
use Magento\Framework\App\TemplateTypesInterface;
12+
use Magento\Framework\Mail\Message;
13+
use Magento\Framework\Mail\MessageInterface;
14+
use Magento\Framework\Mail\TransportInterfaceFactory;
15+
use Magento\Framework\ObjectManagerInterface;
16+
1317
class TransportBuilder
1418
{
1519
/**
@@ -75,17 +79,17 @@ class TransportBuilder
7579

7680
/**
7781
* @param FactoryInterface $templateFactory
78-
* @param \Magento\Framework\Mail\Message $message
79-
* @param \Magento\Framework\Mail\Template\SenderResolverInterface $senderResolver
80-
* @param \Magento\Framework\ObjectManagerInterface $objectManager
81-
* @param \Magento\Framework\Mail\TransportInterfaceFactory $mailTransportFactory
82+
* @param Message $message
83+
* @param SenderResolverInterface $senderResolver
84+
* @param ObjectManagerInterface $objectManager
85+
* @param TransportInterfaceFactory $mailTransportFactory
8286
*/
8387
public function __construct(
84-
\Magento\Framework\Mail\Template\FactoryInterface $templateFactory,
85-
\Magento\Framework\Mail\Message $message,
86-
\Magento\Framework\Mail\Template\SenderResolverInterface $senderResolver,
87-
\Magento\Framework\ObjectManagerInterface $objectManager,
88-
\Magento\Framework\Mail\TransportInterfaceFactory $mailTransportFactory
88+
FactoryInterface $templateFactory,
89+
Message $message,
90+
SenderResolverInterface $senderResolver,
91+
ObjectManagerInterface $objectManager,
92+
TransportInterfaceFactory $mailTransportFactory
8993
) {
9094
$this->templateFactory = $templateFactory;
9195
$this->message = $message;
@@ -229,13 +233,9 @@ protected function reset()
229233
*/
230234
protected function getTemplate()
231235
{
232-
return $this->templateFactory->get(
233-
$this->templateIdentifier
234-
)->setVars(
235-
$this->templateVars
236-
)->setOptions(
237-
$this->templateOptions
238-
);
236+
return $this->templateFactory->get($this->templateIdentifier)
237+
->setVars($this->templateVars)
238+
->setOptions($this->templateOptions);
239239
}
240240

241241
/**
@@ -247,18 +247,14 @@ protected function prepareMessage()
247247
{
248248
$template = $this->getTemplate();
249249
$types = [
250-
\Magento\Framework\App\TemplateTypesInterface::TYPE_TEXT => \Magento\Framework\Mail\MessageInterface::TYPE_TEXT,
251-
\Magento\Framework\App\TemplateTypesInterface::TYPE_HTML => \Magento\Framework\Mail\MessageInterface::TYPE_HTML,
250+
TemplateTypesInterface::TYPE_TEXT => MessageInterface::TYPE_TEXT,
251+
TemplateTypesInterface::TYPE_HTML => MessageInterface::TYPE_HTML,
252252
];
253253

254254
$body = $template->processTemplate();
255-
$this->message->setMessageType(
256-
$types[$template->getType()]
257-
)->setBody(
258-
$body
259-
)->setSubject(
260-
$template->getSubject()
261-
);
255+
$this->message->setMessageType($types[$template->getType()])
256+
->setBody($body)
257+
->setSubject($template->getSubject());
262258

263259
return $this;
264260
}

0 commit comments

Comments
 (0)