diff --git a/vendor/magento/module-sales/Model/Order/Email/Sender/CreditmemoSender.php b/vendor/magento/module-sales/Model/Order/Email/Sender/CreditmemoSender.php index 19dc62772513..22d5bc2b7a56 100644 --- a/vendor/magento/module-sales/Model/Order/Email/Sender/CreditmemoSender.php +++ b/vendor/magento/module-sales/Model/Order/Email/Sender/CreditmemoSender.php @@ -118,6 +118,7 @@ public function send(Creditmemo $creditmemo, $forceSyncMode = false) if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) { $order = $creditmemo->getOrder(); + $paymentHTML = $this->getPaymentHtml($order); $this->appEmulation->startEnvironmentEmulation($order->getStoreId(), Area::AREA_FRONTEND, true); $transport = [ 'order' => $order, @@ -126,7 +127,7 @@ public function send(Creditmemo $creditmemo, $forceSyncMode = false) 'creditmemo_id' => $creditmemo->getId(), 'comment' => $creditmemo->getCustomerNoteNotify() ? $creditmemo->getCustomerNote() : '', 'billing' => $order->getBillingAddress(), - 'payment_html' => $this->getPaymentHtml($order), + 'payment_html' => $paymentHTML, 'store' => $order->getStore(), 'formattedShippingAddress' => $this->getFormattedShippingAddress($order), 'formattedBillingAddress' => $this->getFormattedBillingAddress($order), diff --git a/vendor/magento/module-sales/Model/Order/Email/Sender/InvoiceSender.php b/vendor/magento/module-sales/Model/Order/Email/Sender/InvoiceSender.php index d94e02816e26..d8afe6beba5e 100644 --- a/vendor/magento/module-sales/Model/Order/Email/Sender/InvoiceSender.php +++ b/vendor/magento/module-sales/Model/Order/Email/Sender/InvoiceSender.php @@ -125,6 +125,7 @@ public function send(Invoice $invoice, $forceSyncMode = false) $order->setBaseTaxAmount((float) $invoice->getBaseTaxAmount()); $order->setBaseShippingAmount((float) $invoice->getBaseShippingAmount()); } + $paymentHTML = $this->getPaymentHtml($order); $this->appEmulation->startEnvironmentEmulation($order->getStoreId(), Area::AREA_FRONTEND, true); $transport = [ 'order' => $order, @@ -133,7 +134,7 @@ public function send(Invoice $invoice, $forceSyncMode = false) 'invoice_id' => $invoice->getId(), 'comment' => $invoice->getCustomerNoteNotify() ? $invoice->getCustomerNote() : '', 'billing' => $order->getBillingAddress(), - 'payment_html' => $this->getPaymentHtml($order), + 'payment_html' => $paymentHTML, 'store' => $order->getStore(), 'formattedShippingAddress' => $this->getFormattedShippingAddress($order), 'formattedBillingAddress' => $this->getFormattedBillingAddress($order), diff --git a/vendor/magento/module-sales/Model/Order/Email/Sender/ShipmentSender.php b/vendor/magento/module-sales/Model/Order/Email/Sender/ShipmentSender.php index ba6d65a40c65..78aaf1a696e9 100644 --- a/vendor/magento/module-sales/Model/Order/Email/Sender/ShipmentSender.php +++ b/vendor/magento/module-sales/Model/Order/Email/Sender/ShipmentSender.php @@ -120,6 +120,7 @@ public function send(Shipment $shipment, $forceSyncMode = false) if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) { $order = $shipment->getOrder(); $this->identityContainer->setStore($order->getStore()); + $paymentHTML = $this->getPaymentHtml($order); $this->appEmulation->startEnvironmentEmulation($order->getStoreId(), Area::AREA_FRONTEND, true); $transport = [ 'order' => $order, @@ -128,7 +129,7 @@ public function send(Shipment $shipment, $forceSyncMode = false) 'shipment_id' => $shipment->getId(), 'comment' => $shipment->getCustomerNoteNotify() ? $shipment->getCustomerNote() : '', 'billing' => $order->getBillingAddress(), - 'payment_html' => $this->getPaymentHtml($order), + 'payment_html' => $paymentHTML, 'store' => $order->getStore(), 'formattedShippingAddress' => $this->getFormattedShippingAddress($order), 'formattedBillingAddress' => $this->getFormattedBillingAddress($order),