From 794150b33de825dc2b648965b7a20388b4bf6b4a Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 7 Nov 2023 11:22:51 -0500
Subject: [PATCH 01/35] Revamp of non-packaged cart-items to display all of
 them in the loop instead of making separate cart item markup for fees etc

---
 src/fmg-components/cart/cart.vue              | 116 ++++++++----------
 src/layouts/payment-method/payment-method.vue |   1 -
 2 files changed, 54 insertions(+), 63 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index a6290e46c..d05c8816e 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -18,10 +18,7 @@
                 </div>
 
                 <!-- Packaged Cart Items -->
-                <div
-                    v-for="(cartItem, i) in packageCartItems"
-                    :key="i"
-                    :class="[this.packageCartItems ? 'vaps' : '']">
+                <div v-for="(cartItem, i) in packageCartItems" :key="i" class="packaged-cart-item">
                     <span>{{ cartItem.name }}</span>
                     <textLink
                         v-if="allowItemRemoval"
@@ -33,55 +30,30 @@
                 </div>
 
                 <!-- Nonpackaged Cart Items -->
-                <hr style="background: red" />
                 <div
-                    class="premium-appt-cart-item"
                     v-for="(cartItem, i) in nonpackageCartItems"
-                    :key="i">
-                    <span>{{ cartItem.name }}</span>
+                    :key="i"
+                    class="non-packaged-cart-item"
+                    :class="[
+                        i % 2 == 0 ? 'even' : 'odd',
+                        cartItem.isRemovable ? 'removable-cart-item' : '',
+                    ]">
+                    <span v-if="cartItem != recycleFeeCartItem">{{ cartItem.name }}</span>
                     <textLink
-                        v-if="allowItemRemoval"
+                        v-if="allowItemRemoval && cartItem.isRemovable"
                         ref="removeLink"
                         linkType="text"
                         :text="removeLinkText"
                         href="#!"
                         @click-event="removeItem(cartItem.cartItemType, cartItem.category)" />
-                    <span>{{ currencyFormatter.format(cartItem.subTotal) }}</span>
-                </div>
-
-                <!-- Fees -->
-                <div v-if="recycleFeeCartItem">
                     <textLink
+                        v-else-if="cartItem == recycleFeeCartItem"
                         linkType="text"
                         :text="recycleFeeCartItem.name"
                         href="#!"
                         @click-event="openModal(recyclingModalCmsWidgetName)" />
-                    <span>{{ currencyFormatter.format(recycleFeeCartItem.subTotal) }}</span>
+                    <span>{{ currencyFormatter.format(cartItem.subTotal) }}</span>
                 </div>
-                <div v-if="mobileFeeCartItem">
-                    <span>{{ mobileFeeCartItem.name }}</span
-                    ><span>{{ currencyFormatter.format(mobileFeeCartItem.subTotal) }}</span>
-                </div>
-
-                <div v-if="premiumAppointmentDiscountCartItem" class="premium-appt-cart-item">
-                    <span>{{ premiumAppointmentDiscountCartItem.name }}</span>
-                    <textLink
-                        v-if="allowItemRemoval"
-                        ref="removeLink"
-                        linkType="text"
-                        :text="removeLinkText"
-                        href="#!"
-                        @click-event="
-                            removeItem(
-                                premiumAppointmentDiscountCartItem.cartItemType,
-                                'supportingItems'
-                            )
-                        " />
-                    <span>{{
-                        currencyFormatter.format(premiumAppointmentDiscountCartItem.subTotal)
-                    }}</span>
-                </div>
-                <!-- promos here -->
 
                 <!-- Sub total, sales tax, total columns -->
                 <div class="sub-total">
