Skip to content

Commit c30f2d2

Browse files
author
David Alger
committed
MAGETWO-37843: All responsive email templates in Blank Theme
- fixed incorrectly formatted vars blocks
1 parent 13ad75a commit c30f2d2

22 files changed

+23
-24
lines changed

app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"var store.getUrl('customer/account/')":"Customer Account URL",
1010
"var customer.email":"Customer Email",
1111
"var customer.name":"Customer Name"
12-
@-->
12+
} @-->
1313
{{template config_path="design/email/header_template"}}
1414

1515
<p class="greeting">{{trans "%name," name=$customer.name}}</p>

app/code/Magento/Customer/view/frontend/email/password_new.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!--@vars {
99
"var store.getUrl('customer/account/')":"Customer Account URL",
1010
"var customer.name":"Customer Name"
11-
@-->
11+
} @-->
1212
{{template config_path="design/email/header_template"}}
1313

1414
<p class="greeting">{{trans "%name," name=$customer.name}}</p>

app/code/Magento/Customer/view/frontend/email/password_reset.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!--@subject Your {{var store.getFrontendName()}} password has been changed @-->
88
<!--@vars {
99
"var customer.name":"Customer Name"
10-
@-->
10+
} @-->
1111
{{template config_path="design/email/header_template"}}
1212

1313
<p class="greeting">{{trans "%name," name=$customer.name}}</p>

app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!--@vars {
99
"var customer.name":"Customer Name",
1010
"var store.getUrl('customer/account/createPassword/', [_query:[id:$customer.id, token:$customer.rp_token]])":"Reset Password URL"
11-
@-->
11+
} @-->
1212
{{template config_path="design/email/header_template"}}
1313

1414
<p class="greeting">{{trans "%name," name=$customer.name}}</p>

app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,12 @@ public function execute()
4141
$parts = $this->emailConfig->parseTemplateIdParts($templateId);
4242
$templateId = $parts['templateId'];
4343
$theme = $parts['theme'];
44+
4445
if ($theme) {
45-
// If loading template from a theme folder, set theme so that appropriate template gets loaded
4646
$template->setForcedTheme($templateId, $theme);
4747
}
48-
49-
// Since the $template model doesn't have its area set, set it so that theme loads from appropriate area
5048
$template->setForcedArea($templateId);
49+
5150
$template->loadDefault($templateId);
5251
$template->setData('orig_template_code', $templateId);
5352
$template->setData('template_variables', \Zend_Json::encode($template->getVariablesOptionArray(true)));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"var formattedShippingAddress|raw":"Shipping Address",
1818
"var order.getShippingDescription()":"Shipping Description",
1919
"var order.shipping_description":"Shipping Description"
20-
@-->
20+
} @-->
2121
{{template config_path="design/email/header_template"}}
2222

2323
<table>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"var formattedShippingAddress|raw":"Shipping Address",
1717
"var order.getShippingDescription()":"Shipping Description",
1818
"var order.shipping_description":"Shipping Description"
19-
@-->
19+
} @-->
2020
{{template config_path="design/email/header_template"}}
2121

2222
<table>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"var order.getCustomerName()":"Customer Name",
1313
"var order.increment_id":"Order Id",
1414
"var order.getStatusLabel()":"Order Status"
15-
@-->
15+
} @-->
1616
{{template config_path="design/email/header_template"}}
1717

1818
<table>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"var billing.getName()":"Guest Customer Name",
1212
"var order.increment_id":"Order Id",
1313
"var order.getStatusLabel()":"Order Status"
14-
@-->
14+
} @-->
1515
{{template config_path="design/email/header_template"}}
1616

1717
<table>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"var formattedShippingAddress|raw":"Shipping Address",
1818
"var order.shipping_description":"Shipping Description",
1919
"var order.getShippingDescription()":"Shipping Description"
20-
@-->
20+
} @-->
2121
{{template config_path="design/email/header_template"}}
2222

2323
<table>

0 commit comments

Comments
 (0)