diff --git a/app/code/Magento/Customer/view/frontend/email/account_new.html b/app/code/Magento/Customer/view/frontend/email/account_new.html index 6ba6f05913900..a7ca7482ca8e6 100644 --- a/app/code/Magento/Customer/view/frontend/email/account_new.html +++ b/app/code/Magento/Customer/view/frontend/email/account_new.html @@ -19,7 +19,7 @@ {{trans 'To sign in to our site, use these credentials during checkout or on the My Account page:' - customer_url=$this.getUrl($store,'customer/account/') + customer_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
{{trans "When you sign in to your account, you will be able to:"}}
diff --git a/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html b/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html index 1d9ad963a4974..58e19abb33d5d 100644 --- a/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html +++ b/app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html @@ -23,7 +23,7 @@- {{trans "Confirm Your Account"}} + {{trans "Confirm Your Account"}} |
{{trans "When you sign in to your account, you will be able to:"}}
diff --git a/app/code/Magento/Customer/view/frontend/email/account_new_no_password.html b/app/code/Magento/Customer/view/frontend/email/account_new_no_password.html index 3c57eefa23e42..275c338b3757c 100644 --- a/app/code/Magento/Customer/view/frontend/email/account_new_no_password.html +++ b/app/code/Magento/Customer/view/frontend/email/account_new_no_password.html @@ -18,7 +18,7 @@ {{trans 'To sign in to our site and set a password, click on the link:' - create_password_url="$this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token]])" + create_password_url="$this.getUrl($store,'customer/account/createPassword/',[_query:[id:$customer.id,token:$customer.rp_token],_nosid:1])" |raw}}- {{trans "Set a New Password"}} + {{trans "Set a New Password"}} |
- {{trans "Set a New Password"}} + {{trans "Set a New Password"}} |
{{trans "%name," name=$order.getCustomerName()}}
{{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}} - {{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/') |raw}} + {{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}} {{trans 'If you have questions about your order, you can email us at %store_email' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at %store_phone' store_phone=$store_phone |raw}}{{/depend}}. {{depend store_hours}} {{trans 'Our hours are %store_hours.' store_hours=$store_hours |raw}} diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html index db9e4d8bbca0d..0d13a4b228772 100644 --- a/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html +++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_update.html @@ -27,7 +27,7 @@ order_status=$order.getStatusLabel() |raw}}
-{{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/') |raw}}
+{{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
{{trans 'If you have questions about your order, you can email us at %store_email' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at %store_phone' store_phone=$store_phone |raw}}{{/depend}}. {{depend store_hours}} diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_new.html b/app/code/Magento/Sales/view/frontend/email/invoice_new.html index b9a6e46413dad..4f714dfbd03b1 100644 --- a/app/code/Magento/Sales/view/frontend/email/invoice_new.html +++ b/app/code/Magento/Sales/view/frontend/email/invoice_new.html @@ -26,7 +26,7 @@
{{trans "%name," name=$order.getCustomerName()}}
{{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}} - {{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/') |raw}} + {{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}} {{trans 'If you have questions about your order, you can email us at %store_email' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at %store_phone' store_phone=$store_phone |raw}}{{/depend}}. {{depend store_hours}} {{trans 'Our hours are %store_hours.' store_hours=$store_hours |raw}} diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_update.html b/app/code/Magento/Sales/view/frontend/email/invoice_update.html index e0fe2f042fd65..137abc240c54d 100644 --- a/app/code/Magento/Sales/view/frontend/email/invoice_update.html +++ b/app/code/Magento/Sales/view/frontend/email/invoice_update.html @@ -27,7 +27,7 @@ order_status=$order.getStatusLabel() |raw}}
-{{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/') |raw}}
+{{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
{{trans 'If you have questions about your order, you can email us at %store_email' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at %store_phone' store_phone=$store_phone |raw}}{{/depend}}. {{depend store_hours}} diff --git a/app/code/Magento/Sales/view/frontend/email/order_new.html b/app/code/Magento/Sales/view/frontend/email/order_new.html index 53ffd6ebac8fc..8c7bbf3302938 100644 --- a/app/code/Magento/Sales/view/frontend/email/order_new.html +++ b/app/code/Magento/Sales/view/frontend/email/order_new.html @@ -24,7 +24,7 @@
{{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}} {{trans "Once your package ships we will send you a tracking number."}} - {{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/') |raw}} + {{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
{{trans 'If you have questions about your order, you can email us at %store_email' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at %store_phone' store_phone=$store_phone |raw}}{{/depend}}. diff --git a/app/code/Magento/Sales/view/frontend/email/order_update.html b/app/code/Magento/Sales/view/frontend/email/order_update.html index 3631a097c186b..669ad091407ea 100644 --- a/app/code/Magento/Sales/view/frontend/email/order_update.html +++ b/app/code/Magento/Sales/view/frontend/email/order_update.html @@ -26,7 +26,7 @@ order_status=$order.getStatusLabel() |raw}}
-{{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/') |raw}}
+{{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
{{trans 'If you have questions about your order, you can email us at %store_email' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at %store_phone' store_phone=$store_phone |raw}}{{/depend}}. {{depend store_hours}} diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new.html b/app/code/Magento/Sales/view/frontend/email/shipment_new.html index 0180e8837581b..ae0d64f78ca21 100644 --- a/app/code/Magento/Sales/view/frontend/email/shipment_new.html +++ b/app/code/Magento/Sales/view/frontend/email/shipment_new.html @@ -27,7 +27,7 @@
{{trans "%name," name=$order.getCustomerName()}}
{{trans "Thank you for your order from %store_name." store_name=$store.getFrontendName()}} - {{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/') |raw}} + {{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}} {{trans 'If you have questions about your order, you can email us at %store_email' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at %store_phone' store_phone=$store_phone |raw}}{{/depend}}. {{depend store_hours}} {{trans 'Our hours are %store_hours.' store_hours=$store_hours |raw}} diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_update.html b/app/code/Magento/Sales/view/frontend/email/shipment_update.html index 1da91315ab085..9c8df74f02634 100644 --- a/app/code/Magento/Sales/view/frontend/email/shipment_update.html +++ b/app/code/Magento/Sales/view/frontend/email/shipment_update.html @@ -27,7 +27,7 @@ order_status=$order.getStatusLabel() |raw}}
-{{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/') |raw}}
+{{trans 'You can check the status of your order by logging into your account.' account_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}
{{trans 'If you have questions about your order, you can email us at %store_email' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at %store_phone' store_phone=$store_phone |raw}}{{/depend}}. {{depend store_hours}} diff --git a/app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html b/app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html index f4baffcbd7e10..a50ef4e707b93 100644 --- a/app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html +++ b/app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html @@ -16,7 +16,7 @@ {{trans "If you requested this change, reset your password here:"}} -{{store url="admin/auth/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}} +{{store url="admin/auth/resetpassword/" _query_id=$user.id _query_token=$user.rp_token _nosid=1}} {{trans "If you did not make this request, you can ignore this email and your password will remain the same."}} diff --git a/app/design/frontend/Magento/luma/Magento_Customer/email/account_new.html b/app/design/frontend/Magento/luma/Magento_Customer/email/account_new.html index 6cfd2ea6a6bf0..c55e812ab7d4b 100644 --- a/app/design/frontend/Magento/luma/Magento_Customer/email/account_new.html +++ b/app/design/frontend/Magento/luma/Magento_Customer/email/account_new.html @@ -19,7 +19,7 @@ {{trans 'To sign in to our site, use these credentials during checkout or on the My Account page:' - customer_url=$this.getUrl($store,'customer/account/') + customer_url=$this.getUrl($store,'customer/account/',[_nosid:1]) |raw}}