Skip to content

Commit 2c3e913

Browse files
admanesachinnathanjosiah
admanesachin
authored and
nathanjosiah
committed
MC-20548: Refactor sales module email templates to use scalar variables.
Fix static failures due to missing annotations.
1 parent 0a95049 commit 2c3e913

32 files changed

+217
-70
lines changed

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,22 @@
77
<!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.frontend_name}} @-->
88
<!--@vars {
99
"var formattedBillingAddress|raw":"Billing Address",
10-
"var comment":"Credit Memo Comment",
10+
"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 this.getUrl($store, 'customer/account/')":"Customer Account URL",
13+
"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
1414
"var order_data.customer_name":"Customer Name",
1515
"var order.increment_id":"Order Id",
1616
"var payment_html|raw":"Payment Details",
1717
"var formattedShippingAddress|raw":"Shipping Address",
18-
"var order.shipping_description":"Shipping Description"
18+
"var order.shipping_description":"Shipping Method",
19+
"var store.frontend_name":"Store Frontend name",
20+
"var store_email":"Store Email",
21+
"var store_phone":"Store Phone",
22+
"var store_hours":"Store Hours",
23+
"var creditmemo":"Credit Memo",
24+
"var order":"Order",
25+
"var order_data.is_not_virtual":"Order Type"
1926
} @-->
2027
{{template config_path="design/email/header_template"}}
2128

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,21 @@
77
<!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.frontend_name}} @-->
88
<!--@vars {
99
"var formattedBillingAddress|raw":"Billing Address",
10-
"var comment":"Credit Memo Comment",
10+
"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",
1313
"var billing.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",
17-
"var order.shipping_description":"Shipping Description"
17+
"var order.shipping_description":"Shipping Description",
18+
"var store.frontend_name":"Store Frontend Name",
19+
"var store_phone":"Store Phone",
20+
"var store_email":"Store Email",
21+
"var store_hours":"Store Hours",
22+
"var creditmemo":"Credit Memo",
23+
"var order":"Order",
24+
"var order_data.is_not_virtual":"Order Type"
1825
} @-->
1926
{{template config_path="design/email/header_template"}}
2027

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@
66
-->
77
<!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.frontend_name}} @-->
88
<!--@vars {
9-
"var comment":"Credit Memo Comment",
9+
"var comment|escape|nl2br":"Credit Memo Comment",
1010
"var creditmemo.increment_id":"Credit Memo Id",
11-
"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
11+
"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
1212
"var order_data.customer_name":"Customer Name",
1313
"var order.increment_id":"Order Id",
14-
"var order_data.frontend_status_label":"Order Status"
14+
"var order_data.frontend_status_label":"Order Status",
15+
"var store.frontend_name":"Store Frontend Name",
16+
"var store_phone":"Store Phone",
17+
"var store_email":"Store Email",
18+
"var store_hours":"Store Hours"
1519
} @-->
1620
{{template config_path="design/email/header_template"}}
1721

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@
66
-->
77
<!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.frontend_name}} @-->
88
<!--@vars {
9-
"var comment":"Credit Memo Comment",
9+
"var comment|escape|nl2br":"Credit Memo Comment",
1010
"var creditmemo.increment_id":"Credit Memo Id",
1111
"var billing.name":"Guest Customer Name",
1212
"var order.increment_id":"Order Id",
13-
"var order_data.frontend_status_label":"Order Status"
13+
"var order_data.frontend_status_label":"Order Status",
14+
"var store.frontend_name":"Store Frontend Name",
15+
"var store_phone":"Store Phone",
16+
"var store_email":"Store Email",
17+
"var store_hours":"Store Hours"
1418
} @-->
1519
{{template config_path="design/email/header_template"}}
1620

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,22 @@
77
<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.frontend_name}} @-->
88
<!--@vars {
99
"var formattedBillingAddress|raw":"Billing Address",
10-
"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
10+
"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
1111
"var order_data.customer_name":"Customer Name",
12-
"var comment":"Invoice Comment",
12+
"var comment|escape|nl2br":"Invoice Comment",
1313
"var invoice.increment_id":"Invoice Id",
1414
"layout area=\"frontend\" handle=\"sales_email_order_invoice_items\" invoice=$invoice order=$order":"Invoice Items Grid",
1515
"var order.increment_id":"Order Id",
1616
"var payment_html|raw":"Payment Details",
1717
"var formattedShippingAddress|raw":"Shipping Address",
1818
"var order.shipping_description":"Shipping Description",
19+
"var store.frontend_name":"Store Frontend Name",
20+
"var store_phone":"Store Phone",
21+
"var store_email":"Store Email",
22+
"var store_hours":"Store Hours",
23+
"var invoice": "Invoice",
24+
"var order": "Order",
25+
"var order_data.is_not_virtual": "Order Type"
1926
} @-->
2027
{{template config_path="design/email/header_template"}}
2128

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,20 @@
88
<!--@vars {
99
"var formattedBillingAddress|raw":"Billing Address",
1010
"var billing.name":"Guest Customer Name",
11-
"var comment":"Invoice Comment",
11+
"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",
1414
"var order.increment_id":"Order Id",
1515
"var payment_html|raw":"Payment Details",
1616
"var formattedShippingAddress|raw":"Shipping Address",
17-
"var order.shipping_description":"Shipping Description"
17+
"var order.shipping_description":"Shipping Description",
18+
"var store.frontend_name":"Store Frontend Name",
19+
"var store_phone":"Store Phone",
20+
"var store_email":"Store Email",
21+
"var store_hours":"Store Hours",
22+
"var invoice": "Invoice",
23+
"var order": "Order",
24+
"var order_data.is_not_virtual": "Order Type"
1825
} @-->
1926
{{template config_path="design/email/header_template"}}
2027

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@
66
-->
77
<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.frontend_name}} @-->
88
<!--@vars {
9-
"var this.getUrl($store, 'customer/account/')":"Customer Account URL",
9+
"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
1010
"var order_data.customer_name":"Customer Name",
11-
"var comment":"Invoice Comment",
11+
"var comment|escape|nl2br":"Invoice Comment",
1212
"var invoice.increment_id":"Invoice Id",
1313
"var order.increment_id":"Order Id",
14-
"var order.frontend_status_label":"Order Status"
14+
"var order_data.frontend_status_label":"Order Status",
15+
"var store.frontend_name":"Store Frontend Name",
16+
"var store_phone":"Store Phone",
17+
"var store_email":"Store Email",
18+
"var store_hours":"Store Hours"
1519
} @-->
1620
{{template config_path="design/email/header_template"}}
1721

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@
77
<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.frontend_name}} @-->
88
<!--@vars {
99
"var billing.name":"Guest Customer Name",
10-
"var comment":"Invoice Comment",
10+
"var comment|escape|nl2br":"Invoice Comment",
1111
"var invoice.increment_id":"Invoice Id",
1212
"var order.increment_id":"Order Id",
13-
"var order_data.frontend_status_label":"Order Status"
13+
"var order_data.frontend_status_label":"Order Status",
14+
"var store.frontend_name":"Store Frontend Name",
15+
"var store_phone":"Store Phone",
16+
"var store_email":"Store Email",
17+
"var store_hours":"Store Hours"
1418
} @-->
1519
{{template config_path="design/email/header_template"}}
1620

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,22 @@
77
<!--@subject {{trans "Your %store_name order confirmation" store_name=$store.frontend_name}} @-->
88
<!--@vars {
99
"var formattedBillingAddress|raw":"Billing Address",
10-
"var order_data.email_customer_note":"Email Order Note",
10+
"var order_data.email_customer_note|escape|nl2br":"Email Order Note",
1111
"var order.increment_id":"Order Id",
1212
"layout handle=\"sales_email_order_items\" order=$order area=\"frontend\"":"Order Items Grid",
1313
"var payment_html|raw":"Payment Details",
1414
"var formattedShippingAddress|raw":"Shipping Address",
1515
"var order.shipping_description":"Shipping Description",
1616
"var shipping_msg":"Shipping message",
1717
"var created_at_formatted":"Order Created At (datetime)",
18+
"var store.frontend_name":"Store Frontend Name",
19+
"var store_phone":"Store Phone",
20+
"var store_email":"Store Email",
21+
"var store_hours":"Store Hours",
22+
"var this.getUrl($store,'customer/account/',[_nosid:1])":"Customer Account URL",
23+
"var order_data.is_not_virtual":"Order Type",
24+
"var order":"Order",
25+
"var order_data.customer_name":"Customer Name"
1826
} @-->
1927

