Skip to content

Commit f15cf08

Browse files
yelahin-serhiyyelahin-serhiy
committed
MC-35837: [On Premise] Invoice and Shipment email notifications for guest do not have guest name, similar to MDVA-27452 which fixes same issue for order confirmation emails
1 parent d598c12 commit f15cf08

File tree

17 files changed

+31
-31
lines changed

17 files changed

+31
-31
lines changed

‎app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"var comment|escape|nl2br":"Credit Memo Comment",
1111
"var creditmemo.increment_id":"Credit Memo Id",
1212
"layout handle=\"sales_email_order_creditmemo_items\" creditmemo=$creditmemo order=$order":"Credit Memo Items Grid",
13-
"var billing.name":"Guest Customer Name (Billing)",
13+
"var order_data.customer_name":"Guest Customer Name (Billing)",
1414
"var order.increment_id":"Order Id",
1515
"var payment_html|raw":"Payment Details",
1616
"var formattedShippingAddress|raw":"Shipping Address",
@@ -30,7 +30,7 @@
3030
<table>
3131
<tr class="email-intro">
3232
<td>
33-
<p class="greeting">{{trans "%name," name=$billing.name}}</p>
33+
<p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
3434
<p>
3535
{{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
3636
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.

‎app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!--@vars {
99
"var comment|escape|nl2br":"Credit Memo Comment",
1010
"var creditmemo.increment_id":"Credit Memo Id",
11-
"var billing.name":"Guest Customer Name",
11+
"var order_data.customer_name":"Guest Customer Name",
1212
"var order.increment_id":"Order Id",
1313
"var order_data.frontend_status_label":"Order Status",
1414
"var store.frontend_name":"Store Frontend Name",
@@ -21,7 +21,7 @@
2121
<table>
2222
<tr class="email-intro">
2323
<td>
24-
<p class="greeting">{{trans "%name," name=$billing.name}}</p>
24+
<p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
2525
<p>
2626
{{trans
2727
"Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."

‎app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.frontend_name}} @-->
88
<!--@vars {
99
"var formattedBillingAddress|raw":"Billing Address",
10-
"var billing.name":"Guest Customer Name",
10+
"var order_data.customer_name":"Guest Customer Name",
1111
"var comment|escape|nl2br":"Invoice Comment",
1212
"var invoice.increment_id":"Invoice Id",
1313
"layout handle=\"sales_email_order_invoice_items\" invoice=$invoice order=$order":"Invoice Items Grid",
@@ -30,7 +30,7 @@
3030
<table>
3131
<tr class="email-intro">
3232
<td>
33-
<p class="greeting">{{trans "%name," name=$billing.name}}</p>
33+
<p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
3434
<p>
3535
{{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
3636
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.

‎app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.frontend_name}} @-->
88
<!--@vars {
9-
"var billing.name":"Guest Customer Name",
9+
"var order_data.customer_name":"Guest Customer Name",
1010
"var comment|escape|nl2br":"Invoice Comment",
1111
"var invoice.increment_id":"Invoice Id",
1212
"var order.increment_id":"Order Id",
@@ -21,7 +21,7 @@
2121
<table>
2222
<tr class="email-intro">
2323
<td>
24-
<p class="greeting">{{trans "%name," name=$billing.name}}</p>
24+
<p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
2525
<p>
2626
{{trans
2727
"Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."

‎app/code/Magento/Sales/view/frontend/email/order_update_guest.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<!--@subject {{trans "Update to your %store_name order" store_name=$store.frontend_name}} @-->
88
<!--@vars {
9-
"var billing.name":"Guest Customer Name",
9+
"var order_data.customer_name":"Guest Customer Name",
1010
"var comment|escape|nl2br":"Order Comment",
1111
"var order.increment_id":"Order Id",
1212
"var order_data.frontend_status_label":"Order Status",
@@ -20,7 +20,7 @@
2020
<table>
2121
<tr class="email-intro">
2222
<td>
23-
<p class="greeting">{{trans "%name," name=$billing.name}}</p>
23+
<p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
2424
<p>
2525
{{trans
2626
"Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."

‎app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!--@subject {{trans "Your %store_name order has shipped" store_name=$store.frontend_name}} @-->
88
<!--@vars {
99
"var formattedBillingAddress|raw":"Billing Address",
10-
"var billing.name":"Guest Customer Name",
10+
"var order_data.customer_name":"Guest Customer Name",
1111
"var order.increment_id":"Order Id",
1212
"var payment_html|raw":"Payment Details",
1313
"var comment|escape|nl2br":"Shipment Comment",
@@ -31,7 +31,7 @@
3131
<table>
3232
<tr class="email-intro">
3333
<td>
34-
<p class="greeting">{{trans "%name," name=$billing.name}}</p>
34+
<p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
3535
<p>
3636
{{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
3737
{{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.

‎app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<!--@subject {{trans "Update to your %store_name shipment" store_name=$store.frontend_name}} @-->
88
<!--@vars {
9-
"var billing.name":"Guest Customer Name",
9+
"var order_data.customer_name":"Guest Customer Name",
1010
"var comment|escape|nl2br":"Order Comment",
1111
"var order.increment_id":"Order Id",
1212
"var order_data.frontend_status_label":"Order Status",
@@ -21,7 +21,7 @@
2121
<table>
2222
<tr class="email-intro">
2323
<td>
24-
<p class="greeting">{{trans "%name," name=$billing.name}}</p>
24+
<p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
2525
<p>
2626
{{trans
2727
"Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."

‎app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"var comment|escape|nl2br":"Credit Memo Comment",
1111
"var creditmemo.increment_id":"Credit Memo Id",
1212
"layout handle=\"sales_email_order_creditmemo_items\" creditmemo=$creditmemo order=$order":"Credit Memo Items Grid",
13-
"var billing.name":"Guest Customer Name (Billing)",
13+
"var order_data.customer_name":"Guest Customer Name (Billing)",
1414
"var order.increment_id":"Order Id",
1515
"var payment_html|raw":"Payment Details",
1616
"var formattedShippingAddress|raw":"Shipping Address",
@@ -28,7 +28,7 @@
2828
<table>
2929
<tr class="email-intro">
3030
<td>
31-
<p class="greeting">{{trans "%name," name=$billing.name}}</p>
31+
<p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
3232
<p>
3333
{{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
3434
</p>

‎app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!--@vars {
99
"var comment|escape|nl2br":"Credit Memo Comment",
1010
"var creditmemo.increment_id":"Credit Memo Id",
11-
"var billing.name":"Guest Customer Name",
11+
"var order_data.customer_name":"Guest Customer Name",
1212
"var order.increment_id":"Order Id",
1313
"var order_data.frontend_status_label":"Order Status",
1414
"var store_email":"Store Email",
@@ -19,7 +19,7 @@
1919
<table>
2020
<tr class="email-intro">
2121
<td>
22-
<p class="greeting">{{trans "%name," name=$billing.name}}</p>
22+
<p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
2323
<p>
2424
{{trans
2525
"Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."

‎app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.frontend_name}} @-->
88
<!--@vars {
99
"var formattedBillingAddress|raw":"Billing Address",
10-
"var billing.name":"Guest Customer Name",
10+
"var order_data.customer_name":"Guest Customer Name",
1111
"var comment|escape|nl2br":"Invoice Comment",
1212
"var invoice.increment_id":"Invoice Id",
1313
"layout handle=\"sales_email_order_invoice_items\" invoice=$invoice order=$order":"Invoice Items Grid",
@@ -28,7 +28,7 @@
2828
<table>
2929
<tr class="email-intro">
3030
<td>
31-
<p class="greeting">{{trans "%name," name=$billing.name}}</p>
31+
<p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
3232
<p>
3333
{{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
3434
</p>

‎app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.frontend_name}} @-->
88
<!--@vars {
9-
"var billing.name":"Guest Customer Name",
9+
"var order_data.customer_name":"Guest Customer Name",
1010
"var comment|escape|nl2br":"Invoice Comment",
1111
"var invoice.increment_id":"Invoice Id",
1212
"var order.increment_id":"Order Id",
@@ -19,7 +19,7 @@
1919
<table>
2020
<tr class="email-intro">
2121
<td>
22-
<p class="greeting">{{trans "%name," name=$billing.name}}</p>
22+
<p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
2323
<p>
2424
{{trans
2525
"Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."

‎app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<!--@subject {{trans "Update to your %store_name order" store_name=$store.frontend_name}} @-->
88
<!--@vars {
9-
"var billing.name":"Guest Customer Name",
9+
"var order_data.customer_name":"Guest Customer Name",
1010
"var comment|escape|nl2br":"Order Comment",
1111
"var order.increment_id":"Order Id",
1212
"var order_data.frontend_status_label":"Order Status",
@@ -18,7 +18,7 @@
1818
<table>
1919
<tr class="email-intro">
2020
<td>
21-
<p class="greeting">{{trans "%name," name=$billing.name}}</p>
21+
<p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
2222
<p>
2323
{{trans
2424
"Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."

‎app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!--@subject {{trans "Your %store_name order has shipped" store_name=$store.frontend_name}} @-->
88
<!--@vars {
99
"var formattedBillingAddress|raw":"Billing Address",
10-
"var billing.name":"Guest Customer Name",
10+
"var order_data.customer_name":"Guest Customer Name",
1111
"var order.increment_id":"Order Id",
1212
"var payment_html|raw":"Payment Details",
1313
"var comment|escape|nl2br":"Shipment Comment",
@@ -30,7 +30,7 @@
3030
<table>
3131
<tr class="email-intro">
3232
<td>
33-
<p class="greeting">{{trans "%name," name=$billing.name}}</p>
33+
<p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
3434
<p>
3535
{{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
3636
</p>

‎app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<!--@subject {{trans "Update to your %store_name shipment" store_name=$store.frontend_name}} @-->
88
<!--@vars {
9-
"var billing.name":"Guest Customer Name",
9+
"var order_data.customer_name":"Guest Customer Name",
1010
"var comment|escape|nl2br":"Order Comment",
1111
"var order.increment_id":"Order Id",
1212
"var order_data.frontend_status_label":"Order Status",
@@ -19,7 +19,7 @@
1919
<table>
2020
<tr class="email-intro">
2121
<td>
22-
<p class="greeting">{{trans "%name," name=$billing.name}}</p>
22+
<p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
2323
<p>
2424
{{trans
2525
"Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."

‎dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testSendEmailOnAddCreditmemoComment(): void
4242
$message = $this->transportBuilder->getSentMessage();
4343
$subject =__('Update to your %1 credit memo', $order->getStore()->getFrontendName())->render();
4444
$messageConstraint = $this->logicalAnd(
45-
new StringContains($order->getBillingAddress()->getName()),
45+
new StringContains($order->getCustomerName()),
4646
new RegularExpression(
4747
sprintf(
4848
"/Your order #%s has been updated with a status of.*%s/",

‎dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function testSendEmailOnAddInvoiceComment(): void
4343
$message = $this->transportBuilder->getSentMessage();
4444
$subject = __('Update to your %1 invoice', $order->getStore()->getFrontendName())->render();
4545
$messageConstraint = $this->logicalAnd(
46-
new StringContains($order->getBillingAddress()->getName()),
46+
new StringContains($order->getCustomerName()),
4747
new RegularExpression(
4848
sprintf(
4949
"/Your order #%s has been updated with a status of.*%s/",

‎dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function testSendEmailOnShipmentCommentAdd(): void
4242
$message = $this->transportBuilder->getSentMessage();
4343
$subject =__('Update to your %1 shipment', $order->getStore()->getFrontendName())->render();
4444
$messageConstraint = $this->logicalAnd(
45-
new StringContains($order->getBillingAddress()->getName()),
45+
new StringContains($order->getCustomerName()),
4646
new RegularExpression(
4747
sprintf(
4848
"/Your order #%s has been updated with a status of.*%s/",

0 commit comments

Comments
 (0)