From a18eecc0d0aa82d0976fda0dd5994e519d226c9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Thu, 19 Mar 2020 13:50:19 +0100
Subject: [PATCH 1/3] Fix duplicates of footer and incorrect greeting in some
 Magento_Customer emails

---
 .../Magento/Customer/view/frontend/email/change_email.html | 7 +------
 .../view/frontend/email/change_email_and_password.html     | 7 +------
 .../Customer/view/frontend/email/password_reset.html       | 7 +------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/email/change_email.html b/app/code/Magento/Customer/view/frontend/email/change_email.html
index 4853adf638066..890a1e22b833f 100644
--- a/app/code/Magento/Customer/view/frontend/email/change_email.html
+++ b/app/code/Magento/Customer/view/frontend/email/change_email.html
@@ -12,15 +12,10 @@
 } @-->
 {{template config_path="design/email/header_template"}}
 
-<p class="greeting">{{trans "Hello,"}}</p>
-<br>
-
+<p class="greeting">{{trans "%name," name=$customer.name}}</p>
 <p>
     {{trans "We have received a request to change the following information associated with your account at %store_name: email." store_name=$store.frontend_name}}
     {{trans 'If you have not authorized this action, please contact us immediately 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}}.
 </p>
-<br>
-
-<p>{{trans "Thanks,<br>%store_name" store_name=$store.frontend_name |raw}}</p>
 
 {{template config_path="design/email/footer_template"}}
diff --git a/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html b/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
index 49867bdedc9e0..173223ced9029 100644
--- a/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
+++ b/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
@@ -12,15 +12,10 @@
 } @-->
 {{template config_path="design/email/header_template"}}
 
-<p class="greeting">{{trans "Hello,"}}</p>
-<br>
-
+<p class="greeting">{{trans "%name," name=$customer.name}}</p>
 <p>
     {{trans "We have received a request to change the following information associated with your account at %store_name: email, password." store_name=$store.frontend_name}}
     {{trans 'If you have not authorized this action, please contact us immediately 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}}.
 </p>
-<br>
-
-<p>{{trans "Thanks,<br>%store_name" store_name=$store.frontend_name |raw}}</p>
 
 {{template config_path="design/email/footer_template"}}
diff --git a/app/code/Magento/Customer/view/frontend/email/password_reset.html b/app/code/Magento/Customer/view/frontend/email/password_reset.html
index 79015117c2280..23307978e158c 100644
--- a/app/code/Magento/Customer/view/frontend/email/password_reset.html
+++ b/app/code/Magento/Customer/view/frontend/email/password_reset.html
@@ -13,15 +13,10 @@
 } @-->
 {{template config_path="design/email/header_template"}}
 
-<p class="greeting">{{trans "Hello,"}}</p>
-<br>
-
+<p class="greeting">{{trans "%name," name=$customer.name}}</p>
 <p>
     {{trans "We have received a request to change the following information associated with your account at %store_name: password." store_name=$store.frontend_name}}
     {{trans 'If you have not authorized this action, please contact us immediately 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}}.
 </p>
-<br>
-
-<p>{{trans "Thanks,<br>%store_name" store_name=$store.frontend_name |raw}}</p>
 
 {{template config_path="design/email/footer_template"}}

From 7fa9dd709fbc015354042f5fd12bf2b34db05bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Thu, 19 Mar 2020 14:24:31 +0100
Subject: [PATCH 2/3] Add missing vars

---
 .../Magento/Customer/view/frontend/email/change_email.html     | 3 ++-
 .../view/frontend/email/change_email_and_password.html         | 3 ++-
 .../Magento/Customer/view/frontend/email/password_reset.html   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/email/change_email.html b/app/code/Magento/Customer/view/frontend/email/change_email.html
index 890a1e22b833f..5341a2dc67ad5 100644
--- a/app/code/Magento/Customer/view/frontend/email/change_email.html
+++ b/app/code/Magento/Customer/view/frontend/email/change_email.html
@@ -8,7 +8,8 @@
 <!--@vars {
 "var store.frontend_name":"Store Name",
 "var store_email":"Store Email",
-"var store_phone":"Store Phone"
+"var store_phone":"Store Phone",
+"var customer.name":"Customer Name"
 } @-->
 {{template config_path="design/email/header_template"}}
 
diff --git a/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html b/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
index 173223ced9029..ed2af7ada669e 100644
--- a/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
+++ b/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
@@ -8,7 +8,8 @@
 <!--@vars {
 "var store.frontend_name":"Store Name",
 "var store_email":"Store Email",
-"var store_phone":"Store Phone"
+"var store_phone":"Store Phone",
+"var customer.name":"Customer Name"
 } @-->
 {{template config_path="design/email/header_template"}}
 
diff --git a/app/code/Magento/Customer/view/frontend/email/password_reset.html b/app/code/Magento/Customer/view/frontend/email/password_reset.html
index 23307978e158c..a6c54842a1573 100644
--- a/app/code/Magento/Customer/view/frontend/email/password_reset.html
+++ b/app/code/Magento/Customer/view/frontend/email/password_reset.html
@@ -9,7 +9,8 @@
 "var customer.name":"Customer Name",
 "var store.frontend_name":"Store Name",
 "var store_email":"Store Email",
-"var store_phone":"Store Phone"
+"var store_phone":"Store Phone",
+"var customer.name":"Customer Name"
 } @-->
 {{template config_path="design/email/header_template"}}
 

From 179f02caceffba1d53c9419d901674d3ad993cd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Sat, 4 Apr 2020 19:01:44 +0200
Subject: [PATCH 3/3] Revert changes to greeting, keep only changes regarding
 duplicated footer

---
 .../Magento/Customer/view/frontend/email/change_email.html | 7 ++++---
 .../view/frontend/email/change_email_and_password.html     | 7 ++++---
 .../Customer/view/frontend/email/password_reset.html       | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/email/change_email.html b/app/code/Magento/Customer/view/frontend/email/change_email.html
index 5341a2dc67ad5..f91f40078447b 100644
--- a/app/code/Magento/Customer/view/frontend/email/change_email.html
+++ b/app/code/Magento/Customer/view/frontend/email/change_email.html
@@ -8,12 +8,13 @@
 <!--@vars {
 "var store.frontend_name":"Store Name",
 "var store_email":"Store Email",
-"var store_phone":"Store Phone",
-"var customer.name":"Customer Name"
+"var store_phone":"Store Phone"
 } @-->
 {{template config_path="design/email/header_template"}}
 
-<p class="greeting">{{trans "%name," name=$customer.name}}</p>
+<p class="greeting">{{trans "Hello,"}}</p>
+<br>
+
 <p>
     {{trans "We have received a request to change the following information associated with your account at %store_name: email." store_name=$store.frontend_name}}
     {{trans 'If you have not authorized this action, please contact us immediately 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}}.
diff --git a/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html b/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
index ed2af7ada669e..f957cbe5b59a0 100644
--- a/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
+++ b/app/code/Magento/Customer/view/frontend/email/change_email_and_password.html
@@ -8,12 +8,13 @@
 <!--@vars {
 "var store.frontend_name":"Store Name",
 "var store_email":"Store Email",
-"var store_phone":"Store Phone",
-"var customer.name":"Customer Name"
+"var store_phone":"Store Phone"
 } @-->
 {{template config_path="design/email/header_template"}}
 
-<p class="greeting">{{trans "%name," name=$customer.name}}</p>
+<p class="greeting">{{trans "Hello,"}}</p>
+<br>
+
 <p>
     {{trans "We have received a request to change the following information associated with your account at %store_name: email, password." store_name=$store.frontend_name}}
     {{trans 'If you have not authorized this action, please contact us immediately 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}}.
diff --git a/app/code/Magento/Customer/view/frontend/email/password_reset.html b/app/code/Magento/Customer/view/frontend/email/password_reset.html
index a6c54842a1573..ce9cd02ba72ea 100644
--- a/app/code/Magento/Customer/view/frontend/email/password_reset.html
+++ b/app/code/Magento/Customer/view/frontend/email/password_reset.html
@@ -9,12 +9,13 @@
 "var customer.name":"Customer Name",
 "var store.frontend_name":"Store Name",
 "var store_email":"Store Email",
-"var store_phone":"Store Phone",
-"var customer.name":"Customer Name"
+"var store_phone":"Store Phone"
 } @-->
 {{template config_path="design/email/header_template"}}
 
-<p class="greeting">{{trans "%name," name=$customer.name}}</p>
+<p class="greeting">{{trans "Hello,"}}</p>
+<br>
+
 <p>
     {{trans "We have received a request to change the following information associated with your account at %store_name: password." store_name=$store.frontend_name}}
     {{trans 'If you have not authorized this action, please contact us immediately 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}}.