Skip to content

Commit 017d9ea

Browse files
committed
ACP2E-47: Order emails contains data localized using Admin's locale instead of a customer's locale
1 parent e5ea971 commit 017d9ea

File tree

7 files changed

+8
-14
lines changed

7 files changed

+8
-14
lines changed

app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
use Magento\Framework\DataObject;
1818
use Magento\Store\Model\App\Emulation;
1919

20-
/**
21-
* Class CreditmemoCommentSender
22-
*/
2320
class CreditmemoCommentSender extends NotifySender
2421
{
2522
/**

app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ class CreditmemoSender extends Sender
7171
* @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
7272
* @param ManagerInterface $eventManager
7373
* @param Emulation|null $appEmulation
74+
*
75+
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
7476
*/
7577
public function __construct(
7678
Template $templateContainer,

app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
use Magento\Framework\DataObject;
1818
use Magento\Store\Model\App\Emulation;
1919

20-
/**
21-
* Class InvoiceCommentSender
22-
*/
2320
class InvoiceCommentSender extends NotifySender
2421
{
2522
/**
@@ -46,6 +43,7 @@ class InvoiceCommentSender extends NotifySender
4643
* @param \Psr\Log\LoggerInterface $logger
4744
* @param Renderer $addressRenderer
4845
* @param ManagerInterface $eventManager
46+
* @param Emulation|null $appEmulation
4947
*/
5048
public function __construct(
5149
Template $templateContainer,

app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ class InvoiceSender extends Sender
7272
* @param InvoiceResource $invoiceResource
7373
* @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
7474
* @param ManagerInterface $eventManager
75+
* @param Emulation|null $appEmulation
76+
*
77+
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
7578
*/
7679
public function __construct(
7780
Template $templateContainer,

app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
use Magento\Framework\DataObject;
1818
use Magento\Store\Model\App\Emulation;
1919

20-
/**
21-
* Class ShipmentCommentSender
22-
*/
2320
class ShipmentCommentSender extends NotifySender
2421
{
2522
/**

app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ class ShipmentSender extends Sender
7373
* @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
7474
* @param ManagerInterface $eventManager
7575
* @param Emulation|null $appEmulation
76+
*
77+
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
7678
*/
7779
public function __construct(
7880
Template $templateContainer,

app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ class InvoiceCommentSenderTest extends AbstractSenderTest
2626
*/
2727
protected $invoiceMock;
2828

29-
/**
30-
* @var Invoice|MockObject
31-
*/
32-
private $invoiceResource;
33-
3429
/**
3530
* @inheritDoc
3631
*/

0 commit comments

Comments
 (0)