From c83644090e60b854719ff6d98bff65137d892003 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 29 Nov 2023 06:50:27 -0500
Subject: [PATCH 1/5] Now calculating taxes on revalidated promos

---
 src/layouts/payment-method/payment-method.vue | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 6fa1b02a6..d7e8c465b 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -347,6 +347,7 @@ export default {
                 "payment-method",
                 false
             );
+
             // Handle error alerts here, success alerts are handled in the watcher
             if (revalidatePromoResponse.errors.length) {
                 getNewlyInactivatedPromos(
@@ -357,6 +358,24 @@ export default {
                     this.$refs.funnelHeader.pushGlobalAlert(errorAlert, errorAlert.shouldAutoFade);
                 });
             }
+
+            if (revalidatePromoResponse.promoLineItems.length > 0) {
+                await baseMixin.methods.dispatchStoreActionWithLogging(
+                    storeActions.TAX_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
+                    {
+                        billToAccountNumber: "87291",
+                        providerNumber: this.$store.getters.order.serviceLocation.provider.providerNumber,
+                        appointmentType: this.$store.getters.order.serviceLocation.appointmentType,
+                        serviceLocationCity: this.$store.getters.order.serviceLocation.city,
+                        serviceLocationState: this.$store.getters.order.serviceLocation.state,
+                        serviceLocationZipCode: this.$store.getters.order.serviceLocation.zipCode,
+                        pricedLineItems: revalidatePromoResponse.promoLineItems,
+                    },
+                    "payment-method",
+                    false
+                );
+            }
+
             this.lineItems.promos = revalidatePromoResponse.promoLineItems;
             this.inactivePromos = revalidatePromoResponse.errors.map((x) =>
                 getPromoCodeWithoutBundleIdentifier(x.promoCode)

From 021d7a063fd902c80d37ada4a685deb317e6fe5c Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 29 Nov 2023 06:53:18 -0500
Subject: [PATCH 2/5] Prettified

---
 src/layouts/payment-method/payment-method.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index b81ed9d5a..a480752e3 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -365,7 +365,8 @@ export default {
                     storeActions.TAX_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
                     {
                         billToAccountNumber: "87291",
-                        providerNumber: this.$store.getters.order.serviceLocation.provider.providerNumber,
+                        providerNumber:
+                            this.$store.getters.order.serviceLocation.provider.providerNumber,
                         appointmentType: this.$store.getters.order.serviceLocation.appointmentType,
                         serviceLocationCity: this.$store.getters.order.serviceLocation.city,
                         serviceLocationState: this.$store.getters.order.serviceLocation.state,

From e725baf852d34be95701181deb133d2aa02f9ce4 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 29 Nov 2023 08:04:31 -0500
Subject: [PATCH 3/5] CSR-1843: fix places where link causes scroll to top

---
 src/fmg-components/cart/cart.vue                          | 8 ++++----
 .../promo-modal-question/promo-modal-question.vue         | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 1180b3152..a373bb874 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -7,7 +7,7 @@
                 @click="toggleIsExpanded()">
                 <a
                     aria-label="expand cart"
-                    href="#!"
+                    href="javascript:void(0)"
                     class="col d-flex justify-content-between py-0">
                     <span class="label">{{ amountDueText }}</span>
                     <span class="label amount-due">{{ getFormattedAmount("", amountDue) }}</span>
@@ -30,7 +30,7 @@
                         ref="removeLink"
                         linkType="text"
                         :text="removeLinkText"
-                        href="#!"
+                        href="javascript:void(0)"
                         @click-event="removeItem(cartItem.cartItemType, cartItem.category)">
                         <template v-slot:after-text>
                             <span class="sr-only">{{ cartItem.name }}</span>
@@ -53,13 +53,13 @@
                         ref="removeLink"
                         linkType="text"
                         :text="removeLinkText"
-                        href="#!"
+                        href="javascript:void(0)"
                         @click-event="removeItem(cartItem.cartItemType, cartItem.category)" />
                     <textLink
                         v-else-if="cartItem == recycleFeeCartItem && recyclingModalCmsWidgetName"
                         linkType="text"
                         :text="recycleFeeCartItem.name"
-                        href="#!"
+                        href="javascript:void(0)"
                         @click-event="openModal(recyclingModalCmsWidgetName)" />
                     <span v-else-if="cartItem == recycleFeeCartItem">
                         {{ recycleFeeCartItem.name }}
diff --git a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
index e6ea27737..5ef5049a0 100644
--- a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
+++ b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
@@ -4,7 +4,7 @@
             id="promoLinkPromptId"
             linkType="text"
             :text="promoLinkText"
-            href="#!"
+            href="javascript:void(0)"
             @click-event="openModal" />
         <modal
             :ref="modalName"
@@ -57,7 +57,7 @@
                     ref="removeLink"
                     linkType="text"
                     :text="removeLinkText"
-                    href="#!"
+                    href="javascript:void(0)"
                     @click-event="removeItem(promoCode)" />
             </div>
         </modal>

From 178592d65e96380b379b41694e90c3424eb2746e Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 29 Nov 2023 09:19:17 -0500
Subject: [PATCH 4/5] CSR-1846 fix spacing for promos.

---
 .../promo-modal-question/promo-modal-question.vue     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
index e6ea27737..81b78b754 100644
--- a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
+++ b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
@@ -24,14 +24,14 @@
                 ref="alertInvalidPromo"
                 v-if="displayInvalidPromoAlert"
                 v-html="errorMessage"
-                class="my-4 alert"
+                class="mt-4 alert"
                 cmsWidgetName="AlertInvalidPromoWidget"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
             <alert
                 ref="AlertSimilarPromo"
                 v-if="displaySimilarPromoAlert"
-                class="my-4 alert"
+                class="mt-4 alert"
                 cmsWidgetName="AlertSimilarPromoWidget"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
@@ -39,7 +39,7 @@
                 ref="alertInvalidStackingPromo"
                 v-if="displayStackingPromoAlert"
                 v-html="errorMessage"
-                class="my-4 alert"
+                class="mt-4 alert"
                 cmsWidgetName="AlertStackingPromoWidget"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
@@ -47,11 +47,11 @@
                 ref="AlertInShopPromo"
                 v-if="displayInShopPromoAlert"
                 v-html="errorMessage"
-                class="my-4 alert"
+                class="mt-4 alert"
                 cmsWidgetName="AlertInshopPromoWidget"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
-            <div v-for="(promoCode, i) in this.getPromoCodeList()" :key="i">
+            <div class="mt-4" v-for="(promoCode, i) in this.getPromoCodeList()" :key="i">
                 <span class="applied-promo">Promo code "{{ promoCode }}" applied </span>
                 <textLink
                     ref="removeLink"
@@ -337,5 +337,6 @@ export default {
     font-size: 14px;
     font-weight: 500;
     line-height: 24px;
+
 }
 </style>

From 7cd4d190991141d9e740fe85bbfad56919480741 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 29 Nov 2023 09:25:57 -0500
Subject: [PATCH 5/5] Format code.

---
 .../payment-method/promo-modal-question/promo-modal-question.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
index 81b78b754..afdf4ba14 100644
--- a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
+++ b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
@@ -337,6 +337,5 @@ export default {
     font-size: 14px;
     font-weight: 500;
     line-height: 24px;
-
 }
 </style>