@@ -336,13 +308,13 @@ export default {
             const nonpackageCartItems = [];
 
             this.cartItems.forEach((cartItem) => {
-                if (
-                    cartItem == this.recycleFeeCartItem ||
-                    cartItem == this.mobileFeeCartItem ||
-                    cartItem == this.premiumAppointmentDiscountCartItem
-                ) {
-                    return;
-                }
+                // if (
+                //     cartItem == this.recycleFeeCartItem ||
+                //     cartItem == this.mobileFeeCartItem ||
+                //     cartItem == this.premiumAppointmentDiscountCartItem
+                // ) {
+                //     return;
+                // }
 
                 if (!this.packageCartItems.find((packageCartItem) => packageCartItem == cartItem)) {
                     if (cartItem.isDisplayed) {
@@ -441,6 +413,7 @@ export default {
                     category: cartItemCategories.VAPS,
                     cartItemType: cartItemTypes.RAIN_DEFENSE,
                     isDisplayed: true,
+                    isRemovable: true,
                     subTotal: 0,
                     salesTax: 0,
                     lineItems: [],
@@ -469,6 +442,7 @@ export default {
                         category: cartItemCategories.GLASS_PARTS,
                         cartItemType: cartItemTypes.GLASS_PARTS,
                         isDisplayed: false,
+                        isRemovable: false,
                         subTotal:
                             (lineItem.kitPrice ?? 0) +
                             (lineItem.laborAmount ?? 0) +
@@ -511,6 +485,7 @@ export default {
                     category: cartItemCategories.SUPPORTING_ITEMS,
                     cartItemType: cartItemTypes.RECYCLE_FEE,
                     isDisplayed: true,
+                    isRemovable: false,
                     subTotal: 0,
                     salesTax: 0,
                     lineItems: [],
@@ -545,6 +520,7 @@ export default {
                     category: cartItemCategories.SUPPORTING_ITEMS,
                     cartItemType: cartItemTypes.MOBILE_FEE,
                     isDisplayed: true,
+                    isRemovable: false,
                     subTotal: 0,
                     salesTax: 0,
                     lineItems: [],
@@ -579,6 +555,7 @@ export default {
                     category: cartItemCategories.SUPPORTING_ITEMS,
                     cartItemType: cartItemTypes.SUPPORTING_ITEMS,
                     isDisplayed: false,
+                    isRemovable: false,
                     subTotal: 0,
                     salesTax: 0,
                     lineItems: [],
@@ -714,9 +691,9 @@ export default {
             display: flex;
             justify-content: space-between;
             padding: 0.5rem 1.5rem;
-            &:nth-child(odd) {
-                background-color: #f5f5f5;
-            }
+            // &:nth-child(odd) {
+            //     background-color: #f5f5f5;
+            // }
             &:nth-last-child(-n + 3) {
                 background-color: #e3f2ea;
             }
@@ -725,7 +702,12 @@ export default {
                 color: #ffffff;
             }
         }
-        .vaps {
+        .service-type {
+            background-color: #f5f5f5;
+            //padding-left: 2.5rem;
+            align-items: center;
+        }
+        .packaged-cart-item {
             background-color: #f5f5f5;
             padding-left: 2.5rem;
             align-items: center;
@@ -743,6 +725,28 @@ export default {
                 font-size: 0.875rem;
             }
         }
+        .non-packaged-cart-item {
+            &.odd {
+                background: var(--neutrals-gray-100, #f4f4f4);
+            }
+        }
+        .non-packaged-cart-item {
+            &.even {
+                background-color: var(--neutrals-white, #fff);
+            }
+        }
+        // Custom order/wrap for removable nonpackaged Cart Items
+        .removable-cart-item {
+            flex-wrap: wrap;
+            span {
+                display: flex;
+                justify-content: space-between;
+            }
+            a {
+                order: 3;
+                margin-right: 100%;
+            }
+        }
         .package-type,
         .service-type {
             //background-color: #f5f5f5;
@@ -764,18 +768,6 @@ export default {
                 padding: 0;
             }
         }
-        // Custom order/wrap for nonpackaged Cart Items
-        .premium-appt-cart-item {
-            flex-wrap: wrap;
-            span {
-                display: flex;
-                justify-content: space-between;
-            }
-            a {
-                order: 3;
-                margin-right: 100%;
-            }
-        }
     }
     .vin-toggle {
         &:after {
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 8a5f3a21d..d0d83c498 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -27,7 +27,6 @@
                         :allowItemRemoval="true"
                         v-model="lineItems"
                         servicePackageOptionsCmsName="ServicePackageTitle"
-                        @cart-remove="cartRemove"
                         recyclingModalCmsWidgetName="RecycleModal" />
 
                     <hr />

From ccbb9b18efc4d277e5efa7f4b179265cd9fb4cf6 Mon Sep 17 00:00:00 2001
From: hiteshkumar87 <hitesh.kumar@safelite.com>
Date: Wed, 8 Nov 2023 16:38:18 +0530
Subject: [PATCH 02/35] Appointment EndTime

Appointment end time for Inshop and Dropoff Schedules
---
 src/layouts/confirmation/confirmation.vue     | 6 +++++-
 src/layouts/payment-method/payment-method.vue | 2 +-
 src/layouts/payment/payment.vue               | 2 +-
 src/layouts/review/review.vue                 | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 177e0ff93..1cd2fa4fb 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -238,7 +238,11 @@ export default {
             const schedule = store.getters.order.schedule;
             const scheduleReqs = !!(schedule.date && schedule.startTime && schedule.endTime);
 
-            return serviceLocationReqs && scheduleReqs;
+            // Customer
+            const customer = store.getters.order.customer;
+            const customerReqs = !!customer.emailAddress;
+
+            return serviceLocationReqs && scheduleReqs && customerReqs;
         },
         forwardButtonAction() {
             window.location.assign("//www.safelite.com/");
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 867dbb3fd..9f9df5f52 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -266,7 +266,7 @@ export default {
             const scheduleReqs = !!(
                 schedule.date &&
                 schedule.startTime &&
-                (!isMobile || schedule.endTime) &&
+                schedule.endTime &&
                 schedule.jobMaxMinutes &&
                 schedule.jobMinMinutes
             );
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index 6cae579ce..a6340b5db 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -312,7 +312,7 @@ export default {
             const scheduleReqs = !!(
                 schedule.date &&
                 schedule.startTime &&
-                (!isMobile || schedule.endTime) &&
+                schedule.endTime &&
                 schedule.jobMaxMinutes &&
                 schedule.jobMinMinutes
             );
diff --git a/src/layouts/review/review.vue b/src/layouts/review/review.vue
index 0011e79f7..d6ad0aa82 100644
--- a/src/layouts/review/review.vue
+++ b/src/layouts/review/review.vue
@@ -207,7 +207,7 @@ export default {
             const scheduleReqs = !!(
                 schedule.date &&
                 schedule.startTime &&
-                (!isMobile || schedule.endTime) &&
+                schedule.endTime &&
                 schedule.jobMaxMinutes &&
                 schedule.jobMinMinutes
             );

From f345973d7793043e5cbc21e0b8b32d33209b33ef Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 8 Nov 2023 07:20:01 -0500
Subject: [PATCH 03/35] Tech review changes

---
 src/fmg-components/cart/cart.vue | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index d05c8816e..a8ddb99a5 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -3,15 +3,15 @@
         <div class="px-0">
             <div
                 class="row vin-toggle flex align-items-center"
-                :class="[isActive ? 'active' : '']"
-                @click="toggleClass()">
+                :class="[isExpanded ? 'expanded' : '']"
+                @click="toggleIsExpanded()">
                 <div class="col d-flex justify-content-between">
                     <span class="label">{{ amountDueText }}</span
                     ><span class="label amount-due">{{ currencyFormatter.format(amountDue) }}</span>
                 </div>
             </div>
             <div class="price-table">
-                <div class="service-type" :class="{ packageWithVAPS: packageWithVAPS }">
+                <div class="service-type">
                     <textBlock :cmsWidgetName="servicePackageTitleWidget" /><span>{{
                         currencyFormatter.format(packagePrice)
                     }}</span>
@@ -106,8 +106,7 @@ export default {
     },
     data() {
         return {
-            isActive: false,
-            packageWithVAPS: false,
+            isExpanded: false,
             currencyFormatter: new Intl.NumberFormat("en-US", {
                 style: "currency",
                 currency: "USD",
@@ -119,8 +118,8 @@ export default {
         openModal(modalName) {
             this.$refs[modalName].openModal();
         },
-        toggleClass: function (event) {
-            this.isActive = !this.isActive;
+        toggleIsExpanded() {
+            this.isExpanded = !this.isExpanded;
         },
         getVapsPrice(packageName) {
             const vapsItems = this.getVapsCartItemsForSelectedPackage(packageName);
@@ -308,14 +307,6 @@ export default {
             const nonpackageCartItems = [];
 
             this.cartItems.forEach((cartItem) => {
-                // if (
-                //     cartItem == this.recycleFeeCartItem ||
-                //     cartItem == this.mobileFeeCartItem ||
-                //     cartItem == this.premiumAppointmentDiscountCartItem
-                // ) {
-                //     return;
-                // }
-
                 if (!this.packageCartItems.find((packageCartItem) => packageCartItem == cartItem)) {
                     if (cartItem.isDisplayed) {
                         nonpackageCartItems.push(cartItem);
@@ -476,7 +467,7 @@ export default {
             let cartItem = null;
 
             const recycleFeeLineItem = this.supportingItems.find(
-                (supportingItem) => supportingItem.partNumber == partTypeStrings.RECYCLE_FEE
+                (supportingItem) => supportingItem.partType == partTypeStrings.RECYCLE_FEE
             );
 
             if (recycleFeeLineItem) {
@@ -784,10 +775,10 @@ export default {
             margin: 1rem 0 1rem 1rem;
             cursor: pointer;
         }
-        &.active:after {
+        &.expanded:after {
             transform: rotate(180deg);
         }
-        &.active + .price-table {
+        &.expanded + .price-table {
             max-height: 650px;
             transition: all 350ms ease-in;
             overflow: hidden;

From 1f602079838d246fbb48961f09fcade73ab67fe2 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 8 Nov 2023 10:20:11 -0500
Subject: [PATCH 04/35] CSR-1391 update window height and styles for Afterpay.

---
 public/css/site-2020Styling.css   | 15 +++++++++++++++
 public/scss/site-2020Styling.scss | 19 +++++++++++++++++++
 src/layouts/payment/payment.vue   |  2 +-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/public/css/site-2020Styling.css b/public/css/site-2020Styling.css
index d42d3a81d..beb4c3ec5 100644
--- a/public/css/site-2020Styling.css
+++ b/public/css/site-2020Styling.css
@@ -87,6 +87,21 @@
   display: none;
 }
 
+#afterpay__iframe-checkout-container {
+  width: 100%;
+}
+#afterpay__iframe-checkout-container .style_closeWrapper__lIHJe {
+  display: none;
+}
+
+.buy-container-closer {
+  display: none;
+}
+
+.buy-backdrop {
+  background-color: rgba(0, 0, 0, 0.3) !important;
+}
+
 @keyframes rotate {
   0% {
     transform: rotate(0);
diff --git a/public/scss/site-2020Styling.scss b/public/scss/site-2020Styling.scss
index fd716f6ee..395eebcb2 100644
--- a/public/scss/site-2020Styling.scss
+++ b/public/scss/site-2020Styling.scss
@@ -90,6 +90,25 @@
     }
 }
 
+// AfterPay Styles
+
+#afterpay__iframe-checkout-container {
+    width: 100%;
+    .style_closeWrapper__lIHJe {
+        display: none;
+    }
+}
+
+.buy-container-closer {
+    display: none;
+}
+
+.buy-backdrop {
+    background-color: rgba(0,0,0,.3)!important;
+}
+
+// Modal Spinner
+
 @keyframes rotate {
     0% {  transform: rotate(0)}
     100% { transform: rotate(360deg)}
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index a6340b5db..513a9318e 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -474,7 +474,7 @@ export default {
 <style lang="scss">
 .hop-iframe {
     position: relative;
-    min-height: 1120px;
+    min-height: 650px;
     width: 100%;
     border: 0 none;
 }

From b7f8dd48460892b4a1ad5eb7784fa93f39b83162 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 8 Nov 2023 10:25:28 -0500
Subject: [PATCH 05/35] Code cleanup.

---
 public/css/site-2020Styling.css   | 11 +++++------
 public/scss/site-2020Styling.scss | 15 +++++++--------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/public/css/site-2020Styling.css b/public/css/site-2020Styling.css
index beb4c3ec5..07d331589 100644
--- a/public/css/site-2020Styling.css
+++ b/public/css/site-2020Styling.css
@@ -87,10 +87,13 @@
   display: none;
 }
 
-#afterpay__iframe-checkout-container {
+.buy-backdrop {
+  background-color: rgba(0, 0, 0, 0.3) !important;
+}
+.buy-backdrop #afterpay__iframe-checkout-container {
   width: 100%;
 }
-#afterpay__iframe-checkout-container .style_closeWrapper__lIHJe {
+.buy-backdrop #afterpay__iframe-checkout-container .style_closeWrapper__lIHJe {
   display: none;
 }
 
@@ -98,10 +101,6 @@
   display: none;
 }
 
-.buy-backdrop {
-  background-color: rgba(0, 0, 0, 0.3) !important;
-}
-
 @keyframes rotate {
   0% {
     transform: rotate(0);
diff --git a/public/scss/site-2020Styling.scss b/public/scss/site-2020Styling.scss
index 395eebcb2..3cd0839bc 100644
--- a/public/scss/site-2020Styling.scss
+++ b/public/scss/site-2020Styling.scss
@@ -92,10 +92,13 @@
 
 // AfterPay Styles
 
-#afterpay__iframe-checkout-container {
-    width: 100%;
-    .style_closeWrapper__lIHJe {
-        display: none;
+.buy-backdrop {
+    background-color: rgba(0,0,0,.3)!important;
+    #afterpay__iframe-checkout-container {
+        width: 100%;
+        .style_closeWrapper__lIHJe {
+            display: none;
+        }
     }
 }
 
@@ -103,10 +106,6 @@
     display: none;
 }
 
-.buy-backdrop {
-    background-color: rgba(0,0,0,.3)!important;
-}
-
 // Modal Spinner
 
 @keyframes rotate {

From 854885b6d92c43ac786efe9a5a80a2c4780fdf22 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 8 Nov 2023 14:03:48 -0500
Subject: [PATCH 06/35] Tie vehicle banner to submitted order on confirmation

---
 src/layouts/confirmation/confirmation.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 1cd2fa4fb..94a7054e7 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -14,6 +14,7 @@
                                 <div>
                                     <vehicleBanner
                                         cmsWidgetName="VehicleBannerWidget"
+                                        :displayVehicleImage="vehicleBannerImageUrl"
                                         :displayGenericVehicleImage="false" />
                                 </div>
                                 <div class="scheduleText">
@@ -205,6 +206,9 @@ export default {
                 return `at ${get12HourTimeFormat(this.ScheduleStartTime)}`;
             }
         },
+        vehicleBannerImageUrl() {
+            return store.getters.submittedOrder?.vehicle.imageUrl;
+        },
     },
     methods: {
         arePagePrerequisitesValid() {

From 68c89b97d8f3743f32aaf641a6a9a5b110a01054 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Wed, 8 Nov 2023 14:52:36 -0500
Subject: [PATCH 07/35] CSR-1391 add cart to payment page

---
 src/layouts/payment/payment.vue | 116 +++++++++++++++++++++++++++++++-
 1 file changed, 115 insertions(+), 1 deletion(-)

diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index 6cae579ce..7c6d3ba73 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -21,6 +21,19 @@
                             scrolling="no">
                         </iframe>
                     </div>
+
+                    <hr />
+
+                    <cart
+                        :damage="damageInfo"
+                        :availableLineItems="availableLineItems"
+                        :allowItemRemoval="false"
+                        v-model="lineItems"
+                        servicePackageOptionsCmsName="ServicePackageTitle"
+                        recyclingModalCmsWidgetName="RecycleModal" />
+
+                    <hr />
+
                     <paymentSwitch
                         cmsWidgetName="PaymentMethodWidget"
                         :paymentType="paymentType"
@@ -163,7 +176,7 @@
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
-
+import cart from "@/fmg-components/cart/cart";
 import paymentSwitch from "./payment-switch/payment-switch.vue";
 
 import { storeActions } from "@/constants/store-actions";
@@ -175,6 +188,13 @@ import { applicationConfig } from "@/constants/application-config";
 import { paymentMethods } from "@/constants/payment-method-constants";
 import { AppointmentTypeStrings } from "@/constants/schedule-constants";
 import baseMixin from "@/mixins/base-mixin.js";
+import { mapTaxedAvailableLineItemsToStoreFormat } from "../../store";
+import {
+    revalidatePromosAndValidateNewPromo,
+    getAddableVapsFromAvailableLineItems,
+} from "@/helpers/promotions-helper";
+import { queryStrings } from "@/constants/query-strings";
+import { getQuerystringParameter } from "@/helpers/querystring-helper";
 
 import iframeResize from "../../../node_modules/iframe-resizer/js/iframeResizer.js";
 
@@ -207,6 +227,8 @@ export default {
             displayAmount: this.getDisplayAmountDue(),
             piaLineItems: this.getPiaLineItems(),
             paypalPayment: this.isPaypal(),
+            lineItems: [],
+            availableLineItems: [],
         };
     },
     directives: {
@@ -231,6 +253,24 @@ export default {
             "payment"
         );
 
+        const wipersPromise = baseMixin.methods.dispatchStoreActionWithLogging(
+            storeActions.GET_WIPERS,
+            null,
+            "payment"
+        );
+
+        const rainDefensePromise = baseMixin.methods.dispatchStoreActionWithLogging(
+            storeActions.GET_RAIN_DEFENSE,
+            null,
+            "payment"
+        );
+
+        const supportingItemsPromise = baseMixin.methods.dispatchStoreActionWithLogging(
+            storeActions.GET_SUPPORTING_ITEMS,
+            null,
+            "payment"
+        );
+
         // TODO: Data fetching Promise declarations
 
         const promiseResultMap = [
@@ -242,14 +282,84 @@ export default {
                 resultKey: "signature",
                 promise: signaturePromise,
             },
+            {
+                resultKey: "wipers",
+                promise: wipersPromise,
+            },
+            {
+                resultKey: "rainDefense",
+                promise: rainDefensePromise,
+            },
+            {
+                resultKey: "supportingItems",
+                promise: supportingItemsPromise,
+            },
         ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
 
+        const glassParts = store.getters.order.lineItems.glassParts ?? [];
+
+        let availableLineItems = [
+            resultMap.rainDefense,
+            ...resultMap.supportingItems,
+            ...resultMap.wipers,
+            ...glassParts,
+        ];
+
+        const lineItemsFromStore = store.getters.order.lineItems;
+
+        await baseMixin.methods.dispatchStoreActionWithLogging(
+            storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
+            {
+                availableLineItems: availableLineItems,
+            },
+            "payment",
+            false
+        );
+
+        // Promo logic
+        const promoCodeFromQueryString = getQuerystringParameter(queryStrings.PROMO);
+
+        const { validatePromoResponse, revalidatePromoResponse } =
+            await revalidatePromosAndValidateNewPromo(
+                promoCodeFromQueryString,
+                availableLineItems,
+                "payment-method"
+            );
+
+        availableLineItems.push(...(validatePromoResponse?.orderPromos ?? []));
+        // End of promo logic
+
+        const taxedAvailableLineItems = await baseMixin.methods.dispatchStoreActionWithLogging(
+            storeActions.TAX_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
+            {
+                billToAccountNumber: "87291",
+                providerNumber: store.getters.order.serviceLocation.provider.providerNumber,
+                appointmentType: store.getters.order.serviceLocation.appointmentType,
+                serviceLocationCity: store.getters.order.serviceLocation.city,
+                serviceLocationState: store.getters.order.serviceLocation.state,
+                serviceLocationZipCode: store.getters.order.serviceLocation.zipCode,
+                pricedAvailableLineItems: availableLineItems,
+            },
+            "payment-method",
+            false
+        );
+
+        // Match all available line items to the line items as they are in the store
+        // and rebuild the original structure.
+        const lineItems = mapTaxedAvailableLineItemsToStoreFormat(
+            availableLineItems,
+            lineItemsFromStore
+        );
+
         // Call the "next" function to complete the transition to this page.
         next(async (vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.fetchSignatureInfo(resultMap.signature);
+
+            vm.availableLineItems = taxedAvailableLineItems;
+            vm.lineItems = lineItems;
         });
     },
     computed: {
@@ -276,6 +386,9 @@ export default {
         switchPaymentText() {
             return this.getCmsContent("PaymentMethodWidget", "QuestionText");
         },
+        damageInfo() {
+            return this.$store.getters.damage;
+        },
     },
     methods: {
         arePagePrerequisitesValid() {
@@ -466,6 +579,7 @@ export default {
         funnelHeader,
         navbar,
         loadingModal,
+        cart,
         paymentSwitch,
     },
 };

From cae80fa8137ca13dbab32ffe47efb1d4c3f6020e Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 8 Nov 2023 15:04:26 -0500
Subject: [PATCH 08/35] Also check for "PIA Required"

---
 src/layouts/payment-method/payment-method.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 9f9df5f52..6946b4168 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -409,10 +409,11 @@ export default {
             }
         },
         isPiaDisabled() {
-            const piaExperience =
-                this.getSettingValue(experimentSettings.PIA_EXPERIENCE) === "PIA Optional";
+            const piaExperience = this.getSettingValue(experimentSettings.PIA_EXPERIENCE);
 
-            return !piaExperience;
+            const isEnabled = piaExperience === "PIA Optional" || piaExperience === "PIA Required";
+
+            return !isEnabled;
         },
         paymentMethod() {
             if (this.isPiaDisabled) {

From d5a748cacd4d668e52a05be53e73433f3eac7225 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 8 Nov 2023 15:55:08 -0500
Subject: [PATCH 09/35] Update ctu when updating zip on service-location

---
 src/layouts/service-location/service-location.vue               | 2 ++
 .../service-zip-modal-question/service-zip-modal-question.vue   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index a2aa0813b..f8efc8c25 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -245,6 +245,7 @@ export default {
                 return {
                     state: this.state,
                     zipCode: this.zipCode,
+                    zipCodeCtu: this.zipCodeCtu,
                 };
             },
             set: function (newValue) {
@@ -256,6 +257,7 @@ export default {
 
                 this.state = newValue.state;
                 this.zipCode = newValue.zipCode;
+                this.zipCodeCtu = newValue.zipCodeCtu;
 
                 this.$nextTick();
             },
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 35276228d..ea6f07818 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -141,6 +141,7 @@ export default {
                     this.resetModalButtonStyle();
                 } else {
                     this.internalModel.state = zipCodeData.state;
+                    this.internalModel.zipCodeCtu = zipCodeData.zipCodeCtu;
 
                     // retrieve mobile fee part
                     const serviceZipCode = this.internalModel.zipCode;

From a56abad9627e0a8479b0a4dc292d39941dd558d0 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 8 Nov 2023 15:55:19 -0500
Subject: [PATCH 10/35] Unit test changes

---
 src/layouts/service-location/service-location.spec.js    | 6 ++++++
 .../service-zip-modal-question.spec.js                   | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 55ca775c4..eea946b89 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -286,6 +286,7 @@ describe("service-location.vue", () => {
             const newServiceZipCodeQuestion = {
                 zipCode: "61606",
                 state: "IL",
+                zipCodeCtu: "01526",
             };
 
             const serviceZipCodeComponent = wrapper.findComponent({
@@ -316,6 +317,7 @@ describe("service-location.vue", () => {
             const newServiceZipCodeQuestion = {
                 zipCode: "61606",
                 state: "IL",
+                zipCodeCtu: "01526",
             };
 
             const mobileLocationQuestions = {
@@ -365,6 +367,7 @@ describe("service-location.vue", () => {
             const newServiceZipCodeQuestion = {
                 zipCode: "61606",
                 state: "IL",
+                zipCodeCtu: "01526",
             };
 
             wrapper.vm.selectedAppointmentType = "Inshop";
@@ -395,6 +398,7 @@ describe("service-location.vue", () => {
             const newServiceZipCodeQuestion = {
                 zipCode: "45433",
                 state: "OH",
+                zipCodeCtu: "01526",
             };
 
             // Act
@@ -511,11 +515,13 @@ describe("service-location.vue", () => {
             wrapper.vm.serviceZipCodeQuestion = {
                 zipCode: "61606",
                 state: "IL",
+                zipCodeCtu: "01526",
             };
 
             const newServiceZipCodeInfo = {
                 state: "OH",
                 zipCode: "43081",
+                zipCodeCtu: "01526",
             };
 
             // Act
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
index c1ebd65af..7c09836fe 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -113,6 +113,7 @@ describe("service-zip-modal-question.vue", () => {
         let serviceZipCodeQuestion = {
             state: "",
             zipCode: "",
+            zipCodeCtu: "",
         };
 
         // Arrange
@@ -135,6 +136,7 @@ describe("service-zip-modal-question.vue", () => {
         let serviceZipCodeQuestion = {
             state: "OH",
             zipCode: "43235",
+            zipCodeCtu: "01820",
         };
 
         const wrapper = mount(serviceZipModalQuestion, {
@@ -156,6 +158,7 @@ describe("service-zip-modal-question.vue", () => {
         let serviceZipCodeQuestion = {
             state: "IL",
             zipCode: "61606",
+            zipCodeCtu: "01526",
         };
 
         const zip = "43235";
@@ -176,7 +179,7 @@ describe("service-zip-modal-question.vue", () => {
 
         await wrapper.vm.setZipCode();
 
-        let expectedEmit = [[{ state: "OH", zipCode: "43235" }]];
+        let expectedEmit = [[{ state: "OH", zipCode: "43235", zipCodeCtu: "01820" }]];
 
         // Assert
         expect(wrapper.emitted("update:modelValue")).toEqual(expectedEmit);
@@ -187,6 +190,7 @@ describe("service-zip-modal-question.vue", () => {
         let serviceZipCodeQuestion = {
             state: "IL",
             zipCode: "61606",
+            zipCodeCtu: "01526",
         };
 
         const zip = "";
@@ -214,6 +218,7 @@ describe("service-zip-modal-question.vue", () => {
         let serviceZipCodeQuestion = {
             state: "IL",
             zipCode: "61606",
+            zipCodeCtu: "01526",
         };
 
         const zip = "11111";
@@ -241,6 +246,7 @@ describe("service-zip-modal-question.vue", () => {
         let serviceZipCodeQuestion = {
             state: "IL",
             zipCode: "61606",
+            zipCodeCtu: "01526",
         };
 
         const zip = "";
@@ -269,6 +275,7 @@ describe("service-zip-modal-question.vue", () => {
         let serviceZipCodeQuestion = {
             state: "IL",
             zipCode: "61606",
+            zipCodeCtu: "01526",
         };
 
         const zip = "123";

From afb2cbae739386bac3bf446411a53e7117f91846 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 8 Nov 2023 16:31:25 -0500
Subject: [PATCH 11/35] CSR-1384: refactor updates from tech review

---
 src/fmg-components/cart/cart.spec.js          | 28 +++++-----
 src/fmg-components/cart/cart.vue              | 12 ++++-
 .../add-vaps-modal-buttons.vue                |  8 +--
 src/layouts/payment-method/payment-method.vue | 54 ++++++++-----------
 src/store/index.js                            | 13 ++---
 5 files changed, 55 insertions(+), 60 deletions(-)

diff --git a/src/fmg-components/cart/cart.spec.js b/src/fmg-components/cart/cart.spec.js
index ae84083e6..bd0a2b096 100644
--- a/src/fmg-components/cart/cart.spec.js
+++ b/src/fmg-components/cart/cart.spec.js
@@ -37,13 +37,13 @@ describe("cart.vue", () => {
                 promos: [],
             };
 
-            const availableLineItems = [];
+            const availableVaps = [];
 
             // Act
             const { wrapper } = setupMocks({
                 props: {
                     modelValue: lineItems,
-                    availableLineItems: availableLineItems,
+                    availableVaps: availableVaps,
                 },
             });
 
@@ -89,13 +89,13 @@ describe("cart.vue", () => {
                 promos: [],
             };
 
-            const availableLineItems = [];
+            const availableVaps = [];
 
             // Act
             const { wrapper } = setupMocks({
                 props: {
                     modelValue: lineItems,
-                    availableLineItems: availableLineItems,
+                    availableVaps: availableVaps,
                 },
             });
 
@@ -132,13 +132,13 @@ describe("cart.vue", () => {
                 promos: [],
             };
 
-            const availableLineItems = [];
+            const availableVaps = [];
 
             // Act
             const { wrapper } = setupMocks({
                 props: {
                     modelValue: lineItems,
-                    availableLineItems: availableLineItems,
+                    availableVaps: availableVaps,
                 },
             });
 
@@ -189,13 +189,13 @@ describe("cart.vue", () => {
         //         promos: [],
         //     };
 
-        //     const availableLineItems = [];
+        //     const availableVaps = [];
 
         //     // Act
         //     const { wrapper } = setupMocks({
         //         props: {
         //             modelValue: lineItems,
-        //             availableLineItems: availableLineItems,
+        //             availableVaps: availableVaps,
         //         },
         //     });
 
@@ -234,13 +234,13 @@ describe("cart.vue", () => {
                 promos: [],
             };
 
-            const availableLineItems = [];
+            const availableVaps = [];
 
             // Act
             const { wrapper } = setupMocks({
                 props: {
                     modelValue: lineItems,
-                    availableLineItems: availableLineItems,
+                    availableVaps: availableVaps,
                 },
             });
 
@@ -277,13 +277,13 @@ describe("cart.vue", () => {
                 promos: [],
             };
 
-            const availableLineItems = [];
+            const availableVaps = [];
 
             // Act
             const { wrapper } = setupMocks({
                 props: {
                     modelValue: lineItems,
-                    availableLineItems: availableLineItems,
+                    availableVaps: availableVaps,
                 },
             });
 
@@ -321,13 +321,13 @@ describe("cart.vue", () => {
                 promos: [],
             };
 
-            const availableLineItems = [];
+            const availableVaps = [];
 
             // Act
             const { wrapper } = setupMocks({
                 props: {
                     modelValue: lineItems,
-                    availableLineItems: availableLineItems,
+                    availableVaps: availableVaps,
                 },
             });
 
diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index ca784edd4..e34e9a4c4 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -121,7 +121,7 @@ export default {
         modelValue: Object,
         damage: Object,
         servicePackageOptionsCmsName: String,
-        availableLineItems: Object,
+        availableVaps: Object,
     },
     data() {
         return {
@@ -189,6 +189,16 @@ export default {
         },
     },
     computed: {
+        availableLineItems() {
+            if (!this.lineItems || this.lineItems.length < 1) {
+                return [];
+            }
+            return [
+                ...this.lineItems.glassParts,
+                ...this.lineItems.supportingItems,
+                ...this.availableVaps,
+            ];
+        },
         cartItems: {
             get: function () {
                 let cartItems = [];
diff --git a/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue b/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
index bb378c619..3eaf6a42e 100644
--- a/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
+++ b/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
@@ -76,7 +76,7 @@ export default {
     name: "add-vaps-modal-buttons",
     props: {
         vapsTilesCmsName: String,
-        availableLineItems: Object,
+        availableVaps: Object,
         modelValue: Object,
     },
     data() {
@@ -198,7 +198,7 @@ export default {
             return modelValue;
         },
         rainDefenseModal() {
-            const lineItem = this.availableLineItems.find((item) => {
+            const lineItem = this.availableVaps.find((item) => {
                 return item.partType === partTypeStrings.RAIN_DEFENSE;
             });
             if (lineItem)
@@ -209,10 +209,10 @@ export default {
         },
         wipersModal() {
             // create a single wiper item for modal
-            const frontWiperLineItems = this.availableLineItems.filter((item) => {
+            const frontWiperLineItems = this.availableVaps.filter((item) => {
                 return item.partType.includes(partTypeStrings.FRONT_WIPER);
             });
-            const rearWiperLineItems = this.availableLineItems.filter((item) => {
+            const rearWiperLineItems = this.availableVaps.filter((item) => {
                 return item.partType.includes(partTypeStrings.REAR_WIPER);
             });
             let wipersModal;
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 9a788bd70..a7313ddc7 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -23,7 +23,7 @@
 
                     <cart
                         :damage="damageInfo"
-                        :availableLineItems="availableLineItems"
+                        :availableVaps="availableVaps"
                         v-model="lineItems"
                         servicePackageOptionsCmsName="ServicePackageTitle"
                         @cart-remove="cartRemove" />
@@ -42,7 +42,7 @@
 
                     <add-vaps-modal-buttons
                         v-model="lineItems"
-                        :availableLineItems="availableLineItems"
+                        :availableVaps="availableVaps"
                         vapsTilesCmsName="VapsProductTiles"
                         @added-to-cart="showAlert" />
 
@@ -90,13 +90,14 @@ import {
 } from "@/helpers/promotions-helper";
 import { queryStrings } from "@/constants/query-strings";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { deepClone } from "@/helpers/object-helper";
 
 import { Form } from "vee-validate";
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 import { AppointmentTypeStrings } from "@/constants/schedule-constants";
-import { mapTaxedAvailableLineItemsToStoreFormat } from "../../store";
+import { mapTaxedLineItemsToStoreFormat } from "../../store";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
@@ -118,12 +119,6 @@ export default {
             "payment-method"
         );
 
-        const supportingItemsPromise = baseMixin.methods.dispatchStoreActionWithLogging(
-            storeActions.GET_SUPPORTING_ITEMS,
-            null,
-            "payment-method"
-        );
-
         const promiseResultMap = [
             {
                 resultKey: "cmsContent",
@@ -137,29 +132,25 @@ export default {
                 resultKey: "rainDefense",
                 promise: rainDefensePromise,
             },
-            {
-                resultKey: "supportingItems",
-                promise: supportingItemsPromise,
-            },
         ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
+        const lineItemsFromStore = deepClone(store.getters.order.lineItems);
+        const glassParts = lineItemsFromStore.glassParts ?? [];
+        const supportingItems = lineItemsFromStore.supportingItems ?? [];
 
-        const glassParts = store.getters.order.lineItems.glassParts ?? [];
-
-        let availableLineItems = [
+        const lineItemsToTax = [
             resultMap.rainDefense,
-            ...resultMap.supportingItems,
+            ...supportingItems,
             ...resultMap.wipers,
             ...glassParts,
         ];
+        const availableVaps = [resultMap.rainDefense, ...resultMap.wipers];
 
-        const lineItemsFromStore = store.getters.order.lineItems;
-
-        await baseMixin.methods.dispatchStoreActionWithLogging(
+        const pricedLineItemsToTax = await baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
             {
-                availableLineItems: availableLineItems,
+                availableLineItems: lineItemsToTax,
             },
             "payment-method",
             false
@@ -171,14 +162,14 @@ export default {
         const { validatePromoResponse, revalidatePromoResponse } =
             await revalidatePromosAndValidateNewPromo(
                 promoCodeFromQueryString,
-                availableLineItems,
+                pricedLineItemsToTax,
                 "payment-method"
             );
 
-        availableLineItems.push(...(validatePromoResponse?.orderPromos ?? []));
+        pricedLineItemsToTax.push(...(validatePromoResponse?.orderPromos ?? []));
         // End of promo logic
 
-        const taxedAvailableLineItems = await baseMixin.methods.dispatchStoreActionWithLogging(
+        const taxedLineItems = await baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.TAX_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
             {
                 billToAccountNumber: "87291",
@@ -187,32 +178,29 @@ export default {
                 serviceLocationCity: store.getters.order.serviceLocation.city,
                 serviceLocationState: store.getters.order.serviceLocation.state,
                 serviceLocationZipCode: store.getters.order.serviceLocation.zipCode,
-                pricedAvailableLineItems: availableLineItems,
+                pricedLineItems: pricedLineItemsToTax,
             },
             "payment-method",
             false
         );
 
-        // Match all available line items to the line items as they are in the store
+        // Match all line items to the line items as they are in the store
         // and rebuild the original structure.
-        const lineItems = mapTaxedAvailableLineItemsToStoreFormat(
-            availableLineItems,
-            lineItemsFromStore
-        );
+        const lineItems = mapTaxedLineItemsToStoreFormat(taxedLineItems, lineItemsFromStore);
+        const taxedVaps = mapTaxedLineItemsToStoreFormat(taxedLineItems, availableVaps);
 
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.availableLineItems = taxedAvailableLineItems;
+            vm.availableVaps = taxedVaps;
             vm.lineItems = lineItems;
-
             vm.updateFooterButtonText(vm.customCtaCopy);
         });
     },
     data() {
         return {
             lineItems: [],
-            availableLineItems: [],
+            availableVaps: [],
             paymentMethodInternalModel: this.getPaymentMethodFromStore(),
             inactivePromos: this.getInactivePromosFromStore(),
         };
diff --git a/src/store/index.js b/src/store/index.js
index e2915a1af..5251950c1 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2180,13 +2180,13 @@ export const actions = {
                 serviceLocationCity,
                 serviceLocationState,
                 serviceLocationZipCode,
-                pricedAvailableLineItems,
+                pricedLineItems,
             },
             pageNameToLog,
         }
     ) {
         const flattenedLineItemsWithChildParts =
-            getFlattenedArrayOfLineItemsWithChildParts(pricedAvailableLineItems);
+            getFlattenedArrayOfLineItemsWithChildParts(pricedLineItems);
 
         const lineItemsWithOnlyPriceInfo = flattenedLineItemsWithChildParts.map((lineItem) => ({
             partNumber: lineItem.partNumber,
@@ -2235,12 +2235,9 @@ export const actions = {
 
         context.commit(storeMutations.UPDATE_LINE_ITEMS_SERVER_DATA, response.data.serverData);
 
-        pricedAvailableLineItems = addTaxesToPricedLineItems(
-            pricedAvailableLineItems,
-            response.data.taxedLineItems
-        );
+        pricedLineItems = addTaxesToPricedLineItems(pricedLineItems, response.data.taxedLineItems);
 
-        return pricedAvailableLineItems;
+        return pricedLineItems;
     },
 
     // The <addableVaps> parameter is an array of ALL available front wipers and rain defense
@@ -2610,7 +2607,7 @@ function addTaxesToPricedLineItems(pricedLineItems, taxingLineItems = []) {
     return pricedLineItems;
 }
 
-export function mapTaxedAvailableLineItemsToStoreFormat(availableLineItems, storeLineItems) {
+export function mapTaxedLineItemsToStoreFormat(availableLineItems, storeLineItems) {
     // clone the lineItems array because what we're passing in is referencing the store directly
     const lineItems = deepClone(storeLineItems);
 

From 84948b5cc16ff3252a0af93e920f90125ec1be1b Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 8 Nov 2023 18:02:48 -0500
Subject: [PATCH 12/35] CSR-1484: formatting :-/

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

diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index b2539301d..8e5ad18d6 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -169,9 +169,8 @@ export default {
                 "payment-method"
             );
 
-            
         const newValidatedPromos = validatePromoResponse?.orderPromos ?? [];
-        
+
         pricedLineItemsToTax.push(...newValidatedPromos);
         // End of promo logic
 

From e2ad3594083fd730b4e38b624a20ed18da48dc90 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 8 Nov 2023 19:45:34 -0500
Subject: [PATCH 13/35] CSR-1384: update naming on payment page too

---
 src/layouts/payment/payment.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index ba396f952..cc8b911eb 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -188,7 +188,7 @@ import { applicationConfig } from "@/constants/application-config";
 import { paymentMethods } from "@/constants/payment-method-constants";
 import { AppointmentTypeStrings } from "@/constants/schedule-constants";
 import baseMixin from "@/mixins/base-mixin.js";
-import { mapTaxedAvailableLineItemsToStoreFormat } from "../../store";
+import { mapTaxedLineItemsToStoreFormat } from "../../store";
 import {
     revalidatePromosAndValidateNewPromo,
     getAddableVapsFromAvailableLineItems,
@@ -348,7 +348,7 @@ export default {
 
         // Match all available line items to the line items as they are in the store
         // and rebuild the original structure.
-        const lineItems = mapTaxedAvailableLineItemsToStoreFormat(
+        const lineItems = mapTaxedLineItemsToStoreFormat(
             availableLineItems,
             lineItemsFromStore
         );

From 929cf3e314bf1c937d4fea2303f5caebd3778dd0 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 8 Nov 2023 19:47:16 -0500
Subject: [PATCH 14/35] CSR-1384: another tech-review refactor - make
 wipersOffered a computed

---
 .../add-vaps-modal-buttons.vue                | 78 +++++++++++--------
 src/layouts/payment/payment.vue               |  5 +-
 2 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue b/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
index 9d138d95a..c822fa318 100644
--- a/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
+++ b/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue
@@ -82,7 +82,6 @@ export default {
     data() {
         return {
             addVapsButton: addVapsButton,
-            wipersOffered: null,
             isModalOpened: false,
             selectedWipers: this.getSelectedWipers(),
         };
@@ -249,20 +248,38 @@ export default {
         answersCmsData() {
             return this.getCmsContent(this.vapsTilesCmsName, "Answers");
         },
+        rainDefenseInCart() {
+            return this.currentCartItems.vaps?.some((vap) => {
+                return vap?.partType === partTypeStrings.RAIN_DEFENSE;
+            });
+        },
+        frontWipersInCart() {
+            return this.currentCartItems.vaps?.some((vap) => {
+                return vap?.partType?.includes(partTypeStrings.FRONT_WIPER);
+            });
+        },
+        rearWipersInCart() {
+            return this.currentCartItems.vaps?.some((vap) => {
+                return vap?.partType?.includes(partTypeStrings.REAR_WIPER);
+            });
+        },
+        wipersOffered() {
+            let result;
+            if (!this.frontWipersInCart) {
+                if (!this.rearWipersInCart && this.wipersModal?.rearWiperLineItems.length > 0) {
+                    result = wipersOfferedStrings.BOTH;
+                } else {
+                    result = wipersOfferedStrings.FRONT;
+                }
+            } else if (!this.rearWipersInCart && this.wipersModal?.rearWiperLineItems.length > 0) {
+                result = wipersOfferedStrings.REAR;
+            }
+            return result;
+        },
         buttonsToDisplay() {
             const buttons = [];
             if (!this.answersCmsData) return buttons;
 
-            const rainDefenseInCart = this.currentCartItems.vaps?.some((vap) => {
-                return vap?.partType === partTypeStrings.RAIN_DEFENSE;
-            });
-            const frontWipersInCart = this.currentCartItems.vaps?.some((vap) => {
-                return vap?.partType?.includes(partTypeStrings.FRONT_WIPER);
-            });
-            const rearWipersInCart = this.currentCartItems.vaps?.some((vap) => {
-                return vap?.partType?.includes(partTypeStrings.REAR_WIPER);
-            });
-
             const getAnswer = (name, answers) => {
                 const answerIndex = answers.findIndex((answer) => {
                     return answer.Name === name;
@@ -270,7 +287,7 @@ export default {
                 return answers[answerIndex];
             };
 
-            if (!rainDefenseInCart) {
+            if (!this.rainDefenseInCart) {
                 // NO RAIN DEFENSE IN CART; SHOW RAIN DEFENSE BUTTON
                 const modalData = getAnswer("RainDefenseModal", this.answersCmsData);
                 modalData.SubText = "+$" + this.rainDefenseModal?.listPrice;
@@ -278,27 +295,26 @@ export default {
             }
 
             const modalData = getAnswer("WipersModal", this.answersCmsData);
-            if (!frontWipersInCart) {
-                if (!rearWipersInCart && this.wipersModal?.rearWiperLineItems.length > 0) {
-                    // NO REAR WIPERS or FRONT WIPERS IN CART; SHOW COMBO BUTTON
-                    const prices = [
-                        this.wipersModal?.totalFrontPrice,
-                        this.wipersModal?.totalRearPrice,
-                    ];
-                    prices.sort((a, b) => a - b);
-                    modalData.SubText = "+$" + prices[0] + " - $" + prices[prices.length - 1];
-                    this.updateWipersOffered(wipersOfferedStrings.BOTH);
-                    buttons.push(modalData);
-                } else {
-                    // NO FRONT WIPERS IN CART; SHOW ONLY FRONT WIPERS BUTTON
-                    modalData.SubText = "+$" + this.wipersModal?.totalFrontPrice;
-                    this.updateWipersOffered(wipersOfferedStrings.FRONT);
-                    buttons.push(modalData);
-                }
-            } else if (!rearWipersInCart && this.wipersModal?.rearWiperLineItems.length > 0) {
+            if (this.wipersOffered === wipersOfferedStrings.BOTH) {
+                // NO REAR WIPERS or FRONT WIPERS IN CART; SHOW COMBO BUTTON
+                const prices = [
+                    this.wipersModal?.totalFrontPrice,
+                    this.wipersModal?.totalRearPrice,
+                ];
+                prices.sort((a, b) => a - b);
+                modalData.SubText = "+$" + prices[0] + " - $" + prices[prices.length - 1];
+                buttons.push(modalData);
+            }
+
+            if (this.wipersOffered === wipersOfferedStrings.FRONT) {
+                // NO FRONT WIPERS IN CART; SHOW ONLY FRONT WIPERS BUTTON
+                modalData.SubText = "+$" + this.wipersModal?.totalFrontPrice;
+                buttons.push(modalData);
+            }
+
+            if (this.wipersOffered === wipersOfferedStrings.REAR) {
                 // NO REAR WIPERS IN CART; SHOW ONLY REAR WIPERS BUTTON
                 modalData.SubText = "+$" + this.wipersModal?.totalRearPrice;
-                this.updateWipersOffered(wipersOfferedStrings.REAR);
                 buttons.push(modalData);
             }
 
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index cc8b911eb..fa8d91676 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -348,10 +348,7 @@ export default {
 
         // Match all available line items to the line items as they are in the store
         // and rebuild the original structure.
-        const lineItems = mapTaxedLineItemsToStoreFormat(
-            availableLineItems,
-            lineItemsFromStore
-        );
+        const lineItems = mapTaxedLineItemsToStoreFormat(availableLineItems, lineItemsFromStore);
 
         // Call the "next" function to complete the transition to this page.
         next(async (vm) => {

From 57bffe1334440ce359bbc4348abc56dd34aa4730 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 9 Nov 2023 06:35:34 -0500
Subject: [PATCH 15/35] Tech review changes

---
 src/constants/part-type-strings.js | 1 +
 src/fmg-components/cart/cart.vue   | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/constants/part-type-strings.js b/src/constants/part-type-strings.js
index fd1f4e781..aa56d1ed2 100644
--- a/src/constants/part-type-strings.js
+++ b/src/constants/part-type-strings.js
@@ -3,6 +3,7 @@ const partTypeStrings = {
     REAR_WIPER: "REAR WIPER",
     RAIN_DEFENSE: "RAIN DEFENSE",
     RECALIBRATION: "RECALIBRATION",
+    REPLACE_FEE: "REPLACE FEE",
     RECYCLE_FEE: "RECYCLE FEE",
     MOBILE_FEE: "MOBILE FEE",
     REPAIR_FEE: "REPAIR FEE",
diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 92e3f8adf..f0cca4990 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -222,6 +222,9 @@ export default {
                         salesTax: promoLineItem.salesTax,
                     };
 
+                    promoLineItem.cartItemType = cartItem.cartItemType;
+                    cartItem.lineItems.push(lineItem);
+
                     cartItems.push(cartItem);
                 });
 
@@ -467,14 +470,14 @@ export default {
             let cartItem = null;
 
             const recycleFeeLineItem = this.supportingItems.find(
-                (supportingItem) => supportingItem.partType == partTypeStrings.RECYCLE_FEE
+                (supportingItem) => supportingItem.partType == partTypeStrings.REPLACE_FEE
             );
-
+            console.log(recycleFeeLineItem);
             if (recycleFeeLineItem) {
                 cartItem = {
                     name: this.recycleFeeCartItemName,
                     category: cartItemCategories.SUPPORTING_ITEMS,
-                    cartItemType: cartItemTypes.RECYCLE_FEE,
+                    cartItemType: cartItemTypes.REPLACE_FEE,
                     isDisplayed: true,
                     isRemovable: false,
                     subTotal: 0,

From f0e0c4a3e8ff3ac84533f35a882f39c8fe1ced57 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 9 Nov 2023 07:37:01 -0500
Subject: [PATCH 16/35] Fixed package price calculation that was including
 early bird fee, prettified

---
 src/constants/cart-item-types.js | 1 +
 src/fmg-components/cart/cart.vue | 4 ++--
 src/mixins/base-mixin.js         | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/constants/cart-item-types.js b/src/constants/cart-item-types.js
index 7db2ac312..546a3b6e7 100644
--- a/src/constants/cart-item-types.js
+++ b/src/constants/cart-item-types.js
@@ -5,6 +5,7 @@ const cartItemTypes = {
     GLASS_PARTS: "GLASS PARTS",
     RAIN_DEFENSE: "RAIN DEFENSE",
     RECYCLE_FEE: "RECYCLE FEE",
+    REPLACE_FEE: "REPLACE FEE",
     MOBILE_FEE: "MOBILE FEE",
     PROMOS: "PROMOS",
     EARLY_BIRD: "EARLY BIRD",
diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index ca44600c3..4cef60f56 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -233,7 +233,7 @@ export default {
                     };
 
                     promoLineItem.cartItemType = cartItem.cartItemType;
-                    cartItem.lineItems.push(lineItem);
+                    cartItem.lineItems.push(promoLineItem);
 
                     cartItems.push(cartItem);
                 });
@@ -482,7 +482,7 @@ export default {
             const recycleFeeLineItem = this.supportingItems.find(
                 (supportingItem) => supportingItem.partType == partTypeStrings.REPLACE_FEE
             );
-            console.log(recycleFeeLineItem);
+
             if (recycleFeeLineItem) {
                 cartItem = {
                     name: this.recycleFeeCartItemName,
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 8c85cf815..38b0daefb 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -95,7 +95,7 @@ export default {
         filterOutFees(lineItems) {
             const filteredLineItems = lineItems.filter((item) => {
                 return (
-                    !item.partType.includes("FEE") ||
+                    (!item.partType.includes("FEE") && !item.partType.includes("EARLY BIRD")) ||
                     (item.partType === "REPAIR FEE" && item.partNumber != "SUPPLIES-REPAIR")
                 );
             });

From 70ae9d02b6e40932824e30224991f0d1947cae1a Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 9 Nov 2023 08:40:30 -0500
Subject: [PATCH 17/35] Removed commented CSS

---
 src/fmg-components/cart/cart.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 4cef60f56..9f4acbf70 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -695,9 +695,6 @@ export default {
             display: flex;
             justify-content: space-between;
             padding: 0.5rem 1.5rem;
-            // &:nth-child(odd) {
-            //     background-color: #f5f5f5;
-            // }
             &:nth-last-child(-n + 3) {
                 background-color: #e3f2ea;
             }

From ba7224a0ecdb2350598b63cdca5a62841fdbf7a8 Mon Sep 17 00:00:00 2001
From: CarlNation <32103961+CarlNation@users.noreply.github.com>
Date: Thu, 9 Nov 2023 08:41:02 -0500
Subject: [PATCH 18/35] CSR-1392

referral.locktoken is not persisted in the db so we need to return it to the calling application so it can be sent back in on the final wo submit
---
 src/constants/store-mutations.js                 |  1 +
 src/helpers/heritage-integration/order-helper.js |  1 +
 src/store/index.js                               | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index 4f1d4e395..7a0d19c03 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -54,6 +54,7 @@ const storeMutations = {
     UPDATE_PIA_TYPE: "updatePiaType",
     WORK_ORDER_NUMBER: "updateWorkOrderNumber",
     Customer_Portal_Login_Token: "updateCustomerPortalLoginToken",
+    LOCK_TOKEN: "updateLockToken",
 
     // EVENT BUS MUTATIONS
     ADD_EVENT_TO_BUS: "addEventToBus",
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 27bc735e3..79af9c432 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -163,6 +163,7 @@ async function saveSessionHelper(
             eon: savedSessionInfo.data.eon,
             workOrderNumber: savedSessionInfo.data.workOrderNumber,
             customerPortalLoginToken: savedSessionInfo.data.customerPortalLoginToken,
+            lockToken: savedSessionInfo.data.lockToken,
         },
         false
     );
diff --git a/src/store/index.js b/src/store/index.js
index e2915a1af..88137370c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -127,6 +127,7 @@ const getDefaultState = () => {
             eon: null,
             workOrderNumber: null,
             customerPortalLoginToken: null,
+            lockToken: null,
         },
         applicationUser: {
             eventBus: [],
@@ -249,6 +250,9 @@ export const mutations = {
     updateCustomerPortalLoginToken(state, customerPortalLoginToken) {
         state.order.customerPortalLoginToken = customerPortalLoginToken;
     },
+    updateLockToken(state, lockToken) {
+        state.order.lockToken = lockToken;
+    },
     updateCCToken(state, ccToken) {
         state.order.payment.ccToken.subscriptionId = ccToken.subscriptionId;
         state.order.payment.ccToken.expMonth = ccToken.expMonth;
@@ -1022,6 +1026,7 @@ export const actions = {
             crmCustomerId,
             workOrderNumber,
             customerPortalLoginToken,
+            lockToken,
         }
     ) {
         context.commit(storeMutations.UPDATE_REFERRAL_NUMBER, referralNumber);
@@ -1033,7 +1038,12 @@ export const actions = {
         context.commit(storeMutations.UPDATE_SAVED_SESSION_ID, savedSessionId);
         context.commit(storeMutations.UPDATE_CRM_CUSTOMER_ID, crmCustomerId);
         context.commit(storeMutations.WORK_ORDER_NUMBER, workOrderNumber);
-        context.commit(storeMutations.Customer_Portal_Login_Token, customerPortalLoginToken);
+        context.commit(storeMutations.LOCK_TOKEN, lockToken);
+
+        // if we already have the token, do not update it.  pia does 2 work order submits and the value is not persisted after the first submit
+        if (state.order.customerPortalLoginToken != null && state.order.customerPortalLoginToken != "00000000-0000-0000-0000-000000000000") {
+            context.commit(storeMutations.Customer_Portal_Login_Token, customerPortalLoginToken);
+        }
     },
 
     logPageView(
@@ -1707,6 +1717,7 @@ export const actions = {
                     referralSequenceNumber: order.referralSequenceNumber,
                     eon: order.eon,
                     createDeleteStatusWorkOrderForPia: createDeleteStatusWorkOrderForPia,
+                    lockToken: order.lockToken,
                 },
             },
             logApiCall: true,

From 1568303e8a6379a07abef9e8d8d65529b3bb1e80 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 9 Nov 2023 08:43:54 -0500
Subject: [PATCH 19/35] Removed another css comment missed

---
 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 9f4acbf70..6d709edeb 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -705,7 +705,6 @@ export default {
         }
         .service-type {
             background-color: #f5f5f5;
-            //padding-left: 2.5rem;
             align-items: center;
         }
         .packaged-cart-item {

From 03374ab01380b17f6e793c2d968e2c7dd3b87ba6 Mon Sep 17 00:00:00 2001
From: CarlNation <32103961+CarlNation@users.noreply.github.com>
Date: Thu, 9 Nov 2023 08:51:21 -0500
Subject: [PATCH 20/35] CSR-1392 prettier

---
 src/store/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/store/index.js b/src/store/index.js
index c6cf89a31..de2e6b45b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1041,7 +1041,10 @@ export const actions = {
         context.commit(storeMutations.LOCK_TOKEN, lockToken);
 
         // if we already have the token, do not update it.  pia does 2 work order submits and the value is not persisted after the first submit
-        if (state.order.customerPortalLoginToken != null && state.order.customerPortalLoginToken != "00000000-0000-0000-0000-000000000000") {
+        if (
+            state.order.customerPortalLoginToken != null &&
+            state.order.customerPortalLoginToken != "00000000-0000-0000-0000-000000000000"
+        ) {
             context.commit(storeMutations.Customer_Portal_Login_Token, customerPortalLoginToken);
         }
     },

From 2cbae603bdb0ef5986e2bdcb31d8157184247b67 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Thu, 9 Nov 2023 09:11:19 -0500
Subject: [PATCH 21/35] CSR-1452 | Toast messages built and displayed

For payment-method and quote, only for initial page load promo logic
---
 src/helpers/promotions-helper.js              | 76 +++++++++++++++++++
 src/layouts/payment-method/payment-method.vue | 19 ++++-
 src/layouts/quote/quote.vue                   | 18 ++++-
 src/store/index.js                            |  1 +
 4 files changed, 110 insertions(+), 4 deletions(-)

diff --git a/src/helpers/promotions-helper.js b/src/helpers/promotions-helper.js
index 1689d9550..40ef6cafd 100644
--- a/src/helpers/promotions-helper.js
+++ b/src/helpers/promotions-helper.js
@@ -16,6 +16,10 @@ export const addableVapsPromoPartNumbers = [
     promoPartNumberStrings.WIPER_DISCOUNT_PART_NUMBER,
 ];
 
+const promoErrorCodes = {
+    CANNOT_COMBINE: "SimilarPromoAlreadyOnOrder"
+};
+
 export const pagesToStripPromoQueryStringFrom = ["quote", "payment-method"];
 
 export function getPromosWithAddableVaps(promoList) {
@@ -110,6 +114,73 @@ export async function revalidatePromosAndValidateNewPromo(
     return { validatePromoResponse, revalidatePromoResponse };
 }
 
+export function buildToastMessagesFromRevalidateOrValidatePromoResponse(promoResponse, oldActivePromos = [], oldInactivePromos = []) {
+    console.log('oldActivePromos', oldActivePromos);
+    console.log('oldInactivePromos', oldInactivePromos);
+    console.log('promoResponse', promoResponse);
+    const alerts = [];
+    // Revalidate always has an "errors" array
+    if (promoResponse.errors) {
+        const oldPromoCodes = oldActivePromos.map(promo => getPromoCodeWithoutBundleIdentifier(promo.promoCode));
+        const activePromoCodesFromResponse = [];
+        // consolidate bundle promos to avoid displaying multiple toast messages for one bundle
+        promoResponse.promoLineItems.forEach(newPromo => {
+            const promoCodeToDisplay = getPromoCodeWithoutBundleIdentifier(newPromo.promoCode);
+            if (!activePromoCodesFromResponse.includes(promoCodeToDisplay)) {
+                activePromoCodesFromResponse.push(promoCodeToDisplay);
+            }
+        });
+        console.log('oldPromoCodes', oldPromoCodes);
+        console.log('activePromoCodesFromResponse', activePromoCodesFromResponse);
+        const newlyActivatedPromoCodes = activePromoCodesFromResponse.filter(newPromoCode => !oldPromoCodes.includes(newPromoCode));
+        const newlyInactivatedPromos = promoResponse.errors.filter(error => !oldInactivePromos.includes(error.promoCode));
+        newlyActivatedPromoCodes.forEach(newlyActivatedPromoCode => {
+            alerts.push({
+                messageHeadline: "Promo applied!",
+                messageCopy: `Promo "${newlyActivatedPromoCode}" was successfully applied to your cart.`,
+                type: "alert-success",
+                isDismissible: true,
+                shouldAutoFade: true,
+            });
+        });
+        newlyInactivatedPromos.forEach(newlyInactivatedPromo => {
+            console.log(newlyInactivatedPromo);
+            alerts.push({
+                messageHeadline: "Promo error",
+                messageCopy: `Sorry, promo code "${newlyInactivatedPromo}" is not valid`,
+                type: "alert-danger",
+                isDismissible: true,
+                shouldAutoFade: false,
+            });
+        });
+    } else {
+        if (promoResponse.orderPromos) {
+            let promoCodeToDisplay = getPromoCodeWithoutBundleIdentifier(promoResponse.orderPromos[0].promoCode);
+            alerts.push({
+                messageHeadline: "Promo applied!",
+                messageCopy: `Promo "${promoCodeToDisplay}" was successfully applied to your cart.`,
+                type: "alert-success",
+                isDismissible: true,
+                shouldAutoFade: true,
+            });
+        } else {
+            const alertToPush = {
+                messageHeadline: "Promo error",
+                type: "alert-danger",
+                shouldAutoFade: false,
+                isDismissible: true,
+            }
+            if (promoResponse.errorCode == promoErrorCodes.CANNOT_COMBINE) {
+                alertToPush.messageCopy = `Sorry, promo code "${promoResponse.promoCode}" cannot be combined with ${promoResponse.additionalInfo[0]}`;
+            } else {
+                alertToPush.messageCopy = `Sorry, promo code "${promoResponse.promoCode}" is not valid`;
+            }
+            alerts.push(alertToPush);
+        }
+    }
+    return alerts;
+}
+
 export function getPromosThatMatchLineItemsOnOrder(promos, lineItemsOnOrder) {
     const matchingPromos = [];
     promos.forEach((promo) => {
@@ -152,6 +223,11 @@ export function getVapsThatNeedToBeAddedToSatisfyPromos(
     }
 }
 
+// bundle promos look like: "bundlePromo/###"" for each promo, this returns "bundlePromo" only
+export function getPromoCodeWithoutBundleIdentifier(promoCode) {
+    return promoCode.substring(0, promoCode.indexOf("/"));
+}
+
 export function shouldStripPromoQueryString(fmgPageQueryValue) {
     return pagesToStripPromoQueryStringFrom.includes(fmgPageQueryValue);
 }
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 6e87235b0..33b338a6e 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -88,7 +88,7 @@ import { paymentMethods } from "@/constants/payment-method-constants";
 import { experimentSettings } from "@/constants/experiments";
 import {
     revalidatePromosAndValidateNewPromo,
-    getPromosWithAddableVaps,
+    buildToastMessagesFromRevalidateOrValidatePromoResponse,
     getVapsThatNeedToBeAddedToSatisfyPromos,
 } from "@/helpers/promotions-helper";
 import { queryStrings } from "@/constants/query-strings";
@@ -169,8 +169,11 @@ export default {
         );
 
         // Promo logic
-        const promoCodeFromQueryString = getQuerystringParameter(queryStrings.PROMO);
+        // Populate the previous state of promos for toast message usage in "next()"
+        const oldActivePromos = store.getters.lineItems.promos?.slice(0);
+        const oldInactivePromos = store.getters.order.payment.inactivePromos?.slice(0);
 
+        const promoCodeFromQueryString = getQuerystringParameter(queryStrings.PROMO);
         const { validatePromoResponse, revalidatePromoResponse } =
             await revalidatePromosAndValidateNewPromo(
                 promoCodeFromQueryString,
@@ -219,8 +222,18 @@ export default {
             vm.setCmsContent(resultMap.cmsContent);
             vm.availableLineItems = taxedAvailableLineItems;
             vm.lineItems = lineItems;
-
             vm.updateFooterButtonText(vm.customCtaCopy);
+
+            if (revalidatePromoResponse) {
+                const validateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(revalidatePromoResponse, oldActivePromos, oldInactivePromos);
+                if (validateAlerts.length) {
+                    vm.$refs.funnelHeader.triggerGlobalAlert(validateAlerts[0], validateAlerts[0].shouldAutoFade);
+                }   
+            }
+            if (validatePromoResponse) {
+                const validateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(validatePromoResponse);
+                vm.$refs.funnelHeader.triggerGlobalAlert(validateAlerts[0], validateAlerts[0].shouldAutoFade);
+            }
         });
     },
     data() {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index e6f34101f..46f36b330 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -80,7 +80,8 @@ import { Form, defineRule } from "vee-validate";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { applicationConfig } from "@/constants/application-config";
 import { payWithInsuranceStates } from "@/constants/pay-with-insurance-states";
-import { revalidatePromosAndValidateNewPromo } from "@/helpers/promotions-helper";
+import { revalidatePromosAndValidateNewPromo,
+    buildToastMessagesFromRevalidateOrValidatePromoResponse } from "@/helpers/promotions-helper";
 import { queryStrings } from "@/constants/query-strings";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
 
@@ -151,6 +152,10 @@ export default {
         );
 
         // Promo logic
+        // Populate the previous state of promos for toast message usage in "next()"
+        const oldActivePromos = store.getters.lineItems.promos?.slice(0);
+        const oldInactivePromos = store.getters.order.payment.inactivePromos?.slice(0);
+
         const promoCodeFromQueryString = getQuerystringParameter(queryStrings.PROMO);
 
         const { validatePromoResponse, revalidatePromoResponse } =
@@ -169,6 +174,17 @@ export default {
             vm.availableLineItems = pricingResults;
             vm.isInsuranceSelected = vm.getDefaultIsInsuranceSelectedValue(vm.availableLineItems);
             vm.newValidatedPromos = validatePromoResponse?.orderPromos;
+
+            if (revalidatePromoResponse) {
+                const validateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(revalidatePromoResponse, oldActivePromos, oldInactivePromos);
+                if (validateAlerts.length) {
+                    vm.$refs.funnelHeader.triggerGlobalAlert(validateAlerts[0], validateAlerts[0].shouldAutoFade);
+                }   
+            }
+            if (validatePromoResponse) {
+                const validateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(validatePromoResponse);
+                vm.$refs.funnelHeader.triggerGlobalAlert(validateAlerts[0], validateAlerts[0].shouldAutoFade);
+            }
         });
     },
     data() {
diff --git a/src/store/index.js b/src/store/index.js
index e2915a1af..d0a570b50 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2104,6 +2104,7 @@ export const actions = {
         addGuidToLineItemsIfNotAlreadyThere(vaps);
         context.commit(storeMutations.UPDATE_VAPS, vaps);
     },
+    // COMBINE THESE
     savePromos(context, promos) {
         context.commit(storeMutations.UPDATE_PROMOS, promos);
     },

From 80adf99f63dd4e307ae6cdc3e818ea9d9bcbb582 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 9 Nov 2023 09:41:35 -0500
Subject: [PATCH 22/35] Made available line items return empty glass part,
 supporting items and available vaps arrays to prevent errors

---
 src/fmg-components/cart/cart.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 6d709edeb..28cb25d50 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -177,9 +177,9 @@ export default {
                 return [];
             }
             return [
-                ...this.lineItems.glassParts,
-                ...this.lineItems.supportingItems,
-                ...this.availableVaps,
+                ...this.lineItems.glassParts ?? [],
+                ...this.lineItems.supportingItems ?? [],
+                ...this.availableVaps ?? [],
             ];
         },
         cartItems: {

From e3887f931e2756e82eddd8c3cc7beff22b72033a Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 9 Nov 2023 09:43:58 -0500
Subject: [PATCH 23/35] Prettified

---
 src/fmg-components/cart/cart.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 28cb25d50..7390495f2 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -177,9 +177,9 @@ export default {
                 return [];
             }
             return [
-                ...this.lineItems.glassParts ?? [],
-                ...this.lineItems.supportingItems ?? [],
-                ...this.availableVaps ?? [],
+                ...(this.lineItems.glassParts ?? []),
+                ...(this.lineItems.supportingItems ?? []),
+                ...(this.availableVaps ?? []),
             ];
         },
         cartItems: {

From d781b7fdadb2ebffb2615c19478fa52208b28d66 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 9 Nov 2023 10:49:24 -0500
Subject: [PATCH 24/35] CSR-1462 line items refactor fix for payment page

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

diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index fa8d91676..1886d4aa0 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -192,9 +192,11 @@ import { mapTaxedLineItemsToStoreFormat } from "../../store";
 import {
     revalidatePromosAndValidateNewPromo,
     getAddableVapsFromAvailableLineItems,
+    getVapsThatNeedToBeAddedToSatisfyPromos,
 } from "@/helpers/promotions-helper";
 import { queryStrings } from "@/constants/query-strings";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { deepClone } from "@/helpers/object-helper";
 
 import iframeResize from "../../../node_modules/iframe-resizer/js/iframeResizer.js";
 
@@ -228,7 +230,7 @@ export default {
             piaLineItems: this.getPiaLineItems(),
             paypalPayment: this.isPaypal(),
             lineItems: [],
-            availableLineItems: [],
+            availableVaps: [],
         };
     },
     directives: {
@@ -297,22 +299,22 @@ export default {
         ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
-
-        const glassParts = store.getters.order.lineItems.glassParts ?? [];
-
-        let availableLineItems = [
+        const lineItemsFromStore = deepClone(store.getters.order.lineItems);
+        const glassParts = lineItemsFromStore.glassParts ?? [];
+        const supportingItems = lineItemsFromStore.supportingItems ?? [];
+        
+        const lineItemsToTax = [
             resultMap.rainDefense,
-            ...resultMap.supportingItems,
+            ...supportingItems,
             ...resultMap.wipers,
             ...glassParts,
         ];
+        const availableVaps = [resultMap.rainDefense, ...resultMap.wipers];
 
-        const lineItemsFromStore = store.getters.order.lineItems;
-
-        await baseMixin.methods.dispatchStoreActionWithLogging(
+        const pricedLineItemsToTax = await baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
             {
-                availableLineItems: availableLineItems,
+                availableLineItems: lineItemsToTax,
             },
             "payment",
             false
@@ -324,14 +326,16 @@ export default {
         const { validatePromoResponse, revalidatePromoResponse } =
             await revalidatePromosAndValidateNewPromo(
                 promoCodeFromQueryString,
-                availableLineItems,
-                "payment-method"
+                pricedLineItemsToTax,
+                "payment"
             );
 
-        availableLineItems.push(...(validatePromoResponse?.orderPromos ?? []));
+            const newValidatedPromos = validatePromoResponse?.orderPromos ?? [];
+
+        pricedLineItemsToTax.push(...newValidatedPromos);
         // End of promo logic
 
-        const taxedAvailableLineItems = await baseMixin.methods.dispatchStoreActionWithLogging(
+        const taxedLineItems = await baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.TAX_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
             {
                 billToAccountNumber: "87291",
@@ -340,22 +344,33 @@ export default {
                 serviceLocationCity: store.getters.order.serviceLocation.city,
                 serviceLocationState: store.getters.order.serviceLocation.state,
                 serviceLocationZipCode: store.getters.order.serviceLocation.zipCode,
-                pricedAvailableLineItems: availableLineItems,
+                pricedLineItems: pricedLineItemsToTax,
             },
-            "payment-method",
+            "payment",
             false
         );
 
-        // Match all available line items to the line items as they are in the store
+        // Match all line items to the line items as they are in the store
         // and rebuild the original structure.
-        const lineItems = mapTaxedLineItemsToStoreFormat(availableLineItems, lineItemsFromStore);
+        const lineItems = mapTaxedLineItemsToStoreFormat(taxedLineItems, lineItemsFromStore);
+        const taxedVaps = mapTaxedLineItemsToStoreFormat(taxedLineItems, availableVaps);
+        
+        // Add items that were not in the store yet but added via query string promo validation
+        lineItems.promos = lineItems.promos ?? [];
+        lineItems.promos.push(...newValidatedPromos);
+        const vapsToAddToCart = getVapsThatNeedToBeAddedToSatisfyPromos(
+            newValidatedPromos,
+            taxedVaps,
+            lineItems
+        );
+        lineItems.vaps.push(...vapsToAddToCart);
 
         // Call the "next" function to complete the transition to this page.
         next(async (vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.fetchSignatureInfo(resultMap.signature);
 
-            vm.availableLineItems = taxedAvailableLineItems;
+            vm.availableVaps = taxedVaps;
             vm.lineItems = lineItems;
         });
     },

From effe8b4d8962752ced1e63e0e1efe3b801c7b3d0 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 9 Nov 2023 10:51:33 -0500
Subject: [PATCH 25/35] formatting

---
 src/layouts/payment/payment.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index 1886d4aa0..a0c75fe82 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -302,7 +302,7 @@ export default {
         const lineItemsFromStore = deepClone(store.getters.order.lineItems);
         const glassParts = lineItemsFromStore.glassParts ?? [];
         const supportingItems = lineItemsFromStore.supportingItems ?? [];
-        
+
         const lineItemsToTax = [
             resultMap.rainDefense,
             ...supportingItems,
@@ -330,7 +330,7 @@ export default {
                 "payment"
             );
 
-            const newValidatedPromos = validatePromoResponse?.orderPromos ?? [];
+        const newValidatedPromos = validatePromoResponse?.orderPromos ?? [];
 
         pricedLineItemsToTax.push(...newValidatedPromos);
         // End of promo logic
@@ -354,7 +354,7 @@ export default {
         // and rebuild the original structure.
         const lineItems = mapTaxedLineItemsToStoreFormat(taxedLineItems, lineItemsFromStore);
         const taxedVaps = mapTaxedLineItemsToStoreFormat(taxedLineItems, availableVaps);
-        
+
         // Add items that were not in the store yet but added via query string promo validation
         lineItems.promos = lineItems.promos ?? [];
         lineItems.promos.push(...newValidatedPromos);

From 00ca94d5ddbff81ba295509fdcc87909541e4aae Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 9 Nov 2023 13:51:49 -0500
Subject: [PATCH 26/35] CSR-1384: fix if lineItems.vaps is null

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

diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index c8ef38b3e..41de977b6 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -201,6 +201,7 @@ export default {
             taxedVaps,
             lineItems
         );
+        lineItems.vaps = lineItems.vaps ?? [];
         lineItems.vaps.push(...vapsToAddToCart);
 
         // Call the "next" function to complete the transition to this page.

From 621c1423f87d68674949494ad7dd320f40dd15c3 Mon Sep 17 00:00:00 2001
From: CarlNation <32103961+CarlNation@users.noreply.github.com>
Date: Thu, 9 Nov 2023 14:46:19 -0500
Subject: [PATCH 27/35] CSR-1392

No need for this logic.  token is persisted in customerportallogintoken table and is pulled from there now in the api on final submit
---
 src/store/index.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index de2e6b45b..94a50f46d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1039,14 +1039,7 @@ export const actions = {
         context.commit(storeMutations.UPDATE_CRM_CUSTOMER_ID, crmCustomerId);
         context.commit(storeMutations.WORK_ORDER_NUMBER, workOrderNumber);
         context.commit(storeMutations.LOCK_TOKEN, lockToken);
-
-        // if we already have the token, do not update it.  pia does 2 work order submits and the value is not persisted after the first submit
-        if (
-            state.order.customerPortalLoginToken != null &&
-            state.order.customerPortalLoginToken != "00000000-0000-0000-0000-000000000000"
-        ) {
-            context.commit(storeMutations.Customer_Portal_Login_Token, customerPortalLoginToken);
-        }
+        context.commit(storeMutations.Customer_Portal_Login_Token, customerPortalLoginToken);
     },
 
     logPageView(

From 7eea3baa13b002c003cd9212d597fc5cb30064cf Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Thu, 9 Nov 2023 14:52:18 -0500
Subject: [PATCH 28/35] CSR-1452 | Alerts for promos and alert.vue refactoring

---
 src/fmg-components/cart/cart.vue              |  3 +-
 .../funnel-header/funnel-header.vue           | 56 +++++++++----------
 src/helpers/promotions-helper.js              | 18 +++---
 src/layouts/payment-method/payment-method.vue | 17 ++++--
 src/layouts/quote/quote.vue                   | 10 ++--
 5 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 7390495f2..a44ef3c07 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -221,7 +221,7 @@ export default {
                     let cartItem = null;
 
                     cartItem = {
-                        name: "Some Kind of Promo", // get from CMS?
+                        name: promoLineItem.promoCode,
                         category: cartItemCategories.PROMOS,
                         cartItemType: promoLineItem.partType,
                         isDisplayed: true,
@@ -230,6 +230,7 @@ export default {
                             (promoLineItem.laborAmount ?? 0) +
                             (promoLineItem.sellingPrice ?? 0),
                         salesTax: promoLineItem.salesTax,
+                        lineItems: [],
                     };
 
                     promoLineItem.cartItemType = cartItem.cartItemType;
diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
index d9c598bb4..26a9652d4 100644
--- a/src/fmg-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -5,18 +5,18 @@
         <img class="logo-image img-fluid" :src="imageSrc" alt="Safelite logo" />
         <menuModal />
     </div>
-
-    <transition name="fade" mode="out-in">
-        <alert
-            v-if="displayGlobalAlert"
-            class="rounded-0 w-100 border-0 shadow-sm"
-            cmsWidgetName="GlobalAlert"
-            :manualHeadline="globalAlertMessage.messageHeadline"
-            :manualCopy="globalAlertMessage.messageCopy"
-            :alertClass="globalAlertMessage.type"
-            :onAlertCloseCallback="onAlertClose"
-            v-bind:isDismissible="globalAlertMessage.isDismissible" />
-    </transition>
+    <template v-for="globalAlert in globalAlertMessages" :key="globalAlert.id">
+        <transition name="fade" mode="out-in">
+            <alert
+                v-if="globalAlert.displayAlert"
+                class="rounded-0 w-100 border-0 shadow-sm"
+                cmsWidgetName="GlobalAlert"
+                :manualHeadline="globalAlert.messageHeadline"
+                :manualCopy="globalAlert.messageCopy"
+                :alertClass="globalAlert.type"
+                v-bind:isDismissible="globalAlert.isDismissible" />
+        </transition>
+    </template>
 </template>
 
 <script>
@@ -32,14 +32,8 @@ export default {
     name: "funnel-header",
     data() {
         return {
-            displayGlobalAlert: false,
-            globalAlertMessage: {
-                isDismissible: false,
-                messageCopy: "",
-                messageHeadline: "",
-                type: "",
-            },
-            countdownTimer: () => {},
+            alertIdCounter: 0,
+            globalAlertMessages: [],
         };
     },
     props: {
@@ -51,18 +45,18 @@ export default {
         },
     },
     methods: {
-        triggerGlobalAlert(alertEvent, isAutoDismissing) {
-            clearTimeout(this.countdownTimer);
-            this.displayGlobalAlert = true;
-            this.globalAlertMessage = alertEvent;
+        pushGlobalAlert(alertToPush, isAutoDismissing) {
+            alertToPush.displayAlert = true;
+            alertToPush.id = this.alertIdCounter;
+            this.alertIdCounter++;
             if (isAutoDismissing) {
-                this.countdownTimer = setTimeout(() => {
-                    this.displayGlobalAlert = false;
+                setTimeout(() => {
+                    alertToPush.displayAlert = false;
+                    // force a re-evaluation of the globalAlertMessages to detect the v-if change
+                    this.globalAlertMessages = this.globalAlertMessages.splice(0);
                 }, ALERT_DURATION);
             }
-        },
-        onAlertClose() {
-            this.displayGlobalAlert = false;
+            this.globalAlertMessages.push(alertToPush);
         },
     },
     components: {
@@ -77,8 +71,8 @@ export default {
         );
         // If alert event is on the bus, then display the alert
         if (alertEvent !== undefined) {
-            this.displayGlobalAlert = true;
-            this.globalAlertMessage = alertEvent;
+            alertEvent.displayAlert = true;
+            this.globalAlertMessages.push(alertEvent);
         }
     },
 };
diff --git a/src/helpers/promotions-helper.js b/src/helpers/promotions-helper.js
index 40ef6cafd..04d2fdbe9 100644
--- a/src/helpers/promotions-helper.js
+++ b/src/helpers/promotions-helper.js
@@ -115,9 +115,6 @@ export async function revalidatePromosAndValidateNewPromo(
 }
 
 export function buildToastMessagesFromRevalidateOrValidatePromoResponse(promoResponse, oldActivePromos = [], oldInactivePromos = []) {
-    console.log('oldActivePromos', oldActivePromos);
-    console.log('oldInactivePromos', oldInactivePromos);
-    console.log('promoResponse', promoResponse);
     const alerts = [];
     // Revalidate always has an "errors" array
     if (promoResponse.errors) {
@@ -130,10 +127,14 @@ export function buildToastMessagesFromRevalidateOrValidatePromoResponse(promoRes
                 activePromoCodesFromResponse.push(promoCodeToDisplay);
             }
         });
-        console.log('oldPromoCodes', oldPromoCodes);
-        console.log('activePromoCodesFromResponse', activePromoCodesFromResponse);
+        const inactivePromoCodesFromResponse = [];
+        promoResponse.errors.forEach(newInactive => {
+            const promoCodeToDisplay = getPromoCodeWithoutBundleIdentifier(newInactive.promoCode);
+            if (!inactivePromoCodesFromResponse.includes(promoCodeToDisplay)) {
+                inactivePromoCodesFromResponse.push(promoCodeToDisplay);
+            }
+        });
         const newlyActivatedPromoCodes = activePromoCodesFromResponse.filter(newPromoCode => !oldPromoCodes.includes(newPromoCode));
-        const newlyInactivatedPromos = promoResponse.errors.filter(error => !oldInactivePromos.includes(error.promoCode));
         newlyActivatedPromoCodes.forEach(newlyActivatedPromoCode => {
             alerts.push({
                 messageHeadline: "Promo applied!",
@@ -143,8 +144,9 @@ export function buildToastMessagesFromRevalidateOrValidatePromoResponse(promoRes
                 shouldAutoFade: true,
             });
         });
+
+        const newlyInactivatedPromos = inactivePromoCodesFromResponse.filter(errorPromoCode => !oldInactivePromos.includes(errorPromoCode));
         newlyInactivatedPromos.forEach(newlyInactivatedPromo => {
-            console.log(newlyInactivatedPromo);
             alerts.push({
                 messageHeadline: "Promo error",
                 messageCopy: `Sorry, promo code "${newlyInactivatedPromo}" is not valid`,
@@ -225,7 +227,7 @@ export function getVapsThatNeedToBeAddedToSatisfyPromos(
 
 // bundle promos look like: "bundlePromo/###"" for each promo, this returns "bundlePromo" only
 export function getPromoCodeWithoutBundleIdentifier(promoCode) {
-    return promoCode.substring(0, promoCode.indexOf("/"));
+    return promoCode.split("/")[0];
 }
 
 export function shouldStripPromoQueryString(fmgPageQueryValue) {
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 0a6f20b83..5bf7997c5 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -214,14 +214,15 @@ export default {
             vm.updateFooterButtonText(vm.customCtaCopy);
 
             if (revalidatePromoResponse) {
-                const validateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(revalidatePromoResponse, oldActivePromos, oldInactivePromos);
-                if (validateAlerts.length) {
-                    vm.$refs.funnelHeader.triggerGlobalAlert(validateAlerts[0], validateAlerts[0].shouldAutoFade);
-                }   
+                const revalidateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(revalidatePromoResponse, oldActivePromos, oldInactivePromos);
+
+                revalidateAlerts.forEach(alert => {
+                    vm.$refs.funnelHeader.pushGlobalAlert(alert, alert.shouldAutoFade);
+                });
             }
             if (validatePromoResponse) {
                 const validateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(validatePromoResponse);
-                vm.$refs.funnelHeader.triggerGlobalAlert(validateAlerts[0], validateAlerts[0].shouldAutoFade);
+                vm.$refs.funnelHeader.pushGlobalAlert(validateAlerts[0], validateAlerts[0].shouldAutoFade);
             }
         });
     },
@@ -316,6 +317,10 @@ export default {
                 "payment-method",
                 false
             );
+            const revalidateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(revalidatePromoResponse, this.lineItems.promos, this.inactivePromos);
+            revalidateAlerts.forEach(alert => {
+                this.$refs.funnelHeader.pushGlobalAlert(alert, alert.shouldAutoFade);
+            });
 
             this.lineItems.promos = revalidatePromoResponse.promoLineItems;
             this.inactivePromos = revalidatePromoResponse.errors.map((x) => x.promoCode);
@@ -388,7 +393,7 @@ export default {
             );
         },
         showAlert(alert) {
-            this.$refs.funnelHeader.triggerGlobalAlert(alert, true);
+            this.$refs.funnelHeader.pushGlobalAlert(alert, true);
         },
     },
     computed: {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 46f36b330..83bc8653e 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -176,14 +176,14 @@ export default {
             vm.newValidatedPromos = validatePromoResponse?.orderPromos;
 
             if (revalidatePromoResponse) {
-                const validateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(revalidatePromoResponse, oldActivePromos, oldInactivePromos);
-                if (validateAlerts.length) {
-                    vm.$refs.funnelHeader.triggerGlobalAlert(validateAlerts[0], validateAlerts[0].shouldAutoFade);
-                }   
+                const revalidateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(revalidatePromoResponse, oldActivePromos, oldInactivePromos);
+                revalidateAlerts.forEach(alert => {
+                    vm.$refs.funnelHeader.pushGlobalAlert(alert, alert.shouldAutoFade);
+                });
             }
             if (validatePromoResponse) {
                 const validateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(validatePromoResponse);
-                vm.$refs.funnelHeader.triggerGlobalAlert(validateAlerts[0], validateAlerts[0].shouldAutoFade);
+                vm.$refs.funnelHeader.pushGlobalAlert(validateAlerts[0], validateAlerts[0].shouldAutoFade);
             }
         });
     },

From 1715194c5bd66999a60d0c0ef9db6eef8d4cc0dc Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 9 Nov 2023 15:16:38 -0500
Subject: [PATCH 29/35] Update add-to-calendar to pull from submitted order

---
 .../confirmation/add-to-calendar/add-to-calendar.spec.js | 2 +-
 .../confirmation/add-to-calendar/add-to-calendar.vue     | 8 ++++----
 src/store/index.js                                       | 9 +++++++++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/layouts/confirmation/add-to-calendar/add-to-calendar.spec.js b/src/layouts/confirmation/add-to-calendar/add-to-calendar.spec.js
index c55b170cd..52063c1b9 100644
--- a/src/layouts/confirmation/add-to-calendar/add-to-calendar.spec.js
+++ b/src/layouts/confirmation/add-to-calendar/add-to-calendar.spec.js
@@ -12,7 +12,7 @@ beforeEach(() => {
     jest.restoreAllMocks();
     jest.clearAllMocks();
     store.getters = {
-        order: {
+        submittedOrder: {
             schedule: {
                 date: "2019-01-01",
                 startTime: "09:00",
diff --git a/src/layouts/confirmation/add-to-calendar/add-to-calendar.vue b/src/layouts/confirmation/add-to-calendar/add-to-calendar.vue
index 24427b2d5..4cbe0d748 100644
--- a/src/layouts/confirmation/add-to-calendar/add-to-calendar.vue
+++ b/src/layouts/confirmation/add-to-calendar/add-to-calendar.vue
@@ -110,11 +110,11 @@ export default {
             return this.getCmsContent(this.sameDayDropOffWidgetName, "BodyText");
         },
         UniqueId() {
-            return store.getters.order.referralNumber?.toString();
+            return store.getters.submittedOrder.referralNumber?.toString();
         },
         ServiceType() {
-            const isRepair = store.getters.order.damage.isRepair;
-            const funnelHasRecalibrationPart = store.getters.funnelHasRecalibrationPart;
+            const isRepair = store.getters.submittedOrder.damage.isRepair;
+            const funnelHasRecalibrationPart = store.getters.isRecalibrationOnSubmittedOrder;
             if (!isRepair) {
                 if (funnelHasRecalibrationPart) {
                     return serviceType.REPLACEMENT_AND_RECALIBRATION;
@@ -125,7 +125,7 @@ export default {
             return serviceType.REPAIR;
         },
         RouteCode() {
-            return store.getters.order.schedule.routeCode;
+            return store.getters.submittedOrder.schedule.routeCode;
         },
         Appointment() {
             var subject = "";
diff --git a/src/store/index.js b/src/store/index.js
index de2e6b45b..b75c16390 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -595,6 +595,15 @@ export const getters = {
     isRecalibrationOnOrder: (state) => {
         return getHasRecalibrationPart(state);
     },
+    isRecalibrationOnSubmittedOrder: (state) => {
+        if (window.sessionStorage.getItem("submittedOrder") !== null) {
+            return getHasRecalibrationPart({
+                order: JSON.parse(window.sessionStorage.getItem("submittedOrder")),
+            });
+        }
+
+        return false;
+    },
     areRearWipersOnOrder: (state) => {
         return !!state.order.lineItems.vaps?.some(
             (vap) => vap.partType.toUpperCase() === partTypeStrings.REAR_WIPER.toUpperCase()

From f72ce16936990a534244471e8f80537d5750ebb1 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Thu, 9 Nov 2023 15:17:47 -0500
Subject: [PATCH 30/35] CSR-1452 | Refactor and reformat

---
 src/helpers/promotions-helper.js              | 137 ++++++++++--------
 src/layouts/payment-method/payment-method.vue |  24 ++-
 src/layouts/quote/quote.vue                   |  22 ++-
 3 files changed, 114 insertions(+), 69 deletions(-)

diff --git a/src/helpers/promotions-helper.js b/src/helpers/promotions-helper.js
index 04d2fdbe9..90e3b74f5 100644
--- a/src/helpers/promotions-helper.js
+++ b/src/helpers/promotions-helper.js
@@ -17,7 +17,7 @@ export const addableVapsPromoPartNumbers = [
 ];
 
 const promoErrorCodes = {
-    CANNOT_COMBINE: "SimilarPromoAlreadyOnOrder"
+    CANNOT_COMBINE: "SimilarPromoAlreadyOnOrder",
 };
 
 export const pagesToStripPromoQueryStringFrom = ["quote", "payment-method"];
@@ -114,70 +114,54 @@ export async function revalidatePromosAndValidateNewPromo(
     return { validatePromoResponse, revalidatePromoResponse };
 }
 
-export function buildToastMessagesFromRevalidateOrValidatePromoResponse(promoResponse, oldActivePromos = [], oldInactivePromos = []) {
+export function buildToastMessagesFromRevalidateOrValidatePromoResponse(
+    promoResponse,
+    oldActivePromos = [],
+    oldInactivePromos = []
+) {
     const alerts = [];
     // Revalidate always has an "errors" array
     if (promoResponse.errors) {
-        const oldPromoCodes = oldActivePromos.map(promo => getPromoCodeWithoutBundleIdentifier(promo.promoCode));
-        const activePromoCodesFromResponse = [];
-        // consolidate bundle promos to avoid displaying multiple toast messages for one bundle
-        promoResponse.promoLineItems.forEach(newPromo => {
-            const promoCodeToDisplay = getPromoCodeWithoutBundleIdentifier(newPromo.promoCode);
-            if (!activePromoCodesFromResponse.includes(promoCodeToDisplay)) {
-                activePromoCodesFromResponse.push(promoCodeToDisplay);
-            }
-        });
-        const inactivePromoCodesFromResponse = [];
-        promoResponse.errors.forEach(newInactive => {
-            const promoCodeToDisplay = getPromoCodeWithoutBundleIdentifier(newInactive.promoCode);
-            if (!inactivePromoCodesFromResponse.includes(promoCodeToDisplay)) {
-                inactivePromoCodesFromResponse.push(promoCodeToDisplay);
-            }
-        });
-        const newlyActivatedPromoCodes = activePromoCodesFromResponse.filter(newPromoCode => !oldPromoCodes.includes(newPromoCode));
-        newlyActivatedPromoCodes.forEach(newlyActivatedPromoCode => {
-            alerts.push({
-                messageHeadline: "Promo applied!",
-                messageCopy: `Promo "${newlyActivatedPromoCode}" was successfully applied to your cart.`,
-                type: "alert-success",
-                isDismissible: true,
-                shouldAutoFade: true,
-            });
+        const oldPromoCodes = oldActivePromos.map((promo) =>
+            getPromoCodeWithoutBundleIdentifier(promo.promoCode)
+        );
+        const activePromoCodesFromResponse = getPromoCodesFromPromoObjectsWithoutDuplicates(
+            promoResponse.promoLineItems
+        );
+        const newlyActivatedPromoCodes = activePromoCodesFromResponse.filter(
+            (newPromoCode) => !oldPromoCodes.includes(newPromoCode)
+        );
+
+        newlyActivatedPromoCodes.forEach((newlyActivatedPromoCode) => {
+            alerts.push(createPromoSuccessAlert(newlyActivatedPromoCode));
         });
 
-        const newlyInactivatedPromos = inactivePromoCodesFromResponse.filter(errorPromoCode => !oldInactivePromos.includes(errorPromoCode));
-        newlyInactivatedPromos.forEach(newlyInactivatedPromo => {
-            alerts.push({
-                messageHeadline: "Promo error",
-                messageCopy: `Sorry, promo code "${newlyInactivatedPromo}" is not valid`,
-                type: "alert-danger",
-                isDismissible: true,
-                shouldAutoFade: false,
-            });
+        const inactivePromoCodesFromResponse = getPromoCodesFromPromoObjectsWithoutDuplicates(
+            promoResponse.errors
+        );
+        const newlyInactivatedPromos = inactivePromoCodesFromResponse.filter(
+            (errorPromoCode) => !oldInactivePromos.includes(errorPromoCode)
+        );
+
+        newlyInactivatedPromos.forEach((newlyInactivatedPromo) => {
+            alerts.push(createPromoErrorAlert(newlyInactivatedPromo));
         });
-    } else {
+    }
+    // validate response
+    else {
         if (promoResponse.orderPromos) {
-            let promoCodeToDisplay = getPromoCodeWithoutBundleIdentifier(promoResponse.orderPromos[0].promoCode);
-            alerts.push({
-                messageHeadline: "Promo applied!",
-                messageCopy: `Promo "${promoCodeToDisplay}" was successfully applied to your cart.`,
-                type: "alert-success",
-                isDismissible: true,
-                shouldAutoFade: true,
-            });
+            const promoCodeToDisplay = getPromoCodeWithoutBundleIdentifier(
+                promoResponse.orderPromos[0].promoCode
+            );
+            alerts.push(createPromoSuccessAlert(promoCodeToDisplay));
         } else {
-            const alertToPush = {
-                messageHeadline: "Promo error",
-                type: "alert-danger",
-                shouldAutoFade: false,
-                isDismissible: true,
-            }
-            if (promoResponse.errorCode == promoErrorCodes.CANNOT_COMBINE) {
-                alertToPush.messageCopy = `Sorry, promo code "${promoResponse.promoCode}" cannot be combined with ${promoResponse.additionalInfo[0]}`;
-            } else {
-                alertToPush.messageCopy = `Sorry, promo code "${promoResponse.promoCode}" is not valid`;
-            }
-            alerts.push(alertToPush);
+            alerts.push(
+                createPromoErrorAlert(
+                    promoResponse.promoCode,
+                    promoResponse.errorCode,
+                    promoResponse.additionalInfo
+                )
+            );
         }
     }
     return alerts;
@@ -241,3 +225,42 @@ function findLineItemsWithPartType(typeToFind, itemsToSearch) {
     );
     return partTypeMatches;
 }
+
+// returns a list of promo codes (string) only without duplicates or bundle identifiers
+//  <promos> parameter must be an array of objects with a 'promoCode' field
+function getPromoCodesFromPromoObjectsWithoutDuplicates(promos) {
+    const promoCodes = [];
+    promos.forEach((promo) => {
+        const promoCodeToDisplay = getPromoCodeWithoutBundleIdentifier(promo.promoCode);
+        if (!promoCodes.includes(promoCodeToDisplay)) {
+            promoCodes.push(promoCodeToDisplay);
+        }
+    });
+
+    return promoCodes;
+}
+
+function createPromoSuccessAlert(promoCode) {
+    return {
+        messageHeadline: "Promo applied!",
+        messageCopy: `Promo "${promoCode}" was successfully applied to your cart.`,
+        type: "alert-success",
+        isDismissible: true,
+        shouldAutoFade: true,
+    };
+}
+
+function createPromoErrorAlert(promoCode, errorCode = null, additionalInfo) {
+    const alert = {
+        messageHeadline: "Promo error",
+        type: "alert-danger",
+        shouldAutoFade: false,
+        isDismissible: true,
+    };
+    if (errorCode == promoErrorCodes.CANNOT_COMBINE) {
+        alert.messageCopy = `Sorry, promo code "${promoCode}" cannot be combined with ${additionalInfo[0]}`;
+    } else {
+        alert.messageCopy = `Sorry, promo code "${promoCode}" is not valid`;
+    }
+    return alert;
+}
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 5bf7997c5..a7bda52cb 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -214,15 +214,23 @@ export default {
             vm.updateFooterButtonText(vm.customCtaCopy);
 
             if (revalidatePromoResponse) {
-                const revalidateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(revalidatePromoResponse, oldActivePromos, oldInactivePromos);
+                const revalidateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(
+                    revalidatePromoResponse,
+                    oldActivePromos,
+                    oldInactivePromos
+                );
 
-                revalidateAlerts.forEach(alert => {
+                revalidateAlerts.forEach((alert) => {
                     vm.$refs.funnelHeader.pushGlobalAlert(alert, alert.shouldAutoFade);
                 });
             }
             if (validatePromoResponse) {
-                const validateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(validatePromoResponse);
-                vm.$refs.funnelHeader.pushGlobalAlert(validateAlerts[0], validateAlerts[0].shouldAutoFade);
+                const validateAlerts =
+                    buildToastMessagesFromRevalidateOrValidatePromoResponse(validatePromoResponse);
+                vm.$refs.funnelHeader.pushGlobalAlert(
+                    validateAlerts[0],
+                    validateAlerts[0].shouldAutoFade
+                );
             }
         });
     },
@@ -317,8 +325,12 @@ export default {
                 "payment-method",
                 false
             );
-            const revalidateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(revalidatePromoResponse, this.lineItems.promos, this.inactivePromos);
-            revalidateAlerts.forEach(alert => {
+            const revalidateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(
+                revalidatePromoResponse,
+                this.lineItems.promos,
+                this.inactivePromos
+            );
+            revalidateAlerts.forEach((alert) => {
                 this.$refs.funnelHeader.pushGlobalAlert(alert, alert.shouldAutoFade);
             });
 
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 83bc8653e..fb635c226 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -80,8 +80,10 @@ import { Form, defineRule } from "vee-validate";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { applicationConfig } from "@/constants/application-config";
 import { payWithInsuranceStates } from "@/constants/pay-with-insurance-states";
-import { revalidatePromosAndValidateNewPromo,
-    buildToastMessagesFromRevalidateOrValidatePromoResponse } from "@/helpers/promotions-helper";
+import {
+    revalidatePromosAndValidateNewPromo,
+    buildToastMessagesFromRevalidateOrValidatePromoResponse,
+} from "@/helpers/promotions-helper";
 import { queryStrings } from "@/constants/query-strings";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
 
@@ -176,14 +178,22 @@ export default {
             vm.newValidatedPromos = validatePromoResponse?.orderPromos;
 
             if (revalidatePromoResponse) {
-                const revalidateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(revalidatePromoResponse, oldActivePromos, oldInactivePromos);
-                revalidateAlerts.forEach(alert => {
+                const revalidateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(
+                    revalidatePromoResponse,
+                    oldActivePromos,
+                    oldInactivePromos
+                );
+                revalidateAlerts.forEach((alert) => {
                     vm.$refs.funnelHeader.pushGlobalAlert(alert, alert.shouldAutoFade);
                 });
             }
             if (validatePromoResponse) {
-                const validateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(validatePromoResponse);
-                vm.$refs.funnelHeader.pushGlobalAlert(validateAlerts[0], validateAlerts[0].shouldAutoFade);
+                const validateAlerts =
+                    buildToastMessagesFromRevalidateOrValidatePromoResponse(validatePromoResponse);
+                vm.$refs.funnelHeader.pushGlobalAlert(
+                    validateAlerts[0],
+                    validateAlerts[0].shouldAutoFade
+                );
             }
         });
     },

From 044ce50de9f29c80c0a1c1532ae65acbb58aef1c Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Thu, 9 Nov 2023 15:26:20 -0500
Subject: [PATCH 31/35] CSR-1452 | Unit test fixes

---
 src/layouts/quote/quote.spec.js | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
index 96b7bf092..61242cb33 100644
--- a/src/layouts/quote/quote.spec.js
+++ b/src/layouts/quote/quote.spec.js
@@ -258,10 +258,14 @@ describe("quote.vue", () => {
     test("should have non-null values for necessary data members after 'beforeRouteEnter'", async () => {
         //Arrange
         store.getters = {
+            lineItems: {
+                glassParts: ["item", "item2"],
+            },
             order: {
                 lineItems: {
                     glassParts: ["item", "item2"],
                 },
+                payment: {},
             },
         };
         const { wrapper } = setupMocks({});
@@ -286,6 +290,9 @@ describe("quote.vue", () => {
     test("should default to insurance if query param 'isInsurance' is true", async () => {
         //Arrange
         store.getters = {
+            lineItems: {
+                glassParts: ["item", "item2"],
+            },
             order: {
                 lineItems: {
                     glassParts: ["item", "item2"],
@@ -315,6 +322,9 @@ describe("quote.vue", () => {
     test("should default to cash if query param 'isInsurance' is false", async () => {
         //Arrange
         store.getters = {
+            lineItems: {
+                glassParts: ["item", "item2"],
+            },
             order: {
                 lineItems: {
                     glassParts: ["item", "item2"],
@@ -345,6 +355,9 @@ describe("quote.vue", () => {
         //Arrange
 
         store.getters = {
+            lineItems: {
+                glassParts: ["item", "item2"],
+            },
             order: {
                 lineItems: {
                     glassParts: ["item", "item2"],
@@ -375,6 +388,9 @@ describe("quote.vue", () => {
     test("should default to cash if cash selection is saved to store", async () => {
         //Arrange
         store.getters = {
+            lineItems: {
+                glassParts: ["item", "item2"],
+            },
             order: {
                 lineItems: {
                     glassParts: ["item", "item2"],
@@ -406,6 +422,9 @@ describe("quote.vue", () => {
         // Also needs no query parameter or previous selection in store to be present
         //Arrange
         store.getters = {
+            lineItems: {
+                glassParts: ["item", "item2"],
+            },
             order: {
                 lineItems: {
                     glassParts: ["item", "item2"],
@@ -439,6 +458,9 @@ describe("quote.vue", () => {
         //Arrange
 
         store.getters = {
+            lineItems: {
+                glassParts: ["item", "item2"],
+            },
             order: {
                 lineItems: {
                     glassParts: ["item", "item2"],
@@ -467,10 +489,13 @@ describe("quote.vue", () => {
         //Assert
         expect(wrapper.vm.isInsuranceSelected).toBe(true);
     });
-    test("Should default to insurence if user Service zip is from certain States", async () => {
+    test("Should default to insurance if user Service zip is from certain States", async () => {
         //Arrange
 
         store.getters = {
+            lineItems: {
+                glassParts: ["item", "item2"],
+            },
             order: {
                 lineItems: {
                     glassParts: ["item", "item2"],

From f8f9749d3aac73c9a6b904d927b7b8c2de250177 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Fri, 10 Nov 2023 10:51:01 -0500
Subject: [PATCH 32/35] CSR-1452 | Rewrite save promo functions

Combined inactive and active into one method
 -new save method prevents the same promos ending up in inactive AND active at the same time
 -query string promos save to inactive automatically
---
 src/constants/store-actions.js                |  3 +-
 src/helpers/promotions-helper.js              | 69 ++++++++++++++-----
 src/layouts/payment-method/payment-method.vue | 14 ++--
 src/layouts/payment/payment.vue               |  4 +-
 src/layouts/quote/quote.spec.js               |  2 +-
 src/layouts/quote/quote.vue                   | 10 ++-
 src/store/index.js                            | 42 ++++++++++-
 7 files changed, 113 insertions(+), 31 deletions(-)

diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 1861ac2c1..daa65d2cf 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -86,8 +86,7 @@ const storeActions = {
     SAVE_SUPPORTING_ITEMS_SUPPRESSING_STATE_RESETTING:
         "saveSupportingItemsSuppressingStateResetting",
     SAVE_VAPS: "saveVaps",
-    SAVE_PROMOS: "savePromos",
-    SAVE_INACTIVE_PROMOS: "saveInactivePromos",
+    SAVE_ACTIVE_AND_OR_INACTIVE_PROMOS: "saveActiveAndOrInactivePromos",
     SAVE_CUSTOMER_DETAILS: "saveCustomerDetails",
     SAVE_SERVICE_LOCATION_TECH_NOTES: "saveServiceLocationTechNotes",
     SAVE_CCTOKEN: "saveCCToken",
diff --git a/src/helpers/promotions-helper.js b/src/helpers/promotions-helper.js
index 90e3b74f5..d18a4aa17 100644
--- a/src/helpers/promotions-helper.js
+++ b/src/helpers/promotions-helper.js
@@ -17,9 +17,31 @@ export const addableVapsPromoPartNumbers = [
 ];
 
 const promoErrorCodes = {
-    CANNOT_COMBINE: "SimilarPromoAlreadyOnOrder",
+    UNKNOWN: "Unknown",
+    PROMO_NOT_YET_IN_USE: "PromoNotYetInUse",
+    PROMO_USAGE_COUNT_EXCEEDED: "PromoUsageCountExceeded",
+    PROMO_EXPIRED: "PromoExpired",
+    PROMO_DOES_NOT_EXIST: "PromoDoesNotExist",
+    PROMO_STACKING_NOT_ALLOWED: "PromoStackingNotAllowed",
+    SIMILAR_PROMO_ALREADY_ON_ORDER: "SimilarPromoAlreadyOnOrder",
+    INVALID_PROMO_ON_ORDER: "InvalidPromoOnOrder",
+    PROMO_VALIDATION_ERROR: "PromoValidationError",
+    NO_SUITABLE_ITEM_FOR_PROMO: "NoSuitableItemForPromo",
 };
 
+const stackingPromoErrorCodes = [
+    promoErrorCodes.PROMO_STACKING_NOT_ALLOWED,
+    promoErrorCodes.SIMILAR_PROMO_ALREADY_ON_ORDER,
+];
+
+const excludeFromInactivePromoErrorCodes = [
+    promoErrorCodes.UNKNOWN,
+    promoErrorCodes.PROMO_NOT_YET_IN_USE,
+    promoErrorCodes.PROMO_USAGE_COUNT_EXCEEDED,
+    promoErrorCodes.PROMO_EXPIRED,
+    promoErrorCodes.PROMO_DOES_NOT_EXIST,
+];
+
 export const pagesToStripPromoQueryStringFrom = ["quote", "payment-method"];
 
 export function getPromosWithAddableVaps(promoList) {
@@ -67,35 +89,36 @@ export function removeVapsPromosFromPromoArray(promoArray) {
     return filteredPromoArray;
 }
 
-export async function revalidatePromosAndValidateNewPromo(
+export async function revalidatePromosAndValidateQueryStringPromo(
     newPromo,
     pricedLineItems,
     pageNameToLog
 ) {
     const hasActivePromos = store.getters.order.lineItems.promos;
-    const hasHasInactivePromos = store.getters.order.lineItems.inactivePromos;
+    const hasInactivePromos = store.getters.payment.inactivePromos;
     const hasNewPromo = !!newPromo;
     const addableVaps = getAddableVapsFromAvailableLineItems(pricedLineItems);
 
     let validatePromoResponse = null;
     let revalidatePromoResponse = null;
 
-    if (hasActivePromos || hasHasInactivePromos) {
+    if (
+        (hasActivePromos && hasActivePromos.length) ||
+        (hasInactivePromos && hasInactivePromos.length)
+    ) {
         revalidatePromoResponse = await baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.REVALIDATE_ORDER_PROMOS_AND_SAVE_SERVER_DATA,
             {},
             pageNameToLog,
             false
         );
-        baseMixin.methods.dispatchStoreAction(
-            storeActions.SAVE_PROMOS,
-            revalidatePromoResponse.promoLineItems,
-            false
-        );
         const revalidationErrorPromoCodes = revalidatePromoResponse.errors.map((x) => x.promoCode);
         baseMixin.methods.dispatchStoreAction(
-            storeActions.SAVE_INACTIVE_PROMOS,
-            revalidationErrorPromoCodes,
+            storeActions.SAVE_ACTIVE_AND_OR_INACTIVE_PROMOS,
+            {
+                activePromos: revalidatePromoResponse.promoLineItems,
+                inactivePromos: revalidationErrorPromoCodes,
+            },
             false
         );
     }
@@ -109,8 +132,22 @@ export async function revalidatePromosAndValidateNewPromo(
             pageNameToLog,
             false
         );
+        if (!excludeFromInactivePromoErrorCodes.includes(validatePromoResponse.errorCode)) {
+            // Save any valid (applied or not) query string promoCode to inactivePromos
+            //  in order to not lose the query string promoCode if back button is pressed
+            const inactivePromoCodes = store.getters.payment.inactivePromos ?? [];
+            if (!inactivePromoCodes.includes(newPromo)) {
+                inactivePromoCodes.push(newPromo);
+                baseMixin.methods.dispatchStoreAction(
+                    storeActions.SAVE_ACTIVE_AND_OR_INACTIVE_PROMOS,
+                    {
+                        inactivePromos: inactivePromoCodes,
+                    },
+                    false
+                );
+            }
+        }
     }
-
     return { validatePromoResponse, revalidatePromoResponse };
 }
 
@@ -243,7 +280,7 @@ function getPromoCodesFromPromoObjectsWithoutDuplicates(promos) {
 function createPromoSuccessAlert(promoCode) {
     return {
         messageHeadline: "Promo applied!",
-        messageCopy: `Promo "${promoCode}" was successfully applied to your cart.`,
+        messageCopy: `Promo "${promoCode.toUpperCase()}" was successfully applied to your cart.`,
         type: "alert-success",
         isDismissible: true,
         shouldAutoFade: true,
@@ -257,10 +294,10 @@ function createPromoErrorAlert(promoCode, errorCode = null, additionalInfo) {
         shouldAutoFade: false,
         isDismissible: true,
     };
-    if (errorCode == promoErrorCodes.CANNOT_COMBINE) {
-        alert.messageCopy = `Sorry, promo code "${promoCode}" cannot be combined with ${additionalInfo[0]}`;
+    if (stackingPromoErrorCodes.includes(errorCode)) {
+        alert.messageCopy = `Sorry, promo code "${promoCode.toUpperCase()}" cannot be combined with "${additionalInfo[0].toUpperCase()}"`;
     } else {
-        alert.messageCopy = `Sorry, promo code "${promoCode}" is not valid`;
+        alert.messageCopy = `Sorry, promo code "${promoCode.toUpperCase()}" is not valid`;
     }
     return alert;
 }
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index a7bda52cb..7a43b7440 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -86,7 +86,7 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { paymentMethods } from "@/constants/payment-method-constants";
 import { experimentSettings } from "@/constants/experiments";
 import {
-    revalidatePromosAndValidateNewPromo,
+    revalidatePromosAndValidateQueryStringPromo,
     buildToastMessagesFromRevalidateOrValidatePromoResponse,
     getVapsThatNeedToBeAddedToSatisfyPromos,
 } from "@/helpers/promotions-helper";
@@ -165,7 +165,7 @@ export default {
 
         const promoCodeFromQueryString = getQuerystringParameter(queryStrings.PROMO);
         const { validatePromoResponse, revalidatePromoResponse } =
-            await revalidatePromosAndValidateNewPromo(
+            await revalidatePromosAndValidateQueryStringPromo(
                 promoCodeFromQueryString,
                 pricedLineItemsToTax,
                 "payment-method"
@@ -360,10 +360,12 @@ export default {
                 false
             );
             await this.dispatchStoreAction(storeActions.SAVE_VAPS, this.lineItems.vaps, false);
-            await this.dispatchStoreAction(storeActions.SAVE_PROMOS, this.lineItems.promos, false);
-            await this.dispatchStoreAction(
-                storeActions.SAVE_INACTIVE_PROMOS,
-                this.inactivePromos,
+            this.dispatchStoreAction(
+                storeActions.SAVE_ACTIVE_AND_OR_INACTIVE_PROMOS,
+                {
+                    activePromos: this.lineItems.promos,
+                    inactivePromos: this.inactivePromos,
+                },
                 false
             );
 
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index a0c75fe82..132acccab 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -190,7 +190,7 @@ import { AppointmentTypeStrings } from "@/constants/schedule-constants";
 import baseMixin from "@/mixins/base-mixin.js";
 import { mapTaxedLineItemsToStoreFormat } from "../../store";
 import {
-    revalidatePromosAndValidateNewPromo,
+    revalidatePromosAndValidateQueryStringPromo,
     getAddableVapsFromAvailableLineItems,
     getVapsThatNeedToBeAddedToSatisfyPromos,
 } from "@/helpers/promotions-helper";
@@ -324,7 +324,7 @@ export default {
         const promoCodeFromQueryString = getQuerystringParameter(queryStrings.PROMO);
 
         const { validatePromoResponse, revalidatePromoResponse } =
-            await revalidatePromosAndValidateNewPromo(
+            await revalidatePromosAndValidateQueryStringPromo(
                 promoCodeFromQueryString,
                 pricedLineItemsToTax,
                 "payment"
diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
index 61242cb33..a41f73595 100644
--- a/src/layouts/quote/quote.spec.js
+++ b/src/layouts/quote/quote.spec.js
@@ -22,7 +22,7 @@ jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
 }));
 
 jest.mock("@/helpers/promotions-helper", () => ({
-    revalidatePromosAndValidateNewPromo: jest.fn(() => {
+    revalidatePromosAndValidateQueryStringPromo: jest.fn(() => {
         return { validatePromoResponse: null, revalidatePromoResponse: null };
     }),
 }));
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index fb635c226..6f293c43b 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -81,7 +81,7 @@ import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigat
 import { applicationConfig } from "@/constants/application-config";
 import { payWithInsuranceStates } from "@/constants/pay-with-insurance-states";
 import {
-    revalidatePromosAndValidateNewPromo,
+    revalidatePromosAndValidateQueryStringPromo,
     buildToastMessagesFromRevalidateOrValidatePromoResponse,
 } from "@/helpers/promotions-helper";
 import { queryStrings } from "@/constants/query-strings";
@@ -161,7 +161,7 @@ export default {
         const promoCodeFromQueryString = getQuerystringParameter(queryStrings.PROMO);
 
         const { validatePromoResponse, revalidatePromoResponse } =
-            await revalidatePromosAndValidateNewPromo(
+            await revalidatePromosAndValidateQueryStringPromo(
                 promoCodeFromQueryString,
                 pricingResults,
                 "quote"
@@ -291,7 +291,11 @@ export default {
             }
 
             this.dispatchStoreAction(this.storeActions.SAVE_VAPS, this.selectedVaps, false);
-            this.dispatchStoreAction(this.storeActions.SAVE_PROMOS, this.allActivePromos, false);
+            this.dispatchStoreAction(
+                this.storeActions.SAVE_ACTIVE_AND_OR_INACTIVE_PROMOS,
+                { activePromos: this.allActivePromos },
+                false
+            );
 
             const payment = this.$store.getters.payment;
             if (payment.isInsurance) {
diff --git a/src/store/index.js b/src/store/index.js
index cffd8fee2..c55377ee3 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -23,7 +23,7 @@ import {
     getDisplayTextForDurationLength,
 } from "@/layouts/schedule/helpers/schedule-helper";
 import { paymentMethods } from "@/constants/payment-method-constants";
-
+import { getPromoCodeWithoutBundleIdentifier } from "@/helpers/promotions-helper";
 import { getDateDifferenceInDays } from "@/helpers/date-helper";
 // Export State
 const getDefaultState = () => {
@@ -2125,6 +2125,46 @@ export const actions = {
     saveInactivePromos(context, inactivePromos) {
         context.commit(storeMutations.UPDATE_INACTIVE_PROMOS, inactivePromos);
     },
+    // Manage promo saving to ensure a promoCode never ends up in both active and inactive
+    saveActiveAndOrInactivePromos(context, { activePromos = null, inactivePromos = null }) {
+        let activePromosToSave;
+        let inactivePromosToSave;
+        if (!activePromos && !inactivePromos) {
+            // Allow double null to save empty arrays to store
+            activePromosToSave = [];
+            inactivePromosToSave = [];
+        } else if (activePromos && inactivePromos) {
+            // Prioritize active promos when both inactive and active are supplied
+            activePromosToSave = activePromos;
+            const activePromoCodes = activePromos.map((promoObject) =>
+                getPromoCodeWithoutBundleIdentifier(promoObject.promoCode)
+            );
+            inactivePromosToSave = inactivePromos.filter((inactivePromo) => {
+                return !activePromoCodes.includes(inactivePromo);
+            });
+        } else if (!activePromos) {
+            // Only inactivePromos supplied
+            inactivePromosToSave = inactivePromos;
+            activePromosToSave = (context.getters.lineItems.promos ?? []).filter((activePromo) => {
+                return !inactivePromosToSave.includes(
+                    getPromoCodeWithoutBundleIdentifier(activePromo.promoCode)
+                );
+            });
+        } else if (!inactivePromos) {
+            // Only activePromos supplied
+            activePromosToSave = activePromos;
+            const activePromoCodes = activePromos.map((promoObject) =>
+                getPromoCodeWithoutBundleIdentifier(promoObject.promoCode)
+            );
+            inactivePromosToSave = (context.getters.payment.inactivePromos ?? []).filter(
+                (inactivePromo) => {
+                    return !activePromoCodes.includes(inactivePromo);
+                }
+            );
+        }
+        context.commit(storeMutations.UPDATE_PROMOS, activePromosToSave);
+        context.commit(storeMutations.UPDATE_INACTIVE_PROMOS, inactivePromosToSave);
+    },
 
     // Price order actions
     async priceOrderItemsAndSaveServerData(

From 702d03f9742a9a382841b33170e9e838b52ed496 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Fri, 10 Nov 2023 11:44:37 -0500
Subject: [PATCH 33/35] CSR-1462 break confirmation page out of iframe

---
 src/layouts/confirmation/confirmation.vue             |  2 --
 src/layouts/payment-pia-return/payment-pia-return.vue |  1 +
 src/router/index.js                                   | 11 ++++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 94a7054e7..903df1dc6 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -73,8 +73,6 @@ import { get12HourTimeFormat, get12HourTimeMobileFormat } from "@/helpers/date-h
 export default {
     name: "confirmation",
     async beforeRouteEnter(to, from, next) {
-        await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_ORDER);
-
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue
index 54e49c620..8088cbb06 100644
--- a/src/layouts/payment-pia-return/payment-pia-return.vue
+++ b/src/layouts/payment-pia-return/payment-pia-return.vue
@@ -131,6 +131,7 @@ export default {
             }
 
             this.$refs.loadingModal.isModalVisible = false;
+            await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_ORDER);
             this.$router.navigateWithoutSaving(this.navigationScenarios.PIA_SUCCESS, this.$route);
         },
         forwardButtonAction() {
diff --git a/src/router/index.js b/src/router/index.js
index cec3ff193..f7ff73a94 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -169,7 +169,16 @@ router.beforeEach(async (to, from, next) => {
         showFmgLoadingModal(true);
     }
 
-    next();
+    const toQueryPage = to.query?.fmgPage;
+    const notToPIAReturn = toQueryPage != "payment-pia-return";
+    const isInIframe = window !== window.top;
+
+    if (isInIframe && notToPIAReturn) {
+        const newUrl = `${window.top.location.origin}${to.href}`;
+        window.top.location.href = newUrl;
+    } else {
+        next();
+    }
 });
 
 router.afterEach(async (to, from) => {

From 0735f949f1159fdb13bbafe762147d4aa98bf1ea Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Fri, 10 Nov 2023 13:37:29 -0500
Subject: [PATCH 34/35] CSR-1462

leave create submitted order in confirmation.vue
---
 src/layouts/confirmation/confirmation.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 903df1dc6..bc414be9e 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -73,6 +73,8 @@ import { get12HourTimeFormat, get12HourTimeMobileFormat } from "@/helpers/date-h
 export default {
     name: "confirmation",
     async beforeRouteEnter(to, from, next) {
+        await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_ORDER);
+        
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 

From a667d3ef471a6bc903dcb535013747ca5d90e378 Mon Sep 17 00:00:00 2001
From: CarlNation <32103961+CarlNation@users.noreply.github.com>
Date: Fri, 10 Nov 2023 14:19:13 -0500
Subject: [PATCH 35/35] CSR prettier

---
 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 bc414be9e..94a7054e7 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -74,7 +74,7 @@ export default {
     name: "confirmation",
     async beforeRouteEnter(to, from, next) {
         await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_ORDER);
-        
+
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);