From d3a9931b93be3678100675c86378d1b59b8ae9d5 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 13 Feb 2026 15:48:28 -0500
Subject: [PATCH 01/30] CASH-1455 unverified insurance alert

CASH-1455 unverified insurance alert for the unverified experiment
---
 src/assets/img/icons/info-circle-blue.svg     |  5 ++++
 src/constants/experiments.js                  |  1 +
 src/layouts/payment-method/payment-method.vue | 26 +++++++++++++++++++
 src/mixins/analytics-mixin.js                 |  1 +
 src/store/index.js                            |  2 ++
 src/ux-components/alert/alert.vue             | 17 +++++++++++-
 6 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 src/assets/img/icons/info-circle-blue.svg

diff --git a/src/assets/img/icons/info-circle-blue.svg b/src/assets/img/icons/info-circle-blue.svg
new file mode 100644
index 000000000..fca619fb0
--- /dev/null
+++ b/src/assets/img/icons/info-circle-blue.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 0C6.41775 0 4.87104 0.469192 3.55544 1.34824C2.23985 2.22729 1.21447 3.47672 0.608967 4.93853C0.00346626 6.40034 -0.15496 8.00887 0.153721 9.56072C0.462403 11.1126 1.22433 12.538 2.34315 13.6569C3.46197 14.7757 4.88743 15.5376 6.43928 15.8463C7.99113 16.155 9.59966 15.9965 11.0615 15.391C12.5233 14.7855 13.7727 13.7602 14.6518 12.4446C15.5308 11.129 16 9.58225 16 8C16 5.87827 15.1571 3.84344 13.6569 2.34315C12.1566 0.842855 10.1217 0 8 0V0ZM8.4672 11.4C8.4672 11.5485 8.4082 11.691 8.30318 11.796C8.19816 11.901 8.05572 11.96 7.9072 11.96C7.75868 11.96 7.61624 11.901 7.51122 11.796C7.4062 11.691 7.3472 11.5485 7.3472 11.4V7.08C7.3472 6.93148 7.4062 6.78904 7.51122 6.68402C7.61624 6.579 7.75868 6.52 7.9072 6.52C8.05572 6.52 8.19816 6.579 8.30318 6.68402C8.4082 6.78904 8.4672 6.93148 8.4672 7.08V11.4ZM7.9072 5.4C7.79645 5.4 7.68818 5.36716 7.59608 5.30562C7.50399 5.24409 7.43222 5.15663 7.38983 5.0543C7.34745 4.95198 7.33636 4.83938 7.35796 4.73075C7.37957 4.62212 7.43291 4.52234 7.51122 4.44402C7.58954 4.3657 7.68932 4.31237 7.79795 4.29076C7.90658 4.26915 8.01918 4.28024 8.12151 4.32263C8.22383 4.36501 8.31129 4.43679 8.37283 4.52888C8.43436 4.62097 8.4672 4.72924 8.4672 4.84C8.46741 4.9136 8.45307 4.98651 8.42501 5.05455C8.39694 5.12259 8.3557 5.18441 8.30365 5.23645C8.25161 5.28849 8.18979 5.32973 8.12176 5.3578C8.05372 5.38587 7.9808 5.40021 7.9072 5.4Z" fill="#0070D1"/>
+</svg>
+
+
diff --git a/src/constants/experiments.js b/src/constants/experiments.js
index f81484058..127440e19 100644
--- a/src/constants/experiments.js
+++ b/src/constants/experiments.js
@@ -41,6 +41,7 @@ const experimentSettings = {
     SHOW_MOBILE_FIRST_POPUP_REPLACE_WITH_MSR: "Show_Mobile_First_Popup_Replace_With_MSR",
     OFFER_OEM: "OfferOem",
     USE_ADYEN_PAYMENT: "UseAdyenPayment",
+    SHOW_UNVERIFIED_DEDUCT_ENTRY: "ShowUnverifiedDeducEntry",
 };
 
 const experimentTriggers = {
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 2a6d1d9ed..4d80f84c0 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -53,6 +53,17 @@
                             v-bind:isDismissible="false" />
                     </div>
 
+                    <div>
+                        <alert
+                            ref="UnverifiedInsuranceAlert"
+                            class="mt-5 mb-5"
+                            cmsWidgetName="UnverifiedInsuranceAlertWidget"
+                            v-if="shouldDisplayUnverifiedInsuranceAlert"
+                            :showInfoIcon="true"
+                            :showHorizontalRow="true"
+                            alertClass="alert-info" />
+                    </div>
+
                     <div
                         v-if="isRecalibrationOnOrder && shouldHideRecalibration"
                         class="questions-about-service mt-5">
@@ -865,6 +876,13 @@ export default {
         shouldDisplayPiaAlert() {
             return getBoolFromString(this.$route?.query?.piaError);
         },
+        shouldDisplayUnverifiedInsuranceAlert() {
+            const shouldDisplayUnverifiedDeduct = experimentMixin.methods.hasSettingEqualTo(
+                experimentSettings.SHOW_UNVERIFIED_DEDUCT_ENTRY,
+                "true"
+            );
+            return shouldDisplayUnverifiedDeduct;
+        },
         // Necessary to make the watcher of lineItems work
         // JavaScript does not keep a record of the old value, only a reference to it's location in the memory.
         //  This creates a separate location for oldValue/newValue so they can be compared
@@ -1033,7 +1051,15 @@ export default {
             }
         }
     }
+
+    .alert.alert-info.widget-name-UnverifiedInsuranceAlertWidget {
+        :deep(.alert-heading) {
+            color: $black;
+            font-weight: 600;
+        }
+    }
 }