2028
{{template config_path="design/email/header_template"}}

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,21 @@
77
<!--@subject {{trans "Your %store_name order confirmation" store_name=$store.frontend_name}} @-->
88
<!--@vars {
99
"var formattedBillingAddress|raw":"Billing Address",
10-
"var order_data.email_customer_note":"Email Order Note",
10+
"var order_data.email_customer_note|escape|nl2br":"Email Order Note",
1111
"var order.billing_address.name":"Guest Customer Name",
1212
"var created_at_formatted":"Order Created At (datetime)",
1313
"var order.increment_id":"Order Id",
1414
"layout handle=\"sales_email_order_items\" order=$order":"Order Items Grid",
1515
"var payment_html|raw":"Payment Details",
1616
"var formattedShippingAddress|raw":"Shipping Address",
1717
"var order.shipping_description":"Shipping Description",
18-
"var shipping_msg":"Shipping message"
18+
"var shipping_msg":"Shipping message",
19+
"var store.frontend_name":"Store Frontend Name",
20+
"var store_phone":"Store Phone",
21+
"var store_email":"Store Email",
22+
"var store_hours":"Store Hours",
23+
"var order_data.is_not_virtual":"Order Type",
24+
"var order":"Order"
1925
} @-->
2026
{{template config_path="design/email/header_template"}}
2127

0 commit comments

Comments
 (0)