From 28e6499bb85ca01f71e5e191299c942e17582732 Mon Sep 17 00:00:00 2001 From: Nicholas Graziano Date: Wed, 18 Jan 2017 10:22:59 -0800 Subject: [PATCH 1/3] Fixed the credit memo guest email so that the Order ID appears in the email --- .../Magento/Sales/view/frontend/email/creditmemo_new_guest.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html index c94d58b53234c..ef84173c86fe2 100644 --- a/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html +++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html @@ -34,7 +34,7 @@ -

{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_id=$creditmemo.increment_id order_id=$order.incrh1ent_id}}

+

{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_id=$creditmemo.increment_id order_id=$order.increment_id}}

From 470976d587b0c01939ceeac3ab2d81274fcb6d69 Mon Sep 17 00:00:00 2001 From: Nicholas Graziano Date: Wed, 18 Jan 2017 13:30:21 -0800 Subject: [PATCH 2/3] Fixed bug that caused Order ID to not populate in the Luma theme's credit memo email for guest --- .../Magento/luma/Magento_Sales/email/creditmemo_new_guest.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html index f2b00da60bb8f..d3e6ad730c1ec 100644 --- a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html +++ b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html @@ -33,7 +33,7 @@ -

{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_id=$creditmemo.increment_id order_id=$order.incrh1ent_id}}

+

{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_id=$creditmemo.increment_id order_id=$order.increment_id}}

From cb4033eb791642b68e821de4c5796c3a8d714f27 Mon Sep 17 00:00:00 2001 From: Nicholas Graziano Date: Thu, 19 Jan 2017 09:45:46 -0800 Subject: [PATCH 3/3] Trigger re test in Travis CI, previous test failed due to time out