+
 :deep(span.label),
 :deep(span) {
     font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 238bed59d..316553548 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -291,6 +291,7 @@ export default {
             sessionData.isPia = order?.payment?.isPia ?? false;
             sessionData.piaType = order?.payment?.piaType;
             sessionData.parentAccountNumber = order?.payment?.parentAccountNumber;
+            sessionData.billToAccountNumber = order?.payment?.billToAccountNumber;
             sessionData.settledTenderAmount = order?.settledTenderAmount;
             sessionData.recalRequired = containsRecalParts(order?.lineItems);
             sessionData.recalType = getRecalPartNumbers(order?.lineItems?.glassParts);
diff --git a/src/store/index.js b/src/store/index.js
index c5d9846f9..c37487cac 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1636,6 +1636,7 @@ export const actions = {
             isPia,
             piaType,
             parentAccountNumber,
+            billToAccountNumber,
             settledTenderAmount,
             recalRequired,
             recalType,
@@ -1709,6 +1710,7 @@ export const actions = {
             totalPrice: totalPrice,
             userAgent: userAgent,
             cashPriceSubTotal: cashPriceSubTotal,
+            billToAccountNumber: billToAccountNumber,
         };
 
         return globalMethods.callHttpClient({
diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
index cccab36f0..601a8c8ec 100644
--- a/src/ux-components/alert/alert.vue
+++ b/src/ux-components/alert/alert.vue
@@ -8,7 +8,11 @@
             this.alertClass,
             this.cssClassNameForCmsWidget,
         ]">
-        <p class="mx-6 my-0 fw-bold alert-heading">{{ alertHeadline }}</p>
+        <p class="mx-6 my-0 fw-bold alert-heading">
+            <img v-if="showInfoIcon" :src="infoIcon" alt="Info Icon" class="info-icon" />
+            {{ alertHeadline }}
+        </p>
+        <hr v-if="showHorizontalRow"/>
         <template v-for="paragraph in splitAlertCopyForParagraphTag" :key="paragraph">
             <p
                 class="mx-4 mt-1 mb-0 text-body small"
@@ -58,6 +62,8 @@ import textBlock from "@/digital-components/text-block/text-block";
 export default {
     name: "alert",
     props: {
+        showInfoIcon: Boolean,
+        showHorizontalRow: Boolean,
         isDismissible: Boolean,
         alertClass: String,
         /*
@@ -87,6 +93,9 @@ export default {
         },
     },
     computed: {
+        infoIcon() {
+            return require(`@/assets/img/icons/info-circle-blue.svg`); 
+        },
         pageQueryString() {
             return applicationConfig.PAGE_QUERYSTRING;
         },
@@ -148,6 +157,12 @@ export default {
     border-radius: 0.5rem;
     border-width: 0px;
 
+    hr { 
+        border: 1px solid $blue;
+        margin-left: 1rem;
+        margin-right: 1rem;
+    }
+
     button {
         display: none;
     }

From 03eb4e28b30a42f1848705544f564781c6bb8de1 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 13 Feb 2026 15:52:57 -0500
Subject: [PATCH 02/30] prettier

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

diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
index 601a8c8ec..5c78853d4 100644
--- a/src/ux-components/alert/alert.vue
+++ b/src/ux-components/alert/alert.vue
@@ -12,7 +12,7 @@
             <img v-if="showInfoIcon" :src="infoIcon" alt="Info Icon" class="info-icon" />
             {{ alertHeadline }}
         </p>
-        <hr v-if="showHorizontalRow"/>
+        <hr v-if="showHorizontalRow" />
         <template v-for="paragraph in splitAlertCopyForParagraphTag" :key="paragraph">
             <p
                 class="mx-4 mt-1 mb-0 text-body small"
@@ -94,7 +94,7 @@ export default {
     },
     computed: {
         infoIcon() {
-            return require(`@/assets/img/icons/info-circle-blue.svg`); 
+            return require(`@/assets/img/icons/info-circle-blue.svg`);
         },
         pageQueryString() {
             return applicationConfig.PAGE_QUERYSTRING;
@@ -157,7 +157,7 @@ export default {
     border-radius: 0.5rem;
     border-width: 0px;
 
-    hr { 
+    hr {
         border: 1px solid $blue;
         margin-left: 1rem;
         margin-right: 1rem;

From 918c9b986e83d0eae40a40d1974daa288d8b4874 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Sat, 14 Feb 2026 11:43:15 -0500
Subject: [PATCH 03/30] CASH-1455 test

CASH-1455 test
---
 src/layouts/payment-method/payment-method.spec.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/layouts/payment-method/payment-method.spec.js b/src/layouts/payment-method/payment-method.spec.js
index 76d4daa1e..1bc123d3f 100644
--- a/src/layouts/payment-method/payment-method.spec.js
+++ b/src/layouts/payment-method/payment-method.spec.js
@@ -94,6 +94,9 @@ function setupMocks() {
             vehicle: { year: 2020, make: "Toyota", model: "Camry", carId: "12345" },
             damage: { isRepair: false },
         },
+        applicationUser: {
+            experiments: [],
+        },
         policy: {
             currentDeductible: 123,
         },

From aa2a5fff71f37f96442c204d4f614cd6c7bb8c92 Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Mon, 16 Feb 2026 10:18:35 -0500
Subject: [PATCH 04/30] CASH-2389: Service package order experiment

---
 src/constants/experiments.js                      |  1 +
 .../service-package-question.spec.js              |  5 +++++
 .../service-package-question.vue                  | 15 +++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/src/constants/experiments.js b/src/constants/experiments.js
index 127440e19..c76b1ea1c 100644
--- a/src/constants/experiments.js
+++ b/src/constants/experiments.js
@@ -42,6 +42,7 @@ const experimentSettings = {
     OFFER_OEM: "OfferOem",
     USE_ADYEN_PAYMENT: "UseAdyenPayment",
     SHOW_UNVERIFIED_DEDUCT_ENTRY: "ShowUnverifiedDeducEntry",
+    SERVICE_PACKAGE_ORDER: "ServicePackageOrder",
 };
 
 const experimentTriggers = {
diff --git a/src/layouts/quote/service-package-question/service-package-question.spec.js b/src/layouts/quote/service-package-question/service-package-question.spec.js
index a44dc463c..b3e4742e7 100644
--- a/src/layouts/quote/service-package-question/service-package-question.spec.js
+++ b/src/layouts/quote/service-package-question/service-package-question.spec.js
@@ -35,6 +35,11 @@ jest.mock("@/mixins/experiment-mixin.js", () => ({
                 return true;
             }
         },
+        hasSetting(settingName) {
+            if (settingName === mockExperimentSettings.PROMO_ON_PACKAGE) {
+                return false;
+            }
+        },
         hasSettingEqualTo(settingName, settingValue) {
             return false;
         },
diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue
index 436e98b24..72472e195 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -163,6 +163,16 @@ export default {
             }));
 
             this.$emit("currentNumberOfPackages", modifiedAnswers.length);
+
+            if (this.experimentPackageOrder()) {
+                const orderedKeys = this.experimentPackageOrder()
+                    .split(",")
+                    .map((key) => key.trim());
+                modifiedAnswers.sort(
+                    (a, b) => orderedKeys.indexOf(a.value) - orderedKeys.indexOf(b.value)
+                );
+            }
+
             return modifiedAnswers;
         },
         isDiscountOnOrder() {
@@ -235,6 +245,11 @@ export default {
                 )
             );
         },
+        experimentPackageOrder() {
+            return experimentMixin.methods.hasSetting(experimentSettings.SERVICE_PACKAGE_ORDER)
+                ? experimentMixin.methods.getSettingValue(experimentSettings.SERVICE_PACKAGE_ORDER)
+                : false;
+        },
         getButtonTypeObject() {
             if (this.isAfterpayBreakoutDisplay()) {
                 return this.servicePackageRadioAfterpayExperiment;

From f6f350afb179d1e73ef3a689824cd275e044684f Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 18 Feb 2026 17:04:24 -0500
Subject: [PATCH 05/30] CASH-2397: bug fix if mobile api returns 200 but empty

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index e20c025fb..6ce9e9eae 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -28,7 +28,6 @@
                         cmsWidgetName="ScheduleYourServiceWidget"
                         id="schedule-your-service" />
                     <appointmentTypeQuestion
-                        v-if="hasSelectableDatesLoaded"
                         v-model="appointmentTypeFromAppointmentTypeQuestion"
                         v-show="isAppointmentTypeDisplayed"
                         :isServiceableMobile="isServiceableMobile"
@@ -36,7 +35,6 @@
                         :isDisplayed="isAppointmentTypeDisplayed"
                         :mobileFeeApplies="mobileFeeApplies"
                         :zipCode="zipCode"
-                        ref="appointmentTypeQuestion"
                         groupName="appointmentTypeQuestion"
                         cmsWidgetName="AppointmentTypeQuestionWidget"
                         validationRules="option-required"
@@ -950,7 +948,7 @@ export default {
             return false;
         },
         hasSelectableDatesLoaded() {
-            if (this.isMobileSelected) {
+            if (this.isServiceableMobile) {
                 return this.selectableDatesMobile?.days?.length > 0;
             } else {
                 return this.selectableDatesInshop?.days?.length > 0;
@@ -1842,10 +1840,12 @@ export default {
             } else {
                 this.appointmentType = null;
             }
-            this.setSelectedDateToFirstAvailable(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
+            this.setSelectedDateToFirstAvailable();
         },
         setSelectedDateToFirstAvailable() {
-            this.selectedDate = this.getFirstAvailableDate();
+            if (this.hasSelectableDatesLoaded) { // ensure dates have been loaded by now
+                this.selectedDate = this.getFirstAvailableDate();
+            }
         },
         showRecalAcknowledgementModal() {
             if (this.shouldShowRecalAckModal()) {
@@ -2069,7 +2069,7 @@ export default {
     watch: {
         appointmentTypeFromAppointmentTypeQuestion: {
             handler(newValue, oldValue) {
-                this.handleAppointmentTypeChange(newValue); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
+                this.handleAppointmentTypeChange(newValue);
             },
         },
     },

From 6b19ada54a8ad3fd2da9d76c7b99312e142a7b16 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 18 Feb 2026 17:44:48 -0500
Subject: [PATCH 06/30] CASH-2397 prettier

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 6ce9e9eae..adc85ef2a 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1843,7 +1843,8 @@ export default {
             this.setSelectedDateToFirstAvailable();
         },
         setSelectedDateToFirstAvailable() {
-            if (this.hasSelectableDatesLoaded) { // ensure dates have been loaded by now
+            if (this.hasSelectableDatesLoaded) {
+                // ensure dates have been loaded by now
                 this.selectedDate = this.getFirstAvailableDate();
             }
         },

From 6f51eac1a4e62e7c74c8b4b2b4118544f6a46b5d Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 19 Feb 2026 14:32:23 -0500
Subject: [PATCH 07/30] CASH-2196 clear any validation errors for external
 parameter flow

CASH-2196 clear any validation errors for external parameter flow
---
 src/layouts/vehicle-damage/vehicle-damage.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 7b313dbf7..5e128e867 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -200,6 +200,13 @@ export default {
                         }
                     }
                     baseMixin.methods.ResetExternalParamsAndHideModal();
+
+                    //clear any validation errors for external parameter flow
+                    const form = vm.$refs.theForm;
+                    if (form) {
+                        form.setFieldError("DamageLocationQuestion", undefined);
+                        form.setFieldTouched("DamageLocationQuestion", false, false);
+                    }
                 }
             } else {
                 baseMixin.methods.ResetExternalParamsAndHideModal();

From 0042cc47bedfd53d5b42ed44956297257dd13894 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 24 Feb 2026 13:05:05 -0500
Subject: [PATCH 08/30] CASH-2402 use selected item for determining part number
 instead of amt

CASH-2402 use selected item for determining part number instead of amount.  Amount will be driven by the price service
---
 src/experiment-components/donation-block.vue | 26 +++++++-------------
 src/layouts/confirmation/confirmation.vue    |  6 +++--
 src/store/index.js                           |  4 +--
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/experiment-components/donation-block.vue b/src/experiment-components/donation-block.vue
index f93c96520..e48e66860 100644
--- a/src/experiment-components/donation-block.vue
+++ b/src/experiment-components/donation-block.vue
@@ -31,23 +31,15 @@
                         <div class="donation-slider my-4">
                             <input
                                 name="amount"
-                                id="one"
+                                id="zero"
                                 type="radio"
                                 :value="donationValues[0]"
                                 checked />
-                            <label for="one" class="label">$1</label>
-                            <input
-                                name="amount"
-                                id="three"
-                                type="radio"
-                                :value="donationValues[1]" />
-                            <label for="three" class="label">$3</label>
-                            <input
-                                name="amount"
-                                id="five"
-                                type="radio"
-                                :value="donationValues[2]" />
-                            <label for="five" class="label">$5</label>
+                            <label for="zero" class="label">${{ donationValues[0] }}</label>
+                            <input name="amount" id="one" type="radio" :value="donationValues[1]" />
+                            <label for="one" class="label">${{ donationValues[1] }}</label>
+                            <input name="amount" id="two" type="radio" :value="donationValues[2]" />
+                            <label for="two" class="label">${{ donationValues[2] }}</label>
                             <div class="indicator-bar"></div>
                         </div>
                     </div>
@@ -264,17 +256,17 @@ export default {
             background: $blue;
         }
         input {
-            &#one:checked {
+            &#zero:checked {
                 ~ .indicator-bar {
                     transform: translateX(2rem);
                 }
             }
-            &#three:checked {
+            &#one:checked {
                 ~ .indicator-bar {
                     transform: translateX(calc(100% + 2rem));
                 }
             }
-            &#five:checked {
+            &#two:checked {
                 ~ .indicator-bar {
                     transform: translateX(calc(200% + 2rem));
                 }
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index a9c964268..fa0e53425 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -470,7 +470,8 @@ export default {
             }
         },
         donationValues() {
-            return [1, 3, 5];
+            var donationAmounts = this.getCmsContent("DonationAmountsWidget", "Text");
+            return donationAmounts.split(",").map(Number);
         },
         lineItemsWithoutDonation() {
             const lineItemsClone = deepClone(this.lineItems);
@@ -531,10 +532,11 @@ export default {
             window.location.assign(location.protocol + "//" + location.host);
         },
         async addDonationToOrder() {
+            const selectedItemNumber = this.donationValues.indexOf(Number(this.donationAmount));
             const donationResponse = await baseMixin.methods.dispatchStoreActionWithLogging(
                 storeActions.SUBMIT_DONATION_PART_TO_SV2,
                 {
-                    donationAmount: parseInt(this.donationAmount),
+                    selectedItemNumber: selectedItemNumber,
                     submittedOrder: this.submittedOrder,
                 },
                 false
diff --git a/src/store/index.js b/src/store/index.js
index 73e3c4cbe..1c83807a1 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2126,14 +2126,14 @@ export const actions = {
     },
     async submitDonationPartToSV2(
         context,
-        { payload: { donationAmount, submittedOrder }, pageNameToLog }
+        { payload: { selectedItemNumber, submittedOrder }, pageNameToLog }
     ) {
         const state = JSON.parse(
             window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE)
         );
         const order = state.order;
         const payload = {
-            donationAmount: parseInt(donationAmount),
+            selectedItemNumber: selectedItemNumber,
             savedSessionId: state.applicationUser.savedSessionId,
             paymentInfo: {
                 parentAccountNumber: order.payment.parentAccountNumber,

From 32cc231375f49147a291e675ebde1d2478f9b83d Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Wed, 25 Feb 2026 13:01:59 -0500
Subject: [PATCH 09/30] CASH-2264 - Made agent scheduling work thru 2.0

---
 src/helpers/heritage-integration/order-helper.js    |  3 +--
 src/router/methods/helpers/consume-referral-info.js | 11 +++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 1c0922ba0..a3dc363f5 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -20,7 +20,6 @@ export async function loadSessionIfPresent(isConceptInsurance, pageNameToLog) {
     // Do nothing if there is no cookie or session to use for loading.
     if (
         funnelCookie == null ||
-        funnelCookie.SavedSessionId == null ||
         funnelCookie.ReferralCorrelationId == null ||
         !funnelCookie.ReferralNumber
     ) {
@@ -128,7 +127,7 @@ async function loadSession(
     const response = await baseMixin.methods.dispatchStoreActionWithLogging(
         storeActions.LOAD_SESSION,
         {
-            savedSessionId: savedSessionId?.toString(),
+            savedSessionId: savedSessionId != null ? savedSessionId.toString() : null,
             referralNumber,
             referralDate,
             referralCorrelationId,
diff --git a/src/router/methods/helpers/consume-referral-info.js b/src/router/methods/helpers/consume-referral-info.js
index 6393eedc7..c28ed7669 100644
--- a/src/router/methods/helpers/consume-referral-info.js
+++ b/src/router/methods/helpers/consume-referral-info.js
@@ -15,11 +15,14 @@ export async function consumeReferralQuerystrings() {
     // If no referral number in querystring, check if heritage funnel updated last.
     // This would indicate a customer that went to heritage but did not return through the
     // normal route.  ie: left the site in search of a discount and returned without querystrings.
+
+    //or if a referral number is in query string check if heritage funnel updated last
+    // This would indicate a customer that returned through normal route like from sfa email
     const didHeritageFunnelUpdateLast = getFunnelCookie()?.DidHeritageFunnelUpdateLast;
-    if (didHeritageFunnelUpdateLast && !referralNumber) {
-        referralNumber = getFunnelCookie().ReferralNumber;
-        parentAccount = getFunnelCookie().ReferralParentAccountNumber;
-        correlationId = getFunnelCookie().ReferralCorrelationId;
+    if (didHeritageFunnelUpdateLast) {
+        referralNumber = referralNumber ?? getFunnelCookie().ReferralNumber;
+        parentAccount = parentAccount ?? getFunnelCookie().ReferralParentAccountNumber;
+        correlationId = correlationId ?? getFunnelCookie().ReferralCorrelationId;
         referralDate = getFunnelCookie().ReferralDate;
         savedSessionId = getFunnelCookie().SavedSessionId;
     }

From 6699c49eee21d4ed7e49ca5ad2d683abd194b4f1 Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Fri, 27 Feb 2026 10:15:23 -0500
Subject: [PATCH 10/30] CASH-1684: MSR fee not covered by insurance alert

---
 src/assets/img/icons/alert-circle-yellow.svg |  3 ++
 src/helpers/cms-content-helper.js            | 11 +++++
 src/layouts/schedule/schedule.vue            | 42 ++++++++++++++++++--
 src/ux-components/alert/alert.vue            | 21 ++++++++++
 4 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 src/assets/img/icons/alert-circle-yellow.svg

diff --git a/src/assets/img/icons/alert-circle-yellow.svg b/src/assets/img/icons/alert-circle-yellow.svg
new file mode 100644
index 000000000..904aefb98
--- /dev/null
+++ b/src/assets/img/icons/alert-circle-yellow.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="21" viewBox="0 0 20 21">
+    <path fill="#E86421" fill-rule="nonzero" d="M10 .5c5.523 0 10 4.477 10 10s-4.477 10-10 10-10-4.477-10-10S4.477.5 10 .5zm.043 13.6a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm.77-9.2h-1.54l-.088.009a.502.502 0 0 0-.299.193.66.66 0 0 0-.125.47l.747 6.806.017.096c.065.249.263.425.495.426l.084-.008c.22-.042.396-.246.427-.51l.793-6.805.004-.102a.651.651 0 0 0-.127-.37.489.489 0 0 0-.388-.205z"/>
+</svg>
diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js
index 727add296..450875d0f 100644
--- a/src/helpers/cms-content-helper.js
+++ b/src/helpers/cms-content-helper.js
@@ -343,3 +343,14 @@ export function splitCMSCopyOnParagraphTag(copy) {
 export function splitCMSCopyOnBR(copy) {
     return copy.split("<br>");
 }
+
+// This function takes in a number and returns it formatted as USD currency, with or without cents depending on if the number is an integer or not.
+export function formatToUSDollar(amount) {
+    const isInteger = amount % 1 === 0;
+    return new Intl.NumberFormat("en-US", {
+        style: "currency",
+        currency: "USD",
+        minimumFractionDigits: isInteger ? 0 : 2,
+        maximumFractionDigits: 2,
+    }).format(amount);
+}
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index adc85ef2a..07330b5d6 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -74,6 +74,16 @@
                         cmsWidgetName="AlertNoShopsWidget"
                         v-if="displayNoShopsAlert"
                         alertClass="alert-warning" />
+                    <alert
+                        ref="alertMSRNotCoveredByInsurance"
+                        class="mt-5 mb-5"
+                        v-if="isMSRFeeNotCoveredByInsurance"
+                        :manualHeadline="MSRFeeAlertHeadlineText"
+                        :manualCopy="MSRFeeAlertBodyText"
+                        :showWarningIcon="true"
+                        :hasBorder="true"
+                        :showHorizontalRow="true"
+                        alertClass="alert-warning" />
                 </div>
             </div>
             <div
@@ -221,7 +231,11 @@ import {
     RECAL_ACK_YES,
 } from "@/constants/schedule-constants";
 
-import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import {
+    fetchCmsContentForPage,
+    splitCopyOnCMSPlaceHolder,
+    formatToUSDollar,
+} from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import {
     getPricedMobileFeePart,
@@ -237,7 +251,6 @@ import { partNumberStrings } from "@/constants/part-number-strings";
 import store from "@/store";
 
 import { storeActions } from "@/constants/store-actions";
-import { splitCopyOnCMSPlaceHolder } from "@/helpers/cms-content-helper";
 import {
     calcDaysBetweenDates,
     convertDateStringToDate,
@@ -677,8 +690,7 @@ export default {
         isMobileStaticRecalibrationApplicable() {
             return (
                 this.displayMSR &&
-                this.mobileFeePart?.partNumber == partNumberStrings.MOBILE_STATIC_RECAL_FEE &&
-                (this.isCashItacNoComp || this.mobileFeePart?.isInsurable)
+                this.mobileFeePart?.partNumber == partNumberStrings.MOBILE_STATIC_RECAL_FEE
             );
         },
         displayMSR() {
@@ -688,6 +700,28 @@ export default {
                     ?.toLowerCase() === "true"
             );
         },
+        isMSRFeeNotCoveredByInsurance() {
+            return (
+                this.isMobileSelected &&
+                this.isMobileStaticRecalibrationApplicable &&
+                this.mobileFeeHasPrice &&
+                this.isInsurance &&
+                !this.mobileFeePart?.isInsurable
+            );
+        },
+        MSRFeeAlertHeadlineText() {
+            return this.getCmsContent("AlertMSRNotCoveredByInsuranceWidget", "HeadlineText");
+        },
+        MSRFeeAlertBodyText() {
+            const cmsContentText = this.getCmsContent(
+                "AlertMSRNotCoveredByInsuranceWidget",
+                "BodyText"
+            );
+            return cmsContentText.replaceAll(
+                "{custom:mobileFee}",
+                formatToUSDollar(this.mobileFee)
+            );
+        },
         isCashItacNoComp() {
             return !this.isInsurance || this.isITAC || this.isNoComp;
         },
diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
index 5c78853d4..deb7bca8b 100644
--- a/src/ux-components/alert/alert.vue
+++ b/src/ux-components/alert/alert.vue
@@ -7,9 +7,15 @@
             isDismissible ? 'alert-dismissible' : '',
             this.alertClass,
             this.cssClassNameForCmsWidget,
+            this.hasBorder ? 'bordered' : '',
         ]">
         <p class="mx-6 my-0 fw-bold alert-heading">
             <img v-if="showInfoIcon" :src="infoIcon" alt="Info Icon" class="info-icon" />
+            <img
+                v-if="showWarningIcon"
+                :src="warningIcon"
+                alt="Warning Icon"
+                class="warning-icon" />
             {{ alertHeadline }}
         </p>
         <hr v-if="showHorizontalRow" />
@@ -63,7 +69,9 @@ export default {
     name: "alert",
     props: {
         showInfoIcon: Boolean,
+        showWarningIcon: Boolean,
         showHorizontalRow: Boolean,
+        hasBorder: Boolean,
         isDismissible: Boolean,
         alertClass: String,
         /*
@@ -96,6 +104,9 @@ export default {
         infoIcon() {
             return require(`@/assets/img/icons/info-circle-blue.svg`);
         },
+        warningIcon() {
+            return require(`@/assets/img/icons/alert-circle-yellow.svg`);
+        },
         pageQueryString() {
             return applicationConfig.PAGE_QUERYSTRING;
         },
@@ -211,12 +222,19 @@ export default {
         background-color: $yellow-100;
         .alert-heading {
             color: $yellow-600;
+
+            .warning-icon {
+                height: 1rem;
+            }
         }
         svg {
             fill: $yellow-600;
             width: 1rem;
             height: 1rem;
         }
+        hr {
+            border-color: $yellow-800;
+        }
     }
     &.alert-success {
         background-color: $green-100;
@@ -229,6 +247,9 @@ export default {
             height: 1rem;
         }
     }
+    &.bordered {
+        border: 1px solid;
+    }
     & p {
         font-size: 0.875rem;
     }

From d5ff839f5117b8958905cb0ffd34e2a3343af55f Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 27 Feb 2026 13:35:42 -0500
Subject: [PATCH 11/30] CASH-623 use core service for serviceability details

CASH-623 use core service for serviceability details.  Pass damage type to endpoint now required and remove parms no longer needed
---
 src/store/index.js | 43 +++++++++----------------------------------
 1 file changed, 9 insertions(+), 34 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index 9ddd011bd..9b0e6fa36 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2014,52 +2014,27 @@ export const actions = {
     },
 
     getServiceabilityDetails(context, { payload: { serviceZipCode }, pageNameToLog }) {
-        const escapeRecalibrationType = (rt) => rt.split("&").join("%26");
-
-        const partialLineItemsObjects = context.getters.order.lineItems.glassParts?.map(
-            (lineItem) => ({
-                partNumber: lineItem.partNumber,
-                recalibrationType:
-                    lineItem.recalibrationType && isRecalPartOrHasChildRecalPart(lineItem)
-                        ? escapeRecalibrationType(lineItem.recalibrationType)
-                        : undefined,
-            })
+        const flattenedLineItemsWithChildParts = getFlattenedArrayOfLineItemsWithChildParts(
+            context.getters.order.lineItems.glassParts
         );
 
-        var lineItems = null;
-        if (partialLineItemsObjects) {
-            lineItems = buildQueryStringParameterFromArrayOfComplexObjects(
-                partialLineItemsObjects,
-                "lineItems"
-            );
-        }
-
+        const lineItemsList = flattenedLineItemsWithChildParts
+            .map((item) => item.partNumber)
+            .join(",");
+            
         const vehicle = context.getters.vehicle;
         const carId = vehicle.carId;
         const damage = context.getters.damage;
-        const glassArray = convertGlassPieceNamingForApi(damage.glassToReplace);
-
-        const glassPieces = buildQueryStringParameterFromArrayOfComplexObjects(
-            glassArray,
-            "glassPieces"
-        );
 
         const parentAccountNumber =
             context.getters.order.payment.parentAccountNumber ??
             applicationConfig.CASH_PARENT_ACCOUNT_NUMBER;
-        const referralSequenceNumber = context.getters.order.referralSequenceNumber;
 
-        var endPoint = `${endpoints.GetServiceabilityDetails.url}?zip=${serviceZipCode}&carId=${carId}&parentAccountNumber=${parentAccountNumber}&referralSequenceNumber=${referralSequenceNumber}&applicationName=${applicationConfig.ANALYTICS_APPLICATION_NAME}`;
-        if (lineItems) {
-            endPoint += `&${lineItems}`;
+        var endPoint = `${endpoints.GetServiceabilityDetails.url}?zip=${serviceZipCode}&carId=${carId}&parentAccountNumber=${parentAccountNumber}&damageType=${damage.isRepair}`;
+        if (lineItemsList) {
+            endPoint += `&lineItems=${lineItemsList}`;
         }
 
-        if (glassPieces) {
-            endPoint += `&${glassPieces}`;
-        }
-
-        endPoint += `&isHeavyTruckVehicle=${context.getters.order.vehicle.isBigTruck}`;
-
         return globalMethods.callHttpClient({
             method: endpoints.GetServiceabilityDetails.method,
             endpoint: endPoint,

From 0655817a9ad79a2a59f7d9df716981ff150ae94d Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 27 Feb 2026 13:45:16 -0500
Subject: [PATCH 12/30] prettier

---
 src/store/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/index.js b/src/store/index.js
index 9b0e6fa36..b70ec61d2 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2021,7 +2021,7 @@ export const actions = {
         const lineItemsList = flattenedLineItemsWithChildParts
             .map((item) => item.partNumber)
             .join(",");
-            
+
         const vehicle = context.getters.vehicle;
         const carId = vehicle.carId;
         const damage = context.getters.damage;

From cf94233c3d0c86eeb686bb2cad6d8934f7f5ff53 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 27 Feb 2026 15:18:03 -0500
Subject: [PATCH 13/30] CASH-623

CASH-623
---
 src/store/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/index.js b/src/store/index.js
index b70ec61d2..cd349e351 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2030,7 +2030,7 @@ export const actions = {
             context.getters.order.payment.parentAccountNumber ??
             applicationConfig.CASH_PARENT_ACCOUNT_NUMBER;
 
-        var endPoint = `${endpoints.GetServiceabilityDetails.url}?zip=${serviceZipCode}&carId=${carId}&parentAccountNumber=${parentAccountNumber}&damageType=${damage.isRepair}`;
+        var endPoint = `${endpoints.GetServiceabilityDetails.url}?zip=${serviceZipCode}&carId=${carId}&parentAccountNumber=${parentAccountNumber}&isRepair=${damage.isRepair}`;
         if (lineItemsList) {
             endPoint += `&lineItems=${lineItemsList}`;
         }

From 7af19bba2acc5224691772b5efe36b72d9942ba0 Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Tue, 3 Mar 2026 12:20:20 -0500
Subject: [PATCH 14/30] CASH-2264 - Checking if we have vehicle before routing
 to Vehicle Damage

---
 src/helpers/vehicle-helper.js             | 11 +++++++++++
 src/router/methods/route-logic/vehicle.js |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 src/helpers/vehicle-helper.js

diff --git a/src/helpers/vehicle-helper.js b/src/helpers/vehicle-helper.js
new file mode 100644
index 000000000..cd94d7bd5
--- /dev/null
+++ b/src/helpers/vehicle-helper.js
@@ -0,0 +1,11 @@
+import store from "@/store";
+
+export function hasVehicleInfo() {
+    return (
+        store.getters.order?.vehicle.year &&
+        store.getters.order?.vehicle?.make &&
+        store.getters.order?.vehicle?.model &&
+        store.getters.order?.vehicle?.style &&
+        store.getters.order?.vehicle?.carId
+    );
+}
diff --git a/src/router/methods/route-logic/vehicle.js b/src/router/methods/route-logic/vehicle.js
index 39fa107ab..e7ff41fc0 100644
--- a/src/router/methods/route-logic/vehicle.js
+++ b/src/router/methods/route-logic/vehicle.js
@@ -3,6 +3,7 @@ import { getBoolFromString } from "@/helpers/boolean-helper";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
 import { routeData } from "@/router/constants/routes";
 import { isVerifiedInsurance } from "@/router/methods/helpers/requires-verified-redirect";
+import { hasVehicleInfo } from "@/helpers/vehicle-helper";
 import store from "@/store";
 import { queryStrings } from "@/constants/query-strings";
 import baseMixin from "@/mixins/base-mixin";
@@ -33,7 +34,7 @@ export async function vehicleBeforeEnter(to, from) {
         }
     }
 
-    if (isVerifiedInsurance()) {
+    if (isVerifiedInsurance() && hasVehicleInfo()) {
         return {
             name: routeData.VEHICLE_DAMAGE.name,
             replace: true,

From 664a7d289d7d7e612dc9eb21c47187496066e9a4 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 4 Mar 2026 07:59:51 -0500
Subject: [PATCH 15/30] CASH-2378: add experiment constants

---
 src/constants/experiments.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/constants/experiments.js b/src/constants/experiments.js
index c76b1ea1c..f8691fc46 100644
--- a/src/constants/experiments.js
+++ b/src/constants/experiments.js
@@ -5,6 +5,7 @@ const experimentUniverses = {
     IGQ_SkipQuote: "NextGen_IGQSkipToInsurance",
     AFTERPAY_BREAKOUT_DISPLAY: "AfterpayBreakoutDisplay",
     MOBILE_FIRST_APPOINTMENT: "MobileFirstAppointment",
+    MULTI_LOCATION_POPUP: "MultiLocationPopup",
 };
 
 const experimentSettings = {
@@ -40,6 +41,10 @@ const experimentSettings = {
     SHOW_MOBILE_FIRST_POPUP_REPLACE_WITHOUT_MSR: "Show_Mobile_First_Popup_Replace_Without_MSR",
     SHOW_MOBILE_FIRST_POPUP_REPLACE_WITH_MSR: "Show_Mobile_First_Popup_Replace_With_MSR",
     OFFER_OEM: "OfferOem",
+    SHOW_MULTI_LOCATION_APPT: "ShowMultiLocationAppt",
+    SHOW_NO_AVAILABILE_DAYS_MULTI_LOCATION: "Show_NoAvailableDaysMultiLocation",
+    SHOW_NO_PM_DAYS_MULTI_LOCATION: "Show_NoPMDaysMultiLocation",
+    SHOW_PM_DAYS_MULTI_LOCATION: "Show_PMDaysMultiLocation",
     USE_ADYEN_PAYMENT: "UseAdyenPayment",
     SHOW_UNVERIFIED_DEDUCT_ENTRY: "ShowUnverifiedDeducEntry",
     SERVICE_PACKAGE_ORDER: "ServicePackageOrder",

From 0c32eecdccf47ae54fd6852c0430a9d456cf8e69 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 4 Mar 2026 08:00:39 -0500
Subject: [PATCH 16/30] CASH-2378: create new radio button for multi location
 modal usage

---
 .../button-question/button-question.vue       |   3 +
 .../multi-location-radio.spec.js              | 121 +++++++
 .../multi-location-radio.vue                  | 309 ++++++++++++++++++
 3 files changed, 433 insertions(+)
 create mode 100644 src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.spec.js
 create mode 100644 src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 9862633ad..417c88809 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -226,6 +226,7 @@ export default {
             let classes;
             switch (this.buttonTypeString) {
                 case "timeSlotModalListButton":
+                case "multiLocationRadioButton":
                 case "listButton":
                     classes = "w-100";
                     break;
@@ -265,6 +266,8 @@ export default {
                 classes += " radio-button-container";
             } else if (this.buttonTypeString == "servicePackageRadio") {
                 classes = "package-wrapper col";
+            } else if (this.buttonTypeString == "multiLocationRadioButton") {
+                classes = "multi-location-wrapper col";
             }
 
             if (this.buttonTypeString == "listCard" && this.buttonsInfo.length > 2) {
diff --git a/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.spec.js b/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.spec.js
new file mode 100644
index 000000000..f305d4e2e
--- /dev/null
+++ b/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.spec.js
@@ -0,0 +1,121 @@
+import { mount } from "@vue/test-utils";
+import multiLocationRadio from "./multi-location-radio";
+import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
+
+describe("multi-location-radio.vue", () => {
+    it("Should include buttonLabel in html", async () => {
+        // Arrange
+        let { wrapper } = setupMocks({
+            mountOptionsMockData: {
+                propsData: mockProps,
+            },
+        });
+
+        // Act
+        const outputHtml = wrapper.html();
+
+        // Assert
+        expect(outputHtml).toEqual(expect.stringContaining(mockProps["buttonLabel"]));
+    });
+
+    it("Should include buttonLabelSubCopy in html", async () => {
+        // Arrange
+        let { wrapper } = setupMocks({
+            mountOptionsMockData: {
+                propsData: mockProps,
+            },
+        });
+
+        // Act
+        const outputHtml = wrapper.html();
+
+        // Assert
+        expect(outputHtml).toEqual(expect.stringContaining(mockProps["buttonLabelSubCopy"]));
+    });
+    it("Should include buttonFooterCopy in html", async () => {
+        // Arrange
+        let { wrapper } = setupMocks({
+            mountOptionsMockData: {
+                propsData: mockProps,
+            },
+        });
+
+        // Act
+        const outputHtml = wrapper.html();
+
+        // Assert
+        expect(outputHtml).toEqual(expect.stringContaining(mockProps["buttonFooterCopy"]));
+    });
+    it("Should get 5 strings from getArrayOfListItemsFromRawCmsCopy when provided with a <ul><li>...</li>(x5)</ul> buttonBodyCopy", async () => {
+        // Arrange
+        let { wrapper } = setupMocks({
+            mountOptionsMockData: {
+                propsData: mockProps,
+            },
+        });
+        // Act
+        const results = wrapper.vm.getArrayOfListItemsFromRawCmsCopy(wrapper.vm.buttonBodyCopy);
+
+        // Assert
+        expect(results.length).toBe(5);
+    });
+    it("Should get strings from getArrayOfListItemsFromRawCmsCopy without <ul> or <li> tags when provided with a <ul><li>...</li></ul> buttonBodyCopy", async () => {
+        // Arrange
+        let { wrapper } = setupMocks({
+            mountOptionsMockData: {
+                propsData: mockProps,
+            },
+        });
+
+        // Act
+        const results = wrapper.vm.getArrayOfListItemsFromRawCmsCopy(wrapper.vm.buttonBodyCopy);
+
+        // Assert
+        const fileredResults = results.filter((result) => {
+            return (
+                result.includes("<ul>") ||
+                result.includes("</ul>") ||
+                result.includes("<li>") ||
+                result.includes("</li>")
+            );
+        });
+        expect(fileredResults.length).toBe(0);
+    });
+    it("Should get 5 strings from getArrayOfListItemsFromRawCmsCopy when buttonBodyCopy has 6 total <li>...</li>, but one is empty ", async () => {
+        // Arrange
+        const moddedProps = mockProps;
+        moddedProps["buttonBodyCopy"] =
+            "<ul><li>buttonBodyCopy test copy</li><li>2</li><li>3</li><li>4</li><li>5</li><li></li></ul>";
+        let { wrapper } = setupMocks({
+            mountOptionsMockData: {
+                propsData: moddedProps,
+            },
+        });
+
+        // Act
+        const results = wrapper.vm.getArrayOfListItemsFromRawCmsCopy(wrapper.vm.buttonBodyCopy);
+
+        // Assert
+        expect(results.length).toBe(5);
+    });
+});
+
+const mockProps = {
+    groupName: "group-name",
+    buttonLabel: "buttonLabel test copy",
+    buttonLabelAuxillaryCopy: "buttonLabelAuxillaryCopy test copy",
+    buttonLabelSubCopy: "buttonLabelSubCopy test copy",
+    buttonBodyCopy:
+        "<ul><li>buttonBodyCopy test copy</li><li>2</li><li>3</li><li>4</li><li>5</li></ul>",
+    buttonFooterCopy: "buttonFooterCopy test copy",
+    buttonAuxillaryCopy: "buttonAuxillaryCopy test copy",
+};
+
+function setupMocks({ mountOptionsMockData = {} }) {
+    const wrapper = mount(multiLocationRadio, {
+        ...mountOptionsMockData,
+        mixins: [inputButtonWrapperMixin],
+    });
+
+    return { wrapper };
+}
diff --git a/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue b/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue
new file mode 100644
index 000000000..64c8e3ce2
--- /dev/null
+++ b/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue
@@ -0,0 +1,309 @@
+<template>
+    <baseInputButton v-bind="$props" @buttonClicked="handleAnswerChange" v-model="selectedValue">
+        <div class="location-label" for="testradio">
+            <div class="location-specs">
+                <div class="row">
+                    <div class="col md-6">
+                        <p class="m-0">
+                            <span v-html="this.buttonLabel"></span>
+                        </p>
+                        <span v-html="this.buttonAuxillaryCopy"></span>
+                        <p
+                            class="sub-label m-0"
+                            v-if="this.buttonLabelSubCopy"
+                            v-html="this.buttonLabelSubCopy"></p>
+                    </div>
+                    <hr />
+                    <div class="col md-6 location-info">
+                        <div
+                            class="location-info-label"
+                            v-if="this.buttonBodyCopy"
+                            v-html="this.buttonBodyCopy"></div>
+                    </div>
+                    <div class="time-info" v-html="this.buttonFooterCopy"></div>
+                </div>
+            </div>
+        </div>
+    </baseInputButton>
+</template>
+
+<script>
+import baseInputButton from "@/digital-components/base-input-button/base-input-button";
+import textLink from "@/ux-components/text-link/text-link";
+import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
+import {
+    getRouterLinkDisplayTextFromCopy,
+    getRouterLinkRouteFromCopy,
+    splitCopyOnCMSPlaceHolder,
+    doesCopyContainTextLink,
+} from "@/helpers/cms-content-helper";
+
+export default {
+    name: "multiLocationRadioButton",
+    mixins: [inputButtonWrapperMixin],
+    components: {
+        baseInputButton,
+    },
+    computed: {
+        arrayOfListItemsFromBodyText() {
+            return this.getArrayOfListItemsFromRawCmsCopy(this.buttonBodyCopy);
+        },
+        shouldDisplayStrikeThroughPrice() {
+            const displayPrice = this.buttonAuxillaryCopy?.substring(
+                this.buttonAuxillaryCopy.indexOf("$")
+            );
+            return displayPrice != this.additionalButtonData?.strikeThroughPrice;
+        },
+    },
+    methods: {
+        getRouterLinkDisplayTextFromCopy,
+        getRouterLinkRouteFromCopy,
+        splitCopyOnCMSPlaceHolder,
+        doesCopyContainTextLink,
+        stripUlTagFromCopy(copy) {
+            const regex = /(?:<ul(?:.*?)>)|(?:<\/ul>)/g;
+            return copy?.replace(regex, "");
+        },
+        getArrayOfListItemsFromRawCmsCopy(copy) {
+            const withoutUlTags = this.stripUlTagFromCopy(copy);
+            return withoutUlTags
+                ?.split(/(?:<li(?:.*?)>)|(?:<\/li>)/g)
+                ?.filter((lineItem) => lineItem);
+        },
+    },
+};
+</script>
+
+<style lang="scss">
+.multi-location-wrapper {
+    margin: 1rem 0;
+    &:first-child {
+        margin: 1rem 0 0 0;
+    }
+    &:last-child {
+        margin: 1rem 0 0 0;
+    }
+    @include media-breakpoint-up(md) {
+        margin: 1rem 0.5rem 0 0.5rem;
+        display: flex;
+        flex-direction: column;
+        &:first-child {
+            margin: 1rem 0.5rem 0 0;
+        }
+        &:last-child {
+            margin: 1rem 0 0 0.5rem;
+        }
+    }
+
+    label {
+        display: block;
+        @include media-breakpoint-up(md) {
+            display: flex;
+            height: 100%;
+        }
+    }
+
+    input[type="radio"] {
+        opacity: 0;
+        position: absolute;
+        left: -9999px;
+
+        + .location-label {
+            display: flex;
+            align-items: flex-start;
+            position: relative;
+            cursor: pointer;
+            width: 100%;
+            padding: 0.75rem;
+            border: 1px solid $gray-300;
+            box-shadow:
+                0px 4px 8px -4px rgba(0, 0, 0, 0.15),
+                0px 4px 24px -8px rgba(0, 0, 0, 0.2);
+            border-radius: 0.5rem;
+            overflow: hidden;
+            min-height: 52px;
+            max-height: 126px;
+            @include media-breakpoint-up(md) {
+                max-height: 500px;
+                padding-bottom: 3rem;
+            }
+            transition: max-height 0.25s ease-in;
+
+            &.has-subheader {
+                min-height: 72px;
+            }
+
+            &:before {
+                content: "";
+                position: relative;
+                top: 5px;
+                margin-right: 0.5rem;
+                border-radius: 50%;
+                border: 1px solid $gray-500;
+                width: 16px;
+                height: 16px;
+                min-width: 16px;
+            }
+
+            &:after {
+                content: "";
+                position: absolute;
+                left: 15px;
+                top: 20px;
+                border-radius: 50%;
+                width: 10px;
+                height: 10px;
+                min-width: 10px;
+            }
+        }
+
+        &:hover {
+            + .location-label {
+                &:before {
+                    border: 1px solid #8e9292;
+                    box-shadow:
+                        0px 0px 0px 4px #9fcee6,
+                        0px 1px 4px rgba(0, 0, 0, 0.2);
+                }
+            }
+        }
+
+        &:checked {
+            + .location-label {
+                .location-specs {
+                    max-height: 1000px;
+                }
+            }
+            + .location-label {
+                .location-specs {
+                    .hide-when-closed {
+                        display: block;
+                    }
+                    p:first-child {
+                        font-weight: 600;
+                    }
+                }
+            }
+            + .location-label {
+                border: 1px solid $blue;
+                max-height: 500px;
+                background-color: $blue-100;
+                .special-save-box {
+                    background-color: $green-200;
+                }
+            }
+            + .location-label {
+                &:before {
+                    box-shadow: 0px 0px 0px 1px $blue;
+                }
+            }
+            + .location-label {
+                &:after {
+                    background: $blue;
+                }
+            }
+        }
+
+        &:focus {
+            + .location-label {
+                &:before {
+                    border: 2px solid $blue;
+                }
+            }
+        }
+    }
+
+    .package-footer {
+        color: $red;
+        font-weight: 600;
+    }
+
+    .location-specs {
+        display: flex;
+        flex-direction: column;
+        width: 100%;
+        transition: all 0.5s ease;
+        @include media-breakpoint-up(md) {
+            max-height: 500px;
+        }
+
+        .row {
+            align-items: center;
+        }
+
+        .pricing-info .insurance-pricing span {
+            font-size: 0.875rem;
+            font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
+        }
+
+        p {
+            font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            white-space: nowrap;
+            &:first-child {
+                font-weight: 400;
+            }
+            span {
+                &.pricing-info {
+                    color: $green;
+                    font-size: 0.875rem;
+                    font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
+                    @include media-breakpoint-up(md) {
+                        position: absolute;
+                        bottom: 0.75rem;
+                        left: 0;
+                        width: 100%;
+                        margin-left: 1.25rem;
+                    }
+                    span.strikethrough-price {
+                        text-decoration: line-through;
+                        font-size: 0.75rem;
+                        font-weight: 400;
+                        color: $gray-550;
+                        padding-right: 8px;
+                    }
+                }
+            }
+            &.sub-label {
+                color: $green;
+                text-transform: uppercase;
+                font-size: 0.75rem;
+            }
+        }
+
+        ul {
+            margin: 1rem 0 0 -5px;
+            padding: 0;
+            li {
+                font-size: 0.875rem;
+                line-height: 1.714;
+                color: $gray-550;
+                a {
+                    line-height: 1.714;
+                    padding: 0;
+                }
+            }
+        }
+
+        @keyframes slideaway {
+            from {
+                display: block;
+            }
+            to {
+                transform: translateY(40px);
+                opacity: 0;
+            }
+        }
+
+        .hide-when-closed {
+            display: none;
+            @include media-breakpoint-up(md) {
+                display: flex;
+                flex-direction: column;
+            }
+        }
+    }
+}
+</style>

From b3fb548813eddfdebc96e1569f033ddc71fd3c35 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 4 Mar 2026 08:01:13 -0500
Subject: [PATCH 17/30] CASH-2378: new component for multi location modal

---
 .../multi-location-modal.vue                  | 317 ++++++++++++++++++
 1 file changed, 317 insertions(+)
 create mode 100644 src/layouts/schedule/multi-location-modal/multi-location-modal.vue

diff --git a/src/layouts/schedule/multi-location-modal/multi-location-modal.vue b/src/layouts/schedule/multi-location-modal/multi-location-modal.vue
new file mode 100644
index 000000000..78dbe6ba5
--- /dev/null
+++ b/src/layouts/schedule/multi-location-modal/multi-location-modal.vue
@@ -0,0 +1,317 @@
+<template>
+    <div id="multi-location-modal-container">
+        <modal
+            :ref="modalName"
+            :headerText="modalHeaderText"
+            suppressPageScroll
+            :onModalClosedCallback="onModalClosed"
+            :footerButtonText="modalFooterText"
+            :isFooterButtonPrimary="true"
+            @footer-button-event="confirmAppointment"
+            @isModalOpened="setIsModalOpen">
+            <buttonQuestion
+                ref="buttonQuestion"
+                buttonTypeString="multiLocationRadioButton"
+                :buttonTypeObject="multiLocationRadioButton"
+                class="mt-5"
+                :answers="availableAppointments"
+                groupName="multiLocationQuestion"
+                textPosition="text-center"
+                v-model="selectedValue"
+                isRequired
+                validationRules="time-slot-required" />
+
+            <template v-slot:modal-header-slot>
+                <span>{{ modalSubHeaderText }}</span>
+            </template>
+            <template v-slot:modal-footer-slot>
+                <button
+                    type="button"
+                    class="btn btn-link"
+                    id="see-more-options"
+                    :disabled="isLoading"
+                    @click="closeModal">
+                    {{ buttonText }}
+                </button>
+            </template>
+        </modal>
+    </div>
+</template>
+
+<script>
+// Supporting files
+import store from "@/store";
+import modal from "@/digital-components/modal/modal";
+import { splitCopyOnCMSPlaceHolder } from "@/helpers/cms-content-helper";
+import { get12HourTimeFormat } from "@/helpers/date-helper";
+import { getDisplayTextForDurationLength } from "@/helpers/duration-length-helper";
+import buttonQuestion from "@/digital-components/button-question/button-question";
+import multiLocationRadioButton from "./multi-location-radio/multi-location-radio";
+
+// Validation
+import { defineRule, useField } from "vee-validate";
+import { errorMessages } from "@/constants/error-messages";
+import { required } from "@/helpers/validation-rules";
+
+const NULL_APPOINTMENT = {
+    estimatedServiceMinutes: {
+        minimum: null,
+        maximum: null,
+    },
+    timeSlot: null,
+    date: null,
+};
+
+// Validation for the modal button
+defineRule("time-slot-required", required(errorMessages.OPTION_REQUIRED));
+
+export default {
+    name: "multi-location-modal",
+    props: {
+        cmsWidgetName: String,
+        modalWidgetName: String,
+        buttonWidgetName: String,
+    },
+    data() {
+        return {
+            isModalOpen: false,
+            mobileAppointmentOption: NULL_APPOINTMENT,
+            inshopAppointmentOption: NULL_APPOINTMENT,
+            confirmedAppointment: false,
+            multiLocationRadioButton: multiLocationRadioButton,
+            selectedValue: null,
+        };
+    },
+    methods: {
+        splitCopyOnCMSPlaceHolder,
+        get12HourTimeFormat,
+        openModal() {
+            this.modal.openModal();
+        },
+        onModalClosed() {
+            this.pushEvent();
+            this.$emit("close-mobile-first-modal");
+            this.confirmedAppointment = false;
+        },
+        closeModal() {
+            this.modal.closeModal();
+        },
+        confirmAppointment() {
+            if (!this.selectedAppointment) return;
+
+            const selectedTimeSlot = {
+                timeSlot: this.selectedAppointment.timeSlot,
+                routeCode: this.selectedAppointment.timeSlot.id,
+                date: this.selectedAppointment.date,
+            };
+            this.confirmedAppointment = true;
+            this.$emit("confirm-appointment", {
+                selectedTimeSlot: selectedTimeSlot,
+                appointmentType: this.selectedValue,
+            });
+            this.modal.closeModal();
+        },
+        setPromotedMobileAppointment(appointment) {
+            this.mobileAppointmentOption = appointment;
+        },
+        setPromotedInshopAppointment(appointment) {
+            this.inshopAppointmentOption = appointment;
+        },
+        getIsModalOpen() {
+            return this.isModalOpen;
+        },
+        setIsModalOpen(isOpen) {
+            this.isModalOpen = isOpen;
+        },
+        pushEvent() {
+            let gaAction = this.confirmedAppointment ? this.GaActions.YES : this.GaActions.NO;
+            if (this.mobileAppointmentOption && this.mobileAppointmentOption.timeSlot) {
+                this.pushEventToGA(
+                    this.GaCategories.CONFIRMATION_CLICKED,
+                    gaAction,
+                    this.mobileAppointmentOption.timeSlot.startTime +
+                        "-" +
+                        this.mobileAppointmentOption.timeSlot.endTime +
+                        " " +
+                        this.mobileAppointmentOption.date,
+                    true
+                );
+            }
+        },
+    },
+    computed: {
+        selectedAppointment() {
+            if (this.selectedValue?.toLowerCase() === "mobile") {
+                return this.mobileAppointmentOption;
+            } else if (this.selectedValue?.toLowerCase() === "inshop") {
+                return this.inshopAppointmentOption;
+            } else {
+                return NULL_APPOINTMENT;
+            }
+        },
+        modalName() {
+            return this.modalWidgetName;
+        },
+        modal() {
+            return this.$refs[this.modalName];
+        },
+        modalSubHeaderText() {
+            return this.getCmsContent(this.modalWidgetName, "SubheaderText");
+        },
+        modalHeaderText() {
+            return this.getCmsContent(this.modalWidgetName, "HeaderText");
+        },
+        modalFooterText() {
+            return this.getCmsContent(this.modalWidgetName, "FooterText");
+        },
+        buttonText() {
+            return this.getCmsContent(this.modalWidgetName, "FooterText2");
+        },
+        mobileButtonLabel() {
+            return this.getCmsContent(this.buttonWidgetName, "HeaderText");
+        },
+        inshopButtonLabel() {
+            return this.getCmsContent(this.buttonWidgetName, "SubheaderText");
+        },
+        mobileButtonDate() {
+            if (!this.mobileAppointmentOption.date) return "";
+            return new Date(this.mobileAppointmentOption.date).toLocaleDateString("en-US", {
+                timeZone: "UTC",
+                weekday: "short",
+                month: "long",
+                day: "numeric",
+            });
+        },
+        inshopButtonDate() {
+            if (!this.inshopAppointmentOption.date) return "";
+            return new Date(this.inshopAppointmentOption.date).toLocaleDateString("en-US", {
+                timeZone: "UTC",
+                weekday: "short",
+                month: "long",
+                day: "numeric",
+            });
+        },
+        mobileButtonTime() {
+            const timeslot =
+                this.get12HourTimeFormat(this.mobileAppointmentOption.timeSlot?.startTime) +
+                " - " +
+                this.get12HourTimeFormat(this.mobileAppointmentOption.timeSlot?.endTime);
+            return timeslot;
+        },
+        inshopButtonTime() {
+            const timeslot = this.get12HourTimeFormat(
+                this.inshopAppointmentOption.timeSlot?.startTime
+            );
+            return timeslot;
+        },
+        mobileLocationLabel() {
+            return this.getCmsContent(this.buttonWidgetName, "BodyText");
+        },
+        inshopLocationLabel() {
+            return this.inshopAppointmentOption?.addressCopy;
+        },
+        mobileServiceDuration() {
+            const durationTime = getDisplayTextForDurationLength(
+                this.mobileAppointmentOption.estimatedServiceMinutes.minimum,
+                this.mobileAppointmentOption.estimatedServiceMinutes.maximum
+            );
+            const footerText = this.getCmsContent(this.buttonWidgetName, "FooterText").replaceAll(
+                "{custom:serviceLength}",
+                durationTime
+            );
+            return footerText;
+        },
+        inshopServiceDuration() {
+            const durationTime = getDisplayTextForDurationLength(
+                this.inshopAppointmentOption.estimatedServiceMinutes.minimum,
+                this.inshopAppointmentOption.estimatedServiceMinutes.maximum
+            );
+            const footerText = this.getCmsContent(this.buttonWidgetName, "FooterText").replaceAll(
+                "{custom:serviceLength}",
+                durationTime
+            );
+            return footerText;
+        },
+        availableAppointments() {
+            return [
+                {
+                    value: "mobile",
+                    buttonLabel: this.mobileButtonDate,
+                    buttonLabelSubCopy: this.mobileButtonTime,
+                    buttonBodyCopy: this.mobileLocationLabel,
+                    buttonAuxillaryCopy: this.mobileButtonLabel,
+                    buttonFooterCopy: this.mobileServiceDuration,
+                },
+                {
+                    value: "inshop",
+                    buttonLabel: this.inshopButtonDate,
+                    buttonLabelSubCopy: this.inshopButtonTime,
+                    buttonBodyCopy: this.inshopLocationLabel,
+                    buttonAuxillaryCopy: this.inshopButtonLabel,
+                    buttonFooterCopy: this.inshopServiceDuration,
+                },
+            ];
+        },
+    },
+    components: { modal, buttonQuestion },
+};
+</script>
+<style lang="scss">
+#multi-location-modal-container {
+    .modal-component {
+        @include media-breakpoint-up(md) {
+            .modal-dialog {
+                left: 0;
+                align-content: center;
+                flex-wrap: wrap;
+                width: 22.063rem;
+                transform: translate(0, 0);
+
+                .modal-content {
+                    border-radius: $border-radius-lg;
+                }
+            }
+        }
+        .modal-dialog {
+            .modal-content {
+                .modal-header {
+                    flex-direction: column;
+                    & > span {
+                        color: $red;
+                        font-size: $font-size-14;
+                        font-weight: $font-weight-600;
+                        text-transform: uppercase;
+                    }
+
+                    .modal-title {
+                        font-size: $font-size-20;
+                        font-weight: $font-weight-normal;
+                    }
+                }
+                .modal-body {
+                    padding: 0.5rem 1rem;
+
+                    .modal-body-inner {
+                        ul {
+                            list-style: none;
+                            padding: 1rem;
+                            background-color: #f4f4f4;
+                            font-size: $font-size-14;
+                        }
+                    }
+                }
+                .modal-footer {
+                    flex-flow: wrap-reverse;
+
+                    #see-more-options {
+                        width: 100%;
+                        text-decoration: none;
+                        margin-top: 1.5rem;
+                        font-weight: $font-weight-600;
+                    }
+                }
+            }
+        }
+    }
+}
+</style>

From e5aa47673b3f55df137291819e4d9b3bd8fcc7c7 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 4 Mar 2026 08:05:52 -0500
Subject: [PATCH 18/30] CASH-2378: updates to mobile first modal (renaming,
 change in helper method)

---
 src/layouts/schedule/schedule.vue | 54 +++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 07330b5d6..e1dd86e06 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -5,7 +5,7 @@
         <mobileFirstModal
             modalWidgetName="MobileFirstModalWidget"
             ref="mobileFirstModal"
-            @confirm-appointment="updateTimeSlotandNavigateForward" />
+            @confirm-appointment="updateMobileFirstTimeSlotandNavigateForward" />
         <recalAckModal
             modalWidgetName="RecalAckModalWidget"
             agreementWidgetName="RecalAgreementQuestionWidget"
@@ -488,10 +488,6 @@ export default {
             shopListButton: shopListButton,
             lastSelectedInshopOrDropoffProvider: null,
             selectedMobileFirstAppointment: false,
-            isShowMobileFirstAppt: experimentMixin.methods.hasSettingEqualTo(
-                experimentSettings.SHOW_MOBILE_FIRST_APPT,
-                "true"
-            ),
             calendarLoadingStatus: "none",
         };
     },
@@ -988,6 +984,12 @@ export default {
                 return this.selectableDatesInshop?.days?.length > 0;
             }
         },
+        isShowMobileFirstAppt() {
+            return experimentMixin.methods.hasSettingEqualTo(
+                experimentSettings.SHOW_MOBILE_FIRST_APPT,
+                "true"
+            );
+        },
     },
     methods: {
         splitCopyOnCMSPlaceHolder,
@@ -1934,10 +1936,10 @@ export default {
                 const order = this.$store.getters.order;
                 const isRepair = order.damage.isRepair;
 
-                let preSelectedMobileAppointment = null;
+                let promotedMobileAppointment = null;
                 const todaysDate = getTodayDate();
-                let firstMobileAMAppt = await this.getFirstAvailableMobileApptByTOD("AM");
-                let firstMobilePMAppt = await this.getFirstAvailableMobileApptByTOD("PM");
+                let firstMobileAMAppt = await this.getFirstAvailableApptByTOD("AM", "mobile");
+                let firstMobilePMAppt = await this.getFirstAvailableApptByTOD("PM", "mobile");
                 if (!firstMobileAMAppt && !firstMobilePMAppt) {
                     return;
                 }
@@ -2032,7 +2034,7 @@ export default {
                     if (this.isShowMobileFirstAppt) {
                         if (pmMobileDays == 0) {
                             // Selects the first available time slot
-                            preSelectedMobileAppointment =
+                            promotedMobileAppointment =
                                 numberOfDaysToFirstMobileAMDate <= numberOfDaysToFirstMobilePMDate
                                     ? firstMobileAMAppt
                                     : firstMobilePMAppt;
@@ -2041,20 +2043,20 @@ export default {
                             numberOfDaysToFirstMobilePMDate <= pmMobileDays
                         ) {
                             // Selects the first available PM time slot
-                            preSelectedMobileAppointment = firstMobilePMAppt;
+                            promotedMobileAppointment = firstMobilePMAppt;
                         } else if (
                             firstMobilePMDate &&
                             numberOfDaysToFirstMobilePMDate >= noPMMobileDays
                         ) {
                             // Selects the first available AM time slot. If none, selects the first available PM time slot
-                            preSelectedMobileAppointment = firstMobileAMAppt
+                            promotedMobileAppointment = firstMobileAMAppt
                                 ? firstMobileAMAppt
                                 : firstMobilePMAppt;
                         }
 
-                        if (preSelectedMobileAppointment) {
+                        if (promotedMobileAppointment) {
                             this.$refs.mobileFirstModal.setSelectedAppointment(
-                                preSelectedMobileAppointment
+                                promotedMobileAppointment
                             );
                             this.$refs.mobileFirstModal.openModal();
                         }
@@ -2062,11 +2064,19 @@ export default {
                 }
             }
         },
-        async getFirstAvailableMobileApptByTOD(timeOfDay) {
-            if (!this.selectableDatesMobile?.days?.length) {
+        async getFirstAvailableApptByTOD(timeOfDay, appointmentType) {
+            let selectableDays;
+            if (appointmentType?.toLowerCase() == "mobile") {
+                selectableDays = this.selectableDatesMobile?.days;
+            } else if (appointmentType?.toLowerCase() == "inshop") {
+                selectableDays = this.selectableDatesInshop?.days;
+            } else {
+                return;
+            }
+            if (!selectableDays?.length) {
                 return null;
             } else {
-                for (const dateObj of this.selectableDatesMobile.days) {
+                for (const dateObj of selectableDays) {
                     let matchingTimeSlot = {
                         estimatedServiceMinutes: {
                             minimum: this.estimatedServiceMinutesMinimum,
@@ -2081,6 +2091,16 @@ export default {
                             (matchingTimeSlot.timeSlot = slot) &&
                             (matchingTimeSlot.date = dateObj.date)
                     );
+                    if (
+                        appointmentType?.toLowerCase() == "inshop" &&
+                        this.selectedShopAnswer?.address1 &&
+                        this.selectedShopAnswer?.address2
+                    ) {
+                        matchingTimeSlot.addressCopy =
+                            this.selectedShopAnswer?.address1 +
+                            ", " +
+                            this.selectedShopAnswer?.address2;
+                    }
                     if (isMatchingApptDay && matchingTimeSlot) {
                         return matchingTimeSlot;
                     }
@@ -2088,7 +2108,7 @@ export default {
                 return null;
             }
         },
-        updateTimeSlotandNavigateForward(timeSlotObj) {
+        updateMobileFirstTimeSlotandNavigateForward(timeSlotObj) {
             this.selectedMobileFirstAppointment = true;
             this.appointmentType = AppointmentTypeStrings.MOBILE;
             this.selectedDate = timeSlotObj.date;

From 364b5d29bf961af42e4371632941064a2591ba97 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 4 Mar 2026 08:06:27 -0500
Subject: [PATCH 19/30] CASH-2378: implement new multi location modal

---
 src/layouts/schedule/schedule.vue | 198 +++++++++++++++++++++++++++++-
 1 file changed, 193 insertions(+), 5 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index e1dd86e06..dbdaaa90f 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -6,6 +6,11 @@
             modalWidgetName="MobileFirstModalWidget"
             ref="mobileFirstModal"
             @confirm-appointment="updateMobileFirstTimeSlotandNavigateForward" />
+        <multiLocationModal
+            modalWidgetName="MultiLocationModalWidget"
+            buttonWidgetName="MultiLocationRadioButtonWidget"
+            ref="multiLocationModal"
+            @confirm-appointment="updateMultiLocationTimeSlotandNavigateForward" />
         <recalAckModal
             modalWidgetName="RecalAckModalWidget"
             agreementWidgetName="RecalAgreementQuestionWidget"
@@ -14,7 +19,9 @@
             ref="recalAckModal" />
         <div
             class="container page-container-grouped-styles"
-            :class="[isMobileFirstModalOpen ? 'hidden-background' : '']">
+            :class="[
+                isMobileFirstModalOpen || isMultiLocationModalOpen ? 'hidden-background' : '',
+            ]">
             <div class="row">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
                     <mobileFeeWaiverAlert
@@ -201,6 +208,7 @@ import shopLocation from "@/layouts/schedule/shop-location/shop-location";
 import timeSlotQuestion from "@/layouts/schedule/time-slot-question/time-slot-question.vue";
 import durationTextBlock from "@/layouts/schedule/duration-text-block/duration-text-block.vue";
 import mobileFirstModal from "@/layouts/schedule/mobile-first-modal/mobile-first-modal.vue";
+import multiLocationModal from "@/layouts/schedule/multi-location-modal/multi-location-modal.vue";
 import recalAckModal from "@/layouts/schedule/recal-ack-modal/recal-ack-modal.vue";
 
 import shopQuestion from "@/layouts/service-location/shop-question/shop-question";
@@ -488,6 +496,7 @@ export default {
             shopListButton: shopListButton,
             lastSelectedInshopOrDropoffProvider: null,
             selectedMobileFirstAppointment: false,
+            selectedMultiLocationAppointment: false,
             calendarLoadingStatus: "none",
         };
     },
@@ -620,7 +629,8 @@ export default {
                 shopProviderData.data
             );
             vm.initializeDatePicker().then(() => {
-                vm.showMobileFirstModal();
+                // vm.showMobileFirstModal(); // KEEP IN CASE WE WANT TO REINSTATE MOBILE FIRST
+                vm.showMultiLocationModal();
                 vm.hideLoadingModal();
                 vm.calendarLoadingStatus = "none";
                 if (!vm.preSelectedDate) vm.setSelectedDateToFirstAvailable();
@@ -930,6 +940,11 @@ export default {
                 ? this.$refs.mobileFirstModal?.getIsModalOpen()
                 : false;
         },
+        isMultiLocationModalOpen() {
+            return this.selectableDatesMobile.days && this.selectableDatesInshop.days
+                ? this.$refs.multiLocationModal?.getIsModalOpen()
+                : false;
+        },
         displayWaitList() {
             if (!this.appointmentType) return false;
             const firstMobileDateString =
@@ -990,6 +1005,12 @@ export default {
                 "true"
             );
         },
+        isShowMultiLocationPopup() {
+            return experimentMixin.methods.hasSettingEqualTo(
+                experimentSettings.SHOW_MULTI_LOCATION_APPT,
+                "true"
+            );
+        },
     },
     methods: {
         splitCopyOnCMSPlaceHolder,
@@ -1275,7 +1296,8 @@ export default {
                 }
             }
             this.initializeDatePicker().then(() => {
-                this.showMobileFirstModal();
+                // this.showMobileFirstModal(); // KEEP IN CASE WE WANT TO REINSTATE MOBILE FIRST
+                this.showMultiLocationModal();
                 this.hideLoadingModal();
                 this.calendarLoadingStatus = "none";
                 this.setSelectedDateToFirstAvailable();
@@ -1309,7 +1331,7 @@ export default {
         },
 
         async initializeDatePicker() {
-            this.isShowMobileFirstAppt && this.showLoadingModal();
+            this.isShowMultiLocationPopup && this.showLoadingModal();
 
             const includeMobileTimeSlots = this.isServiceableMobile;
             const includeInshopTimeSlots = this.isServiceableInshop || this.isServiceableDropoff;
@@ -1821,7 +1843,8 @@ export default {
                 this.zipCodeCtu = newZipCode.zipCodeCtu;
                 this.selectedDate = null;
                 this.initializeDatePicker().then(() => {
-                    this.showMobileFirstModal();
+                    // this.showMobileFirstModal(); // KEEP IN CASE WE WANT TO REINSTATE MOBILE FIRST
+                    this.showMultiLocationModal();
                     this.hideLoadingModal();
                     this.calendarLoadingStatus = "none";
                     this.setSelectedDateToFirstAvailable();
@@ -2064,6 +2087,157 @@ export default {
                 }
             }
         },
+        async showMultiLocationModal() {
+            if (!this.selectedRouteCodeData?.routeCode) {
+                let maxDayRangeToShowPmTimeslot = experimentMixin.methods.getSettingValue(
+                    experimentSettings.SHOW_PM_DAYS_MULTI_LOCATION
+                );
+                let maxDayRangeToShowNoPmTimeslot = experimentMixin.methods.getSettingValue(
+                    experimentSettings.SHOW_NO_PM_DAYS_MULTI_LOCATION
+                );
+                let maxDayRangeToShowAnyTimeslot = experimentMixin.methods.getSettingValue(
+                    experimentSettings.SHOW_NO_AVAILABILE_DAYS_MULTI_LOCATION
+                );
+                let showMultiLocationAppointment = experimentMixin.methods.getSettingValue(
+                    experimentSettings.SHOW_MULTI_LOCATION_APPT
+                );
+
+                // temp vars to use for testing; TO BE REMOVED
+                maxDayRangeToShowPmTimeslot = 2;
+                maxDayRangeToShowNoPmTimeslot = 2;
+                maxDayRangeToShowAnyTimeslot = 5;
+
+                let promotedMobileAppointment = null;
+                let promotedInshopAppointment = null;
+                const todaysDate = getTodayDate();
+
+                // Helper function to calculate days until appointment (handles null/undefined)
+                const calculateDaysUntilDate = (appointmentObj) => {
+                    const dateString = appointmentObj?.date;
+                    return dateString
+                        ? (new Date(dateString) - todaysDate) / (1000 * 60 * 60 * 24)
+                        : null;
+                };
+
+                // Fetch all appointments
+                const [firstMobileAMAppt, firstMobilePMAppt, firstInshopAMAppt, firstInshopPMAppt] =
+                    await Promise.all([
+                        this.getFirstAvailableApptByTOD("AM", "mobile"),
+                        this.getFirstAvailableApptByTOD("PM", "mobile"),
+                        this.getFirstAvailableApptByTOD("AM", "inshop"),
+                        this.getFirstAvailableApptByTOD("PM", "inshop"),
+                    ]);
+
+                // Extract dates
+                const firstMobileAMDate = firstMobileAMAppt?.date;
+                const firstMobilePMDate = firstMobilePMAppt?.date;
+                const firstInshopAMDate = firstInshopAMAppt?.date;
+                const firstInshopPMDate = firstInshopPMAppt?.date;
+
+                // Calculate days until appointments
+                const numberOfDaysToFirstMobileAMDate = calculateDaysUntilDate(firstMobileAMAppt);
+                const numberOfDaysToFirstMobilePMDate = calculateDaysUntilDate(firstMobilePMAppt);
+                const numberOfDaysToFirstInshopAMDate = calculateDaysUntilDate(firstInshopAMAppt);
+                const numberOfDaysToFirstInshopPMDate = calculateDaysUntilDate(firstInshopPMAppt);
+
+                const shouldExposeMultiLocationModal = () => {
+                    const isMobileAppointmentInDateRange =
+                        (firstMobileAMDate &&
+                            numberOfDaysToFirstMobileAMDate <= maxDayRangeToShowAnyTimeslot) ||
+                        (firstMobilePMDate &&
+                            numberOfDaysToFirstMobilePMDate <= maxDayRangeToShowAnyTimeslot);
+                    const isInshopAppointmentInDateRange =
+                        (firstInshopAMDate &&
+                            numberOfDaysToFirstInshopAMDate <= maxDayRangeToShowAnyTimeslot) ||
+                        (firstInshopPMDate &&
+                            numberOfDaysToFirstInshopPMDate <= maxDayRangeToShowAnyTimeslot);
+
+                    if (showMultiLocationAppointment) {
+                        return isMobileAppointmentInDateRange && isInshopAppointmentInDateRange;
+                    }
+                    return false;
+                };
+
+                if (shouldExposeMultiLocationModal()) {
+                    const multiLocationPopupExperiment =
+                        store.getters.applicationUser.experiments.find(
+                            (e) => e.universeName === experimentUniverses.MULTI_LOCATION_POPUP
+                        );
+                    const hasExposedMultiLocationPopup = multiLocationPopupExperiment?.isExposed;
+
+                    if (!hasExposedMultiLocationPopup && multiLocationPopupExperiment) {
+                        baseMixin.methods.dispatchStoreActionWithLogging(
+                            storeActions.LOG_EXPERIMENT_EXPOSURE_AND_UPDATE_STORE,
+                            {
+                                userId: getUserIdValue(),
+                                deviceId: getDeviceIdValue(),
+                                sessionKey: getSessionKeyValue(),
+                                pageName: "schedule",
+                                experiment: multiLocationPopupExperiment,
+                            },
+                            "schedule",
+                            false
+                        );
+                    }
+                    if (this.isShowMultiLocationPopup) {
+                        if (maxDayRangeToShowPmTimeslot == 0) {
+                            // Selects the first available mobile time slot
+                            promotedMobileAppointment =
+                                numberOfDaysToFirstMobileAMDate <= numberOfDaysToFirstMobilePMDate
+                                    ? firstMobileAMAppt
+                                    : firstMobilePMAppt;
+                            // Selects the first available inshop time slot
+                            promotedInshopAppointment =
+                                numberOfDaysToFirstInshopAMDate <= numberOfDaysToFirstInshopPMDate
+                                    ? firstInshopAMAppt
+                                    : firstInshopPMAppt;
+                        } else {
+                            if (
+                                firstMobilePMDate &&
+                                numberOfDaysToFirstMobilePMDate <= maxDayRangeToShowPmTimeslot
+                            ) {
+                                // Selects the first available PM time slot
+                                promotedMobileAppointment = firstMobilePMAppt;
+                            } else if (
+                                firstMobilePMDate &&
+                                numberOfDaysToFirstMobilePMDate >= maxDayRangeToShowNoPmTimeslot
+                            ) {
+                                // Selects the first available AM time slot. If none, selects the first available PM time slot
+                                promotedMobileAppointment = firstMobileAMAppt
+                                    ? firstMobileAMAppt
+                                    : firstMobilePMAppt;
+                            }
+
+                            if (
+                                firstInshopPMDate &&
+                                numberOfDaysToFirstInshopPMDate <= maxDayRangeToShowPmTimeslot
+                            ) {
+                                // Selects the first available PM time slot
+                                promotedInshopAppointment = firstInshopPMAppt;
+                            } else if (
+                                firstInshopPMDate &&
+                                numberOfDaysToFirstInshopPMDate >= maxDayRangeToShowNoPmTimeslot
+                            ) {
+                                // Selects the first available AM time slot. If none, selects the first available PM time slot
+                                promotedInshopAppointment = firstInshopAMAppt
+                                    ? firstInshopAMAppt
+                                    : firstInshopPMAppt;
+                            }
+                        }
+
+                        if (promotedMobileAppointment && promotedInshopAppointment) {
+                            this.$refs.multiLocationModal.setPromotedMobileAppointment(
+                                promotedMobileAppointment
+                            );
+                            this.$refs.multiLocationModal.setPromotedInshopAppointment(
+                                promotedInshopAppointment
+                            );
+                            this.$refs.multiLocationModal.openModal();
+                        }
+                    }
+                }
+            }
+        },
         async getFirstAvailableApptByTOD(timeOfDay, appointmentType) {
             let selectableDays;
             if (appointmentType?.toLowerCase() == "mobile") {
@@ -2084,6 +2258,7 @@ export default {
                         },
                         timeSlot: null,
                         date: null,
+                        addressCopy: null,
                     };
                     const isMatchingApptDay = dateObj.timeSlots.some(
                         (slot) =>
@@ -2116,6 +2291,18 @@ export default {
             this.updateTimeSlot(timeSlotObj);
             this.forwardButtonAction();
         },
+        updateMultiLocationTimeSlotandNavigateForward({ selectedTimeSlot, appointmentType }) {
+            if (appointmentType?.toLowerCase() == "mobile") {
+                this.appointmentType = AppointmentTypeStrings.MOBILE;
+            } else if (appointmentType?.toLowerCase() == "inshop") {
+                this.appointmentType = AppointmentTypeStrings.IN_SHOP;
+            }
+            this.selectedMultiLocationAppointment = true;
+            this.selectedDate = selectedTimeSlot.date;
+            this.updateSelectedProvider();
+            this.updateTimeSlot(selectedTimeSlot);
+            this.forwardButtonAction();
+        },
         updateRecalAcknowledgedAndNavigateForward(isAcknowledged) {
             this.isRecalAcknowledgedForScheduling = isAcknowledged;
             this.forwardButtonAction();
@@ -2139,6 +2326,7 @@ export default {
         textBlock,
         timeSlotQuestion,
         mobileFirstModal,
+        multiLocationModal,
         recalAckModal,
         alert,
         serviceZipModalQuestion,

From e5b00fde3ed6239f4b232caf9ed3a3d7474f011c Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 4 Mar 2026 08:41:38 -0500
Subject: [PATCH 20/30] CASH-2378: implement copilot PR review suggestions
 (better guards, removing superfluous emit)

---
 .../schedule/multi-location-modal/multi-location-modal.vue     | 3 +--
 src/layouts/schedule/schedule.vue                              | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/layouts/schedule/multi-location-modal/multi-location-modal.vue b/src/layouts/schedule/multi-location-modal/multi-location-modal.vue
index 78dbe6ba5..3ca0693a8 100644
--- a/src/layouts/schedule/multi-location-modal/multi-location-modal.vue
+++ b/src/layouts/schedule/multi-location-modal/multi-location-modal.vue
@@ -90,14 +90,13 @@ export default {
         },
         onModalClosed() {
             this.pushEvent();
-            this.$emit("close-mobile-first-modal");
             this.confirmedAppointment = false;
         },
         closeModal() {
             this.modal.closeModal();
         },
         confirmAppointment() {
-            if (!this.selectedAppointment) return;
+            if (!this.selectedAppointment.timeSlot.id) return;
 
             const selectedTimeSlot = {
                 timeSlot: this.selectedAppointment.timeSlot,
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index dbdaaa90f..f4a9c09ac 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -2152,7 +2152,7 @@ export default {
                         (firstInshopPMDate &&
                             numberOfDaysToFirstInshopPMDate <= maxDayRangeToShowAnyTimeslot);
 
-                    if (showMultiLocationAppointment) {
+                    if (showMultiLocationAppointment?.toLowerCase() === "true") {
                         return isMobileAppointmentInDateRange && isInshopAppointmentInDateRange;
                     }
                     return false;

From 4b3c80c62b510249ce45250aabfd6a08553d896a Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 4 Mar 2026 14:47:28 -0500
Subject: [PATCH 21/30] CASH-2378 - remove hard coded values

---
 src/layouts/schedule/schedule.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index f4a9c09ac..e55274d01 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -2102,11 +2102,6 @@ export default {
                     experimentSettings.SHOW_MULTI_LOCATION_APPT
                 );
 
-                // temp vars to use for testing; TO BE REMOVED
-                maxDayRangeToShowPmTimeslot = 2;
-                maxDayRangeToShowNoPmTimeslot = 2;
-                maxDayRangeToShowAnyTimeslot = 5;
-
                 let promotedMobileAppointment = null;
                 let promotedInshopAppointment = null;
                 const todaysDate = getTodayDate();

From de4384a6c3050dee9b63cf82e88b5bf93b4477f1 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 4 Mar 2026 16:32:27 -0500
Subject: [PATCH 22/30] CASH-2378: add GA event changes

---
 src/constants/analytics.js                    |  2 ++
 .../multi-location-modal.vue                  | 31 +++++++++++++++++--
 src/layouts/schedule/schedule.vue             | 11 ++++++-
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/constants/analytics.js b/src/constants/analytics.js
index e156de11b..51b0c24b6 100644
--- a/src/constants/analytics.js
+++ b/src/constants/analytics.js
@@ -15,6 +15,8 @@ const GaCategories = {
     APPOINTMENT: "Appointment",
     SERVICE_LOCATION: "service-location",
     CONFIRMATION_CLICKED: "confirmation clicked",
+    INSHOP_CONFIRMATION_CLICKED: "inshop confirmation clicked",
+    MOBILE_CONFIRMATION_CLICKED: "mobile confirmation clicked",
     RECAL_DISCLAIMER: "Recalibration disclaimer",
 };
 
diff --git a/src/layouts/schedule/multi-location-modal/multi-location-modal.vue b/src/layouts/schedule/multi-location-modal/multi-location-modal.vue
index 3ca0693a8..012e8a15d 100644
--- a/src/layouts/schedule/multi-location-modal/multi-location-modal.vue
+++ b/src/layouts/schedule/multi-location-modal/multi-location-modal.vue
@@ -80,6 +80,7 @@ export default {
             confirmedAppointment: false,
             multiLocationRadioButton: multiLocationRadioButton,
             selectedValue: null,
+            experimentSettings: "",
         };
     },
     methods: {
@@ -122,18 +123,42 @@ export default {
         setIsModalOpen(isOpen) {
             this.isModalOpen = isOpen;
         },
+        captureExperimentSettings(settingsString) {
+            this.experimentSettings = settingsString;
+        },
         pushEvent() {
             let gaAction = this.confirmedAppointment ? this.GaActions.YES : this.GaActions.NO;
-            if (this.mobileAppointmentOption && this.mobileAppointmentOption.timeSlot) {
+            if (
+                this.selectedValue?.toLowerCase() === "mobile" &&
+                this.mobileAppointmentOption?.timeSlot
+            ) {
                 this.pushEventToGA(
-                    this.GaCategories.CONFIRMATION_CLICKED,
+                    this.GaCategories.MOBILE_CONFIRMATION_CLICKED,
                     gaAction,
                     this.mobileAppointmentOption.timeSlot.startTime +
                         "-" +
                         this.mobileAppointmentOption.timeSlot.endTime +
                         " " +
                         this.mobileAppointmentOption.date,
-                    true
+                    true,
+                    null,
+                    this.experimentSettings
+                );
+            } else if (
+                this.selectedValue?.toLowerCase() === "inshop" &&
+                this.inshopAppointmentOption?.timeSlot
+            ) {
+                this.pushEventToGA(
+                    this.GaCategories.INSHOP_CONFIRMATION_CLICKED,
+                    gaAction,
+                    this.inshopAppointmentOption.timeSlot.startTime +
+                        "-" +
+                        this.inshopAppointmentOption.timeSlot.endTime +
+                        " " +
+                        this.inshopAppointmentOption.date,
+                    true,
+                    null,
+                    this.experimentSettings
                 );
             }
         },
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index e55274d01..f771a2363 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -2101,7 +2101,15 @@ export default {
                 let showMultiLocationAppointment = experimentMixin.methods.getSettingValue(
                     experimentSettings.SHOW_MULTI_LOCATION_APPT
                 );
-
+                let experimentSettingsString =
+                    "ShowPm:" +
+                    maxDayRangeToShowPmTimeslot +
+                    "|" +
+                    "NoPm:" +
+                    maxDayRangeToShowNoPmTimeslot +
+                    "|" +
+                    "NoAvail:" +
+                    maxDayRangeToShowAnyTimeslot;
                 let promotedMobileAppointment = null;
                 let promotedInshopAppointment = null;
                 const todaysDate = getTodayDate();
@@ -2228,6 +2236,7 @@ export default {
                                 promotedInshopAppointment
                             );
                             this.$refs.multiLocationModal.openModal();
+                            this.$refs.multiLocationModal.captureExperimentSettings(experimentSettingsString);
                         }
                     }
                 }

From 3bced163dcd4480512d1c0ccc01b10770b68c969 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 4 Mar 2026 16:36:44 -0500
Subject: [PATCH 23/30] CASH-2378 prettier fix

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index f771a2363..a11045ce2 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -2236,7 +2236,9 @@ export default {
                                 promotedInshopAppointment
                             );
                             this.$refs.multiLocationModal.openModal();
-                            this.$refs.multiLocationModal.captureExperimentSettings(experimentSettingsString);
+                            this.$refs.multiLocationModal.captureExperimentSettings(
+                                experimentSettingsString
+                            );
                         }
                     }
                 }

From 27c7da1eb5891d761ae8267a690ee44dedc28697 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 5 Mar 2026 08:56:16 -0500
Subject: [PATCH 24/30] Revert "Merge pull request #3075 from
 Safelite/feature/CASH-1684"

This reverts commit cbb02bf4ae8ec30300b6b8fcbbf3c76cc7b424a7, reversing
changes made to e44acb4e617d6bb82afe8872b44c66dc4fd2fe0c.
---
 src/assets/img/icons/alert-circle-yellow.svg |  3 --
 src/helpers/cms-content-helper.js            | 11 -----
 src/layouts/schedule/schedule.vue            | 42 ++------------------
 src/ux-components/alert/alert.vue            | 21 ----------
 4 files changed, 4 insertions(+), 73 deletions(-)
 delete mode 100644 src/assets/img/icons/alert-circle-yellow.svg

diff --git a/src/assets/img/icons/alert-circle-yellow.svg b/src/assets/img/icons/alert-circle-yellow.svg
deleted file mode 100644
index 904aefb98..000000000
--- a/src/assets/img/icons/alert-circle-yellow.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="21" viewBox="0 0 20 21">
-    <path fill="#E86421" fill-rule="nonzero" d="M10 .5c5.523 0 10 4.477 10 10s-4.477 10-10 10-10-4.477-10-10S4.477.5 10 .5zm.043 13.6a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm.77-9.2h-1.54l-.088.009a.502.502 0 0 0-.299.193.66.66 0 0 0-.125.47l.747 6.806.017.096c.065.249.263.425.495.426l.084-.008c.22-.042.396-.246.427-.51l.793-6.805.004-.102a.651.651 0 0 0-.127-.37.489.489 0 0 0-.388-.205z"/>
-</svg>
diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js
index 450875d0f..727add296 100644
--- a/src/helpers/cms-content-helper.js
+++ b/src/helpers/cms-content-helper.js
@@ -343,14 +343,3 @@ export function splitCMSCopyOnParagraphTag(copy) {
 export function splitCMSCopyOnBR(copy) {
     return copy.split("<br>");
 }
-
-// This function takes in a number and returns it formatted as USD currency, with or without cents depending on if the number is an integer or not.
-export function formatToUSDollar(amount) {
-    const isInteger = amount % 1 === 0;
-    return new Intl.NumberFormat("en-US", {
-        style: "currency",
-        currency: "USD",
-        minimumFractionDigits: isInteger ? 0 : 2,
-        maximumFractionDigits: 2,
-    }).format(amount);
-}
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index a11045ce2..89ed21a08 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -81,16 +81,6 @@
                         cmsWidgetName="AlertNoShopsWidget"
                         v-if="displayNoShopsAlert"
                         alertClass="alert-warning" />
-                    <alert
-                        ref="alertMSRNotCoveredByInsurance"
-                        class="mt-5 mb-5"
-                        v-if="isMSRFeeNotCoveredByInsurance"
-                        :manualHeadline="MSRFeeAlertHeadlineText"
-                        :manualCopy="MSRFeeAlertBodyText"
-                        :showWarningIcon="true"
-                        :hasBorder="true"
-                        :showHorizontalRow="true"
-                        alertClass="alert-warning" />
                 </div>
             </div>
             <div
@@ -239,11 +229,7 @@ import {
     RECAL_ACK_YES,
 } from "@/constants/schedule-constants";
 
-import {
-    fetchCmsContentForPage,
-    splitCopyOnCMSPlaceHolder,
-    formatToUSDollar,
-} from "@/helpers/cms-content-helper";
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import {
     getPricedMobileFeePart,
@@ -259,6 +245,7 @@ import { partNumberStrings } from "@/constants/part-number-strings";
 import store from "@/store";
 
 import { storeActions } from "@/constants/store-actions";
+import { splitCopyOnCMSPlaceHolder } from "@/helpers/cms-content-helper";
 import {
     calcDaysBetweenDates,
     convertDateStringToDate,
@@ -696,7 +683,8 @@ export default {
         isMobileStaticRecalibrationApplicable() {
             return (
                 this.displayMSR &&
-                this.mobileFeePart?.partNumber == partNumberStrings.MOBILE_STATIC_RECAL_FEE
+                this.mobileFeePart?.partNumber == partNumberStrings.MOBILE_STATIC_RECAL_FEE &&
+                (this.isCashItacNoComp || this.mobileFeePart?.isInsurable)
             );
         },
         displayMSR() {
@@ -706,28 +694,6 @@ export default {
                     ?.toLowerCase() === "true"
             );
         },
-        isMSRFeeNotCoveredByInsurance() {
-            return (
-                this.isMobileSelected &&
-                this.isMobileStaticRecalibrationApplicable &&
-                this.mobileFeeHasPrice &&
-                this.isInsurance &&
-                !this.mobileFeePart?.isInsurable
-            );
-        },
-        MSRFeeAlertHeadlineText() {
-            return this.getCmsContent("AlertMSRNotCoveredByInsuranceWidget", "HeadlineText");
-        },
-        MSRFeeAlertBodyText() {
-            const cmsContentText = this.getCmsContent(
-                "AlertMSRNotCoveredByInsuranceWidget",
-                "BodyText"
-            );
-            return cmsContentText.replaceAll(
-                "{custom:mobileFee}",
-                formatToUSDollar(this.mobileFee)
-            );
-        },
         isCashItacNoComp() {
             return !this.isInsurance || this.isITAC || this.isNoComp;
         },
diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
index deb7bca8b..5c78853d4 100644
--- a/src/ux-components/alert/alert.vue
+++ b/src/ux-components/alert/alert.vue
@@ -7,15 +7,9 @@
             isDismissible ? 'alert-dismissible' : '',
             this.alertClass,
             this.cssClassNameForCmsWidget,
-            this.hasBorder ? 'bordered' : '',
         ]">
         <p class="mx-6 my-0 fw-bold alert-heading">
             <img v-if="showInfoIcon" :src="infoIcon" alt="Info Icon" class="info-icon" />
-            <img
-                v-if="showWarningIcon"
-                :src="warningIcon"
-                alt="Warning Icon"
-                class="warning-icon" />
             {{ alertHeadline }}
         </p>
         <hr v-if="showHorizontalRow" />
@@ -69,9 +63,7 @@ export default {
     name: "alert",
     props: {
         showInfoIcon: Boolean,
-        showWarningIcon: Boolean,
         showHorizontalRow: Boolean,
-        hasBorder: Boolean,
         isDismissible: Boolean,
         alertClass: String,
         /*
@@ -104,9 +96,6 @@ export default {
         infoIcon() {
             return require(`@/assets/img/icons/info-circle-blue.svg`);
         },
-        warningIcon() {
-            return require(`@/assets/img/icons/alert-circle-yellow.svg`);
-        },
         pageQueryString() {
             return applicationConfig.PAGE_QUERYSTRING;
         },
@@ -222,19 +211,12 @@ export default {
         background-color: $yellow-100;
         .alert-heading {
             color: $yellow-600;
-
-            .warning-icon {
-                height: 1rem;
-            }
         }
         svg {
             fill: $yellow-600;
             width: 1rem;
             height: 1rem;
         }
-        hr {
-            border-color: $yellow-800;
-        }
     }
     &.alert-success {
         background-color: $green-100;
@@ -247,9 +229,6 @@ export default {
             height: 1rem;
         }
     }
-    &.bordered {
-        border: 1px solid;
-    }
     & p {
         font-size: 0.875rem;
     }

From e1bd79ef8e2a2ac0c5c99f9853012d5a37a3b575 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 5 Mar 2026 10:19:38 -0500
Subject: [PATCH 25/30] CASH-2442 ZipPlus4 changes

CASH-2442 pass address line 1/2 to the tax endpoint so zipPlus4 can be requested for tax purposes
---
 .../promo-modal-question/promo-modal-question.vue         | 4 ++++
 src/layouts/payment-method/payment-method.vue             | 8 ++++++++
 src/store/index.js                                        | 4 ++++
 3 files changed, 16 insertions(+)

diff --git a/src/fmg-components/promo-modal-question/promo-modal-question.vue b/src/fmg-components/promo-modal-question/promo-modal-question.vue
index 1e87d5bb5..bb3b390a8 100644
--- a/src/fmg-components/promo-modal-question/promo-modal-question.vue
+++ b/src/fmg-components/promo-modal-question/promo-modal-question.vue
@@ -317,6 +317,10 @@ export default {
                                     serviceLocationZipCode:
                                         store.getters.order.serviceLocation.zipCode,
                                     pricedLineItems: pricedLineItemsToTax,
+                                    serviceLocationAddressLine1:
+                                        store.getters.order.serviceLocation?.address,
+                                    serviceLocationAddressLine2:
+                                        store.getters.order.serviceLocation?.address2,
                                 },
                                 "payment-method",
                                 false
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 4d80f84c0..d333b4bbf 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -322,6 +322,8 @@ export default {
                 serviceLocationState: store.getters.order.serviceLocation.state,
                 serviceLocationZipCode: store.getters.order.serviceLocation.zipCode,
                 pricedLineItems: lineItemsForCart,
+                serviceLocationAddressLine1: store.getters.order.serviceLocation?.address,
+                serviceLocationAddressLine2: store.getters.order.serviceLocation?.address2,
             },
             "payment-method",
             false
@@ -526,6 +528,10 @@ export default {
                         serviceLocationState: this.$store.getters.order.serviceLocation.state,
                         serviceLocationZipCode: this.$store.getters.order.serviceLocation.zipCode,
                         pricedLineItems: this.lineItems,
+                        serviceLocationAddressLine1:
+                            this.$store.getters.order.serviceLocation?.address,
+                        serviceLocationAddressLine2:
+                            this.$store.getters.order.serviceLocation?.address2,
                     },
                     "payment-method",
                     false
@@ -650,6 +656,8 @@ export default {
                     serviceLocationState: store.getters.order.serviceLocation.state,
                     serviceLocationZipCode: store.getters.order.serviceLocation.zipCode,
                     pricedLineItems: this.lineItems,
+                    serviceLocationAddressLine1: store.getters.order.serviceLocation?.address,
+                    serviceLocationAddressLine2: store.getters.order.serviceLocation?.address2,
                 },
                 "payment-method",
                 false
diff --git a/src/store/index.js b/src/store/index.js
index cd349e351..e91ec6c0b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -3115,6 +3115,8 @@ export const actions = {
                 serviceLocationState,
                 serviceLocationZipCode,
                 pricedLineItems,
+                serviceLocationAddressLine1,
+                serviceLocationAddressLine2,
             },
             pageNameToLog,
         }
@@ -3148,6 +3150,8 @@ export const actions = {
                 appointmentType: appointmentType,
                 pricedLineItems: lineItemsWithOnlyPriceInfo,
                 serviceLocation: {
+                    addressLine1: appointmentType == "Mobile" ? serviceLocationAddressLine1 : null,
+                    addressLine2: appointmentType == "Mobile" ? serviceLocationAddressLine2 : null,
                     city: appointmentType == "Mobile" ? serviceLocationCity : null,
                     state: appointmentType == "Mobile" ? serviceLocationState : null,
                     zipCode: appointmentType == "Mobile" ? serviceLocationZipCode : null,

From ef8ff581d5a65025f78f7465592dfe1893c6dcfc Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 5 Mar 2026 15:05:35 -0500
Subject: [PATCH 26/30] CASH-2378 - CSS updates

---
 .../multi-location-modal.vue                  |  10 +-
 .../multi-location-radio.vue                  | 155 +++++++-----------
 src/styles/mixins/customMixins.scss           |   5 +
 src/styles/ux-variables.scss                  |   6 +
 4 files changed, 82 insertions(+), 94 deletions(-)

diff --git a/src/layouts/schedule/multi-location-modal/multi-location-modal.vue b/src/layouts/schedule/multi-location-modal/multi-location-modal.vue
index 012e8a15d..2ca7176e9 100644
--- a/src/layouts/schedule/multi-location-modal/multi-location-modal.vue
+++ b/src/layouts/schedule/multi-location-modal/multi-location-modal.vue
@@ -300,13 +300,15 @@ export default {
             .modal-content {
                 .modal-header {
                     flex-direction: column;
+                    text-align: center;
+                    padding: 0 1rem;
+
                     & > span {
                         color: $red;
-                        font-size: $font-size-14;
                         font-weight: $font-weight-600;
                         text-transform: uppercase;
+                        font-family: $font-family-sans-serif-semibold;
                     }
-
                     .modal-title {
                         font-size: $font-size-20;
                         font-weight: $font-weight-normal;
@@ -315,6 +317,10 @@ export default {
                 .modal-body {
                     padding: 0.5rem 1rem;
 
+                    .button-question {
+                        margin-top: 0.75rem;
+                    }
+
                     .modal-body-inner {
                         ul {
                             list-style: none;
diff --git a/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue b/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue
index 64c8e3ce2..0adabf9cc 100644
--- a/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue
+++ b/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue
@@ -1,26 +1,25 @@
 <template>
     <baseInputButton v-bind="$props" @buttonClicked="handleAnswerChange" v-model="selectedValue">
-        <div class="location-label" for="testradio">
+        <div class="radio-label" for="testradio">
             <div class="location-specs">
                 <div class="row">
                     <div class="col md-6">
                         <p class="m-0">
                             <span v-html="this.buttonLabel"></span>
                         </p>
-                        <span v-html="this.buttonAuxillaryCopy"></span>
+                        <span class="service-tag" v-html="this.buttonAuxillaryCopy"></span>
                         <p
                             class="sub-label m-0"
                             v-if="this.buttonLabelSubCopy"
                             v-html="this.buttonLabelSubCopy"></p>
-                    </div>
-                    <hr />
+                    </div> 
                     <div class="col md-6 location-info">
                         <div
                             class="location-info-label"
                             v-if="this.buttonBodyCopy"
                             v-html="this.buttonBodyCopy"></div>
                     </div>
-                    <div class="time-info" v-html="this.buttonFooterCopy"></div>
+                    <div class="col md-6 time-info" v-html="this.buttonFooterCopy"></div>
                 </div>
             </div>
         </div>
@@ -83,17 +82,6 @@ export default {
     &:last-child {
         margin: 1rem 0 0 0;
     }
-    @include media-breakpoint-up(md) {
-        margin: 1rem 0.5rem 0 0.5rem;
-        display: flex;
-        flex-direction: column;
-        &:first-child {
-            margin: 1rem 0.5rem 0 0;
-        }
-        &:last-child {
-            margin: 1rem 0 0 0.5rem;
-        }
-    }
 
     label {
         display: block;
@@ -108,7 +96,7 @@ export default {
         position: absolute;
         left: -9999px;
 
-        + .location-label {
+        + .radio-label {
             display: flex;
             align-items: flex-start;
             position: relative;
@@ -124,7 +112,6 @@ export default {
             min-height: 52px;
             max-height: 126px;
             @include media-breakpoint-up(md) {
-                max-height: 500px;
                 padding-bottom: 3rem;
             }
             transition: max-height 0.25s ease-in;
@@ -158,7 +145,7 @@ export default {
         }
 
         &:hover {
-            + .location-label {
+            + .radio-label {
                 &:before {
                     border: 1px solid #8e9292;
                     box-shadow:
@@ -169,35 +156,27 @@ export default {
         }
 
         &:checked {
-            + .location-label {
-                .location-specs {
-                    max-height: 1000px;
-                }
-            }
-            + .location-label {
+            + .radio-label {
                 .location-specs {
                     .hide-when-closed {
                         display: block;
                     }
-                    p:first-child {
-                        font-weight: 600;
+                    .service-tag {
+                        background: $blue;
+                        color: $blue-150;
                     }
                 }
             }
-            + .location-label {
+            + .radio-label {
                 border: 1px solid $blue;
-                max-height: 500px;
                 background-color: $blue-100;
-                .special-save-box {
-                    background-color: $green-200;
-                }
             }
-            + .location-label {
+            + .radio-label {
                 &:before {
                     box-shadow: 0px 0px 0px 1px $blue;
                 }
             }
-            + .location-label {
+            + .radio-label {
                 &:after {
                     background: $blue;
                 }
@@ -205,7 +184,7 @@ export default {
         }
 
         &:focus {
-            + .location-label {
+            + .radio-label {
                 &:before {
                     border: 2px solid $blue;
                 }
@@ -213,77 +192,69 @@ export default {
         }
     }
 
-    .package-footer {
-        color: $red;
-        font-weight: 600;
-    }
-
     .location-specs {
         display: flex;
         flex-direction: column;
         width: 100%;
         transition: all 0.5s ease;
-        @include media-breakpoint-up(md) {
-            max-height: 500px;
-        }
 
         .row {
             align-items: center;
+
+            .col {
+                flex: 1 0 100%;
+            }
+
+            .service-tag {
+                font-size: $font-size-12;
+                font-family: $font-family-sans-serif-semibold;
+                position: absolute;
+                top: 0;
+                right: 0;
+                background: $blue-150;
+                color: $blue;
+                padding: 0.25rem 0.5rem;
+                border-radius: 1rem;
+                margin: 0.5rem;
+            }
+            p {
+                font-size: $font-size-14;
+
+                & > span {
+                    color: $black;
+                    font-family: $font-family-sans-serif-semibold;
+                    font-weight: $font-weight-bold;
+                    font-size: $font-size-base;
+                }
+            }
+            .sub-label {
+                margin-bottom: 0.5rem !important;
+                border-bottom: 1px solid $gray-1000;
+            }
         }
 
-        .pricing-info .insurance-pricing span {
-            font-size: 0.875rem;
-            font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
+        .location-info-label, .time-info {
+            font-family: $font-family-sans-serif;
+            font-size: $font-size-12;
         }
-
-        p {
-            font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
+        .location-info-label {
             display: flex;
-            justify-content: space-between;
             align-items: center;
-            white-space: nowrap;
-            &:first-child {
-                font-weight: 400;
-            }
-            span {
-                &.pricing-info {
-                    color: $green;
-                    font-size: 0.875rem;
-                    font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
-                    @include media-breakpoint-up(md) {
-                        position: absolute;
-                        bottom: 0.75rem;
-                        left: 0;
-                        width: 100%;
-                        margin-left: 1.25rem;
-                    }
-                    span.strikethrough-price {
-                        text-decoration: line-through;
-                        font-size: 0.75rem;
-                        font-weight: 400;
-                        color: $gray-550;
-                        padding-right: 8px;
-                    }
-                }
-            }
-            &.sub-label {
-                color: $green;
-                text-transform: uppercase;
-                font-size: 0.75rem;
-            }
-        }
 
-        ul {
-            margin: 1rem 0 0 -5px;
-            padding: 0;
-            li {
-                font-size: 0.875rem;
-                line-height: 1.714;
-                color: $gray-550;
-                a {
-                    line-height: 1.714;
-                    padding: 0;
-                }
+            &:before {
+                content: "";
+                display: inline-block;
+                position: relative;
+                top: 0;
+                margin-right: 0.375rem;
+                width: 0.75rem;
+                height: 1rem;
+                background-image: url(~@/assets/img/icons/location-pin.svg);
+                background-repeat: no-repeat;
+                background-position: 0 50%;
+                background-size: 0.75rem auto;
+                padding: 0 0.75rem 0 0;
+                @include blue-filter();
             }
         }
 
diff --git a/src/styles/mixins/customMixins.scss b/src/styles/mixins/customMixins.scss
index 62abcc82d..2a5d3add3 100644
--- a/src/styles/mixins/customMixins.scss
+++ b/src/styles/mixins/customMixins.scss
@@ -20,3 +20,8 @@
 }
 // Usage: @include responsive-font-size-md(mobile-font-size-in-rem, desktop-font-size-in-rem);
 // Example: @include responsive-font-size-md(0.875rem, 1rem);
+
+// Filter to use on SVG elements that are background
+@mixin blue-filter {
+    filter: brightness(0) saturate(100%) invert(31%) sepia(68%) saturate(1676%) hue-rotate(186deg) brightness(93%) contrast(110%);
+}
\ No newline at end of file
diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss
index 76035c6ca..9ad9381a7 100644
--- a/src/styles/ux-variables.scss
+++ b/src/styles/ux-variables.scss
@@ -127,6 +127,12 @@ $body-color: $gray-600;
 $font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif;
 $font-family-monospace:
     UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+$font-family-sans-serif-semibold: UrbanistSemibold, Arial, Helvetica, sans-serif;
+$font-family-sans-serif-bold: UrbanistBold, Arial, Helvetica, sans-serif;
+$font-family-sans-serif-extrabold: UrbanistExtraBold, Arial, Helvetica, sans-serif;
+$font-family-sans-serif-medium-italic: UrbanistMedium_Italic, Arial, Helvetica, sans-serif;
+$font-family-sans-serif-bold-italic: UrbanistBold_Italic, Arial, Helvetica, sans-serif;
+
 // stylelint-enable value-keyword-case
 $font-family-base: $font-family-sans-serif;
 $font-family-code: $font-family-monospace;

From 980fb39b8087ff3bf8388a8cca8457bedf2ae305 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 5 Mar 2026 15:23:30 -0500
Subject: [PATCH 27/30] CASH-2378 prettier fixes

---
 .../multi-location-radio/multi-location-radio.vue            | 5 +++--
 src/styles/mixins/customMixins.scss                          | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue b/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue
index 0adabf9cc..00c7f5016 100644
--- a/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue
+++ b/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue
@@ -12,7 +12,7 @@
                             class="sub-label m-0"
                             v-if="this.buttonLabelSubCopy"
                             v-html="this.buttonLabelSubCopy"></p>
-                    </div> 
+                    </div>
                     <div class="col md-6 location-info">
                         <div
                             class="location-info-label"
@@ -233,7 +233,8 @@ export default {
             }
         }
 
-        .location-info-label, .time-info {
+        .location-info-label,
+        .time-info {
             font-family: $font-family-sans-serif;
             font-size: $font-size-12;
         }
diff --git a/src/styles/mixins/customMixins.scss b/src/styles/mixins/customMixins.scss
index 2a5d3add3..4ee56d5f1 100644
--- a/src/styles/mixins/customMixins.scss
+++ b/src/styles/mixins/customMixins.scss
@@ -23,5 +23,6 @@
 
 // Filter to use on SVG elements that are background
 @mixin blue-filter {
-    filter: brightness(0) saturate(100%) invert(31%) sepia(68%) saturate(1676%) hue-rotate(186deg) brightness(93%) contrast(110%);
-}
\ No newline at end of file
+    filter: brightness(0) saturate(100%) invert(31%) sepia(68%) saturate(1676%) hue-rotate(186deg)
+        brightness(93%) contrast(110%);
+}

From bae4df944c2866f39764ef0eab5886b84304ef59 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 6 Mar 2026 11:15:23 -0500
Subject: [PATCH 28/30] CASH-2448 - update inshop GA event label

---
 .../schedule/multi-location-modal/multi-location-modal.vue      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/layouts/schedule/multi-location-modal/multi-location-modal.vue b/src/layouts/schedule/multi-location-modal/multi-location-modal.vue
index 2ca7176e9..effa3c91b 100644
--- a/src/layouts/schedule/multi-location-modal/multi-location-modal.vue
+++ b/src/layouts/schedule/multi-location-modal/multi-location-modal.vue
@@ -153,8 +153,6 @@ export default {
                     gaAction,
                     this.inshopAppointmentOption.timeSlot.startTime +
                         "-" +
-                        this.inshopAppointmentOption.timeSlot.endTime +
-                        " " +
                         this.inshopAppointmentOption.date,
                     true,
                     null,

From def39132eb2486c9c5eaae68dbdc0fe84231afdf Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 6 Mar 2026 14:52:54 -0500
Subject: [PATCH 29/30] CASH-2449: added link to address

---
 .../multi-location-radio.vue                  | 32 ++++++++++++++++++-
 src/mixins/base-mixin.js                      |  9 ++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue b/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue
index 00c7f5016..275c6cd2c 100644
--- a/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue
+++ b/src/layouts/schedule/multi-location-modal/multi-location-radio/multi-location-radio.vue
@@ -16,8 +16,17 @@
                     <div class="col md-6 location-info">
                         <div
                             class="location-info-label"
-                            v-if="this.buttonBodyCopy"
+                            v-if="this.buttonBodyCopy && this.value === 'mobile'"
                             v-html="this.buttonBodyCopy"></div>
+                        <div
+                            class="location-info-label"
+                            v-if="this.buttonBodyCopy && this.value === 'inshop'">
+                            <textLink
+                                linkType="newWindowLink"
+                                :text="this.buttonBodyCopy"
+                                :href="inshopHref"
+                                target="_blank" />
+                        </div>
                     </div>
                     <div class="col md-6 time-info" v-html="this.buttonFooterCopy"></div>
                 </div>
@@ -36,12 +45,14 @@ import {
     splitCopyOnCMSPlaceHolder,
     doesCopyContainTextLink,
 } from "@/helpers/cms-content-helper";
+import baseMixin from "@/mixins/base-mixin.js";
 
 export default {
     name: "multiLocationRadioButton",
     mixins: [inputButtonWrapperMixin],
     components: {
         baseInputButton,
+        textLink,
     },
     computed: {
         arrayOfListItemsFromBodyText() {
@@ -53,6 +64,19 @@ export default {
             );
             return displayPrice != this.additionalButtonData?.strikeThroughPrice;
         },
+        isAppleBrowser() {
+            return baseMixin.methods.isAppleBrowser();
+        },
+        inshopHref() {
+            if (this.isAppleBrowser) {
+                return "https://maps.apple.com/?q=" + encodeURIComponent(this.buttonBodyCopy) + '"';
+            }
+            return (
+                "https://www.google.com/maps/search/?api=1&query=" +
+                encodeURIComponent(this.buttonBodyCopy) +
+                '"'
+            );
+        },
     },
     methods: {
         getRouterLinkDisplayTextFromCopy,
@@ -257,6 +281,12 @@ export default {
                 padding: 0 0.75rem 0 0;
                 @include blue-filter();
             }
+            & > a.new-window-link {
+                margin-bottom: 0;
+                font-family: $font-family-sans-serif;
+                font-size: $font-size-12;
+                padding-bottom: 0;
+            }
         }
 
         @keyframes slideaway {
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 813a3189a..4ca139275 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -209,6 +209,15 @@ export default {
                 userAgent.includes("webOS")
             );
         },
+        isAppleBrowser() {
+            const userAgent = navigator.userAgent;
+            return (
+                userAgent.includes("iPod") ||
+                userAgent.includes("iPad") ||
+                userAgent.includes("iPhone") ||
+                userAgent.includes("Mac")
+            );
+        },
         getSubmittedOrder() {
             return JSON.parse(
                 window.sessionStorage.getItem(sessionStorageKeyConstants.SUBMITTED_STATE)

From 158c4a6f35fa5e619006f4fc23e7193b18915942 Mon Sep 17 00:00:00 2001
From: Matt Sykes <Matthew.Sykes@safelite.com>
Date: Fri, 6 Mar 2026 17:34:28 -0500
Subject: [PATCH 30/30] Fixes go to definition and intellisense for @ imports
 that are everywher

---
 jsconfig.json | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 jsconfig.json

diff --git a/jsconfig.json b/jsconfig.json
new file mode 100644
index 000000000..30e99a02e
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,9 @@
+{
+    "compilerOptions": {
+      "baseUrl": ".",
+      "paths": {
+        "@/*": ["src/*"]
+      }
+    },
+    "include": ["src"]
+  }
\ No newline at end of file