Skip to content

Commit 292fa21

Browse files
committed
Fix issue with incorrect payment translation in sales emails
add setStore method before generation email template variables
1 parent a55c94f commit 292fa21

File tree

10 files changed

+17
-0
lines changed

10 files changed

+17
-0
lines changed

app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ public function send(
9999
$creditmemo->setSendEmail(true);
100100

101101
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
102+
$this->identityContainer->setStore($order->getStore());
103+
102104
$transport = [
103105
'order' => $order,
104106
'creditmemo' => $creditmemo,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public function __construct(
6363
public function send(Creditmemo $creditmemo, $notify = true, $comment = '')
6464
{
6565
$order = $creditmemo->getOrder();
66+
$this->identityContainer->setStore($order->getStore());
67+
6668
$transport = [
6769
'order' => $order,
6870
'creditmemo' => $creditmemo,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public function send(Creditmemo $creditmemo, $forceSyncMode = false)
103103

104104
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
105105
$order = $creditmemo->getOrder();
106+
$this->identityContainer->setStore($order->getStore());
106107

107108
$transport = [
108109
'order' => $order,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public function __construct(
6363
public function send(Invoice $invoice, $notify = true, $comment = '')
6464
{
6565
$order = $invoice->getOrder();
66+
$this->identityContainer->setStore($order->getStore());
67+
6668
$transport = [
6769
'order' => $order,
6870
'invoice' => $invoice,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public function send(Invoice $invoice, $forceSyncMode = false)
103103

104104
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
105105
$order = $invoice->getOrder();
106+
$this->identityContainer->setStore($order->getStore());
106107

107108
$transport = [
108109
'order' => $order,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ public function __construct(
6161
*/
6262
public function send(Order $order, $notify = true, $comment = '')
6363
{
64+
$this->identityContainer->setStore($order->getStore());
65+
6466
$transport = [
6567
'order' => $order,
6668
'comment' => $comment,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public function __construct(
6363
public function send(Shipment $shipment, $notify = true, $comment = '')
6464
{
6565
$order = $shipment->getOrder();
66+
$this->identityContainer->setStore($order->getStore());
67+
6668
$transport = [
6769
'order' => $order,
6870
'shipment' => $shipment,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ public function send(Shipment $shipment, $forceSyncMode = false)
103103

104104
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
105105
$order = $shipment->getOrder();
106+
$this->identityContainer->setStore($order->getStore());
106107

107108
$transport = [
108109
'order' => $order,

app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ public function send(
9999
$invoice->setSendEmail(true);
100100

101101
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
102+
$this->identityContainer->setStore($order->getStore());
103+
102104
$transport = [
103105
'order' => $order,
104106
'invoice' => $invoice,

app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ public function send(
9999
$shipment->setSendEmail(true);
100100

101101
if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
102+
$this->identityContainer->setStore($order->getStore());
103+
102104
$transport = [
103105
'order' => $order,
104106
'shipment' => $shipment,

0 commit comments

Comments
 (0)