From c6a50eb67ddaf4f13120d72ba93c99d005bd6ede Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Fri, 1 Dec 2023 19:07:27 +0530 Subject: [PATCH 1/5] Update confirmation.vue Back to Safelite button redirecting to environment content site. --- src/layouts/confirmation/confirmation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue index 51546a97e..32c36c161 100644 --- a/src/layouts/confirmation/confirmation.vue +++ b/src/layouts/confirmation/confirmation.vue @@ -300,7 +300,7 @@ export default { return serviceLocationReqs && scheduleReqs && customerReqs; }, forwardButtonAction() { - window.location.assign("//www.safelite.com/"); + window.location.assign(location.protocol + "//" + location.host); }, }, components: { From b4792236d8de27f0ae82329e0909afa603c8b216 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Fri, 1 Dec 2023 08:46:50 -0500 Subject: [PATCH 2/5] CSR-1857 | Exclude promos from lineItems sent to safelite-hop --- src/layouts/payment/payment.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue index 6de58dc3c..559a44ee2 100644 --- a/src/layouts/payment/payment.vue +++ b/src/layouts/payment/payment.vue @@ -532,7 +532,7 @@ export default { } cartItems.forEach((item) => { - if (item.name !== null) { + if (item.name !== null && item.category != "promos") { lineItems.push(`${item.name}|${(item.salesTax + item.subTotal).toFixed(2)}|1`); } }); From ad5014ac6f4fc1f2c6431bc4cf844288506bbb7e Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 1 Dec 2023 10:29:51 -0500 Subject: [PATCH 3/5] CSR-1819 remove unneeded accessibility spans. --- src/fmg-components/cart/cart.vue | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index d5ef09542..4e6aeb1da 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -16,8 +16,7 @@
- - {{ screenReaderPackagePriceText }} + {{ getFormattedAmount("", packagePrice) }}
@@ -64,39 +63,29 @@ {{ recycleFeeCartItem.name }} - {{ screenReaderRecycleFeeText }}{{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}{{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}
{{ subtotalText }}{{ screenReaderSubTotalText }}{{ getFormattedAmount("", subTotal) }}{{ getFormattedAmount("", subTotal) }}
{{ salesTaxText }}{{ screenReaderSalesTaxText }}{{ getFormattedAmount("", salesTax) }}{{ getFormattedAmount("", salesTax) }}
{{ amountPaidText }}{{ screenReaderAmountPaidText }}{{ getFormattedAmount("", amountPaid) }}{{ getFormattedAmount("", amountPaid) }}
{{ amountDueText }}{{ screenReaderTotalAmountDueText }}{{ getFormattedAmount("", amountDue) }}{{ getFormattedAmount("", amountDue) }}
@@ -136,6 +125,7 @@ export default { allowItemRemoval: Boolean, recyclingModalCmsWidgetName: String, showAsPaid: Boolean, + cmsWidgetName: String, }, data() { return { From 088060a354d5217bb83f9fc6d622760066c3d131 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 1 Dec 2023 10:31:30 -0500 Subject: [PATCH 4/5] Remove unneeded prop. --- src/fmg-components/cart/cart.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 4e6aeb1da..29ce7aca8 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -125,7 +125,6 @@ export default { allowItemRemoval: Boolean, recyclingModalCmsWidgetName: String, showAsPaid: Boolean, - cmsWidgetName: String, }, data() { return { From 2106738f5d9a7e3f3c9898bb7fbbb2bed0138f73 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 1 Dec 2023 13:30:32 -0500 Subject: [PATCH 5/5] Format code. --- src/fmg-components/cart/cart.vue | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 29ce7aca8..cd50a8fda 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -63,30 +63,25 @@ {{ recycleFeeCartItem.name }} - {{ getFormattedAmount(cartItem.category, cartItem.subTotal) }} + {{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}
{{ subtotalText }}{{ getFormattedAmount("", subTotal) }} + >{{ getFormattedAmount("", subTotal) }}
{{ salesTaxText }}{{ getFormattedAmount("", salesTax) }} + >{{ getFormattedAmount("", salesTax) }}
{{ amountPaidText }}{{ getFormattedAmount("", amountPaid) }} + >{{ getFormattedAmount("", amountPaid) }}
{{ amountDueText }}{{ getFormattedAmount("", amountDue) }} + >{{ getFormattedAmount("", amountDue) }}