From c6ec570f4c761584ece1408b6c167fadc5d2bb30 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Mon, 6 Oct 2025 10:50:44 -0400
Subject: [PATCH 001/233] CASH-1527 | Initial attempt at updating salesforce

Apparently it does not work in localhost.
---
 .../salesforce-helper-dev.js                  | 69 +++++--------------
 .../salesforce-webchat/salesforce-webchat.vue | 13 ++--
 .../sierra-webchat/sierra-webchat.vue         | 16 ++---
 src/helpers/webchat-helper.js                 |  2 +-
 src/styles/ux-variables.scss                  |  4 +-
 5 files changed, 35 insertions(+), 69 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-dev.js b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
index d11ccf0d4..f7f2b24fd 100644
--- a/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
@@ -7,9 +7,9 @@ function setupCustomSettings(
     onWebchatCloseCallback
 ) {
     modifyEmbeddedSvcCallback();
-    embedded_svc.addEventHandler("onSettingsCallCompleted", finishedLoadingCallback);
-    embedded_svc.addEventHandler("afterMaximize", onWebchatOpenCallback);
-    embedded_svc.addEventHandler("afterDestroy", onWebchatCloseCallback);
+    embeddedservice_bootstrap.addEventHandler("onSettingsCallCompleted", finishedLoadingCallback);
+    embeddedservice_bootstrap.addEventHandler("afterMaximize", onWebchatOpenCallback);
+    embeddedservice_bootstrap.addEventHandler("afterDestroy", onWebchatCloseCallback);
 }
 
 /*
@@ -36,24 +36,6 @@ export function initializeSalesforceWebchatForDev(
     onWebchatCloseCallback
 ) {
     var initESW = function (gslbBaseURL) {
-        embedded_svc.settings.displayHelpButton = true; //Or false
-        embedded_svc.settings.language = ""; //For example, enter 'en' or 'en-US'
-        //embedded_svc.settings.defaultMinimizedText = '...'; //(Defaults to Chat with an Expert)
-        //embedded_svc.settings.disabledMinimizedText = '...'; //(Defaults to Agent Offline)
-        //embedded_svc.settings.loadingText = ''; //(Defaults to Loading)
-        //embedded_svc.settings.storageDomain = 'yourdomain.com'; //(Sets the domain for your deployment so that visitors can navigate subdomains during a chat session)
-        // Settings for Chat
-        //embedded_svc.settings.directToButtonRouting = function(prechatFormData) {
-        // Dynamically changes the button ID based on what the visitor enters in the pre-chat form.
-        // Returns a valid button ID.
-        //};
-        //embedded_svc.settings.prepopulatedPrechatFields = {}; //Sets the auto-population of pre-chat form fields
-        //embedded_svc.settings.fallbackRouting = []; //An array of button IDs, user IDs, or userId_buttonId
-        //embedded_svc.settings.offlineSupportMinimizedText = '...'; //(Defaults to Contact Us)
-
-        embedded_svc.settings.enabledFeatures = ["LiveAgent"];
-        embedded_svc.settings.entryFeature = "LiveAgent";
-
         setupCustomSettings(
             modifyEmbeddedSvcCallback,
             finishedLoadingCallback,
@@ -61,36 +43,19 @@ export function initializeSalesforceWebchatForDev(
             onWebchatCloseCallback
         );
 
-        embedded_svc.init(
-            "https://safelite2--dev.sandbox.my.salesforce.com",
-            "https://safelite2--dev.sandbox.my.salesforce-sites.com/chat",
-            gslbBaseURL,
-            "00D6s0000008r6A",
-            "Sales_Central_Snap_in",
-            {
-                baseLiveAgentContentURL:
-                    "https://c.la12s-core1.sfdc-8tgtt5.salesforceliveagent.com/content",
-                deploymentId: "572Wr0000017xKX",
-                buttonId: "573Wr000000CpgH",
-                baseLiveAgentURL: "https://d.la12s-core1.sfdc-8tgtt5.salesforceliveagent.com/chat",
-                eswLiveAgentDevName:
-                    "EmbeddedServiceLiveAgent_Parent04IWr000003yKq9MAE_1961681659a",
-                isOfflineSupportEnabled: false,
-            }
-        );
-    };
+        try {
+            embeddedservice_bootstrap.settings.language = "en_US"; // For example, enter 'en' or 'en-US'
 
-    if (!window.embedded_svc) {
-        var s = document.createElement("script");
-        s.setAttribute(
-            "src",
-            "https://safelite2--dev.sandbox.my.salesforce.com/embeddedservice/5.0/esw.min.js"
-        );
-        s.onload = function () {
-            initESW(null);
-        };
-        document.body.appendChild(s);
-    } else {
-        initESW("https://service.force.com");
-    }
+            embeddedservice_bootstrap.init(
+                "00D6s0000008r6A",
+                "Sales_Central_TFN",
+                "https://safelite2--dev.sandbox.my.site.com/ESWSalesCentralTFN1755660094477",
+                {
+                    scrt2URL: "https://safelite2--dev.sandbox.my.salesforce-scrt.com",
+                }
+            );
+        } catch (err) {
+            console.error("Error loading Embedded Messaging: ", err);
+        }
+    };
 }
diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index 19ce71235..93e966f3e 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -33,7 +33,8 @@ export default {
     mounted() {
         // Load in script from salesforce CDN
         const script = document.createElement("script");
-        script.src = "https://service.force.com/embeddedservice/5.0/esw.min.js";
+        script.src =
+            "https://safelite2--dev.sandbox.my.site.com/ESWSalesCentralTFN1755660094477/assets/js/bootstrap.min.js";
         script.onload = this.initializeSalesforceWebchat;
         document.body.appendChild(script);
 
@@ -92,11 +93,11 @@ export default {
             }
         },
         modifyEmbeddedSvcCallback() {
-            window.embedded_svc.settings.avatarImgURL = require("@/assets/img/salesforce-webchat/avatar_webchat.png");
-            window.embedded_svc.settings.prechatBackgroundImgURL = require("@/assets/img/salesforce-webchat/safelite_logo_webchat.png");
-            window.embedded_svc.settings.smallCompanyLogoImgURL = require("@/assets/img/salesforce-webchat/minimized_chat_bubble_webchat.png");
-            window.embedded_svc.settings.displayHelpButton = false;
-            window.embedded_svc.addEventHandler("onChatEstablished", () => {
+            window.embeddedservice_bootstrap.settings.avatarImgURL = require("@/assets/img/salesforce-webchat/avatar_webchat.png");
+            window.embeddedservice_bootstrap.settings.prechatBackgroundImgURL = require("@/assets/img/salesforce-webchat/safelite_logo_webchat.png");
+            window.embeddedservice_bootstrap.settings.smallCompanyLogoImgURL = require("@/assets/img/salesforce-webchat/minimized_chat_bubble_webchat.png");
+            window.embeddedservice_bootstrap.settings.displayHelpButton = false;
+            window.embeddedservice_bootstrap.addEventHandler("onChatEstablished", () => {
                 this.pushEventForChatsToGA("support_chat", "chat_opened", "Live Agent", true);
             });
         },
diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index cc88b5433..59c833dbf 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -139,8 +139,8 @@ export default {
             // Pass data to Salesforce chat if available
             const transfer = event.detail;
             if (
-                window.embedded_svc &&
-                typeof window.embedded_svc.bootstrapEmbeddedService === "function"
+                window.embeddedservice_bootstrap &&
+                typeof window.embeddedservice_bootstrap.bootstrapEmbeddedService === "function"
             ) {
                 if (
                     transfer &&
@@ -149,13 +149,13 @@ export default {
                     transfer.data.last_name &&
                     transfer.data.email
                 ) {
-                    window.embedded_svc.settings.prepopulatedPrechatFields = {
+                    window.embeddedservice_bootstrap.settings.prepopulatedPrechatFields = {
                         FirstName: transfer.data.first_name,
                         LastName: transfer.data.last_name,
                         Email: transfer.data.email,
                         Subject: transfer.data.chat_summary,
                     };
-                    window.embedded_svc.settings.extraPrechatFormDetails = [
+                    window.embeddedservice_bootstrap.settings.extraPrechatFormDetails = [
                         {
                             label: "Scarlett AI Summary",
                             value: transfer.data.chat_summary,
@@ -164,14 +164,14 @@ export default {
                         },
                     ];
                     if (
-                        window.embedded_svc.liveAgentAPI &&
-                        typeof window.embedded_svc.liveAgentAPI.startChat === "function"
+                        window.embeddedservice_bootstrap.liveAgentAPI &&
+                        typeof window.embeddedservice_bootstrap.liveAgentAPI.startChat === "function"
                     ) {
-                        window.embedded_svc.liveAgentAPI.startChat();
+                        window.embeddedservice_bootstrap.liveAgentAPI.startChat();
                         return;
                     }
                 }
-                window.embedded_svc.bootstrapEmbeddedService();
+                window.embeddedservice_bootstrap.bootstrapEmbeddedService();
             }
         };
         window.addEventListener("sierra-chat-transfer", this._handleSierraTransfer);
diff --git a/src/helpers/webchat-helper.js b/src/helpers/webchat-helper.js
index 917d6de0f..90fc4a29a 100644
--- a/src/helpers/webchat-helper.js
+++ b/src/helpers/webchat-helper.js
@@ -11,7 +11,7 @@ export const webchatHelper = () => {
         if (webchatGlobalNonpersistedState.shouldLaunchSierra) {
             window.dispatchEvent(new CustomEvent("launch-sierra-webchat")); // launches the sierra chat
         } else {
-            window.embedded_svc.bootstrapEmbeddedService(); // launches the salesForce prechat form
+            window.embeddedservice_bootstrap.bootstrapEmbeddedService(); // launches the salesForce prechat form
         }
     }
 
diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss
index c0a69a112..bec02081f 100644
--- a/src/styles/ux-variables.scss
+++ b/src/styles/ux-variables.scss
@@ -123,8 +123,8 @@ $body-color: $gray-600;
 
 //Fonts
 $font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif;
-$font-family-monospace: UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
-    monospace;
+$font-family-monospace:
+    UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 // stylelint-enable value-keyword-case
 $font-family-base: $font-family-sans-serif;
 $font-family-code: $font-family-monospace;

From 36100083fe86b8d382cdd20a0613dddaa43436a6 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Mon, 6 Oct 2025 10:54:22 -0400
Subject: [PATCH 002/233] Add logging, remove wrapper function

---
 .../salesforce-helper-dev.js                  | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-dev.js b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
index f7f2b24fd..2e56634cc 100644
--- a/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
@@ -35,27 +35,27 @@ export function initializeSalesforceWebchatForDev(
     onWebchatOpenCallback,
     onWebchatCloseCallback
 ) {
-    var initESW = function (gslbBaseURL) {
-        setupCustomSettings(
-            modifyEmbeddedSvcCallback,
-            finishedLoadingCallback,
-            onWebchatOpenCallback,
-            onWebchatCloseCallback
+    setupCustomSettings(
+        modifyEmbeddedSvcCallback,
+        finishedLoadingCallback,
+        onWebchatOpenCallback,
+        onWebchatCloseCallback
+    );
+
+    try {
+        console.log("initializing embeddedservice_bootstrap");
+        embeddedservice_bootstrap.settings.language = "en_US"; // For example, enter 'en' or 'en-US'
+
+        embeddedservice_bootstrap.init(
+            "00D6s0000008r6A",
+            "Sales_Central_TFN",
+            "https://safelite2--dev.sandbox.my.site.com/ESWSalesCentralTFN1755660094477",
+            {
+                scrt2URL: "https://safelite2--dev.sandbox.my.salesforce-scrt.com",
+            }
         );
+    } catch (err) {
+        console.error("Error loading Embedded Messaging: ", err);
+    }
 
-        try {
-            embeddedservice_bootstrap.settings.language = "en_US"; // For example, enter 'en' or 'en-US'
-
-            embeddedservice_bootstrap.init(
-                "00D6s0000008r6A",
-                "Sales_Central_TFN",
-                "https://safelite2--dev.sandbox.my.site.com/ESWSalesCentralTFN1755660094477",
-                {
-                    scrt2URL: "https://safelite2--dev.sandbox.my.salesforce-scrt.com",
-                }
-            );
-        } catch (err) {
-            console.error("Error loading Embedded Messaging: ", err);
-        }
-    };
 }

From b6f497c13f908f54671613b6ccd9d83b5e551915 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Wed, 8 Oct 2025 09:46:08 -0400
Subject: [PATCH 003/233] Update listeners

---
 .../salesforce-webchat/salesforce-helper-dev.js            | 7 +++----
 .../salesforce-webchat/salesforce-webchat.vue              | 2 +-
 src/digital-components/sierra-webchat/sierra-webchat.vue   | 3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-dev.js b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
index 2e56634cc..a171fb974 100644
--- a/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
@@ -7,9 +7,9 @@ function setupCustomSettings(
     onWebchatCloseCallback
 ) {
     modifyEmbeddedSvcCallback();
-    embeddedservice_bootstrap.addEventHandler("onSettingsCallCompleted", finishedLoadingCallback);
-    embeddedservice_bootstrap.addEventHandler("afterMaximize", onWebchatOpenCallback);
-    embeddedservice_bootstrap.addEventHandler("afterDestroy", onWebchatCloseCallback);
+    window.addEventListener("onEmbeddedMessagingReady", finishedLoadingCallback);
+    window.addEventListener("onEmbeddedMessagingWindowMaximized", onWebchatOpenCallback);
+    window.addEventListener("onEmbeddedMessagingWindowClosed", onWebchatCloseCallback);
 }
 
 /*
@@ -57,5 +57,4 @@ export function initializeSalesforceWebchatForDev(
     } catch (err) {
         console.error("Error loading Embedded Messaging: ", err);
     }
-
 }
diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index 93e966f3e..31719024e 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -97,7 +97,7 @@ export default {
             window.embeddedservice_bootstrap.settings.prechatBackgroundImgURL = require("@/assets/img/salesforce-webchat/safelite_logo_webchat.png");
             window.embeddedservice_bootstrap.settings.smallCompanyLogoImgURL = require("@/assets/img/salesforce-webchat/minimized_chat_bubble_webchat.png");
             window.embeddedservice_bootstrap.settings.displayHelpButton = false;
-            window.embeddedservice_bootstrap.addEventHandler("onChatEstablished", () => {
+            window.addEventListener("onEmbeddedMessagingConversationStarted", () => {
                 this.pushEventForChatsToGA("support_chat", "chat_opened", "Live Agent", true);
             });
         },
diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index 59c833dbf..6248ffa2d 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -165,7 +165,8 @@ export default {
                     ];
                     if (
                         window.embeddedservice_bootstrap.liveAgentAPI &&
-                        typeof window.embeddedservice_bootstrap.liveAgentAPI.startChat === "function"
+                        typeof window.embeddedservice_bootstrap.liveAgentAPI.startChat ===
+                            "function"
                     ) {
                         window.embeddedservice_bootstrap.liveAgentAPI.startChat();
                         return;

From a6506db3187c0b86dd2898806f5072d2b547e3f6 Mon Sep 17 00:00:00 2001
From: JennyNou <167806377+JennyNou@users.noreply.github.com>
Date: Tue, 11 Nov 2025 14:20:44 -0500
Subject: [PATCH 004/233] Add test to cover OEM scenario

---
 playwright-tests/framework/TestPages.ts       |  3 +
 .../pages/OrderConfirmationPage.ts            |  2 +-
 playwright-tests/pages/PaymentMethodPage.ts   | 17 ++++
 .../pages/ProblemGlassQuestionsPage.ts        | 43 +++++++++
 playwright-tests/tests/0000__M.test.ts        | 13 ++-
 .../tests/InsuranceOEMAllState.ts             | 88 +++++++++++++++++++
 6 files changed, 164 insertions(+), 2 deletions(-)
 create mode 100644 playwright-tests/pages/ProblemGlassQuestionsPage.ts
 create mode 100644 playwright-tests/tests/InsuranceOEMAllState.ts

diff --git a/playwright-tests/framework/TestPages.ts b/playwright-tests/framework/TestPages.ts
index e873a1c7b..b0baf2db1 100644
--- a/playwright-tests/framework/TestPages.ts
+++ b/playwright-tests/framework/TestPages.ts
@@ -24,6 +24,7 @@ import { CCPolicyInfoPage } from "../pages/CCPolicyInfoPage"
 import { DuplicateCheckPage } from "../pages/DuplicateCheckPage"
 import { PolicyVehiclesPage } from "../pages/PolicyVehiclesPage"
 import { PolicyInfoSubmittedPage } from "../pages/PolicyInfoSubmittedPage"
+import { ProblemGlassQuestionsPage } from "../pages/ProblemGlassQuestionsPage"
 import RecalibrationInfoPage from "../pages/RecalibrationInfoPage"
 import { CoverageStatementPage } from "../pages/CoverageStatementPage"
 import { VerifyDetailsPage } from "../pages/VerifyDetailsPage"
@@ -48,6 +49,7 @@ export interface ITestPages {
     paymentMethodPage: PaymentMethodPage,
     policyInfoSubmittedPage: PolicyInfoSubmittedPage,
     policyVehiclesPage: PolicyVehiclesPage,
+    problemGlassQuestionsPage: ProblemGlassQuestionsPage,
     recalibrationInfoPage: RecalibrationInfoPage,
     schedulePage: SchedulePage,
     mobileDetailsPage: MobileDetailsPage,
@@ -83,6 +85,7 @@ export const createTestPages: TestPagesFactory<ITestPages> = (page: Page) => {
         paymentMethodPage: new PaymentMethodPage(page),
         policyInfoSubmittedPage: new PolicyInfoSubmittedPage(page),
         policyVehiclesPage: new PolicyVehiclesPage(page),
+        problemGlassQuestionsPage: new ProblemGlassQuestionsPage(page),
         recalibrationInfoPage: new RecalibrationInfoPage(page),
         schedulePage: new SchedulePage(page),
         mobileDetailsPage: new MobileDetailsPage(page),
diff --git a/playwright-tests/pages/OrderConfirmationPage.ts b/playwright-tests/pages/OrderConfirmationPage.ts
index 02951bdd2..6bf10926c 100644
--- a/playwright-tests/pages/OrderConfirmationPage.ts
+++ b/playwright-tests/pages/OrderConfirmationPage.ts
@@ -47,7 +47,7 @@ export class OrderConfirmationPage extends BasePage {
     async validateOrderConfirmationPage(testData: Partial<ITestData>) {
         // Destructure data we use
         const { vehicleDetails, customerDetails, servicePackage, isCashInsuranceFlow,
-            isPolicyFound, claimDetails, paymentDetails, isUseVehicleOnPolicy, paymentMethod, isPolicyUnverified } = testData;
+            isPolicyFound, claimDetails, paymentDetails, isUseVehicleOnPolicy, paymentMethod, isPolicyUnverified, isOEM } = testData;
         await this.serviceText.waitFor({ state: "visible" });
 
         Soft.expect((await this.getActualAppointmentSummary()).map(item => item.toLowerCase())).toEqual((await this.getExpectedAppointmentSummary(testData)).map(item => item.toLowerCase()));
diff --git a/playwright-tests/pages/PaymentMethodPage.ts b/playwright-tests/pages/PaymentMethodPage.ts
index 4ea1a8b82..b4b00a151 100644
--- a/playwright-tests/pages/PaymentMethodPage.ts
+++ b/playwright-tests/pages/PaymentMethodPage.ts
@@ -496,6 +496,22 @@ export class PaymentMethodPage extends BasePage {
         let updatedAppointmentDate = parsedAppointmentDate.toLocaleDateString('en-US', { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' });
         return updatedAppointmentDate;
     }
+    
+    async validateOEMPart( isOEM: boolean): Promise<void> {
+        if (isOEM == true) {
+        // Get Vuex state from localStorage
+        const vuexState = JSON.parse(await this.page.evaluate('localStorage.getItem(\'vuex\')'));
+
+        // Validate the presence of an OEM part
+        if (vuexState.order?.lineItems?.glassParts?.length > 0) {
+            const firstGlassPartNumber = vuexState.order.lineItems.glassParts[0].partNumber;
+
+            await expect(firstGlassPartNumber.includes("OEM")).toBe(true);
+        } else {
+            throw new Error("No glass parts found in the order");
+        }
+        }
+    }
 
     @step("PaymentMethodPage >> Select Payment Method: ")
     async handlePaymentMethodPage(testData: Partial<ITestData>) {
@@ -504,6 +520,7 @@ export class PaymentMethodPage extends BasePage {
         await this.validateProgressBar(ProgressBarPercentages.PaymentMethodPage);
         await this.validatePaymentDetailsPage(testData);
         await this.ValidateAfterPayBreakOutSection();
+        await this.validateOEMPart(testData.isOEM!);
 
         // Verify VAPS wipers on backend for standard and premium packages
         if (servicePackage === ServicePackage.Standard || servicePackage === ServicePackage.Premium) {
diff --git a/playwright-tests/pages/ProblemGlassQuestionsPage.ts b/playwright-tests/pages/ProblemGlassQuestionsPage.ts
new file mode 100644
index 000000000..08124eef0
--- /dev/null
+++ b/playwright-tests/pages/ProblemGlassQuestionsPage.ts
@@ -0,0 +1,43 @@
+import { expect, type Locator, type Page } from '@playwright/test';
+import { IClaimDetails, ICustomerDetails } from 'safelite-playwright-core';
+import { InsuranceBasePage } from './InsuranceBasePage';
+import { ITestData } from 'framework/TestData';
+import { step } from 'framework/localTypes/Step';
+
+export class ProblemGlassQuestionsPage extends InsuranceBasePage {
+    readonly provideVinManuallyButton: Locator;
+    readonly provideLicensePlateButton: Locator;
+    readonly provideHomeAddressButton: Locator;
+    readonly continueOnVinPopUpButton: Locator;
+    readonly dontShareVinButton: Locator;
+
+    readonly yestoGlassQuestionButton: Locator;
+    readonly notoGlassQuestionButton: Locator;
+    readonly continueButton: Locator;
+
+
+    constructor(page: Page) {
+        super(page);
+        
+        this.provideVinManuallyButton = page.locator('label[for="VINManually"]');
+        this.provideLicensePlateButton = page.locator('label[for="licensePlate"]');
+        this.provideHomeAddressButton = page.locator('label[for="HomeAddress"]');
+        this.continueOnVinPopUpButton = page.locator('button:has-text("Continue")');
+        this.dontShareVinButton = page.getByRole('button', { name: "I would rather not share my VIN" });
+
+        this.yestoGlassQuestionButton = page.locator('label:has-text("Yes")');
+        this.notoGlassQuestionButton = page.locator('label:has-text("No")');
+        this.continueButton = page.locator('button[type="submit"].btn-success.nav-continue');
+
+    }
+
+
+    @step("ProblemGlassQuestionsPage >> Click continue button and select yes or no for problem glass question")
+
+    async handleproblemGlassQuestionsPage(testData: Partial<ITestData>){
+
+        await this.dontShareVinButton.click();
+        await this.yestoGlassQuestionButton.click();
+        await this.continueButton.click();
+    }
+}
\ No newline at end of file
diff --git a/playwright-tests/tests/0000__M.test.ts b/playwright-tests/tests/0000__M.test.ts
index c8788b04a..4209daad6 100644
--- a/playwright-tests/tests/0000__M.test.ts
+++ b/playwright-tests/tests/0000__M.test.ts
@@ -28,6 +28,7 @@ import insuranceITAC21stCenturyTests from "./InsuranceITAC21stCentury";
 import insuranceGeicoTests from "./InsuranceGeico";
 import insuranceITACOptimizedPriceValidationAllStateTests from "./InsuranceITACOptimizedPriceValidationAllState";
 import insuranceNoCompProgressiveTests from "./InsuranceNoCompProgressive";
+import insuranceOEMAllstateTests from "./InsuranceOEMAllState";
 import cashRepairInShopAfterPayTests from "./CashRepairInShopAfterPay";
 import cashRepairInShopPayPalTests from "./CashRepairInShopPayPal";
 import cashReplaceMultiSlidingGlassDropoffTests from "./CashReplaceMultiSlidingGlassDropoff";
@@ -82,6 +83,7 @@ const allStandardTests = [
     {name: "InsuranceITAC21stCentury", tests: insuranceITAC21stCenturyTests},
     {name: "InsuranceNoCompProgressive", tests: insuranceNoCompProgressiveTests},
     // {name: "InsuranceBigTruckVerified", tests: insuranceBigTruckVerifiedTests},
+    {name: "InsuranceOEMAllstate", tests: insuranceOEMAllstateTests},
     {name: "InsuranceUnverified", tests: insuranceUnverifiedTests},
     // {name: "InsuranceGeico", tests: insuranceGeicoTests},
     // {name: "InsuranceITACOptimizedPriceValidationAllState", tests: insuranceITACOptimizedPriceValidationAllStateTests}
@@ -323,7 +325,7 @@ async function runWorkflow(page: Page, testCase: TestCase) {
 }
 
 export async function handleInsuranceFlow(testCase: TestCase) {
-    const { isPolicyFound, isPolicyDriver, endorsements, isRecalVehicle, isCashInsuranceFlow, flow } = testCase.testData;
+    const { isPolicyFound, isPolicyDriver, endorsements, isRecalVehicle, isCashInsuranceFlow, isOEM, flow } = testCase.testData;
         
         // Check if the insurance policy has endorsements
         const hasEndorsements = endorsements && endorsements.length > 0;
@@ -332,6 +334,15 @@ export async function handleInsuranceFlow(testCase: TestCase) {
         let insuranceCompanyPage = testCase.pages.insuranceCompanyPage;
         await insuranceCompanyPage.handleInsuranceCompanyPage(testCase.testData);
 
+        // Handle OEM scenario 
+        if (isOEM) {
+            // User should be on heritage problem glass questions page after selecting Allstate on insurance company page
+            if (testCase.testData.isOEM === true) {
+                let problemGlassQuestionsPage = testCase.pages.problemGlassQuestionsPage;
+                await problemGlassQuestionsPage.handleproblemGlassQuestionsPage(testCase.testData);
+            }
+        }
+        
         // Handle ccPolicyInfoPage
         let ccPolicyInfoPage = testCase.pages.ccPolicyInfoPage;
         await ccPolicyInfoPage.handleCCPolicyInfoPage(testCase.testData);
diff --git a/playwright-tests/tests/InsuranceOEMAllState.ts b/playwright-tests/tests/InsuranceOEMAllState.ts
new file mode 100644
index 000000000..c5fc0dc14
--- /dev/null
+++ b/playwright-tests/tests/InsuranceOEMAllState.ts
@@ -0,0 +1,88 @@
+//Imports here
+import { ITestData } from 'framework/TestData'
+import { ServiceLocation, DamageType, PaymentType, PartQuestionType } from 'safelite-playwright-core';
+import { ITestCase } from '../framework/Typedefs'
+import { PaymentMethod } from "framework/localTypes/Enums";
+import { VehicleLookupType } from 'safelite-playwright-core';
+import { getDefaultTestData, setFakerSeedFromTestName } from 'safelite-playwright-core';
+
+// Set the seed based on test name for consistent but unique data
+setFakerSeedFromTestName("InsuranceOEMAllstate");
+
+// Now get the test data with the seeded faker
+const insuranceOEMAllstateData: Partial<ITestData> = {
+    ...getDefaultTestData(),  // Get default data with current seed
+   
+    // Key feature: Insurance flow with GEICO
+    paymentMethod: PaymentMethod.Insurance,
+   
+    // Insurance claim flags
+    isPolicyFound: false,
+    isPolicyUnverified: true,
+    isRecalVehicle: true,
+    isOEM: true,
+
+    // Override customer details with specific name and California location
+    customerDetails: {
+        ...getDefaultTestData().customerDetails!,
+        firstName: 'Jane',
+        lastName: 'OEMTest',
+        address: {
+            ...getDefaultTestData().customerDetails!.address,
+            city: 'Richmond',
+            state: 'Virginia',
+            postalCode: '23219'
+        }
+    },
+
+   
+    // Insurance claim details
+    claimDetails: {
+        client: 'Allstate',
+        policyNumber: 'MockOEMTest',
+        policyDeductible: "Unverified",
+        policyZip: '43085', 
+        damageDate: new Date(new Date().setDate(new Date().getDate() - 1)).toLocaleDateString('en-US', {month: '2-digit', day: '2-digit', year: 'numeric'}),
+        damageCause: DamageType.Rock
+    },
+   
+    // Hyundai vehicle details with VIN lookup
+    vehicleDetails: {
+        ...getDefaultTestData().vehicleDetails!,
+        year: '2024',
+        make: 'Jeep',
+        model: 'Wrangler',
+        style: '4 door utility',
+        vehicleLookupType: VehicleLookupType.Zip,
+    },
+   
+    // Part questions related to recalibration
+    partQuestions: [
+        {
+            partQuestionType: PartQuestionType.GeneralQuestion1,
+            isOnPage: true,
+            optionToSelect: 'Yes'
+        },
+    ],
+
+    // Override for in-shop appointment
+    appointmentDetails: {
+        serviceLocation: ServiceLocation.InShop,
+        shopAddress: '5719 Brandt Pike, Dayton, OH 45424',
+        appointmentDate: getDefaultTestData().appointmentDetails?.appointmentDate
+    },
+
+    // Override payment details (empty because we skip payment method page in insurance flow)
+    paymentDetails: {} 
+}
+       
+const insuranceOEMAllstateTests: ITestCase[] = [];
+
+const tc = {
+    name: `InsuranceOEMAllstate`,
+    tags: ['@E2E','@InsuranceOEMAllstate', '@test_report', '@Insurance'],
+    testData: insuranceOEMAllstateData
+};
+insuranceOEMAllstateTests.push(tc);
+
+export default insuranceOEMAllstateTests;
\ No newline at end of file

From 05643bdcf342228971fb400d221a75eb79b6b877 Mon Sep 17 00:00:00 2001
From: JennyNou <167806377+JennyNou@users.noreply.github.com>
Date: Tue, 11 Nov 2025 14:25:18 -0500
Subject: [PATCH 005/233] Fix step name for clarity

---
 playwright-tests/pages/ProblemGlassQuestionsPage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playwright-tests/pages/ProblemGlassQuestionsPage.ts b/playwright-tests/pages/ProblemGlassQuestionsPage.ts
index 08124eef0..e875ed262 100644
--- a/playwright-tests/pages/ProblemGlassQuestionsPage.ts
+++ b/playwright-tests/pages/ProblemGlassQuestionsPage.ts
@@ -32,7 +32,7 @@ export class ProblemGlassQuestionsPage extends InsuranceBasePage {
     }
 
 
-    @step("ProblemGlassQuestionsPage >> Click continue button and select yes or no for problem glass question")
+    @step("ProblemGlassQuestionsPage >> Handle VIN popup and answer glass question")
 
     async handleproblemGlassQuestionsPage(testData: Partial<ITestData>){
 

From defd461145e5e9ed706031ba552ae3578171f576 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Fri, 14 Nov 2025 11:08:00 -0500
Subject: [PATCH 006/233] Salesforcewebchat Changes

---
 .../salesforce-helper-dev.js                  |  3 +--
 .../salesforce-webchat/salesforce-webchat.vue | 27 +++----------------
 .../sierra-webchat/sierra-webchat.vue         |  2 +-
 src/helpers/webchat-helper.js                 |  2 +-
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-dev.js b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
index a171fb974..bc1b75dd3 100644
--- a/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
@@ -7,7 +7,7 @@ function setupCustomSettings(
     onWebchatCloseCallback
 ) {
     modifyEmbeddedSvcCallback();
-    window.addEventListener("onEmbeddedMessagingReady", finishedLoadingCallback);
+    window.addEventListener("onEmbeddedMessagingButtonCreated", finishedLoadingCallback);
     window.addEventListener("onEmbeddedMessagingWindowMaximized", onWebchatOpenCallback);
     window.addEventListener("onEmbeddedMessagingWindowClosed", onWebchatCloseCallback);
 }
@@ -43,7 +43,6 @@ export function initializeSalesforceWebchatForDev(
     );
 
     try {
-        console.log("initializing embeddedservice_bootstrap");
         embeddedservice_bootstrap.settings.language = "en_US"; // For example, enter 'en' or 'en-US'
 
         embeddedservice_bootstrap.init(
diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index 31719024e..1dca6de8c 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -16,7 +16,7 @@ export default {
     mixins: [analyticsMixin],
     data() {
         return {
-            isAgentAvailable: false,
+            isWebchatLoaded: false,
             isWebchatOpen: false,
         };
     },
@@ -37,25 +37,9 @@ export default {
             "https://safelite2--dev.sandbox.my.site.com/ESWSalesCentralTFN1755660094477/assets/js/bootstrap.min.js";
         script.onload = this.initializeSalesforceWebchat;
         document.body.appendChild(script);
-
-        // Notify funnel-header about Salesforce chat open/close state
-        this._salesforceChatOpenObserver = new MutationObserver(() => {
-            const isOpen = !!document.querySelector(".embeddedServiceSidebar");
-            window.dispatchEvent(
-                new CustomEvent("salesforce-chat-visibility", { detail: { open: isOpen } })
-            );
-        });
-        this._salesforceChatOpenObserver.observe(document.body, {
-            childList: true,
-            subtree: true,
-        });
     },
     beforeUnmount() {
         // Clean up event listeners and observers
-        window.removeEventListener(
-            "salesforce-chat-visibility",
-            this._handleSalesforceChatVisibility
-        );
         window.removeEventListener("sierra-chat-transfer", this._handleSierraToSalesforceTransfer);
         if (this._salesforceChatOpenObserver) {
             this._salesforceChatOpenObserver.disconnect();
@@ -93,16 +77,13 @@ export default {
             }
         },
         modifyEmbeddedSvcCallback() {
-            window.embeddedservice_bootstrap.settings.avatarImgURL = require("@/assets/img/salesforce-webchat/avatar_webchat.png");
-            window.embeddedservice_bootstrap.settings.prechatBackgroundImgURL = require("@/assets/img/salesforce-webchat/safelite_logo_webchat.png");
-            window.embeddedservice_bootstrap.settings.smallCompanyLogoImgURL = require("@/assets/img/salesforce-webchat/minimized_chat_bubble_webchat.png");
-            window.embeddedservice_bootstrap.settings.displayHelpButton = false;
+            window.embeddedservice_bootstrap.settings.hideChatButtonOnLoad = true;
             window.addEventListener("onEmbeddedMessagingConversationStarted", () => {
                 this.pushEventForChatsToGA("support_chat", "chat_opened", "Live Agent", true);
             });
         },
         finishedLoadingCallback(data) {
-            this.isAgentAvailable = data.isAgentAvailable;
+            this.isWebchatLoaded = true;
             this.updateShouldShowWebchatButton();
         },
         onWebchatOpenCallback() {
@@ -118,7 +99,7 @@ export default {
         updateShouldShowWebchatButton() {
             this.webchatGlobalNonpersistedState.showWebchatButton =
                 !this.hideSalesforceWebchatLaunchButton &&
-                this.isAgentAvailable &&
+                this.isWebchatLoaded &&
                 !this.isWebchatOpen;
         },
     },
diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index 6248ffa2d..4d43187e2 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -172,7 +172,7 @@ export default {
                         return;
                     }
                 }
-                window.embeddedservice_bootstrap.bootstrapEmbeddedService();
+                window.embeddedservice_bootstrap.utilAPI.launchChat();
             }
         };
         window.addEventListener("sierra-chat-transfer", this._handleSierraTransfer);
diff --git a/src/helpers/webchat-helper.js b/src/helpers/webchat-helper.js
index 90fc4a29a..e5254d08d 100644
--- a/src/helpers/webchat-helper.js
+++ b/src/helpers/webchat-helper.js
@@ -11,7 +11,7 @@ export const webchatHelper = () => {
         if (webchatGlobalNonpersistedState.shouldLaunchSierra) {
             window.dispatchEvent(new CustomEvent("launch-sierra-webchat")); // launches the sierra chat
         } else {
-            window.embeddedservice_bootstrap.bootstrapEmbeddedService(); // launches the salesForce prechat form
+            window.embeddedservice_bootstrap.utilAPI.launchChat(); // launches the salesForce prechat form
         }
     }
 

From 1188f7a6e943a3100b14f9cc8324b710a5e860e5 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Mon, 17 Nov 2025 15:02:08 -0500
Subject: [PATCH 007/233] CASH-1884

CASH-1884 save quote broke in prod
---
 src/router/methods/after-each.js                    | 4 ++++
 src/router/methods/helpers/consume-referral-info.js | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/src/router/methods/after-each.js b/src/router/methods/after-each.js
index 1e1f80134..608119399 100644
--- a/src/router/methods/after-each.js
+++ b/src/router/methods/after-each.js
@@ -1,6 +1,10 @@
 import analyticsMixin from "@/mixins/analytics-mixin";
+import store from "@/store";
+import { storeMutations } from "@/constants/store-mutations";
 
 export async function afterEach(to, from) {
+    store.commit(storeMutations.UPDATE_LAST_PAGE_VISITED, to.name);
+
     // digital consumer logging
     analyticsMixin.methods.logDigitalConsumer();
 
diff --git a/src/router/methods/helpers/consume-referral-info.js b/src/router/methods/helpers/consume-referral-info.js
index 87700d500..125aed84f 100644
--- a/src/router/methods/helpers/consume-referral-info.js
+++ b/src/router/methods/helpers/consume-referral-info.js
@@ -10,6 +10,7 @@ export async function consumeReferralQuerystrings() {
     let parentAccount = getQuerystringParameter(queryStrings.PARENT_ACCOUNT);
     let correlationId = getQuerystringParameter(queryStrings.CORRELATION_ID);
     let referralDate = null;
+    let savedSessionId = null;
 
     // 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
@@ -20,6 +21,7 @@ export async function consumeReferralQuerystrings() {
         parentAccount = getFunnelCookie().ReferralParentAccountNumber;
         correlationId = getFunnelCookie().ReferralCorrelationId;
         referralDate = getFunnelCookie().ReferralDate;
+        savedSessionId = getFunnelCookie().SavedSessionId;
     }
 
     if (referralNumber) {
@@ -30,6 +32,10 @@ export async function consumeReferralQuerystrings() {
         if (referralDate) {
             store.commit(storeMutations.UPDATE_REFERRAL_DATE, referralDate);
         }
+        if (savedSessionId) {
+            store.commit(storeMutations.UPDATE_SAVED_SESSION_ID, savedSessionId);
+        }
+        
         updateOrCreateFunnelCookie();
     }
 }

From 61227af45d418a42c7fb81f266f9929179373be0 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Mon, 17 Nov 2025 15:08:14 -0500
Subject: [PATCH 008/233] CASH-1884

prettier
---
 src/router/methods/helpers/consume-referral-info.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/methods/helpers/consume-referral-info.js b/src/router/methods/helpers/consume-referral-info.js
index 125aed84f..6393eedc7 100644
--- a/src/router/methods/helpers/consume-referral-info.js
+++ b/src/router/methods/helpers/consume-referral-info.js
@@ -35,7 +35,7 @@ export async function consumeReferralQuerystrings() {
         if (savedSessionId) {
             store.commit(storeMutations.UPDATE_SAVED_SESSION_ID, savedSessionId);
         }
-        
+
         updateOrCreateFunnelCookie();
     }
 }

From 5090d2f2313c74a90f26323da9d0e19877eb6b24 Mon Sep 17 00:00:00 2001
From: JennyNou <jenny.nou@safelite.com>
Date: Mon, 17 Nov 2025 15:23:14 -0500
Subject: [PATCH 009/233] Update locator for Afterpay banner validation

---
 playwright-tests/pages/ServicePackagesPage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playwright-tests/pages/ServicePackagesPage.ts b/playwright-tests/pages/ServicePackagesPage.ts
index 63a60a6e6..ba95f67cd 100644
--- a/playwright-tests/pages/ServicePackagesPage.ts
+++ b/playwright-tests/pages/ServicePackagesPage.ts
@@ -44,7 +44,7 @@ export class ServicePackagesPage extends BasePage {
         this.promoCodeTextbox = this.page.getByLabel('Enter a promo code');
         this.applyPromoButton = this.page.getByRole('button', { name: 'Apply promo code' });
         this.repeatedClicksModalCloseButton = this.page.locator('.QSISlider').locator('img[src*=\'close\']');
-        this.afterPayBanner = this.page.locator('#afterpay-banner');
+        this.afterPayBanner = this.page.locator('div.afterpay-modal-banner');
         this.glassOnlypackagePrice = this.page.locator('fieldset:has(legend#ServicePackageQuestion) label').filter({ hasText: 'Glass service only' }).locator('.pricing-info');
     }
 

From d9ef3f65b5900e45c4f56fbc0218b3598f15f292 Mon Sep 17 00:00:00 2001
From: JennyNou <jenny.nou@safelite.com>
Date: Mon, 17 Nov 2025 16:18:00 -0500
Subject: [PATCH 010/233] Rename for clarification

---
 playwright-tests/framework/TestPages.ts                  | 6 +++---
 ...tionsPage.ts => HeritageProblemGlassQuestionsPage.ts} | 9 ++++-----
 playwright-tests/pages/OrderConfirmationPage.ts          | 2 +-
 playwright-tests/tests/0000__M.test.ts                   | 4 ++--
 4 files changed, 10 insertions(+), 11 deletions(-)
 rename playwright-tests/pages/{ProblemGlassQuestionsPage.ts => HeritageProblemGlassQuestionsPage.ts} (81%)

diff --git a/playwright-tests/framework/TestPages.ts b/playwright-tests/framework/TestPages.ts
index b0baf2db1..c2cc04b35 100644
--- a/playwright-tests/framework/TestPages.ts
+++ b/playwright-tests/framework/TestPages.ts
@@ -24,7 +24,7 @@ import { CCPolicyInfoPage } from "../pages/CCPolicyInfoPage"
 import { DuplicateCheckPage } from "../pages/DuplicateCheckPage"
 import { PolicyVehiclesPage } from "../pages/PolicyVehiclesPage"
 import { PolicyInfoSubmittedPage } from "../pages/PolicyInfoSubmittedPage"
-import { ProblemGlassQuestionsPage } from "../pages/ProblemGlassQuestionsPage"
+import { HeritageProblemGlassQuestionsPage } from "../pages/HeritageProblemGlassQuestionsPage"
 import RecalibrationInfoPage from "../pages/RecalibrationInfoPage"
 import { CoverageStatementPage } from "../pages/CoverageStatementPage"
 import { VerifyDetailsPage } from "../pages/VerifyDetailsPage"
@@ -49,7 +49,7 @@ export interface ITestPages {
     paymentMethodPage: PaymentMethodPage,
     policyInfoSubmittedPage: PolicyInfoSubmittedPage,
     policyVehiclesPage: PolicyVehiclesPage,
-    problemGlassQuestionsPage: ProblemGlassQuestionsPage,
+    heritageProblemGlassQuestionsPage: HeritageProblemGlassQuestionsPage,
     recalibrationInfoPage: RecalibrationInfoPage,
     schedulePage: SchedulePage,
     mobileDetailsPage: MobileDetailsPage,
@@ -85,7 +85,7 @@ export const createTestPages: TestPagesFactory<ITestPages> = (page: Page) => {
         paymentMethodPage: new PaymentMethodPage(page),
         policyInfoSubmittedPage: new PolicyInfoSubmittedPage(page),
         policyVehiclesPage: new PolicyVehiclesPage(page),
-        problemGlassQuestionsPage: new ProblemGlassQuestionsPage(page),
+        heritageProblemGlassQuestionsPage: new HeritageProblemGlassQuestionsPage(page),
         recalibrationInfoPage: new RecalibrationInfoPage(page),
         schedulePage: new SchedulePage(page),
         mobileDetailsPage: new MobileDetailsPage(page),
diff --git a/playwright-tests/pages/ProblemGlassQuestionsPage.ts b/playwright-tests/pages/HeritageProblemGlassQuestionsPage.ts
similarity index 81%
rename from playwright-tests/pages/ProblemGlassQuestionsPage.ts
rename to playwright-tests/pages/HeritageProblemGlassQuestionsPage.ts
index e875ed262..097fd5200 100644
--- a/playwright-tests/pages/ProblemGlassQuestionsPage.ts
+++ b/playwright-tests/pages/HeritageProblemGlassQuestionsPage.ts
@@ -1,10 +1,9 @@
 import { expect, type Locator, type Page } from '@playwright/test';
-import { IClaimDetails, ICustomerDetails } from 'safelite-playwright-core';
 import { InsuranceBasePage } from './InsuranceBasePage';
 import { ITestData } from 'framework/TestData';
 import { step } from 'framework/localTypes/Step';
 
-export class ProblemGlassQuestionsPage extends InsuranceBasePage {
+export class HeritageProblemGlassQuestionsPage extends InsuranceBasePage {
     readonly provideVinManuallyButton: Locator;
     readonly provideLicensePlateButton: Locator;
     readonly provideHomeAddressButton: Locator;
@@ -32,9 +31,9 @@ export class ProblemGlassQuestionsPage extends InsuranceBasePage {
     }
 
 
-    @step("ProblemGlassQuestionsPage >> Handle VIN popup and answer glass question")
-
-    async handleproblemGlassQuestionsPage(testData: Partial<ITestData>){
+    @step("HeritageProblemGlassQuestionsPage >> Handle VIN popup and answer glass question on heritage")
+    // Handles OEM scenario with vehicle that has only one glass question
+    async handleHeritageProblemGlassQuestionsPage(testData: Partial<ITestData>){
 
         await this.dontShareVinButton.click();
         await this.yestoGlassQuestionButton.click();
diff --git a/playwright-tests/pages/OrderConfirmationPage.ts b/playwright-tests/pages/OrderConfirmationPage.ts
index 6bf10926c..a65c80fd2 100644
--- a/playwright-tests/pages/OrderConfirmationPage.ts
+++ b/playwright-tests/pages/OrderConfirmationPage.ts
@@ -47,7 +47,7 @@ export class OrderConfirmationPage extends BasePage {
     async validateOrderConfirmationPage(testData: Partial<ITestData>) {
         // Destructure data we use
         const { vehicleDetails, customerDetails, servicePackage, isCashInsuranceFlow,
-            isPolicyFound, claimDetails, paymentDetails, isUseVehicleOnPolicy, paymentMethod, isPolicyUnverified, isOEM } = testData;
+            isPolicyFound, claimDetails, paymentDetails, isUseVehicleOnPolicy, paymentMethod, isPolicyUnverified} = testData;
         await this.serviceText.waitFor({ state: "visible" });
 
         Soft.expect((await this.getActualAppointmentSummary()).map(item => item.toLowerCase())).toEqual((await this.getExpectedAppointmentSummary(testData)).map(item => item.toLowerCase()));
diff --git a/playwright-tests/tests/0000__M.test.ts b/playwright-tests/tests/0000__M.test.ts
index 4209daad6..4f0bbe6bf 100644
--- a/playwright-tests/tests/0000__M.test.ts
+++ b/playwright-tests/tests/0000__M.test.ts
@@ -338,8 +338,8 @@ export async function handleInsuranceFlow(testCase: TestCase) {
         if (isOEM) {
             // User should be on heritage problem glass questions page after selecting Allstate on insurance company page
             if (testCase.testData.isOEM === true) {
-                let problemGlassQuestionsPage = testCase.pages.problemGlassQuestionsPage;
-                await problemGlassQuestionsPage.handleproblemGlassQuestionsPage(testCase.testData);
+                let HeritageProblemGlassQuestionsPage = testCase.pages.heritageProblemGlassQuestionsPage;
+                await HeritageProblemGlassQuestionsPage.handleHeritageProblemGlassQuestionsPage(testCase.testData);
             }
         }
         

From 9f1e230ea23d82499b068637a170582495958f4b Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 18 Nov 2025 13:35:15 -0500
Subject: [PATCH 011/233] Re-add CASH-1620 to develop.

---
 src/constants/cart-item-categories.js         |   2 +-
 src/constants/cart-item-types.js              |   2 +-
 src/constants/part-type-strings.js            |   1 +
 src/constants/quote-page-discounts.js         |  80 +++++++++++++
 .../service-package-radio-for-afterpay.vue    |   4 +-
 .../service-package-radio.vue                 |   9 +-
 src/fmg-components/cart/cart.vue              |  79 ++++++-------
 src/layouts/quote/quote.spec.js               |   2 +-
 src/layouts/quote/quote.vue                   | 104 ++++++++++-------
 .../service-package-question.spec.js          |  53 ++++-----
 .../service-package-question.vue              | 110 ++++++++----------
 .../service-package-radio.vue                 |   7 +-
 src/mixins/base-mixin.js                      |   4 +-
 13 files changed, 260 insertions(+), 197 deletions(-)
 create mode 100644 src/constants/quote-page-discounts.js

diff --git a/src/constants/cart-item-categories.js b/src/constants/cart-item-categories.js
index 6bbb960b9..5c8faafcf 100644
--- a/src/constants/cart-item-categories.js
+++ b/src/constants/cart-item-categories.js
@@ -3,7 +3,7 @@ const cartItemCategories = {
     GLASS_PARTS: "glassParts",
     SUPPORTING_ITEMS: "supportingItems",
     PROMOS: "promos",
-    SERVICE_PACKAGE_DISCOUNT: "servicePackageDiscount",
+    QUOTE_PAGE_DISCOUNT: "quotePageDiscount",
 };
 
 export { cartItemCategories };
diff --git a/src/constants/cart-item-types.js b/src/constants/cart-item-types.js
index 0bb418d43..8f70aeaed 100644
--- a/src/constants/cart-item-types.js
+++ b/src/constants/cart-item-types.js
@@ -10,7 +10,7 @@ const cartItemTypes = {
     PROMOS: "PROMOS",
     EARLY_BIRD: "EARLY BIRD",
     SUPPLIES_REPAIR: "SUPPLIES-REPAIR",
-    SERVICE_PACKAGE_DISCOUNT: "SERVICE PACKAGE DISCOUNT",
+    QUOTE_PAGE_DISCOUNT: "QUOTE PAGE DISCOUNT",
     DONATION: "DONATION",
 };
 
diff --git a/src/constants/part-type-strings.js b/src/constants/part-type-strings.js
index 741132e28..17b96d2fb 100644
--- a/src/constants/part-type-strings.js
+++ b/src/constants/part-type-strings.js
@@ -10,6 +10,7 @@ const partTypeStrings = {
     REPAIR_FEE: "REPAIR FEE",
     EARLY_BIRD: "EARLY BIRD",
     SERVICE_PACKAGE_DISCOUNT: "SERVICE PACKAGE DISCOUNT",
+    QUOTE_PAGE_DISCOUNT: "QUOTE PAGE DISCOUNT",
     DONATION: "DONATION",
 };
 
diff --git a/src/constants/quote-page-discounts.js b/src/constants/quote-page-discounts.js
new file mode 100644
index 000000000..2dd32d915
--- /dev/null
+++ b/src/constants/quote-page-discounts.js
@@ -0,0 +1,80 @@
+import { packageNames } from "./package-names";
+import { partTypeStrings } from "./part-type-strings";
+
+export const quotePageDiscountTable = [
+    // Repair
+    {
+        name: "Repair Glass Only",
+        experimentCode: "Show_GlassOnly_Repair_Discount",
+        partNumber: "GL RPR CSH PKG",
+        partType: partTypeStrings.QUOTE_PAGE_DISCOUNT,
+        description: "GLASS RPR GEOTARGET DISC",
+        packageLevel: packageNames.TIER_ONE,
+    },
+    {
+        name: "Repair Standard",
+        experimentCode: "Show_Standard_Repair_Discount",
+        partNumber: "STD RPR CSH PKG",
+        partType: partTypeStrings.QUOTE_PAGE_DISCOUNT,
+        description: "STD RPR GEOTARGET DISC",
+        packageLevel: packageNames.TIER_TWO,
+    },
+    {
+        name: "Repair Premium",
+        experimentCode: "Show_Premium_Repair_Discount",
+        partNumber: "PRM RPR CSH PKG",
+        partType: partTypeStrings.QUOTE_PAGE_DISCOUNT,
+        description: "PREM RPR GEOTARGET DISC",
+        packageLevel: packageNames.TIER_THREE,
+    },
+    // Replace - No recal
+    {
+        name: "Replace Glass Only",
+        experimentCode: "Show_GlassOnly_Replace_Discount",
+        partNumber: "GL RPL CSH PKG",
+        partType: partTypeStrings.QUOTE_PAGE_DISCOUNT,
+        description: "GLASS RPL GEOTARGET DISC",
+        packageLevel: packageNames.TIER_ONE,
+    },
+    {
+        name: "Replace Standard",
+        experimentCode: "Show_Standard_Replace_Discount",
+        partNumber: "STD RPL CSH PKG",
+        partType: partTypeStrings.QUOTE_PAGE_DISCOUNT,
+        description: "STD RPL GEOTARGET DISC",
+        packageLevel: packageNames.TIER_TWO,
+    },
+    {
+        name: "Replace Premium",
+        experimentCode: "Show_Premium_Replace_Discount",
+        partNumber: "PRM RPL CSH PKG",
+        partType: partTypeStrings.QUOTE_PAGE_DISCOUNT,
+        description: "PREM RPL GEOTARGET DISC",
+        packageLevel: packageNames.TIER_THREE,
+    },
+    // Replace - with recal
+    {
+        name: "Recal Glass Only",
+        experimentCode: "Show_GlassOnly_Recal_Discount",
+        partNumber: "GL RCL CSH PKG",
+        partType: partTypeStrings.QUOTE_PAGE_DISCOUNT,
+        description: "GLASS RCL GEOTARGET DISC",
+        packageLevel: packageNames.TIER_ONE,
+    },
+    {
+        name: "Recal Standard",
+        experimentCode: "Show_Standard_Recal_Discount",
+        partNumber: "STD RCL CSH PKG",
+        partType: partTypeStrings.QUOTE_PAGE_DISCOUNT,
+        description: "STD RCL GEOTARGET DISC",
+        packageLevel: packageNames.TIER_TWO,
+    },
+    {
+        name: "Recal Premium",
+        experimentCode: "Show_Premium_Recal_Discount",
+        partNumber: "PRM RCL CSH PKG",
+        partType: partTypeStrings.QUOTE_PAGE_DISCOUNT,
+        description: "PREM RCL GEOTARGET DISC",
+        packageLevel: packageNames.TIER_THREE,
+    },
+];
diff --git a/src/experiment-components/service-package-radio-for-afterpay.vue b/src/experiment-components/service-package-radio-for-afterpay.vue
index 2e746e4f2..7f7e91084 100644
--- a/src/experiment-components/service-package-radio-for-afterpay.vue
+++ b/src/experiment-components/service-package-radio-for-afterpay.vue
@@ -145,9 +145,7 @@ export default {
             return "$" + decimalPrice.toFixed(2);
         },
         hasPackageDiscount() {
-            return (
-                this.additionalButtonData.servicePackageDiscount && this.additionalButtonData.Text
-            );
+            return this.additionalButtonData.hasDiscount && this.additionalButtonData.Text;
         },
     },
 };
diff --git a/src/experiment-components/service-package-radio.vue b/src/experiment-components/service-package-radio.vue
index ee7e12712..a116fecd8 100644
--- a/src/experiment-components/service-package-radio.vue
+++ b/src/experiment-components/service-package-radio.vue
@@ -4,11 +4,11 @@
             class="package-label pricing-by-day-pkg-lbl"
             :class="[
                 this.buttonLabelSubCopy ? 'has-subheader' : '',
-                !this.additionalButtonData.servicePackageDiscount ? 'adjust-top' : '',
+                !this.additionalButtonData.hasDiscount ? 'adjust-top' : '',
             ]"
             for="testradio">
             <div class="package-specs">
-                <div v-if="this.additionalButtonData.servicePackageDiscount" class="row">
+                <div v-if="this.additionalButtonData.hasDiscount" class="row">
                     <div class="col md-6">
                         <p class="m-0">
                             <span v-html="this.buttonLabel"></span>
@@ -84,10 +84,7 @@
                 </div>
 
                 <div
-                    v-if="
-                        this.additionalButtonData.servicePackageDiscount &&
-                        this.additionalButtonData.Text
-                    "
+                    v-if="this.additionalButtonData.hasDiscount && this.additionalButtonData.Text"
                     class="special-save-box">
                     <span v-html="this.additionalButtonData.Text"></span>
                 </div>
diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index d1bd2a939..e890e53cc 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -190,6 +190,7 @@ import { cartItemCategories } from "@/constants/cart-item-categories";
 import { cartItemTypes } from "@/constants/cart-item-types";
 import { coverageStatus, cartItemTypesCoveredByInsurance } from "@/constants/insurance";
 import { experimentSettings } from "@/constants/experiments";
+import { quotePageDiscountTable } from "@/constants/quote-page-discounts";
 
 export default {
     name: "cart",
@@ -256,11 +257,11 @@ export default {
 
             return subTotal;
         },
-        getServicePackageDiscount() {
-            const servicePackageDiscountLineItems = this.servicePackageDiscountCartItem;
+        getQuotePageDiscount() {
+            const quotePageDiscountLineItems = this.quotePageDiscountCartItem;
             let subTotal = 0;
 
-            subTotal += servicePackageDiscountLineItems?.subTotal ?? 0;
+            subTotal += quotePageDiscountLineItems?.subTotal ?? 0;
             return subTotal;
         },
         getVapsCartItemsForSelectedPackage(packageName) {
@@ -303,7 +304,8 @@ export default {
 
         getLineItemAmount(amount, useVerifyingText, category) {
             if (useVerifyingText) return this.verifyingCoverageText;
-            return category == "promos" || category == "servicePackageDiscount"
+            return category == cartItemCategories.PROMOS ||
+                category == cartItemCategories.QUOTE_PAGE_DISCOUNT
                 ? "(" + this.currencyFormatter.format(amount * -1) + ")"
                 : this.currencyFormatter.format(amount);
         },
@@ -316,16 +318,21 @@ export default {
             if (category == cartItemCategories.VAPS || category == cartItemCategories.PROMOS) {
                 this.saveVaps(this.lineItems);
                 // Check if service package discount should be removed after vaps change
-                if (
-                    this.servicePackageDiscountCartItem &&
-                    this.discountPackageNames != this.packageLevel
-                ) {
-                    this.lineItems.supportingItems = this.lineItems.supportingItems.filter(
-                        (lineItemsToKeep) =>
-                            lineItemsToKeep.cartItemType !=
-                            this.servicePackageDiscountCartItem.cartItemType
+                if (this.quotePageDiscountCartItem) {
+                    const existingLineItem = this.quotePageDiscountCartItem.lineItems.at(0);
+                    const discountInfo = quotePageDiscountTable.find(
+                        (info) => info.partNumber === existingLineItem?.partNumber
                     );
-                    shouldSaveSupportingItems = true;
+                    const packageLevelForDiscount = discountInfo?.packageLevel;
+
+                    if (this.packageLevel !== packageLevelForDiscount) {
+                        this.lineItems.supportingItems = this.lineItems.supportingItems.filter(
+                            (lineItemsToKeep) =>
+                                lineItemsToKeep.cartItemType !=
+                                this.quotePageDiscountCartItem.cartItemType
+                        );
+                        shouldSaveSupportingItems = true;
+                    }
                 }
             }
             if (shouldSaveSupportingItems) {
@@ -483,8 +490,8 @@ export default {
                     cartItems.push(this.mobileFeeCartItem);
                 }
 
-                if (this.servicePackageDiscountCartItem) {
-                    cartItems.push(this.servicePackageDiscountCartItem);
+                if (this.quotePageDiscountCartItem) {
+                    cartItems.push(this.quotePageDiscountCartItem);
                 }
 
                 if (this.premiumAppointmentDiscountCartItem) {
@@ -500,12 +507,6 @@ export default {
                 return cartItems;
             },
         },
-        discountPackageNames() {
-            const discountServicePackage = experimentMixin.methods.getSettingValue(
-                experimentSettings.PROMO_ON_PACKAGE
-            );
-            return getDiscountedPackageName(discountServicePackage);
-        },
         servicePackageTitleWidget() {
             const servicePackageNames = this.getCmsContent(
                 this.servicePackageOptionsCmsName,
@@ -550,8 +551,8 @@ export default {
             }
 
             packagePrice += this.getVapsPrice(this.packageLevel);
-            if (this.servicePackageDiscountCartItem) {
-                packagePrice -= this.getServicePackageDiscount();
+            if (this.quotePageDiscountCartItem) {
+                packagePrice -= this.getQuotePageDiscount();
             }
 
             return packagePrice;
@@ -928,25 +929,25 @@ export default {
             }
             return cartItem;
         },
-        servicePackageDiscountCartItemName() {
+        quotePageDiscountCartItemName() {
             return this.getCmsContent("ServicePackageDiscountTextWidget", "Text");
         },
-        servicePackageDiscountCartItem() {
+        quotePageDiscountCartItem() {
             let cartItem = null;
 
-            const servicePackageDiscountLineItem = this.supportingItems.find(
-                (lineItem) => lineItem.partType == partTypeStrings.SERVICE_PACKAGE_DISCOUNT
+            const quotePageDiscountLineItem = this.supportingItems.find(
+                (lineItem) => lineItem.partType == partTypeStrings.QUOTE_PAGE_DISCOUNT
             );
 
-            if (servicePackageDiscountLineItem) {
+            if (quotePageDiscountLineItem) {
                 cartItem = {
                     name:
-                        this.servicePackageDiscountCartItemName +
+                        this.quotePageDiscountCartItemName +
                         Math.abs(
-                            baseMixin.methods.getTotalLineItemPrice(servicePackageDiscountLineItem)
+                            baseMixin.methods.getTotalLineItemPrice(quotePageDiscountLineItem)
                         ),
-                    category: cartItemCategories.SERVICE_PACKAGE_DISCOUNT,
-                    cartItemType: cartItemTypes.SERVICE_PACKAGE_DISCOUNT,
+                    category: cartItemCategories.QUOTE_PAGE_DISCOUNT,
+                    cartItemType: cartItemTypes.QUOTE_PAGE_DISCOUNT,
                     isDisplayed: true,
                     isRemovable: false,
                     subTotal: 0,
@@ -955,15 +956,15 @@ export default {
                     isCoveredByInsurance: false,
                 };
 
-                servicePackageDiscountLineItem.cartItemType = cartItem.cartItemType;
-                cartItem.lineItems.push(servicePackageDiscountLineItem);
+                quotePageDiscountLineItem.cartItemType = cartItem.cartItemType;
+                cartItem.lineItems.push(quotePageDiscountLineItem);
 
                 cartItem.subTotal +=
-                    (servicePackageDiscountLineItem.kitPrice ?? 0) +
-                    (servicePackageDiscountLineItem.laborAmount ?? 0) +
-                    (servicePackageDiscountLineItem.sellingPrice ?? 0);
+                    (quotePageDiscountLineItem.kitPrice ?? 0) +
+                    (quotePageDiscountLineItem.laborAmount ?? 0) +
+                    (quotePageDiscountLineItem.sellingPrice ?? 0);
 
-                cartItem.salesTax += servicePackageDiscountLineItem.salesTax ?? 0;
+                cartItem.salesTax += quotePageDiscountLineItem.salesTax ?? 0;
             }
 
             return cartItem;
@@ -972,7 +973,7 @@ export default {
             let cartItem = null;
 
             const otherSupportingItems = this.supportingItems.filter((item) => {
-                return item.partType != partTypeStrings.SERVICE_PACKAGE_DISCOUNT;
+                return item.partType != partTypeStrings.QUOTE_PAGE_DISCOUNT;
             });
             // Don't include fees they are part of the package total
             let otherSupportingItemsLineItems =
diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
index aea32211e..5d9f3bacb 100644
--- a/src/layouts/quote/quote.spec.js
+++ b/src/layouts/quote/quote.spec.js
@@ -82,7 +82,7 @@ jest.mock("@/mixins/base-mixin", () => ({
         filterOutFees(items) {
             return null;
         },
-        filterOutServicePackageDiscountPart(items) {
+        filterOutQuotePageDiscountPart(items) {
             return null;
         },
         isFormValid(form) {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 7f9ea7efc..17326ec8e 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -31,10 +31,11 @@
                         :isRecalibrationOnOrder="isRecalibrationOnOrder"
                         :shouldHideRecalibration="shouldHideRecalibration"
                         @vapsItemsSelected="vapsItemsSelectedAction"
-                        @servicePackageDiscountSelected="servicePackageDiscountSelectedAction"
+                        @quotePageDiscountSelected="quotePageDiscountSelectedAction"
                         @currentNumberOfPackages="currentNumberOfPackagesAction"
                         :servicePackage="servicePackage"
                         :activePromos="lineItems.promos"
+                        :availableQuotePageDiscounts="quoteDiscountPartsInfo"
                         v-on="{ 'buttonEvent.openModal': openModalAction }"
                         validationRules="option-required"
                         isRequired />
@@ -174,6 +175,7 @@ import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stas
 import { storeMutations } from "@/constants/store-mutations";
 import { debugLog } from "@/helpers/debug-log-helper";
 import { savePageData } from "@/router/methods/helpers/save-page-data";
+import { quotePageDiscountTable } from "../../constants/quote-page-discounts";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
@@ -184,6 +186,14 @@ const ACCEPTED_QUOTE_TYPES = {
     INSURANCE: "insurance",
 };
 
+function getAvailableQuotePageDiscounts() {
+    const activeDiscounts = quotePageDiscountTable?.filter((discountEntry) =>
+        experimentMixin?.methods?.hasSettingEqualTo(discountEntry?.experimentCode, "true")
+    );
+
+    return activeDiscounts ?? [];
+}
+
 export default {
     name: "quote",
     async beforeRouteEnter(to, from, next) {
@@ -300,29 +310,22 @@ export default {
         const lineItems = deepClone(store.getters.order.lineItems);
         lineItems.vaps = lineItems.vaps ?? [];
         const nullSafeGlassParts = lineItems.glassParts ?? [];
-        const servicePackageDiscountSettingValue = experimentMixin.methods.getSettingValue(
-            experimentSettings.SERVICE_PACKAGE_DISCOUNT
-        );
-        const isServicePackageDiscount = servicePackageDiscountSettingValue === "True";
-        //Service package cash discount api call when experiment is active
-        var servicePackageDiscountPart = [];
-        if (isServicePackageDiscount) {
-            const servicePackageDiscountPartResponse =
-                await baseMixin.methods.dispatchStoreActionWithLogging(
-                    storeActions.GET_SERVICE_PACKAGE_DISCOUNT_PART,
-                    null,
-                    "quote"
-                );
-            if (servicePackageDiscountPartResponse.data) {
-                servicePackageDiscountPart.push(servicePackageDiscountPartResponse.data);
-            }
-        }
+
+        const quotePageDiscountPartsInfo = getAvailableQuotePageDiscounts();
+
+        const quotePageDiscountParts = quotePageDiscountPartsInfo.map((partInfo) => ({
+            partNumber: partInfo.partNumber,
+            partType: partInfo.partType,
+            description: partInfo.description,
+            isInsurable: null,
+        }));
+
         const availableLineItems = [
             resultMap.rainRepel,
             ...resultMap.supportingItems,
             ...resultMap.wipers,
             ...nullSafeGlassParts,
-            ...servicePackageDiscountPart,
+            ...quotePageDiscountParts,
         ];
 
         // When calling pricing from the quote page, always use the cash parent account but save the existing one in case it's unverified insurance navigating backwards
@@ -349,7 +352,7 @@ export default {
             false
         );
 
-        // This will remove any servicePackageDiscount item from lineItems.supportingItems
+        // This will remove any discount item from lineItems.supportingItems
         baseMixin.methods.dispatchStoreAction(
             storeActions.SAVE_SUPPORTING_ITEMS,
             resultMap.supportingItems,
@@ -451,10 +454,9 @@ export default {
                           )
                         : baseMixin.methods.filterOutFees(availableLineItems);
 
-                    const lineItemsNoDiscount =
-                        baseMixin.methods.filterOutServicePackageDiscountPart(
-                            lineItemsForCalculatingPrice
-                        );
+                    const lineItemsNoDiscount = baseMixin.methods.filterOutQuotePageDiscountPart(
+                        lineItemsForCalculatingPrice
+                    );
 
                     if (isInsuranceFromQueryString != null) {
                         if (isInsuranceFromQueryString.toLowerCase() === "true") {
@@ -578,17 +580,8 @@ export default {
         isRecalibrationOnOrder() {
             return store.getters.isRecalibrationOnOrder;
         },
-        isServicePackageDiscountOnOrder() {
-            return containsLineItemWithPartType(
-                partTypeStrings.SERVICE_PACKAGE_DISCOUNT,
-                this.availableLineItems
-            );
-        },
-        servicePackageDiscountParts() {
-            return findLineItemsWithPartType(
-                partTypeStrings.SERVICE_PACKAGE_DISCOUNT,
-                this.availableLineItems
-            );
+        isQuotePageDiscountOnOrder() {
+            return this.quotePageDiscountPartsInfo?.length > 0;
         },
         shouldHideRecalibration() {
             return (
@@ -617,6 +610,23 @@ export default {
             thresholdAmount && (thresholdAmount = parseInt(thresholdAmount));
             return thresholdAmount;
         },
+        quoteDiscountPartsInfo() {
+            const defs = getAvailableQuotePageDiscounts();
+            const withPrices = defs
+                .map((def) => {
+                    const match = this.availableLineItems?.find?.(
+                        (pricedItem) => pricedItem.partNumber === def.partNumber
+                    );
+
+                    return {
+                        packageLevel: def.packageLevel,
+                        item: match,
+                    };
+                })
+                .filter((result) => result.item);
+
+            return withPrices;
+        },
     },
     methods: {
         getColCount() {
@@ -660,7 +670,7 @@ export default {
         vapsItemsSelectedAction(vapsItemsSelected) {
             this.lineItems.vaps = vapsItemsSelected;
         },
-        servicePackageDiscountSelectedAction(supportingItemsSelected) {
+        quotePageDiscountSelectedAction(supportingItemsSelected) {
             this.lineItems.supportingItems = supportingItemsSelected;
         },
         backButtonAction() {
@@ -722,10 +732,10 @@ export default {
                     false
                 );
             }
-            if (this.isInsuranceSelected && this.isServicePackageDiscountOnOrder) {
+            if (this.isInsuranceSelected && this.isQuotePageDiscountOnOrder) {
                 let supportingItems = this.lineItems.supportingItems;
                 supportingItems = supportingItems.filter((item) => {
-                    return item.partType != this.servicePackageDiscountParts[0].partType;
+                    return item.partType != partTypeStrings.QUOTE_PAGE_DISCOUNT;
                 });
                 this.dispatchStoreAction(
                     this.storeActions.SAVE_SUPPORTING_ITEMS,
@@ -811,19 +821,23 @@ export default {
                             lineItemsToPrice =
                                 baseMixin.methods.filterOutRecalibration(lineItemsToPrice);
                         }
-                        if (this.isServicePackageDiscountOnOrder) {
+                        if (this.isQuotePageDiscountOnOrder) {
                             lineItemsToPrice = lineItemsToPrice?.filter((item) => {
-                                return (
-                                    item.partType != this.servicePackageDiscountParts[0].partType
-                                );
+                                return item.partType != partTypeStrings.QUOTE_PAGE_DISCOUNT;
                             });
                         }
                         let price = 0;
                         if (
-                            tier.additionalButtonData?.servicePackageDiscount &&
-                            this.isServicePackageDiscountOnOrder
+                            tier.additionalButtonData?.hasDiscount &&
+                            this.isQuotePageDiscountOnOrder
                         ) {
-                            lineItemsToPrice.push(...this.servicePackageDiscountParts);
+                            const parts = this.quoteDiscountPartsInfo;
+                            const matchPart = parts.find(
+                                (discountInfo) => discountInfo.packageLevel === tier
+                            );
+                            if (matchPart) {
+                                lineItemsToPrice.push(matchPart);
+                            }
                         }
                         price += baseMixin.methods.getTierOnePackagePrice(
                             baseMixin.methods.filterOutFees(lineItemsToPrice)
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 523c0edce..a44dc463c 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
@@ -14,6 +14,7 @@ import { experimentSettings } from "@/constants/experiments";
 import baseMixin from "@/mixins/base-mixin.js";
 import { partTypeStrings } from "@/constants/part-type-strings";
 import { nextTick } from "vue";
+import { packageNames } from "../../../constants/package-names";
 
 jest.mock("@/store", () => ({
     commit: jest.fn(),
@@ -73,9 +74,9 @@ describe("service-package-question.vue", () => {
                     price: 35.5,
                 },
                 {
-                    partNumber: "DISC CASHSAVE70",
+                    partNumber: "PRM RCL CSH PKG",
                     description: null,
-                    partType: "SERVICE PACKAGE DISCOUNT",
+                    partType: "QUOTE PAGE DISCOUNT",
                     price: -70,
                 },
             ],
@@ -105,13 +106,27 @@ describe("service-package-question.vue", () => {
                         description: null,
                         kitPrice: 0,
                         laborAmount: 0,
-                        partNumber: "DISC CASHSAVE70",
-                        partType: "SERVICE PACKAGE DISCOUNT",
+                        partNumber: "PRM RCL CSH PKG",
+                        partType: "QUOTE PAGE DISCOUNT",
                         salesTax: null,
                         sellingPrice: -70,
                     },
                 ],
             },
+            availableQuotePageDiscounts: [
+                {
+                    packageLevel: packageNames.TIER_THREE,
+                    item: {
+                        description: null,
+                        kitPrice: 0,
+                        laborAmount: 0,
+                        partNumber: "PRM RCL CSH PKG",
+                        partType: "QUOTE PAGE DISCOUNT",
+                        salesTax: null,
+                        sellingPrice: -70,
+                    },
+                },
+            ],
             activePromos: [],
         };
         const packageNameKey = "05_01_CSR_Quote_Standard_Repair";
@@ -136,41 +151,17 @@ describe("service-package-question.vue", () => {
     });
     it("should return price when there is  discount", () => {
         const wrapper = setupMocks({});
-        const partType = partTypeStrings.SERVICE_PACKAGE_DISCOUNT;
 
-        wrapper.vm.isServicePackageDiscountOnOrder = containsLineItemWithPartType(
-            partType,
-            mockProps.lineItems.supportingItems
-        );
-        const servicePackageDiscountLineItem = findLineItemsWithPartType(
-            partType,
-            mockProps.lineItems.supportingItems
-        );
-        wrapper.vm.getServicePackageDiscountPrice();
-        const price = baseMixin.methods.getTotalLineItemPrice(servicePackageDiscountLineItem[0]);
+        const price = wrapper.vm.getDiscountPrice(packageNames.TIER_THREE);
 
         expect(Math.abs(price)).toEqual(70);
     });
-    it("isServicePackageDiscountOnOrder returns true if it contains service package discount lineItems", () => {
+    it("isDiscountOnOrder returns true if it contains quote package discount lineItems", () => {
         // Arrange
         const wrapper = setupMocks({});
 
         // Assert
-        expect(wrapper.vm.isServicePackageDiscountOnOrder).toBe(true);
-    });
-    it("servicePackageDiscountParts should returns service package discount lineItems", () => {
-        // Arrange
-        const wrapper = setupMocks({});
-
-        // Assert
-        expect(wrapper.vm.servicePackageDiscountParts).toEqual([
-            {
-                partNumber: "DISC CASHSAVE70",
-                description: null,
-                partType: "SERVICE PACKAGE DISCOUNT",
-                price: -70,
-            },
-        ]);
+        expect(wrapper.vm.isDiscountOnOrder).toBe(true);
     });
     it("should have the correct insurance pricing text when insurance is selected", () => {
         // Arrange
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 d1a99da08..e45147295 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -60,6 +60,7 @@ export default {
         servicePackage: null,
         isRecalibrationOnOrder: Boolean,
         shouldHideRecalibration: Boolean,
+        availableQuotePageDiscounts: null,
     },
     data() {
         return {
@@ -85,27 +86,18 @@ export default {
         selectedPackageName(newValue) {
             const VapsProductsInSelectedPackage = this.getVapsLineItemsForSelectedPackage(newValue);
             this.$emit("vapsItemsSelected", VapsProductsInSelectedPackage);
-            const servicePackageDiscountPartInSelectedPackage =
-                this.getServicePackageDiscountPartForSelectedPackage(newValue);
+            const discountPartInSelectedPackage = this.getDiscountPartForSelectedPackage(newValue);
             let supportingItems = this.supportingLineItems;
-            if (
-                containsLineItemWithPartType(
-                    partTypeStrings.SERVICE_PACKAGE_DISCOUNT,
-                    supportingItems
-                )
-            ) {
-                supportingItems = supportingItems.filter(
-                    (item) => item.partType !== partTypeStrings.SERVICE_PACKAGE_DISCOUNT
-                );
-            }
-            if (
-                servicePackageDiscountPartInSelectedPackage?.length > 0 &&
-                supportingItems != null
-            ) {
-                supportingItems.push(servicePackageDiscountPartInSelectedPackage[0]);
+
+            supportingItems = supportingItems.filter(
+                (item) => item.partType !== partTypeStrings.QUOTE_PAGE_DISCOUNT
+            );
+
+            if (discountPartInSelectedPackage) {
+                supportingItems.push(discountPartInSelectedPackage);
             }
 
-            this.$emit("servicePackageDiscountSelected", supportingItems);
+            this.$emit("quotePageDiscountSelected", supportingItems);
         },
         servicePackage(newValue) {
             if (newValue !== null) {
@@ -118,7 +110,7 @@ export default {
             return this.availableLineItems ?? [];
         },
         supportingLineItems() {
-            return this.$store.getters.lineItems?.supportingItems;
+            return this.$store.getters.lineItems?.supportingItems ?? [];
         },
         servicePackageAnswers() {
             const cmsWidgetName = this.isInsuranceSelected
@@ -149,18 +141,15 @@ export default {
                     ? this.getDiscountedPackagePriceString(answer.Name, false)
                     : this.getDiscountedPackagePriceString(
                           answer.Name,
-                          this.isServicePackageDiscountOnOrder &&
-                              this.discountPackageNames == answer.Name
+                          this.hasDiscountForPackage(answer.Name)
                       ),
                 buttonFooterCopy: this.getFooterTextFromCms(answer.SubWidgetName),
                 additionalButtonData: {
                     strikeThroughPrice: this.getPackagePriceString(answer.Name),
-                    servicePackageDiscount:
-                        this.isServicePackageDiscountOnOrder &&
-                        this.discountPackageNames == answer.Name,
+                    hasDiscount: this.hasDiscountForPackage(answer.Name),
                     Text: this.isInsuranceSelected
                         ? false
-                        : "Special: Save $" + this.getServicePackageDiscountPrice(),
+                        : "Special: Save $" + this.getDiscountPrice(answer.Name),
                     isInsuranceSelected: this.isInsuranceSelected,
                 },
             }));
@@ -168,17 +157,8 @@ export default {
             this.$emit("currentNumberOfPackages", modifiedAnswers.length);
             return modifiedAnswers;
         },
-        isServicePackageDiscountOnOrder() {
-            return containsLineItemWithPartType(
-                partTypeStrings.SERVICE_PACKAGE_DISCOUNT,
-                this.nullSafeAvailableLineItems
-            );
-        },
-        discountPackageNames() {
-            const discountServicePackage = experimentMixin.methods.getSettingValue(
-                experimentSettings.PROMO_ON_PACKAGE
-            );
-            return getDiscountedPackageName(discountServicePackage);
+        isDiscountOnOrder() {
+            return this.availableQuotePageDiscounts?.length > 0;
         },
         frontWipersApplicableForTierTwo() {
             return shouldFrontWipersBeAvailable(
@@ -226,12 +206,6 @@ export default {
         isRepair() {
             return this.$store.getters.order.damage.isRepair;
         },
-        servicePackageDiscountParts() {
-            return findLineItemsWithPartType(
-                partTypeStrings.SERVICE_PACKAGE_DISCOUNT,
-                this.nullSafeAvailableLineItems
-            );
-        },
         showRecalInServicePackages() {
             return this.isRecalibrationOnOrder && !this.shouldHideRecalibration;
         },
@@ -280,16 +254,16 @@ export default {
             const formattedPriceFloat = parseFloat(
                 this.getPackagePrice(packageName, {
                     discountedPrice: false,
-                    servicePackageDiscount: false,
+                    quotePageDiscount: false,
                 })
             ).toFixed(2);
             return "$" + formattedPriceFloat;
         },
-        getDiscountedPackagePriceString(packageName, servicePackageDiscount) {
+        getDiscountedPackagePriceString(packageName, quotePageDiscount) {
             const formattedPriceFloat = parseFloat(
                 this.getPackagePrice(packageName, {
                     discountedPrice: true,
-                    servicePackageDiscount,
+                    quotePageDiscount,
                 })
             ).toFixed(2);
 
@@ -298,7 +272,7 @@ export default {
             }
             return (this.isInsuranceSelected ? "As little as $" : "$") + formattedPriceFloat;
         },
-        getPackagePrice(packageName, { discountedPrice = false, servicePackageDiscount = false }) {
+        getPackagePrice(packageName, { discountedPrice = false, quotePageDiscount = false }) {
             let lineItemsToPrice = [...this.nullSafeAvailableLineItems];
 
             if (this.isRecalibrationOnOrder && this.shouldHideRecalibration) {
@@ -306,17 +280,20 @@ export default {
             }
 
             //remove service package discount part
-            if (this.isServicePackageDiscountOnOrder) {
+            if (this.isDiscountOnOrder) {
                 lineItemsToPrice = lineItemsToPrice.filter((item) => {
-                    return item.partType != this.servicePackageDiscountParts[0].partType;
+                    return item.partType != partTypeStrings.QUOTE_PAGE_DISCOUNT;
                 });
             }
 
             if (discountedPrice) {
                 lineItemsToPrice.push(...removeVapsPromosFromPromoArray(this.activePromos));
             }
-            if (servicePackageDiscount) {
-                lineItemsToPrice.push(...this.servicePackageDiscountParts);
+            if (quotePageDiscount) {
+                const part = this.getDiscountPartForSelectedPackage(packageName);
+                if (part) {
+                    lineItemsToPrice.push(part);
+                }
             }
             let priceFloat = this.isInsuranceSelected
                 ? 0
@@ -328,14 +305,16 @@ export default {
 
             return priceFloat;
         },
-        getServicePackageDiscountPrice() {
-            if (this.isServicePackageDiscountOnOrder) {
-                let price = 0;
-                price += baseMixin.methods.getTotalLineItemPrice(
-                    this.servicePackageDiscountParts[0]
-                );
+        getDiscountPrice(packageName) {
+            const part = this.getDiscountPartForSelectedPackage(packageName);
+
+            if (part) {
+                const price = baseMixin.methods.getTotalLineItemPrice(part);
+
                 return Math.abs(price);
             }
+
+            return null;
         },
         getVapsPrice(packageName, applyPromoDiscounts = false) {
             const vapsItems = this.getVapsLineItemsForSelectedPackage(packageName);
@@ -398,13 +377,18 @@ export default {
 
             return vapsLineItemsForSelectedPackage;
         },
-        getServicePackageDiscountPartForSelectedPackage(packageName) {
-            const selectedPackage = this.servicePackageAnswers.filter(
-                (item) => item.value === packageName
-            );
-            if (selectedPackage?.[0]?.additionalButtonData?.servicePackageDiscount) {
-                return this.servicePackageDiscountParts;
-            } else return [];
+        getDiscountPartForSelectedPackage(packageName) {
+            if (this.availableQuotePageDiscounts?.length > 0) {
+                const match = this.availableQuotePageDiscounts.find(
+                    (discountInfo) => discountInfo.packageLevel === packageName
+                );
+                return match?.item;
+            }
+
+            return null;
+        },
+        hasDiscountForPackage(packageName) {
+            return !!this.getDiscountPartForSelectedPackage(packageName);
         },
         combineLineItemsWithoutDuplicates(lineItemsOne, lineItemsTwo) {
             const combinedLineItemArray = [...lineItemsTwo];
diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
index 441a4f5cb..8bb7e921a 100644
--- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
@@ -5,7 +5,7 @@
             :class="[this.buttonLabelSubCopy ? 'has-subheader' : '']"
             for="testradio">
             <div class="package-specs">
-                <div v-if="this.additionalButtonData.servicePackageDiscount" class="row">
+                <div v-if="this.additionalButtonData.hasDiscount" class="row">
                     <div class="col md-6">
                         <p class="m-0">
                             <span v-html="this.buttonLabel"></span>
@@ -77,10 +77,7 @@
                 </div>
 
                 <div
-                    v-if="
-                        this.additionalButtonData.servicePackageDiscount &&
-                        this.additionalButtonData.Text
-                    "
+                    v-if="this.additionalButtonData.hasDiscount && this.additionalButtonData.Text"
                     class="special-save-box">
                     <span v-html="this.additionalButtonData.Text"></span>
                 </div>
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 5204178de..813a3189a 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -129,9 +129,9 @@ export default {
             });
             return lineItemsArray;
         },
-        filterOutServicePackageDiscountPart(lineItems) {
+        filterOutQuotePageDiscountPart(lineItems) {
             const filteredLineItems = lineItems?.filter((item) => {
-                return !item?.partType?.includes(partTypeStrings.SERVICE_PACKAGE_DISCOUNT);
+                return !item?.partType?.includes(partTypeStrings.QUOTE_PAGE_DISCOUNT);
             });
             return filteredLineItems;
         },

From 9812c874df821eb9a431f34b01c292086ffbc0ec Mon Sep 17 00:00:00 2001
From: JennyNou <167806377+JennyNou@users.noreply.github.com>
Date: Tue, 18 Nov 2025 13:49:45 -0500
Subject: [PATCH 012/233] Move method to base page for reusability

---
 playwright-tests/pages/BasePage.ts          | 16 ++++++++++++++++
 playwright-tests/pages/PaymentMethodPage.ts | 16 ----------------
 playwright-tests/tests/0000__M.test.ts      |  4 +---
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts
index 6596986df..1562677a2 100644
--- a/playwright-tests/pages/BasePage.ts
+++ b/playwright-tests/pages/BasePage.ts
@@ -169,4 +169,20 @@ export class BasePage {
         Soft.expect(actualProgressPercentage).toBe(progressPercentage);
         console.log(`Progress Bar Percentage: Actual - ${actualProgressPercentage} vs Expected - ${progressPercentage}`);
     }
+
+    async validateOEMPart( isOEM: boolean): Promise<void> {
+        if (isOEM!) {
+        // Get Vuex state from localStorage
+        const vuexState = JSON.parse(await this.page.evaluate('localStorage.getItem(\'vuex\')'));
+
+        // Validate the presence of an OEM part
+        if (vuexState.order?.lineItems?.glassParts?.length > 0) {
+            const firstGlassPartNumber = vuexState.order.lineItems.glassParts[0].partNumber;
+
+            await expect(firstGlassPartNumber.includes("OEM")).toBe(true);
+        } else {
+            throw new Error("No glass parts found in the order");
+        }
+        }
+    } 
 }
\ No newline at end of file
diff --git a/playwright-tests/pages/PaymentMethodPage.ts b/playwright-tests/pages/PaymentMethodPage.ts
index b4b00a151..cbf6d01c8 100644
--- a/playwright-tests/pages/PaymentMethodPage.ts
+++ b/playwright-tests/pages/PaymentMethodPage.ts
@@ -496,22 +496,6 @@ export class PaymentMethodPage extends BasePage {
         let updatedAppointmentDate = parsedAppointmentDate.toLocaleDateString('en-US', { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' });
         return updatedAppointmentDate;
     }
-    
-    async validateOEMPart( isOEM: boolean): Promise<void> {
-        if (isOEM == true) {
-        // Get Vuex state from localStorage
-        const vuexState = JSON.parse(await this.page.evaluate('localStorage.getItem(\'vuex\')'));
-
-        // Validate the presence of an OEM part
-        if (vuexState.order?.lineItems?.glassParts?.length > 0) {
-            const firstGlassPartNumber = vuexState.order.lineItems.glassParts[0].partNumber;
-
-            await expect(firstGlassPartNumber.includes("OEM")).toBe(true);
-        } else {
-            throw new Error("No glass parts found in the order");
-        }
-        }
-    }
 
     @step("PaymentMethodPage >> Select Payment Method: ")
     async handlePaymentMethodPage(testData: Partial<ITestData>) {
diff --git a/playwright-tests/tests/0000__M.test.ts b/playwright-tests/tests/0000__M.test.ts
index 4f0bbe6bf..d2d85f4b9 100644
--- a/playwright-tests/tests/0000__M.test.ts
+++ b/playwright-tests/tests/0000__M.test.ts
@@ -335,12 +335,10 @@ export async function handleInsuranceFlow(testCase: TestCase) {
         await insuranceCompanyPage.handleInsuranceCompanyPage(testCase.testData);
 
         // Handle OEM scenario 
-        if (isOEM) {
+        if (isOEM === true) {
             // User should be on heritage problem glass questions page after selecting Allstate on insurance company page
-            if (testCase.testData.isOEM === true) {
                 let HeritageProblemGlassQuestionsPage = testCase.pages.heritageProblemGlassQuestionsPage;
                 await HeritageProblemGlassQuestionsPage.handleHeritageProblemGlassQuestionsPage(testCase.testData);
-            }
         }
         
         // Handle ccPolicyInfoPage

From a154a93b36cde71ecf3f2b3e2f0d855431d5e9af Mon Sep 17 00:00:00 2001
From: kpatel8hs4io <31411746+kpatel8hs4io@users.noreply.github.com>
Date: Wed, 19 Nov 2025 14:33:56 -0500
Subject: [PATCH 013/233] minor changes related to OEM scenario

---
 playwright-tests/framework/TestData.ts         | 7 ++++---
 playwright-tests/pages/PaymentMethodPage.ts    | 7 +++++--
 playwright-tests/tests/0000__M.test.ts         | 4 ++--
 playwright-tests/tests/InsuranceOEMAllState.ts | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/playwright-tests/framework/TestData.ts b/playwright-tests/framework/TestData.ts
index 9ed648426..1af123c41 100644
--- a/playwright-tests/framework/TestData.ts
+++ b/playwright-tests/framework/TestData.ts
@@ -3,7 +3,8 @@ import { PaymentMethod } from './localTypes/Enums'
 
 export interface ITestData extends base {
     // Put any project-specific data here. Anything useful to other Safelite projects should be submitted as a pull request to safelite-playwright-core.
-    paymentMethod: PaymentMethod
-    isOptedInForTextMessages: boolean
-    totalAmount?: number
+    paymentMethod: PaymentMethod,
+    isOptedInForTextMessages: boolean,
+    totalAmount?: number,
+    isForcedOEM?: boolean
 }
\ No newline at end of file
diff --git a/playwright-tests/pages/PaymentMethodPage.ts b/playwright-tests/pages/PaymentMethodPage.ts
index cbf6d01c8..015a088ae 100644
--- a/playwright-tests/pages/PaymentMethodPage.ts
+++ b/playwright-tests/pages/PaymentMethodPage.ts
@@ -499,12 +499,15 @@ export class PaymentMethodPage extends BasePage {
 
     @step("PaymentMethodPage >> Select Payment Method: ")
     async handlePaymentMethodPage(testData: Partial<ITestData>) {
-        const { servicePackage, isRecalVehicle, paymentDetails } = testData;
+        const { servicePackage, isRecalVehicle, paymentDetails, isForcedOEM } = testData;
 
         await this.validateProgressBar(ProgressBarPercentages.PaymentMethodPage);
         await this.validatePaymentDetailsPage(testData);
         await this.ValidateAfterPayBreakOutSection();
-        await this.validateOEMPart(testData.isOEM!);
+
+        if (isForcedOEM){
+            await this.validateOEMPart(isForcedOEM);
+        }
 
         // Verify VAPS wipers on backend for standard and premium packages
         if (servicePackage === ServicePackage.Standard || servicePackage === ServicePackage.Premium) {
diff --git a/playwright-tests/tests/0000__M.test.ts b/playwright-tests/tests/0000__M.test.ts
index d2d85f4b9..cd8270a8a 100644
--- a/playwright-tests/tests/0000__M.test.ts
+++ b/playwright-tests/tests/0000__M.test.ts
@@ -325,7 +325,7 @@ async function runWorkflow(page: Page, testCase: TestCase) {
 }
 
 export async function handleInsuranceFlow(testCase: TestCase) {
-    const { isPolicyFound, isPolicyDriver, endorsements, isRecalVehicle, isCashInsuranceFlow, isOEM, flow } = testCase.testData;
+    const { isPolicyFound, isPolicyDriver, endorsements, isRecalVehicle, isCashInsuranceFlow, isForcedOEM, flow } = testCase.testData;
         
         // Check if the insurance policy has endorsements
         const hasEndorsements = endorsements && endorsements.length > 0;
@@ -335,7 +335,7 @@ export async function handleInsuranceFlow(testCase: TestCase) {
         await insuranceCompanyPage.handleInsuranceCompanyPage(testCase.testData);
 
         // Handle OEM scenario 
-        if (isOEM === true) {
+        if (isForcedOEM) {
             // User should be on heritage problem glass questions page after selecting Allstate on insurance company page
                 let HeritageProblemGlassQuestionsPage = testCase.pages.heritageProblemGlassQuestionsPage;
                 await HeritageProblemGlassQuestionsPage.handleHeritageProblemGlassQuestionsPage(testCase.testData);
diff --git a/playwright-tests/tests/InsuranceOEMAllState.ts b/playwright-tests/tests/InsuranceOEMAllState.ts
index c5fc0dc14..c55939a4c 100644
--- a/playwright-tests/tests/InsuranceOEMAllState.ts
+++ b/playwright-tests/tests/InsuranceOEMAllState.ts
@@ -20,7 +20,7 @@ const insuranceOEMAllstateData: Partial<ITestData> = {
     isPolicyFound: false,
     isPolicyUnverified: true,
     isRecalVehicle: true,
-    isOEM: true,
+    isForcedOEM: true,
 
     // Override customer details with specific name and California location
     customerDetails: {

From 37facdfecd992c9e87b51fe9fe20f77368f90f42 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 20 Nov 2025 11:46:54 -0500
Subject: [PATCH 014/233] CASH-1925

CASH-1925 add new endpoints for work order submit
---
 src/constants/endpoints.js |  8 ++++++++
 src/store/index.js         | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 17a8f9a08..c1771b3f5 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -124,6 +124,14 @@ const endpoints = {
         url: "/order/api/v1/order/save-session/fmg",
         method: "POST",
     },
+    SubmitOrder: {
+        url: "/order/api/v1/order/submit-order",
+        method: "POST",
+    },
+    SubmitOrderForPia: {
+        url: "/order/api/v1/order/submit-order-for-pia",
+        method: "POST",
+    },
     LoadSession: {
         url: "/order/api/v1/order/load-session",
         method: "POST",
diff --git a/src/store/index.js b/src/store/index.js
index 6bccc5969..ca1d76f6f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2363,9 +2363,17 @@ export const actions = {
         //affiliate cookie save only when submitAfterSave
         const affiliateCookies = submitAfterSave ? applicationUser.affiliateCookies : null;
 
+        let endPoint = endpoints.SaveSession.url;
+        if (createUnscheduledStatusWorkOrderForPIA) {
+            endPoint = endpoints.SubmitOrderForPia.url;
+        }
+        if (submitAfterSave) {
+            endPoint = endpoints.SubmitOrder.url;
+        }
+
         return globalMethods.callHttpClient({
             method: endpoints.SaveSession.method,
-            endpoint: endpoints.SaveSession.url,
+            endpoint: endPoint,
             payload: {
                 submitAfterSave: submitAfterSave,
                 userAgent: navigator.userAgent,

From 9c94d7da6d01e4f440ecca308f0525dd92af8a82 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Thu, 20 Nov 2025 15:22:55 -0500
Subject: [PATCH 015/233] CASH-1873: Show Mobile First modal on page load

---
 .../mobile-first-modal/mobile-first-modal.vue |  1 +
 src/layouts/schedule/schedule.vue             | 27 +++++++++++--------
 src/styles/ux-variables.scss                  |  4 +--
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/layouts/schedule/mobile-first-modal/mobile-first-modal.vue b/src/layouts/schedule/mobile-first-modal/mobile-first-modal.vue
index 2dbde3bd9..1ef9fbc54 100644
--- a/src/layouts/schedule/mobile-first-modal/mobile-first-modal.vue
+++ b/src/layouts/schedule/mobile-first-modal/mobile-first-modal.vue
@@ -76,6 +76,7 @@ export default {
             let selectedTimeSlot = {
                 timeSlot: this.selectedAppontment.timeSlot,
                 routeCode: this.selectedAppontment.timeSlot.id,
+                date: this.selectedAppontment.date,
             };
             this.$emit("confirm-appointment", selectedTimeSlot);
             this.modal.closeModal();
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 3b4fec04c..1bc3c0945 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -469,6 +469,7 @@ export default {
             navigatingForward: false,
             shopListButton: shopListButton,
             lastSelectedInshopOrDropoffProvider: null,
+            selectedMobileFirstAppointment: false,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -597,7 +598,9 @@ export default {
                 pricedMobileFeePart,
                 shopProviderData.data
             );
-            vm.initializeDatePicker();
+            vm.initializeDatePicker().then(() => {
+                vm.showMobileFirstModal();
+            });
         });
     },
     computed: {
@@ -858,7 +861,9 @@ export default {
             );
         },
         isMobileFirstModalOpen() {
-            return this.isMobileSelected ? this.$refs.mobileFirstModal?.getIsModalOpen() : false;
+            return this.selectableDatesMobile.days
+                ? this.$refs.mobileFirstModal?.getIsModalOpen()
+                : false;
         },
     },
     methods: {
@@ -1187,8 +1192,6 @@ export default {
                 moreShopTimeSlots.mobileTimeSlotsData.days
             );
 
-            this.showMobileFirstModal();
-
             return moreShopTimeSlots;
         },
 
@@ -1678,7 +1681,9 @@ export default {
                 this.zipCode = newZipCode.zipCode;
                 this.zipCodeCtu = newZipCode.zipCodeCtu;
                 this.selectedDate = null;
-                this.initializeDatePicker();
+                this.initializeDatePicker().then(() => {
+                    this.showMobileFirstModal();
+                });
             });
         },
         updateSelectedProviderAndZipCode(newZipCode, newProvider) {
@@ -1716,7 +1721,6 @@ export default {
                 }
                 this.appointmentType = AppointmentTypeStrings.MOBILE;
                 this.updateSelectedProvider();
-                this.showMobileFirstModal();
             } else if (newAppointmentType) {
                 if (this.appointmentType != AppointmentTypeStrings.MOBILE) {
                     // Clear last shop selected if appointment type was changed in any manner other than from Mobile
@@ -1742,7 +1746,7 @@ export default {
             this.selectedDate = this.getFirstAvailableDate();
         },
         async showMobileFirstModal() {
-            if (this.appointmentType == AppointmentTypeStrings.MOBILE) {
+            if (!this.selectedRouteCodeData?.routeCode) {
                 const isShowMobileFirstAppt = experimentMixin.methods.hasSettingEqualTo(
                     experimentSettings.SHOW_MOBILE_FIRST_APPT,
                     "true"
@@ -1824,9 +1828,6 @@ export default {
             }
         },
         async getFirstAvailableMobileApptByTOD(timeOfDay) {
-            if (!this.selectableDatesMobile.days) {
-                await this.initializeDatePicker();
-            }
             if (!this.selectableDatesMobile?.days?.length) {
                 return null;
             } else {
@@ -1853,6 +1854,10 @@ export default {
             }
         },
         updateTimeSlotandNavigateForward(timeSlotObj) {
+            this.selectedMobileFirstAppointment = true;
+            this.appointmentType = AppointmentTypeStrings.MOBILE;
+            this.selectedDate = timeSlotObj.date;
+            this.updateSelectedProvider();
             this.updateTimeSlot(timeSlotObj);
             this.forwardButtonAction();
         },
@@ -1872,7 +1877,7 @@ export default {
             const hasValueChanged = newValue !== oldValue;
             const isDateDifferent = (newValue || oldValue) !== selectedDate;
 
-            if (hasValueChanged && isDateDifferent) {
+            if (hasValueChanged && isDateDifferent && !this.selectedMobileFirstAppointment) {
                 this.selectedTimeSlotInfo = {
                     timeSlot: {
                         date: null,
diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss
index 770d95b42..0c275ad51 100644
--- a/src/styles/ux-variables.scss
+++ b/src/styles/ux-variables.scss
@@ -123,8 +123,8 @@ $body-color: $gray-600;
 
 //Fonts
 $font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif;
-$font-family-monospace: UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
-    monospace;
+$font-family-monospace:
+    UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 // stylelint-enable value-keyword-case
 $font-family-base: $font-family-sans-serif;
 $font-family-code: $font-family-monospace;

From 2eb3b2722f8148867b541c697d9f3b214cfe52d2 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Fri, 21 Nov 2025 14:28:24 -0500
Subject: [PATCH 016/233] CASH-1873: Show waiting modal for Mobile First

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 1bc3c0945..246ce2986 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -470,6 +470,10 @@ export default {
             shopListButton: shopListButton,
             lastSelectedInshopOrDropoffProvider: null,
             selectedMobileFirstAppointment: false,
+            isShowMobileFirstAppt: experimentMixin.methods.hasSettingEqualTo(
+                experimentSettings.SHOW_MOBILE_FIRST_APPT,
+                "true"
+            ),
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -1196,6 +1200,8 @@ export default {
         },
 
         async initializeDatePicker() {
+            this.isShowMobileFirstAppt && this.showLoadingModal();
+
             this.selectedDate = null;
 
             const includeMobileTimeSlots = this.isServiceableMobile;
@@ -1233,6 +1239,8 @@ export default {
                     this.setDisplayWaitList();
                 }
             }
+
+            this.isShowMobileFirstAppt && this.hideLoadingModal();
         },
         getScheduleApiResponse,
         getServiceZipCtuCodeFromStore() {
@@ -1349,6 +1357,9 @@ export default {
         showLoadingModal() {
             this.$refs.loadingModal.showModal();
         },
+        hideLoadingModal() {
+            this.$refs.loadingModal.hideModal();
+        },
         async forwardButtonAction() {
             this.navigatingForward = true;
             var ctu = this.zipCodeCtu;
@@ -1747,10 +1758,6 @@ export default {
         },
         async showMobileFirstModal() {
             if (!this.selectedRouteCodeData?.routeCode) {
-                const isShowMobileFirstAppt = experimentMixin.methods.hasSettingEqualTo(
-                    experimentSettings.SHOW_MOBILE_FIRST_APPT,
-                    "true"
-                );
                 const pmMobileDays = experimentMixin.methods.getSettingValue(
                     experimentSettings.SHOW_PM_MOBILE_DAYS
                 );
@@ -1805,7 +1812,7 @@ export default {
                         );
                     }
 
-                    if (isShowMobileFirstAppt) {
+                    if (this.isShowMobileFirstAppt) {
                         if (firstMobilePMDate && numberOfDaysToFirstMobilePMDate <= pmMobileDays) {
                             preSelectedMobileAppointment = firstMobilePMAppt;
                         } else if (

From 81f005a77fb6cc4a19c634c907bcb6bd9c50f45f Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Mon, 24 Nov 2025 12:53:14 -0500
Subject: [PATCH 017/233] Fix typo for flag value

---
 src/layouts/quote/quote.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 17326ec8e..01b585349 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -581,7 +581,7 @@ export default {
             return store.getters.isRecalibrationOnOrder;
         },
         isQuotePageDiscountOnOrder() {
-            return this.quotePageDiscountPartsInfo?.length > 0;
+            return this.quoteDiscountPartsInfo?.length > 0;
         },
         shouldHideRecalibration() {
             return (

From 2738e5ceffdc064b45368422c5d4a2db885e42b9 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 24 Nov 2025 14:02:25 -0500
Subject: [PATCH 018/233] CASH-1891 font updates from Urbanist to
 UrbanistRegular, UrbanistSemibold.

---
 src/fmg-components/funnel-footer/funnel-footer.vue     | 10 ++--------
 src/layouts/payment-method/payment-method.vue          |  5 +++--
 .../service-package-radio/service-package-radio.vue    |  6 ++----
 src/layouts/schedule/shop-location/shop-location.vue   |  2 +-
 src/ux-components/button-main/button-main.vue          |  7 +------
 5 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/fmg-components/funnel-footer/funnel-footer.vue b/src/fmg-components/funnel-footer/funnel-footer.vue
index a195c446b..572bed1ee 100644
--- a/src/fmg-components/funnel-footer/funnel-footer.vue
+++ b/src/fmg-components/funnel-footer/funnel-footer.vue
@@ -75,17 +75,11 @@ export default {
 
         :deep(a) {
             text-decoration: none;
-            &.new-window-link {
-                font-family: Urbanist, Arial, Helvetica, sans-serif;
-                margin: 0 0.75rem;
-                color: $gray-600;
-                font-weight: 400;
-            }
+            &.new-window-link,
             &.navigation-link {
-                font-family: Urbanist, Arial, Helvetica, sans-serif;
+                font-family: UrbanistRegular, Arial, Helvetica, sans-serif;
                 margin: 0 0.75rem;
                 color: $gray-600;
-                font-weight: 400;
             }
         }
 
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 21c16d80b..955d106b5 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -986,8 +986,9 @@ export default {
         }
     }
 }
-:deep(span.label) {
-    font-weight: 600;
+:deep(span.label),
+:deep(span) {
+    font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
 }
 :deep(div.service-questions span) {
     color: $black;
diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
index 8bb7e921a..959c7345e 100644
--- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
@@ -294,12 +294,11 @@ export default {
 
             .pricing-info .insurance-pricing span {
                 font-size: 0.875rem;
-                font-family: Urbanist, Arial, Helvetica, sans-serif;
-                font-weight: 500;
+                font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
             }
 
             p {
-                font-family: Urbanist, Arial, Helvetica, sans-serif;
+                font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
@@ -312,7 +311,6 @@ export default {
                         color: $green;
                         font-size: 0.875rem;
                         font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
-                        font-weight: 600;
                         @include media-breakpoint-up(md) {
                             position: absolute;
                             bottom: 0.75rem;
diff --git a/src/layouts/schedule/shop-location/shop-location.vue b/src/layouts/schedule/shop-location/shop-location.vue
index 33ec097e8..f22436eda 100644
--- a/src/layouts/schedule/shop-location/shop-location.vue
+++ b/src/layouts/schedule/shop-location/shop-location.vue
@@ -109,10 +109,10 @@ export default {
         border-radius: $border-radius-pill;
 
         a {
+            font-family: UrbanistSemibold;
             display: inline-block;
             text-decoration: none;
             color: $white;
-            font-weight: $font-weight-600;
             line-height: 1.5rem;
             padding: 0.75rem 3rem;
         }
diff --git a/src/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue
index f5db583bb..87eb28841 100644
--- a/src/ux-components/button-main/button-main.vue
+++ b/src/ux-components/button-main/button-main.vue
@@ -63,13 +63,13 @@ export default {
 
 <style lang="scss">
 .btn {
+    font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
     &.btn-primary {
         position: relative;
         background: $red;
         border: none;
         color: $white;
         justify-content: center;
-        font-weight: 500;
         @media (hover: hover) {
             background: $red;
         }
@@ -92,7 +92,6 @@ export default {
             background: $gray-200 !important;
             background: $red !important;
             color: $white !important;
-            font-weight: 400;
             height: 48px;
             border: none;
             cursor: pointer;
@@ -116,7 +115,6 @@ export default {
         background: transparent;
         border: 1px solid $blue;
         color: $blue;
-        font-weight: 500;
         transition: all 150ms linear;
         height: 3rem;
         &:hover {
@@ -137,7 +135,6 @@ export default {
         &:disabled {
             background: transparent;
             color: $red !important;
-            font-weight: 400;
             height: 48px;
             border: 1px solid $red;
             cursor: pointer;
@@ -157,7 +154,6 @@ export default {
         background: $green-100;
         border: 1px solid $green-400;
         color: $black;
-        font-weight: 500;
         transition: all 150ms linear;
         height: 3rem;
         &:hover {
@@ -177,7 +173,6 @@ export default {
         &:disabled {
             background: transparent;
             color: $gray-550 !important;
-            font-weight: 400;
             height: 48px;
             border: 1px solid $gray-550;
             cursor: pointer;

From 0c7fd57ee3a4d2fb33536f89c39eea3bc11de84e Mon Sep 17 00:00:00 2001
From: JennyNou <jenny.nou@safelite.com>
Date: Fri, 28 Nov 2025 14:43:54 -0500
Subject: [PATCH 019/233] Updated locator for content page button for funnel
 entry

---
 playwright-tests/pages/HomePage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/playwright-tests/pages/HomePage.ts b/playwright-tests/pages/HomePage.ts
index b28dd75a4..39e349790 100644
--- a/playwright-tests/pages/HomePage.ts
+++ b/playwright-tests/pages/HomePage.ts
@@ -30,7 +30,7 @@ export class HomePage extends BasePage {
         super(page);
 
         this.page = page;
-        this.letsGetStartedButton = this.page.locator('.hero-content #zipCodeTextboxButton');
+        this.letsGetStartedButton = this.page.locator('#zipCodeTextboxButton');
         this.cusmodalPopup = this.page.locator('#Cusmodalpopup');
         this.closePopupButton = this.page.getByRole('button', { name: '×' });
 

From c75fa4a5ffe455ce292f369da4465543b2299ac0 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 1 Dec 2025 01:15:38 -0500
Subject: [PATCH 020/233] CASH-1790: remove unused method

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 246ce2986..b6f779efb 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1130,29 +1130,6 @@ export default {
                 );
             }
         },
-        getTimeSlotInfo() {
-            // Get the current date
-            const currentDate = getTodayDate();
-
-            // Add 10 days to the current date
-            currentDate.setDate(currentDate.getDate() + 10);
-
-            // Format the date as yyyy-mm-dd
-            const year = currentDate.getFullYear();
-            const month = String(currentDate.getMonth() + 1).padStart(2, "0");
-            const day = String(currentDate.getDate()).padStart(2, "0");
-
-            const formattedDate = `${year}-${month}-${day}`;
-
-            return {
-                date: formattedDate,
-                endTime: "12:00",
-                jobMaxMinutes: "180",
-                jobMinMinutes: "120",
-                routeCode: "3357I-03357-M-I*20988*AM",
-                startTime: "08:00",
-            };
-        },
         onShopSelected(shopQuestionPopUpData) {
             this.resetWaitlist();
             this.preSelectedDate = null;

From e4da847a3d29fa2be2a7458fc42f45efb8d0fd8d Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 1 Dec 2025 01:26:17 -0500
Subject: [PATCH 021/233] CASH-1790: clarify refs

---
 .../schedule/time-slot-question/time-slot-question.vue     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 1b8a2cb2e..aa4903deb 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="time-slots-question">
         <buttonQuestion
+            ref="chooseDropOffOrInshop"
             v-if="isDropOffAppointmentAvailable"
             v-model="selectedAnswerForDropOffOrInshop"
             @update:modelValue="dropOffSelectionChanged"
@@ -23,8 +24,9 @@
             </div>
         </buttonQuestion>
         <buttonQuestion
-            ref="buttonQuestion"
-            v-if="shouldDisplayTimeSlotQuestion"
+            ref="chooseTimeSlot"
+            v-if="displayTimeSlotQuestion"
+            v-model="selectedAnswerForTimeSlots"
             @update:modelValue="timeSlotSelectionChanged"
             buttonTypeString="timeSlotModalListButton"
             :buttonTypeObject="timeSlotModalListButton"
@@ -37,7 +39,6 @@
             :lazyLoad="{ isLazyLoad: !isMobileAppointment, amountToLoad: 10 }"
             groupName="chooseTimeSlot"
             textPosition="text-center"
-            v-model="selectedAnswerForTimeSlots"
             questionText="Available times:"
             isRequired
             validationRules="time-slot-required" />

From c6bdbf8a03b914db65836f3ff5b055b850010d5f Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 1 Dec 2025 02:41:54 -0500
Subject: [PATCH 022/233] CASH-1790: add a check if loaded to fix bug

---
 src/layouts/schedule/schedule.vue                     |  8 ++++++++
 .../time-slot-question/time-slot-question.vue         | 11 +++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index b6f779efb..a1778caa4 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -167,6 +167,7 @@
                         :timeSlotsForSelectedDate="timeSlotsForSelectedDate"
                         :isSameDay="isSameDay"
                         :selectedRouteCodeData="selectedRouteCodeData"
+                        :isDatePickerDoneInitializing="isDatePickerDoneInitializing"
                         @waitListRequested="handleWaitListRequested" />
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
@@ -474,6 +475,7 @@ export default {
                 experimentSettings.SHOW_MOBILE_FIRST_APPT,
                 "true"
             ),
+            isDatePickerDoneInitializing: false,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -1218,6 +1220,8 @@ export default {
             }
 
             this.isShowMobileFirstAppt && this.hideLoadingModal();
+            await this.$nextTick();
+            this.isDatePickerDoneInitializing = true;
         },
         getScheduleApiResponse,
         getServiceZipCtuCodeFromStore() {
@@ -1853,6 +1857,10 @@ export default {
             },
         },
         selectedDate(newValue, oldValue) {
+            if (!this.isDatePickerDoneInitializing) {
+                return;
+            } // needed otherwise it nulls selecdtedTimeSlotInfo too early and prevents a previously selected time slot from auto-selecting
+
             // Clear time slot selection if date selected changes
             const selectedDate = this.getSelectedDateFromStore();
             if (oldValue && this.appointmentType === AppointmentTypeStrings.MOBILE) {
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index aa4903deb..d2e43054c 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -36,7 +36,10 @@
                 isInshopOrDropOffAppointment ? 'is-inshop-or-drop-off-appointment' : '',
             ]"
             :answers="availableTimeSlots"
-            :lazyLoad="{ isLazyLoad: !isMobileAppointment, amountToLoad: 10 }"
+            :lazyLoad="{
+                isLazyLoad: !isMobileAppointment && !selectedAnswerForTimeSlots,
+                amountToLoad: 10,
+            }"
             groupName="chooseTimeSlot"
             textPosition="text-center"
             questionText="Available times:"
@@ -134,6 +137,7 @@ export default {
         isSameDay: Boolean,
         displayWaitList: Boolean,
         selectedRouteCodeData: Object,
+        isDatePickerDoneInitializing: Boolean,
     },
     data() {
         return {
@@ -187,6 +191,9 @@ export default {
             this.updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(newValue);
         },
         timeSlotsForSelectedDate() {
+            if (!this.isDatePickerDoneInitializing) {
+                return;
+            } // needed otherwise it nulls these too early and prevents a previously selected time slot from auto-selecting
             this.selectedAnswerForDropOffOrInshop = null;
             this.selectedAnswerForTimeSlots = null;
             this.autoSelectTimeSlotIfOnlyOneIsAvailable();
@@ -390,7 +397,7 @@ export default {
                 this.answersForDropOffQuestion[0].value !== PICK_A_TIME_BUTTON_VALUE
             );
         },
-        shouldDisplayTimeSlotQuestion() {
+        displayTimeSlotQuestion() {
             return (
                 this.selectedAnswerForDropOffOrInshop == PICK_A_TIME_BUTTON_VALUE ||
                 !this.isDropOffAppointmentAvailable

From a6bd79299c94e1e9fbf248851203a80c2112a3b4 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 1 Dec 2025 03:07:38 -0500
Subject: [PATCH 023/233] CASH-1790: spelling fix

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index a1778caa4..f08038f2b 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1859,7 +1859,7 @@ export default {
         selectedDate(newValue, oldValue) {
             if (!this.isDatePickerDoneInitializing) {
                 return;
-            } // needed otherwise it nulls selecdtedTimeSlotInfo too early and prevents a previously selected time slot from auto-selecting
+            } // needed otherwise it nulls selectedTimeSlotInfo too early and prevents a previously selected time slot from auto-selecting
 
             // Clear time slot selection if date selected changes
             const selectedDate = this.getSelectedDateFromStore();

From 6d1a5bf12d63c0247d4db2e251f1137973a69b18 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 1 Dec 2025 11:15:45 -0500
Subject: [PATCH 024/233] Revert "Merge pull request #2957 from
 Safelite/feature/CASH-1790"

This reverts commit 1d3b49b49bd7b79ed61b74acd347a49e53266ed1, reversing
changes made to 95c114e7f858dcd92b2af0904bdb44d89823fda6.
---
 src/layouts/schedule/schedule.vue             | 31 ++++++++++++++-----
 .../time-slot-question/time-slot-question.vue | 18 +++--------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index f08038f2b..246ce2986 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -167,7 +167,6 @@
                         :timeSlotsForSelectedDate="timeSlotsForSelectedDate"
                         :isSameDay="isSameDay"
                         :selectedRouteCodeData="selectedRouteCodeData"
-                        :isDatePickerDoneInitializing="isDatePickerDoneInitializing"
                         @waitListRequested="handleWaitListRequested" />
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
@@ -475,7 +474,6 @@ export default {
                 experimentSettings.SHOW_MOBILE_FIRST_APPT,
                 "true"
             ),
-            isDatePickerDoneInitializing: false,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -1132,6 +1130,29 @@ export default {
                 );
             }
         },
+        getTimeSlotInfo() {
+            // Get the current date
+            const currentDate = getTodayDate();
+
+            // Add 10 days to the current date
+            currentDate.setDate(currentDate.getDate() + 10);
+
+            // Format the date as yyyy-mm-dd
+            const year = currentDate.getFullYear();
+            const month = String(currentDate.getMonth() + 1).padStart(2, "0");
+            const day = String(currentDate.getDate()).padStart(2, "0");
+
+            const formattedDate = `${year}-${month}-${day}`;
+
+            return {
+                date: formattedDate,
+                endTime: "12:00",
+                jobMaxMinutes: "180",
+                jobMinMinutes: "120",
+                routeCode: "3357I-03357-M-I*20988*AM",
+                startTime: "08:00",
+            };
+        },
         onShopSelected(shopQuestionPopUpData) {
             this.resetWaitlist();
             this.preSelectedDate = null;
@@ -1220,8 +1241,6 @@ export default {
             }
 
             this.isShowMobileFirstAppt && this.hideLoadingModal();
-            await this.$nextTick();
-            this.isDatePickerDoneInitializing = true;
         },
         getScheduleApiResponse,
         getServiceZipCtuCodeFromStore() {
@@ -1857,10 +1876,6 @@ export default {
             },
         },
         selectedDate(newValue, oldValue) {
-            if (!this.isDatePickerDoneInitializing) {
-                return;
-            } // needed otherwise it nulls selectedTimeSlotInfo too early and prevents a previously selected time slot from auto-selecting
-
             // Clear time slot selection if date selected changes
             const selectedDate = this.getSelectedDateFromStore();
             if (oldValue && this.appointmentType === AppointmentTypeStrings.MOBILE) {
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index d2e43054c..1b8a2cb2e 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -1,7 +1,6 @@
 <template>
     <div class="time-slots-question">
         <buttonQuestion
-            ref="chooseDropOffOrInshop"
             v-if="isDropOffAppointmentAvailable"
             v-model="selectedAnswerForDropOffOrInshop"
             @update:modelValue="dropOffSelectionChanged"
@@ -24,9 +23,8 @@
             </div>
         </buttonQuestion>
         <buttonQuestion
-            ref="chooseTimeSlot"
-            v-if="displayTimeSlotQuestion"
-            v-model="selectedAnswerForTimeSlots"
+            ref="buttonQuestion"
+            v-if="shouldDisplayTimeSlotQuestion"
             @update:modelValue="timeSlotSelectionChanged"
             buttonTypeString="timeSlotModalListButton"
             :buttonTypeObject="timeSlotModalListButton"
@@ -36,12 +34,10 @@
                 isInshopOrDropOffAppointment ? 'is-inshop-or-drop-off-appointment' : '',
             ]"
             :answers="availableTimeSlots"
-            :lazyLoad="{
-                isLazyLoad: !isMobileAppointment && !selectedAnswerForTimeSlots,
-                amountToLoad: 10,
-            }"
+            :lazyLoad="{ isLazyLoad: !isMobileAppointment, amountToLoad: 10 }"
             groupName="chooseTimeSlot"
             textPosition="text-center"
+            v-model="selectedAnswerForTimeSlots"
             questionText="Available times:"
             isRequired
             validationRules="time-slot-required" />
@@ -137,7 +133,6 @@ export default {
         isSameDay: Boolean,
         displayWaitList: Boolean,
         selectedRouteCodeData: Object,
-        isDatePickerDoneInitializing: Boolean,
     },
     data() {
         return {
@@ -191,9 +186,6 @@ export default {
             this.updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(newValue);
         },
         timeSlotsForSelectedDate() {
-            if (!this.isDatePickerDoneInitializing) {
-                return;
-            } // needed otherwise it nulls these too early and prevents a previously selected time slot from auto-selecting
             this.selectedAnswerForDropOffOrInshop = null;
             this.selectedAnswerForTimeSlots = null;
             this.autoSelectTimeSlotIfOnlyOneIsAvailable();
@@ -397,7 +389,7 @@ export default {
                 this.answersForDropOffQuestion[0].value !== PICK_A_TIME_BUTTON_VALUE
             );
         },
-        displayTimeSlotQuestion() {
+        shouldDisplayTimeSlotQuestion() {
             return (
                 this.selectedAnswerForDropOffOrInshop == PICK_A_TIME_BUTTON_VALUE ||
                 !this.isDropOffAppointmentAvailable

From b2934987e9f61da18ea2f0f0db9216b97e22e0d8 Mon Sep 17 00:00:00 2001
From: binduchalla <35506898+binduchalla@users.noreply.github.com>
Date: Mon, 1 Dec 2025 12:30:40 -0500
Subject: [PATCH 025/233] Cash-1877 Apply bundle promo code on quote page

Applying bundle promo code on quote page for existing cash replace script part of E2E tests
---
 playwright-tests/tests/CashReplaceDynamicRecalMobile.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/playwright-tests/tests/CashReplaceDynamicRecalMobile.ts b/playwright-tests/tests/CashReplaceDynamicRecalMobile.ts
index 7b16f582b..5705a95a3 100644
--- a/playwright-tests/tests/CashReplaceDynamicRecalMobile.ts
+++ b/playwright-tests/tests/CashReplaceDynamicRecalMobile.ts
@@ -1,6 +1,6 @@
 //Imports here
 import { ITestData } from 'framework/TestData'
-import { ServiceLocation, PaymentType } from 'safelite-playwright-core';
+import { ServiceLocation, ServicePackage, PaymentType } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
 import { getDefaultTestData, setFakerSeedFromTestName } from 'safelite-playwright-core';
@@ -29,7 +29,8 @@ const cashReplaceDynamicRecalMobileData: Partial<ITestData> = {
             postalCode: '21237'
         }
     },
-   
+
+    servicePackage: ServicePackage.Premium,
     // Override vehicle details
     vehicleDetails: {
         ...getDefaultTestData().vehicleDetails!,
@@ -59,7 +60,8 @@ const cashReplaceDynamicRecalMobileData: Partial<ITestData> = {
    
     // Override payment details
     paymentDetails: {
-        paymentType: PaymentType.PayAtService
+        paymentType: PaymentType.PayAtService,
+        promoCode: 'digitalrain'
     }
 }
 

From 16b348b78bcbafe79f4f97147bc21a8bcb573edf Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 1 Dec 2025 13:20:32 -0500
Subject: [PATCH 026/233] CASH-1891 adjust font weight in footer.

---
 src/fmg-components/funnel-footer/funnel-footer.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/fmg-components/funnel-footer/funnel-footer.vue b/src/fmg-components/funnel-footer/funnel-footer.vue
index 572bed1ee..5d8d0cd80 100644
--- a/src/fmg-components/funnel-footer/funnel-footer.vue
+++ b/src/fmg-components/funnel-footer/funnel-footer.vue
@@ -80,6 +80,7 @@ export default {
                 font-family: UrbanistRegular, Arial, Helvetica, sans-serif;
                 margin: 0 0.75rem;
                 color: $gray-600;
+                font-weight: initial;
             }
         }
 

From 883399d7c5bfd3b63c97702aaa8d25a3ba4403ad Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Tue, 2 Dec 2025 12:12:37 -0500
Subject: [PATCH 027/233] CASH-1928: Don't show text below spinner

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 246ce2986..5c54c07f3 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1,6 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
-        <loadingModal ref="loadingModal" />
+        <loadingModal notFullScreen ref="loadingModal" />
         <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
         <mobileFirstModal
             modalWidgetName="MobileFirstModalWidget"

From ffb4156b14033ab296430ea2881fa6b1abe2d283 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 4 Dec 2025 16:25:28 -0500
Subject: [PATCH 028/233] CASH-1790: remove obsolete method

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 5c54c07f3..377a49ad3 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1130,29 +1130,6 @@ export default {
                 );
             }
         },
-        getTimeSlotInfo() {
-            // Get the current date
-            const currentDate = getTodayDate();
-
-            // Add 10 days to the current date
-            currentDate.setDate(currentDate.getDate() + 10);
-
-            // Format the date as yyyy-mm-dd
-            const year = currentDate.getFullYear();
-            const month = String(currentDate.getMonth() + 1).padStart(2, "0");
-            const day = String(currentDate.getDate()).padStart(2, "0");
-
-            const formattedDate = `${year}-${month}-${day}`;
-
-            return {
-                date: formattedDate,
-                endTime: "12:00",
-                jobMaxMinutes: "180",
-                jobMinMinutes: "120",
-                routeCode: "3357I-03357-M-I*20988*AM",
-                startTime: "08:00",
-            };
-        },
         onShopSelected(shopQuestionPopUpData) {
             this.resetWaitlist();
             this.preSelectedDate = null;

From 56e14ab1cd0d2ecc3dd5ffc9ed97a26772a91e6b Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 4 Dec 2025 16:26:46 -0500
Subject: [PATCH 029/233] CASH-1790: add refs for self-documenting clarity

---
 .../schedule/time-slot-question/time-slot-question.vue      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 1b8a2cb2e..6f3fb3283 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="time-slots-question">
         <buttonQuestion
+            ref="chooseDropOffOrInshop"
             v-if="isDropOffAppointmentAvailable"
             v-model="selectedAnswerForDropOffOrInshop"
             @update:modelValue="dropOffSelectionChanged"
@@ -23,8 +24,9 @@
             </div>
         </buttonQuestion>
         <buttonQuestion
-            ref="buttonQuestion"
-            v-if="shouldDisplayTimeSlotQuestion"
+            ref="chooseTimeSlot"
+            v-if="displayTimeSlotQuestion"
+            v-model="selectedAnswerForTimeSlots"
             @update:modelValue="timeSlotSelectionChanged"
             buttonTypeString="timeSlotModalListButton"
             :buttonTypeObject="timeSlotModalListButton"

From 9e9f6257a62afd226b3dad2093cd297c960568bf Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 4 Dec 2025 16:28:56 -0500
Subject: [PATCH 030/233] CASH-1790: add check to keep watches from activating
 before initial load is complete to fix bug

---
 src/layouts/schedule/schedule.vue                     |  8 ++++++++
 .../time-slot-question/time-slot-question.vue         | 11 +++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 377a49ad3..d3d382980 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -167,6 +167,7 @@
                         :timeSlotsForSelectedDate="timeSlotsForSelectedDate"
                         :isSameDay="isSameDay"
                         :selectedRouteCodeData="selectedRouteCodeData"
+                        :isDatePickerDoneInitializing="isDatePickerDoneInitializing"
                         @waitListRequested="handleWaitListRequested" />
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
@@ -474,6 +475,7 @@ export default {
                 experimentSettings.SHOW_MOBILE_FIRST_APPT,
                 "true"
             ),
+            isDatePickerDoneInitializing: false,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -1218,6 +1220,8 @@ export default {
             }
 
             this.isShowMobileFirstAppt && this.hideLoadingModal();
+            await this.$nextTick();
+            this.isDatePickerDoneInitializing = true;
         },
         getScheduleApiResponse,
         getServiceZipCtuCodeFromStore() {
@@ -1853,6 +1857,10 @@ export default {
             },
         },
         selectedDate(newValue, oldValue) {
+            if (!this.isDatePickerDoneInitializing) {
+                return;
+            } // needed otherwise it nulls selectedTimeSlotInfo too early and prevents a previously selected time slot from auto-selecting
+
             // Clear time slot selection if date selected changes
             const selectedDate = this.getSelectedDateFromStore();
             if (oldValue && this.appointmentType === AppointmentTypeStrings.MOBILE) {
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 6f3fb3283..7a8f7527f 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -36,10 +36,9 @@
                 isInshopOrDropOffAppointment ? 'is-inshop-or-drop-off-appointment' : '',
             ]"
             :answers="availableTimeSlots"
-            :lazyLoad="{ isLazyLoad: !isMobileAppointment, amountToLoad: 10 }"
+            :lazyLoad="{ isLazyLoad: !isMobileAppointment && !selectedAnswerForTimeSlots, amountToLoad: 10 }"
             groupName="chooseTimeSlot"
             textPosition="text-center"
-            v-model="selectedAnswerForTimeSlots"
             questionText="Available times:"
             isRequired
             validationRules="time-slot-required" />
@@ -135,7 +134,8 @@ export default {
         isSameDay: Boolean,
         displayWaitList: Boolean,
         selectedRouteCodeData: Object,
-    },
+        isDatePickerDoneInitializing: Boolean,
+    },    
     data() {
         return {
             timeSlotModalListButton: timeSlotModalListButton,
@@ -188,6 +188,9 @@ export default {
             this.updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(newValue);
         },
         timeSlotsForSelectedDate() {
+            if (!this.isDatePickerDoneInitializing) {
+                return;
+            }   // needed otherwise it nulls these too early and prevents a previously selected time slot from auto-selecting
             this.selectedAnswerForDropOffOrInshop = null;
             this.selectedAnswerForTimeSlots = null;
             this.autoSelectTimeSlotIfOnlyOneIsAvailable();
@@ -391,7 +394,7 @@ export default {
                 this.answersForDropOffQuestion[0].value !== PICK_A_TIME_BUTTON_VALUE
             );
         },
-        shouldDisplayTimeSlotQuestion() {
+        displayTimeSlotQuestion() {
             return (
                 this.selectedAnswerForDropOffOrInshop == PICK_A_TIME_BUTTON_VALUE ||
                 !this.isDropOffAppointmentAvailable

From 28b01bb3b4ace19d1852140a6874a64e8378b5a1 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 4 Dec 2025 16:30:02 -0500
Subject: [PATCH 031/233] CASH-1790: fix for prettier

---
 .../schedule/time-slot-question/time-slot-question.vue   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 7a8f7527f..d2e43054c 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -36,7 +36,10 @@
                 isInshopOrDropOffAppointment ? 'is-inshop-or-drop-off-appointment' : '',
             ]"
             :answers="availableTimeSlots"
-            :lazyLoad="{ isLazyLoad: !isMobileAppointment && !selectedAnswerForTimeSlots, amountToLoad: 10 }"
+            :lazyLoad="{
+                isLazyLoad: !isMobileAppointment && !selectedAnswerForTimeSlots,
+                amountToLoad: 10,
+            }"
             groupName="chooseTimeSlot"
             textPosition="text-center"
             questionText="Available times:"
@@ -135,7 +138,7 @@ export default {
         displayWaitList: Boolean,
         selectedRouteCodeData: Object,
         isDatePickerDoneInitializing: Boolean,
-    },    
+    },
     data() {
         return {
             timeSlotModalListButton: timeSlotModalListButton,
@@ -190,7 +193,7 @@ export default {
         timeSlotsForSelectedDate() {
             if (!this.isDatePickerDoneInitializing) {
                 return;
-            }   // needed otherwise it nulls these too early and prevents a previously selected time slot from auto-selecting
+            } // needed otherwise it nulls these too early and prevents a previously selected time slot from auto-selecting
             this.selectedAnswerForDropOffOrInshop = null;
             this.selectedAnswerForTimeSlots = null;
             this.autoSelectTimeSlotIfOnlyOneIsAvailable();

From 211906eab93696969311932848fad6a555137a4a Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Sat, 6 Dec 2025 08:42:15 -0500
Subject: [PATCH 032/233] CASH-1790-ref: more accurate naming

---
 src/digital-components/date-picker/date-picker.vue | 2 +-
 src/layouts/schedule/schedule.vue                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index d586ff839..db1eba7ff 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -281,7 +281,7 @@ export default {
             if (event.screenX === 0 && event.screenY === 0) {
                 return;
             }
-            this.$emit("date-clicked", date);
+            this.$emit("date-selected", date);
         },
         getWeekStartDate(dateString) {
             const date = convertDateStringToDate(dateString);
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index d3d382980..175ece2b1 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -144,7 +144,7 @@
                         class="text-link-small"
                         :getMoreDatesCallback="getMoreScheduleData"
                         validationRules="date-required"
-                        @date-clicked="handleDateClicked"
+                        @date-selected="handleDateSelected"
                         :pricingByDayBasePrice="pricingByDayBasePrice"
                         :pricingByDayUpcharge="pricingByDayUpcharge"
                         :showPricingByDay="showPricingByDay"
@@ -1572,7 +1572,7 @@ export default {
         handleWaitListRequested(value) {
             this.waitListRequested = value;
         },
-        handleDateClicked(date) {
+        handleDateSelected(date) {
             // do something to mark this as upcharge day or not...
             if (date.isPricingByDayUpchargeDay) {
                 this.includePricingByDayUpcharge = true;

From 2af1b71a5264cc4187beac2ffb4c7cc78950438b Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 8 Dec 2025 10:30:19 -0500
Subject: [PATCH 033/233] CSR-1790-ref remove watch on selectedDate and use
 direct events instead

---
 src/layouts/schedule/schedule.vue | 97 +++++++++++++------------------
 1 file changed, 39 insertions(+), 58 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 175ece2b1..00ad09b46 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1573,27 +1573,46 @@ export default {
             this.waitListRequested = value;
         },
         handleDateSelected(date) {
-            // do something to mark this as upcharge day or not...
-            if (date.isPricingByDayUpchargeDay) {
-                this.includePricingByDayUpcharge = true;
-            } else {
-                this.includePricingByDayUpcharge = false;
+            const previousDate = this.selectedDate;
+            
+            // check if date actually changed
+            if (previousDate !== date.dateString) {
+                this.handleDateChanged({
+                    newDate: date.dateString,
+                    oldDate: previousDate
+                });
             }
+
+            // TODO: REMOVE AS PART OF CASH-1634
+            // // do something to mark this as upcharge day or not...
+            // if (date.isPricingByDayUpchargeDay) {
+            //     this.includePricingByDayUpcharge = true;
+            // } else {
+            //     this.includePricingByDayUpcharge = false;
+            // }
         },
-        updateTimeSlot(timeSlotObj) {
+        handleDateChanged(newDate) {
+            // Clear time slot selection when date changes
+            this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
+            this.updateFooterButtonText(this.selectedTimeSlotInfo);
+        },
+        getEmptyTimeSlot() {
+            return {
+                timeSlot: {
+                    date: null,
+                    routeCode: null,
+                    startTime: null,
+                    endTime: null,
+                    jobMaxMinutes: null,
+                    jobMinMinutes: null,
+                },
+                isPremiumAppointment: null,
+            };
+        },
+        updateTimeSlot(timeSlotObj) { 
             if (!timeSlotObj?.routeCode) {
                 this.appointmentType = AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF;
-                this.selectedTimeSlotInfo = {
-                    timeSlot: {
-                        date: null,
-                        routeCode: null,
-                        startTime: null,
-                        endTime: null,
-                        jobMaxMinutes: null,
-                        jobMinMinutes: null,
-                    },
-                    isPremiumAppointment: null,
-                };
+                this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
                 return;
             }
             const timeSlot = this.timeSlotsForSelectedDate?.timeSlots?.find(
@@ -1690,6 +1709,9 @@ export default {
         },
         handleAppointmentTypeChange(newAppointmentType) {
             this.updateFooterButtonText();
+            // if time appointment type changes, clear any selected time slot
+            this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
+
             if (newAppointmentType === AppointmentTypeStrings.MOBILE) {
                 // Remember last shop selected if previous selection was inshop/dropoff
                 if (
@@ -1698,17 +1720,6 @@ export default {
                         AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF) &&
                     this.selectedProvider
                 ) {
-                    this.selectedTimeSlotInfo = {
-                        timeSlot: {
-                            date: null,
-                            routeCode: null,
-                            startTime: null,
-                            endTime: null,
-                            jobMaxMinutes: null,
-                            jobMinMinutes: null,
-                        },
-                        isPremiumAppointment: null,
-                    };
                     this.lastSelectedInshopOrDropoffProvider = this.selectedProvider;
                 }
                 this.appointmentType = AppointmentTypeStrings.MOBILE;
@@ -1856,36 +1867,6 @@ export default {
                 this.handleAppointmentTypeChange(newValue);
             },
         },
-        selectedDate(newValue, oldValue) {
-            if (!this.isDatePickerDoneInitializing) {
-                return;
-            } // needed otherwise it nulls selectedTimeSlotInfo too early and prevents a previously selected time slot from auto-selecting
-
-            // Clear time slot selection if date selected changes
-            const selectedDate = this.getSelectedDateFromStore();
-            if (oldValue && this.appointmentType === AppointmentTypeStrings.MOBILE) {
-                oldValue = `${oldValue}-mobile`;
-            }
-            const hasValueChanged = newValue !== oldValue;
-            const isDateDifferent = (newValue || oldValue) !== selectedDate;
-
-            if (hasValueChanged && isDateDifferent && !this.selectedMobileFirstAppointment) {
-                this.selectedTimeSlotInfo = {
-                    timeSlot: {
-                        date: null,
-                        routeCode: null,
-                        startTime: null,
-                        endTime: null,
-                        jobMaxMinutes: null,
-                        jobMinMinutes: null,
-                    },
-                    isPremiumAppointment: null,
-                };
-            }
-        },
-        selectedTimeSlotInfo(newValue) {
-            this.updateFooterButtonText(newValue);
-        },
     },
     components: {
         funnelHeader,

From 29017f7f12bb28ca0661f96b72c5efcc6f300d2c Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 8 Dec 2025 13:59:09 -0500
Subject: [PATCH 034/233] CASH-1935: add unmounted fix to modal / remove
 superfluous other unmounteds no longer needed

---
 src/digital-components/modal/modal.vue                        | 4 ++++
 .../save-progress-modal-question.vue                          | 4 ----
 .../save-progress-popup-question.vue                          | 4 ----
 .../time-slot-modal-question/time-slot-modal-question.vue     | 3 ---
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 3c3efd05b..9f2be7764 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -160,6 +160,10 @@ export default {
             return this.staticBackdrop ? "static" : "true";
         },
     },
+    unmounted() {
+        // remove any modal effects before leaving page (e.g. user hits browser back button)
+        this.closeModal();
+    },
     components: {
         modalButtonMain,
     },
diff --git a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue b/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue
index fe49fe30e..3bcc1a7a4 100644
--- a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue
+++ b/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue
@@ -57,10 +57,6 @@ export default {
         modalWidgetName: String,
         pageName: String,
     },
-    unmounted() {
-        // remove any modal effects before leaving page (e.g. user hits browser back button)
-        this.modal?.closeModal();
-    },
     computed: {
         buttonText() {
             return this.getCmsContent(this.modalWidgetName, "SubheaderText");
diff --git a/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue b/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue
index 19b1b3629..318d11793 100644
--- a/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue
+++ b/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue
@@ -54,10 +54,6 @@ export default {
     mounted() {
         if (this.showSaveProgressPopup) this.modal.openModal();
     },
-    unmounted() {
-        // remove any modal effects before leaving page (e.g. user hits browser back button)
-        this.modal.closeModal();
-    },
     emits: ["close-save-progress-popup", "save-progress"], // <--- should remove oodles of warnings in dev tools
     props: {
         modelValue: Object,
diff --git a/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue b/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue
index e36ccc946..07cb185d0 100644
--- a/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue
+++ b/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue
@@ -548,9 +548,6 @@ export default {
             }
         },
     },
-    unmounted() {
-        if (this.isModalOpened) this.closeModal();
-    },
     watch: {
         waitListRequested(newVal) {
             if (newVal) {

From 53b928a711ce0dd4fff6d1a17c3ca8267cdaee51 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 9 Dec 2025 09:25:32 -0500
Subject: [PATCH 035/233] CASH-1931

CASH-1931 use bold for modal header sections.
Do not let the link wrap text on to a new line
---
 .../quote/afterpay-modal-banner/afterpay-modal-banner.vue    | 3 ++-
 src/ux-components/text-link/text-link.vue                    | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue b/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
index dfa68c9b4..98c6844b8 100644
--- a/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
+++ b/src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
@@ -253,9 +253,10 @@ export default {
                             height: 40px;
                         }
                         h3 {
-                            font-family: UrbanistSemibold;
+                            font-family: UrbanistBold;
                             font-size: 1rem;
                             margin: 0 0 0 0.5rem;
+                            color: $black;
                         }
                     }
                     p {
diff --git a/src/ux-components/text-link/text-link.vue b/src/ux-components/text-link/text-link.vue
index cae562b08..d9d9df115 100644
--- a/src/ux-components/text-link/text-link.vue
+++ b/src/ux-components/text-link/text-link.vue
@@ -15,7 +15,7 @@
     <!-- prettier-ignore -->
     <a v-else-if="linkType === 'textSmall'" @click="handleClick" class="small" :href="href">{{ text }}<slot name="after-text"></slot></a>
     <!-- prettier-ignore -->
-    <a v-else-if="linkType === 'text'" @click="handleClick" :href="href">{{ text }}<slot name="after-text"></slot></a>
+    <a v-else-if="linkType === 'text'" @click="handleClick" class="text-link" :href="href">{{ text }}<slot name="after-text"></slot></a>
 </template>
 
 <script>
@@ -89,5 +89,8 @@ a {
     &.new-window-link {
         margin-bottom: 1.5rem;
     }
+    &.text-link { 
+        white-space: nowrap;
+    }
 }
 </style>

From bd739cae917939a06fce79090ab69e805094e04e Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 9 Dec 2025 09:32:13 -0500
Subject: [PATCH 036/233] prettier

---
 src/styles/ux-variables.scss              | 4 ++--
 src/ux-components/text-link/text-link.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss
index 0c275ad51..770d95b42 100644
--- a/src/styles/ux-variables.scss
+++ b/src/styles/ux-variables.scss
@@ -123,8 +123,8 @@ $body-color: $gray-600;
 
 //Fonts
 $font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif;
-$font-family-monospace:
-    UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+$font-family-monospace: UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
+    monospace;
 // stylelint-enable value-keyword-case
 $font-family-base: $font-family-sans-serif;
 $font-family-code: $font-family-monospace;
diff --git a/src/ux-components/text-link/text-link.vue b/src/ux-components/text-link/text-link.vue
index d9d9df115..92714e740 100644
--- a/src/ux-components/text-link/text-link.vue
+++ b/src/ux-components/text-link/text-link.vue
@@ -89,7 +89,7 @@ a {
     &.new-window-link {
         margin-bottom: 1.5rem;
     }
-    &.text-link { 
+    &.text-link {
         white-space: nowrap;
     }
 }

From 3bd6d314b1d5b8860a212acc3769fe17ca15e636 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Tue, 9 Dec 2025 11:41:54 -0500
Subject: [PATCH 037/233] CASH-1687: Update vehicle keys messaging

---
 src/layouts/mobile-details/mobile-details.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/layouts/mobile-details/mobile-details.vue b/src/layouts/mobile-details/mobile-details.vue
index 1c1a48249..b6978a7ff 100644
--- a/src/layouts/mobile-details/mobile-details.vue
+++ b/src/layouts/mobile-details/mobile-details.vue
@@ -25,6 +25,11 @@
                                 cmsWidgetName="PleaseProvideAddressWidget"
                                 class="provide-address-header" />
                             <textBlock
+                                v-if="isMSRFeeApplicable()"
+                                cmsWidgetName="VehicleKeysMSRMessageWidget"
+                                class="keys-message" />
+                            <textBlock
+                                v-else
                                 cmsWidgetName="VehicleKeysMessageWidget"
                                 class="keys-message" />
                             <mobileAddressQuestions
@@ -143,6 +148,9 @@ export default {
         getIsVehicleProtectedFromStore() {
             return store.getters.order.serviceLocation.isVehicleProtected;
         },
+        isMSRFeeApplicable() {
+            return store.getters.order.isMSRFeeApplicable;
+        },
         async forwardButtonAction() {
             await this.dispatchStoreAction(
                 this.storeActions.SAVE_MOBILE_DETAILS,

From 88682fe1b338ef5a70b2a0fec756153a2c7049ff Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 10 Dec 2025 15:46:41 -0500
Subject: [PATCH 038/233] CASH-1790 remove unused props

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 00ad09b46..898be4a1b 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -133,8 +133,6 @@
                             :isOvernightDropoff="isOvernightDropoff" />
                     </div>
                     <datePicker
-                        :currentZip="zipCode"
-                        :currentProviderNumber="selectedProvider?.providerNumber"
                         v-show="appointmentType"
                         customComponentId="dateQuestion"
                         selectableDatesSetting="custom"

From 17bcaac1b6331f02cae08040c4cb8af3aade9369 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 10 Dec 2025 17:15:11 -0500
Subject: [PATCH 039/233] CASH-1790: refactor to remove another watch on
 time-slot-question

---
 src/layouts/schedule/schedule.vue                   | 13 ++++++-------
 .../time-slot-question/time-slot-question.vue       |  8 --------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 898be4a1b..d78c37115 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -636,12 +636,12 @@ export default {
         showTimeSlotQuestion() {
             if (
                 this.selectedDate &&
-                this.selectedDate.includes("mobile") &&
-                !this.isMobileSelected
+                this.appointmentTypeFromAppointmentTypeQuestion &&
+                this.timeSlotsForSelectedDate
             ) {
-                this.setSelectedDateToFirstAvailable();
+                return true;
             }
-            return this.selectedDate && this.appointmentTypeFromAppointmentTypeQuestion;
+            return false;
         },
         isMobileStaticRecalibrationApplicable() {
             return (
@@ -1572,12 +1572,12 @@ export default {
         },
         handleDateSelected(date) {
             const previousDate = this.selectedDate;
-            
+
             // check if date actually changed
             if (previousDate !== date.dateString) {
                 this.handleDateChanged({
                     newDate: date.dateString,
-                    oldDate: previousDate
+                    oldDate: previousDate,
                 });
             }
 
@@ -1877,7 +1877,6 @@ export default {
         textBlock,
         timeSlotQuestion,
         mobileFirstModal,
-
         alert,
         serviceZipModalQuestion,
         appointmentTypeQuestion,
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index d2e43054c..3690370e0 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -190,14 +190,6 @@ export default {
         selectedRouteCodeData(newValue) {
             this.updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(newValue);
         },
-        timeSlotsForSelectedDate() {
-            if (!this.isDatePickerDoneInitializing) {
-                return;
-            } // needed otherwise it nulls these too early and prevents a previously selected time slot from auto-selecting
-            this.selectedAnswerForDropOffOrInshop = null;
-            this.selectedAnswerForTimeSlots = null;
-            this.autoSelectTimeSlotIfOnlyOneIsAvailable();
-        },
     },
     computed: {
         supplementalInformationBlock() {

From 21ca0f2d27cd984411826cbb97e7b4fa5b301823 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Thu, 11 Dec 2025 09:52:57 -0500
Subject: [PATCH 040/233] Initial Try to pass prechat details from scarlett

---
 src/helpers/webchat-helper.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/helpers/webchat-helper.js b/src/helpers/webchat-helper.js
index e5254d08d..45b0ff8dd 100644
--- a/src/helpers/webchat-helper.js
+++ b/src/helpers/webchat-helper.js
@@ -11,6 +11,12 @@ export const webchatHelper = () => {
         if (webchatGlobalNonpersistedState.shouldLaunchSierra) {
             window.dispatchEvent(new CustomEvent("launch-sierra-webchat")); // launches the sierra chat
         } else {
+            window.embeddedservice_bootstrap.prechatAPI.setHiddenPrechatFields({
+                ScarlettAISummary: "sScarletAISummary",
+                FirstName: "sFirstName",
+                LastName: "sLastName",
+                Email: "sEmail",
+            });
             window.embeddedservice_bootstrap.utilAPI.launchChat(); // launches the salesForce prechat form
         }
     }

From cc45d3b521bdec35d999d625e22ff684fd68addb Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 11 Dec 2025 11:48:33 -0500
Subject: [PATCH 041/233] CASH-1790: removing date-picker watch bc it was
 causing issues and redundant

---
 src/digital-components/date-picker/date-picker.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index db1eba7ff..9d620ec77 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -846,12 +846,6 @@ export default {
         },
     },
     watch: {
-        isLoading(newValue) {
-            // if done loading dates, then set to first available date
-            if (newValue === false && this.firstAvailableSelectableDate) {
-                this.selectedDate = this.firstAvailableSelectableDate;
-            }
-        },
         modelValue(newValue) {
             this.resetField({
                 value: newValue,

From 290ea914e2d8fed5d26e2dd2dbc85915b2b6c53d Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 11 Dec 2025 12:38:19 -0500
Subject: [PATCH 042/233] CASH-1790: refactoring and restoring watch on
 time-slot-question

---
 src/layouts/schedule/schedule.vue                   | 13 ++-----------
 .../time-slot-question/time-slot-question.vue       |  5 +++++
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index d78c37115..a58d7182c 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1179,8 +1179,6 @@ export default {
         async initializeDatePicker() {
             this.isShowMobileFirstAppt && this.showLoadingModal();
 
-            this.selectedDate = null;
-
             const includeMobileTimeSlots = this.isServiceableMobile;
             const includeInshopTimeSlots = this.isServiceableInshop || this.isServiceableDropoff;
             const datePickerInitialData = await this.$refs.datePicker.loadInitialData({
@@ -1575,10 +1573,8 @@ export default {
 
             // check if date actually changed
             if (previousDate !== date.dateString) {
-                this.handleDateChanged({
-                    newDate: date.dateString,
-                    oldDate: previousDate,
-                });
+                this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
+                this.updateFooterButtonText(this.selectedTimeSlotInfo);
             }
 
             // TODO: REMOVE AS PART OF CASH-1634
@@ -1589,11 +1585,6 @@ export default {
             //     this.includePricingByDayUpcharge = false;
             // }
         },
-        handleDateChanged(newDate) {
-            // Clear time slot selection when date changes
-            this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
-            this.updateFooterButtonText(this.selectedTimeSlotInfo);
-        },
         getEmptyTimeSlot() {
             return {
                 timeSlot: {
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 3690370e0..647d7c48b 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -190,6 +190,11 @@ export default {
         selectedRouteCodeData(newValue) {
             this.updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(newValue);
         },
+        timeSlotsForSelectedDate() {
+            this.selectedAnswerForDropOffOrInshop = null;
+            this.selectedAnswerForTimeSlots = null;
+            this.autoSelectTimeSlotIfOnlyOneIsAvailable();
+        },
     },
     computed: {
         supplementalInformationBlock() {

From 165157ae4728b53f184a9f502997673404576762 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 11 Dec 2025 12:45:34 -0500
Subject: [PATCH 043/233] CASH-1790: remove no longer needed boolean check

---
 src/layouts/schedule/schedule.vue                             | 4 ----
 .../schedule/time-slot-question/time-slot-question.vue        | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index a58d7182c..d2a4e8038 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -165,7 +165,6 @@
                         :timeSlotsForSelectedDate="timeSlotsForSelectedDate"
                         :isSameDay="isSameDay"
                         :selectedRouteCodeData="selectedRouteCodeData"
-                        :isDatePickerDoneInitializing="isDatePickerDoneInitializing"
                         @waitListRequested="handleWaitListRequested" />
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
@@ -473,7 +472,6 @@ export default {
                 experimentSettings.SHOW_MOBILE_FIRST_APPT,
                 "true"
             ),
-            isDatePickerDoneInitializing: false,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -1216,8 +1214,6 @@ export default {
             }
 
             this.isShowMobileFirstAppt && this.hideLoadingModal();
-            await this.$nextTick();
-            this.isDatePickerDoneInitializing = true;
         },
         getScheduleApiResponse,
         getServiceZipCtuCodeFromStore() {
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 647d7c48b..d12757571 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -137,7 +137,6 @@ export default {
         isSameDay: Boolean,
         displayWaitList: Boolean,
         selectedRouteCodeData: Object,
-        isDatePickerDoneInitializing: Boolean,
     },
     data() {
         return {

From 47e57c8425649efbb0ba6c2ff30f8c0e34c31caf Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 11 Dec 2025 12:54:37 -0500
Subject: [PATCH 044/233] CASH-1790: copilot suggestion

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index d2a4e8038..bee86a537 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1594,7 +1594,7 @@ export default {
                 isPremiumAppointment: null,
             };
         },
-        updateTimeSlot(timeSlotObj) { 
+        updateTimeSlot(timeSlotObj) {
             if (!timeSlotObj?.routeCode) {
                 this.appointmentType = AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF;
                 this.selectedTimeSlotInfo = this.getEmptyTimeSlot();

From b3e243585a2f988d9366147adbfeb37250e5e6ed Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 15 Dec 2025 13:49:24 -0500
Subject: [PATCH 045/233] CASH-1953 Attempt to correct possible provider number
 bug for shop-time-slots

---
 src/digital-components/date-picker/date-picker.vue | 2 +-
 src/layouts/schedule/schedule.vue                  | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index 9d620ec77..42e24adf2 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -466,7 +466,7 @@ export default {
                 const response = config.getSelectableDatesCallback({
                     startDateString: initialViewStartDate,
                     endDateString: initialViewEndDate,
-                    providerNumber: config.providerNumber,
+                    inshopProviderNumber: config.inshopProviderNumber, // TODO FOR CASH-1953
                     zipCode: config.zipCode,
                     includeMobileTimeSlots: config.includeMobileTimeSlots,
                     includeInshopTimeSlots: config.includeInshopTimeSlots,
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index bee86a537..a99c0b36a 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -285,6 +285,7 @@ const getScheduleApiResponse = async ({
     startDateString,
     endDateString,
     providerNumber,
+    inshopProviderNumber, // TODO FOR CASH-1953
     zipCode,
     includeMobileTimeSlots = true,
     includeInshopTimeSlots = true,
@@ -327,7 +328,7 @@ const getScheduleApiResponse = async ({
                 startDate: apiStartDate,
                 endDate: apiEndDate,
                 shopAppointmentType: "InshopOrDropoff",
-                providerNumber: providerNumber,
+                providerNumber: inshopProviderNumber, // TODO FOR CASH-1953
             },
         };
         if (apiStartDate < apiEndDate) {
@@ -631,6 +632,9 @@ export default {
                 return this.isGlassServiceableMobile;
             }
         },
+        closestInshopProviderNumber() { // TODO FOR CASH-1953
+            return this.shopProviderData?.shopProviders[0]?.providerNumber;
+        },
         showTimeSlotQuestion() {
             if (
                 this.selectedDate &&
@@ -1158,6 +1162,7 @@ export default {
                 startDateString: startDate,
                 endDateString: endDate,
                 providerNumber: this.selectedProvider?.providerNumber,
+                inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber, // TODO FOR CASH-1953
                 zipCode: this.zipCode,
                 includeMobileTimeSlots: this.isServiceableMobile,
                 includeInshopTimeSlots: this.isServiceableInshop || this.isServiceableDropoff,
@@ -1186,6 +1191,7 @@ export default {
                 getSelectableDatesCallback: getScheduleApiResponse,
                 preSelectedDate: this.preSelectedDate,
                 providerNumber: this.selectedProvider?.providerNumber,
+                inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber, // TODO FOR CASH-1953
                 zipCode: this.zipCode,
                 includeMobileTimeSlots: includeMobileTimeSlots,
                 includeInshopTimeSlots: includeInshopTimeSlots,

From 779cf9415a228df5fa2246bd8bb42bf66736e768 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 15 Dec 2025 17:47:38 -0500
Subject: [PATCH 046/233] CASH-1790 another bug fix for no mobile available

---
 src/layouts/schedule/schedule.vue | 47 ++++++++++++++++---------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index bee86a537..ca66fed8c 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -24,6 +24,7 @@
                     <appointmentTypeQuestion
                         v-model="appointmentTypeFromAppointmentTypeQuestion"
                         v-show="isAppointmentTypeDisplayed"
+                        @handle-appointment-type-change="handleAppointmentTypeChange"
                         :isServiceableMobile="isServiceableMobile"
                         :isServiceableInshop="isServiceableInshop"
                         :isDisplayed="isAppointmentTypeDisplayed"
@@ -438,8 +439,8 @@ export default {
             pricingByDayBasePrice: null,
             pricingByDayUpcharge: null,
             showPricingByDay: null,
-            selectableDatesInshop: [],
-            selectableDatesMobile: [],
+            selectableDatesInshop: null,
+            selectableDatesMobile: null,
             preSelectedDate: null,
             streetAddress: this.getServiceAddressFromStore(),
             apartmentNumberOrBusinessName: this.getServiceAddress2FromStore(),
@@ -602,6 +603,7 @@ export default {
             );
             vm.initializeDatePicker().then(() => {
                 vm.showMobileFirstModal();
+                vm.setSelectedDateToFirstAvailable();
             });
         });
     },
@@ -827,13 +829,13 @@ export default {
         },
         estimatedServiceMinutesMinimum() {
             return this.isMobileSelected
-                ? this.selectableDatesMobile.estimatedServiceMinutesMinimum
-                : this.selectableDatesInshop.estimatedServiceMinutesMinimum;
+                ? this.selectableDatesMobile?.estimatedServiceMinutesMinimum
+                : this.selectableDatesInshop?.estimatedServiceMinutesMinimum;
         },
         estimatedServiceMinutesMaximum() {
             return this.isMobileSelected
-                ? this.selectableDatesMobile.estimatedServiceMinutesMaximum
-                : this.selectableDatesInshop.estimatedServiceMinutesMaximum;
+                ? this.selectableDatesMobile?.estimatedServiceMinutesMaximum
+                : this.selectableDatesInshop?.estimatedServiceMinutesMaximum;
         },
         timeSlotsForSelectedDate() {
             if (!this.selectedDate) return null;
@@ -841,11 +843,11 @@ export default {
 
             if (this.isMobileSelected) {
                 const selectedDateString = selectedDate.replace("-mobile", "");
-                return this.selectableDatesMobile.days?.find(
+                return this.selectableDatesMobile?.days?.find(
                     (selectableDate) => selectableDate.date === selectedDateString
                 );
             } else {
-                return this.selectableDatesInshop.days?.find(
+                return this.selectableDatesInshop?.days?.find(
                     (selectableDate) => selectableDate.date === this.selectedDate
                 );
             }
@@ -863,7 +865,7 @@ export default {
             );
         },
         isMobileFirstModalOpen() {
-            return this.selectableDatesMobile.days
+            return this.selectableDatesMobile?.days
                 ? this.$refs.mobileFirstModal?.getIsModalOpen()
                 : false;
         },
@@ -1015,7 +1017,9 @@ export default {
             return store.getters.order.serviceLocation.isVehicleProtected;
         },
         getAppointmentTypeFromStore() {
-            return store.getters.order.serviceLocation.appointmentType;
+            const appointmentTypeFromStore = store.getters.order.serviceLocation.appointmentType;
+            this.handleAppointmentTypeChange(appointmentTypeFromStore);
+            return appointmentTypeFromStore;
         },
         getSelectedProviderFromStore() {
             return store.getters.order.serviceLocation.provider;
@@ -1036,6 +1040,7 @@ export default {
             this.appointmentType = null;
             this.selectedProvider = null;
             this.appointmentTypeFromAppointmentTypeQuestion = null;
+            this.handleAppointmentTypeChange();
             this.preSelectedDate = null;
         },
         setServiceabilityDetails(serviceabilityDetails) {
@@ -1288,7 +1293,7 @@ export default {
                 }
             }
             */
-            this.$refs.navbar.updateButtonText(navbarButtonText);
+            this.$refs.navbar?.updateButtonText(navbarButtonText);
         },
         convertSelectedDateToShortMonthAndDay(selectedDate) {
             // This conversion ensures we don't get get GMT induced date changes
@@ -1463,9 +1468,12 @@ export default {
             this.showLoadingModal();
         },
         setDisplayWaitList() {
-            const dateString = this.isMobileSelected
-                ? this.selectableDatesMobile?.days[0]?.date
-                : this.selectableDatesInshop?.days[0]?.date;
+            let dateString;
+            if (this.isMobileSelected && this.selectableDatesMobile?.days?.length) {
+                dateString = this.selectableDatesMobile.days[0].date;
+            } else if (this.selectableDatesInshop?.days?.length) {
+                dateString = this.selectableDatesInshop.days[0].date;
+            } 
             if (
                 experimentMixin.methods.hasSettingEqualTo(
                     experimentSettings.DISPLAY_WAITLIST,
@@ -1634,9 +1642,9 @@ export default {
         },
         getFirstAvailableDate() {
             let dateToSelect;
-            if (this.isMobileSelected) {
+            if (this.isMobileSelected && this.selectableDatesMobile?.days?.length) {
                 dateToSelect = returnFirstDate(this.selectableDatesMobile);
-            } else {
+            } else if (this.selectableDatesInshop?.days?.length) {
                 dateToSelect = returnFirstDate(this.selectableDatesInshop);
             }
             if (!dateToSelect) return null;
@@ -1846,13 +1854,6 @@ export default {
             this.forwardButtonAction();
         },
     },
-    watch: {
-        appointmentTypeFromAppointmentTypeQuestion: {
-            handler(newValue, oldValue) {
-                this.handleAppointmentTypeChange(newValue);
-            },
-        },
-    },
     components: {
         funnelHeader,
         navbar,

From 8d98a53f0c1e04ba502949bdebe868d2fa839024 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 15 Dec 2025 17:48:46 -0500
Subject: [PATCH 047/233] CASH-1790 prettier change

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index ca66fed8c..7ae428e59 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1473,7 +1473,7 @@ export default {
                 dateString = this.selectableDatesMobile.days[0].date;
             } else if (this.selectableDatesInshop?.days?.length) {
                 dateString = this.selectableDatesInshop.days[0].date;
-            } 
+            }
             if (
                 experimentMixin.methods.hasSettingEqualTo(
                     experimentSettings.DISPLAY_WAITLIST,

From a212894a26d48d9fcfba15bf819363894e8851b0 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 10 Dec 2025 16:12:58 -0500
Subject: [PATCH 048/233] Adyen POC 0.0

---
 src/constants/endpoints.js                    |   8 +
 src/layouts/payment-adyen/payment-adyen.vue   | 319 ++++++++++++++++++
 .../payment-pia-return/payment-pia-return.vue |   3 +
 src/router/constants/routes.js                |   4 +
 src/router/constants/routing-table.js         |  15 +-
 src/router/methods/routes.js                  |   1 +
 6 files changed, 349 insertions(+), 1 deletion(-)
 create mode 100644 src/layouts/payment-adyen/payment-adyen.vue

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index c1771b3f5..214431e5c 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -216,6 +216,14 @@ const endpoints = {
         url: "/order/api/v1/order/add-donation-part",
         method: "POST",
     },
+    InitializeAdyenPayment: {
+        url: "/order/api/v1/order/payment/session/initialize-session",
+        method: "POST",
+    },
+    GetAdyenSessionResult: {
+        url: "/order/api/v1/order/payment/session/session-result",
+        method: "POST",
+    },
 };
 
 export { endpoints };
diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
new file mode 100644
index 000000000..d105382d6
--- /dev/null
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -0,0 +1,319 @@
+<template>
+    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
+        <div class="container-fluid">
+            <div class="row justify-content-center">
+                <div class="col-md-6">
+                    <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+                </div>
+            </div>
+            <div class="row justify-content-center">
+                <div class="col-md-6 col-xl-4">
+                    <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
+                    <!--
+            ... Page code goes here.
+          -->
+                    <div id="adyen-container"></div>
+                    <navbar
+                        cmsWidgetName="FunnelFooterWidget"
+                        ref="navbar"
+                        isForwardActionDisabled="true"
+                        isSubmitHidden="true"
+                        @back-clicked="backButtonAction" />
+                </div>
+            </div>
+        </div>
+        <component
+            :is="'script'"
+            src="https://checkoutshopper-test.adyen.com/checkoutshopper/sdk/6.21.0/adyen.js"
+            @load="initializeAdyen"></component>
+        <link
+            rel="stylesheet"
+            href="https://checkoutshopper-test.adyen.com/checkoutshopper/sdk/6.21.0/adyen.css" />
+    </Form>
+</template>
+<script>
+import Form from "vee-validate";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import navbar from "@/fmg-components/nav-bar/nav-bar";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import { settleAllPromises } from "@/helpers/layout-helper";
+import globalMethods from "@/global-methods";
+import { endpoints } from "../../constants/endpoints";
+import { AppointmentTypeStrings } from "../../constants/schedule-constants";
+
+export default {
+    name: "payment-adyen",
+    mixins: [],
+    data() {
+        return {
+            sessionId: String,
+        };
+    },
+
+    async beforeRouteEnter(to, from, next) {
+        // Call APIs
+        const cmsContentPromise = fetchCmsContentForPage(to.name);
+
+        // Settle API calls in parallel before handling results.
+        const promiseResultMap = [
+            {
+                resultKey: "cmsContent",
+                promise: cmsContentPromise,
+            },
+        ];
+
+        const resultMap = await settleAllPromises(promiseResultMap);
+
+        // Hydrate page with results
+        next(async (vm) => {
+            vm.setCmsContent(resultMap.cmsContent);
+        });
+    },
+
+    methods: {
+        async backButtonAction() {
+            // Stub, for navigating back via nav-bar.
+        },
+
+        async forwardButtonAction() {
+            // Stub, for navigating forward via nav-bar
+        },
+
+        arePagePrerequisitesValid() {
+            // Stub, for checking if application is capable of entering this page
+            // And/or, is all information required for this page present?
+            // To prevent sequence-breaking from the end-user.
+
+            return true;
+        },
+
+        async initializeAdyen() {
+            const requestBody = this.adyenInitRequestInfo;
+
+            console.log(`Calling with:`);
+            console.log(requestBody);
+
+            const response = await globalMethods.callHttpClient({
+                method: endpoints.InitializeAdyenPayment.method,
+                endpoint: endpoints.InitializeAdyenPayment.url,
+                payload: requestBody,
+                logApiCall: true,
+                pageNameToLog: "payment-adyen",
+            });
+
+            const responseJson = response?.data;
+
+            console.log(`Got data:`);
+            console.log(responseJson);
+
+            const session = {
+                id: responseJson.sessionId,
+                sessionData: responseJson.sessionData,
+            };
+
+            this.sessionId = responseJson.sessionId;
+
+            const configuration = {
+                session: session,
+                clientKey: "test_WYGT4F5ZT5BRRL5MPWHK6QLYOIXZXROD",
+                environment: "test",
+                amount: {
+                    value: this.adyenPriceTotal,
+                    currency: "USD",
+                },
+                locale: "en-US",
+                countryCode: "US",
+                showPayButton: true,
+                translations: {
+                    "en-US": {
+                        "creditCard.securityCode.label": "CVV/CVC",
+                    },
+                },
+                onPaymentCompleted: (result, component) => {
+                    console.log(`Payment completed from Adyen.`);
+                    this.handleCompletedPayment(result);
+                },
+                onPaymentFailed: (result, component) => {
+                    console.log(`Payment failed from Adyen`);
+                    this.handleFailedPayment(result);
+                },
+                onError: (error, component) => {
+                    console.log(`Error from Adyen`);
+                    this.handleError(error);
+                },
+            };
+
+            console.log(`Configuration =`);
+            console.log(configuration);
+
+            // eslint-disable-next-line
+            const checkOut = await AdyenWeb.AdyenCheckout(configuration);
+            window.checkout = checkOut;
+            // eslint-disable-next-line
+            const dropin = new AdyenWeb.Dropin(checkOut, {
+                paymentMethodsConfiguration: {
+                    card: {
+                        showBrandIcon: true, // when false not showing the brand logo
+                        hasHolderName: true, // show holder name
+                        holderNameRequired: true, // make holder name mandatory
+                        billingAddressRequired: true,
+                        billingAddressAllowedCountries: ["US"],
+                        // configure placeholders
+                        placeholders: {
+                            cardNumber: "1234 5678 9012 3456",
+                            expiryDate: "MM/YY",
+                            securityCodeThreeDigits: "123",
+                            securityCodeFourDigits: "1234",
+                            holderName: "J. Smith",
+                        },
+                    },
+                },
+            }).mount("#adyen-container");
+        },
+
+        async handleCompletedPayment(result) {
+            console.log(`Result =`);
+            console.log(result);
+            // Fetch session info
+            const paymentSessionRequest = {
+                zipCodeCtu: this.locationInfo.zipCodeCtu,
+                workOrderNumber: this.workOrderNumberLastSixDigits,
+                sourceSystem: this.sourceSystem,
+                sessionId: this.sessionId,
+                sessionResult: result?.sessionResult,
+            };
+
+            console.log(`Get session payload =`);
+            console.log(paymentSessionRequest);
+
+            const response = await globalMethods.callHttpClient({
+                method: endpoints.GetAdyenSessionResult.method,
+                endpoint: endpoints.GetAdyenSessionResult.url,
+                payload: paymentSessionRequest,
+                logApiCall: true,
+                pageNameToLog: "payment-adyen",
+            });
+
+            const responseJson = response?.data;
+
+            console.log(`Session response =`);
+            console.log(responseJson);
+
+            const ccToken = {
+                subscriptionId: responseJson?.storedToken,
+                expMonth: responseJson?.cardExpiryMonth,
+                expYear: responseJson?.cardExpiryYear,
+                cardType: responseJson?.cardType,
+                billToPostalCode: this.locationInfo.zipCode, // TODO
+                billToFirstName: this.$store.getters.order.customer.firstName, // TODO
+                billToLastName: this.$store.getters.order.customer.lastName, // TODO
+                referenceNumber: responseJson?.workOrderNumber,
+                authCode: responseJson?.authCode,
+                transactionId: responseJson?.transactionReference, // TODO
+                transReferenceNumber: responseJson?.transactionReference,
+                lastFour: responseJson?.last4DigitsOfCard,
+            };
+
+            console.log(`CC Token generated =`);
+            console.log(ccToken);
+        },
+        handleFailedPayment(result) {},
+        handleError(error) {},
+    },
+
+    computed: {
+        adyenInitRequestInfo() {
+            return {
+                sourceSystem: this.sourceSystem,
+                referralSequenceNumber: this.$store.getters.order.referralSequenceNumber,
+                workOrderNumber: this.workOrderNumberLastSixDigits,
+                zipCodeCtu: this.locationInfo.zipCodeCtu,
+                amount: this.adyenPriceTotal, // TODO
+                city: this.locationInfo.city,
+                houseNumberOrName: this.splitStreetAddress.number,
+                street: this.splitStreetAddress.street,
+                zipCode: this.locationInfo.zipCode,
+                stateOrProvince: this.locationInfo.state,
+                returnUrl: "localhost:8080/fmg/confirmation",
+                email: this.$store.getters.order.customer.emailAddress,
+                IP: "127.0.0.1", // TODO
+                firstName: this.$store.getters.order.customer.firstName,
+                lastName: this.$store.getters.order.customer.lastName,
+                idempotencyKey: `${this.$store.getters.order.referralCorrelationId}-${this.sourceSystem}`,
+            };
+        },
+
+        workOrderNumberLastSixDigits() {
+            const workOrderNumber = this.$store.getters.order.workOrderNumber ?? "";
+            const tokens = workOrderNumber.split("-");
+            const lastSegment = tokens[tokens.length - 1] ?? "";
+            const numDigits = lastSegment.length;
+            const numZeroes = 6 - numDigits;
+
+            let result = "";
+            for (let i = 0; i < numZeroes; i++) {
+                result += "0";
+            }
+
+            result += lastSegment;
+
+            return result;
+        },
+
+        locationInfo() {
+            const serviceLocation = this.$store.getters.order.serviceLocation;
+            const isMobile = serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE;
+            if (isMobile) {
+                return {
+                    address: serviceLocation.address,
+                    address2: serviceLocation.address2,
+                    city: serviceLocation.city,
+                    state: serviceLocation.state,
+                    zipCode: serviceLocation.zipCode,
+                    zipCodeCtu: serviceLocation.zipCodeCtu,
+                };
+            } else {
+                const providerInfo = serviceLocation.provider.address;
+                return {
+                    address: providerInfo.streetAddress,
+                    address2: "",
+                    city: providerInfo.city,
+                    state: providerInfo.state,
+                    zipCode: providerInfo.zipCode,
+                    zipCodeCtu: providerInfo.zipCodeCtu,
+                };
+            }
+        },
+
+        splitStreetAddress() {
+            const address = this.locationInfo.address;
+            const tokens = address.split(" ") ?? [""];
+            const number = tokens[0];
+
+            const street = tokens.slice(1).reduce((prev, next) => `${prev} ${next}`);
+
+            return {
+                number: number ?? "",
+                street: street ?? "",
+            };
+        },
+
+        sourceSystem() {
+            return "FMG-2.0";
+        },
+
+        adyenPriceTotal() {
+            return 10000;
+        },
+    },
+
+    components: {
+        Form,
+        funnelHeader,
+        funnelSubHeader,
+        navbar,
+    },
+};
+</script>
diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue
index b1ec2b120..c905f3d78 100644
--- a/src/layouts/payment-pia-return/payment-pia-return.vue
+++ b/src/layouts/payment-pia-return/payment-pia-return.vue
@@ -156,6 +156,9 @@ export default {
                     lastFour: lastFour,
                 };
 
+                console.log(`CCToken =`);
+                console.log(ccToken);
+
                 baseMixin.methods.dispatchStoreAction(storeActions.SAVE_CCTOKEN, ccToken, false);
                 baseMixin.methods.dispatchStoreAction(
                     storeActions.SAVE_NEXTGEN_SETTLED_AMOUNT,
diff --git a/src/router/constants/routes.js b/src/router/constants/routes.js
index 98d6c503a..4b51ff857 100644
--- a/src/router/constants/routes.js
+++ b/src/router/constants/routes.js
@@ -89,6 +89,10 @@ export const routeData = {
         name: "payment-pia-return",
         path: "/payment-pia-return",
     },
+    PAYMENT_ADYEN: {
+        name: "payment-adyen",
+        path: "/payment-adyen",
+    },
     CONFIRMATION: {
         name: "confirmation",
         path: "/confirmation",
diff --git a/src/router/constants/routing-table.js b/src/router/constants/routing-table.js
index 02a0d9384..cd41e8fcf 100644
--- a/src/router/constants/routing-table.js
+++ b/src/router/constants/routing-table.js
@@ -535,7 +535,7 @@ const routingTable = function () {
                 },
                 {
                     scenario: navigationScenarios.CLICKED_PAY_NOW,
-                    destinationPageData: routeData.PAYMENT,
+                    destinationPageData: routeData.PAYMENT_ADYEN,
                 },
                 {
                     scenario: navigationScenarios.CLICKED_INSURANCE,
@@ -563,6 +563,19 @@ const routingTable = function () {
                 },
             ],
         },
+        {
+            pageName: routeData.PAYMENT_ADYEN.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationPageData: routeData.PAYMENT_METHOD,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.CONFIRMATION,
+                },
+            ],
+        },
         {
             pageName: routeData.PAYMENT_PIA_RETURN.name,
             maps: [
diff --git a/src/router/methods/routes.js b/src/router/methods/routes.js
index 97af04068..cf0392ccf 100644
--- a/src/router/methods/routes.js
+++ b/src/router/methods/routes.js
@@ -36,6 +36,7 @@ export const routes = [
     createRoute(routeData.PAYMENT_METHOD, paymentMethodBeforeEnter),
     createRoute(routeData.PAYMENT, paymentBeforeEnter),
     createRoute(routeData.PAYMENT_PIA_RETURN),
+    createRoute(routeData.PAYMENT_ADYEN),
     createRoute(routeData.CONFIRMATION),
     createRoute(routeData.RETURN_USER),
     createRoute(routeData.MOBILE_DETAILS),

From 3b1b000a1387df7bf8f64a17f2a73edc1d624ce2 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 11 Dec 2025 11:58:11 -0500
Subject: [PATCH 049/233] In progress

---
 src/constants/endpoints.js                  |  4 +-
 src/layouts/payment-adyen/payment-adyen.vue | 77 ++++++++++++++++-----
 2 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 214431e5c..e40fce79a 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -217,11 +217,11 @@ const endpoints = {
         method: "POST",
     },
     InitializeAdyenPayment: {
-        url: "/order/api/v1/order/payment/session/initialize-session",
+        url: "/payment/api/v1/payment/payment/session/initialize-session",
         method: "POST",
     },
     GetAdyenSessionResult: {
-        url: "/order/api/v1/order/payment/session/session-result",
+        url: "/payment/api/v1/payment/payment/session/session-result",
         method: "POST",
     },
 };
diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index d105382d6..86c8a67d2 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -42,6 +42,10 @@ import { settleAllPromises } from "@/helpers/layout-helper";
 import globalMethods from "@/global-methods";
 import { endpoints } from "../../constants/endpoints";
 import { AppointmentTypeStrings } from "../../constants/schedule-constants";
+import baseMixin from "@/mixins/base-mixin.js";
+import { storeActions } from "@/constants/store-actions";
+import { getAmountDue } from "@/helpers/pricing-helper.js";
+import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js";
 
 export default {
     name: "payment-adyen",
@@ -90,6 +94,9 @@ export default {
         },
 
         async initializeAdyen() {
+            console.log(`Price = ${this.amountDue}`);
+            console.log(`Adyen Price = ${this.adyenPriceTotal}`);
+
             const requestBody = this.adyenInitRequestInfo;
 
             console.log(`Calling with:`);
@@ -153,23 +160,23 @@ export default {
             window.checkout = checkOut;
             // eslint-disable-next-line
             const dropin = new AdyenWeb.Dropin(checkOut, {
-                paymentMethodsConfiguration: {
-                    card: {
-                        showBrandIcon: true, // when false not showing the brand logo
-                        hasHolderName: true, // show holder name
-                        holderNameRequired: true, // make holder name mandatory
-                        billingAddressRequired: true,
-                        billingAddressAllowedCountries: ["US"],
-                        // configure placeholders
-                        placeholders: {
-                            cardNumber: "1234 5678 9012 3456",
-                            expiryDate: "MM/YY",
-                            securityCodeThreeDigits: "123",
-                            securityCodeFourDigits: "1234",
-                            holderName: "J. Smith",
-                        },
-                    },
-                },
+                // paymentMethodsConfiguration: {
+                //     card: {
+                //         showBrandIcon: true, // when false not showing the brand logo
+                //         hasHolderName: true, // show holder name
+                //         holderNameRequired: true, // make holder name mandatory
+                //         billingAddressRequired: true,
+                //         billingAddressAllowedCountries: ["US"],
+                //         // configure placeholders
+                //         placeholders: {
+                //             cardNumber: "1234 5678 9012 3456",
+                //             expiryDate: "MM/YY",
+                //             securityCodeThreeDigits: "123",
+                //             securityCodeFourDigits: "1234",
+                //             holderName: "J. Smith",
+                //         },
+                //     },
+                // },
             }).mount("#adyen-container");
         },
 
@@ -218,9 +225,39 @@ export default {
 
             console.log(`CC Token generated =`);
             console.log(ccToken);
+
+            await baseMixin.methods.dispatchStoreAction(storeActions.SAVE_CCTOKEN, ccToken, false);
+            await baseMixin.methods.dispatchStoreAction(
+                storeActions.SAVE_NEXTGEN_SETTLED_AMOUNT,
+                this.amountDue,
+                false
+            );
+
+            await this.saveAndSubmitWorkOrder();
         },
         handleFailedPayment(result) {},
         handleError(error) {},
+
+        async saveAndSubmitWorkOrder() {
+            // Work order submission after successful payment.
+            await this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
+            try {
+                await submitWorkOrder({
+                    pageNameToLog: "payment-adyen",
+                    submitAfterSave: true,
+                });
+            } catch (error) {
+                console.log(`error: response from submit work order: ${error.message}`);
+
+                // navigate to error page
+
+                //this.$refs.loadingModal.isModalVisible = false;
+            }
+
+            //this.$refs.loadingModal.isModalVisible = false;
+            // clear order
+            // navigate forward
+        },
     },
 
     computed: {
@@ -304,8 +341,12 @@ export default {
             return "FMG-2.0";
         },
 
+        amountDue() {
+            return getAmountDue(this.$store.getters.order.lineItems);
+        },
+
         adyenPriceTotal() {
-            return 10000;
+            return this.amountDue * 100;
         },
     },
 

From 75417c4a34efc311020622ca98db225b25829294 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Fri, 12 Dec 2025 14:12:20 -0500
Subject: [PATCH 050/233] Attempts to resolve PayPal

---
 src/layouts/payment-adyen/payment-adyen.vue | 56 +++++++++++++--------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index 86c8a67d2..f7e85b019 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -79,6 +79,10 @@ export default {
     methods: {
         async backButtonAction() {
             // Stub, for navigating back via nav-bar.
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK,
+                this.pageName
+            );
         },
 
         async forwardButtonAction() {
@@ -130,14 +134,15 @@ export default {
                     value: this.adyenPriceTotal,
                     currency: "USD",
                 },
-                locale: "en-US",
+                locale: "en_US",
                 countryCode: "US",
                 showPayButton: true,
                 translations: {
-                    "en-US": {
+                    "en_US": {
                         "creditCard.securityCode.label": "CVV/CVC",
                     },
                 },
+
                 onPaymentCompleted: (result, component) => {
                     console.log(`Payment completed from Adyen.`);
                     this.handleCompletedPayment(result);
@@ -160,23 +165,27 @@ export default {
             window.checkout = checkOut;
             // eslint-disable-next-line
             const dropin = new AdyenWeb.Dropin(checkOut, {
-                // paymentMethodsConfiguration: {
-                //     card: {
-                //         showBrandIcon: true, // when false not showing the brand logo
-                //         hasHolderName: true, // show holder name
-                //         holderNameRequired: true, // make holder name mandatory
-                //         billingAddressRequired: true,
-                //         billingAddressAllowedCountries: ["US"],
-                //         // configure placeholders
-                //         placeholders: {
-                //             cardNumber: "1234 5678 9012 3456",
-                //             expiryDate: "MM/YY",
-                //             securityCodeThreeDigits: "123",
-                //             securityCodeFourDigits: "1234",
-                //             holderName: "J. Smith",
-                //         },
-                //     },
-                // },
+                paymentMethodsConfiguration: {
+                    ideal: {
+                        showImage: true,
+                    },
+                    paypal: {
+                        amount: {
+                            value: this.adyenPriceTotal,
+                            currency: "USD",
+                        },
+                        environment: "test", // Change this to "live" when you're ready to accept live PayPal payments
+                        countryCode: "US", // Only needed for test. This will be automatically retrieved when you are in production.
+                        blockPayPalVenmoButton: false,
+                        //blockPayPalPayLaterButton: true
+                    },
+                    card: {
+                        hasHolderName: true,
+                        holderNameRequired: true,
+                        billingAddressRequired: true,
+                        name: "Credit or debit card",
+                    },
+                },
             }).mount("#adyen-container");
         },
 
@@ -235,7 +244,10 @@ export default {
 
             await this.saveAndSubmitWorkOrder();
         },
-        handleFailedPayment(result) {},
+        async handleFailedPayment(result) {
+            console.log(`Result =`);
+            console.log(result);
+        },
         handleError(error) {},
 
         async saveAndSubmitWorkOrder() {
@@ -273,12 +285,12 @@ export default {
                 street: this.splitStreetAddress.street,
                 zipCode: this.locationInfo.zipCode,
                 stateOrProvince: this.locationInfo.state,
-                returnUrl: "localhost:8080/fmg/confirmation",
+                returnUrl: "http://localhost:8080/fmg/confirmation",
                 email: this.$store.getters.order.customer.emailAddress,
                 IP: "127.0.0.1", // TODO
                 firstName: this.$store.getters.order.customer.firstName,
                 lastName: this.$store.getters.order.customer.lastName,
-                idempotencyKey: `${this.$store.getters.order.referralCorrelationId}-${this.sourceSystem}`,
+                idempotencyKey: crypto.randomUUID(), // `${this.$store.getters.order.referralCorrelationId}-${this.sourceSystem}`,
             };
         },
 

From a8453c76ae50c27edd04effb3da57a26a02d98b8 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Mon, 15 Dec 2025 10:17:57 -0500
Subject: [PATCH 051/233] Misc

---
 src/layouts/payment-adyen/payment-adyen.vue | 35 ++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index f7e85b019..e38578e54 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -46,6 +46,7 @@ import baseMixin from "@/mixins/base-mixin.js";
 import { storeActions } from "@/constants/store-actions";
 import { getAmountDue } from "@/helpers/pricing-helper.js";
 import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js";
+import { paymentMethods } from "@/constants/payment-method-constants";
 
 export default {
     name: "payment-adyen",
@@ -138,7 +139,7 @@ export default {
                 countryCode: "US",
                 showPayButton: true,
                 translations: {
-                    "en_US": {
+                    en_US: {
                         "creditCard.securityCode.label": "CVV/CVC",
                     },
                 },
@@ -235,6 +236,11 @@ export default {
             console.log(`CC Token generated =`);
             console.log(ccToken);
 
+            // Save payment type.
+            // For now, CC.
+            // Need to determine payment type from Adyen response
+            await this.dispatchStoreAction(storeActions.SAVE_PAYMENT_METHOD_CHOICE, paymentMethods.CREDIT_CARD, false);
+
             await baseMixin.methods.dispatchStoreAction(storeActions.SAVE_CCTOKEN, ccToken, false);
             await baseMixin.methods.dispatchStoreAction(
                 storeActions.SAVE_NEXTGEN_SETTLED_AMOUNT,
@@ -247,6 +253,33 @@ export default {
         async handleFailedPayment(result) {
             console.log(`Result =`);
             console.log(result);
+
+            // Fetch session info
+            const paymentSessionRequest = {
+                zipCodeCtu: this.locationInfo.zipCodeCtu,
+                workOrderNumber: this.workOrderNumberLastSixDigits,
+                sourceSystem: this.sourceSystem,
+                sessionId: this.sessionId,
+                sessionResult: result?.sessionResult,
+            };
+
+            console.log(`Get session payload =`);
+            console.log(paymentSessionRequest);
+
+            try {
+                const response = await globalMethods.callHttpClient({
+                    method: endpoints.GetAdyenSessionResult.method,
+                    endpoint: endpoints.GetAdyenSessionResult.url,
+                    payload: paymentSessionRequest,
+                    logApiCall: true,
+                    pageNameToLog: "payment-adyen",
+                });
+
+                console.log(response);
+            } catch (error) {
+                console.log(`Error getting session info after failure.`);
+            }
+            
         },
         handleError(error) {},
 

From 72a3d8588eb64e8136937b1c74d0b38e8fef19e0 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 16 Dec 2025 09:45:44 -0500
Subject: [PATCH 052/233] Afterpay return page

---
 package-lock.json                             |  41 +++++++
 package.json                                  |   1 +
 src/helpers/adyen-helper.js                   | 116 ++++++++++++++++++
 src/layouts/payment-adyen/payment-adyen.vue   |  67 +++++-----
 src/router/constants/routes.js                |   5 +
 .../methods/route-logic/adyen-return.js       |  73 +++++++++++
 src/router/methods/routes.js                  |   2 +
 7 files changed, 267 insertions(+), 38 deletions(-)
 create mode 100644 src/helpers/adyen-helper.js
 create mode 100644 src/router/methods/route-logic/adyen-return.js

diff --git a/package-lock.json b/package-lock.json
index 7d44b181a..2e45411d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
       "name": "Safelite",
       "version": "0.1.0",
       "dependencies": {
+        "@adyen/adyen-web": "^6.27.0",
         "@iframe-resizer/child": "^5.3.3",
         "axios": "^0.30.2",
         "bootstrap": "^5.3.3",
@@ -59,6 +60,18 @@
         "node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18 || 19 || 20 || 21 || 22"
       }
     },
+    "node_modules/@adyen/adyen-web": {
+      "version": "6.27.0",
+      "resolved": "https://registry.npmjs.org/@adyen/adyen-web/-/adyen-web-6.27.0.tgz",
+      "integrity": "sha512-6E6hqEkMkoY/FevjO53zhgeCWMt+i/PDc11MX6eVM7Fvd+Sdgc9cIwTBz+NKIXs4ZerG6n2gd+ZIZEywqF/aBQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/applepayjs": "14.0.9",
+        "@types/googlepay": "0.7.8",
+        "classnames": "2.5.1",
+        "preact": "10.22.1"
+      }
+    },
     "node_modules/@ampproject/remapping": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
@@ -3173,6 +3186,12 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/@types/applepayjs": {
+      "version": "14.0.9",
+      "resolved": "https://registry.npmjs.org/@types/applepayjs/-/applepayjs-14.0.9.tgz",
+      "integrity": "sha512-xEprYbb0TEP/XIiDPbVnTYpDai8fTFpsQfVSfTd81Is2GOMUy7ie019eyX6Mz2ECxfjoUVKaiGSL577roIeHCg==",
+      "license": "MIT"
+    },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
@@ -3328,6 +3347,12 @@
         "@types/send": "*"
       }
     },
+    "node_modules/@types/googlepay": {
+      "version": "0.7.8",
+      "resolved": "https://registry.npmjs.org/@types/googlepay/-/googlepay-0.7.8.tgz",
+      "integrity": "sha512-EHl7G7jIeit/Px/fi/Du/19SZDvqrRhy0DjJX40Vzs/97m3sro9mzVyAYNC0pfzpWGDY+zPjtTLEfhV+OYWUcQ==",
+      "license": "MIT"
+    },
     "node_modules/@types/graceful-fs": {
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
@@ -5789,6 +5814,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/classnames": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
+      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",
+      "license": "MIT"
+    },
     "node_modules/clean-css": {
       "version": "5.3.3",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
@@ -13681,6 +13712,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/preact": {
+      "version": "10.22.1",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.22.1.tgz",
+      "integrity": "sha512-jRYbDDgMpIb5LHq3hkI0bbl+l/TQ9UnkdQ0ww+lp+4MMOdqaUYdFc5qeyP+IV8FAd/2Em7drVPeKdQxsiWCf/A==",
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/preact"
+      }
+    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
diff --git a/package.json b/package.json
index 7d06ad112..c55259920 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "@adyen/adyen-web": "^6.27.0",
     "@iframe-resizer/child": "^5.3.3",
     "axios": "^0.30.2",
     "bootstrap": "^5.3.3",
diff --git a/src/helpers/adyen-helper.js b/src/helpers/adyen-helper.js
new file mode 100644
index 000000000..93bd53bc8
--- /dev/null
+++ b/src/helpers/adyen-helper.js
@@ -0,0 +1,116 @@
+import { AdyenCheckout } from "@adyen/adyen-web/auto";
+import store from "@/store";
+import globalMethods from "@/global-methods";
+import { endpoints } from "@/constants/endpoints";
+import { AppointmentTypeStrings } from "@/constants/schedule-constants";
+
+export async function getNewSession(sessionConfig) {}
+
+export async function getSessionInfo(sessionId, encryptedSessionResult, pageNameToLog = "") {
+    const order = store.getters.order;
+    const location = getLocationInfo(order);
+    const workOrder = getWorkOrderLastSixDigits(order);
+    const system = getSourceSystem();
+
+    const request = {
+        sessionId: sessionId,
+        sessionResult: encryptedSessionResult,
+        zipCodeCtu: location.zipCodeCtu,
+        workOrderNumber: workOrder,
+        sourceSystem: system,
+    };
+
+    const response = await globalMethods.callHttpClient({
+        method: endpoints.GetAdyenSessionResult.method,
+        endpoint: endpoints.GetAdyenSessionResult.url,
+        payload: request,
+        logApiCall: true,
+        pageNameToLog: pageNameToLog,
+    });
+
+    return response?.data;
+}
+
+export async function createAdyenCheckout({
+    session: { id, sessionData },
+    handlers: { onPaymentCompleted, onPaymentFailed, onError },
+    options: { showPayButton = true, amount },
+}) {
+    const config = {
+        session: {
+            id: id,
+            sessionData: sessionData,
+        },
+        clientKey: "test_WYGT4F5ZT5BRRL5MPWHK6QLYOIXZXROD",
+        environment: "test",
+        locale: "en_US",
+        countryCode: "US",
+        showPayButton: showPayButton,
+        translations: {
+            en_US: {
+                "creditCard.securityCode.label": "CVV/CVC",
+            },
+        },
+        onPaymentCompleted: onPaymentCompleted,
+        onPaymentFailed: onPaymentFailed,
+        onError: onError,
+    };
+
+    if (amount !== undefined && amount !== null) {
+        config.amount = {
+            value: amount,
+            currency: "USD",
+        };
+    }
+
+    console.log(`Creating checkout with configuration:`);
+    console.log(config);
+
+    return await AdyenCheckout(config);
+}
+
+function getLocationInfo(order) {
+    const serviceLocation = order.serviceLocation;
+    const isMobile = serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE;
+    if (isMobile) {
+        return {
+            address: serviceLocation.address,
+            address2: serviceLocation.address2,
+            city: serviceLocation.city,
+            state: serviceLocation.state,
+            zipCode: serviceLocation.zipCode,
+            zipCodeCtu: serviceLocation.zipCodeCtu,
+        };
+    } else {
+        const providerInfo = serviceLocation.provider.address;
+        return {
+            address: providerInfo.streetAddress,
+            address2: "",
+            city: providerInfo.city,
+            state: providerInfo.state,
+            zipCode: providerInfo.zipCode,
+            zipCodeCtu: providerInfo.zipCodeCtu,
+        };
+    }
+}
+
+function getWorkOrderLastSixDigits(order) {
+    const workOrderNumber = order.workOrderNumber ?? "";
+    const tokens = workOrderNumber.split("-");
+    const lastSegment = tokens[tokens.length - 1] ?? "";
+    const numDigits = lastSegment.length;
+    const numZeroes = 6 - numDigits;
+
+    let result = "";
+    for (let i = 0; i < numZeroes; i++) {
+        result += "0";
+    }
+
+    result += lastSegment;
+
+    return result;
+}
+
+function getSourceSystem() {
+    return "FMG-2.0";
+}
diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index e38578e54..a2d7651a2 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -47,6 +47,8 @@ import { storeActions } from "@/constants/store-actions";
 import { getAmountDue } from "@/helpers/pricing-helper.js";
 import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js";
 import { paymentMethods } from "@/constants/payment-method-constants";
+import { createAdyenCheckout } from "@/helpers/adyen-helper";
+import { Dropin } from "@adyen/adyen-web/auto";
 
 export default {
     name: "payment-adyen",
@@ -127,45 +129,31 @@ export default {
 
             this.sessionId = responseJson.sessionId;
 
-            const configuration = {
+            const checkout = await createAdyenCheckout({
                 session: session,
-                clientKey: "test_WYGT4F5ZT5BRRL5MPWHK6QLYOIXZXROD",
-                environment: "test",
-                amount: {
-                    value: this.adyenPriceTotal,
-                    currency: "USD",
-                },
-                locale: "en_US",
-                countryCode: "US",
-                showPayButton: true,
-                translations: {
-                    en_US: {
-                        "creditCard.securityCode.label": "CVV/CVC",
+                handlers: {
+                    onPaymentCompleted: (result, component) => {
+                        console.log(`Payment completed from Adyen.`);
+                        this.handleCompletedPayment(result);
+                    },
+                    onPaymentFailed: (result, component) => {
+                        console.log(`Payment failed from Adyen`);
+                        this.handleFailedPayment(result);
+                    },
+                    onError: (error, component) => {
+                        console.log(`Error from Adyen`);
+                        this.handleError(error);
                     },
                 },
-
-                onPaymentCompleted: (result, component) => {
-                    console.log(`Payment completed from Adyen.`);
-                    this.handleCompletedPayment(result);
+                options: {
+                    amount: this.adyenPriceTotal,
                 },
-                onPaymentFailed: (result, component) => {
-                    console.log(`Payment failed from Adyen`);
-                    this.handleFailedPayment(result);
-                },
-                onError: (error, component) => {
-                    console.log(`Error from Adyen`);
-                    this.handleError(error);
-                },
-            };
+            });
 
-            console.log(`Configuration =`);
-            console.log(configuration);
+            console.log(checkout);
 
-            // eslint-disable-next-line
-            const checkOut = await AdyenWeb.AdyenCheckout(configuration);
-            window.checkout = checkOut;
-            // eslint-disable-next-line
-            const dropin = new AdyenWeb.Dropin(checkOut, {
+            window.checkout = checkout;
+            const dropin = new Dropin(checkout, {
                 paymentMethodsConfiguration: {
                     ideal: {
                         showImage: true,
@@ -239,7 +227,11 @@ export default {
             // Save payment type.
             // For now, CC.
             // Need to determine payment type from Adyen response
-            await this.dispatchStoreAction(storeActions.SAVE_PAYMENT_METHOD_CHOICE, paymentMethods.CREDIT_CARD, false);
+            await this.dispatchStoreAction(
+                storeActions.SAVE_PAYMENT_METHOD_CHOICE,
+                paymentMethods.CREDIT_CARD,
+                false
+            );
 
             await baseMixin.methods.dispatchStoreAction(storeActions.SAVE_CCTOKEN, ccToken, false);
             await baseMixin.methods.dispatchStoreAction(
@@ -279,7 +271,6 @@ export default {
             } catch (error) {
                 console.log(`Error getting session info after failure.`);
             }
-            
         },
         handleError(error) {},
 
@@ -312,18 +303,18 @@ export default {
                 referralSequenceNumber: this.$store.getters.order.referralSequenceNumber,
                 workOrderNumber: this.workOrderNumberLastSixDigits,
                 zipCodeCtu: this.locationInfo.zipCodeCtu,
-                amount: this.adyenPriceTotal, // TODO
+                amount: this.adyenPriceTotal,
                 city: this.locationInfo.city,
                 houseNumberOrName: this.splitStreetAddress.number,
                 street: this.splitStreetAddress.street,
                 zipCode: this.locationInfo.zipCode,
                 stateOrProvince: this.locationInfo.state,
-                returnUrl: "http://localhost:8080/fmg/confirmation",
+                returnUrl: "http://localhost:8080/fmg/virtual/payment/return",
                 email: this.$store.getters.order.customer.emailAddress,
                 IP: "127.0.0.1", // TODO
                 firstName: this.$store.getters.order.customer.firstName,
                 lastName: this.$store.getters.order.customer.lastName,
-                idempotencyKey: crypto.randomUUID(), // `${this.$store.getters.order.referralCorrelationId}-${this.sourceSystem}`,
+                idempotencyKey: `${this.$store.getters.order.referralCorrelationId}-${this.sourceSystem}`,
             };
         },
 
diff --git a/src/router/constants/routes.js b/src/router/constants/routes.js
index 4b51ff857..5090df2b3 100644
--- a/src/router/constants/routes.js
+++ b/src/router/constants/routes.js
@@ -93,6 +93,11 @@ export const routeData = {
         name: "payment-adyen",
         path: "/payment-adyen",
     },
+    PAYMENT_ADYEN_RETURN: {
+        name: "adyen-return",
+        path: "/virtual/payment/return",
+        virtual: true,
+    },
     CONFIRMATION: {
         name: "confirmation",
         path: "/confirmation",
diff --git a/src/router/methods/route-logic/adyen-return.js b/src/router/methods/route-logic/adyen-return.js
new file mode 100644
index 000000000..9bf1940ba
--- /dev/null
+++ b/src/router/methods/route-logic/adyen-return.js
@@ -0,0 +1,73 @@
+import { AdyenCheckout } from "@adyen/adyen-web";
+import { routeData } from "@router/constants/routes";
+import { createAdyenCheckout, getSessionInfo } from "@/helpers/adyen-helper";
+
+export async function adyenReturnBeforeEnter(to, from) {
+    console.log(`In adyen return.`);
+    console.log(JSON.parse(JSON.stringify(to)));
+
+    const sessionId = to?.query?.sessionId;
+    const redirectResult = to?.query?.redirectResult;
+
+    if (sessionId && redirectResult) {
+        const result = await finalizeAdyenPayment(sessionId, redirectResult);
+        console.log(`Out of promise`);
+        console.log(result);
+
+        const sessionInfo = await getSessionInfo(sessionId, result.sessionResult);
+
+        console.log(`Got session info:`);
+        console.log(sessionInfo);
+
+        // TODO once afterpay info is returned, create cc token and submit order.
+
+        return {
+            name: routeData.CONFIRMATION.name,
+            replace: true,
+        };
+    }
+
+    return {
+        name: routeData.ERROR.name,
+        replace: true,
+    };
+}
+
+function finalizeAdyenPayment(sessionId, redirectResult) {
+    return new Promise((resolve, reject) => {
+        createAdyenCheckout({
+            session: {
+                id: sessionId,
+            },
+            handlers: {
+                onPaymentCompleted: (result, component) => {
+                    console.log(`Payment successful`);
+                    console.log(result);
+                    resolve(result);
+                },
+                onPaymentFailed: (result, component) => {
+                    console.log(`Payment failed`);
+                    console.log(result);
+                    reject("Payment failed from Adyen");
+                },
+                onError: (error, component) => {
+                    console.log(`Error occured`);
+                    console.log(error);
+                    reject("Error from Adyen");
+                },
+            },
+            options: {},
+        }).then(
+            (checkout) => {
+                checkout.submitDetails({
+                    details: {
+                        redirectResult: redirectResult,
+                    },
+                });
+            },
+            (error) => {
+                reject(error);
+            }
+        );
+    });
+}
diff --git a/src/router/methods/routes.js b/src/router/methods/routes.js
index cf0392ccf..ec6077270 100644
--- a/src/router/methods/routes.js
+++ b/src/router/methods/routes.js
@@ -13,6 +13,7 @@ import { restartBeforeEnter } from "@/router/methods/route-logic/restart";
 import { paymentMethodBeforeEnter } from "@/router/methods/route-logic/payment-method";
 import { paymentBeforeEnter } from "@/router/methods/route-logic/payment";
 import { serviceLocationBeforeEnter } from "@/router/methods/route-logic/service-location";
+import { adyenReturnBeforeEnter } from "@/router/methods/route-logic/adyen-return";
 
 export const routes = [
     // Non-virtual pages.
@@ -48,4 +49,5 @@ export const routes = [
     createVirtualRoute(routeData.AUTO_ROUTE, autoRouteBeforeEnter),
     createVirtualRoute(routeData.ERROR, errorBeforeEnter),
     createVirtualRoute(routeData.RESTART, restartBeforeEnter),
+    createVirtualRoute(routeData.PAYMENT_ADYEN_RETURN, adyenReturnBeforeEnter),
 ];

From 8385928d8c5c14061f0acf9b5b076888b4c3c94d Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 16 Dec 2025 11:10:56 -0500
Subject: [PATCH 053/233] Changes for Dev

---
 src/constants/application-config.js           |  1 +
 src/constants/experiments.js                  |  1 +
 src/layouts/payment-adyen/payment-adyen.vue   | 26 ++++++++++++++-----
 src/layouts/payment-method/payment-method.vue | 14 +++++++---
 src/router/constants/navigation-scenarios.js  |  1 +
 src/router/constants/routing-table.js         |  4 +++
 .../methods/route-logic/adyen-return.js       |  2 +-
 7 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/constants/application-config.js b/src/constants/application-config.js
index 93a6f70d8..b739d9ff9 100644
--- a/src/constants/application-config.js
+++ b/src/constants/application-config.js
@@ -22,6 +22,7 @@ const applicationConfig = {
     PIA_ERROR_URL:
         location.protocol + "//" + location.host + "/fmg/payment-pia-return?src=concept-funnel",
     CONFIRMATION_URL: location.protocol + "//" + location.host + "/fmg/confirmation",
+    PIA_ADYEN_RETURN_URL: location.protocol + "//" + location.host + "/fmg/virtual/payment/return",
     GOOGLE_CALENDAR: "https://www.google.com/calendar/render?action=TEMPLATE",
     YAHOO_CALENDAR: "https://calendar.yahoo.com/?v=60",
     OUTLOOK_CALENDAR:
diff --git a/src/constants/experiments.js b/src/constants/experiments.js
index f358fc89f..0ca3987f0 100644
--- a/src/constants/experiments.js
+++ b/src/constants/experiments.js
@@ -33,6 +33,7 @@ const experimentSettings = {
     SHOW_PM_MOBILE_DAYS: "Show_PMmobileDays",
     SHOW_NO_PM_MOBILE_DAYS: "Show_NoPMmobileDays",
     SHOW_NO_MOBILE_AVAILABLE_DAYS: "Show_NoMobileAvailableDays",
+    USE_ADYEN_PAYMENT: "UseAdyenPayment",
 };
 
 const experimentTriggers = {
diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index a2d7651a2..5e74692d5 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -49,6 +49,7 @@ import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js"
 import { paymentMethods } from "@/constants/payment-method-constants";
 import { createAdyenCheckout } from "@/helpers/adyen-helper";
 import { Dropin } from "@adyen/adyen-web/auto";
+import { applicationConfig } from "@/constants/application-config";
 
 export default {
     name: "payment-adyen",
@@ -279,20 +280,29 @@ export default {
             await this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
             try {
                 await submitWorkOrder({
-                    pageNameToLog: "payment-adyen",
+                    pageNameToLog: this.pageName,
                     submitAfterSave: true,
                 });
             } catch (error) {
                 console.log(`error: response from submit work order: ${error.message}`);
 
                 // navigate to error page
+                const errorPayload = {
+                    cause: `Error while submitting work order after Adyen payment.`,
+                    currentPage: this.pageName,
+                    sessionId: this.sessionId,
+                    idempotencyKey: this.idempotencyKey,
+                };
 
-                //this.$refs.loadingModal.isModalVisible = false;
+                this.$router.handleSoftError(errorPayload);
             }
 
-            //this.$refs.loadingModal.isModalVisible = false;
             // clear order
-            // navigate forward
+            await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_STATE);
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_FORWARD,
+                this.pageName
+            );
         },
     },
 
@@ -309,12 +319,12 @@ export default {
                 street: this.splitStreetAddress.street,
                 zipCode: this.locationInfo.zipCode,
                 stateOrProvince: this.locationInfo.state,
-                returnUrl: "http://localhost:8080/fmg/virtual/payment/return",
+                returnUrl: applicationConfig.PIA_ADYEN_RETURN_URL,
                 email: this.$store.getters.order.customer.emailAddress,
                 IP: "127.0.0.1", // TODO
                 firstName: this.$store.getters.order.customer.firstName,
                 lastName: this.$store.getters.order.customer.lastName,
-                idempotencyKey: `${this.$store.getters.order.referralCorrelationId}-${this.sourceSystem}`,
+                idempotencyKey: this.idempotencyKey,
             };
         },
 
@@ -373,6 +383,10 @@ export default {
             };
         },
 
+        idempotencyKey() {
+            return `${this.$store.getters.order.referralCorrelationId}-${this.sourceSystem}`;
+        },
+
         sourceSystem() {
             return "FMG-2.0";
         },
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 955d106b5..0fa02e80a 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -170,6 +170,7 @@ import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stas
 import { debugLog } from "@/helpers/debug-log-helper";
 import { ErrorMessage } from "vee-validate";
 import { Field } from "vee-validate";
+import experimentMixin from "../../mixins/experiment-mixin";
 
 defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
 defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
@@ -609,10 +610,17 @@ export default {
             }
 
             this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
-            this.$router.navigateWithoutSaving(
-                this.navigationScenarios.CLICKED_PAY_NOW,
-                this.pageName
+
+            const shouldUseAdyen = experimentMixin.methods.hasSettingEqualTo(
+                experimentSettings.USE_ADYEN_PAYMENT,
+                "true"
             );
+
+            const scenarioName = shouldUseAdyen
+                ? this.navigationScenarios.CLICKED_PAY_NOW_ADYEN
+                : this.navigationScenarios.CLICKED_PAY_NOW;
+
+            this.$router.navigateWithoutSaving(scenarioName, this.pageName);
         },
         async evaluatePromosAndTaxItemsOnOrder() {
             //Revalidate promos if there are any inactive, or active promos
diff --git a/src/router/constants/navigation-scenarios.js b/src/router/constants/navigation-scenarios.js
index b660afca3..c2247d59b 100644
--- a/src/router/constants/navigation-scenarios.js
+++ b/src/router/constants/navigation-scenarios.js
@@ -61,6 +61,7 @@ const navigationScenarios = {
     // Payment
     CLICKED_INSURANCE: "CLICKED_INSURANCE",
     CLICKED_PAY_NOW: "CLICKED_PAY_NOW",
+    CLICKED_PAY_NOW_ADYEN: "CLICKED_PAY_NOW_ADYEN",
     CLICKED_PAY_LATER: "CLICKED_PAY_LATER",
     PIA_ERROR: "PIA_ERROR",
     PIA_CC_ERROR: "PIA_CC_ERROR",
diff --git a/src/router/constants/routing-table.js b/src/router/constants/routing-table.js
index cd41e8fcf..192e1572e 100644
--- a/src/router/constants/routing-table.js
+++ b/src/router/constants/routing-table.js
@@ -535,6 +535,10 @@ const routingTable = function () {
                 },
                 {
                     scenario: navigationScenarios.CLICKED_PAY_NOW,
+                    destinationPageData: routeData.PAYMENT,
+                },
+                {
+                    scenario: navigationScenarios.CLICKED_PAY_NOW_ADYEN,
                     destinationPageData: routeData.PAYMENT_ADYEN,
                 },
                 {
diff --git a/src/router/methods/route-logic/adyen-return.js b/src/router/methods/route-logic/adyen-return.js
index 9bf1940ba..a516518ac 100644
--- a/src/router/methods/route-logic/adyen-return.js
+++ b/src/router/methods/route-logic/adyen-return.js
@@ -1,5 +1,5 @@
 import { AdyenCheckout } from "@adyen/adyen-web";
-import { routeData } from "@router/constants/routes";
+import { routeData } from "@/router/constants/routes";
 import { createAdyenCheckout, getSessionInfo } from "@/helpers/adyen-helper";
 
 export async function adyenReturnBeforeEnter(to, from) {

From f11e7dd9ec724e7e1ec784c98ee53e7152753044 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Tue, 16 Dec 2025 13:21:11 -0500
Subject: [PATCH 054/233] CASH-2036: Mobile first popup changes.

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index bee86a537..ff723d9cb 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1793,8 +1793,9 @@ export default {
                         if (firstMobilePMDate && numberOfDaysToFirstMobilePMDate <= pmMobileDays) {
                             preSelectedMobileAppointment = firstMobilePMAppt;
                         } else if (
-                            firstMobilePMDate &&
-                            numberOfDaysToFirstMobilePMDate >= noPMMobileDays
+                            (firstMobilePMDate &&
+                                numberOfDaysToFirstMobilePMDate >= noPMMobileDays) ||
+                            pmMobileDays == 0
                         ) {
                             preSelectedMobileAppointment = firstMobileAMAppt
                                 ? firstMobileAMAppt
@@ -1803,10 +1804,12 @@ export default {
                                 (preSelectedMobileAppointment = firstMobilePMAppt);
                         }
 
-                        this.$refs.mobileFirstModal.setSelectedAppointment(
-                            preSelectedMobileAppointment
-                        );
-                        this.$refs.mobileFirstModal.openModal();
+                        if (preSelectedMobileAppointment) {
+                            this.$refs.mobileFirstModal.setSelectedAppointment(
+                                preSelectedMobileAppointment
+                            );
+                            this.$refs.mobileFirstModal.openModal();
+                        }
                     }
                 }
             }

From 652684782150b8e286421ec3468e4018459d52ef Mon Sep 17 00:00:00 2001
From: kpatel8hs4io <31411746+kpatel8hs4io@users.noreply.github.com>
Date: Tue, 16 Dec 2025 15:13:20 -0500
Subject: [PATCH 055/233] Updated few playwright scripts

---
 playwright-tests/pages/HomePage.ts                       | 9 +++++----
 playwright-tests/pages/PaypalPage.ts                     | 2 ++
 playwright-tests/pages/SchedulePage.ts                   | 5 +++++
 .../tests/CashReplaceMultiSlidingGlassDropoff.ts         | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/playwright-tests/pages/HomePage.ts b/playwright-tests/pages/HomePage.ts
index 39e349790..3d44b023a 100644
--- a/playwright-tests/pages/HomePage.ts
+++ b/playwright-tests/pages/HomePage.ts
@@ -47,7 +47,7 @@ export class HomePage extends BasePage {
 
         //Zip Entry
         this.enterServiceZipTextBox = this.page.locator('#zipCodeTextbox');
-        this.zipEntryLetsGetStartedButton = this.page.locator('#zipCodeTextboxButton');
+        this.zipEntryLetsGetStartedButton = this.page.locator('#zipCodeTextbox');
         this.getQuoteAndScheduleButton = this.page.getByLabel('main').getByRole('link', { name: 'Get quote + schedule' });
     }
 
@@ -61,10 +61,11 @@ export class HomePage extends BasePage {
 
     async letsGetStarted(zip: string, enterFunnelWithZip: boolean) {
         if (enterFunnelWithZip) {
-            await this.letsGetStartedButton.evaluate((element, zip) => {
+            await this.zipEntryLetsGetStartedButton.fill(zip);
+            /* await this.letsGetStartedButton.evaluate((element, zip) => {
                 const currentHref = element.getAttribute('href') || '';
-                element.setAttribute('href', `${currentHref}&zipCode=${zip}`);
-            }, zip);
+                element.setAttribute('href', `${currentHref}?zipCode=${zip}`);
+            }, zip);*/
         }
 
         // Wait until modal pop up opens and close pop up
diff --git a/playwright-tests/pages/PaypalPage.ts b/playwright-tests/pages/PaypalPage.ts
index ce5547f3c..e67e0a57b 100644
--- a/playwright-tests/pages/PaypalPage.ts
+++ b/playwright-tests/pages/PaypalPage.ts
@@ -41,6 +41,8 @@ export class PaypalPage extends BasePage {
             await this.paypalLoginButton.click();
             await this.completePurchaseButton.click();
         } else {
+            await this.usernameTextBox.waitFor({ state: 'visible' });
+            await this.page.screenshot({ path: `test-results\\ortoni-data\\paypal-username-${Date.now()}.png`, fullPage: true });
             await this.usernameTextBox.fill(paymentDetails.username!);
             await this.nextButton.click();
             await this.tryAnotherWayButton.click();
diff --git a/playwright-tests/pages/SchedulePage.ts b/playwright-tests/pages/SchedulePage.ts
index 77b330aff..944b84136 100644
--- a/playwright-tests/pages/SchedulePage.ts
+++ b/playwright-tests/pages/SchedulePage.ts
@@ -35,6 +35,7 @@ export class SchedulePage extends BasePage {
     readonly timeSlots: Locator;
     readonly allDayDropOffButton: Locator;
     readonly pickATimeButton: Locator;
+    readonly mobileFirstModalCloseButton: Locator;
 
     constructor(page: Page) {
         super(page);
@@ -65,6 +66,7 @@ export class SchedulePage extends BasePage {
         this.viewMoreDatesLink = this.page.getByText(/View more dates/).first();
         this.appointmentDuration = this.page.locator('.duration-text-block');
         this.timeSlots = this.page.locator('fieldset:has(>legend#chooseTimeSlot) label').filter({ visible: true});
+        this.mobileFirstModalCloseButton = this.page.getByRole('dialog').getByRole('button', { name: 'Close' });
     }
 
     async selectLocation(testData: Partial<ITestData>) {
@@ -229,6 +231,9 @@ export class SchedulePage extends BasePage {
     async handleSchedulePage(testData: Partial<ITestData>) {
         const { appointmentDetails } = testData;
         await this.validateProgressBar(ProgressBarPercentages.SchedulePage);
+        if (await this.mobileFirstModalCloseButton.isVisible()) {
+            await this.mobileFirstModalCloseButton.click();
+        }
         await this.selectLocation(testData);
         await this.scheduleFirstAppointment(testData);
         await this.nextPage();
diff --git a/playwright-tests/tests/CashReplaceMultiSlidingGlassDropoff.ts b/playwright-tests/tests/CashReplaceMultiSlidingGlassDropoff.ts
index f488a3555..4042c67de 100644
--- a/playwright-tests/tests/CashReplaceMultiSlidingGlassDropoff.ts
+++ b/playwright-tests/tests/CashReplaceMultiSlidingGlassDropoff.ts
@@ -35,7 +35,7 @@ const cashReplaceMultiSlidingGlassDropoffData: Partial<ITestData> = {
     appointmentDetails: {
         serviceLocation: ServiceLocation.DropOff,
         appointmentDate: getDefaultTestData().appointmentDetails?.appointmentDate,
-        shopAddress: "6826 sawmill rd, Columbus, OH 43235"
+        shopAddress: "1343 cameron ave, lewis center, oh 43035"
     },
    
     // Override vehicle details

From ad69af36a0a482b64cf4dbe29338ae227880ae59 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Tue, 16 Dec 2025 15:14:47 -0500
Subject: [PATCH 056/233] CASH-2036: If ShowPMMobileDays experiment setting is
 0, choose first available appointment

---
 src/layouts/schedule/schedule.vue | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index ff723d9cb..65eec08d0 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1790,18 +1790,26 @@ export default {
                     }
 
                     if (this.isShowMobileFirstAppt) {
-                        if (firstMobilePMDate && numberOfDaysToFirstMobilePMDate <= pmMobileDays) {
+                        if (pmMobileDays == 0) {
+                            // Selects the first available time slot
+                            preSelectedMobileAppointment =
+                                numberOfDaysToFirstMobileAMDate < numberOfDaysToFirstMobilePMDate
+                                    ? firstMobileAMAppt
+                                    : firstMobilePMAppt;
+                        } else if (
+                            firstMobilePMDate &&
+                            numberOfDaysToFirstMobilePMDate <= pmMobileDays
+                        ) {
+                            // Selects the first available PM time slot
                             preSelectedMobileAppointment = firstMobilePMAppt;
                         } else if (
-                            (firstMobilePMDate &&
-                                numberOfDaysToFirstMobilePMDate >= noPMMobileDays) ||
-                            pmMobileDays == 0
+                            firstMobilePMDate &&
+                            numberOfDaysToFirstMobilePMDate >= noPMMobileDays
                         ) {
+                            // Selects the first available AM time slot. If none, selects the first available PM time slot
                             preSelectedMobileAppointment = firstMobileAMAppt
                                 ? firstMobileAMAppt
-                                : null;
-                            !preSelectedMobileAppointment &&
-                                (preSelectedMobileAppointment = firstMobilePMAppt);
+                                : firstMobilePMAppt;
                         }
 
                         if (preSelectedMobileAppointment) {

From dbd7681b4748b598d3a5eac95daa08c63ecab659 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 16 Dec 2025 16:42:23 -0500
Subject: [PATCH 057/233] CASH-1790 quick fix; missed event emit

---
 .../appointment-type-question/appointment-type-question.vue      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
index fc4d08b92..924b2e62a 100644
--- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
+++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
@@ -80,6 +80,7 @@ export default {
             },
             set: function (newValue) {
                 this.$emit("update:modelValue", newValue);
+                this.$emit("handle-appointment-type-change", newValue);
             },
         },
         isMobileOnly() {

From f78d1c4192b5fe93db51bb279a739f4113a350e3 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Wed, 17 Dec 2025 05:38:15 -0500
Subject: [PATCH 058/233] CASH-2037

CASH-2037 change the products logged in the session name to use the part number and part type.  Also add the service package selected for the data analytics team.
---
 src/helpers/service-package-helper.js           | 13 +++++++++++++
 src/layouts/quote/quote.vue                     |  7 ++++++-
 .../service-package-question.vue                |  8 ++++++++
 src/mixins/analytics-mixin.js                   | 17 ++++++++++++++++-
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/helpers/service-package-helper.js b/src/helpers/service-package-helper.js
index 4144c44e7..d3fc3f01b 100644
--- a/src/helpers/service-package-helper.js
+++ b/src/helpers/service-package-helper.js
@@ -254,6 +254,19 @@ export function getDiscountedPackageName(discountPackage) {
     return package_names[discountPackage] || null;
 }
 
+export function getPackageLabel(packageName) {
+    switch (packageName) {
+        case packageNames.TIER_ONE:
+            return externalParamPackageLabels.GLASS_ONLY;
+        case packageNames.TIER_TWO:
+            return externalParamPackageLabels.STANDARD;
+        case packageNames.TIER_THREE:
+            return externalParamPackageLabels.PREMIUM;
+        default:
+            return null;
+    }
+}
+
 function maxTier(tierA, tierB) {
     if (tierA === packageNames.TIER_THREE || tierB === packageNames.TIER_THREE) {
         return packageNames.TIER_THREE;
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 01b585349..26dc1af16 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -33,6 +33,7 @@
                         @vapsItemsSelected="vapsItemsSelectedAction"
                         @quotePageDiscountSelected="quotePageDiscountSelectedAction"
                         @currentNumberOfPackages="currentNumberOfPackagesAction"
+                        @servicePackageSelected="servicePackageSelectedAction"
                         :servicePackage="servicePackage"
                         :activePromos="lineItems.promos"
                         :availableQuotePageDiscounts="quoteDiscountPartsInfo"
@@ -564,6 +565,7 @@ export default {
             isSaveProgressComplete: null,
             packageNumber: null,
             skipToInsurance: null,
+            servicePackageSelected: null,
         };
     },
     async mounted() {
@@ -670,6 +672,9 @@ export default {
         vapsItemsSelectedAction(vapsItemsSelected) {
             this.lineItems.vaps = vapsItemsSelected;
         },
+        servicePackageSelectedAction(newValue) {
+            this.servicePackageSelected = newValue;
+        },
         quotePageDiscountSelectedAction(supportingItemsSelected) {
             this.lineItems.supportingItems = supportingItemsSelected;
         },
@@ -758,7 +763,7 @@ export default {
                 false
             );
 
-            await savePageData(this.pageName, { saveProgressPopupSkipped: true }, true);
+            await savePageData(this.pageName, { saveProgressPopupSkipped: true, servicePackageSelected: this.servicePackageSelected }, true);
 
             const payment = this.$store.getters.payment;
             if (payment.isInsurance) {
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 e45147295..43910c61e 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -34,6 +34,7 @@ import {
     findLineItemsWithPartType,
     getPackageNameByType,
     getDiscountedPackageName,
+    getPackageLabel,
 } from "@/helpers/service-package-helper";
 import {
     getPromosThatMatchLineItemsOnOrder,
@@ -45,6 +46,7 @@ import { containsRecalParts, getItemsWithoutRecalParts } from "@/helpers/recal-h
 import experimentMixin from "@/mixins/experiment-mixin.js";
 import { experimentSettings } from "@/constants/experiments";
 import { savePageData } from "@/router/methods/helpers/save-page-data";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 export default {
     name: "servicePackageQuestion",
@@ -84,6 +86,12 @@ export default {
             if (this.activePromos?.length) this.selectDefaultPackage();
         },
         selectedPackageName(newValue) {
+            debugLog("selectedPackageName:", newValue);
+            const packageLabel = getPackageLabel(newValue);
+            
+            debugLog("getPackageLabel:", packageLabel);
+            this.$emit("servicePackageSelected", `ServicePackage-${packageLabel}`);
+
             const VapsProductsInSelectedPackage = this.getVapsLineItemsForSelectedPackage(newValue);
             this.$emit("vapsItemsSelected", VapsProductsInSelectedPackage);
             const discountPartInSelectedPackage = this.getDiscountPartForSelectedPackage(newValue);
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index a77fe930a..0be50a8be 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -232,6 +232,21 @@ export default {
                 (part) => `${part.glassLocation}-${part.glassName}`
             );
 
+            const format = (part) => `${part?.partNumber}-${part?.partType ? part.partType : ""}`;
+            const mapParts = (arr) => (arr ?? []).map(format);
+
+            const glassParts = mapParts(order?.lineItems?.glassParts);
+            const supportingItems = mapParts(order?.lineItems?.supportingItems);
+            const vaps = mapParts(order?.lineItems?.vaps);
+            const childParts = [].concat(
+                ...(order?.lineItems?.glassParts ?? []).map((gp) => mapParts(gp?.childParts))
+            );
+            const allParts = [...glassParts, ...supportingItems, ...vaps, ...childParts];
+
+            if (applicationUser?.pageData?.quote?.servicePackageSelected) {
+                allParts.push(applicationUser.pageData.quote.servicePackageSelected);
+            }
+
             var appointment = `${order?.schedule?.date ?? ""} ${order?.schedule?.startTime ?? ""}`;
 
             var sessionData = {};
@@ -251,7 +266,7 @@ export default {
                 ? "Insurance"
                 : "Cash";
             sessionData.damageType = order?.damage?.isRepair ? "Repair" : "Replace";
-            sessionData.productType = glassProducts;
+            sessionData.productType = allParts;
             sessionData.eon = order?.eon;
             sessionData.referralNumber = order?.referralNumber;
             sessionData.referralSequenceNumber = order?.referralSequenceNumber;

From 882076f259081527ed5bc842b9f7526ffc25565c Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Wed, 17 Dec 2025 07:06:17 -0500
Subject: [PATCH 059/233] prettier

---
 src/layouts/quote/quote.vue                              | 9 ++++++++-
 .../service-package-question.vue                         | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 26dc1af16..dabc39fd7 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -763,7 +763,14 @@ export default {
                 false
             );
 
-            await savePageData(this.pageName, { saveProgressPopupSkipped: true, servicePackageSelected: this.servicePackageSelected }, true);
+            await savePageData(
+                this.pageName,
+                {
+                    saveProgressPopupSkipped: true,
+                    servicePackageSelected: this.servicePackageSelected,
+                },
+                true
+            );
 
             const payment = this.$store.getters.payment;
             if (payment.isInsurance) {
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 43910c61e..436e98b24 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -88,7 +88,7 @@ export default {
         selectedPackageName(newValue) {
             debugLog("selectedPackageName:", newValue);
             const packageLabel = getPackageLabel(newValue);
-            
+
             debugLog("getPackageLabel:", packageLabel);
             this.$emit("servicePackageSelected", `ServicePackage-${packageLabel}`);
 

From cfb8af306c8d574d8280fe3ab5f8dea96a81e41a Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Wed, 17 Dec 2025 12:22:16 -0500
Subject: [PATCH 060/233] CASH-2027 - Add call to  oem-after-market-parts
 endpoint

---
 src/constants/endpoints.js     |  4 +++
 src/constants/store-actions.js |  1 +
 src/layouts/quote/quote.vue    |  7 +++++
 src/store/index.js             | 48 ++++++++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index c1771b3f5..4471b1011 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -216,6 +216,10 @@ const endpoints = {
         url: "/order/api/v1/order/add-donation-part",
         method: "POST",
     },
+    GetOemAfterMarketParts: {
+        url: "/parts/api/v1/parts/oem-after-market-parts",
+        method: "POST",
+    },
 };
 
 export { endpoints };
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 513891ea1..2bbfc87fa 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -23,6 +23,7 @@ const storeActions = {
     GET_ALERT_REASONS_BY_CTU: "getAlertReasonsByCtu",
     GET_PARTS_OR_QUESTIONS: "getPartsOrQuestions",
     GET_PARTS: "getParts",
+    GET_OEM_AFTERMARKET_PARTS: "getOemAfterMarketParts",
     GET_WIPERS: "getWipers",
     GET_RAIN_REPEL: "getRainRepel",
     GET_SUPPORTING_ITEMS: "getSupportingItems",
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index dabc39fd7..5b874ad0c 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -219,6 +219,13 @@ export default {
             "quote"
         );
 
+        // call API oem-after-market-parts method
+        const oemAfterMarketParts = baseMixin.methods.dispatchStoreActionWithLogging(
+            storeActions.GET_OEM_AFTERMARKET_PARTS,
+            null,
+            "quote"
+        );
+
         const shouldExposeSkipQuote = store.getters.isRecalibrationOnOrder;
         const skipQuoteExperiment = store.getters.applicationUser.experiments.find(
             (e) => e.universeName === experimentUniverses.IGQ_SkipQuote
diff --git a/src/store/index.js b/src/store/index.js
index ca1d76f6f..b94fe17a8 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1836,6 +1836,54 @@ export const actions = {
         return response;
     },
 
+    // Parts API Actions
+    async getOemAfterMarketParts(context, { pageNameToLog }) {
+        const vehicle = context.getters.vehicle;
+        const damage = context.getters.damage;
+        const order = context.state.order;
+
+        const carId = vehicle.carId;
+        const glassArray = damage.glassToReplace;
+        const resultsArray = damage.partQuestionAnswers;
+        const zipCode = order.serviceLocation.zipCode;
+        const vin = vehicle.vin;
+        const make = vehicle.make;
+        const serviceType = order.serviceLocation?.appointmentType;
+        const referralSeqNumber = order.referralSequenceNumber;
+        const parentAccountNumber = applicationConfig.CASH_PARENT_ACCOUNT_NUMBER;
+        const oemEndorsementFlag = false; // Need to update from the store when available
+
+        // create a new array to avoid mutating state
+        const glassArrayForPayload = convertGlassPieceNamingForApi(glassArray);
+        const resultsArrayForPayload = convertResultsForApi(resultsArray);
+
+        const response = await globalMethods.callHttpClient({
+            method: endpoints.GetOemAfterMarketParts.method,
+            endpoint: endpoints.GetOemAfterMarketParts.url,
+            payload: {
+                carId: carId,
+                glassPieces: glassArrayForPayload,
+                answerResults: resultsArrayForPayload,
+                zip: zipCode,
+                vin: vin,
+                serviceType: serviceType,
+                referralSeqNumber: referralSeqNumber,
+                make: make,
+                parentAccountNumber: parentAccountNumber.toString(),
+                oemEndorsementFlag: oemEndorsementFlag,
+            },
+            logApiCall: true,
+            pageNameToLog: pageNameToLog,
+        });
+
+        // Flatten location and name properties
+        response.data.glassPieceParts = convertGlassPieceNamingFromApi(
+            response.data.glassPieceParts
+        );
+
+        return response;
+    },
+
     async getWipers(context, { payload, pageNameToLog }) {
         const carId = payload.carId;
         const serviceZipCode = payload.serviceZipCode;

From 7c2fb6eee025937948f43d8218e1689779081314 Mon Sep 17 00:00:00 2001
From: kpatel8hs4io <31411746+kpatel8hs4io@users.noreply.github.com>
Date: Wed, 17 Dec 2025 14:53:32 -0500
Subject: [PATCH 061/233] fixed alert validation playwright tests

---
 playwright-tests/pages/LookupPage.ts               | 14 +++++++-------
 playwright-tests/pages/ServiceZipPage.ts           |  4 ++--
 playwright-tests/pages/VehicleLookupAddressPage.ts |  4 ++--
 playwright-tests/pages/VehicleLookupLicensePage.ts |  4 ++--
 playwright-tests/pages/VinLookupPage.ts            |  6 +++---
 playwright-tests/pages/forms/AddressForm.ts        |  2 +-
 .../alert-validation/alert0007_VinNotFound.ts      |  4 ++--
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/playwright-tests/pages/LookupPage.ts b/playwright-tests/pages/LookupPage.ts
index e5f2fca04..7d6c1df03 100644
--- a/playwright-tests/pages/LookupPage.ts
+++ b/playwright-tests/pages/LookupPage.ts
@@ -81,9 +81,9 @@ export class LookupPage extends BasePage {
         
         // Map of expected messages by lookup type
         const expectedMessages = {
-            'address': "Your address didn't return a VIN match.Please re-enter the information below or provide your VIN  in a different way.",
-            'license plate': "Your license plate didn’t return a VIN match.Please re-enter the information above or provide your VIN  in a different way.",
-            'VIN': "Your VIN didn’t return a vehicle matchPlease re-enter your VIN or we can look up your VIN  for you.",
+            'address': "Your address didn't return a VIN match.Please re-enter the information below or provide your VIN in a different way.",
+            'license plate': "Your license plate didn’t return a VIN match.Please re-enter the information above or provide your VIN in a different way.",
+            'VIN': "Your VIN didn’t return a vehicle matchPlease re-enter your VIN or we can look up your VIN for you.",
             'ZIP code': "Your ZIP code didn't return a match.Please re-enter the information above or provide your VIN in a different way."
         };
         
@@ -106,19 +106,19 @@ export class LookupPage extends BasePage {
         }
     }
 
-    async handleZipValidation(testData: Partial<ITestData>, zip: string, lookupType: VehicleLookupType, alertFlags?: IAlertFlags): Promise<boolean> {
+    async handleZipValidation(testData: Partial<ITestData>): Promise<boolean> {
         
-        let { vehicleDamage } = testData;
+        let { customerDetails,vehicleDamage, vehicleDetails, alertFlags } = testData;
         // Only proceed with validation if alertFlags is provided
         if (alertFlags) {
             if (alertFlags.isUnserviceableZip) {
-                await this.checkForUnserviceableZipAlertMessage(zip);
+                await this.checkForUnserviceableZipAlertMessage(customerDetails!.address.postalCode!);
                 throw new TestSuccessAlert('Unserviceable ZIP validation successful.');
             } else if (alertFlags.isInvalidZip) {
                 await this.checkForInvalidZipAlertMessage();
                 throw new TestSuccessAlert('Invalid ZIP validation successful.');
             } else if (alertFlags.isVinNotFound) {
-                await this.checkForVinNotFoundAlertMessage(lookupType);
+                await this.checkForVinNotFoundAlertMessage(vehicleDetails!.vehicleLookupType!);
                 throw new TestSuccessAlert('Vin not found validation successful.');
             } else {
                 
diff --git a/playwright-tests/pages/ServiceZipPage.ts b/playwright-tests/pages/ServiceZipPage.ts
index 91393f892..6c1a178f5 100644
--- a/playwright-tests/pages/ServiceZipPage.ts
+++ b/playwright-tests/pages/ServiceZipPage.ts
@@ -12,9 +12,9 @@ export class ServiceZipPage extends LookupPage {
 
     @step("ZipLookupPage >> Lookup by service ZIP: ")
     async handleServiceZipPage(testData: Partial<ITestData>) {
-        const { customerDetails, vehicleDetails, alertFlags } = testData;
+        const { customerDetails } = testData;
         await this.validateProgressBar(ProgressBarPercentages.ServiceZipPage);
         await this.enterZip(customerDetails!.address.postalCode!);
-        await this.handleZipValidation(testData, customerDetails!.address.postalCode!, vehicleDetails!.vehicleLookupType!, alertFlags!);
+        await this.handleZipValidation(testData);
     }
 }
\ No newline at end of file
diff --git a/playwright-tests/pages/VehicleLookupAddressPage.ts b/playwright-tests/pages/VehicleLookupAddressPage.ts
index c5f37ee3d..50a7f1b24 100644
--- a/playwright-tests/pages/VehicleLookupAddressPage.ts
+++ b/playwright-tests/pages/VehicleLookupAddressPage.ts
@@ -29,10 +29,10 @@ export class VehicleLookupAddressPage extends LookupPage {
 
     @step("VehicleLookupAddressPage >> Lookup by address: ")
     async handleVehicleLookupAddressPage(testData: Partial<ITestData>) {
-        const { customerDetails, vehicleDetails, alertFlags } = testData;
+        const { customerDetails, vehicleDetails } = testData;
 
         await this.validateProgressBar(ProgressBarPercentages.VehicleLookupAddressPage);
         await this.lookupVehicleByAddress(customerDetails!, vehicleDetails!);
-        await this.handleZipValidation(customerDetails!.address.postalCode!, vehicleDetails!.vehicleLookupType!, alertFlags!);
+        await this.handleZipValidation(testData);
     }
 }
\ No newline at end of file
diff --git a/playwright-tests/pages/VehicleLookupLicensePage.ts b/playwright-tests/pages/VehicleLookupLicensePage.ts
index e20828b6e..a19d2156b 100644
--- a/playwright-tests/pages/VehicleLookupLicensePage.ts
+++ b/playwright-tests/pages/VehicleLookupLicensePage.ts
@@ -34,11 +34,11 @@ export class VehicleLookupLicensePage extends LookupPage {
 
     @step("VehicleLookupLicensePage >> Lookup by license plate: ")
     async handleVehicleLookupLicensePage(testData: Partial<ITestData>) {
-        const { customerDetails, vehicleDetails, alertFlags } = testData;
+        const { customerDetails, vehicleDetails } = testData;
 
         await this.validateProgressBar(ProgressBarPercentages.VehicleLookupLicensePage);
         await this.enterPlateDetails(vehicleDetails!);
         await this.enterZip(customerDetails!.address.postalCode!);
-        await this.handleZipValidation(customerDetails!.address.postalCode!, vehicleDetails!.vehicleLookupType!, alertFlags!);
+        await this.handleZipValidation(testData);
     }
 }
\ No newline at end of file
diff --git a/playwright-tests/pages/VinLookupPage.ts b/playwright-tests/pages/VinLookupPage.ts
index 3b69fc2d6..2f508acda 100644
--- a/playwright-tests/pages/VinLookupPage.ts
+++ b/playwright-tests/pages/VinLookupPage.ts
@@ -24,11 +24,11 @@ export class VinLookupPage extends LookupPage {
 
     @step("VinLookupPage >> Lookup by VIN: ")
     async handleVehicleLookupVinPage(testData: Partial<ITestData>) {
-        const { customerDetails, vehicleDetails, alertFlags } = testData;
+        const { customerDetails, vehicleDetails } = testData;
         let vin: string;
 
         if (Array.isArray(vehicleDetails?.vin)) {
-            vin = vehicleDetails.vin[0];
+            vin = vehicleDetails!.vin[0];
         } else {
             vin = vehicleDetails?.vin || '';
         }
@@ -36,6 +36,6 @@ export class VinLookupPage extends LookupPage {
         await this.validateProgressBar(ProgressBarPercentages.VinLookupPage);
         await this.enterVin(vin);
         await this.enterZip(customerDetails!.address.postalCode!);
-        await this.handleZipValidation(customerDetails!.address.postalCode!, vehicleDetails!.vehicleLookupType!, alertFlags!);
+        await this.handleZipValidation(testData);
     }
 }
\ No newline at end of file
diff --git a/playwright-tests/pages/forms/AddressForm.ts b/playwright-tests/pages/forms/AddressForm.ts
index 4ddb6a512..92f270320 100644
--- a/playwright-tests/pages/forms/AddressForm.ts
+++ b/playwright-tests/pages/forms/AddressForm.ts
@@ -57,7 +57,7 @@ export class AddressForm extends BasePage {
                 );
             });
 
-            await this.page.hover(".pac-container .pac-item");
+            await this.addressSuggestionList.hover();
             await new Promise(resolve => setTimeout(resolve, 1000));
             await this.addressSuggestionList.click(); // Select the first suggestion
             //await this.streetAddressTextBox.press('Tab'); // Move focus to ZIP code field
diff --git a/playwright-tests/tests/alert-validation/alert0007_VinNotFound.ts b/playwright-tests/tests/alert-validation/alert0007_VinNotFound.ts
index d88ceeab6..7c01188cb 100644
--- a/playwright-tests/tests/alert-validation/alert0007_VinNotFound.ts
+++ b/playwright-tests/tests/alert-validation/alert0007_VinNotFound.ts
@@ -75,10 +75,10 @@ const lookupTypesToTest: LookupTestCase[] = [
         },
         customerDetails: {
             address: {
-                street: '4076 Spectacle Drive',
+                street: '4219 Turpin Ln',
                 city: 'Columbus',
                 state: 'OH',
-                postalCode: '59261',
+                postalCode: '43230',
                 country: 'United States'
             }
         },

From dc8d7b4c27f7dec274d3c5586bc5b89504f153cf Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Thu, 18 Dec 2025 10:14:07 -0500
Subject: [PATCH 062/233] CASH-2036: Defect fix

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 6c0b3506f..71ee19d35 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1801,7 +1801,7 @@ export default {
                         if (pmMobileDays == 0) {
                             // Selects the first available time slot
                             preSelectedMobileAppointment =
-                                numberOfDaysToFirstMobileAMDate < numberOfDaysToFirstMobilePMDate
+                                numberOfDaysToFirstMobileAMDate <= numberOfDaysToFirstMobilePMDate
                                     ? firstMobileAMAppt
                                     : firstMobilePMAppt;
                         } else if (

From 5802ccead3094091634516915e7edcf0a86e90cc Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 18 Dec 2025 11:15:36 -0500
Subject: [PATCH 063/233] Paypal + Afterpay + Apple Pay Submission

---
 src/helpers/adyen-helper.js                   | 36 ++++++++++++++++
 src/layouts/payment-adyen/payment-adyen.vue   | 21 ++++++----
 .../methods/route-logic/adyen-return.js       | 41 ++++++++++++++++++-
 3 files changed, 88 insertions(+), 10 deletions(-)

diff --git a/src/helpers/adyen-helper.js b/src/helpers/adyen-helper.js
index 93bd53bc8..96d04f767 100644
--- a/src/helpers/adyen-helper.js
+++ b/src/helpers/adyen-helper.js
@@ -3,6 +3,7 @@ import store from "@/store";
 import globalMethods from "@/global-methods";
 import { endpoints } from "@/constants/endpoints";
 import { AppointmentTypeStrings } from "@/constants/schedule-constants";
+import { paymentMethods } from "@/constants/payment-method-constants";
 
 export async function getNewSession(sessionConfig) {}
 
@@ -69,6 +70,41 @@ export async function createAdyenCheckout({
     return await AdyenCheckout(config);
 }
 
+export function mapAdyenToFmgPaymentMethod(adyenMethod) {
+    const paymentMethodMap = {
+        ["scheme"]: paymentMethods.CREDIT_CARD,
+        ["afterpaytouch"]: paymentMethods.AFTERPAY,
+        ["paypal"]: paymentMethods.PAYPAL,
+        ["applepay"]: paymentMethods.APPLE_PAY,
+    };
+
+    const match = paymentMethodMap[adyenMethod];
+
+    return match ?? paymentMethods.CREDIT_CARD;
+}
+
+export function generateCcToken(adyenSessionInfo) {
+    const order = store.getters.order;
+    const locationInfo = getLocationInfo(order);
+
+    const ccToken = {
+        subscriptionId: adyenSessionInfo?.storedToken,
+        expMonth: adyenSessionInfo?.cardExpiryMonth,
+        expYear: adyenSessionInfo?.cardExpiryYear,
+        cardType: adyenSessionInfo?.cardType,
+        billToPostalCode: locationInfo.zipCode, // TODO - real data?
+        billToFirstName: order.customer.firstName, // TODO - real data?
+        billToLastName: order.customer.lastName, // TODO - real data?
+        referenceNumber: adyenSessionInfo?.workOrderNumber,
+        authCode: adyenSessionInfo?.authCode,
+        transactionId: adyenSessionInfo?.transactionReference,
+        transReferenceNumber: adyenSessionInfo?.transactionReference,
+        lastFour: adyenSessionInfo?.last4DigitsOfCard,
+    };
+
+    return ccToken;
+}
+
 function getLocationInfo(order) {
     const serviceLocation = order.serviceLocation;
     const isMobile = serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE;
diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index 5e74692d5..2d351472c 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -22,13 +22,6 @@
                 </div>
             </div>
         </div>
-        <component
-            :is="'script'"
-            src="https://checkoutshopper-test.adyen.com/checkoutshopper/sdk/6.21.0/adyen.js"
-            @load="initializeAdyen"></component>
-        <link
-            rel="stylesheet"
-            href="https://checkoutshopper-test.adyen.com/checkoutshopper/sdk/6.21.0/adyen.css" />
     </Form>
 </template>
 <script>
@@ -46,11 +39,13 @@ import baseMixin from "@/mixins/base-mixin.js";
 import { storeActions } from "@/constants/store-actions";
 import { getAmountDue } from "@/helpers/pricing-helper.js";
 import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js";
-import { paymentMethods } from "@/constants/payment-method-constants";
 import { createAdyenCheckout } from "@/helpers/adyen-helper";
 import { Dropin } from "@adyen/adyen-web/auto";
 import { applicationConfig } from "@/constants/application-config";
 
+import "@adyen/adyen-web/styles/adyen.css";
+import { mapAdyenToFmgPaymentMethod } from "../../helpers/adyen-helper";
+
 export default {
     name: "payment-adyen",
     mixins: [],
@@ -225,12 +220,16 @@ export default {
             console.log(`CC Token generated =`);
             console.log(ccToken);
 
+            const paymentMethodFromSession = responseJson?.paymentMethod;
+
+            const paymentMethod = mapAdyenToFmgPaymentMethod(paymentMethodFromSession);
+
             // Save payment type.
             // For now, CC.
             // Need to determine payment type from Adyen response
             await this.dispatchStoreAction(
                 storeActions.SAVE_PAYMENT_METHOD_CHOICE,
-                paymentMethods.CREDIT_CARD,
+                paymentMethod,
                 false
             );
 
@@ -400,6 +399,10 @@ export default {
         },
     },
 
+    mounted() {
+        this.initializeAdyen();
+    },
+
     components: {
         Form,
         funnelHeader,
diff --git a/src/router/methods/route-logic/adyen-return.js b/src/router/methods/route-logic/adyen-return.js
index a516518ac..134aba151 100644
--- a/src/router/methods/route-logic/adyen-return.js
+++ b/src/router/methods/route-logic/adyen-return.js
@@ -1,6 +1,11 @@
-import { AdyenCheckout } from "@adyen/adyen-web";
 import { routeData } from "@/router/constants/routes";
 import { createAdyenCheckout, getSessionInfo } from "@/helpers/adyen-helper";
+import { mapAdyenToFmgPaymentMethod, generateCcToken } from "@/helpers/adyen-helper";
+import baseMixin from "@/mixins/base-mixin.js";
+import { getAmountDue } from "@/helpers/pricing-helper";
+import store from "@/store";
+import { storeActions } from "@/constants/store-actions";
+import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js";
 
 export async function adyenReturnBeforeEnter(to, from) {
     console.log(`In adyen return.`);
@@ -20,6 +25,40 @@ export async function adyenReturnBeforeEnter(to, from) {
         console.log(sessionInfo);
 
         // TODO once afterpay info is returned, create cc token and submit order.
+        const paymentMethod = mapAdyenToFmgPaymentMethod(sessionInfo?.paymentMethod);
+        const amountDue = getAmountDue(store.getters.order.lineItems);
+        const ccToken = generateCcToken(sessionInfo);
+
+        await baseMixin.methods.dispatchStoreAction(
+            storeActions.SAVE_PAYMENT_METHOD_CHOICE,
+            paymentMethod,
+            false
+        );
+
+        await baseMixin.methods.dispatchStoreAction(storeActions.SAVE_CCTOKEN, ccToken, false);
+
+        await baseMixin.methods.dispatchStoreAction(
+            storeActions.SAVE_NEXTGEN_SETTLED_AMOUNT,
+            amountDue,
+            false
+        );
+
+        await baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
+
+        try {
+            await submitWorkOrder({
+                pageNameToLog: "adyen-return",
+                submitAfterSave: true,
+            });
+        } catch (error) {
+            console.log(error);
+            return {
+                name: routeData.ERROR.name,
+                replace: true,
+            };
+        }
+
+        await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_STATE);
 
         return {
             name: routeData.CONFIRMATION.name,

From fbb5a3eb148a830a4142e23cfb325eb8eb2876a1 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 18 Dec 2025 15:00:30 -0500
Subject: [PATCH 064/233] CASH-2041

CASH-2041 - do not update selected provider if null
---
 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 6c0b3506f..b3c57f2d4 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1731,7 +1731,9 @@ export default {
                     this.appointmentType = AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF;
                 }
                 // make sure a selectedProvider exists
-                this.updateSelectedProvider(this.lastSelectedInshopOrDropoffProvider);
+                if (this.lastSelectedInshopOrDropoffProvider) {
+                    this.updateSelectedProvider(this.lastSelectedInshopOrDropoffProvider);
+                }
             } else {
                 this.appointmentType = null;
             }

From d364ab794a302a1117d96921df411ea85817e849 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Thu, 18 Dec 2025 15:27:02 -0500
Subject: [PATCH 065/233] CASH-1762: Decom Service Package Discount endpoint

---
 public/static/healthcheck/index.html |  1 -
 src/constants/endpoints.js           |  4 ----
 src/constants/store-actions.js       |  1 -
 src/store/index.js                   | 20 --------------------
 4 files changed, 26 deletions(-)

diff --git a/public/static/healthcheck/index.html b/public/static/healthcheck/index.html
index 52e21bb5b..3f87a7587 100644
--- a/public/static/healthcheck/index.html
+++ b/public/static/healthcheck/index.html
@@ -545,7 +545,6 @@
                     { path: '/parts/parts-or-questions', method: 'POST', body: {"carId":"CR00046193","glassPieces":[{"location":"Windshield","name":"Single"}],"zip":"43015","vin":null,"serviceType":null,"referralSeqNumber":environmentContext.referralNumber,"AppName":"FixMyGlass"} },
                     { path: '/parts/wipers/CR00046193/43015', method: 'GET' },
                     { path: '/parts/mobile-premium-fee/Cash/Replace', method: 'GET' },
-                    { path: '/parts/service-package-discount', method: 'POST', body: {"glassPieces":[{"location":"Windshield","name":"Single"}],"damageType":"Replace","AppName":"FixMyGlass"} },
                     { path: '/parts/mobile-fee/?serviceType=Install&facilityType=Mobile&parentAccountNumber=167132&billToAccountNumber=87291&providerNumber=03357&isItacOptimized=false&zipCode=43015', method: 'GET' },
                 ]
             },
diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 4471b1011..ba11ad3a1 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -76,10 +76,6 @@ const endpoints = {
         url: "/parts/api/v1/parts/pricing-by-day-part-number",
         method: "GET",
     },
-    GetServicePackageDiscountPart: {
-        url: "/parts/api/v1/parts/service-package-discount",
-        method: "POST",
-    },
     GetServiceabilityDetails: {
         url: "/location/api/v1/location/serviceability-details",
         method: "GET",
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 2bbfc87fa..e09a4c78b 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -33,7 +33,6 @@ const storeActions = {
     GET_MOLDING_QUESTIONS: "getMoldingQuestions",
     GET_MOBILE_FEE_PART: "getMobileFeePart",
     GET_PRICING_BY_DAY_PART: "getPricingByDayPart",
-    GET_SERVICE_PACKAGE_DISCOUNT_PART: "getServicePackageDiscountPart",
     GET_SERVICEABILITY_DETAILS: "getServiceabilityDetails",
     GET_SHOP_TIME_SLOTS: "getShopTimeSlots",
     GET_MOBILE_TIME_SLOTS: "getMobileTimeSlots",
diff --git a/src/store/index.js b/src/store/index.js
index b94fe17a8..7bd428eb8 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1984,26 +1984,6 @@ export const actions = {
                 return response;
             });
     },
-    getServicePackageDiscountPart(context, { pageNameToLog }) {
-        const damage = context.getters.damage;
-        const damageType = damage.isRepair ? "Repair" : "Replace";
-        const glassPieces = convertGlassPieceNamingForApi(damage.glassToReplace);
-
-        return globalMethods
-            .callHttpClient({
-                method: endpoints.GetServicePackageDiscountPart.method,
-                endpoint: endpoints.GetServicePackageDiscountPart.url,
-                payload: {
-                    glassPieces: glassPieces,
-                    damageType: damageType,
-                },
-                logApiCall: true,
-                pageNameToLog: pageNameToLog,
-            })
-            .then((response) => {
-                return response;
-            });
-    },
 
     getServiceabilityDetails(context, { payload: { serviceZipCode }, pageNameToLog }) {
         const escapeRecalibrationType = (rt) => rt.split("&").join("%26");

From 6b31329637c3f255d823422242f513fe3c0f901c Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 19 Dec 2025 09:47:31 -0500
Subject: [PATCH 066/233] CASH-2041

CASH-2041
---
 src/constants/experiments.js      |  1 +
 src/layouts/quote/quote.vue       | 14 ++++++++++----
 src/layouts/schedule/schedule.vue |  2 ++
 src/store/index.js                |  8 +++++---
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/constants/experiments.js b/src/constants/experiments.js
index f358fc89f..bec7c9a39 100644
--- a/src/constants/experiments.js
+++ b/src/constants/experiments.js
@@ -33,6 +33,7 @@ const experimentSettings = {
     SHOW_PM_MOBILE_DAYS: "Show_PMmobileDays",
     SHOW_NO_PM_MOBILE_DAYS: "Show_NoPMmobileDays",
     SHOW_NO_MOBILE_AVAILABLE_DAYS: "Show_NoMobileAvailableDays",
+    OFFER_OEM: "OfferOem",
 };
 
 const experimentTriggers = {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 5b874ad0c..b08e9ed72 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -220,11 +220,17 @@ export default {
         );
 
         // call API oem-after-market-parts method
-        const oemAfterMarketParts = baseMixin.methods.dispatchStoreActionWithLogging(
-            storeActions.GET_OEM_AFTERMARKET_PARTS,
-            null,
-            "quote"
+        const offerOem = experimentMixin.methods.hasSettingEqualTo(
+            experimentSettings.OFFER_OEM,
+            "true"
         );
+        if (offerOem) {
+            const oemAfterMarketParts = baseMixin.methods.dispatchStoreActionWithLogging(
+                storeActions.GET_OEM_AFTERMARKET_PARTS,
+                null,
+                "quote"
+            );
+        }
 
         const shouldExposeSkipQuote = store.getters.isRecalibrationOnOrder;
         const skipQuoteExperiment = store.getters.applicationUser.experiments.find(
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 80443d79d..c0bdb7e68 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1655,6 +1655,8 @@ export default {
             this.updateSelectedProvider();
         },
         updateSelectedProvider(newShopProvider) {
+            if (!this.appointmentTypeStrings) return;
+
             if (newShopProvider) {
                 this.selectedProvider = newShopProvider;
             } else if (this.appointmentType === this.appointmentTypeStrings.MOBILE) {
diff --git a/src/store/index.js b/src/store/index.js
index b94fe17a8..409818a40 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1877,9 +1877,11 @@ export const actions = {
         });
 
         // Flatten location and name properties
-        response.data.glassPieceParts = convertGlassPieceNamingFromApi(
-            response.data.glassPieceParts
-        );
+        if (response?.data?.glassPieceParts) {
+            response.data.glassPieceParts = convertGlassPieceNamingFromApi(
+                response.data.glassPieceParts
+            );
+        }
 
         return response;
     },

From 7ced4f8d7643f85af297bcaf1a6a7233b8b19d76 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 22 Dec 2025 13:28:29 -0500
Subject: [PATCH 067/233] Revert "Merge pull request #2970 from
 Safelite/feature/CASH-1790-refactor-1"

This reverts commit a9c7ba7c9c8b1c6c3f9e9997ff1bcf242bc2e477, reversing
changes made to 4523490776778a98b54db9e69617acb9cd9d1f68.
---
 src/layouts/schedule/schedule.vue | 47 +++++++++++++++----------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index c0bdb7e68..187a9de62 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -24,7 +24,6 @@
                     <appointmentTypeQuestion
                         v-model="appointmentTypeFromAppointmentTypeQuestion"
                         v-show="isAppointmentTypeDisplayed"
-                        @handle-appointment-type-change="handleAppointmentTypeChange"
                         :isServiceableMobile="isServiceableMobile"
                         :isServiceableInshop="isServiceableInshop"
                         :isDisplayed="isAppointmentTypeDisplayed"
@@ -439,8 +438,8 @@ export default {
             pricingByDayBasePrice: null,
             pricingByDayUpcharge: null,
             showPricingByDay: null,
-            selectableDatesInshop: null,
-            selectableDatesMobile: null,
+            selectableDatesInshop: [],
+            selectableDatesMobile: [],
             preSelectedDate: null,
             streetAddress: this.getServiceAddressFromStore(),
             apartmentNumberOrBusinessName: this.getServiceAddress2FromStore(),
@@ -603,7 +602,6 @@ export default {
             );
             vm.initializeDatePicker().then(() => {
                 vm.showMobileFirstModal();
-                vm.setSelectedDateToFirstAvailable();
             });
         });
     },
@@ -829,13 +827,13 @@ export default {
         },
         estimatedServiceMinutesMinimum() {
             return this.isMobileSelected
-                ? this.selectableDatesMobile?.estimatedServiceMinutesMinimum
-                : this.selectableDatesInshop?.estimatedServiceMinutesMinimum;
+                ? this.selectableDatesMobile.estimatedServiceMinutesMinimum
+                : this.selectableDatesInshop.estimatedServiceMinutesMinimum;
         },
         estimatedServiceMinutesMaximum() {
             return this.isMobileSelected
-                ? this.selectableDatesMobile?.estimatedServiceMinutesMaximum
-                : this.selectableDatesInshop?.estimatedServiceMinutesMaximum;
+                ? this.selectableDatesMobile.estimatedServiceMinutesMaximum
+                : this.selectableDatesInshop.estimatedServiceMinutesMaximum;
         },
         timeSlotsForSelectedDate() {
             if (!this.selectedDate) return null;
@@ -843,11 +841,11 @@ export default {
 
             if (this.isMobileSelected) {
                 const selectedDateString = selectedDate.replace("-mobile", "");
-                return this.selectableDatesMobile?.days?.find(
+                return this.selectableDatesMobile.days?.find(
                     (selectableDate) => selectableDate.date === selectedDateString
                 );
             } else {
-                return this.selectableDatesInshop?.days?.find(
+                return this.selectableDatesInshop.days?.find(
                     (selectableDate) => selectableDate.date === this.selectedDate
                 );
             }
@@ -865,7 +863,7 @@ export default {
             );
         },
         isMobileFirstModalOpen() {
-            return this.selectableDatesMobile?.days
+            return this.selectableDatesMobile.days
                 ? this.$refs.mobileFirstModal?.getIsModalOpen()
                 : false;
         },
@@ -1017,9 +1015,7 @@ export default {
             return store.getters.order.serviceLocation.isVehicleProtected;
         },
         getAppointmentTypeFromStore() {
-            const appointmentTypeFromStore = store.getters.order.serviceLocation.appointmentType;
-            this.handleAppointmentTypeChange(appointmentTypeFromStore);
-            return appointmentTypeFromStore;
+            return store.getters.order.serviceLocation.appointmentType;
         },
         getSelectedProviderFromStore() {
             return store.getters.order.serviceLocation.provider;
@@ -1040,7 +1036,6 @@ export default {
             this.appointmentType = null;
             this.selectedProvider = null;
             this.appointmentTypeFromAppointmentTypeQuestion = null;
-            this.handleAppointmentTypeChange();
             this.preSelectedDate = null;
         },
         setServiceabilityDetails(serviceabilityDetails) {
@@ -1293,7 +1288,7 @@ export default {
                 }
             }
             */
-            this.$refs.navbar?.updateButtonText(navbarButtonText);
+            this.$refs.navbar.updateButtonText(navbarButtonText);
         },
         convertSelectedDateToShortMonthAndDay(selectedDate) {
             // This conversion ensures we don't get get GMT induced date changes
@@ -1468,12 +1463,9 @@ export default {
             this.showLoadingModal();
         },
         setDisplayWaitList() {
-            let dateString;
-            if (this.isMobileSelected && this.selectableDatesMobile?.days?.length) {
-                dateString = this.selectableDatesMobile.days[0].date;
-            } else if (this.selectableDatesInshop?.days?.length) {
-                dateString = this.selectableDatesInshop.days[0].date;
-            }
+            const dateString = this.isMobileSelected
+                ? this.selectableDatesMobile?.days[0]?.date
+                : this.selectableDatesInshop?.days[0]?.date;
             if (
                 experimentMixin.methods.hasSettingEqualTo(
                     experimentSettings.DISPLAY_WAITLIST,
@@ -1642,9 +1634,9 @@ export default {
         },
         getFirstAvailableDate() {
             let dateToSelect;
-            if (this.isMobileSelected && this.selectableDatesMobile?.days?.length) {
+            if (this.isMobileSelected) {
                 dateToSelect = returnFirstDate(this.selectableDatesMobile);
-            } else if (this.selectableDatesInshop?.days?.length) {
+            } else {
                 dateToSelect = returnFirstDate(this.selectableDatesInshop);
             }
             if (!dateToSelect) return null;
@@ -1869,6 +1861,13 @@ export default {
             this.forwardButtonAction();
         },
     },
+    watch: {
+        appointmentTypeFromAppointmentTypeQuestion: {
+            handler(newValue, oldValue) {
+                this.handleAppointmentTypeChange(newValue);
+            },
+        },
+    },
     components: {
         funnelHeader,
         navbar,

From 4753ec8474ce3bb1e16f455fb7bfc2292d2c0cc6 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 23 Dec 2025 10:56:03 -0500
Subject: [PATCH 068/233] Save different information for Paypal

---
 src/layouts/payment-adyen/payment-adyen.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index 2d351472c..f92f0c093 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -42,6 +42,7 @@ import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js"
 import { createAdyenCheckout } from "@/helpers/adyen-helper";
 import { Dropin } from "@adyen/adyen-web/auto";
 import { applicationConfig } from "@/constants/application-config";
+import { paymentMethods } from "@/constants/payment-method-constants";
 
 import "@adyen/adyen-web/styles/adyen.css";
 import { mapAdyenToFmgPaymentMethod } from "../../helpers/adyen-helper";
@@ -233,7 +234,20 @@ export default {
                 false
             );
 
-            await baseMixin.methods.dispatchStoreAction(storeActions.SAVE_CCTOKEN, ccToken, false);
+            if (paymentMethod === paymentMethods.PAYPAL) {
+                await baseMixin.methods.dispatchStoreAction(
+                    storeActions.SAVE_PAYPAL_TOKEN,
+                    responseJson?.storedToken,
+                    false
+                );
+            } else {
+                await baseMixin.methods.dispatchStoreAction(
+                    storeActions.SAVE_CCTOKEN,
+                    ccToken,
+                    false
+                );
+            }
+
             await baseMixin.methods.dispatchStoreAction(
                 storeActions.SAVE_NEXTGEN_SETTLED_AMOUNT,
                 this.amountDue,

From 9a613de8a3f81fe56dd5574a5b324fab79566991 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 23 Dec 2025 11:34:56 -0500
Subject: [PATCH 069/233] CACH-1953: remove comments

---
 src/digital-components/date-picker/date-picker.vue |  2 +-
 src/layouts/schedule/schedule.vue                  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index 42e24adf2..f38df0372 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -466,7 +466,7 @@ export default {
                 const response = config.getSelectableDatesCallback({
                     startDateString: initialViewStartDate,
                     endDateString: initialViewEndDate,
-                    inshopProviderNumber: config.inshopProviderNumber, // TODO FOR CASH-1953
+                    inshopProviderNumber: config.inshopProviderNumber,
                     zipCode: config.zipCode,
                     includeMobileTimeSlots: config.includeMobileTimeSlots,
                     includeInshopTimeSlots: config.includeInshopTimeSlots,
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index b6809795a..2fbaf4610 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -285,7 +285,7 @@ const getScheduleApiResponse = async ({
     startDateString,
     endDateString,
     providerNumber,
-    inshopProviderNumber, // TODO FOR CASH-1953
+    inshopProviderNumber,
     zipCode,
     includeMobileTimeSlots = true,
     includeInshopTimeSlots = true,
@@ -328,7 +328,7 @@ const getScheduleApiResponse = async ({
                 startDate: apiStartDate,
                 endDate: apiEndDate,
                 shopAppointmentType: "InshopOrDropoff",
-                providerNumber: inshopProviderNumber, // TODO FOR CASH-1953
+                providerNumber: inshopProviderNumber,
             },
         };
         if (apiStartDate < apiEndDate) {
@@ -632,7 +632,7 @@ export default {
                 return this.isGlassServiceableMobile;
             }
         },
-        closestInshopProviderNumber() { // TODO FOR CASH-1953
+        closestInshopProviderNumber() {
             return this.shopProviderData?.shopProviders[0]?.providerNumber;
         },
         showTimeSlotQuestion() {
@@ -1162,7 +1162,7 @@ export default {
                 startDateString: startDate,
                 endDateString: endDate,
                 providerNumber: this.selectedProvider?.providerNumber,
-                inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber, // TODO FOR CASH-1953
+                inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber,
                 zipCode: this.zipCode,
                 includeMobileTimeSlots: this.isServiceableMobile,
                 includeInshopTimeSlots: this.isServiceableInshop || this.isServiceableDropoff,
@@ -1191,7 +1191,7 @@ export default {
                 getSelectableDatesCallback: getScheduleApiResponse,
                 preSelectedDate: this.preSelectedDate,
                 providerNumber: this.selectedProvider?.providerNumber,
-                inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber, // TODO FOR CASH-1953
+                inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber,
                 zipCode: this.zipCode,
                 includeMobileTimeSlots: includeMobileTimeSlots,
                 includeInshopTimeSlots: includeInshopTimeSlots,

From ec59d14e1b69649ea74c7d775226e63a50c1f8fe Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 23 Dec 2025 15:46:19 -0500
Subject: [PATCH 070/233] Afterpay hardcoding

---
 src/router/methods/route-logic/adyen-return.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/router/methods/route-logic/adyen-return.js b/src/router/methods/route-logic/adyen-return.js
index 134aba151..d94de4c38 100644
--- a/src/router/methods/route-logic/adyen-return.js
+++ b/src/router/methods/route-logic/adyen-return.js
@@ -29,6 +29,12 @@ export async function adyenReturnBeforeEnter(to, from) {
         const amountDue = getAmountDue(store.getters.order.lineItems);
         const ccToken = generateCcToken(sessionInfo);
 
+        ccToken.authCode = "831001";
+        ccToken.cardType = "VS";
+        ccToken.lastFour = "1111";
+        ccToken.expMonth = "03";
+        ccToken.expYear = "2030";
+
         await baseMixin.methods.dispatchStoreAction(
             storeActions.SAVE_PAYMENT_METHOD_CHOICE,
             paymentMethod,

From 2590a1739c9294d03b9c4f74a6cb52fba18c362a Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 23 Dec 2025 17:20:41 -0500
Subject: [PATCH 071/233] CASH-1953: prettier

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 2fbaf4610..5f5b87969 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1162,7 +1162,9 @@ export default {
                 startDateString: startDate,
                 endDateString: endDate,
                 providerNumber: this.selectedProvider?.providerNumber,
-                inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber,
+                inshopProviderNumber: this.isMobileSelected
+                    ? this.closestInshopProviderNumber
+                    : this.selectedProvider?.providerNumber,
                 zipCode: this.zipCode,
                 includeMobileTimeSlots: this.isServiceableMobile,
                 includeInshopTimeSlots: this.isServiceableInshop || this.isServiceableDropoff,
@@ -1191,7 +1193,9 @@ export default {
                 getSelectableDatesCallback: getScheduleApiResponse,
                 preSelectedDate: this.preSelectedDate,
                 providerNumber: this.selectedProvider?.providerNumber,
-                inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber,
+                inshopProviderNumber: this.isMobileSelected
+                    ? this.closestInshopProviderNumber
+                    : this.selectedProvider?.providerNumber,
                 zipCode: this.zipCode,
                 includeMobileTimeSlots: includeMobileTimeSlots,
                 includeInshopTimeSlots: includeInshopTimeSlots,

From 68fdc3f27bdfb17cfa0336fa5e6511ace6b0aa4a Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 29 Dec 2025 17:43:27 -0500
Subject: [PATCH 072/233] CASH-1953: fix bug where selected provider can be
 null if loading w a preselected mobile date/time and then switching to inshop

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 5f5b87969..e0edcd544 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1737,6 +1737,8 @@ export default {
                 // make sure a selectedProvider exists
                 if (this.lastSelectedInshopOrDropoffProvider) {
                     this.updateSelectedProvider(this.lastSelectedInshopOrDropoffProvider);
+                } else {
+                    this.updateSelectedProvider();
                 }
             } else {
                 this.appointmentType = null;

From a2f43262fe72b933ac40bf6c1611f7e51b15c6a8 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 31 Dec 2025 15:34:49 -0500
Subject: [PATCH 073/233] CASH-2034: fix for date selection issue

---
 src/layouts/schedule/schedule.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index e0edcd544..948a7de19 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -22,6 +22,7 @@
                         cmsWidgetName="ScheduleYourServiceWidget"
                         id="schedule-your-service" />
                     <appointmentTypeQuestion
+                        v-if="hasSelectableDatesLoaded"
                         v-model="appointmentTypeFromAppointmentTypeQuestion"
                         v-show="isAppointmentTypeDisplayed"
                         :isServiceableMobile="isServiceableMobile"
@@ -871,6 +872,13 @@ export default {
                 ? this.$refs.mobileFirstModal?.getIsModalOpen()
                 : false;
         },
+        hasSelectableDatesLoaded() {
+            if (this.isMobileSelected) {
+                return this.selectableDatesMobile?.days?.length > 0;
+            } else {
+                return this.selectableDatesInshop?.days?.length > 0;
+            }
+        },
     },
     methods: {
         splitCopyOnCMSPlaceHolder,
@@ -1743,8 +1751,8 @@ export default {
             } else {
                 this.appointmentType = null;
             }
-            this.setSelectedDateToFirstAvailable();
-            this.setDisplayWaitList();
+            this.setSelectedDateToFirstAvailable(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
+            this.setDisplayWaitList(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
         },
         setSelectedDateToFirstAvailable() {
             this.selectedDate = this.getFirstAvailableDate();
@@ -1876,7 +1884,7 @@ export default {
     watch: {
         appointmentTypeFromAppointmentTypeQuestion: {
             handler(newValue, oldValue) {
-                this.handleAppointmentTypeChange(newValue);
+                this.handleAppointmentTypeChange(newValue); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
             },
         },
     },

From 43bf0814307ab5c072e1573e8481063412d4eba4 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 5 Jan 2026 11:59:32 -0500
Subject: [PATCH 074/233] Revert "Merge pull request #2988 from
 Safelite/feature/CASH-2034"

This reverts commit 662ef71ffd67761417909306cbb4cfc0c4c7a52c, reversing
changes made to f469265fe82b1eab73eb5f19939deff3f4eb2f98.
---
 src/layouts/schedule/schedule.vue | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 948a7de19..e0edcd544 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -22,7 +22,6 @@
                         cmsWidgetName="ScheduleYourServiceWidget"
                         id="schedule-your-service" />
                     <appointmentTypeQuestion
-                        v-if="hasSelectableDatesLoaded"
                         v-model="appointmentTypeFromAppointmentTypeQuestion"
                         v-show="isAppointmentTypeDisplayed"
                         :isServiceableMobile="isServiceableMobile"
@@ -872,13 +871,6 @@ export default {
                 ? this.$refs.mobileFirstModal?.getIsModalOpen()
                 : false;
         },
-        hasSelectableDatesLoaded() {
-            if (this.isMobileSelected) {
-                return this.selectableDatesMobile?.days?.length > 0;
-            } else {
-                return this.selectableDatesInshop?.days?.length > 0;
-            }
-        },
     },
     methods: {
         splitCopyOnCMSPlaceHolder,
@@ -1751,8 +1743,8 @@ export default {
             } else {
                 this.appointmentType = null;
             }
-            this.setSelectedDateToFirstAvailable(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
-            this.setDisplayWaitList(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
+            this.setSelectedDateToFirstAvailable();
+            this.setDisplayWaitList();
         },
         setSelectedDateToFirstAvailable() {
             this.selectedDate = this.getFirstAvailableDate();
@@ -1884,7 +1876,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 366d02516c8ba86f153ff7d2d74bd005a544602a Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 5 Jan 2026 12:04:02 -0500
Subject: [PATCH 075/233] Revert "Merge pull request #2975 from
 Safelite/feature/CASH-1790-refactor-1"

This reverts commit cea4cf5d4ac662322d0ff18f66f4f3c0fa646e65, reversing
changes made to 90e11544d6de4e47873de632e8a11886a694c69a.
---
 .../appointment-type-question/appointment-type-question.vue      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
index 924b2e62a..fc4d08b92 100644
--- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
+++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
@@ -80,7 +80,6 @@ export default {
             },
             set: function (newValue) {
                 this.$emit("update:modelValue", newValue);
-                this.$emit("handle-appointment-type-change", newValue);
             },
         },
         isMobileOnly() {

From cc17cf867043e6642ba643d8bd658e9d16448437 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 5 Jan 2026 12:08:10 -0500
Subject: [PATCH 076/233] Revert "Merge pull request #2968 from
 Safelite/feature/CASH-1790-refactor-1"

This reverts commit 8ddce5cd25bdac93115d1a0e491073cf5d898820, reversing
changes made to a3eee218126734bb24a9fa95bf8ab19b14d1ce66.
---
 .../date-picker/date-picker.vue               |   8 +-
 src/layouts/schedule/schedule.vue             | 109 ++++++++++++------
 .../time-slot-question/time-slot-question.vue |   4 +
 3 files changed, 83 insertions(+), 38 deletions(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index f38df0372..f48b1f43b 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -281,7 +281,7 @@ export default {
             if (event.screenX === 0 && event.screenY === 0) {
                 return;
             }
-            this.$emit("date-selected", date);
+            this.$emit("date-clicked", date);
         },
         getWeekStartDate(dateString) {
             const date = convertDateStringToDate(dateString);
@@ -846,6 +846,12 @@ export default {
         },
     },
     watch: {
+        isLoading(newValue) {
+            // if done loading dates, then set to first available date
+            if (newValue === false && this.firstAvailableSelectableDate) {
+                this.selectedDate = this.firstAvailableSelectableDate;
+            }
+        },
         modelValue(newValue) {
             this.resetField({
                 value: newValue,
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index e0edcd544..654c7b01a 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -133,6 +133,8 @@
                             :isOvernightDropoff="isOvernightDropoff" />
                     </div>
                     <datePicker
+                        :currentZip="zipCode"
+                        :currentProviderNumber="selectedProvider?.providerNumber"
                         v-show="appointmentType"
                         customComponentId="dateQuestion"
                         selectableDatesSetting="custom"
@@ -142,7 +144,7 @@
                         class="text-link-small"
                         :getMoreDatesCallback="getMoreScheduleData"
                         validationRules="date-required"
-                        @date-selected="handleDateSelected"
+                        @date-clicked="handleDateClicked"
                         :pricingByDayBasePrice="pricingByDayBasePrice"
                         :pricingByDayUpcharge="pricingByDayUpcharge"
                         :showPricingByDay="showPricingByDay"
@@ -165,6 +167,7 @@
                         :timeSlotsForSelectedDate="timeSlotsForSelectedDate"
                         :isSameDay="isSameDay"
                         :selectedRouteCodeData="selectedRouteCodeData"
+                        :isDatePickerDoneInitializing="isDatePickerDoneInitializing"
                         @waitListRequested="handleWaitListRequested" />
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
@@ -473,6 +476,7 @@ export default {
                 experimentSettings.SHOW_MOBILE_FIRST_APPT,
                 "true"
             ),
+            isDatePickerDoneInitializing: false,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -638,12 +642,12 @@ export default {
         showTimeSlotQuestion() {
             if (
                 this.selectedDate &&
-                this.appointmentTypeFromAppointmentTypeQuestion &&
-                this.timeSlotsForSelectedDate
+                this.selectedDate.includes("mobile") &&
+                !this.isMobileSelected
             ) {
-                return true;
+                this.setSelectedDateToFirstAvailable();
             }
-            return false;
+            return this.selectedDate && this.appointmentTypeFromAppointmentTypeQuestion;
         },
         isMobileStaticRecalibrationApplicable() {
             return (
@@ -1184,6 +1188,8 @@ export default {
         async initializeDatePicker() {
             this.isShowMobileFirstAppt && this.showLoadingModal();
 
+            this.selectedDate = null;
+
             const includeMobileTimeSlots = this.isServiceableMobile;
             const includeInshopTimeSlots = this.isServiceableInshop || this.isServiceableDropoff;
             const datePickerInitialData = await this.$refs.datePicker.loadInitialData({
@@ -1224,6 +1230,8 @@ export default {
             }
 
             this.isShowMobileFirstAppt && this.hideLoadingModal();
+            await this.$nextTick();
+            this.isDatePickerDoneInitializing = true;
         },
         getScheduleApiResponse,
         getServiceZipCtuCodeFromStore() {
@@ -1574,40 +1582,28 @@ export default {
         handleWaitListRequested(value) {
             this.waitListRequested = value;
         },
-        handleDateSelected(date) {
-            const previousDate = this.selectedDate;
-
-            // check if date actually changed
-            if (previousDate !== date.dateString) {
-                this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
-                this.updateFooterButtonText(this.selectedTimeSlotInfo);
+        handleDateClicked(date) {
+            // do something to mark this as upcharge day or not...
+            if (date.isPricingByDayUpchargeDay) {
+                this.includePricingByDayUpcharge = true;
+            } else {
+                this.includePricingByDayUpcharge = false;
             }
-
-            // TODO: REMOVE AS PART OF CASH-1634
-            // // do something to mark this as upcharge day or not...
-            // if (date.isPricingByDayUpchargeDay) {
-            //     this.includePricingByDayUpcharge = true;
-            // } else {
-            //     this.includePricingByDayUpcharge = false;
-            // }
-        },
-        getEmptyTimeSlot() {
-            return {
-                timeSlot: {
-                    date: null,
-                    routeCode: null,
-                    startTime: null,
-                    endTime: null,
-                    jobMaxMinutes: null,
-                    jobMinMinutes: null,
-                },
-                isPremiumAppointment: null,
-            };
         },
         updateTimeSlot(timeSlotObj) {
             if (!timeSlotObj?.routeCode) {
                 this.appointmentType = AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF;
-                this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
+                this.selectedTimeSlotInfo = {
+                    timeSlot: {
+                        date: null,
+                        routeCode: null,
+                        startTime: null,
+                        endTime: null,
+                        jobMaxMinutes: null,
+                        jobMinMinutes: null,
+                    },
+                    isPremiumAppointment: null,
+                };
                 return;
             }
             const timeSlot = this.timeSlotsForSelectedDate?.timeSlots?.find(
@@ -1706,9 +1702,6 @@ export default {
         },
         handleAppointmentTypeChange(newAppointmentType) {
             this.updateFooterButtonText();
-            // if time appointment type changes, clear any selected time slot
-            this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
-
             if (newAppointmentType === AppointmentTypeStrings.MOBILE) {
                 // Remember last shop selected if previous selection was inshop/dropoff
                 if (
@@ -1717,6 +1710,17 @@ export default {
                         AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF) &&
                     this.selectedProvider
                 ) {
+                    this.selectedTimeSlotInfo = {
+                        timeSlot: {
+                            date: null,
+                            routeCode: null,
+                            startTime: null,
+                            endTime: null,
+                            jobMaxMinutes: null,
+                            jobMinMinutes: null,
+                        },
+                        isPremiumAppointment: null,
+                    };
                     this.lastSelectedInshopOrDropoffProvider = this.selectedProvider;
                 }
                 this.appointmentType = AppointmentTypeStrings.MOBILE;
@@ -1879,6 +1883,36 @@ export default {
                 this.handleAppointmentTypeChange(newValue);
             },
         },
+        selectedDate(newValue, oldValue) {
+            if (!this.isDatePickerDoneInitializing) {
+                return;
+            } // needed otherwise it nulls selectedTimeSlotInfo too early and prevents a previously selected time slot from auto-selecting
+
+            // Clear time slot selection if date selected changes
+            const selectedDate = this.getSelectedDateFromStore();
+            if (oldValue && this.appointmentType === AppointmentTypeStrings.MOBILE) {
+                oldValue = `${oldValue}-mobile`;
+            }
+            const hasValueChanged = newValue !== oldValue;
+            const isDateDifferent = (newValue || oldValue) !== selectedDate;
+
+            if (hasValueChanged && isDateDifferent && !this.selectedMobileFirstAppointment) {
+                this.selectedTimeSlotInfo = {
+                    timeSlot: {
+                        date: null,
+                        routeCode: null,
+                        startTime: null,
+                        endTime: null,
+                        jobMaxMinutes: null,
+                        jobMinMinutes: null,
+                    },
+                    isPremiumAppointment: null,
+                };
+            }
+        },
+        selectedTimeSlotInfo(newValue) {
+            this.updateFooterButtonText(newValue);
+        },
     },
     components: {
         funnelHeader,
@@ -1891,6 +1925,7 @@ export default {
         textBlock,
         timeSlotQuestion,
         mobileFirstModal,
+
         alert,
         serviceZipModalQuestion,
         appointmentTypeQuestion,
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index d12757571..d2e43054c 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -137,6 +137,7 @@ export default {
         isSameDay: Boolean,
         displayWaitList: Boolean,
         selectedRouteCodeData: Object,
+        isDatePickerDoneInitializing: Boolean,
     },
     data() {
         return {
@@ -190,6 +191,9 @@ export default {
             this.updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(newValue);
         },
         timeSlotsForSelectedDate() {
+            if (!this.isDatePickerDoneInitializing) {
+                return;
+            } // needed otherwise it nulls these too early and prevents a previously selected time slot from auto-selecting
             this.selectedAnswerForDropOffOrInshop = null;
             this.selectedAnswerForTimeSlots = null;
             this.autoSelectTimeSlotIfOnlyOneIsAvailable();

From bf9646214404dcc31468b4f336e6111ce3dcc563 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 5 Jan 2026 12:10:03 -0500
Subject: [PATCH 077/233] Revert "Merge pull request #2963 from
 Safelite/feature/CASH-1790"

This reverts commit 454e187b3903b4e8436e6b4d33a461e9aa059c9a, reversing
changes made to 59d4b42609ad4f4a2f6850878de82048b836df8c.
---
 src/layouts/schedule/schedule.vue             | 31 ++++++++++++++-----
 .../time-slot-question/time-slot-question.vue | 18 +++--------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 654c7b01a..1ebf47c7e 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -167,7 +167,6 @@
                         :timeSlotsForSelectedDate="timeSlotsForSelectedDate"
                         :isSameDay="isSameDay"
                         :selectedRouteCodeData="selectedRouteCodeData"
-                        :isDatePickerDoneInitializing="isDatePickerDoneInitializing"
                         @waitListRequested="handleWaitListRequested" />
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
@@ -476,7 +475,6 @@ export default {
                 experimentSettings.SHOW_MOBILE_FIRST_APPT,
                 "true"
             ),
-            isDatePickerDoneInitializing: false,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -1136,6 +1134,29 @@ export default {
                 );
             }
         },
+        getTimeSlotInfo() {
+            // Get the current date
+            const currentDate = getTodayDate();
+
+            // Add 10 days to the current date
+            currentDate.setDate(currentDate.getDate() + 10);
+
+            // Format the date as yyyy-mm-dd
+            const year = currentDate.getFullYear();
+            const month = String(currentDate.getMonth() + 1).padStart(2, "0");
+            const day = String(currentDate.getDate()).padStart(2, "0");
+
+            const formattedDate = `${year}-${month}-${day}`;
+
+            return {
+                date: formattedDate,
+                endTime: "12:00",
+                jobMaxMinutes: "180",
+                jobMinMinutes: "120",
+                routeCode: "3357I-03357-M-I*20988*AM",
+                startTime: "08:00",
+            };
+        },
         onShopSelected(shopQuestionPopUpData) {
             this.resetWaitlist();
             this.preSelectedDate = null;
@@ -1230,8 +1251,6 @@ export default {
             }
 
             this.isShowMobileFirstAppt && this.hideLoadingModal();
-            await this.$nextTick();
-            this.isDatePickerDoneInitializing = true;
         },
         getScheduleApiResponse,
         getServiceZipCtuCodeFromStore() {
@@ -1884,10 +1903,6 @@ export default {
             },
         },
         selectedDate(newValue, oldValue) {
-            if (!this.isDatePickerDoneInitializing) {
-                return;
-            } // needed otherwise it nulls selectedTimeSlotInfo too early and prevents a previously selected time slot from auto-selecting
-
             // Clear time slot selection if date selected changes
             const selectedDate = this.getSelectedDateFromStore();
             if (oldValue && this.appointmentType === AppointmentTypeStrings.MOBILE) {
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index d2e43054c..1b8a2cb2e 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -1,7 +1,6 @@
 <template>
     <div class="time-slots-question">
         <buttonQuestion
-            ref="chooseDropOffOrInshop"
             v-if="isDropOffAppointmentAvailable"
             v-model="selectedAnswerForDropOffOrInshop"
             @update:modelValue="dropOffSelectionChanged"
@@ -24,9 +23,8 @@
             </div>
         </buttonQuestion>
         <buttonQuestion
-            ref="chooseTimeSlot"
-            v-if="displayTimeSlotQuestion"
-            v-model="selectedAnswerForTimeSlots"
+            ref="buttonQuestion"
+            v-if="shouldDisplayTimeSlotQuestion"
             @update:modelValue="timeSlotSelectionChanged"
             buttonTypeString="timeSlotModalListButton"
             :buttonTypeObject="timeSlotModalListButton"
@@ -36,12 +34,10 @@
                 isInshopOrDropOffAppointment ? 'is-inshop-or-drop-off-appointment' : '',
             ]"
             :answers="availableTimeSlots"
-            :lazyLoad="{
-                isLazyLoad: !isMobileAppointment && !selectedAnswerForTimeSlots,
-                amountToLoad: 10,
-            }"
+            :lazyLoad="{ isLazyLoad: !isMobileAppointment, amountToLoad: 10 }"
             groupName="chooseTimeSlot"
             textPosition="text-center"
+            v-model="selectedAnswerForTimeSlots"
             questionText="Available times:"
             isRequired
             validationRules="time-slot-required" />
@@ -137,7 +133,6 @@ export default {
         isSameDay: Boolean,
         displayWaitList: Boolean,
         selectedRouteCodeData: Object,
-        isDatePickerDoneInitializing: Boolean,
     },
     data() {
         return {
@@ -191,9 +186,6 @@ export default {
             this.updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(newValue);
         },
         timeSlotsForSelectedDate() {
-            if (!this.isDatePickerDoneInitializing) {
-                return;
-            } // needed otherwise it nulls these too early and prevents a previously selected time slot from auto-selecting
             this.selectedAnswerForDropOffOrInshop = null;
             this.selectedAnswerForTimeSlots = null;
             this.autoSelectTimeSlotIfOnlyOneIsAvailable();
@@ -397,7 +389,7 @@ export default {
                 this.answersForDropOffQuestion[0].value !== PICK_A_TIME_BUTTON_VALUE
             );
         },
-        displayTimeSlotQuestion() {
+        shouldDisplayTimeSlotQuestion() {
             return (
                 this.selectedAnswerForDropOffOrInshop == PICK_A_TIME_BUTTON_VALUE ||
                 !this.isDropOffAppointmentAvailable

From 7fe18c3b8279f9ba5dcd8f8f52db76cdafe15af6 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Sat, 6 Dec 2025 08:42:15 -0500
Subject: [PATCH 078/233] CASH-1790-ref: more accurate naming

(cherry picked from commit 211906eab93696969311932848fad6a555137a4a)
---
 src/digital-components/date-picker/date-picker.vue | 2 +-
 src/layouts/schedule/schedule.vue                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index d586ff839..db1eba7ff 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -281,7 +281,7 @@ export default {
             if (event.screenX === 0 && event.screenY === 0) {
                 return;
             }
-            this.$emit("date-clicked", date);
+            this.$emit("date-selected", date);
         },
         getWeekStartDate(dateString) {
             const date = convertDateStringToDate(dateString);
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 5c54c07f3..491a0c2bc 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -144,7 +144,7 @@
                         class="text-link-small"
                         :getMoreDatesCallback="getMoreScheduleData"
                         validationRules="date-required"
-                        @date-clicked="handleDateClicked"
+                        @date-selected="handleDateSelected"
                         :pricingByDayBasePrice="pricingByDayBasePrice"
                         :pricingByDayUpcharge="pricingByDayUpcharge"
                         :showPricingByDay="showPricingByDay"
@@ -1591,7 +1591,7 @@ export default {
         handleWaitListRequested(value) {
             this.waitListRequested = value;
         },
-        handleDateClicked(date) {
+        handleDateSelected(date) {
             // do something to mark this as upcharge day or not...
             if (date.isPricingByDayUpchargeDay) {
                 this.includePricingByDayUpcharge = true;

From dd94ee4d8b96fcd480ffb231da0897a933fb8dce Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 8 Dec 2025 10:30:19 -0500
Subject: [PATCH 079/233] CSR-1790-ref remove watch on selectedDate and use
 direct events instead

(cherry picked from commit 2af1b71a5264cc4187beac2ffb4c7cc78950438b)
---
 src/layouts/schedule/schedule.vue | 93 +++++++++++++------------------
 1 file changed, 39 insertions(+), 54 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 491a0c2bc..25e64b8c4 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1592,27 +1592,46 @@ export default {
             this.waitListRequested = value;
         },
         handleDateSelected(date) {
-            // do something to mark this as upcharge day or not...
-            if (date.isPricingByDayUpchargeDay) {
-                this.includePricingByDayUpcharge = true;
-            } else {
-                this.includePricingByDayUpcharge = false;
+            const previousDate = this.selectedDate;
+            
+            // check if date actually changed
+            if (previousDate !== date.dateString) {
+                this.handleDateChanged({
+                    newDate: date.dateString,
+                    oldDate: previousDate
+                });
             }
+
+            // TODO: REMOVE AS PART OF CASH-1634
+            // // do something to mark this as upcharge day or not...
+            // if (date.isPricingByDayUpchargeDay) {
+            //     this.includePricingByDayUpcharge = true;
+            // } else {
+            //     this.includePricingByDayUpcharge = false;
+            // }
         },
-        updateTimeSlot(timeSlotObj) {
+        handleDateChanged(newDate) {
+            // Clear time slot selection when date changes
+            this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
+            this.updateFooterButtonText(this.selectedTimeSlotInfo);
+        },
+        getEmptyTimeSlot() {
+            return {
+                timeSlot: {
+                    date: null,
+                    routeCode: null,
+                    startTime: null,
+                    endTime: null,
+                    jobMaxMinutes: null,
+                    jobMinMinutes: null,
+                },
+                isPremiumAppointment: null,
+            };
+        },
+        updateTimeSlot(timeSlotObj) { 
             if (!timeSlotObj?.routeCode) {
                 this.appointmentType = AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF;
-                this.selectedTimeSlotInfo = {
-                    timeSlot: {
-                        date: null,
-                        routeCode: null,
-                        startTime: null,
-                        endTime: null,
-                        jobMaxMinutes: null,
-                        jobMinMinutes: null,
-                    },
-                    isPremiumAppointment: null,
-                };
+                this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
                 return;
             }
             const timeSlot = this.timeSlotsForSelectedDate?.timeSlots?.find(
@@ -1709,6 +1728,9 @@ export default {
         },
         handleAppointmentTypeChange(newAppointmentType) {
             this.updateFooterButtonText();
+            // if time appointment type changes, clear any selected time slot
+            this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
+
             if (newAppointmentType === AppointmentTypeStrings.MOBILE) {
                 // Remember last shop selected if previous selection was inshop/dropoff
                 if (
@@ -1717,17 +1739,6 @@ export default {
                         AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF) &&
                     this.selectedProvider
                 ) {
-                    this.selectedTimeSlotInfo = {
-                        timeSlot: {
-                            date: null,
-                            routeCode: null,
-                            startTime: null,
-                            endTime: null,
-                            jobMaxMinutes: null,
-                            jobMinMinutes: null,
-                        },
-                        isPremiumAppointment: null,
-                    };
                     this.lastSelectedInshopOrDropoffProvider = this.selectedProvider;
                 }
                 this.appointmentType = AppointmentTypeStrings.MOBILE;
@@ -1875,32 +1886,6 @@ export default {
                 this.handleAppointmentTypeChange(newValue);
             },
         },
-        selectedDate(newValue, oldValue) {
-            // Clear time slot selection if date selected changes
-            const selectedDate = this.getSelectedDateFromStore();
-            if (oldValue && this.appointmentType === AppointmentTypeStrings.MOBILE) {
-                oldValue = `${oldValue}-mobile`;
-            }
-            const hasValueChanged = newValue !== oldValue;
-            const isDateDifferent = (newValue || oldValue) !== selectedDate;
-
-            if (hasValueChanged && isDateDifferent && !this.selectedMobileFirstAppointment) {
-                this.selectedTimeSlotInfo = {
-                    timeSlot: {
-                        date: null,
-                        routeCode: null,
-                        startTime: null,
-                        endTime: null,
-                        jobMaxMinutes: null,
-                        jobMinMinutes: null,
-                    },
-                    isPremiumAppointment: null,
-                };
-            }
-        },
-        selectedTimeSlotInfo(newValue) {
-            this.updateFooterButtonText(newValue);
-        },
     },
     components: {
         funnelHeader,

From e1b617774c30867d33bcc9f84447df907ad2d5f9 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 10 Dec 2025 15:46:41 -0500
Subject: [PATCH 080/233] CASH-1790 remove unused props

(cherry picked from commit 88682fe1b338ef5a70b2a0fec756153a2c7049ff)
---
 src/layouts/schedule/schedule.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 25e64b8c4..936846602 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -133,8 +133,6 @@
                             :isOvernightDropoff="isOvernightDropoff" />
                     </div>
                     <datePicker
-                        :currentZip="zipCode"
-                        :currentProviderNumber="selectedProvider?.providerNumber"
                         v-show="appointmentType"
                         customComponentId="dateQuestion"
                         selectableDatesSetting="custom"

From 0c2db55997f29978a287105b620083b8862ab76f Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 10 Dec 2025 17:15:11 -0500
Subject: [PATCH 081/233] CASH-1790: refactor to remove another watch on
 time-slot-question

(cherry picked from commit 17bcaac1b6331f02cae08040c4cb8af3aade9369)
---
 src/layouts/schedule/schedule.vue                   | 13 ++++++-------
 .../time-slot-question/time-slot-question.vue       |  5 -----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 936846602..dd0397da2 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -634,12 +634,12 @@ export default {
         showTimeSlotQuestion() {
             if (
                 this.selectedDate &&
-                this.selectedDate.includes("mobile") &&
-                !this.isMobileSelected
+                this.appointmentTypeFromAppointmentTypeQuestion &&
+                this.timeSlotsForSelectedDate
             ) {
-                this.setSelectedDateToFirstAvailable();
+                return true;
             }
-            return this.selectedDate && this.appointmentTypeFromAppointmentTypeQuestion;
+            return false;
         },
         isMobileStaticRecalibrationApplicable() {
             return (
@@ -1591,12 +1591,12 @@ export default {
         },
         handleDateSelected(date) {
             const previousDate = this.selectedDate;
-            
+
             // check if date actually changed
             if (previousDate !== date.dateString) {
                 this.handleDateChanged({
                     newDate: date.dateString,
-                    oldDate: previousDate
+                    oldDate: previousDate,
                 });
             }
 
@@ -1896,7 +1896,6 @@ export default {
         textBlock,
         timeSlotQuestion,
         mobileFirstModal,
-
         alert,
         serviceZipModalQuestion,
         appointmentTypeQuestion,
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 1b8a2cb2e..3a148972b 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -185,11 +185,6 @@ export default {
         selectedRouteCodeData(newValue) {
             this.updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(newValue);
         },
-        timeSlotsForSelectedDate() {
-            this.selectedAnswerForDropOffOrInshop = null;
-            this.selectedAnswerForTimeSlots = null;
-            this.autoSelectTimeSlotIfOnlyOneIsAvailable();
-        },
     },
     computed: {
         supplementalInformationBlock() {

From 5e0bee779f16b60d5a96bc8382c1d4e0a5bd9ecc Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 11 Dec 2025 11:48:33 -0500
Subject: [PATCH 082/233] CASH-1790: removing date-picker watch bc it was
 causing issues and redundant

(cherry picked from commit cc45d3b521bdec35d999d625e22ff684fd68addb)
---
 src/digital-components/date-picker/date-picker.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index db1eba7ff..9d620ec77 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -846,12 +846,6 @@ export default {
         },
     },
     watch: {
-        isLoading(newValue) {
-            // if done loading dates, then set to first available date
-            if (newValue === false && this.firstAvailableSelectableDate) {
-                this.selectedDate = this.firstAvailableSelectableDate;
-            }
-        },
         modelValue(newValue) {
             this.resetField({
                 value: newValue,

From 260448886faeaf1c5fad5e9d7de53cee0869b2aa Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 11 Dec 2025 12:38:19 -0500
Subject: [PATCH 083/233] CASH-1790: refactoring and restoring watch on
 time-slot-question

(cherry picked from commit 290ea914e2d8fed5d26e2dd2dbc85915b2b6c53d)
---
 src/layouts/schedule/schedule.vue                   | 13 ++-----------
 .../time-slot-question/time-slot-question.vue       |  5 +++++
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index dd0397da2..bcf138387 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1200,8 +1200,6 @@ export default {
         async initializeDatePicker() {
             this.isShowMobileFirstAppt && this.showLoadingModal();
 
-            this.selectedDate = null;
-
             const includeMobileTimeSlots = this.isServiceableMobile;
             const includeInshopTimeSlots = this.isServiceableInshop || this.isServiceableDropoff;
             const datePickerInitialData = await this.$refs.datePicker.loadInitialData({
@@ -1594,10 +1592,8 @@ export default {
 
             // check if date actually changed
             if (previousDate !== date.dateString) {
-                this.handleDateChanged({
-                    newDate: date.dateString,
-                    oldDate: previousDate,
-                });
+                this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
+                this.updateFooterButtonText(this.selectedTimeSlotInfo);
             }
 
             // TODO: REMOVE AS PART OF CASH-1634
@@ -1608,11 +1604,6 @@ export default {
             //     this.includePricingByDayUpcharge = false;
             // }
         },
-        handleDateChanged(newDate) {
-            // Clear time slot selection when date changes
-            this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
-            this.updateFooterButtonText(this.selectedTimeSlotInfo);
-        },
         getEmptyTimeSlot() {
             return {
                 timeSlot: {
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 3a148972b..1b8a2cb2e 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -185,6 +185,11 @@ export default {
         selectedRouteCodeData(newValue) {
             this.updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(newValue);
         },
+        timeSlotsForSelectedDate() {
+            this.selectedAnswerForDropOffOrInshop = null;
+            this.selectedAnswerForTimeSlots = null;
+            this.autoSelectTimeSlotIfOnlyOneIsAvailable();
+        },
     },
     computed: {
         supplementalInformationBlock() {

From 730b41a3ab80caeae86910e674a43f2e0f0d070c Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 11 Dec 2025 12:45:34 -0500
Subject: [PATCH 084/233] CASH-1790: remove no longer needed boolean check

(cherry picked from commit 165157ae4728b53f184a9f502997673404576762)

From 50685aaebd186068281122a93261cbfedd9f6c92 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 11 Dec 2025 12:54:37 -0500
Subject: [PATCH 085/233] CASH-1790: copilot suggestion

(cherry picked from commit 47e57c8425649efbb0ba6c2ff30f8c0e34c31caf)
---
 src/layouts/schedule/schedule.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index bcf138387..d9f21a950 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1617,7 +1617,7 @@ export default {
                 isPremiumAppointment: null,
             };
         },
-        updateTimeSlot(timeSlotObj) { 
+        updateTimeSlot(timeSlotObj) {
             if (!timeSlotObj?.routeCode) {
                 this.appointmentType = AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF;
                 this.selectedTimeSlotInfo = this.getEmptyTimeSlot();

From 45d9e9baa92968365b2dba5420ea8d97c309cf5b Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 4 Dec 2025 16:25:28 -0500
Subject: [PATCH 086/233] CASH-1790: remove obsolete method

(cherry picked from commit ffb4156b14033ab296430ea2881fa6b1abe2d283)
---
 src/layouts/schedule/schedule.vue | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 5c54c07f3..377a49ad3 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1130,29 +1130,6 @@ export default {
                 );
             }
         },
-        getTimeSlotInfo() {
-            // Get the current date
-            const currentDate = getTodayDate();
-
-            // Add 10 days to the current date
-            currentDate.setDate(currentDate.getDate() + 10);
-
-            // Format the date as yyyy-mm-dd
-            const year = currentDate.getFullYear();
-            const month = String(currentDate.getMonth() + 1).padStart(2, "0");
-            const day = String(currentDate.getDate()).padStart(2, "0");
-
-            const formattedDate = `${year}-${month}-${day}`;
-
-            return {
-                date: formattedDate,
-                endTime: "12:00",
-                jobMaxMinutes: "180",
-                jobMinMinutes: "120",
-                routeCode: "3357I-03357-M-I*20988*AM",
-                startTime: "08:00",
-            };
-        },
         onShopSelected(shopQuestionPopUpData) {
             this.resetWaitlist();
             this.preSelectedDate = null;

From 205b7f1cf3bdfc2f4b0b6f9e914b16c091fb82cf Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 4 Dec 2025 16:26:46 -0500
Subject: [PATCH 087/233] CASH-1790: add refs for self-documenting clarity

(cherry picked from commit 56e14ab1cd0d2ecc3dd5ffc9ed97a26772a91e6b)
---
 .../schedule/time-slot-question/time-slot-question.vue      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 1b8a2cb2e..6f3fb3283 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="time-slots-question">
         <buttonQuestion
+            ref="chooseDropOffOrInshop"
             v-if="isDropOffAppointmentAvailable"
             v-model="selectedAnswerForDropOffOrInshop"
             @update:modelValue="dropOffSelectionChanged"
@@ -23,8 +24,9 @@
             </div>
         </buttonQuestion>
         <buttonQuestion
-            ref="buttonQuestion"
-            v-if="shouldDisplayTimeSlotQuestion"
+            ref="chooseTimeSlot"
+            v-if="displayTimeSlotQuestion"
+            v-model="selectedAnswerForTimeSlots"
             @update:modelValue="timeSlotSelectionChanged"
             buttonTypeString="timeSlotModalListButton"
             :buttonTypeObject="timeSlotModalListButton"

From 8cd70f046796aa92d3efd3e37c756ce6dc1cac11 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 4 Dec 2025 16:28:56 -0500
Subject: [PATCH 088/233] CASH-1790: add check to keep watches from activating
 before initial load is complete to fix bug

(cherry picked from commit 9e9f6257a62afd226b3dad2093cd297c960568bf)
---
 src/layouts/schedule/schedule.vue                     |  8 ++++++++
 .../time-slot-question/time-slot-question.vue         | 11 +++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 377a49ad3..d3d382980 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -167,6 +167,7 @@
                         :timeSlotsForSelectedDate="timeSlotsForSelectedDate"
                         :isSameDay="isSameDay"
                         :selectedRouteCodeData="selectedRouteCodeData"
+                        :isDatePickerDoneInitializing="isDatePickerDoneInitializing"
                         @waitListRequested="handleWaitListRequested" />
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
@@ -474,6 +475,7 @@ export default {
                 experimentSettings.SHOW_MOBILE_FIRST_APPT,
                 "true"
             ),
+            isDatePickerDoneInitializing: false,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -1218,6 +1220,8 @@ export default {
             }
 
             this.isShowMobileFirstAppt && this.hideLoadingModal();
+            await this.$nextTick();
+            this.isDatePickerDoneInitializing = true;
         },
         getScheduleApiResponse,
         getServiceZipCtuCodeFromStore() {
@@ -1853,6 +1857,10 @@ export default {
             },
         },
         selectedDate(newValue, oldValue) {
+            if (!this.isDatePickerDoneInitializing) {
+                return;
+            } // needed otherwise it nulls selectedTimeSlotInfo too early and prevents a previously selected time slot from auto-selecting
+
             // Clear time slot selection if date selected changes
             const selectedDate = this.getSelectedDateFromStore();
             if (oldValue && this.appointmentType === AppointmentTypeStrings.MOBILE) {
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 6f3fb3283..7a8f7527f 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -36,10 +36,9 @@
                 isInshopOrDropOffAppointment ? 'is-inshop-or-drop-off-appointment' : '',
             ]"
             :answers="availableTimeSlots"
-            :lazyLoad="{ isLazyLoad: !isMobileAppointment, amountToLoad: 10 }"
+            :lazyLoad="{ isLazyLoad: !isMobileAppointment && !selectedAnswerForTimeSlots, amountToLoad: 10 }"
             groupName="chooseTimeSlot"
             textPosition="text-center"
-            v-model="selectedAnswerForTimeSlots"
             questionText="Available times:"
             isRequired
             validationRules="time-slot-required" />
@@ -135,7 +134,8 @@ export default {
         isSameDay: Boolean,
         displayWaitList: Boolean,
         selectedRouteCodeData: Object,
-    },
+        isDatePickerDoneInitializing: Boolean,
+    },    
     data() {
         return {
             timeSlotModalListButton: timeSlotModalListButton,
@@ -188,6 +188,9 @@ export default {
             this.updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(newValue);
         },
         timeSlotsForSelectedDate() {
+            if (!this.isDatePickerDoneInitializing) {
+                return;
+            }   // needed otherwise it nulls these too early and prevents a previously selected time slot from auto-selecting
             this.selectedAnswerForDropOffOrInshop = null;
             this.selectedAnswerForTimeSlots = null;
             this.autoSelectTimeSlotIfOnlyOneIsAvailable();
@@ -391,7 +394,7 @@ export default {
                 this.answersForDropOffQuestion[0].value !== PICK_A_TIME_BUTTON_VALUE
             );
         },
-        shouldDisplayTimeSlotQuestion() {
+        displayTimeSlotQuestion() {
             return (
                 this.selectedAnswerForDropOffOrInshop == PICK_A_TIME_BUTTON_VALUE ||
                 !this.isDropOffAppointmentAvailable

From 773fe6c6982ac58cccdfc68309788259bfd7456f Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 4 Dec 2025 16:30:02 -0500
Subject: [PATCH 089/233] CASH-1790: fix for prettier

(cherry picked from commit 28b01bb3b4ace19d1852140a6874a64e8378b5a1)
---
 .../schedule/time-slot-question/time-slot-question.vue   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 7a8f7527f..d2e43054c 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -36,7 +36,10 @@
                 isInshopOrDropOffAppointment ? 'is-inshop-or-drop-off-appointment' : '',
             ]"
             :answers="availableTimeSlots"
-            :lazyLoad="{ isLazyLoad: !isMobileAppointment && !selectedAnswerForTimeSlots, amountToLoad: 10 }"
+            :lazyLoad="{
+                isLazyLoad: !isMobileAppointment && !selectedAnswerForTimeSlots,
+                amountToLoad: 10,
+            }"
             groupName="chooseTimeSlot"
             textPosition="text-center"
             questionText="Available times:"
@@ -135,7 +138,7 @@ export default {
         displayWaitList: Boolean,
         selectedRouteCodeData: Object,
         isDatePickerDoneInitializing: Boolean,
-    },    
+    },
     data() {
         return {
             timeSlotModalListButton: timeSlotModalListButton,
@@ -190,7 +193,7 @@ export default {
         timeSlotsForSelectedDate() {
             if (!this.isDatePickerDoneInitializing) {
                 return;
-            }   // needed otherwise it nulls these too early and prevents a previously selected time slot from auto-selecting
+            } // needed otherwise it nulls these too early and prevents a previously selected time slot from auto-selecting
             this.selectedAnswerForDropOffOrInshop = null;
             this.selectedAnswerForTimeSlots = null;
             this.autoSelectTimeSlotIfOnlyOneIsAvailable();

From 6a033237c14ac0cbfcdc01e5eaae6db18f0cff96 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 16 Dec 2025 16:42:23 -0500
Subject: [PATCH 090/233] CASH-1790 quick fix; missed event emit

(cherry picked from commit dbd7681b4748b598d3a5eac95daa08c63ecab659)
---
 .../appointment-type-question/appointment-type-question.vue      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
index fc4d08b92..924b2e62a 100644
--- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
+++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
@@ -80,6 +80,7 @@ export default {
             },
             set: function (newValue) {
                 this.$emit("update:modelValue", newValue);
+                this.$emit("handle-appointment-type-change", newValue);
             },
         },
         isMobileOnly() {

From 19cc59cce073d5a0667a75e891cb7a3fd57f304b Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 31 Dec 2025 15:34:49 -0500
Subject: [PATCH 091/233] CASH-2034: fix for date selection issue

(cherry picked from commit a2f43262fe72b933ac40bf6c1611f7e51b15c6a8)
---
 src/layouts/schedule/schedule.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 5c54c07f3..748c14ecd 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -22,6 +22,7 @@
                         cmsWidgetName="ScheduleYourServiceWidget"
                         id="schedule-your-service" />
                     <appointmentTypeQuestion
+                        v-if="hasSelectableDatesLoaded"
                         v-model="appointmentTypeFromAppointmentTypeQuestion"
                         v-show="isAppointmentTypeDisplayed"
                         :isServiceableMobile="isServiceableMobile"
@@ -869,6 +870,13 @@ export default {
                 ? this.$refs.mobileFirstModal?.getIsModalOpen()
                 : false;
         },
+        hasSelectableDatesLoaded() {
+            if (this.isMobileSelected) {
+                return this.selectableDatesMobile?.days?.length > 0;
+            } else {
+                return this.selectableDatesInshop?.days?.length > 0;
+            }
+        },
     },
     methods: {
         splitCopyOnCMSPlaceHolder,
@@ -1750,8 +1758,8 @@ export default {
             } else {
                 this.appointmentType = null;
             }
-            this.setSelectedDateToFirstAvailable();
-            this.setDisplayWaitList();
+            this.setSelectedDateToFirstAvailable(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
+            this.setDisplayWaitList(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
         },
         setSelectedDateToFirstAvailable() {
             this.selectedDate = this.getFirstAvailableDate();
@@ -1872,7 +1880,7 @@ export default {
     watch: {
         appointmentTypeFromAppointmentTypeQuestion: {
             handler(newValue, oldValue) {
-                this.handleAppointmentTypeChange(newValue);
+                this.handleAppointmentTypeChange(newValue); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
             },
         },
         selectedDate(newValue, oldValue) {

From e3df44882343c81496599998346f7d6e2bbb7d5c Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Tue, 6 Jan 2026 09:32:23 -0500
Subject: [PATCH 092/233] CASH-1918: Mobile First modal data events

---
 src/constants/analytics.js                       |  3 +++
 .../mobile-first-modal/mobile-first-modal.vue    | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/constants/analytics.js b/src/constants/analytics.js
index fe43be06d..00088baa7 100644
--- a/src/constants/analytics.js
+++ b/src/constants/analytics.js
@@ -14,6 +14,7 @@ const GaCategories = {
     EVOX: "Evox",
     APPOINTMENT: "Appointment",
     SERVICE_LOCATION: "service-location",
+    CONFIRMATION_CLICKED: "confirmation clicked",
 };
 
 const GaActions = {
@@ -26,6 +27,8 @@ const GaActions = {
     MOBILE_AVAILABLE: "mobile_available",
     SHOPS_FIRST_DISPLAYED: "shops_first_displayed",
     MORE_LOCATIONS_CLICKED: "more_locations_clicked",
+    YES: "yes",
+    NO: "no",
 };
 
 const GaLabels = {
diff --git a/src/layouts/schedule/mobile-first-modal/mobile-first-modal.vue b/src/layouts/schedule/mobile-first-modal/mobile-first-modal.vue
index 1ef9fbc54..ee235de7c 100644
--- a/src/layouts/schedule/mobile-first-modal/mobile-first-modal.vue
+++ b/src/layouts/schedule/mobile-first-modal/mobile-first-modal.vue
@@ -58,6 +58,7 @@ export default {
                 timeSlot: null,
                 date: null,
             },
+            confirmedAppointment: false,
         };
     },
     methods: {
@@ -67,6 +68,7 @@ export default {
             this.modal.openModal();
         },
         onModalClosed() {
+            this.pushEvent();
             this.$emit("close-mobile-first-modal");
         },
         closeModal() {
@@ -78,6 +80,7 @@ export default {
                 routeCode: this.selectedAppontment.timeSlot.id,
                 date: this.selectedAppontment.date,
             };
+            this.confirmedAppointment = true;
             this.$emit("confirm-appointment", selectedTimeSlot);
             this.modal.closeModal();
         },
@@ -90,6 +93,19 @@ export default {
         setIsModalOpen(isOpen) {
             this.isModalOpen = isOpen;
         },
+        pushEvent() {
+            let gaAction = this.confirmedAppointment ? this.GaActions.YES : this.GaActions.NO;
+            this.pushEventToGA(
+                this.GaCategories.CONFIRMATION_CLICKED,
+                gaAction,
+                this.selectedAppontment.timeSlot.startTime +
+                    "-" +
+                    this.selectedAppontment.timeSlot.endTime +
+                    " " +
+                    this.selectedAppontment.date,
+                true
+            );
+        },
     },
     computed: {
         modalName() {

From 29c7243b9825e42b6d876bfd41ffa06b7cbcdce1 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 11 Dec 2025 12:45:34 -0500
Subject: [PATCH 093/233] CASH-1790: remove no longer needed boolean check

(cherry picked from commit 165157ae4728b53f184a9f502997673404576762)
---
 src/layouts/schedule/schedule.vue                             | 4 ----
 .../schedule/time-slot-question/time-slot-question.vue        | 1 -
 2 files changed, 5 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 8faea66f7..bee86a537 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -165,7 +165,6 @@
                         :timeSlotsForSelectedDate="timeSlotsForSelectedDate"
                         :isSameDay="isSameDay"
                         :selectedRouteCodeData="selectedRouteCodeData"
-                        :isDatePickerDoneInitializing="isDatePickerDoneInitializing"
                         @waitListRequested="handleWaitListRequested" />
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
@@ -473,7 +472,6 @@ export default {
                 experimentSettings.SHOW_MOBILE_FIRST_APPT,
                 "true"
             ),
-            isDatePickerDoneInitializing: false,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -1216,8 +1214,6 @@ export default {
             }
 
             this.isShowMobileFirstAppt && this.hideLoadingModal();
-            await this.$nextTick();
-            this.isDatePickerDoneInitializing = true;
         },
         getScheduleApiResponse,
         getServiceZipCtuCodeFromStore() {
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index d2e43054c..84701bc09 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -137,7 +137,6 @@ export default {
         isSameDay: Boolean,
         displayWaitList: Boolean,
         selectedRouteCodeData: Object,
-        isDatePickerDoneInitializing: Boolean,
     },
     data() {
         return {

From c45c241a65c8e0f96a7eb355dee14eecb5cb2083 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 11 Dec 2025 12:38:19 -0500
Subject: [PATCH 094/233] CASH-1790: refactoring and restoring watch on
 time-slot-question

(cherry picked from commit 290ea914e2d8fed5d26e2dd2dbc85915b2b6c53d)
---
 src/layouts/schedule/time-slot-question/time-slot-question.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 84701bc09..d12757571 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -190,9 +190,6 @@ export default {
             this.updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(newValue);
         },
         timeSlotsForSelectedDate() {
-            if (!this.isDatePickerDoneInitializing) {
-                return;
-            } // needed otherwise it nulls these too early and prevents a previously selected time slot from auto-selecting
             this.selectedAnswerForDropOffOrInshop = null;
             this.selectedAnswerForTimeSlots = null;
             this.autoSelectTimeSlotIfOnlyOneIsAvailable();

From ed0ddf69bdcf83fade375d6be489a3964e309348 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Tue, 6 Jan 2026 10:09:26 -0500
Subject: [PATCH 095/233] CASH-1918: Spelling fix and make cursor happy

---
 .../mobile-first-modal/mobile-first-modal.vue | 53 ++++++++++---------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/layouts/schedule/mobile-first-modal/mobile-first-modal.vue b/src/layouts/schedule/mobile-first-modal/mobile-first-modal.vue
index ee235de7c..4e6b439e8 100644
--- a/src/layouts/schedule/mobile-first-modal/mobile-first-modal.vue
+++ b/src/layouts/schedule/mobile-first-modal/mobile-first-modal.vue
@@ -50,7 +50,7 @@ export default {
     data() {
         return {
             isModalOpen: false,
-            selectedAppontment: {
+            selectedAppointment: {
                 estimatedServiceMinutes: {
                     minimum: null,
                     maximum: null,
@@ -70,22 +70,23 @@ export default {
         onModalClosed() {
             this.pushEvent();
             this.$emit("close-mobile-first-modal");
+            this.confirmedAppointment = false;
         },
         closeModal() {
             this.modal.closeModal();
         },
         confirmAppointment() {
             let selectedTimeSlot = {
-                timeSlot: this.selectedAppontment.timeSlot,
-                routeCode: this.selectedAppontment.timeSlot.id,
-                date: this.selectedAppontment.date,
+                timeSlot: this.selectedAppointment.timeSlot,
+                routeCode: this.selectedAppointment.timeSlot.id,
+                date: this.selectedAppointment.date,
             };
             this.confirmedAppointment = true;
             this.$emit("confirm-appointment", selectedTimeSlot);
             this.modal.closeModal();
         },
         setSelectedAppointment(appointment) {
-            this.selectedAppontment = appointment;
+            this.selectedAppointment = appointment;
         },
         getIsModalOpen() {
             return this.isModalOpen;
@@ -95,16 +96,18 @@ export default {
         },
         pushEvent() {
             let gaAction = this.confirmedAppointment ? this.GaActions.YES : this.GaActions.NO;
-            this.pushEventToGA(
-                this.GaCategories.CONFIRMATION_CLICKED,
-                gaAction,
-                this.selectedAppontment.timeSlot.startTime +
-                    "-" +
-                    this.selectedAppontment.timeSlot.endTime +
-                    " " +
-                    this.selectedAppontment.date,
-                true
-            );
+            if (this.selectedAppointment && this.selectedAppointment.timeSlot) {
+                this.pushEventToGA(
+                    this.GaCategories.CONFIRMATION_CLICKED,
+                    gaAction,
+                    this.selectedAppointment.timeSlot.startTime +
+                        "-" +
+                        this.selectedAppointment.timeSlot.endTime +
+                        " " +
+                        this.selectedAppointment.date,
+                    true
+                );
+            }
         },
     },
     computed: {
@@ -128,37 +131,37 @@ export default {
                 if (token.includes(INLINE_SERVICETYPE_TOKEN)) {
                     const serviceType = "<strong>" + this.getServiceType + "</strong>";
                     tokens.splice(tokens.indexOf(token), 1, serviceType);
-                } else if (token.includes(INLINE_DAY_TOKEN) && this.selectedAppontment.date) {
+                } else if (token.includes(INLINE_DAY_TOKEN) && this.selectedAppointment.date) {
                     const day =
                         "<strong>" +
-                        new Date(this.selectedAppontment.date).toLocaleDateString("en-US", {
+                        new Date(this.selectedAppointment.date).toLocaleDateString("en-US", {
                             weekday: "long",
                             timeZone: "UTC",
                         }) +
                         "</strong>";
                     tokens.splice(tokens.indexOf(token), 1, day);
-                } else if (token.includes(INLINE_DATE_TOKEN) && this.selectedAppontment.date) {
-                    const date = new Date(this.selectedAppontment.date).toLocaleDateString(
+                } else if (token.includes(INLINE_DATE_TOKEN) && this.selectedAppointment.date) {
+                    const date = new Date(this.selectedAppointment.date).toLocaleDateString(
                         "en-US",
                         { timeZone: "UTC", weekday: "long", month: "long", day: "numeric" }
                     );
                     tokens.splice(tokens.indexOf(token), 1, date);
                 } else if (
                     token.includes(INLINE_TIMESLOT_TOKEN) &&
-                    this.selectedAppontment.timeSlot
+                    this.selectedAppointment.timeSlot
                 ) {
                     const timeslot =
-                        this.get12HourTimeFormat(this.selectedAppontment.timeSlot.startTime) +
+                        this.get12HourTimeFormat(this.selectedAppointment.timeSlot.startTime) +
                         " - " +
-                        this.get12HourTimeFormat(this.selectedAppontment.timeSlot.endTime);
+                        this.get12HourTimeFormat(this.selectedAppointment.timeSlot.endTime);
                     tokens.splice(tokens.indexOf(token), 1, timeslot);
                 } else if (
                     token.includes(INLINE_SERVICE_LENGTH_TOKEN) &&
-                    this.selectedAppontment.estimatedServiceMinutes
+                    this.selectedAppointment.estimatedServiceMinutes
                 ) {
                     const inshopDurationTime = getDisplayTextForDurationLength(
-                        this.selectedAppontment.estimatedServiceMinutes.minimum,
-                        this.selectedAppontment.estimatedServiceMinutes.maximum
+                        this.selectedAppointment.estimatedServiceMinutes.minimum,
+                        this.selectedAppointment.estimatedServiceMinutes.maximum
                     );
                     tokens.splice(tokens.indexOf(token), 1, inshopDurationTime);
                 }

From d107245f73fabc17a7ce82afb722108b039116aa Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 7 Jan 2026 10:06:32 -0500
Subject: [PATCH 096/233] Visual changes

---
 src/constants/progress-bar-mapper.js        |   4 +
 src/layouts/payment-adyen/payment-adyen.vue | 112 +++++++++++++++++---
 2 files changed, 101 insertions(+), 15 deletions(-)

diff --git a/src/constants/progress-bar-mapper.js b/src/constants/progress-bar-mapper.js
index a6e41d31b..a57774c21 100644
--- a/src/constants/progress-bar-mapper.js
+++ b/src/constants/progress-bar-mapper.js
@@ -80,6 +80,10 @@ export const pageProgressMapper = {
         percent: 98.5,
         step: 4,
     },
+    "payment-adyen": {
+        percent: 98.5,
+        step: 4,
+    },
     confirmation: {
         percent: 100,
         step: 4,
diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index f92f0c093..3e6853aaf 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -1,18 +1,34 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
-        <div class="container-fluid">
-            <div class="row justify-content-center">
-                <div class="col-md-6">
-                    <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
-                </div>
-            </div>
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
-                    <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
-                    <!--
-            ... Page code goes here.
-          -->
-                    <div id="adyen-container"></div>
+        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        <div class="container">
+            <div class="row">
+                <div class="col-12">
+                    <div id="card-container">
+                        <div id="payment-container">
+                            <funnelSubHeader class="py-5" cmsWidgetName="FunnelSubHeaderWidget" />
+                            <div id="adyen-container"></div>
+                        </div>
+
+                        <div id="cart-container">
+                            <cart
+                                ref="cart"
+                                :damage="damageInfo"
+                                :availableVaps="[]"
+                                :allowItemRemoval="false"
+                                v-model="lineItems"
+                                servicePackageOptionsCmsName="ServicePackageTitle"
+                                recyclingModalCmsWidgetName="RecycleModal"
+                                :isInsurance="isInsurance"
+                                :insuranceDeductible="currentDeductible"
+                                :insuranceCompanyName="insuranceCompanyName"
+                                :showInsuranceCoverageAs="showInsuranceCoverageAs"
+                                :isItac="isItac"
+                                :isNoComp="isNoComp"
+                                :isCollapsible="false" />
+                        </div>
+                    </div>
+
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
@@ -46,6 +62,10 @@ import { paymentMethods } from "@/constants/payment-method-constants";
 
 import "@adyen/adyen-web/styles/adyen.css";
 import { mapAdyenToFmgPaymentMethod } from "../../helpers/adyen-helper";
+import { showFmgLoadingModal } from "../../helpers/loading-modal-helper";
+import cart from "@/fmg-components/cart/cart";
+import { coverageStatus } from "@/constants/insurance";
+import { deepClone } from "@/helpers/object-helper";
 
 export default {
     name: "payment-adyen",
@@ -162,8 +182,8 @@ export default {
                         },
                         environment: "test", // Change this to "live" when you're ready to accept live PayPal payments
                         countryCode: "US", // Only needed for test. This will be automatically retrieved when you are in production.
-                        blockPayPalVenmoButton: false,
-                        //blockPayPalPayLaterButton: true
+                        blockPayPalVenmoButton: true,
+                        blockPayPalPayLaterButton: true,
                     },
                     card: {
                         hasHolderName: true,
@@ -190,6 +210,8 @@ export default {
             console.log(`Get session payload =`);
             console.log(paymentSessionRequest);
 
+            showFmgLoadingModal(true);
+
             const response = await globalMethods.callHttpClient({
                 method: endpoints.GetAdyenSessionResult.method,
                 endpoint: endpoints.GetAdyenSessionResult.url,
@@ -411,6 +433,40 @@ export default {
         adyenPriceTotal() {
             return this.amountDue * 100;
         },
+
+        // Cart info
+        damageInfo() {
+            return this.$store.getters.damage;
+        },
+        isInsurance() {
+            return this.$store.getters.payment.isInsurance;
+        },
+        isNoComp() {
+            return this.$store.getters.policy.isNoComp;
+        },
+        isItac() {
+            return this.$store.getters.policy.isItac;
+        },
+        showInsuranceCoverageAs() {
+            if (!this.isInsurance) {
+                return null;
+            }
+
+            if (this.isNoComp || this.isItac) {
+                return coverageStatus.NOCOMP;
+            } else {
+                return this.$store.getters.payment.insuranceCoverage.coverageStatus;
+            }
+        },
+        currentDeductible() {
+            return this.$store.getters.policy.currentDeductible;
+        },
+        insuranceCompanyName() {
+            return this.$store.getters.policy.insuranceCompanyName;
+        },
+        lineItems() {
+            return deepClone(this.$store.getters.lineItems);
+        },
     },
 
     mounted() {
@@ -422,6 +478,32 @@ export default {
         funnelHeader,
         funnelSubHeader,
         navbar,
+        cart,
     },
 };
 </script>
+<style lang="scss">
+#card-container {
+    display: flex;
+    & > #payment-container {
+        flex-basis: 55%;
+        margin-right: 9%;
+    }
+    & > #cart-container {
+        flex-basis: 36%;
+        margin-top: 2rem;
+    }
+
+    @include media-breakpoint-down(lg) {
+        flex-direction: column;
+        & > #payment-container {
+            flex-basis: auto;
+            margin-right: 0;
+        }
+        & > #cart-container {
+            flex-basis: auto;
+            margin: 0 0.5rem;
+        }
+    }
+}
+</style>

From 3f9df4c331e7a5f4172bf8d9d220680ea549456f Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 7 Jan 2026 10:27:20 -0500
Subject: [PATCH 097/233] Page prereqs

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

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index 3e6853aaf..a8b1704a1 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -66,6 +66,8 @@ import { showFmgLoadingModal } from "../../helpers/loading-modal-helper";
 import cart from "@/fmg-components/cart/cart";
 import { coverageStatus } from "@/constants/insurance";
 import { deepClone } from "@/helpers/object-helper";
+import store from "@/store";
+import { debugLog } from "@/helpers/debug-log-helper.js";
 
 export default {
     name: "payment-adyen",
@@ -110,11 +112,110 @@ export default {
         },
 
         arePagePrerequisitesValid() {
-            // Stub, for checking if application is capable of entering this page
-            // And/or, is all information required for this page present?
-            // To prevent sequence-breaking from the end-user.
+            // Service Location
+            const serviceLocation = store.getters.order.serviceLocation;
+            const mobileReqs = !!(
+                serviceLocation.address &&
+                serviceLocation.city &&
+                serviceLocation.state &&
+                serviceLocation.zipCode
+            );
 
-            return true;
+            const providerLocation = serviceLocation.provider.address;
+            const dropOffInshopReqs = !!(
+                providerLocation.streetAddress &&
+                providerLocation.city &&
+                providerLocation.state &&
+                providerLocation.zipCode
+            );
+
+            const isMobile = serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE;
+
+            const serviceLocationReqs =
+                (isMobile && mobileReqs) || (!isMobile && dropOffInshopReqs);
+
+            // Insurance
+            const isInsuranceSet = store.getters.order.payment.isInsurance !== null;
+
+            // Schedule
+            const schedule = store.getters.order.schedule;
+            const scheduleReqs = !!(
+                schedule.date &&
+                schedule.startTime &&
+                schedule.endTime &&
+                schedule.jobMaxMinutes &&
+                schedule.jobMinMinutes
+            );
+
+            // Customer
+            const customer = store.getters.order.customer;
+            const customerReqs = !!(
+                customer.firstName &&
+                customer.lastName &&
+                customer.phoneNumber &&
+                customer.emailAddress
+            );
+
+            const paymentMethodReqs =
+                store.getters.order.payment.isPia !== null &&
+                (store.getters.order.payment.isPia || !!store.getters.order.payment.piaType);
+
+            const preReqResult =
+                serviceLocationReqs &&
+                isInsuranceSet &&
+                scheduleReqs &&
+                customerReqs &&
+                paymentMethodReqs;
+
+            // prettier-ignore
+            {
+                debugLog("--- payment-adyen.vue pagePrereqs start ---", null, !preReqResult);
+                debugLog("mobileReqs:", mobileReqs, !preReqResult);
+                debugLog("serviceLocation.address:", serviceLocation.address, !preReqResult);
+                debugLog("serviceLocation.city:", serviceLocation.city, !preReqResult);
+                debugLog("serviceLocation.state:", serviceLocation.state, !preReqResult);
+                debugLog("serviceLocation.zipCode:", serviceLocation.zipCode, !preReqResult);
+
+                debugLog("", null, !preReqResult);
+
+                debugLog("dropOffInshopReqs:", dropOffInshopReqs, !preReqResult);
+                debugLog("serviceLocationReqs:", serviceLocationReqs, !preReqResult);
+                debugLog("providerLocation.streetAddress:", providerLocation.streetAddress, !preReqResult);
+                debugLog("providerLocation.city:", providerLocation.city, !preReqResult);
+                debugLog("providerLocation.state:", providerLocation.state, !preReqResult);
+                debugLog("providerLocation.zipCode:", providerLocation.zipCode, !preReqResult);
+                
+                debugLog("", null, !preReqResult);
+                
+                debugLog("isInsuranceSet:", isInsuranceSet, !preReqResult);
+
+                debugLog("", null, !preReqResult);
+
+                debugLog("scheduleReqs:", scheduleReqs, !preReqResult);
+                debugLog("schedule.date:", schedule.date, !preReqResult);
+                debugLog("schedule.startTime:", schedule.startTime, !preReqResult);
+                debugLog("schedule.endTime:", schedule.endTime, !preReqResult);
+                debugLog("schedule.jobMaxMinutes:", schedule.jobMaxMinutes, !preReqResult);
+                debugLog("schedule.jobMinMinutes:", schedule.jobMinMinutes, !preReqResult);
+                
+                debugLog("", null, !preReqResult);
+
+                debugLog("customerReqs:", customerReqs, !preReqResult);
+                debugLog("customer.firstName:", customer.firstName, !preReqResult);
+                debugLog("customer.lastName:", customer.lastName, !preReqResult);
+                debugLog("customer.phoneNumber:", customer.phoneNumber, !preReqResult);
+                debugLog("customer.emailAddress:", customer.emailAddress, !preReqResult);
+                
+                debugLog("", null, !preReqResult);
+
+                debugLog("paymentMethodReqs:", paymentMethodReqs, !preReqResult);
+                debugLog("store.getters.order.payment.isPia:", store.getters.order?.payment?.isPia, !preReqResult);
+                debugLog("store.getters.order.payment.piaType:", store.getters.order?.payment?.piaType, !preReqResult);
+
+                debugLog("--- payment-adyen.vue pagePrereqs end ---", null, !preReqResult);
+            }
+
+            return preReqResult;
         },
 
         async initializeAdyen() {

From 3d3d48a1ec2722102c252a1db6f85463d58ece40 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 7 Jan 2026 11:17:14 -0500
Subject: [PATCH 098/233] Move hardcoded test values to env variables

---
 environment-variables.js                    | 2 ++
 src/constants/application-config.js         | 2 ++
 src/helpers/adyen-helper.js                 | 5 +++--
 src/layouts/payment-adyen/payment-adyen.vue | 1 -
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/environment-variables.js b/environment-variables.js
index 4d894b006..17c797cfd 100644
--- a/environment-variables.js
+++ b/environment-variables.js
@@ -13,6 +13,8 @@ const environmentVariables = {
   ['__VUE_APP_SAFELITE_HOP__']: "https://sv2-safelitehop-dev.safelite.com/fmgCheckoutShared.aspx",
   ['__VUE_APP_SESSION_TIMEOUT_MINUTES__']: 30,
   ['__VUE_APP_SOLARWINDS_MONITORING_SCRIPT__']: "",
+  ['__VUE_APP_ADYEN_ENVIRONMENT__']: "test",
+  ['__VUE_APP_ADYEN_CLIENT_KEY__']: "test_WYGT4F5ZT5BRRL5MPWHK6QLYOIXZXROD",
 };
 
 const keysOnly = Object.keys(environmentVariables);
diff --git a/src/constants/application-config.js b/src/constants/application-config.js
index b739d9ff9..91873d455 100644
--- a/src/constants/application-config.js
+++ b/src/constants/application-config.js
@@ -32,6 +32,8 @@ const applicationConfig = {
     COOKIE_NAME_LENGTH_MAX_LIMIT: 44,
     SESSION_TIMEOUT_MINUTES: process.env.__VUE_APP_SESSION_TIMEOUT_MINUTES__,
     RETURN_USER_PAGE: "/fmg/return-user",
+    ADYEN_CLIENT_KEY: process.env.__VUE_APP_ADYEN_CLIENT_KEY__,
+    ADYEN_ENVIRONMENT: process.env.__VUE_APP_ADYEN_ENVIRONMENT__,
 };
 
 export { applicationConfig };
diff --git a/src/helpers/adyen-helper.js b/src/helpers/adyen-helper.js
index 96d04f767..8de92bf89 100644
--- a/src/helpers/adyen-helper.js
+++ b/src/helpers/adyen-helper.js
@@ -4,6 +4,7 @@ import globalMethods from "@/global-methods";
 import { endpoints } from "@/constants/endpoints";
 import { AppointmentTypeStrings } from "@/constants/schedule-constants";
 import { paymentMethods } from "@/constants/payment-method-constants";
+import { applicationConfig } from "../constants/application-config";
 
 export async function getNewSession(sessionConfig) {}
 
@@ -42,8 +43,8 @@ export async function createAdyenCheckout({
             id: id,
             sessionData: sessionData,
         },
-        clientKey: "test_WYGT4F5ZT5BRRL5MPWHK6QLYOIXZXROD",
-        environment: "test",
+        clientKey: applicationConfig.ADYEN_CLIENT_KEY,
+        environment: applicationConfig.ADYEN_ENVIRONMENT,
         locale: "en_US",
         countryCode: "US",
         showPayButton: showPayButton,
diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index a8b1704a1..d09ffd14e 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -281,7 +281,6 @@ export default {
                             value: this.adyenPriceTotal,
                             currency: "USD",
                         },
-                        environment: "test", // Change this to "live" when you're ready to accept live PayPal payments
                         countryCode: "US", // Only needed for test. This will be automatically retrieved when you are in production.
                         blockPayPalVenmoButton: true,
                         blockPayPalPayLaterButton: true,

From 5488b3d6a341aabdf79d0067eb64d23a1a5d4cc1 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 7 Jan 2026 11:55:26 -0500
Subject: [PATCH 099/233] Prevent unwanted execution in error scenario

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

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index d09ffd14e..d4420f437 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -430,6 +430,8 @@ export default {
                 };
 
                 this.$router.handleSoftError(errorPayload);
+
+                return;
             }
 
             // clear order

From f02751ad6fd57f959606d41ab1ec3329eccd4640 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 7 Jan 2026 12:14:17 -0500
Subject: [PATCH 100/233] Remove window.checkout Assignment as it is Unneeded

---
 src/layouts/payment-adyen/payment-adyen.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index d4420f437..fffd56b21 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -270,7 +270,6 @@ export default {
 
             console.log(checkout);
 
-            window.checkout = checkout;
             const dropin = new Dropin(checkout, {
                 paymentMethodsConfiguration: {
                     ideal: {

From e3d705702cffbe337fb0ba4035025c7f00855b18 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 7 Jan 2026 12:46:47 -0500
Subject: [PATCH 101/233] Add back environment setting per Adyen documentation.

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

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index fffd56b21..b407f9d55 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -280,6 +280,7 @@ export default {
                             value: this.adyenPriceTotal,
                             currency: "USD",
                         },
+                        environment: applicationConfig.ADYEN_ENVIRONMENT,
                         countryCode: "US", // Only needed for test. This will be automatically retrieved when you are in production.
                         blockPayPalVenmoButton: true,
                         blockPayPalPayLaterButton: true,

From 9d8e8c851bb931b819628ecccbd887f2805fb0ad Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Wed, 7 Jan 2026 13:32:22 -0500
Subject: [PATCH 102/233] CASH-1936 - Added parentAccountNumber property to
 partsorquestion endpoint

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

diff --git a/src/store/index.js b/src/store/index.js
index ca1d76f6f..14ecceece 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1765,7 +1765,8 @@ export const actions = {
         const glassArray = damage.glassToReplace;
         const zipCode = order.serviceLocation.zipCode;
         const vin = vehicle.vin;
-        const serviceType = order.serviceLocation?.appointmentType;
+        const serviceType = damage.isRepair ? "Repair" : "Install";
+        const parentAccountNumber = context.getters.payment.parentAccountNumber;
         const referralSeqNumber = order.referralSequenceNumber;
 
         // create a new array to avoid mutating state
@@ -1781,6 +1782,7 @@ export const actions = {
                 vin: vin,
                 serviceType: serviceType,
                 referralSeqNumber: referralSeqNumber,
+                parentAccountNumber: parentAccountNumber,
             },
             logApiCall: true,
             pageNameToLog: pageNameToLog,

From 09084dab48818bcfa09333bbd5e98cdcc9b1df84 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 8 Jan 2026 13:59:26 -0500
Subject: [PATCH 103/233] Simplify + Add logging

---
 src/layouts/payment-adyen/payment-adyen.vue | 34 +++++----------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index b407f9d55..45bdc4961 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -378,37 +378,19 @@ export default {
 
             await this.saveAndSubmitWorkOrder();
         },
-        async handleFailedPayment(result) {
+        handleFailedPayment(result) {
             console.log(`Result =`);
             console.log(result);
 
-            // Fetch session info
-            const paymentSessionRequest = {
-                zipCodeCtu: this.locationInfo.zipCodeCtu,
-                workOrderNumber: this.workOrderNumberLastSixDigits,
-                sourceSystem: this.sourceSystem,
-                sessionId: this.sessionId,
-                sessionResult: result?.sessionResult,
-            };
+            const stringToLog = `ADYEN PAYMENT NOT AUTHORIZED. Code = ${result?.resultCode}. Id = ${this.sessionId}`;
 
-            console.log(`Get session payload =`);
-            console.log(paymentSessionRequest);
-
-            try {
-                const response = await globalMethods.callHttpClient({
-                    method: endpoints.GetAdyenSessionResult.method,
-                    endpoint: endpoints.GetAdyenSessionResult.url,
-                    payload: paymentSessionRequest,
-                    logApiCall: true,
-                    pageNameToLog: "payment-adyen",
-                });
-
-                console.log(response);
-            } catch (error) {
-                console.log(`Error getting session info after failure.`);
-            }
+            global.$logger.logError(stringToLog);
+        },
+        handleError(error) {
+            const stringToLog = `ADYEN ERROR. Name = ${error.name}. Details = ${error.message}.`;
+
+            global.$logger.logError(stringToLog);
         },
-        handleError(error) {},
 
         async saveAndSubmitWorkOrder() {
             // Work order submission after successful payment.

From 6534b06238bb296b245491a33d26d3ece3591f86 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 8 Jan 2026 16:40:43 -0500
Subject: [PATCH 104/233] Parity experience for failed payments.

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

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index 45bdc4961..4ea759e2c 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -4,6 +4,16 @@
         <div class="container">
             <div class="row">
                 <div class="col-12">
+                    <div>
+                        <alert
+                            ref="piaErrorAlert"
+                            class="my-4"
+                            v-if="hasPaymentFailureError"
+                            cmsWidgetName="PIAErrorAlertWidget"
+                            alertClass="alert-danger"
+                            @textLinkClicked="paymentFailedPayLater"
+                            v-bind:isDismissable="false" />
+                    </div>
                     <div id="card-container">
                         <div id="payment-container">
                             <funnelSubHeader class="py-5" cmsWidgetName="FunnelSubHeaderWidget" />
@@ -45,6 +55,7 @@ import Form from "vee-validate";
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import alert from "@/ux-components/alert/alert";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
@@ -75,6 +86,8 @@ export default {
     data() {
         return {
             sessionId: String,
+            dropinComponent: null,
+            hasPaymentFailureError: false,
         };
     },
 
@@ -292,7 +305,11 @@ export default {
                         name: "Credit or debit card",
                     },
                 },
-            }).mount("#adyen-container");
+            });
+
+            this.dropinComponent = dropin;
+
+            dropin.mount("#adyen-container");
         },
 
         async handleCompletedPayment(result) {
@@ -378,13 +395,17 @@ export default {
 
             await this.saveAndSubmitWorkOrder();
         },
-        handleFailedPayment(result) {
+        async handleFailedPayment(result) {
             console.log(`Result =`);
             console.log(result);
 
             const stringToLog = `ADYEN PAYMENT NOT AUTHORIZED. Code = ${result?.resultCode}. Id = ${this.sessionId}`;
 
-            global.$logger.logError(stringToLog);
+            await global.$logger.logError(stringToLog);
+
+            this.hasPaymentFailureError = true;
+
+            this.dropinComponent?.update();
         },
         handleError(error) {
             const stringToLog = `ADYEN ERROR. Name = ${error.name}. Details = ${error.message}.`;
@@ -423,6 +444,37 @@ export default {
                 this.pageName
             );
         },
+
+        async paymentFailedPayLater() {
+            console.log(`Doing final work order submission...`);
+            showFmgLoadingModal(true);
+
+            await this.dispatchStoreAction(
+                storeActions.SAVE_PAYMENT_METHOD_CHOICE,
+                paymentMethods.PAY_LATER,
+                false
+            );
+
+            await this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
+
+            try {
+                await submitWorkOrder({
+                    pageNameToLog: this.pageName,
+                    submitAfterSave: true,
+                });
+
+                await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_STATE);
+
+                this.$router.navigateWithoutSaving(
+                    this.navigationScenarios.CLICKED_FORWARD,
+                    this.pageName
+                );
+            } catch (error) {
+                console.log(`Final submission failed after failed payment.`);
+                this.$router.handleSoftError();
+                return;
+            }
+        },
     },
 
     computed: {
@@ -563,6 +615,7 @@ export default {
         funnelSubHeader,
         navbar,
         cart,
+        alert,
     },
 };
 </script>

From 6aa8d3434cb6c1890b8dd303147368bfafed037a Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 8 Jan 2026 17:30:49 -0500
Subject: [PATCH 105/233] Parity for adyen failures in redirect flow

---
 src/layouts/payment-adyen/payment-adyen.vue   |  6 +++++
 .../methods/route-logic/adyen-return.js       | 26 ++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index 4ea759e2c..262614235 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -105,9 +105,15 @@ export default {
 
         const resultMap = await settleAllPromises(promiseResultMap);
 
+        const hasExistingPiaError = to.query?.piaFailure;
+
         // Hydrate page with results
         next(async (vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+
+            if(hasExistingPiaError) {
+                vm.hasPaymentFailureError = true;
+            }
         });
     },
 
diff --git a/src/router/methods/route-logic/adyen-return.js b/src/router/methods/route-logic/adyen-return.js
index d94de4c38..1e423e056 100644
--- a/src/router/methods/route-logic/adyen-return.js
+++ b/src/router/methods/route-logic/adyen-return.js
@@ -15,7 +15,21 @@ export async function adyenReturnBeforeEnter(to, from) {
     const redirectResult = to?.query?.redirectResult;
 
     if (sessionId && redirectResult) {
-        const result = await finalizeAdyenPayment(sessionId, redirectResult);
+        let result = null;
+
+        try {
+            result = await finalizeAdyenPayment(sessionId, redirectResult);
+        } catch (error) {
+            // Payment fails, so return user to payment-adyen screen to try again or pay later.
+            return {
+                name: routeData.PAYMENT_ADYEN.name,
+                query: {
+                    piaFailure: true,
+                },
+                replace: true,
+            };
+        }
+
         console.log(`Out of promise`);
         console.log(result);
 
@@ -93,12 +107,18 @@ function finalizeAdyenPayment(sessionId, redirectResult) {
                 onPaymentFailed: (result, component) => {
                     console.log(`Payment failed`);
                     console.log(result);
-                    reject("Payment failed from Adyen");
+                    reject({
+                        paymentFailure: true,
+                        message: "Payment failed from Adyen",
+                    });
                 },
                 onError: (error, component) => {
                     console.log(`Error occured`);
                     console.log(error);
-                    reject("Error from Adyen");
+                    reject({
+                        paymentFailure: false,
+                        message: "Error from Adyen",
+                    });
                 },
             },
             options: {},

From 3cbddd8cda0741951d17b5da0c5e46a228cc0aba Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 9 Jan 2026 10:58:04 -0500
Subject: [PATCH 106/233] CASH-2025: updates to store actions

---
 src/constants/store-actions.js   |  1 +
 src/constants/store-mutations.js |  1 +
 src/store/index.js               | 13 +++++++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index e09a4c78b..2fc0c88eb 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -111,6 +111,7 @@ const storeActions = {
     SAVE_PAYPAL_TOKEN: "savePaypalToken",
     SAVE_NEXTGEN_SETTLED_AMOUNT: "saveNextGenSettledAmount",
     SAVE_IS_RECAL_ACK_OPT_IN: "saveIsRecalAckOptIn",
+    SAVE_IS_OEM_GLASS_SELECTED: "saveIsOemGlassSelected",
     SAVE_IS_MSR_FEE_APPLICABLE: "saveIsMSRFeeApplicable",
 
     CREATE_SUBMITTED_STATE: "createSubmittedState",
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index 2112c789c..5167581e0 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -69,6 +69,7 @@ const storeMutations = {
     LOCK_TOKEN: "updateLockToken",
     UPDATE_SETTLED_TENDER_AMOUNT: "updateSettledTenderAmount",
     UPDATE_IS_RECAL_ACK_OPT_IN: "updateIsRecalAckOptIn",
+    UPDATE_IS_OEM_GLASS_SELECTED: "updateIsOemGlassSelected",
     UPDATE_IS_MSR_FEE_APPLICABLE: "updateIsMSRFeeApplicable",
     UPDATE_CASH_PRICE_SUBTOTAL: "updateCashPriceSubTotal",
 
diff --git a/src/store/index.js b/src/store/index.js
index 1c1f4038f..8dd6d7502 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -190,6 +190,7 @@ const getDefaultState = () => {
             settledTenderAmount: 0,
             isRecalAckOptIn: false,
             isMSRFeeApplicable: false,
+            isOemGlassSelected: false,
         },
         applicationUser: {
             eventBus: [],
@@ -342,6 +343,9 @@ export const mutations = {
     updateIsRecalAckOptIn(state, isRecalAckOptIn) {
         state.order.isRecalAckOptIn = isRecalAckOptIn;
     },
+    updateIsOemGlassSelected(state, isOemGlassSelected) {
+        state.order.isOemGlassSelected = isOemGlassSelected;
+    },
     updateIsMSRFeeApplicable(state, isMSRFeeApplicable) {
         state.order.isMSRFeeApplicable = isMSRFeeApplicable;
     },
@@ -674,6 +678,7 @@ export const mutations = {
         state.order.eon = sessionInformation.order.eon;
         state.order.customerPortalLoginToken = sessionInformation.order.CustomerPortalLoginToken;
         state.order.isRecalAckOptIn = sessionInformation.order.isRecalAckOptIn;
+        state.order.isOemGlassSelected = sessionInformation.order.isOemGlassSelected;
 
         if (state.order.vehicle.vin !== sessionInformation.order.vehicle?.vin) {
             state.applicationUser.pageData[routeData.PART_QUESTIONS.name] = null;
@@ -1853,8 +1858,7 @@ export const actions = {
         const serviceType = order.serviceLocation?.appointmentType;
         const referralSeqNumber = order.referralSequenceNumber;
         const parentAccountNumber = applicationConfig.CASH_PARENT_ACCOUNT_NUMBER;
-        const oemEndorsementFlag = false; // Need to update from the store when available
-
+        const oemEndorsementFlag = order.isOemGlassSelected;
         // create a new array to avoid mutating state
         const glassArrayForPayload = convertGlassPieceNamingForApi(glassArray);
         const resultsArrayForPayload = convertResultsForApi(resultsArray);
@@ -2542,6 +2546,7 @@ export const actions = {
                     lockToken: order.lockToken,
                     isRecalAckOptIn: order.isRecalAckOptIn,
                     isMSRFeeApplicable: order.isMSRFeeApplicable,
+                    isOemGlassSelected: order.isOemGlassSelected,
                     cashPriceSubTotal: order.cashPriceSubTotal,
                 },
             },
@@ -2959,6 +2964,10 @@ export const actions = {
         context.commit(storeMutations.UPDATE_IS_RECAL_ACK_OPT_IN, isRecalAckOptIn);
     },
 
+    saveIsOemGlassSelected(context, isOemGlassSelected) {
+        context.commit(storeMutations.UPDATE_IS_OEM_GLASS_SELECTED, isOemGlassSelected);
+    },
+
     saveIsMSRFeeApplicable(context, isMSRFeeApplicable) {
         context.commit(storeMutations.UPDATE_IS_MSR_FEE_APPLICABLE, isMSRFeeApplicable);
     },

From 9af898604d8f28d12ee50ca2f6f410ecbc640068 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 9 Jan 2026 10:59:33 -0500
Subject: [PATCH 107/233] CASH-2025: temp commenting during dev

---
 src/layouts/quote/quote.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index b08e9ed72..9f973d79d 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -2,6 +2,13 @@
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <loadingModal ref="loadingModal" />
         <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+
+        <div>
+            <p style="font-size: 10px; color: darkblue">
+                alternateGlassPartsForOem: {{ alternateGlassPartsForOem }}
+            </p>
+        </div>
+
         <div
             class="container quote position-relative"
             :class="[showSaveProgressPopup ? 'initial-popup-open' : '']">
@@ -743,6 +750,12 @@ export default {
                 this.lineItems.supportingItems = this.filterOutFees(this.lineItems.supportingItems);
             }
 
+            // isOemGlassSelected?
+            // if it IS, then swap out the glass parts in the line items for these
+
+            // if it's NOT selected BUT alternateGlassPartsForOem exist, then swap out
+            // // the existing glass line items for whatever is in alternateGlassPartsForOem
+
             if (this.lineItems.glassParts?.length > 0) {
                 this.dispatchStoreAction(
                     this.storeActions.SAVE_GLASS_PARTS_SUPPRESSING_STATE_RESETTING,

From c6e006020c1decd8a57fffd63e371c068f7acf34 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 9 Jan 2026 11:01:16 -0500
Subject: [PATCH 108/233] CASH-2025: new oem glass question component

---
 .../oem-glass-question/oem-glass-question.vue | 134 ++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 src/layouts/quote/oem-glass-question/oem-glass-question.vue

diff --git a/src/layouts/quote/oem-glass-question/oem-glass-question.vue b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
new file mode 100644
index 000000000..b1b4b4e48
--- /dev/null
+++ b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
@@ -0,0 +1,134 @@
+<template>
+    <div
+        class="oem-glass-question-container py-3 my-2"
+        :class="[isExpanded ? 'expanded' : '']">
+        <div
+            class="oem-glass-question-header d-flex align-items-center justify-content-between"
+            @click="toggleIsExpanded">
+            {{ headerText }}
+        </div>
+        <div class="oem-glass-question-body">
+            <div class="oem-glass-question-copy" v-html="bodyText"></div>
+            <div class="oem-glass-question-option">
+                <checkboxQuestion
+                    class="mt-3"
+                    cmsWidgetName="OemGlassInputQuestionWidget"
+                    v-model="installOemGlass"
+                    @click="waitListChecked" />
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import checkboxQuestion from "@/digital-components/checkbox-question/checkbox-question";
+
+export default {
+    name: "oem-part-question",
+    props: {
+        cmsWidgetName: String,
+    },
+    data() {
+        return {
+            isExpanded: true,
+        };
+    },
+    computed: {
+        headerText() {
+            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
+        },
+        bodyText() {
+            return this.getCmsContent(this.cmsWidgetName, "BodyText");
+        },
+        footerText() {
+            return this.getCmsContent(this.cmsWidgetName, "FooterText");
+        },
+        installOemGlass: {
+            get() {
+                return this.modelValue;
+            },
+            set(newValue) {
+                this.$emit("update:modelValue", newValue);
+            },
+        },
+    },
+    methods: {
+        toggleIsExpanded() {
+            this.setIsExpanded(!this.isExpanded);
+        },
+        setIsExpanded(newVal) {
+            this.isExpanded = newVal;
+        },
+    },
+    components: {
+        checkboxQuestion,
+    },
+};
+</script>
+
+<style lang="scss">
+.oem-glass-question-container {
+    .oem-glass-question-header {
+        font-weight: bold;
+
+        span {
+            flex-grow: 1;
+            color: $black;
+        }
+
+        &::after {
+            content: "";
+            transition: all 0.5s ease;
+            background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 16 9'%3E%3Cpath d='M7.99282 0.117702C7.75716 0.116049 7.53044 0.207797 7.3623 0.37286L0.255553 7.46878C0.0862976 7.63796 -0.00878906 7.86742 -0.00878906 8.10667C-0.00878906 8.34593 0.0862976 8.57539 0.255553 8.74457C0.424808 8.91374 0.654368 9.00879 0.893731 9.00879C1.13309 9.00879 1.36265 8.91374 1.53191 8.74457L7.99282 2.27378L14.4614 8.74457C14.6307 8.91205 14.8595 9.00547 15.0977 9.00428C15.3359 9.00308 15.5638 8.90737 15.7314 8.73819C15.8989 8.56901 15.9924 8.34022 15.9912 8.10216C15.99 7.8641 15.8942 7.63627 15.725 7.46878L8.6259 0.377963C8.45765 0.21088 8.22999 0.117289 7.99282 0.117702Z' fill='%230C7E47'/%3E%3C/svg%3E");
+            background-repeat: no-repeat;
+            background-position: center center;
+            width: 16px;
+            height: 16px;
+            display: inline-flex;
+            position: relative;
+        }
+    }
+
+    .oem-glass-question-body {
+        transition: all 500ms ease-out;
+        visibility: hidden;
+        overflow: hidden;
+        max-height: 0;
+
+        .oem-glass-question-option {
+            margin-top: 0.5em;
+
+            .oem-glass-question-strikethrough-price {
+                font-size: smaller;
+                text-decoration: line-through;
+            }
+
+            .oem-glass-question-free-price {
+                display: inline-block;
+                font-weight: bolder;
+                border-radius: 1em;
+                background-color: $green-300;
+                padding: 0 0.5em;
+                margin-inline-start: 0.5em;
+            }
+        }
+    }
+
+    &.expanded {
+        .oem-glass-question-header {
+            &::after {
+                transform: rotate(180deg);
+            }
+        }
+
+        .oem-glass-question-body {
+            visibility: visible;
+            max-height: none;
+
+            border-top: 1px solid $green-400;
+            padding-top: 0.5em;
+            margin-top: 0.5em;
+        }
+    }
+}
+</style>

From e7e499ca461ac96dc4a0a4a42737cde38cb95855 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 9 Jan 2026 11:05:40 -0500
Subject: [PATCH 109/233] CASH-2025: add oem question and logic

---
 src/layouts/quote/quote.vue | 58 ++++++++++++++++++++++++++++++-------
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 9f973d79d..0f273dcb1 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -93,6 +93,11 @@
                             isInsuranceSelected ? isInsuranceContinueButtonText : ''
                         " />
 
+                    <oemGlassQuestion
+                        cmsWidgetName="OemGlassQuestionWidget"
+                        v-if="offerOem"
+                        v-model="isOemGlassSelected" />
+
                     <saveProgressModalQuestion
                         modalWidgetName="SaveProgressModalWidget"
                         modalName="SaveProgressModal"
@@ -136,6 +141,7 @@ import afterpayModalBanner from "@/layouts/quote/afterpay-modal-banner/afterpay-
 import recalDisclaimer from "@/layouts/quote/recal-disclaimer/recal-disclaimer.vue";
 import saveProgressModalQuestion from "@/fmg-components/save-progress-modal-question/save-progress-modal-question";
 import saveProgressPopupQuestion from "@/fmg-components/save-progress-popup-question/save-progress-popup-question";
+import oemGlassQuestion from "./oem-glass-question/oem-glass-question.vue";
 
 // Supporting files
 import baseMixin from "@/mixins/base-mixin.js";
@@ -227,17 +233,16 @@ export default {
         );
 
         // call API oem-after-market-parts method
-        const offerOem = experimentMixin.methods.hasSettingEqualTo(
-            experimentSettings.OFFER_OEM,
-            "true"
+        const experimentAllowsOfferOem = true;
+        // const experimentAllowsOfferOem = experimentMixin.methods.hasSettingEqualTo(
+        //     experimentSettings.OFFER_OEM,
+        //     "true"
+        // );
+        const oemGlassCheckPromise = baseMixin.methods.dispatchStoreActionWithLogging(
+            storeActions.GET_OEM_AFTERMARKET_PARTS,
+            null,
+            "quote"
         );
-        if (offerOem) {
-            const oemAfterMarketParts = baseMixin.methods.dispatchStoreActionWithLogging(
-                storeActions.GET_OEM_AFTERMARKET_PARTS,
-                null,
-                "quote"
-            );
-        }
 
         const shouldExposeSkipQuote = store.getters.isRecalibrationOnOrder;
         const skipQuoteExperiment = store.getters.applicationUser.experiments.find(
@@ -311,6 +316,10 @@ export default {
                 resultKey: "supportingItems",
                 promise: supportingItemsPromise,
             },
+            {
+                resultKey: "oemGlassCheck",
+                promise: oemGlassCheckPromise,
+            },
         ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
@@ -332,6 +341,24 @@ export default {
         lineItems.vaps = lineItems.vaps ?? [];
         const nullSafeGlassParts = lineItems.glassParts ?? [];
 
+        const oemGlassCheck = resultMap.oemGlassCheck;
+        const offerOem = experimentAllowsOfferOem ? oemGlassCheck.offerOem : false;
+        console.log("offerOem: ", offerOem);
+        const oemGlassPieceParts = oemGlassCheck?.glassPieceParts;
+        const oemGlassParts = oemGlassPieceParts ? oemGlassPieceParts[0].parts : null;
+
+        let alternateGlassPartsForOem;
+        // if (oemGlassCheck.glassPieceParts[0].parts) {
+        //     // yes, it's a toyota or lexus
+        //     console.log("BRE yes, oem available: ", oemGlassCheck.glassPieceParts[0].parts)
+        //     alternateGlassPartsForOem = oemGlassCheck.glassPieceParts[0].parts;
+        // }
+        if (oemGlassParts) {
+            // yes, it's a toyota or lexus
+            alternateGlassPartsForOem = oemGlassParts;
+            console.log("BRE yes, oem available: ", alternateGlassPartsForOem);
+        }
+
         const quotePageDiscountPartsInfo = getAvailableQuotePageDiscounts();
 
         const quotePageDiscountParts = quotePageDiscountPartsInfo.map((partInfo) => ({
@@ -410,6 +437,8 @@ export default {
             vm.holdParentAccountNumber = holdParentAccountNumber;
             vm.holdBillToAccountNumber = holdBillToAccountNumber;
             vm.skipToInsurance = shouldSkipToInsurance;
+            vm.offerOem = offerOem;
+            vm.alternateGlassPartsForOem = alternateGlassPartsForOem; // oemParts
 
             if (revalidatePromoResponse) {
                 const revalidateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(
@@ -577,6 +606,8 @@ export default {
             availableLineItems: null,
             lineItems: [],
             addableVaps: [],
+            offerOem: null,
+            alternateGlassPartsForOem: null,
             servicePackage: null,
             holdParentAccountNumber: null,
             holdBillToAccountNumber: null,
@@ -586,6 +617,7 @@ export default {
             packageNumber: null,
             skipToInsurance: null,
             servicePackageSelected: null,
+            isOemGlassSelected: false,
         };
     },
     async mounted() {
@@ -788,6 +820,11 @@ export default {
                 },
                 false
             );
+            this.dispatchStoreAction(
+                this.storeActions.SAVE_IS_OEM_GLASS_SELECTED,
+                this.isOemGlassSelected,
+                false
+            );
 
             await savePageData(
                 this.pageName,
@@ -922,6 +959,7 @@ export default {
         recalDisclaimer,
         saveProgressModalQuestion,
         saveProgressPopupQuestion,
+        oemGlassQuestion,
     },
 };
 </script>

From 9fad67319b925da03b42c8b3ede8135b46bf7871 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Fri, 9 Jan 2026 15:50:54 -0500
Subject: [PATCH 110/233] CASH-2025: Swap OEM glass order item

---
 .../oem-glass-question/oem-glass-question.vue |  5 +--
 src/layouts/quote/quote.spec.js               |  3 ++
 src/layouts/quote/quote.vue                   | 44 +++++++++++++------
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/layouts/quote/oem-glass-question/oem-glass-question.vue b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
index b1b4b4e48..e1fdc2508 100644
--- a/src/layouts/quote/oem-glass-question/oem-glass-question.vue
+++ b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
@@ -1,7 +1,5 @@
 <template>
-    <div
-        class="oem-glass-question-container py-3 my-2"
-        :class="[isExpanded ? 'expanded' : '']">
+    <div class="oem-glass-question-container py-3 my-2" :class="[isExpanded ? 'expanded' : '']">
         <div
             class="oem-glass-question-header d-flex align-items-center justify-content-between"
             @click="toggleIsExpanded">
@@ -27,6 +25,7 @@ export default {
     name: "oem-part-question",
     props: {
         cmsWidgetName: String,
+        modelValue: Boolean,
     },
     data() {
         return {
diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
index 5d9f3bacb..60dd548ad 100644
--- a/src/layouts/quote/quote.spec.js
+++ b/src/layouts/quote/quote.spec.js
@@ -118,6 +118,9 @@ jest.mock("@/mixins/experiment-mixin.js", () => ({
             if (settingName === mockExperimentSettings.DISPLAY_AFTERPAY_BREAKOUT_DISPLAY) {
                 return false;
             }
+            if (settingName === mockExperimentSettings.OFFER_OEM) {
+                return false;
+            }
             return "test";
         },
     },
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 0f273dcb1..729faaf68 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -231,13 +231,10 @@ export default {
             null,
             "quote"
         );
-
-        // call API oem-after-market-parts method
-        const experimentAllowsOfferOem = true;
-        // const experimentAllowsOfferOem = experimentMixin.methods.hasSettingEqualTo(
-        //     experimentSettings.OFFER_OEM,
-        //     "true"
-        // );
+        const experimentAllowsOfferOem = experimentMixin.methods.hasSettingEqualTo(
+            experimentSettings.OFFER_OEM,
+            "true"
+        );
         const oemGlassCheckPromise = baseMixin.methods.dispatchStoreActionWithLogging(
             storeActions.GET_OEM_AFTERMARKET_PARTS,
             null,
@@ -343,9 +340,9 @@ export default {
 
         const oemGlassCheck = resultMap.oemGlassCheck;
         const offerOem = experimentAllowsOfferOem ? oemGlassCheck.offerOem : false;
-        console.log("offerOem: ", offerOem);
         const oemGlassPieceParts = oemGlassCheck?.glassPieceParts;
         const oemGlassParts = oemGlassPieceParts ? oemGlassPieceParts[0].parts : null;
+        const isOemGlassSelected = store.getters.order.isOemGlassSelected;
 
         let alternateGlassPartsForOem;
         // if (oemGlassCheck.glassPieceParts[0].parts) {
@@ -439,6 +436,7 @@ export default {
             vm.skipToInsurance = shouldSkipToInsurance;
             vm.offerOem = offerOem;
             vm.alternateGlassPartsForOem = alternateGlassPartsForOem; // oemParts
+            vm.isOemGlassSelected = isOemGlassSelected;
 
             if (revalidatePromoResponse) {
                 const revalidateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(
@@ -782,11 +780,15 @@ export default {
                 this.lineItems.supportingItems = this.filterOutFees(this.lineItems.supportingItems);
             }
 
-            // isOemGlassSelected?
-            // if it IS, then swap out the glass parts in the line items for these
-
-            // if it's NOT selected BUT alternateGlassPartsForOem exist, then swap out
-            // // the existing glass line items for whatever is in alternateGlassPartsForOem
+            if (this.alternateGlassPartsForOem && this.alternateGlassPartsForOem.length > 0) {
+                let isOEMGlassOnOrder = this.isOEMGlassOnOrder(this.lineItems.glassParts);
+                if (
+                    (this.isOemGlassSelected && !isOEMGlassOnOrder) ||
+                    (!this.isOemGlassSelected && isOEMGlassOnOrder)
+                ) {
+                    this.swapOEMGlassPartsOnOrder();
+                }
+            }
 
             if (this.lineItems.glassParts?.length > 0) {
                 this.dispatchStoreAction(
@@ -943,6 +945,22 @@ export default {
             const alert = createPromoSuccessAlert(lineItems.promos[0].promoCode);
             this.$refs.funnelHeader.pushGlobalAlert(alert, alert.shouldAutoFade);
         },
+        isOEMGlassOnOrder(glassParts) {
+            if (glassParts && glassParts.length > 0) {
+                return glassParts.some((part) => part.partNumber.endsWith("OEM"));
+            }
+            return false;
+        },
+        swapOEMGlassPartsOnOrder() {
+            const windshieldString = "WINDSHIELD";
+            this.lineItems.glassParts.forEach((part, index) => {
+                if (part.partType === windshieldString) {
+                    this.lineItems.glassParts[index] = this.alternateGlassPartsForOem.find(
+                        (altPart) => altPart.partType === windshieldString
+                    );
+                }
+            });
+        },
     },
     components: {
         funnelHeader,

From e391b21bf70aaa90ff61637014974fc52f4cc49e Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 9 Jan 2026 18:00:03 -0500
Subject: [PATCH 111/233] CASH-2025: styling updates

---
 .../oem-glass-question/oem-glass-question.vue | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/layouts/quote/oem-glass-question/oem-glass-question.vue b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
index e1fdc2508..3eee8989d 100644
--- a/src/layouts/quote/oem-glass-question/oem-glass-question.vue
+++ b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
@@ -1,7 +1,7 @@
 <template>
-    <div class="oem-glass-question-container py-3 my-2" :class="[isExpanded ? 'expanded' : '']">
+    <div class="oem-glass-question-container py-5 mt-3 mb-6" :class="[isExpanded ? 'expanded' : '']">
         <div
-            class="oem-glass-question-header d-flex align-items-center justify-content-between"
+            class="oem-glass-question-header"
             @click="toggleIsExpanded">
             {{ headerText }}
         </div>
@@ -67,8 +67,14 @@ export default {
 
 <style lang="scss">
 .oem-glass-question-container {
+    border-top: 1px solid gray;
+
     .oem-glass-question-header {
-        font-weight: bold;
+        font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
+        color: $blue;
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
 
         span {
             flex-grow: 1;
@@ -81,21 +87,24 @@ export default {
             background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 16 9'%3E%3Cpath d='M7.99282 0.117702C7.75716 0.116049 7.53044 0.207797 7.3623 0.37286L0.255553 7.46878C0.0862976 7.63796 -0.00878906 7.86742 -0.00878906 8.10667C-0.00878906 8.34593 0.0862976 8.57539 0.255553 8.74457C0.424808 8.91374 0.654368 9.00879 0.893731 9.00879C1.13309 9.00879 1.36265 8.91374 1.53191 8.74457L7.99282 2.27378L14.4614 8.74457C14.6307 8.91205 14.8595 9.00547 15.0977 9.00428C15.3359 9.00308 15.5638 8.90737 15.7314 8.73819C15.8989 8.56901 15.9924 8.34022 15.9912 8.10216C15.99 7.8641 15.8942 7.63627 15.725 7.46878L8.6259 0.377963C8.45765 0.21088 8.22999 0.117289 7.99282 0.117702Z' fill='%230C7E47'/%3E%3C/svg%3E");
             background-repeat: no-repeat;
             background-position: center center;
+            color: $blue;
             width: 16px;
             height: 16px;
             display: inline-flex;
             position: relative;
+            margin-left: .5rem;
         }
     }
 
     .oem-glass-question-body {
-        transition: all 500ms ease-out;
-        visibility: hidden;
-        overflow: hidden;
         max-height: 0;
+        transition: all 350ms ease-in;
+        overflow: hidden;
+        visibility: hidden;
 
         .oem-glass-question-option {
             margin-top: 0.5em;
+            font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
 
             .oem-glass-question-strikethrough-price {
                 font-size: smaller;
@@ -123,8 +132,6 @@ export default {
         .oem-glass-question-body {
             visibility: visible;
             max-height: none;
-
-            border-top: 1px solid $green-400;
             padding-top: 0.5em;
             margin-top: 0.5em;
         }

From fa9ad6afcd2b660c0d5389ebc91b366cc50bf656 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 9 Jan 2026 18:01:01 -0500
Subject: [PATCH 112/233] CASH-2025: clean up

---
 .../oem-glass-question/oem-glass-question.vue  | 10 +++++-----
 src/layouts/quote/quote.vue                    | 18 +-----------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/layouts/quote/oem-glass-question/oem-glass-question.vue b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
index 3eee8989d..1fc251b4c 100644
--- a/src/layouts/quote/oem-glass-question/oem-glass-question.vue
+++ b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
@@ -1,8 +1,8 @@
 <template>
-    <div class="oem-glass-question-container py-5 mt-3 mb-6" :class="[isExpanded ? 'expanded' : '']">
-        <div
-            class="oem-glass-question-header"
-            @click="toggleIsExpanded">
+    <div
+        class="oem-glass-question-container py-5 mt-3 mb-6"
+        :class="[isExpanded ? 'expanded' : '']">
+        <div class="oem-glass-question-header" @click="toggleIsExpanded">
             {{ headerText }}
         </div>
         <div class="oem-glass-question-body">
@@ -92,7 +92,7 @@ export default {
             height: 16px;
             display: inline-flex;
             position: relative;
-            margin-left: .5rem;
+            margin-left: 0.5rem;
         }
     }
 
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 729faaf68..abf68247c 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -2,13 +2,6 @@
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <loadingModal ref="loadingModal" />
         <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
-
-        <div>
-            <p style="font-size: 10px; color: darkblue">
-                alternateGlassPartsForOem: {{ alternateGlassPartsForOem }}
-            </p>
-        </div>
-
         <div
             class="container quote position-relative"
             :class="[showSaveProgressPopup ? 'initial-popup-open' : '']">
@@ -345,16 +338,7 @@ export default {
         const isOemGlassSelected = store.getters.order.isOemGlassSelected;
 
         let alternateGlassPartsForOem;
-        // if (oemGlassCheck.glassPieceParts[0].parts) {
-        //     // yes, it's a toyota or lexus
-        //     console.log("BRE yes, oem available: ", oemGlassCheck.glassPieceParts[0].parts)
-        //     alternateGlassPartsForOem = oemGlassCheck.glassPieceParts[0].parts;
-        // }
-        if (oemGlassParts) {
-            // yes, it's a toyota or lexus
-            alternateGlassPartsForOem = oemGlassParts;
-            console.log("BRE yes, oem available: ", alternateGlassPartsForOem);
-        }
+        if (oemGlassParts) alternateGlassPartsForOem = oemGlassParts;
 
         const quotePageDiscountPartsInfo = getAvailableQuotePageDiscounts();
 

From 1e84f8c15a47e01c97c7490c263d8ec00fad8b0d Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Sat, 10 Jan 2026 14:39:18 -0500
Subject: [PATCH 113/233] CASH-1952

CASH-1952 change endpoint to POST
---
 src/constants/endpoints.js |  2 +-
 src/store/index.js         | 46 +++++++++++++-------------------------
 2 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index c23de7766..d25fce6a3 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -158,7 +158,7 @@ const endpoints = {
     },
     TaxOrderItems: {
         url: "/price/api/v1/price/taxed-order-items",
-        method: "GET",
+        method: "POST",
     },
     LogExperimentExposureIfAssigned: {
         url: "/experiments/api/v1/experiments/log-exposure",
diff --git a/src/store/index.js b/src/store/index.js
index 1c1f4038f..6802ddb13 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -3125,40 +3125,24 @@ export const actions = {
             promoCode: lineItem.promoCode ?? null,
         }));
 
-        const pricedLineItemsFormattedForRequest =
-            buildQueryStringParameterFromArrayOfComplexObjects(
-                lineItemsWithOnlyPriceInfo,
-                "lineItems"
-            );
-
-        let queryString = "";
-        if (appointmentType == "Mobile") {
-            queryString =
-                `ParentAccountNumber=${context.getters.order.payment.parentAccountNumber}` +
-                `&BillToAccountNumber=${billToAccountNumber}` +
-                `&ProviderNumber=${providerNumber}` +
-                `&AppointmentType=${appointmentType}` +
-                `&ServiceLocation.City=${serviceLocationCity}` +
-                `&ServiceLocation.State=${serviceLocationState}` +
-                `&ServiceLocation.ZipCode=${serviceLocationZipCode}` +
-                `&${pricedLineItemsFormattedForRequest}`;
-        } else {
-            queryString =
-                `ParentAccountNumber=${context.getters.order.payment.parentAccountNumber}` +
-                `&BillToAccountNumber=${billToAccountNumber}` +
-                `&ProviderNumber=${providerNumber}` +
-                `&AppointmentType=${appointmentType}` +
-                `&${pricedLineItemsFormattedForRequest}`;
-        }
-
-        const lineItemServerData = context.getters.order.lineItems.serverData;
-        if (lineItemServerData) {
-            queryString += `&ServerData=${encodeURIComponent(lineItemServerData)}`;
-        }
+        const order = context.getters.order;
 
         const response = await globalMethods.callHttpClient({
             method: endpoints.TaxOrderItems.method,
-            endpoint: `${endpoints.TaxOrderItems.url}?${queryString}`,
+            endpoint: endpoints.TaxOrderItems.url,
+            payload: {
+                parentAccountNumber: order.payment.parentAccountNumber,
+                billToAccountNumber: billToAccountNumber,
+                providerNumber: providerNumber,
+                appointmentType: appointmentType,
+                pricedLineItems: lineItemsWithOnlyPriceInfo,
+                serviceLocation: {
+                    city: appointmentType == "Mobile" ? serviceLocationCity : null,
+                    state: appointmentType == "Mobile" ? serviceLocationState : null,
+                    zipCode: appointmentType == "Mobile" ? serviceLocationZipCode : null,
+                },
+                serverData: order.lineItems.serverData ? order.lineItems.serverData : "",
+            },
             logApiCall: true,
             pageNameToLog: pageNameToLog,
         });

From f1c4e291c387d5dbf5e259977c8873faedc94f5a Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Mon, 12 Jan 2026 09:10:20 -0500
Subject: [PATCH 114/233] CASH-2025: Add null check

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

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index abf68247c..8d86c16af 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -939,9 +939,12 @@ export default {
             const windshieldString = "WINDSHIELD";
             this.lineItems.glassParts.forEach((part, index) => {
                 if (part.partType === windshieldString) {
-                    this.lineItems.glassParts[index] = this.alternateGlassPartsForOem.find(
+                    let altPartToUse = this.alternateGlassPartsForOem.find(
                         (altPart) => altPart.partType === windshieldString
                     );
+                    if (altPartToUse) {
+                        this.lineItems.glassParts[index] = altPartToUse;
+                    }
                 }
             });
         },

From da1a675d8aa78ac3f30fe6b498ef6ef8a451e85c Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Mon, 12 Jan 2026 09:41:55 -0500
Subject: [PATCH 115/233] Finish implementing webchat

---
 .../sierra-webchat/sierra-webchat.vue              | 14 +++-----------
 src/helpers/webchat-helper.js                      |  6 ------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index 4d43187e2..d9fb7dd0e 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -149,20 +149,12 @@ export default {
                     transfer.data.last_name &&
                     transfer.data.email
                 ) {
-                    window.embeddedservice_bootstrap.settings.prepopulatedPrechatFields = {
+                    window.embeddedservice_bootstrap.prechatAPI.setHiddenPrechatFields({
+                        ScarlettAISummary: transfer.data.chat_summary,
                         FirstName: transfer.data.first_name,
                         LastName: transfer.data.last_name,
                         Email: transfer.data.email,
-                        Subject: transfer.data.chat_summary,
-                    };
-                    window.embeddedservice_bootstrap.settings.extraPrechatFormDetails = [
-                        {
-                            label: "Scarlett AI Summary",
-                            value: transfer.data.chat_summary,
-                            transcriptFields: ["Scarlett_AI_Summary__c"],
-                            displayToAgent: true,
-                        },
-                    ];
+                    });
                     if (
                         window.embeddedservice_bootstrap.liveAgentAPI &&
                         typeof window.embeddedservice_bootstrap.liveAgentAPI.startChat ===
diff --git a/src/helpers/webchat-helper.js b/src/helpers/webchat-helper.js
index 45b0ff8dd..e5254d08d 100644
--- a/src/helpers/webchat-helper.js
+++ b/src/helpers/webchat-helper.js
@@ -11,12 +11,6 @@ export const webchatHelper = () => {
         if (webchatGlobalNonpersistedState.shouldLaunchSierra) {
             window.dispatchEvent(new CustomEvent("launch-sierra-webchat")); // launches the sierra chat
         } else {
-            window.embeddedservice_bootstrap.prechatAPI.setHiddenPrechatFields({
-                ScarlettAISummary: "sScarletAISummary",
-                FirstName: "sFirstName",
-                LastName: "sLastName",
-                Email: "sEmail",
-            });
             window.embeddedservice_bootstrap.utilAPI.launchChat(); // launches the salesForce prechat form
         }
     }

From 3fb0aa82ee645fb1039ef9ce3bc799b05b174d82 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 12 Jan 2026 10:24:25 -0500
Subject: [PATCH 116/233] CASH-2025: remove unneeded call

---
 src/layouts/quote/oem-glass-question/oem-glass-question.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/layouts/quote/oem-glass-question/oem-glass-question.vue b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
index 1fc251b4c..b591587c6 100644
--- a/src/layouts/quote/oem-glass-question/oem-glass-question.vue
+++ b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
@@ -11,8 +11,7 @@
                 <checkboxQuestion
                     class="mt-3"
                     cmsWidgetName="OemGlassInputQuestionWidget"
-                    v-model="installOemGlass"
-                    @click="waitListChecked" />
+                    v-model="installOemGlass" />
             </div>
         </div>
     </div>

From 4eefa6963f8d41733f4c4c03dea2db81602a4876 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 12 Jan 2026 10:29:06 -0500
Subject: [PATCH 117/233] CASH-2025: add null check

---
 src/layouts/quote/quote.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 8d86c16af..3c69ec53c 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -332,7 +332,7 @@ export default {
         const nullSafeGlassParts = lineItems.glassParts ?? [];
 
         const oemGlassCheck = resultMap.oemGlassCheck;
-        const offerOem = experimentAllowsOfferOem ? oemGlassCheck.offerOem : false;
+        const offerOem = experimentAllowsOfferOem ? oemGlassCheck?.offerOem : false;
         const oemGlassPieceParts = oemGlassCheck?.glassPieceParts;
         const oemGlassParts = oemGlassPieceParts ? oemGlassPieceParts[0].parts : null;
         const isOemGlassSelected = store.getters.order.isOemGlassSelected;

From 42645e176077d59499d03763b0274712e00c6297 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 12 Jan 2026 10:35:43 -0500
Subject: [PATCH 118/233] CASH-2025: add additional check to avoid Typeerror

---
 src/layouts/quote/quote.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 3c69ec53c..31309f182 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -334,7 +334,7 @@ export default {
         const oemGlassCheck = resultMap.oemGlassCheck;
         const offerOem = experimentAllowsOfferOem ? oemGlassCheck?.offerOem : false;
         const oemGlassPieceParts = oemGlassCheck?.glassPieceParts;
-        const oemGlassParts = oemGlassPieceParts ? oemGlassPieceParts[0].parts : null;
+        const oemGlassParts = (oemGlassPieceParts && oemGlassPieceParts.length > 0) ? oemGlassPieceParts[0].parts : null;
         const isOemGlassSelected = store.getters.order.isOemGlassSelected;
 
         let alternateGlassPartsForOem;

From e869c97becb9f65b1fef23c46db16084ecbca39c Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 12 Jan 2026 10:40:18 -0500
Subject: [PATCH 119/233] CASH-2025: add a null check on lineItems.glassParts
 before calling swapOEM...

---
 src/layouts/quote/quote.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 31309f182..66d4afcb6 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -764,7 +764,7 @@ export default {
                 this.lineItems.supportingItems = this.filterOutFees(this.lineItems.supportingItems);
             }
 
-            if (this.alternateGlassPartsForOem && this.alternateGlassPartsForOem.length > 0) {
+            if (this.lineItems.glassParts && this.alternateGlassPartsForOem && this.alternateGlassPartsForOem.length > 0) {
                 let isOEMGlassOnOrder = this.isOEMGlassOnOrder(this.lineItems.glassParts);
                 if (
                     (this.isOemGlassSelected && !isOEMGlassOnOrder) ||

From 48ae53649219098e1671bd308e08edd1a1b61493 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 12 Jan 2026 10:40:54 -0500
Subject: [PATCH 120/233] CASH-2025: prettier changes

---
 src/layouts/quote/quote.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 66d4afcb6..096620d65 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -334,7 +334,10 @@ export default {
         const oemGlassCheck = resultMap.oemGlassCheck;
         const offerOem = experimentAllowsOfferOem ? oemGlassCheck?.offerOem : false;
         const oemGlassPieceParts = oemGlassCheck?.glassPieceParts;
-        const oemGlassParts = (oemGlassPieceParts && oemGlassPieceParts.length > 0) ? oemGlassPieceParts[0].parts : null;
+        const oemGlassParts =
+            oemGlassPieceParts && oemGlassPieceParts.length > 0
+                ? oemGlassPieceParts[0].parts
+                : null;
         const isOemGlassSelected = store.getters.order.isOemGlassSelected;
 
         let alternateGlassPartsForOem;
@@ -764,7 +767,11 @@ export default {
                 this.lineItems.supportingItems = this.filterOutFees(this.lineItems.supportingItems);
             }
 
-            if (this.lineItems.glassParts && this.alternateGlassPartsForOem && this.alternateGlassPartsForOem.length > 0) {
+            if (
+                this.lineItems.glassParts &&
+                this.alternateGlassPartsForOem &&
+                this.alternateGlassPartsForOem.length > 0
+            ) {
                 let isOEMGlassOnOrder = this.isOEMGlassOnOrder(this.lineItems.glassParts);
                 if (
                     (this.isOemGlassSelected && !isOEMGlassOnOrder) ||

From 5545ff29358d31b163f76edde2d9d1ee9b708aa2 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Mon, 12 Jan 2026 10:51:49 -0500
Subject: [PATCH 121/233] CASH-2025

CASH-2025 change location of oem flag on order service
---
 src/store/index.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index ca24e8287..2fa749968 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -122,6 +122,7 @@ const getDefaultState = () => {
                 capabilityQuestionAnswers: null,
                 dateOfLoss: null,
                 damageCause: null,
+                installOemGlass: null,
             },
             lineItems: {
                 glassParts: null,
@@ -190,7 +191,6 @@ const getDefaultState = () => {
             settledTenderAmount: 0,
             isRecalAckOptIn: false,
             isMSRFeeApplicable: false,
-            isOemGlassSelected: false,
         },
         applicationUser: {
             eventBus: [],
@@ -344,7 +344,7 @@ export const mutations = {
         state.order.isRecalAckOptIn = isRecalAckOptIn;
     },
     updateIsOemGlassSelected(state, isOemGlassSelected) {
-        state.order.isOemGlassSelected = isOemGlassSelected;
+        state.order.damage.installOemGlass = isOemGlassSelected;
     },
     updateIsMSRFeeApplicable(state, isMSRFeeApplicable) {
         state.order.isMSRFeeApplicable = isMSRFeeApplicable;
@@ -678,7 +678,6 @@ export const mutations = {
         state.order.eon = sessionInformation.order.eon;
         state.order.customerPortalLoginToken = sessionInformation.order.CustomerPortalLoginToken;
         state.order.isRecalAckOptIn = sessionInformation.order.isRecalAckOptIn;
-        state.order.isOemGlassSelected = sessionInformation.order.isOemGlassSelected;
 
         if (state.order.vehicle.vin !== sessionInformation.order.vehicle?.vin) {
             state.applicationUser.pageData[routeData.PART_QUESTIONS.name] = null;
@@ -717,6 +716,8 @@ export const mutations = {
         state.order.damage.capabilityQuestionAnswers =
             sessionInformation.order.damage.capabilityQuestionAnswers;
 
+        state.order.damage.installOemGlass = sessionInformation.order.damage.installOemGlass;
+
         state.order.lineItems.glassParts = sessionInformation.order.lineItems.glassParts;
         state.order.lineItems.supportingItems = sessionInformation.order.lineItems.supportingItems;
         state.order.lineItems.vaps = sessionInformation.order.lineItems.vaps ?? [];
@@ -1858,7 +1859,7 @@ export const actions = {
         const serviceType = order.serviceLocation?.appointmentType;
         const referralSeqNumber = order.referralSequenceNumber;
         const parentAccountNumber = applicationConfig.CASH_PARENT_ACCOUNT_NUMBER;
-        const oemEndorsementFlag = order.isOemGlassSelected;
+        const oemEndorsementFlag = order.damage.installOemGlass;
         // create a new array to avoid mutating state
         const glassArrayForPayload = convertGlassPieceNamingForApi(glassArray);
         const resultsArrayForPayload = convertResultsForApi(resultsArray);
@@ -2457,6 +2458,7 @@ export const actions = {
                         partQuestionAnswers: order.damage.partQuestionAnswers,
                         moldingQuestionAnswers: order.damage.moldingQuestionAnswers,
                         capabilityQuestionAnswers: order.damage.capabilityQuestionAnswers,
+                        installOemGlass: order.damage.installOemGlass,
                     },
                     lineItems: {
                         glassParts: lineItems.glassParts,
@@ -2546,7 +2548,6 @@ export const actions = {
                     lockToken: order.lockToken,
                     isRecalAckOptIn: order.isRecalAckOptIn,
                     isMSRFeeApplicable: order.isMSRFeeApplicable,
-                    isOemGlassSelected: order.isOemGlassSelected,
                     cashPriceSubTotal: order.cashPriceSubTotal,
                 },
             },

From cacba1081890a3bbd6cf2e8e1330811942ebad10 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 12 Jan 2026 11:02:49 -0500
Subject: [PATCH 122/233] CASH-2025: update location in store

---
 src/layouts/quote/quote.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 096620d65..53f76c855 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -338,7 +338,7 @@ export default {
             oemGlassPieceParts && oemGlassPieceParts.length > 0
                 ? oemGlassPieceParts[0].parts
                 : null;
-        const isOemGlassSelected = store.getters.order.isOemGlassSelected;
+        const isOemGlassSelected = store.getters.order.damage.installOemGlass;
 
         let alternateGlassPartsForOem;
         if (oemGlassParts) alternateGlassPartsForOem = oemGlassParts;

From a5fcc3d394bfaab2ba38b0a94daa310acc5f9e10 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 12 Jan 2026 12:37:17 -0500
Subject: [PATCH 123/233] CASH-2025: make sure oem endorsement is not null for
 api call

---
 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 2fa749968..8faf39f73 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1859,7 +1859,7 @@ export const actions = {
         const serviceType = order.serviceLocation?.appointmentType;
         const referralSeqNumber = order.referralSequenceNumber;
         const parentAccountNumber = applicationConfig.CASH_PARENT_ACCOUNT_NUMBER;
-        const oemEndorsementFlag = order.damage.installOemGlass;
+        const oemEndorsementFlag = order.damage.installOemGlass || false;
         // create a new array to avoid mutating state
         const glassArrayForPayload = convertGlassPieceNamingForApi(glassArray);
         const resultsArrayForPayload = convertResultsForApi(resultsArray);

From 48616d1fcaf580b606c52d3b5ed73a8d81ab1fb7 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 12 Jan 2026 12:39:57 -0500
Subject: [PATCH 124/233] CASH-2025: cursor suggestion

---
 src/layouts/quote/quote.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 53f76c855..cbb3c26ed 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -338,7 +338,7 @@ export default {
             oemGlassPieceParts && oemGlassPieceParts.length > 0
                 ? oemGlassPieceParts[0].parts
                 : null;
-        const isOemGlassSelected = store.getters.order.damage.installOemGlass;
+        const isOemGlassSelected = store.getters.order.damage.installOemGlass ?? false;
 
         let alternateGlassPartsForOem;
         if (oemGlassParts) alternateGlassPartsForOem = oemGlassParts;

From dfe1ac94dc1b23528236bcd8ac6be75609e7dd4d Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 12 Jan 2026 12:55:07 -0500
Subject: [PATCH 125/233] CASH-2025: another null check

---
 src/layouts/quote/quote.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index cbb3c26ed..05102d3a5 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -338,7 +338,7 @@ export default {
             oemGlassPieceParts && oemGlassPieceParts.length > 0
                 ? oemGlassPieceParts[0].parts
                 : null;
-        const isOemGlassSelected = store.getters.order.damage.installOemGlass ?? false;
+        const isOemGlassSelected = store.getters.order.damage?.installOemGlass ?? false;
 
         let alternateGlassPartsForOem;
         if (oemGlassParts) alternateGlassPartsForOem = oemGlassParts;

From fa5ff6b58bf9b50d08aa669bc8231538ee613ac1 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Mon, 12 Jan 2026 13:26:38 -0500
Subject: [PATCH 126/233] Handle cancellation and payment errors.

---
 src/layouts/payment-adyen/payment-adyen.vue   | 36 +++++++++++++------
 .../methods/route-logic/adyen-return.js       | 15 ++++++--
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index 262614235..d71c13a38 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -111,7 +111,7 @@ export default {
         next(async (vm) => {
             vm.setCmsContent(resultMap.cmsContent);
 
-            if(hasExistingPiaError) {
+            if (hasExistingPiaError) {
                 vm.hasPaymentFailureError = true;
             }
         });
@@ -203,9 +203,9 @@ export default {
                 debugLog("providerLocation.city:", providerLocation.city, !preReqResult);
                 debugLog("providerLocation.state:", providerLocation.state, !preReqResult);
                 debugLog("providerLocation.zipCode:", providerLocation.zipCode, !preReqResult);
-                
+
                 debugLog("", null, !preReqResult);
-                
+
                 debugLog("isInsuranceSet:", isInsuranceSet, !preReqResult);
 
                 debugLog("", null, !preReqResult);
@@ -216,7 +216,7 @@ export default {
                 debugLog("schedule.endTime:", schedule.endTime, !preReqResult);
                 debugLog("schedule.jobMaxMinutes:", schedule.jobMaxMinutes, !preReqResult);
                 debugLog("schedule.jobMinMinutes:", schedule.jobMinMinutes, !preReqResult);
-                
+
                 debugLog("", null, !preReqResult);
 
                 debugLog("customerReqs:", customerReqs, !preReqResult);
@@ -224,7 +224,7 @@ export default {
                 debugLog("customer.lastName:", customer.lastName, !preReqResult);
                 debugLog("customer.phoneNumber:", customer.phoneNumber, !preReqResult);
                 debugLog("customer.emailAddress:", customer.emailAddress, !preReqResult);
-                
+
                 debugLog("", null, !preReqResult);
 
                 debugLog("paymentMethodReqs:", paymentMethodReqs, !preReqResult);
@@ -405,18 +405,32 @@ export default {
             console.log(`Result =`);
             console.log(result);
 
-            const stringToLog = `ADYEN PAYMENT NOT AUTHORIZED. Code = ${result?.resultCode}. Id = ${this.sessionId}`;
+            const wasPaymentCancelled = result?.resultCode === "Cancelled";
 
-            await global.$logger.logError(stringToLog);
+            if (!wasPaymentCancelled) {
+                const stringToLog = `ADYEN PAYMENT NOT AUTHORIZED. Code = ${result?.resultCode}. Id = ${this.sessionId}`;
 
-            this.hasPaymentFailureError = true;
+                await global.$logger.logError(stringToLog);
+
+                this.hasPaymentFailureError = true;
+            }
 
             this.dropinComponent?.update();
         },
-        handleError(error) {
-            const stringToLog = `ADYEN ERROR. Name = ${error.name}. Details = ${error.message}.`;
+        async handleError(error) {
+            console.log(error);
 
-            global.$logger.logError(stringToLog);
+            const wasPaymentCancelled = error?.name === "CANCEL";
+
+            if (!wasPaymentCancelled) {
+                const stringToLog = `ADYEN ERROR. Name = ${error.name}. Details = ${error.message}.`;
+
+                await global.$logger.logError(stringToLog);
+
+                this.hasPaymentFailureError = true;
+            }
+
+            this.dropinComponent?.update();
         },
 
         async saveAndSubmitWorkOrder() {
diff --git a/src/router/methods/route-logic/adyen-return.js b/src/router/methods/route-logic/adyen-return.js
index 1e423e056..e7a901c2e 100644
--- a/src/router/methods/route-logic/adyen-return.js
+++ b/src/router/methods/route-logic/adyen-return.js
@@ -19,7 +19,16 @@ export async function adyenReturnBeforeEnter(to, from) {
 
         try {
             result = await finalizeAdyenPayment(sessionId, redirectResult);
-        } catch (error) {
+        } catch (unexpectedResult) {
+            // If user cancelled payment, handle without error message
+            if (unexpectedResult.code === "Cancelled") {
+                return {
+                    name: routeData.PAYMENT_ADYEN.name,
+                    replace: true,
+                };
+            }
+
+            // Otherwise, failure scenario.
             // Payment fails, so return user to payment-adyen screen to try again or pay later.
             return {
                 name: routeData.PAYMENT_ADYEN.name,
@@ -108,7 +117,7 @@ function finalizeAdyenPayment(sessionId, redirectResult) {
                     console.log(`Payment failed`);
                     console.log(result);
                     reject({
-                        paymentFailure: true,
+                        code: result?.resultCode,
                         message: "Payment failed from Adyen",
                     });
                 },
@@ -116,7 +125,7 @@ function finalizeAdyenPayment(sessionId, redirectResult) {
                     console.log(`Error occured`);
                     console.log(error);
                     reject({
-                        paymentFailure: false,
+                        code: "Error",
                         message: "Error from Adyen",
                     });
                 },

From 5a05320f610418fb4087528726e2587b79008d09 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 12 Jan 2026 15:32:20 -0500
Subject: [PATCH 127/233] CASH-2025: remove if insurance selected

---
 src/layouts/quote/quote.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 05102d3a5..a11b0d588 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -88,7 +88,7 @@
 
                     <oemGlassQuestion
                         cmsWidgetName="OemGlassQuestionWidget"
-                        v-if="offerOem"
+                        v-if="offerOem && !isInsuranceSelected"
                         v-model="isOemGlassSelected" />
 
                     <saveProgressModalQuestion

From 29aed064e9333fcb3fd995e9da91b60b3afe49e7 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 12 Jan 2026 15:38:27 -0500
Subject: [PATCH 128/233] Revert "Merge pull request #2994 from
 Safelite/feature/CASH-2034-for-develop-branch"

This reverts commit a5f9f0343dcefdc5c012f0d449dc5cf9b00b08f7, reversing
changes made to 34b9e8e9bdb4fbbe644612bb97ccf9fd55758d9d.
---
 src/layouts/schedule/schedule.vue | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 948a7de19..e0edcd544 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -22,7 +22,6 @@
                         cmsWidgetName="ScheduleYourServiceWidget"
                         id="schedule-your-service" />
                     <appointmentTypeQuestion
-                        v-if="hasSelectableDatesLoaded"
                         v-model="appointmentTypeFromAppointmentTypeQuestion"
                         v-show="isAppointmentTypeDisplayed"
                         :isServiceableMobile="isServiceableMobile"
@@ -872,13 +871,6 @@ export default {
                 ? this.$refs.mobileFirstModal?.getIsModalOpen()
                 : false;
         },
-        hasSelectableDatesLoaded() {
-            if (this.isMobileSelected) {
-                return this.selectableDatesMobile?.days?.length > 0;
-            } else {
-                return this.selectableDatesInshop?.days?.length > 0;
-            }
-        },
     },
     methods: {
         splitCopyOnCMSPlaceHolder,
@@ -1751,8 +1743,8 @@ export default {
             } else {
                 this.appointmentType = null;
             }
-            this.setSelectedDateToFirstAvailable(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
-            this.setDisplayWaitList(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
+            this.setSelectedDateToFirstAvailable();
+            this.setDisplayWaitList();
         },
         setSelectedDateToFirstAvailable() {
             this.selectedDate = this.getFirstAvailableDate();
@@ -1884,7 +1876,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 040e179f5755a4765073ed0a640c05eff72029ea Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 12 Jan 2026 15:40:43 -0500
Subject: [PATCH 129/233] Revert "Merge pull request #2992 from
 Safelite/feature/CASH-1790-refactor-2"

This reverts commit 34b9e8e9bdb4fbbe644612bb97ccf9fd55758d9d, reversing
changes made to 51b58cb042bb083719bc288a05a5802c599a2ff4.
---
 .../date-picker/date-picker.vue               |   8 +-
 src/layouts/schedule/schedule.vue             | 109 ++++++++++++------
 .../time-slot-question/time-slot-question.vue |   4 +
 .../appointment-type-question.vue             |   1 -
 4 files changed, 83 insertions(+), 39 deletions(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index f38df0372..f48b1f43b 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -281,7 +281,7 @@ export default {
             if (event.screenX === 0 && event.screenY === 0) {
                 return;
             }
-            this.$emit("date-selected", date);
+            this.$emit("date-clicked", date);
         },
         getWeekStartDate(dateString) {
             const date = convertDateStringToDate(dateString);
@@ -846,6 +846,12 @@ export default {
         },
     },
     watch: {
+        isLoading(newValue) {
+            // if done loading dates, then set to first available date
+            if (newValue === false && this.firstAvailableSelectableDate) {
+                this.selectedDate = this.firstAvailableSelectableDate;
+            }
+        },
         modelValue(newValue) {
             this.resetField({
                 value: newValue,
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index e0edcd544..654c7b01a 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -133,6 +133,8 @@
                             :isOvernightDropoff="isOvernightDropoff" />
                     </div>
                     <datePicker
+                        :currentZip="zipCode"
+                        :currentProviderNumber="selectedProvider?.providerNumber"
                         v-show="appointmentType"
                         customComponentId="dateQuestion"
                         selectableDatesSetting="custom"
@@ -142,7 +144,7 @@
                         class="text-link-small"
                         :getMoreDatesCallback="getMoreScheduleData"
                         validationRules="date-required"
-                        @date-selected="handleDateSelected"
+                        @date-clicked="handleDateClicked"
                         :pricingByDayBasePrice="pricingByDayBasePrice"
                         :pricingByDayUpcharge="pricingByDayUpcharge"
                         :showPricingByDay="showPricingByDay"
@@ -165,6 +167,7 @@
                         :timeSlotsForSelectedDate="timeSlotsForSelectedDate"
                         :isSameDay="isSameDay"
                         :selectedRouteCodeData="selectedRouteCodeData"
+                        :isDatePickerDoneInitializing="isDatePickerDoneInitializing"
                         @waitListRequested="handleWaitListRequested" />
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
@@ -473,6 +476,7 @@ export default {
                 experimentSettings.SHOW_MOBILE_FIRST_APPT,
                 "true"
             ),
+            isDatePickerDoneInitializing: false,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -638,12 +642,12 @@ export default {
         showTimeSlotQuestion() {
             if (
                 this.selectedDate &&
-                this.appointmentTypeFromAppointmentTypeQuestion &&
-                this.timeSlotsForSelectedDate
+                this.selectedDate.includes("mobile") &&
+                !this.isMobileSelected
             ) {
-                return true;
+                this.setSelectedDateToFirstAvailable();
             }
-            return false;
+            return this.selectedDate && this.appointmentTypeFromAppointmentTypeQuestion;
         },
         isMobileStaticRecalibrationApplicable() {
             return (
@@ -1184,6 +1188,8 @@ export default {
         async initializeDatePicker() {
             this.isShowMobileFirstAppt && this.showLoadingModal();
 
+            this.selectedDate = null;
+
             const includeMobileTimeSlots = this.isServiceableMobile;
             const includeInshopTimeSlots = this.isServiceableInshop || this.isServiceableDropoff;
             const datePickerInitialData = await this.$refs.datePicker.loadInitialData({
@@ -1224,6 +1230,8 @@ export default {
             }
 
             this.isShowMobileFirstAppt && this.hideLoadingModal();
+            await this.$nextTick();
+            this.isDatePickerDoneInitializing = true;
         },
         getScheduleApiResponse,
         getServiceZipCtuCodeFromStore() {
@@ -1574,40 +1582,28 @@ export default {
         handleWaitListRequested(value) {
             this.waitListRequested = value;
         },
-        handleDateSelected(date) {
-            const previousDate = this.selectedDate;
-
-            // check if date actually changed
-            if (previousDate !== date.dateString) {
-                this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
-                this.updateFooterButtonText(this.selectedTimeSlotInfo);
+        handleDateClicked(date) {
+            // do something to mark this as upcharge day or not...
+            if (date.isPricingByDayUpchargeDay) {
+                this.includePricingByDayUpcharge = true;
+            } else {
+                this.includePricingByDayUpcharge = false;
             }
-
-            // TODO: REMOVE AS PART OF CASH-1634
-            // // do something to mark this as upcharge day or not...
-            // if (date.isPricingByDayUpchargeDay) {
-            //     this.includePricingByDayUpcharge = true;
-            // } else {
-            //     this.includePricingByDayUpcharge = false;
-            // }
-        },
-        getEmptyTimeSlot() {
-            return {
-                timeSlot: {
-                    date: null,
-                    routeCode: null,
-                    startTime: null,
-                    endTime: null,
-                    jobMaxMinutes: null,
-                    jobMinMinutes: null,
-                },
-                isPremiumAppointment: null,
-            };
         },
         updateTimeSlot(timeSlotObj) {
             if (!timeSlotObj?.routeCode) {
                 this.appointmentType = AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF;
-                this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
+                this.selectedTimeSlotInfo = {
+                    timeSlot: {
+                        date: null,
+                        routeCode: null,
+                        startTime: null,
+                        endTime: null,
+                        jobMaxMinutes: null,
+                        jobMinMinutes: null,
+                    },
+                    isPremiumAppointment: null,
+                };
                 return;
             }
             const timeSlot = this.timeSlotsForSelectedDate?.timeSlots?.find(
@@ -1706,9 +1702,6 @@ export default {
         },
         handleAppointmentTypeChange(newAppointmentType) {
             this.updateFooterButtonText();
-            // if time appointment type changes, clear any selected time slot
-            this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
-
             if (newAppointmentType === AppointmentTypeStrings.MOBILE) {
                 // Remember last shop selected if previous selection was inshop/dropoff
                 if (
@@ -1717,6 +1710,17 @@ export default {
                         AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF) &&
                     this.selectedProvider
                 ) {
+                    this.selectedTimeSlotInfo = {
+                        timeSlot: {
+                            date: null,
+                            routeCode: null,
+                            startTime: null,
+                            endTime: null,
+                            jobMaxMinutes: null,
+                            jobMinMinutes: null,
+                        },
+                        isPremiumAppointment: null,
+                    };
                     this.lastSelectedInshopOrDropoffProvider = this.selectedProvider;
                 }
                 this.appointmentType = AppointmentTypeStrings.MOBILE;
@@ -1879,6 +1883,36 @@ export default {
                 this.handleAppointmentTypeChange(newValue);
             },
         },
+        selectedDate(newValue, oldValue) {
+            if (!this.isDatePickerDoneInitializing) {
+                return;
+            } // needed otherwise it nulls selectedTimeSlotInfo too early and prevents a previously selected time slot from auto-selecting
+
+            // Clear time slot selection if date selected changes
+            const selectedDate = this.getSelectedDateFromStore();
+            if (oldValue && this.appointmentType === AppointmentTypeStrings.MOBILE) {
+                oldValue = `${oldValue}-mobile`;
+            }
+            const hasValueChanged = newValue !== oldValue;
+            const isDateDifferent = (newValue || oldValue) !== selectedDate;
+
+            if (hasValueChanged && isDateDifferent && !this.selectedMobileFirstAppointment) {
+                this.selectedTimeSlotInfo = {
+                    timeSlot: {
+                        date: null,
+                        routeCode: null,
+                        startTime: null,
+                        endTime: null,
+                        jobMaxMinutes: null,
+                        jobMinMinutes: null,
+                    },
+                    isPremiumAppointment: null,
+                };
+            }
+        },
+        selectedTimeSlotInfo(newValue) {
+            this.updateFooterButtonText(newValue);
+        },
     },
     components: {
         funnelHeader,
@@ -1891,6 +1925,7 @@ export default {
         textBlock,
         timeSlotQuestion,
         mobileFirstModal,
+
         alert,
         serviceZipModalQuestion,
         appointmentTypeQuestion,
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index d12757571..d2e43054c 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -137,6 +137,7 @@ export default {
         isSameDay: Boolean,
         displayWaitList: Boolean,
         selectedRouteCodeData: Object,
+        isDatePickerDoneInitializing: Boolean,
     },
     data() {
         return {
@@ -190,6 +191,9 @@ export default {
             this.updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(newValue);
         },
         timeSlotsForSelectedDate() {
+            if (!this.isDatePickerDoneInitializing) {
+                return;
+            } // needed otherwise it nulls these too early and prevents a previously selected time slot from auto-selecting
             this.selectedAnswerForDropOffOrInshop = null;
             this.selectedAnswerForTimeSlots = null;
             this.autoSelectTimeSlotIfOnlyOneIsAvailable();
diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
index 924b2e62a..fc4d08b92 100644
--- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
+++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
@@ -80,7 +80,6 @@ export default {
             },
             set: function (newValue) {
                 this.$emit("update:modelValue", newValue);
-                this.$emit("handle-appointment-type-change", newValue);
             },
         },
         isMobileOnly() {

From d9dce69e3511d66e723c220fb52f02bf998ed536 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 12 Jan 2026 15:41:47 -0500
Subject: [PATCH 130/233] Revert "Merge pull request #2993 from
 Safelite/feature/CASH-1790-for-develop"

This reverts commit 51b58cb042bb083719bc288a05a5802c599a2ff4, reversing
changes made to 783c726bd70cd15a24e43c3a312123b99cb6adc7.
---
 src/layouts/schedule/schedule.vue             | 31 ++++++++++++++-----
 .../time-slot-question/time-slot-question.vue | 18 +++--------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 654c7b01a..1ebf47c7e 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -167,7 +167,6 @@
                         :timeSlotsForSelectedDate="timeSlotsForSelectedDate"
                         :isSameDay="isSameDay"
                         :selectedRouteCodeData="selectedRouteCodeData"
-                        :isDatePickerDoneInitializing="isDatePickerDoneInitializing"
                         @waitListRequested="handleWaitListRequested" />
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
@@ -476,7 +475,6 @@ export default {
                 experimentSettings.SHOW_MOBILE_FIRST_APPT,
                 "true"
             ),
-            isDatePickerDoneInitializing: false,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -1136,6 +1134,29 @@ export default {
                 );
             }
         },
+        getTimeSlotInfo() {
+            // Get the current date
+            const currentDate = getTodayDate();
+
+            // Add 10 days to the current date
+            currentDate.setDate(currentDate.getDate() + 10);
+
+            // Format the date as yyyy-mm-dd
+            const year = currentDate.getFullYear();
+            const month = String(currentDate.getMonth() + 1).padStart(2, "0");
+            const day = String(currentDate.getDate()).padStart(2, "0");
+
+            const formattedDate = `${year}-${month}-${day}`;
+
+            return {
+                date: formattedDate,
+                endTime: "12:00",
+                jobMaxMinutes: "180",
+                jobMinMinutes: "120",
+                routeCode: "3357I-03357-M-I*20988*AM",
+                startTime: "08:00",
+            };
+        },
         onShopSelected(shopQuestionPopUpData) {
             this.resetWaitlist();
             this.preSelectedDate = null;
@@ -1230,8 +1251,6 @@ export default {
             }
 
             this.isShowMobileFirstAppt && this.hideLoadingModal();
-            await this.$nextTick();
-            this.isDatePickerDoneInitializing = true;
         },
         getScheduleApiResponse,
         getServiceZipCtuCodeFromStore() {
@@ -1884,10 +1903,6 @@ export default {
             },
         },
         selectedDate(newValue, oldValue) {
-            if (!this.isDatePickerDoneInitializing) {
-                return;
-            } // needed otherwise it nulls selectedTimeSlotInfo too early and prevents a previously selected time slot from auto-selecting
-
             // Clear time slot selection if date selected changes
             const selectedDate = this.getSelectedDateFromStore();
             if (oldValue && this.appointmentType === AppointmentTypeStrings.MOBILE) {
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index d2e43054c..1b8a2cb2e 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -1,7 +1,6 @@
 <template>
     <div class="time-slots-question">
         <buttonQuestion
-            ref="chooseDropOffOrInshop"
             v-if="isDropOffAppointmentAvailable"
             v-model="selectedAnswerForDropOffOrInshop"
             @update:modelValue="dropOffSelectionChanged"
@@ -24,9 +23,8 @@
             </div>
         </buttonQuestion>
         <buttonQuestion
-            ref="chooseTimeSlot"
-            v-if="displayTimeSlotQuestion"
-            v-model="selectedAnswerForTimeSlots"
+            ref="buttonQuestion"
+            v-if="shouldDisplayTimeSlotQuestion"
             @update:modelValue="timeSlotSelectionChanged"
             buttonTypeString="timeSlotModalListButton"
             :buttonTypeObject="timeSlotModalListButton"
@@ -36,12 +34,10 @@
                 isInshopOrDropOffAppointment ? 'is-inshop-or-drop-off-appointment' : '',
             ]"
             :answers="availableTimeSlots"
-            :lazyLoad="{
-                isLazyLoad: !isMobileAppointment && !selectedAnswerForTimeSlots,
-                amountToLoad: 10,
-            }"
+            :lazyLoad="{ isLazyLoad: !isMobileAppointment, amountToLoad: 10 }"
             groupName="chooseTimeSlot"
             textPosition="text-center"
+            v-model="selectedAnswerForTimeSlots"
             questionText="Available times:"
             isRequired
             validationRules="time-slot-required" />
@@ -137,7 +133,6 @@ export default {
         isSameDay: Boolean,
         displayWaitList: Boolean,
         selectedRouteCodeData: Object,
-        isDatePickerDoneInitializing: Boolean,
     },
     data() {
         return {
@@ -191,9 +186,6 @@ export default {
             this.updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(newValue);
         },
         timeSlotsForSelectedDate() {
-            if (!this.isDatePickerDoneInitializing) {
-                return;
-            } // needed otherwise it nulls these too early and prevents a previously selected time slot from auto-selecting
             this.selectedAnswerForDropOffOrInshop = null;
             this.selectedAnswerForTimeSlots = null;
             this.autoSelectTimeSlotIfOnlyOneIsAvailable();
@@ -397,7 +389,7 @@ export default {
                 this.answersForDropOffQuestion[0].value !== PICK_A_TIME_BUTTON_VALUE
             );
         },
-        displayTimeSlotQuestion() {
+        shouldDisplayTimeSlotQuestion() {
             return (
                 this.selectedAnswerForDropOffOrInshop == PICK_A_TIME_BUTTON_VALUE ||
                 !this.isDropOffAppointmentAvailable

From 9f3fb0144f3c5107e0a13998d50e0d6d7ecfd27c Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Mon, 12 Jan 2026 16:11:38 -0500
Subject: [PATCH 131/233] CASH-2114: Price OEM parts and show price difference
 on page

---
 src/constants/part-type-strings.js            |  1 +
 .../oem-glass-question/oem-glass-question.vue |  7 ++-
 src/layouts/quote/quote.vue                   | 54 +++++++++++++++++--
 3 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/src/constants/part-type-strings.js b/src/constants/part-type-strings.js
index 17b96d2fb..0118c0b2c 100644
--- a/src/constants/part-type-strings.js
+++ b/src/constants/part-type-strings.js
@@ -12,6 +12,7 @@ const partTypeStrings = {
     SERVICE_PACKAGE_DISCOUNT: "SERVICE PACKAGE DISCOUNT",
     QUOTE_PAGE_DISCOUNT: "QUOTE PAGE DISCOUNT",
     DONATION: "DONATION",
+    WINDSHIELD: "WINDSHIELD",
 };
 
 export { partTypeStrings };
diff --git a/src/layouts/quote/oem-glass-question/oem-glass-question.vue b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
index b591587c6..f07338e71 100644
--- a/src/layouts/quote/oem-glass-question/oem-glass-question.vue
+++ b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
@@ -25,6 +25,8 @@ export default {
     props: {
         cmsWidgetName: String,
         modelValue: Boolean,
+        oemGlassPartPrice: Number,
+        aftermarketGlassPartPrice: Number,
     },
     data() {
         return {
@@ -36,7 +38,10 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "HeaderText");
         },
         bodyText() {
-            return this.getCmsContent(this.cmsWidgetName, "BodyText");
+            let priceDifference = this.oemGlassPartPrice - this.aftermarketGlassPartPrice;
+            let bodyText = this.getCmsContent(this.cmsWidgetName, "BodyText");
+            bodyText = bodyText.replace("{custom:OEMGLASSPRICE}", "$" + priceDifference.toFixed(2));
+            return bodyText;
         },
         footerText() {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index a11b0d588..82cb61b86 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -89,7 +89,9 @@
                     <oemGlassQuestion
                         cmsWidgetName="OemGlassQuestionWidget"
                         v-if="offerOem && !isInsuranceSelected"
-                        v-model="isOemGlassSelected" />
+                        v-model="isOemGlassSelected"
+                        :oemGlassPartPrice="oemGlassPartPrice"
+                        :aftermarketGlassPartPrice="aftermarketGlassPartPrice" />
 
                     <saveProgressModalQuestion
                         modalWidgetName="SaveProgressModalWidget"
@@ -360,6 +362,18 @@ export default {
             ...quotePageDiscountParts,
         ];
 
+        let pricedAlternateGlassParts = null;
+        if (alternateGlassPartsForOem && alternateGlassPartsForOem.length > 0) {
+            pricedAlternateGlassParts = await baseMixin.methods.dispatchStoreActionWithLogging(
+                storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
+                {
+                    availableLineItems: alternateGlassPartsForOem,
+                },
+                "quote",
+                false
+            );
+        }
+
         // When calling pricing from the quote page, always use the cash parent account but save the existing one in case it's unverified insurance navigating backwards
         var holdParentAccountNumber = store.getters.order.payment?.parentAccountNumber;
         var holdBillToAccountNumber = store.getters.order.payment?.billToAccountNumber;
@@ -422,9 +436,40 @@ export default {
             vm.holdBillToAccountNumber = holdBillToAccountNumber;
             vm.skipToInsurance = shouldSkipToInsurance;
             vm.offerOem = offerOem;
-            vm.alternateGlassPartsForOem = alternateGlassPartsForOem; // oemParts
+            vm.alternateGlassPartsForOem = pricedAlternateGlassParts; // oemParts
             vm.isOemGlassSelected = isOemGlassSelected;
 
+            const getOEMGlassPartPrice = () => {
+                let price = 0;
+                if (vm.alternateGlassPartsForOem) {
+                    let oemGlassPart = vm.isOemGlassSelected
+                        ? vm.lineItems.glassParts
+                        : vm.alternateGlassPartsForOem;
+                    if (oemGlassPart) {
+                        price = oemGlassPart.find(
+                            (altPart) => altPart.partType === partTypeStrings.WINDSHIELD
+                        )?.sellingPrice;
+                    }
+                }
+                return price;
+            };
+            const getAftermarketGlassPartPrice = () => {
+                let price = 0;
+                if (vm.alternateGlassPartsForOem) {
+                    let aftermarketGlassPart = vm.isOemGlassSelected
+                        ? vm.alternateGlassPartsForOem
+                        : vm.lineItems.glassParts;
+                    if (aftermarketGlassPart) {
+                        price = aftermarketGlassPart.find(
+                            (altPart) => altPart.partType === partTypeStrings.WINDSHIELD
+                        )?.sellingPrice;
+                    }
+                }
+                return price;
+            };
+            vm.oemGlassPartPrice = getOEMGlassPartPrice();
+            vm.aftermarketGlassPartPrice = getAftermarketGlassPartPrice();
+
             if (revalidatePromoResponse) {
                 const revalidateAlerts = buildToastMessagesFromRevalidateOrValidatePromoResponse(
                     revalidatePromoResponse,
@@ -943,11 +988,10 @@ export default {
             return false;
         },
         swapOEMGlassPartsOnOrder() {
-            const windshieldString = "WINDSHIELD";
             this.lineItems.glassParts.forEach((part, index) => {
-                if (part.partType === windshieldString) {
+                if (part.partType === partTypeStrings.WINDSHIELD) {
                     let altPartToUse = this.alternateGlassPartsForOem.find(
-                        (altPart) => altPart.partType === windshieldString
+                        (altPart) => altPart.partType === partTypeStrings.WINDSHIELD
                     );
                     if (altPartToUse) {
                         this.lineItems.glassParts[index] = altPartToUse;

From 3ee017dd8a9ef706679d4a4b50bbae5c3e519607 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Mon, 12 Jan 2026 16:36:27 -0500
Subject: [PATCH 132/233] CASH-2114: Null check

---
 src/layouts/quote/quote.vue  | 7 ++++---
 src/styles/ux-variables.scss | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 82cb61b86..bd7a09944 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -446,9 +446,10 @@ export default {
                         ? vm.lineItems.glassParts
                         : vm.alternateGlassPartsForOem;
                     if (oemGlassPart) {
-                        price = oemGlassPart.find(
-                            (altPart) => altPart.partType === partTypeStrings.WINDSHIELD
-                        )?.sellingPrice;
+                        price =
+                            oemGlassPart.find(
+                                (altPart) => altPart.partType === partTypeStrings.WINDSHIELD
+                            )?.sellingPrice || 0;
                     }
                 }
                 return price;
diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss
index 770d95b42..0c275ad51 100644
--- a/src/styles/ux-variables.scss
+++ b/src/styles/ux-variables.scss
@@ -123,8 +123,8 @@ $body-color: $gray-600;
 
 //Fonts
 $font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif;
-$font-family-monospace: UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
-    monospace;
+$font-family-monospace:
+    UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 // stylelint-enable value-keyword-case
 $font-family-base: $font-family-sans-serif;
 $font-family-code: $font-family-monospace;

From 3bfe0b2b4391531e87ece25b74f25fe24b8ba070 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 Jan 2026 10:08:59 -0500
Subject: [PATCH 133/233] Align error on final order submission

---
 src/layouts/payment-adyen/payment-adyen.vue    | 13 ++++---------
 src/router/constants/routing-table.js          |  7 +++++++
 src/router/methods/route-logic/adyen-return.js |  5 ++++-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index d71c13a38..d47187760 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -444,15 +444,10 @@ export default {
             } catch (error) {
                 console.log(`error: response from submit work order: ${error.message}`);
 
-                // navigate to error page
-                const errorPayload = {
-                    cause: `Error while submitting work order after Adyen payment.`,
-                    currentPage: this.pageName,
-                    sessionId: this.sessionId,
-                    idempotencyKey: this.idempotencyKey,
-                };
-
-                this.$router.handleSoftError(errorPayload);
+                this.$router.navigateWithoutSaving(
+                    this.navigationScenarios.PIA_ERROR,
+                    this.pageName
+                );
 
                 return;
             }
diff --git a/src/router/constants/routing-table.js b/src/router/constants/routing-table.js
index 192e1572e..48cd49b3f 100644
--- a/src/router/constants/routing-table.js
+++ b/src/router/constants/routing-table.js
@@ -578,6 +578,13 @@ const routingTable = function () {
                     scenario: navigationScenarios.CLICKED_FORWARD,
                     destinationPageData: routeData.CONFIRMATION,
                 },
+                {
+                    scenario: navigationScenarios.PIA_ERROR,
+                    destinationPageData: routeData.PAYMENT_METHOD,
+                    params: {
+                        piaError: "true",
+                    },
+                },
             ],
         },
         {
diff --git a/src/router/methods/route-logic/adyen-return.js b/src/router/methods/route-logic/adyen-return.js
index e7a901c2e..3db4fda99 100644
--- a/src/router/methods/route-logic/adyen-return.js
+++ b/src/router/methods/route-logic/adyen-return.js
@@ -82,7 +82,10 @@ export async function adyenReturnBeforeEnter(to, from) {
         } catch (error) {
             console.log(error);
             return {
-                name: routeData.ERROR.name,
+                name: routeData.PAYMENT_METHOD.name,
+                query: {
+                    piaError: "true",
+                },
                 replace: true,
             };
         }

From 6ab6932fc57d9bda65a2fe0093a90001f664ae02 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 Jan 2026 10:26:43 -0500
Subject: [PATCH 134/233] Optional chaining

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

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index d47187760..ab5f69be6 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -423,7 +423,7 @@ export default {
             const wasPaymentCancelled = error?.name === "CANCEL";
 
             if (!wasPaymentCancelled) {
-                const stringToLog = `ADYEN ERROR. Name = ${error.name}. Details = ${error.message}.`;
+                const stringToLog = `ADYEN ERROR. Name = ${error?.name}. Details = ${error?.message}.`;
 
                 await global.$logger.logError(stringToLog);
 

From 09a979962418078a8c2415edc39fec58f415fe2d Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Tue, 13 Jan 2026 10:45:24 -0500
Subject: [PATCH 135/233] CASH-2114: Copy over Childparts when swapping OEM
 glass

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

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index bd7a09944..0bd095b77 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -995,6 +995,8 @@ export default {
                         (altPart) => altPart.partType === partTypeStrings.WINDSHIELD
                     );
                     if (altPartToUse) {
+                        let childParts = this.lineItems.glassParts[index].childParts;
+                        altPartToUse.childParts = childParts;
                         this.lineItems.glassParts[index] = altPartToUse;
                     }
                 }

From 516ba215b8d313e660cf12848a5214db9d5314b9 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 Jan 2026 11:11:25 -0500
Subject: [PATCH 136/233] Nits on redirect flow

---
 src/router/methods/route-logic/adyen-return.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/router/methods/route-logic/adyen-return.js b/src/router/methods/route-logic/adyen-return.js
index 3db4fda99..f15168861 100644
--- a/src/router/methods/route-logic/adyen-return.js
+++ b/src/router/methods/route-logic/adyen-return.js
@@ -21,7 +21,7 @@ export async function adyenReturnBeforeEnter(to, from) {
             result = await finalizeAdyenPayment(sessionId, redirectResult);
         } catch (unexpectedResult) {
             // If user cancelled payment, handle without error message
-            if (unexpectedResult.code === "Cancelled") {
+            if (unexpectedResult.code === "Cancelled" || unexpectedResult.code === "CANCEL") {
                 return {
                     name: routeData.PAYMENT_ADYEN.name,
                     replace: true,
@@ -119,6 +119,13 @@ function finalizeAdyenPayment(sessionId, redirectResult) {
                 onPaymentFailed: (result, component) => {
                     console.log(`Payment failed`);
                     console.log(result);
+
+                    if (result?.resultCode !== "Cancelled") {
+                        const stringToLog = `ADYEN PAYMENT NOT AUTHORIZED. Code = ${result?.resultCode}. Id = ${sessionId}`;
+
+                        global.$logger.logError(stringToLog);
+                    }
+
                     reject({
                         code: result?.resultCode,
                         message: "Payment failed from Adyen",
@@ -127,8 +134,15 @@ function finalizeAdyenPayment(sessionId, redirectResult) {
                 onError: (error, component) => {
                     console.log(`Error occured`);
                     console.log(error);
+
+                    if (error?.name !== "CANCEL") {
+                        const stringToLog = `ADYEN ERROR. Name = ${error?.name}. Details = ${error?.message}.`;
+
+                        global.$logger.logError(stringToLog);
+                    }
+
                     reject({
-                        code: "Error",
+                        code: error?.name,
                         message: "Error from Adyen",
                     });
                 },

From a68e0ad43144b0bac74ea0bc8ce8560fd1b2f81b Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 13 Jan 2026 12:16:11 -0500
Subject: [PATCH 137/233] Typo

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

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index ab5f69be6..bbdf33719 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -12,7 +12,7 @@
                             cmsWidgetName="PIAErrorAlertWidget"
                             alertClass="alert-danger"
                             @textLinkClicked="paymentFailedPayLater"
-                            v-bind:isDismissable="false" />
+                            v-bind:isDismissible="false" />
                     </div>
                     <div id="card-container">
                         <div id="payment-container">

From 74fb32dd04fa4003521f6ee3b64d8c7fb3e27f27 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Tue, 13 Jan 2026 13:25:47 -0500
Subject: [PATCH 138/233] CASH-2147: OEM parts styling

---
 .../oem-glass-question/oem-glass-question.vue | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/layouts/quote/oem-glass-question/oem-glass-question.vue b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
index f07338e71..731cb70eb 100644
--- a/src/layouts/quote/oem-glass-question/oem-glass-question.vue
+++ b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
@@ -9,7 +9,7 @@
             <div class="oem-glass-question-copy" v-html="bodyText"></div>
             <div class="oem-glass-question-option">
                 <checkboxQuestion
-                    class="mt-3"
+                    class="mt-3 ms-1"
                     cmsWidgetName="OemGlassInputQuestionWidget"
                     v-model="installOemGlass" />
             </div>
@@ -30,7 +30,7 @@ export default {
     },
     data() {
         return {
-            isExpanded: true,
+            isExpanded: false,
         };
     },
     computed: {
@@ -40,7 +40,10 @@ export default {
         bodyText() {
             let priceDifference = this.oemGlassPartPrice - this.aftermarketGlassPartPrice;
             let bodyText = this.getCmsContent(this.cmsWidgetName, "BodyText");
-            bodyText = bodyText.replace("{custom:OEMGLASSPRICE}", "$" + priceDifference.toFixed(2));
+            bodyText = bodyText.replace(
+                "{custom:OEMGLASSPRICE}",
+                "<span id='price-dif'>$" + priceDifference.toFixed(2) + "</span>"
+            );
             return bodyText;
         },
         footerText() {
@@ -79,6 +82,7 @@ export default {
         display: flex;
         align-items: center;
         justify-content: flex-start;
+        cursor: pointer;
 
         span {
             flex-grow: 1;
@@ -88,7 +92,7 @@ export default {
         &::after {
             content: "";
             transition: all 0.5s ease;
-            background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 16 9'%3E%3Cpath d='M7.99282 0.117702C7.75716 0.116049 7.53044 0.207797 7.3623 0.37286L0.255553 7.46878C0.0862976 7.63796 -0.00878906 7.86742 -0.00878906 8.10667C-0.00878906 8.34593 0.0862976 8.57539 0.255553 8.74457C0.424808 8.91374 0.654368 9.00879 0.893731 9.00879C1.13309 9.00879 1.36265 8.91374 1.53191 8.74457L7.99282 2.27378L14.4614 8.74457C14.6307 8.91205 14.8595 9.00547 15.0977 9.00428C15.3359 9.00308 15.5638 8.90737 15.7314 8.73819C15.8989 8.56901 15.9924 8.34022 15.9912 8.10216C15.99 7.8641 15.8942 7.63627 15.725 7.46878L8.6259 0.377963C8.45765 0.21088 8.22999 0.117289 7.99282 0.117702Z' fill='%230C7E47'/%3E%3C/svg%3E");
+            background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 16 9'%3E%3Cpath d='M7.99282 0.117702C7.75716 0.116049 7.53044 0.207797 7.3623 0.37286L0.255553 7.46878C0.0862976 7.63796 -0.00878906 7.86742 -0.00878906 8.10667C-0.00878906 8.34593 0.0862976 8.57539 0.255553 8.74457C0.424808 8.91374 0.654368 9.00879 0.893731 9.00879C1.13309 9.00879 1.36265 8.91374 1.53191 8.74457L7.99282 2.27378L14.4614 8.74457C14.6307 8.91205 14.8595 9.00547 15.0977 9.00428C15.3359 9.00308 15.5638 8.90737 15.7314 8.73819C15.8989 8.56901 15.9924 8.34022 15.9912 8.10216C15.99 7.8641 15.8942 7.63627 15.725 7.46878L8.6259 0.377963C8.45765 0.21088 8.22999 0.117289 7.99282 0.117702Z' fill='%230070d1'/%3E%3C/svg%3E");
             background-repeat: no-repeat;
             background-position: center center;
             color: $blue;
@@ -138,6 +142,20 @@ export default {
             max-height: none;
             padding-top: 0.5em;
             margin-top: 0.5em;
+
+            .oem-glass-question-copy {
+                #price-dif {
+                    font-weight: $font-weight-700;
+                    color: $black;
+                }
+            }
+
+            .oem-glass-question-option {
+                .small {
+                    font-weight: $font-weight-700;
+                    color: $black;
+                }
+            }
         }
     }
 }

From 8b2caca8038dc93d2b4b37e3e454a45d8ea21b68 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Tue, 13 Jan 2026 15:06:55 -0500
Subject: [PATCH 139/233] CASH-2147: UI fixes

---
 .../quote/oem-glass-question/oem-glass-question.vue        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/layouts/quote/oem-glass-question/oem-glass-question.vue b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
index 731cb70eb..24bcc0f28 100644
--- a/src/layouts/quote/oem-glass-question/oem-glass-question.vue
+++ b/src/layouts/quote/oem-glass-question/oem-glass-question.vue
@@ -76,6 +76,10 @@ export default {
 .oem-glass-question-container {
     border-top: 1px solid gray;
 
+    @include media-breakpoint-up(lg) {
+        margin: 0 2rem;
+    }
+
     .oem-glass-question-header {
         font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
         color: $blue;
@@ -101,6 +105,7 @@ export default {
             display: inline-flex;
             position: relative;
             margin-left: 0.5rem;
+            transform: rotate(180deg);
         }
     }
 
@@ -133,7 +138,7 @@ export default {
     &.expanded {
         .oem-glass-question-header {
             &::after {
-                transform: rotate(180deg);
+                transform: unset;
             }
         }
 

From 40ffbe908c900a93f3ab7485986e7bb982ad5d29 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 13 Jan 2026 15:55:55 -0500
Subject: [PATCH 140/233] CASH-2148

CASH-2148 - reset installOem flag when vehicle or vehicle part changes
---
 src/layouts/vehicle-parts/vehicle-parts.vue | 6 ++++++
 src/store/index.js                          | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index b8e773d30..6965635b7 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -198,6 +198,12 @@ export default {
                 false
             );
 
+            this.dispatchStoreAction(
+                this.storeActions.SAVE_IS_OEM_GLASS_SELECTED,
+                false,
+                false
+            );
+
             // Navigate to the next page
             this.navigateForward(matchedParts);
         },
diff --git a/src/store/index.js b/src/store/index.js
index 8faf39f73..15c69f483 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -344,6 +344,10 @@ export const mutations = {
         state.order.isRecalAckOptIn = isRecalAckOptIn;
     },
     updateIsOemGlassSelected(state, isOemGlassSelected) {
+        console.log(
+            "Mutation::::::::::::::::::::::::::::::::::::::: updateIsOemGlassSelected:",
+            isOemGlassSelected
+        );
         state.order.damage.installOemGlass = isOemGlassSelected;
     },
     updateIsMSRFeeApplicable(state, isMSRFeeApplicable) {

From f97c2f37eb904a02da3c4060bfc6d2db93579f49 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 13 Jan 2026 15:57:53 -0500
Subject: [PATCH 141/233] CASH-2148

CASH-2148
---
 src/layouts/part-questions/part-questions.vue | 6 ++++++
 src/store/index.js                            | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 5456d868f..c3fbee941 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -188,6 +188,12 @@ export default {
                 }
             });
 
+            this.dispatchStoreAction(
+                this.storeActions.SAVE_IS_OEM_GLASS_SELECTED,
+                false,
+                false
+            );
+
             // save to vuex store as order.damage.partQuestionAnswers (array)
             // used in GET_PARTS call following this one
             await this.dispatchStoreAction(
diff --git a/src/store/index.js b/src/store/index.js
index 15c69f483..8faf39f73 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -344,10 +344,6 @@ export const mutations = {
         state.order.isRecalAckOptIn = isRecalAckOptIn;
     },
     updateIsOemGlassSelected(state, isOemGlassSelected) {
-        console.log(
-            "Mutation::::::::::::::::::::::::::::::::::::::: updateIsOemGlassSelected:",
-            isOemGlassSelected
-        );
         state.order.damage.installOemGlass = isOemGlassSelected;
     },
     updateIsMSRFeeApplicable(state, isMSRFeeApplicable) {

From bae8770fb850ac4bb1d41848c9576829913fc423 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 13 Jan 2026 16:06:07 -0500
Subject: [PATCH 142/233] prettier

prettier
---
 src/layouts/part-questions/part-questions.vue | 6 +-----
 src/layouts/vehicle-parts/vehicle-parts.vue   | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index c3fbee941..958a38095 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -188,11 +188,7 @@ export default {
                 }
             });
 
-            this.dispatchStoreAction(
-                this.storeActions.SAVE_IS_OEM_GLASS_SELECTED,
-                false,
-                false
-            );
+            this.dispatchStoreAction(this.storeActions.SAVE_IS_OEM_GLASS_SELECTED, false, false);
 
             // save to vuex store as order.damage.partQuestionAnswers (array)
             // used in GET_PARTS call following this one
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 6965635b7..55fc1852c 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -198,11 +198,7 @@ export default {
                 false
             );
 
-            this.dispatchStoreAction(
-                this.storeActions.SAVE_IS_OEM_GLASS_SELECTED,
-                false,
-                false
-            );
+            this.dispatchStoreAction(this.storeActions.SAVE_IS_OEM_GLASS_SELECTED, false, false);
 
             // Navigate to the next page
             this.navigateForward(matchedParts);

From d767d9084797567efb5f8b2d4949ae658476d817 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 13 Jan 2026 17:57:34 -0500
Subject: [PATCH 143/233] CASH-2034: fixes

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 948a7de19..ca541876c 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -621,7 +621,10 @@ export default {
             },
         },
         isMobileSelected() {
-            return this.appointmentType == AppointmentTypeStrings.MOBILE;
+            return (
+                this.appointmentType == AppointmentTypeStrings.MOBILE ||
+                (this.isServiceableMobile && !this.isServiceableInshop)
+            );
         },
         isServiceableMobile() {
             if (this.isRecalibrationServiceableMobile !== null) {
@@ -1140,7 +1143,7 @@ export default {
                 );
             }
         },
-        onShopSelected(shopQuestionPopUpData) {
+        async onShopSelected(shopQuestionPopUpData) {
             this.resetWaitlist();
             this.preSelectedDate = null;
             this.shopProviderData = shopQuestionPopUpData.shopProviderData;
@@ -1148,6 +1151,8 @@ export default {
             const selectedProvider = this.shopProviderData.shopProviders.find((shopProvider) => {
                 return shopProvider.providerNumber === shopQuestionPopUpData.selectedProviderNumber;
             });
+            const didProviderNumberChange =
+                oldProvider?.providerNumber !== selectedProvider.providerNumber;
 
             // No zipCodeData comes back if zip was not changed
             if (shopQuestionPopUpData.zipCodeData) {
@@ -1156,13 +1161,12 @@ export default {
                     selectedProvider
                 );
             } else {
-                const didProviderNumberChange =
-                    oldProvider?.providerNumber !== selectedProvider.providerNumber;
                 if (didProviderNumberChange) {
                     this.updateSelectedProvider(selectedProvider);
-                    this.initializeDatePicker();
                 }
             }
+            await this.initializeDatePicker();
+            this.setSelectedDateToFirstAvailable();
         },
         async getMoreScheduleData(startDate, endDate) {
             // called only when "View more dates" is clicked; not on initial page load
@@ -1710,7 +1714,6 @@ export default {
             this.zipContainsMilitaryBase = newZipCode.containsMilitaryBase;
             this.selectedDate = null;
             this.selectedProvider = newProvider;
-            this.initializeDatePicker();
         },
         handleAppointmentTypeChange(newAppointmentType) {
             this.updateFooterButtonText();

From cc52bfc46aa952bdcaf4bae35fdbf56cfbd31acb Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 13 Jan 2026 20:27:53 -0500
Subject: [PATCH 144/233] CASH-2148

CASH-fix test
---
 src/layouts/part-questions/part-questions.spec.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/layouts/part-questions/part-questions.spec.js b/src/layouts/part-questions/part-questions.spec.js
index 268f1febd..e7279dbe5 100644
--- a/src/layouts/part-questions/part-questions.spec.js
+++ b/src/layouts/part-questions/part-questions.spec.js
@@ -306,6 +306,10 @@ describe("partQuestions.vue...", () => {
             //Assert
             expect(spy).toHaveBeenNthCalledWith(
                 1,
+                storeActions.SAVE_IS_OEM_GLASS_SELECTED, false, false
+            );
+            expect(spy).toHaveBeenNthCalledWith(
+                2,
                 "savePartQuestionAnswers",
                 [
                     {

From 97bba7fe93bfed3192700c0d8075c81ec779089a Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 13 Jan 2026 20:36:09 -0500
Subject: [PATCH 145/233] prettier

---
 src/layouts/part-questions/part-questions.spec.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/layouts/part-questions/part-questions.spec.js b/src/layouts/part-questions/part-questions.spec.js
index e7279dbe5..4dcbb669c 100644
--- a/src/layouts/part-questions/part-questions.spec.js
+++ b/src/layouts/part-questions/part-questions.spec.js
@@ -306,7 +306,9 @@ describe("partQuestions.vue...", () => {
             //Assert
             expect(spy).toHaveBeenNthCalledWith(
                 1,
-                storeActions.SAVE_IS_OEM_GLASS_SELECTED, false, false
+                storeActions.SAVE_IS_OEM_GLASS_SELECTED,
+                false,
+                false
             );
             expect(spy).toHaveBeenNthCalledWith(
                 2,

From eafeb8d80d35bd3b536cd2c0196f17cd89fe37d1 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 14 Jan 2026 09:56:31 -0500
Subject: [PATCH 146/233] CASH-2034 add null check

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index ca541876c..aa5e63b17 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1152,7 +1152,7 @@ export default {
                 return shopProvider.providerNumber === shopQuestionPopUpData.selectedProviderNumber;
             });
             const didProviderNumberChange =
-                oldProvider?.providerNumber !== selectedProvider.providerNumber;
+                oldProvider?.providerNumber !== selectedProvider?.providerNumber;
 
             // No zipCodeData comes back if zip was not changed
             if (shopQuestionPopUpData.zipCodeData) {

From 061d5036b03c96afbef6d1f1f2b64dc4e396ca1e Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 14 Jan 2026 12:18:22 -0500
Subject: [PATCH 147/233] Default to specific payment type if indicated

---
 src/helpers/adyen-helper.js                 | 15 +++++++++++++++
 src/layouts/payment-adyen/payment-adyen.vue | 20 +++++++++++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/helpers/adyen-helper.js b/src/helpers/adyen-helper.js
index 8de92bf89..540418e56 100644
--- a/src/helpers/adyen-helper.js
+++ b/src/helpers/adyen-helper.js
@@ -84,6 +84,21 @@ export function mapAdyenToFmgPaymentMethod(adyenMethod) {
     return match ?? paymentMethods.CREDIT_CARD;
 }
 
+export function mapFmgToAdyenPaymentMethod(fmgMethod) {
+    const paymentMethodMap = {
+        [paymentMethods.CREDIT_CARD]: "scheme",
+        [paymentMethods.AFTERPAY]: "afterpaytouch",
+        [paymentMethods.PAYPAL]: "paypal",
+        [paymentMethods.APPLE_PAY]: "applepay",
+        [paymentMethods.PAY_NOW]: null,
+        [paymentMethods.PAY_LATER]: null,
+    };
+
+    const match = paymentMethodMap[fmgMethod];
+
+    return match;
+}
+
 export function generateCcToken(adyenSessionInfo) {
     const order = store.getters.order;
     const locationInfo = getLocationInfo(order);
diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index bbdf33719..be83acf8c 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -72,7 +72,7 @@ import { applicationConfig } from "@/constants/application-config";
 import { paymentMethods } from "@/constants/payment-method-constants";
 
 import "@adyen/adyen-web/styles/adyen.css";
-import { mapAdyenToFmgPaymentMethod } from "../../helpers/adyen-helper";
+import { mapAdyenToFmgPaymentMethod, mapFmgToAdyenPaymentMethod } from "../../helpers/adyen-helper";
 import { showFmgLoadingModal } from "../../helpers/loading-modal-helper";
 import cart from "@/fmg-components/cart/cart";
 import { coverageStatus } from "@/constants/insurance";
@@ -289,7 +289,7 @@ export default {
 
             console.log(checkout);
 
-            const dropin = new Dropin(checkout, {
+            const configuration = {
                 paymentMethodsConfiguration: {
                     ideal: {
                         showImage: true,
@@ -311,7 +311,17 @@ export default {
                         name: "Credit or debit card",
                     },
                 },
-            });
+            };
+
+            const adyenPaymentType = mapFmgToAdyenPaymentMethod(this.piaType);
+
+            if (adyenPaymentType) {
+                configuration.openPaymentMethod = {
+                    type: adyenPaymentType
+                };
+            }
+
+            const dropin = new Dropin(checkout, configuration);
 
             this.dropinComponent = dropin;
 
@@ -493,6 +503,10 @@ export default {
     },
 
     computed: {
+        piaType() {
+            return this.$store.getters.order.payment.piaType;
+        },
+
         adyenInitRequestInfo() {
             return {
                 sourceSystem: this.sourceSystem,

From 1d479f9639c605b203f7a94cf515002564c3fcff Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 14 Jan 2026 12:29:00 -0500
Subject: [PATCH 148/233] Formatting

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

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index be83acf8c..42b7d03fb 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -317,7 +317,7 @@ export default {
 
             if (adyenPaymentType) {
                 configuration.openPaymentMethod = {
-                    type: adyenPaymentType
+                    type: adyenPaymentType,
                 };
             }
 

From f0a4c81516dec4bddeb1a3416eb56c484a566bf5 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Wed, 14 Jan 2026 13:31:36 -0500
Subject: [PATCH 149/233] Constant typo

---
 src/helpers/adyen-helper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/helpers/adyen-helper.js b/src/helpers/adyen-helper.js
index 540418e56..5cd7a9e77 100644
--- a/src/helpers/adyen-helper.js
+++ b/src/helpers/adyen-helper.js
@@ -91,7 +91,7 @@ export function mapFmgToAdyenPaymentMethod(fmgMethod) {
         [paymentMethods.PAYPAL]: "paypal",
         [paymentMethods.APPLE_PAY]: "applepay",
         [paymentMethods.PAY_NOW]: null,
-        [paymentMethods.PAY_LATER]: null,
+        [paymentMethods.LATER]: null,
     };
 
     const match = paymentMethodMap[fmgMethod];

From d47ecb5cc09350c989d5da1505ba23e885fe1329 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Thu, 15 Jan 2026 14:45:42 -0500
Subject: [PATCH 150/233] CASH-2180: Remove QPD parts for insurance orders

---
 .../insurance-company/insurance-company.vue     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue
index 21c62078a..0ec8fd5e9 100644
--- a/src/layouts/insurance-company/insurance-company.vue
+++ b/src/layouts/insurance-company/insurance-company.vue
@@ -59,6 +59,7 @@ import store from "@/store";
 import { flushSaveSessionQueue } from "@/helpers/heritage-integration/order-helper";
 import { errorMessages } from "@/constants/error-messages";
 import { required, regex } from "@/helpers/validation-rules";
+import { partTypeStrings } from "@/constants/part-type-strings";
 
 defineRule("insurance-company-required", required(errorMessages.INSURANCE_COMPANY_REQUIRED));
 
@@ -164,6 +165,8 @@ export default {
             // await any pending save-sessions.  if you don't, we will save the new parent account into vuex and then a pending async save-session response overwrites it
             await flushSaveSessionQueue();
 
+            this.removeQPDLineItemIfExists();
+
             await this.dispatchStoreAction(
                 this.storeActions.SAVE_PARENT_ACCOUNT_NUMBER,
                 this.parentAccountNumber.toString(),
@@ -193,6 +196,20 @@ export default {
         handlePageShow() {
             window.location.reload();
         },
+        removeQPDLineItemIfExists() {
+            const lineItems = deepClone(store.getters.order.lineItems);
+            const removeQPDpartIndex = lineItems?.supportingItems.findIndex(
+                (item) => item.partType == partTypeStrings.QUOTE_PAGE_DISCOUNT
+            );
+            if (removeQPDpartIndex >= 0) {
+                lineItems.supportingItems.splice(removeQPDpartIndex, 1);
+                baseMixin.methods.dispatchStoreAction(
+                    storeActions.SAVE_SUPPORTING_ITEMS_SUPPRESSING_STATE_RESETTING,
+                    lineItems.supportingItems,
+                    false
+                );
+            }
+        },
     },
     unmounted() {
         window.removeEventListener("pageshow", this.handlePageShow);

From d12a8454176e0873a6d3f442036ece4fde39651a Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Thu, 15 Jan 2026 15:35:59 -0500
Subject: [PATCH 151/233] CASH-2180: Filter out QPD parts

---
 .../insurance-company/insurance-company.vue    | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue
index 0ec8fd5e9..4da99fec9 100644
--- a/src/layouts/insurance-company/insurance-company.vue
+++ b/src/layouts/insurance-company/insurance-company.vue
@@ -59,7 +59,6 @@ import store from "@/store";
 import { flushSaveSessionQueue } from "@/helpers/heritage-integration/order-helper";
 import { errorMessages } from "@/constants/error-messages";
 import { required, regex } from "@/helpers/validation-rules";
-import { partTypeStrings } from "@/constants/part-type-strings";
 
 defineRule("insurance-company-required", required(errorMessages.INSURANCE_COMPANY_REQUIRED));
 
@@ -198,17 +197,14 @@ export default {
         },
         removeQPDLineItemIfExists() {
             const lineItems = deepClone(store.getters.order.lineItems);
-            const removeQPDpartIndex = lineItems?.supportingItems.findIndex(
-                (item) => item.partType == partTypeStrings.QUOTE_PAGE_DISCOUNT
+            lineItems.supportingItems = baseMixin.methods.filterOutQuotePageDiscountPart(
+                lineItems.supportingItems
+            );
+            baseMixin.methods.dispatchStoreAction(
+                storeActions.SAVE_SUPPORTING_ITEMS_SUPPRESSING_STATE_RESETTING,
+                lineItems.supportingItems,
+                false
             );
-            if (removeQPDpartIndex >= 0) {
-                lineItems.supportingItems.splice(removeQPDpartIndex, 1);
-                baseMixin.methods.dispatchStoreAction(
-                    storeActions.SAVE_SUPPORTING_ITEMS_SUPPRESSING_STATE_RESETTING,
-                    lineItems.supportingItems,
-                    false
-                );
-            }
         },
     },
     unmounted() {

From d789a37e7bf5af8d4a8b7e181417ad1d2e5a82f8 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Thu, 15 Jan 2026 15:52:08 -0500
Subject: [PATCH 152/233] CASH-2180: Make asynchronous

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

diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue
index 4da99fec9..1455847bd 100644
--- a/src/layouts/insurance-company/insurance-company.vue
+++ b/src/layouts/insurance-company/insurance-company.vue
@@ -164,7 +164,7 @@ export default {
             // await any pending save-sessions.  if you don't, we will save the new parent account into vuex and then a pending async save-session response overwrites it
             await flushSaveSessionQueue();
 
-            this.removeQPDLineItemIfExists();
+            await this.removeQPDLineItemIfExists();
 
             await this.dispatchStoreAction(
                 this.storeActions.SAVE_PARENT_ACCOUNT_NUMBER,
@@ -195,12 +195,12 @@ export default {
         handlePageShow() {
             window.location.reload();
         },
-        removeQPDLineItemIfExists() {
+        async removeQPDLineItemIfExists() {
             const lineItems = deepClone(store.getters.order.lineItems);
             lineItems.supportingItems = baseMixin.methods.filterOutQuotePageDiscountPart(
                 lineItems.supportingItems
             );
-            baseMixin.methods.dispatchStoreAction(
+            await baseMixin.methods.dispatchStoreAction(
                 storeActions.SAVE_SUPPORTING_ITEMS_SUPPRESSING_STATE_RESETTING,
                 lineItems.supportingItems,
                 false

From fa036d7b114c7df3df77faa25e198a400f2ce72d Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 16 Jan 2026 11:06:06 -0500
Subject: [PATCH 153/233] CASH-2112 add text block

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

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index 42b7d03fb..4427cf92c 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -36,6 +36,10 @@
                                 :isItac="isItac"
                                 :isNoComp="isNoComp"
                                 :isCollapsible="false" />
+                            <textBlock
+                                class="payment-disclaimer"
+                                marginTopSizeOverride=0
+                                cmsWidgetName="PaymentDisclaimerWidget" />
                         </div>
                     </div>
 
@@ -56,6 +60,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import alert from "@/ux-components/alert/alert";
+import textBlock from "@/digital-components/text-block/text-block";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
@@ -645,6 +650,7 @@ export default {
         navbar,
         cart,
         alert,
+        textBlock,
     },
 };
 </script>
@@ -671,5 +677,10 @@ export default {
             margin: 0 0.5rem;
         }
     }
+
+    .payment-disclaimer p {
+        font-size: 0.875rem;
+        line-height: 1.2;
+    }
 }
 </style>

From f04c3c607cb7b91be1f491f18e2f9e451a5abcee Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Thu, 15 Jan 2026 14:45:42 -0500
Subject: [PATCH 154/233] CASH-2180: Remove QPD parts for insurance orders

---
 .../insurance-company/insurance-company.vue     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue
index 21c62078a..0ec8fd5e9 100644
--- a/src/layouts/insurance-company/insurance-company.vue
+++ b/src/layouts/insurance-company/insurance-company.vue
@@ -59,6 +59,7 @@ import store from "@/store";
 import { flushSaveSessionQueue } from "@/helpers/heritage-integration/order-helper";
 import { errorMessages } from "@/constants/error-messages";
 import { required, regex } from "@/helpers/validation-rules";
+import { partTypeStrings } from "@/constants/part-type-strings";
 
 defineRule("insurance-company-required", required(errorMessages.INSURANCE_COMPANY_REQUIRED));
 
@@ -164,6 +165,8 @@ export default {
             // await any pending save-sessions.  if you don't, we will save the new parent account into vuex and then a pending async save-session response overwrites it
             await flushSaveSessionQueue();
 
+            this.removeQPDLineItemIfExists();
+
             await this.dispatchStoreAction(
                 this.storeActions.SAVE_PARENT_ACCOUNT_NUMBER,
                 this.parentAccountNumber.toString(),
@@ -193,6 +196,20 @@ export default {
         handlePageShow() {
             window.location.reload();
         },
+        removeQPDLineItemIfExists() {
+            const lineItems = deepClone(store.getters.order.lineItems);
+            const removeQPDpartIndex = lineItems?.supportingItems.findIndex(
+                (item) => item.partType == partTypeStrings.QUOTE_PAGE_DISCOUNT
+            );
+            if (removeQPDpartIndex >= 0) {
+                lineItems.supportingItems.splice(removeQPDpartIndex, 1);
+                baseMixin.methods.dispatchStoreAction(
+                    storeActions.SAVE_SUPPORTING_ITEMS_SUPPRESSING_STATE_RESETTING,
+                    lineItems.supportingItems,
+                    false
+                );
+            }
+        },
     },
     unmounted() {
         window.removeEventListener("pageshow", this.handlePageShow);

From 35cb35100e259a2f4abc7683950f6631aa016902 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Thu, 15 Jan 2026 15:35:59 -0500
Subject: [PATCH 155/233] CASH-2180: Filter out QPD parts

---
 .../insurance-company/insurance-company.vue    | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue
index 0ec8fd5e9..4da99fec9 100644
--- a/src/layouts/insurance-company/insurance-company.vue
+++ b/src/layouts/insurance-company/insurance-company.vue
@@ -59,7 +59,6 @@ import store from "@/store";
 import { flushSaveSessionQueue } from "@/helpers/heritage-integration/order-helper";
 import { errorMessages } from "@/constants/error-messages";
 import { required, regex } from "@/helpers/validation-rules";
-import { partTypeStrings } from "@/constants/part-type-strings";
 
 defineRule("insurance-company-required", required(errorMessages.INSURANCE_COMPANY_REQUIRED));
 
@@ -198,17 +197,14 @@ export default {
         },
         removeQPDLineItemIfExists() {
             const lineItems = deepClone(store.getters.order.lineItems);
-            const removeQPDpartIndex = lineItems?.supportingItems.findIndex(
-                (item) => item.partType == partTypeStrings.QUOTE_PAGE_DISCOUNT
+            lineItems.supportingItems = baseMixin.methods.filterOutQuotePageDiscountPart(
+                lineItems.supportingItems
+            );
+            baseMixin.methods.dispatchStoreAction(
+                storeActions.SAVE_SUPPORTING_ITEMS_SUPPRESSING_STATE_RESETTING,
+                lineItems.supportingItems,
+                false
             );
-            if (removeQPDpartIndex >= 0) {
-                lineItems.supportingItems.splice(removeQPDpartIndex, 1);
-                baseMixin.methods.dispatchStoreAction(
-                    storeActions.SAVE_SUPPORTING_ITEMS_SUPPRESSING_STATE_RESETTING,
-                    lineItems.supportingItems,
-                    false
-                );
-            }
         },
     },
     unmounted() {

From 570b70465959d69dd0b099b1dd764ab58343e269 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Thu, 15 Jan 2026 15:52:08 -0500
Subject: [PATCH 156/233] CASH-2180: Make asynchronous

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

diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue
index 4da99fec9..1455847bd 100644
--- a/src/layouts/insurance-company/insurance-company.vue
+++ b/src/layouts/insurance-company/insurance-company.vue
@@ -164,7 +164,7 @@ export default {
             // await any pending save-sessions.  if you don't, we will save the new parent account into vuex and then a pending async save-session response overwrites it
             await flushSaveSessionQueue();
 
-            this.removeQPDLineItemIfExists();
+            await this.removeQPDLineItemIfExists();
 
             await this.dispatchStoreAction(
                 this.storeActions.SAVE_PARENT_ACCOUNT_NUMBER,
@@ -195,12 +195,12 @@ export default {
         handlePageShow() {
             window.location.reload();
         },
-        removeQPDLineItemIfExists() {
+        async removeQPDLineItemIfExists() {
             const lineItems = deepClone(store.getters.order.lineItems);
             lineItems.supportingItems = baseMixin.methods.filterOutQuotePageDiscountPart(
                 lineItems.supportingItems
             );
-            baseMixin.methods.dispatchStoreAction(
+            await baseMixin.methods.dispatchStoreAction(
                 storeActions.SAVE_SUPPORTING_ITEMS_SUPPRESSING_STATE_RESETTING,
                 lineItems.supportingItems,
                 false

From 18efcadfc482e2add7bc63068d5df6d45e98a9fd Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 16 Jan 2026 14:01:27 -0500
Subject: [PATCH 157/233] prettier

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

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index 4427cf92c..9d5f21785 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -38,7 +38,7 @@
                                 :isCollapsible="false" />
                             <textBlock
                                 class="payment-disclaimer"
-                                marginTopSizeOverride=0
+                                marginTopSizeOverride="0"
                                 cmsWidgetName="PaymentDisclaimerWidget" />
                         </div>
                     </div>

From e639edd15c4999e39531bd6dd1f93c5a56130b27 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Mon, 19 Jan 2026 06:28:15 -0500
Subject: [PATCH 158/233] CASH-2149

CASH-2149 recal ack modal for scheduling
---
 src/constants/analytics.js                    |   2 +
 src/constants/schedule-constants.js           |   3 +
 src/constants/store-actions.js                |   1 +
 src/constants/store-mutations.js              |   1 +
 src/helpers/recal-helper.js                   |   8 +
 .../recal-ack-modal/recal-ack-modal.vue       | 223 ++++++++++++++++++
 src/layouts/schedule/schedule.vue             |  57 ++++-
 src/store/index.js                            |  11 +
 src/styles/ux-variables.scss                  |   2 +
 9 files changed, 307 insertions(+), 1 deletion(-)
 create mode 100644 src/layouts/schedule/recal-ack-modal/recal-ack-modal.vue

diff --git a/src/constants/analytics.js b/src/constants/analytics.js
index 00088baa7..e156de11b 100644
--- a/src/constants/analytics.js
+++ b/src/constants/analytics.js
@@ -15,6 +15,7 @@ const GaCategories = {
     APPOINTMENT: "Appointment",
     SERVICE_LOCATION: "service-location",
     CONFIRMATION_CLICKED: "confirmation clicked",
+    RECAL_DISCLAIMER: "Recalibration disclaimer",
 };
 
 const GaActions = {
@@ -29,6 +30,7 @@ const GaActions = {
     MORE_LOCATIONS_CLICKED: "more_locations_clicked",
     YES: "yes",
     NO: "no",
+    ACKNOWLEDGED: "Acknowledged",
 };
 
 const GaLabels = {
diff --git a/src/constants/schedule-constants.js b/src/constants/schedule-constants.js
index 2b626df18..2b6171075 100644
--- a/src/constants/schedule-constants.js
+++ b/src/constants/schedule-constants.js
@@ -11,6 +11,8 @@ const PREMIUM_FEE_PART_TYPE = "EARLY BIRD";
 
 const PRICING_BY_DAY_PART_TYPE = "PREMAPPT GEN";
 
+const RECAL_ACK_YES = "Yes";
+
 const RouteCodeFlags = {
     ALL_DAY_DROP_OFF: "ALL DAY DROP OFF",
     OVERNIGHT_DROP_OFF: "OVERNIGHT DROP OFF",
@@ -31,4 +33,5 @@ export {
     PRICING_BY_DAY_PART_TYPE,
     RouteCodeFlags,
     cmsWidgetFieldMappings,
+    RECAL_ACK_YES,
 };
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 2fc0c88eb..3afd4df24 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -111,6 +111,7 @@ const storeActions = {
     SAVE_PAYPAL_TOKEN: "savePaypalToken",
     SAVE_NEXTGEN_SETTLED_AMOUNT: "saveNextGenSettledAmount",
     SAVE_IS_RECAL_ACK_OPT_IN: "saveIsRecalAckOptIn",
+    SAVE_IS_RECAL_ACKNOWLEDGED_FOR_SCHEDULING: "saveIsRecalAcknowledgedForScheduling",
     SAVE_IS_OEM_GLASS_SELECTED: "saveIsOemGlassSelected",
     SAVE_IS_MSR_FEE_APPLICABLE: "saveIsMSRFeeApplicable",
 
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index 5167581e0..700f527c2 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -69,6 +69,7 @@ const storeMutations = {
     LOCK_TOKEN: "updateLockToken",
     UPDATE_SETTLED_TENDER_AMOUNT: "updateSettledTenderAmount",
     UPDATE_IS_RECAL_ACK_OPT_IN: "updateIsRecalAckOptIn",
+    UPDATE_IS_RECAL_ACKNOWLEDGED_FOR_SCHEDULING: "updateIsRecalAcknowledgedForScheduling",
     UPDATE_IS_OEM_GLASS_SELECTED: "updateIsOemGlassSelected",
     UPDATE_IS_MSR_FEE_APPLICABLE: "updateIsMSRFeeApplicable",
     UPDATE_CASH_PRICE_SUBTOTAL: "updateCashPriceSubTotal",
diff --git a/src/helpers/recal-helper.js b/src/helpers/recal-helper.js
index 2794bbcf6..2a3281185 100644
--- a/src/helpers/recal-helper.js
+++ b/src/helpers/recal-helper.js
@@ -3,6 +3,14 @@ import { partTypeStrings } from "@/constants/part-type-strings";
 
 const recalPartTypes = [partTypeStrings.RECALIBRATION, partTypeStrings.ADAS_RECALIBRATION];
 
+export function anyPartWithRequiresRecalFlag(lineItems) {
+    if (!lineItems) {
+        return false;
+    }
+
+    return lineItems.glassParts?.some((li) => li.requiresRecalibration === true);
+}
+
 export function isRecalPartOrHasChildRecalPart(lineItem) {
     if (lineItem.childParts && lineItem.childParts.length > 0) {
         return isRecalPart(lineItem) || containsRecalParts(lineItem.childParts);
diff --git a/src/layouts/schedule/recal-ack-modal/recal-ack-modal.vue b/src/layouts/schedule/recal-ack-modal/recal-ack-modal.vue
new file mode 100644
index 000000000..e1c823cfe
--- /dev/null
+++ b/src/layouts/schedule/recal-ack-modal/recal-ack-modal.vue
@@ -0,0 +1,223 @@
+// This modal is used to acknowledge the recal disclaimer during scheduling. // It will trigger when
+there is a glass part with requiresRecalibration = true // but there is no recalibration part in
+lineItems. This mostly occurs when // a zip code that does mobile only is selected but the vehicle
+requires // recalibration.
+<template>
+    <div id="recal-ack-modal-container">
+        <modal
+            :ref="modalName"
+            suppressPageScroll
+            :onModalClosedCallback="onModalClosed"
+            :footerButtonText="modalFooterText"
+            :isFooterButtonPrimary="true"
+            @footer-button-event="ackRecalDisclaimer">
+            <p class="modal-body-inner" v-html="modalBodyText"></p>
+            <div>
+                <div class="learn-more">
+                    <a href="javascript:;" @click="learnMore = !learnMore">{{ learnMoreLabel }}</a>
+                    <div v-if="learnMore">{{ learnMoreText }}</div>
+                </div>
+                <buttonQuestion
+                    :questionText="questionText"
+                    :answers="answersFromCms"
+                    :groupName="groupName"
+                    buttonTypeString="listButtonHorizontal"
+                    v-model="selectedValues"
+                    isRequired />
+            </div>
+            <template v-slot:modal-header-slot>
+                <span>{{ modalHeaderText }}</span>
+            </template>
+        </modal>
+    </div>
+</template>
+
+<script>
+import modal from "@/digital-components/modal/modal";
+import buttonQuestion from "@/digital-components/button-question/button-question";
+import { RECAL_ACK_YES } from "@/constants/schedule-constants";
+
+export default {
+    name: "recal-ack-modal",
+    props: {
+        agreementWidgetName: String,
+        modalWidgetName: String,
+        groupName: String,
+    },
+    data() {
+        return {
+            learnMore: false,
+            isModalOpen: true,
+            isRecalAcknowledged: "",
+        };
+    },
+    methods: {
+        openModal() {
+            this.modal.openModal();
+        },
+        onModalClosed() {
+            this.$emit("recal-ack-modal");
+        },
+        closeModal() {
+            this.modal.closeModal();
+        },
+        setIsModalOpen(isOpen) {
+            this.isModalOpen = isOpen;
+        },
+        ackRecalDisclaimer() {
+            this.modal.closeModal();
+
+            if (this.isRecalAcknowledged === RECAL_ACK_YES) {
+                this.pushEventToGA(
+                    this.GaCategories.RECAL_DISCLAIMER,
+                    this.GaActions.ACKNOWLEDGED,
+                    this.isRecalAcknowledged,
+                    true
+                );
+
+                this.$emit("recalAcknowledged", this.isRecalAcknowledged);
+            }
+        },
+    },
+    computed: {
+        questionText() {
+            return this.getCmsContent(this.agreementWidgetName, "QuestionText");
+        },
+        answersFromCms() {
+            return this.getCmsContent(this.agreementWidgetName, "Answers");
+        },
+        learnMoreLabel() {
+            return this.getCmsContent(this.modalWidgetName, "SubheaderText");
+        },
+        learnMoreText() {
+            return this.getCmsContent(this.modalWidgetName, "FooterText2");
+        },
+        modalName() {
+            return this.modalWidgetName;
+        },
+        modal() {
+            return this.$refs[this.modalName];
+        },
+        modalHeaderText() {
+            return this.getCmsContent(this.modalWidgetName, "HeaderText");
+        },
+        modalBodyText() {
+            return this.getCmsContent(this.modalWidgetName, "BodyText");
+        },
+        modalFooterText() {
+            return this.getCmsContent(this.modalWidgetName, "FooterText");
+        },
+        selectedValues: {
+            get: function () {
+                return this.isRecalAcknowledged;
+            },
+            set: function (newValue) {
+                this.isRecalAcknowledged = this.answersFromCms.find(
+                    (a) => a.Name === newValue
+                )?.Text;
+            },
+        },
+    },
+    components: { modal, buttonQuestion },
+};
+</script>
+<style lang="scss">
+#recal-ack-modal-container {
+    .modal-component {
+        @include media-breakpoint-up(md) {
+            .modal-dialog {
+                left: 0;
+                align-content: center;
+                flex-wrap: wrap;
+                width: 34.875rem;
+                transform: translate(0, 0);
+
+                .modal-content {
+                    border-radius: $border-radius-lg;
+                }
+            }
+        }
+        .modal-dialog {
+            .modal-content {
+                .btn-close {
+                    display: none;
+                }
+                .modal-header {
+                    width: 75%;
+                    padding: 0 1.25rem 0 1.25rem;
+                    flex-direction: column;
+                    & > span {
+                        color: $black;
+                        font-size: 1.25rem;
+                        font-weight: normal;
+                    }
+
+                    .modal-title {
+                        font-size: $font-size-20;
+                        font-weight: $font-weight-normal;
+                    }
+                }
+                .modal-body {
+                    padding: 0.875rem 1.25rem 1.875rem 1.25rem;
+
+                    .modal-body-inner {
+                        ul {
+                            list-style: none;
+                            padding: 1rem;
+                            background-color: #f4f4f4;
+                            font-size: $font-size-14;
+                        }
+                        p {
+                            font-size: 0.875rem;
+                        }
+                    }
+
+                    .button-inner-wrapper > .col:first-child .list-button-horizontal {
+                        border-bottom-left-radius: 50rem;
+                        border-top-left-radius: 50rem;
+                    }
+                    .col:first-of-type .list-button-horizontal .list-button-horizontal-content,
+                    .list-group:first-of-type
+                        .list-button-horizontal
+                        .list-button-horizontal-content {
+                        border-bottom-left-radius: 50rem;
+                        border-top-left-radius: 50rem;
+                    }
+
+                    .button-inner-wrapper > .col:last-child .list-button-horizontal {
+                        border-bottom-right-radius: 50rem;
+                        border-top-right-radius: 50rem;
+                    }
+                    .col:last-of-type .list-button-horizontal .list-button-horizontal-content,
+                    .list-group:first-of-type
+                        .list-button-horizontal
+                        .list-button-horizontal-content {
+                        border-bottom-right-radius: 50rem;
+                        border-top-right-radius: 50rem;
+                    }
+
+                    .learn-more {
+                        padding-bottom: 0;
+                        font-size: 0.875rem;
+                        a {
+                            font-weight: 600;
+                        }
+                    }
+                    .question-text {
+                        margin-top: 0.875rem;
+                    }
+                }
+                .modal-footer {
+                    flex-flow: wrap-reverse;
+                    padding-top: 0;
+                    padding-bottom: 2rem;
+                }
+                .modal-footer .modal-footer-button:hover {
+                    background-color: $red-1000;
+                    border-color: $red-1100;
+                }
+            }
+        }
+    }
+}
+</style>
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 1ebf47c7e..a812ab5f6 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -6,6 +6,12 @@
             modalWidgetName="MobileFirstModalWidget"
             ref="mobileFirstModal"
             @confirm-appointment="updateTimeSlotandNavigateForward" />
+        <recalAckModal
+            modalWidgetName="RecalAckModalWidget"
+            agreementWidgetName="RecalAgreementQuestionWidget"
+            groupName="recalAckGroup"
+            @recalAcknowledged="updateRecalAcknowledgedAndNavigateForward"
+            ref="recalAckModal" />
         <div
             class="container page-container-grouped-styles"
             :class="[isMobileFirstModalOpen ? 'hidden-background' : '']">
@@ -190,6 +196,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 recalAckModal from "@/layouts/schedule/recal-ack-modal/recal-ack-modal.vue";
 
 import shopQuestion from "@/layouts/service-location/shop-question/shop-question";
 import shopQuestionPopup from "@/layouts/service-location/shop-question/shop-question-popup";
@@ -216,6 +223,7 @@ import {
     RouteCodeFlags,
     PREMIUM_FEE_PART_TYPE,
     PRICING_BY_DAY_PART_TYPE,
+    RECAL_ACK_YES,
 } from "@/constants/schedule-constants";
 
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -242,6 +250,7 @@ import {
     isDropOffRouteCode,
     getTodayDate,
 } from "@/layouts/schedule/helpers/schedule-helper";
+import { containsRecalParts, anyPartWithRequiresRecalFlag } from "@/helpers/recal-helper";
 
 import { DAYS_OF_WEEK } from "@/digital-components/date-picker/mixins/constants";
 import { required } from "@/helpers/validation-rules";
@@ -430,6 +439,7 @@ export default {
     name: "schedule",
     data() {
         return {
+            isRecalAcknowledgedForScheduling: this.getIsRecalAcknowledgedForSchedulingFromStore(),
             selectedDate: this.getSelectedDateFromStore(),
             selectedTimeSlotInfo: this.getSelectedTimeSlotInfo(),
             mobilePremiumAppointmentFee: null,
@@ -1252,6 +1262,9 @@ export default {
 
             this.isShowMobileFirstAppt && this.hideLoadingModal();
         },
+        getIsRecalAcknowledgedForSchedulingFromStore() {
+            return store.getters.order.isRecalAcknowledgedForScheduling;
+        },
         getScheduleApiResponse,
         getServiceZipCtuCodeFromStore() {
             return store.getters.order.serviceLocation.zipCodeCtu;
@@ -1370,7 +1383,25 @@ export default {
         hideLoadingModal() {
             this.$refs.loadingModal.hideModal();
         },
+        async closeRecalAcknowledgementPopup() {
+            this.showRecalAcknowledgementPopup = false;
+        },
         async forwardButtonAction() {
+            const showRecalAcknowledgementModal = await this.showRecalAcknowledgementModal();
+            if (
+                showRecalAcknowledgementModal &&
+                this.isRecalAcknowledgedForScheduling !== RECAL_ACK_YES
+            ) {
+                this.showRecalAcknowledgementPopup = true;
+                return;
+            }
+
+            this.dispatchStoreAction(
+                storeActions.SAVE_IS_RECAL_ACKNOWLEDGED_FOR_SCHEDULING,
+                this.isRecalAcknowledgedForScheduling,
+                false
+            );
+
             this.navigatingForward = true;
             var ctu = this.zipCodeCtu;
             if (this.appointmentType === AppointmentTypeStrings.MOBILE) {
@@ -1772,6 +1803,26 @@ export default {
         setSelectedDateToFirstAvailable() {
             this.selectedDate = this.getFirstAvailableDate();
         },
+        async showRecalAcknowledgementModal() {
+            const order = this.$store.getters.order;
+            const containsRecalPart = containsRecalParts(order.lineItems);
+            const hasPartWithRecalRequirement = anyPartWithRequiresRecalFlag(order.lineItems);
+
+            // if any of the glass parts contain an item with the requiresRecalibration flag set to true
+            // and the order does not contain a recalibration part, show the recalibration acknowledgement modal
+            if (
+                !containsRecalPart &&
+                hasPartWithRecalRequirement &&
+                this.isRecalAcknowledgedForScheduling !== RECAL_ACK_YES
+            ) {
+                this.$refs.navbar.removeLoader();
+                this.$refs.recalAckModal.openModal();
+                return true;
+            }
+
+            this.closeRecalAcknowledgementPopup();
+            return false;
+        },
         async showMobileFirstModal() {
             if (!this.selectedRouteCodeData?.routeCode) {
                 const pmMobileDays = experimentMixin.methods.getSettingValue(
@@ -1895,6 +1946,10 @@ export default {
             this.updateTimeSlot(timeSlotObj);
             this.forwardButtonAction();
         },
+        updateRecalAcknowledgedAndNavigateForward(isAcknowledged) {
+            this.isRecalAcknowledgedForScheduling = isAcknowledged;
+            this.forwardButtonAction();
+        },
     },
     watch: {
         appointmentTypeFromAppointmentTypeQuestion: {
@@ -1940,7 +1995,7 @@ export default {
         textBlock,
         timeSlotQuestion,
         mobileFirstModal,
-
+        recalAckModal,
         alert,
         serviceZipModalQuestion,
         appointmentTypeQuestion,
diff --git a/src/store/index.js b/src/store/index.js
index 8faf39f73..e9b379b56 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -190,6 +190,7 @@ const getDefaultState = () => {
             lockToken: null,
             settledTenderAmount: 0,
             isRecalAckOptIn: false,
+            isRecalAcknowledgedForScheduling: "",
             isMSRFeeApplicable: false,
         },
         applicationUser: {
@@ -343,6 +344,9 @@ export const mutations = {
     updateIsRecalAckOptIn(state, isRecalAckOptIn) {
         state.order.isRecalAckOptIn = isRecalAckOptIn;
     },
+    updateIsRecalAcknowledgedForScheduling(state, isRecalAcknowledgedForScheduling) {
+        state.order.isRecalAcknowledgedForScheduling = isRecalAcknowledgedForScheduling;
+    },
     updateIsOemGlassSelected(state, isOemGlassSelected) {
         state.order.damage.installOemGlass = isOemGlassSelected;
     },
@@ -2965,6 +2969,13 @@ export const actions = {
         context.commit(storeMutations.UPDATE_IS_RECAL_ACK_OPT_IN, isRecalAckOptIn);
     },
 
+    saveIsRecalAcknowledgedForScheduling(context, isRecalAcknowledgedForScheduling) {
+        context.commit(
+            storeMutations.UPDATE_IS_RECAL_ACKNOWLEDGED_FOR_SCHEDULING,
+            isRecalAcknowledgedForScheduling
+        );
+    },
+
     saveIsOemGlassSelected(context, isOemGlassSelected) {
         context.commit(storeMutations.UPDATE_IS_OEM_GLASS_SELECTED, isOemGlassSelected);
     },
diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss
index 0c275ad51..76035c6ca 100644
--- a/src/styles/ux-variables.scss
+++ b/src/styles/ux-variables.scss
@@ -27,6 +27,8 @@ $red-600: #ac160b;
 $red-700: #840900;
 $red-800: #5b0600;
 $red-900: #330300;
+$red-1000: #a80019;
+$red-1100: #791710;
 
 // Greens
 $green-100: #e3f2ea;

From 6e0609f8c1bbafe5bbfe89a7d368edc4bbfef4ec Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Tue, 20 Jan 2026 10:38:26 -0500
Subject: [PATCH 159/233] CASH-2183: Conditional PIA

---
 src/constants/experiments.js                  |  3 ++
 src/layouts/payment-method/payment-method.vue | 44 ++++++++++++++++++-
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/constants/experiments.js b/src/constants/experiments.js
index a2a648a65..1d689d727 100644
--- a/src/constants/experiments.js
+++ b/src/constants/experiments.js
@@ -12,6 +12,9 @@ const experimentSettings = {
     SUPPRESS_VIN_CAPTURE: "SuppressVinCapture",
     DISPLAY_AVAILABILITY_INDICATORS: "DisplayAvailabilityIndicators",
     PIA_EXPERIENCE: "PIA Experience",
+    CONDITIONAL_PROVIDER_NUMBERS: "ConditionalProviderNumbers",
+    CONDITIONAL_PROVIDER_NUMBERS_2: "ConditionalProviderNumbers2",
+    CONDITIONAL_PROVIDER_SHUTOFF_DATE: "ConditionalProviderShutoffDate",
     PIA_INSURANCE: "DisplayPIAInsurance",
     SUBMIT_ORDER_ENABLE_PIA: "SubmitOrder_Enable_PIA",
     IS_EMAIL_OPTIONAL: "isEmailOptional",
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 0fa02e80a..bd4b8212b 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -810,11 +810,51 @@ export default {
             const piaInsurance = this.getSettingValue(experimentSettings.PIA_INSURANCE);
 
             if (this.isInsurance) {
-                return piaInsurance === "true" && this.currentDeductible > 0;
+                return (
+                    (piaInsurance === "true" || this.isConditionalPIAEnabled) &&
+                    this.currentDeductible > 0
+                );
             } else {
-                return piaExperience === "PIA Optional" || piaExperience === "PIA Required";
+                if (piaExperience.includes("PIA Disabled")) {
+                    return this.isConditionalPIAEnabled;
+                } else {
+                    return piaExperience === "PIA Optional" || piaExperience === "PIA Required";
+                }
             }
         },
+        isConditionalPIAEnabled() {
+            const conditionalProviderNumbers = this.getSettingValue(
+                experimentSettings.CONDITIONAL_PROVIDER_NUMBERS
+            );
+            const conditionalProviderNumbers2 = this.getSettingValue(
+                experimentSettings.CONDITIONAL_PROVIDER_NUMBERS_2
+            );
+            const conditionalProviderShutoffDate = this.getSettingValue(
+                experimentSettings.CONDITIONAL_PROVIDER_SHUTOFF_DATE
+            );
+
+            const allConditionalProviderNumbers = [
+                conditionalProviderNumbers,
+                conditionalProviderNumbers2,
+            ]
+                .filter(Boolean)
+                .join(",");
+            const providerNumber =
+                this.$store.getters.order.serviceLocation.provider.providerNumber;
+            const appointmentDate = new Date(this.$store.getters.order.schedule.date);
+            const shutoffDate = new Date(conditionalProviderShutoffDate);
+            if (allConditionalProviderNumbers && conditionalProviderShutoffDate) {
+                const providerNumbersArray = allConditionalProviderNumbers
+                    .split(",")
+                    .map((num) => num.trim());
+                if (!providerNumbersArray.includes(providerNumber)) {
+                    return false;
+                } else {
+                    return appointmentDate <= shutoffDate;
+                }
+            }
+            return false;
+        },
         paymentMethod() {
             if (!this.isPiaEnabled) {
                 return paymentMethods.LATER;

From f3166de125140c0cd29aeb4eec5da08152e0f776 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 20 Jan 2026 10:41:20 -0500
Subject: [PATCH 160/233] CASH-2186

CASSH-2186 when doing a zip change when the recal ack modal is in effect, will have to navigate back to service-zip so we can add any necessary recal parts.
---
 src/layouts/schedule/schedule.vue            | 54 +++++++++++++++-----
 src/router/constants/navigation-scenarios.js |  1 +
 src/router/constants/routing-table.js        |  4 ++
 3 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index a812ab5f6..b63e5fb21 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1387,7 +1387,7 @@ export default {
             this.showRecalAcknowledgementPopup = false;
         },
         async forwardButtonAction() {
-            const showRecalAcknowledgementModal = await this.showRecalAcknowledgementModal();
+            const showRecalAcknowledgementModal = this.showRecalAcknowledgementModal();
             if (
                 showRecalAcknowledgementModal &&
                 this.isRecalAcknowledgedForScheduling !== RECAL_ACK_YES
@@ -1725,7 +1725,27 @@ export default {
                 this.selectedProvider = this.shopProviderData.shopProviders[0];
             }
         },
-        handleZipCodeChange(newZipCode) {
+        async handleZipCodeChange(newZipCode) {
+            // if we were showing the recal ack modal and now are changing the zip, we need to navigate
+            // to service-zip so we can get call parts again to add the recal part if needed
+            if (this.shouldShowRecalAckModal()) {
+                await baseMixin.methods.dispatchStoreAction(
+                    storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
+                    {
+                        zipCode: newZipCode.zipCode,
+                        state: newZipCode.state,
+                        zipCodeCtu: newZipCode.zipCodeCtu,
+                    },
+                    false
+                );
+
+                this.$router.navigateWithSaving(
+                    this.navigationScenarios.ZIP_CODE_CHANGED_RECAL_ACK,
+                    this.pageName
+                );
+                return;
+            }
+
             this.resetMobileLocation();
 
             getShopProviderData(newZipCode.zipCode, this.pageName).then((result) => {
@@ -1803,18 +1823,8 @@ export default {
         setSelectedDateToFirstAvailable() {
             this.selectedDate = this.getFirstAvailableDate();
         },
-        async showRecalAcknowledgementModal() {
-            const order = this.$store.getters.order;
-            const containsRecalPart = containsRecalParts(order.lineItems);
-            const hasPartWithRecalRequirement = anyPartWithRequiresRecalFlag(order.lineItems);
-
-            // if any of the glass parts contain an item with the requiresRecalibration flag set to true
-            // and the order does not contain a recalibration part, show the recalibration acknowledgement modal
-            if (
-                !containsRecalPart &&
-                hasPartWithRecalRequirement &&
-                this.isRecalAcknowledgedForScheduling !== RECAL_ACK_YES
-            ) {
+        showRecalAcknowledgementModal() {
+            if (this.shouldShowRecalAckModal()) {
                 this.$refs.navbar.removeLoader();
                 this.$refs.recalAckModal.openModal();
                 return true;
@@ -1823,6 +1833,22 @@ export default {
             this.closeRecalAcknowledgementPopup();
             return false;
         },
+        shouldShowRecalAckModal() {
+            // if any of the glass parts contain an item with the requiresRecalibration flag set to true
+            // and the order does not contain a recalibration part, show the recalibration acknowledgement modal
+            const order = this.$store.getters.order;
+            const containsRecalPart = containsRecalParts(order.lineItems);
+            const hasPartWithRecalRequirement = anyPartWithRequiresRecalFlag(order.lineItems);
+
+            if (
+                !containsRecalPart &&
+                hasPartWithRecalRequirement &&
+                this.isRecalAcknowledgedForScheduling !== RECAL_ACK_YES
+            ) {
+                return true;
+            }
+            return false;
+        },
         async showMobileFirstModal() {
             if (!this.selectedRouteCodeData?.routeCode) {
                 const pmMobileDays = experimentMixin.methods.getSettingValue(
diff --git a/src/router/constants/navigation-scenarios.js b/src/router/constants/navigation-scenarios.js
index c2247d59b..0d0ee836f 100644
--- a/src/router/constants/navigation-scenarios.js
+++ b/src/router/constants/navigation-scenarios.js
@@ -57,6 +57,7 @@ const navigationScenarios = {
 
     // Schedule
     CLICKED_CHANGE_LOCATION: "CLICKED_CHANGE_LOCATION",
+    ZIP_CODE_CHANGED_RECAL_ACK: "ZIP_CODE_CHANGED_RECAL_ACK",
 
     // Payment
     CLICKED_INSURANCE: "CLICKED_INSURANCE",
diff --git a/src/router/constants/routing-table.js b/src/router/constants/routing-table.js
index 192e1572e..562615591 100644
--- a/src/router/constants/routing-table.js
+++ b/src/router/constants/routing-table.js
@@ -486,6 +486,10 @@ const routingTable = function () {
                     scenario: navigationScenarios.CLICKED_FORWARD_WITH_MOBILE_SERVICE,
                     destinationPageData: routeData.MOBILE_DETAILS,
                 },
+                {
+                    scenario: navigationScenarios.ZIP_CODE_CHANGED_RECAL_ACK,
+                    destinationPageData: routeData.SERVICE_ZIP,
+                },
             ],
         },
         {

From 2914a508781ac8448b3429523fdb4a464f190a10 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Tue, 20 Jan 2026 10:56:01 -0500
Subject: [PATCH 161/233] CASH-2183: Null check

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

diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index bd4b8212b..2a6d1d9ed 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -815,7 +815,7 @@ export default {
                     this.currentDeductible > 0
                 );
             } else {
-                if (piaExperience.includes("PIA Disabled")) {
+                if (piaExperience?.includes("PIA Disabled")) {
                     return this.isConditionalPIAEnabled;
                 } else {
                     return piaExperience === "PIA Optional" || piaExperience === "PIA Required";

From 19dad3a5ca5bad982b05415ad6d0921a072bd15e Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Wed, 21 Jan 2026 12:30:13 -0500
Subject: [PATCH 162/233] CASH-1297

CASH-1297 this is a temporary defect fix for this card
---
 src/layouts/payment-method/payment-method.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 2a6d1d9ed..a66c1b758 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -609,6 +609,19 @@ export default {
                 return;
             }
 
+            const billToAccountNumber = await baseMixin.methods.dispatchStoreActionWithLogging(
+                storeActions.GET_BILL_TO_ACCOUNT_NUMBER,
+                {},
+                "payment-method",
+                false
+            );
+
+            baseMixin.methods.dispatchStoreAction(
+                storeActions.SAVE_BILL_TO_ACCOUNT_NUMBER,
+                billToAccountNumber,
+                false
+            );
+
             this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
 
             const shouldUseAdyen = experimentMixin.methods.hasSettingEqualTo(

From fe9d1fd4763456c1643ef09bdd8cb4811a80b05c Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 22 Jan 2026 09:29:14 -0500
Subject: [PATCH 163/233] Revert "CASH-1297"

This reverts commit 19dad3a5ca5bad982b05415ad6d0921a072bd15e.
---
 src/layouts/payment-method/payment-method.vue | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index a66c1b758..2a6d1d9ed 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -609,19 +609,6 @@ export default {
                 return;
             }
 
-            const billToAccountNumber = await baseMixin.methods.dispatchStoreActionWithLogging(
-                storeActions.GET_BILL_TO_ACCOUNT_NUMBER,
-                {},
-                "payment-method",
-                false
-            );
-
-            baseMixin.methods.dispatchStoreAction(
-                storeActions.SAVE_BILL_TO_ACCOUNT_NUMBER,
-                billToAccountNumber,
-                false
-            );
-
             this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
 
             const shouldUseAdyen = experimentMixin.methods.hasSettingEqualTo(

From 1efd1ec797a18715f37be6bafb11ba710b4f2c4c Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 22 Jan 2026 11:33:11 -0500
Subject: [PATCH 164/233] Correctly implement 'Clicked Pay Later' scenario on
 payment pages.

---
 src/layouts/payment-adyen/payment-adyen.vue | 2 +-
 src/router/constants/routing-table.js       | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index 9d5f21785..34a232e2c 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -496,7 +496,7 @@ export default {
                 await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_STATE);
 
                 this.$router.navigateWithoutSaving(
-                    this.navigationScenarios.CLICKED_FORWARD,
+                    this.navigationScenarios.CLICKED_PAY_LATER,
                     this.pageName
                 );
             } catch (error) {
diff --git a/src/router/constants/routing-table.js b/src/router/constants/routing-table.js
index 3b237d747..d5f8e442c 100644
--- a/src/router/constants/routing-table.js
+++ b/src/router/constants/routing-table.js
@@ -569,6 +569,10 @@ const routingTable = function () {
                         piaError: "true",
                     },
                 },
+                {
+                    scenario: navigationScenarios.CLICKED_PAY_LATER,
+                    destinationPageData: routeData.CONFIRMATION,
+                },
             ],
         },
         {
@@ -589,6 +593,10 @@ const routingTable = function () {
                         piaError: "true",
                     },
                 },
+                {
+                    scenario: navigationScenarios.CLICKED_PAY_LATER,
+                    destinationPageData: routeData.CONFIRMATION,
+                },
             ],
         },
         {

From 485ab11d42c941f9bb346e016b9fb40f12a38a92 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Thu, 22 Jan 2026 14:47:17 -0500
Subject: [PATCH 165/233] CASH-1527 | Add in sys snippet

---
 .../salesforce-helper-sys.js                  | 59 +++++++++++++++++++
 .../salesforce-webchat/salesforce-webchat.vue | 15 ++++-
 .../sierra-webchat/sierra-webchat.vue         |  2 +-
 3 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 src/digital-components/salesforce-webchat/salesforce-helper-sys.js

diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-sys.js b/src/digital-components/salesforce-webchat/salesforce-helper-sys.js
new file mode 100644
index 000000000..c843ced94
--- /dev/null
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-sys.js
@@ -0,0 +1,59 @@
+/* eslint-disable */
+
+function setupCustomSettings(
+    modifyEmbeddedSvcCallback,
+    finishedLoadingCallback,
+    onWebchatOpenCallback,
+    onWebchatCloseCallback
+) {
+    modifyEmbeddedSvcCallback();
+    window.addEventListener("onEmbeddedMessagingButtonCreated", finishedLoadingCallback);
+    window.addEventListener("onEmbeddedMessagingWindowMaximized", onWebchatOpenCallback);
+    window.addEventListener("onEmbeddedMessagingWindowClosed", onWebchatCloseCallback);
+}
+
+/*
+The code below is generated from salesforce but modified in the following ways:
+  * Only the javascript inside the second <script> tag in the provided salesforce code is copy pasted
+  * CSS is not copied in
+  * First <script> tag loading in the file from the CDN is not copied in
+  * Copy the entire contents of the second <script> tag inside the initializeSalesforceWebchatForSys
+      method and add a call to setupCustomSettings before the 'embedded_svc.init()' method is called
+      
+      Actual call to paste in:
+      setupCustomSettings(
+            modifyEmbeddedSvcCallback,
+            finishedLoadingCallback,
+            onWebchatOpenCallback,
+            onWebchatCloseCallback
+        );
+*/
+
+export function initializeSalesforceWebchatForSys(
+    modifyEmbeddedSvcCallback,
+    finishedLoadingCallback,
+    onWebchatOpenCallback,
+    onWebchatCloseCallback
+) {
+    setupCustomSettings(
+        modifyEmbeddedSvcCallback,
+        finishedLoadingCallback,
+        onWebchatOpenCallback,
+        onWebchatCloseCallback
+    );
+
+    try {
+        embeddedservice_bootstrap.settings.language = "en_US"; // For example, enter 'en' or 'en-US'
+
+        embeddedservice_bootstrap.init(
+            '00DcY0000067qKz',
+            'Sales_Central_TFN',
+            'https://safelite2--sys.sandbox.my.site.com/ESWSalesCentralTFN1767797265631',
+            {
+                scrt2URL: 'https://safelite2--sys.sandbox.my.salesforce-scrt.com'
+            }
+        );
+    } catch (err) {
+        console.error("Error loading Embedded Messaging: ", err);
+    }
+}
diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index 1dca6de8c..1dab19035 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -103,7 +103,20 @@ export default {
                 !this.isWebchatOpen;
         },
     },
-    computed: {},
+    computed: {
+        webChatScriptSrc() {
+            switch (applicationConfig.CURRENT_ENVIRONMENT) {
+                case "Prod":
+                    return "https://safelite2.my.salesforce.com/embeddedservice/5.0/esw.min.js";
+                case "QA":
+                case "SysTest":
+                    return "https://safelite2--sys.sandbox.my.site.com/ESWSalesCentralTFN1767797265631/assets/js/bootstrap.min.js";
+                case "Dev":
+                case "Localhost":
+                    return "https://safelite2--dev.sandbox.my.site.com/ESWSalesCentralTFN1755660094477/assets/js/bootstrap.min.js";
+            }
+        },
+    },
     components: {},
 };
 </script>
diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index d9fb7dd0e..920a66052 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -160,7 +160,7 @@ export default {
                         typeof window.embeddedservice_bootstrap.liveAgentAPI.startChat ===
                             "function"
                     ) {
-                        window.embeddedservice_bootstrap.liveAgentAPI.startChat();
+                        window.embeddedservice_bootstrap.utilAPI.launchChat();
                         return;
                     }
                 }

From 5bd09c249cef6491edd7ce846e9123db72d792fd Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Thu, 22 Jan 2026 14:55:57 -0500
Subject: [PATCH 166/233] Formatting

---
 .../salesforce-webchat/salesforce-helper-sys.js           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-sys.js b/src/digital-components/salesforce-webchat/salesforce-helper-sys.js
index c843ced94..d946674d0 100644
--- a/src/digital-components/salesforce-webchat/salesforce-helper-sys.js
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-sys.js
@@ -46,11 +46,11 @@ export function initializeSalesforceWebchatForSys(
         embeddedservice_bootstrap.settings.language = "en_US"; // For example, enter 'en' or 'en-US'
 
         embeddedservice_bootstrap.init(
-            '00DcY0000067qKz',
-            'Sales_Central_TFN',
-            'https://safelite2--sys.sandbox.my.site.com/ESWSalesCentralTFN1767797265631',
+            "00DcY0000067qKz",
+            "Sales_Central_TFN",
+            "https://safelite2--sys.sandbox.my.site.com/ESWSalesCentralTFN1767797265631",
             {
-                scrt2URL: 'https://safelite2--sys.sandbox.my.salesforce-scrt.com'
+                scrt2URL: "https://safelite2--sys.sandbox.my.salesforce-scrt.com",
             }
         );
     } catch (err) {

From e45d00075d5e21840b87c6e0ceba27ad2b216d67 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Thu, 22 Jan 2026 15:24:26 -0500
Subject: [PATCH 167/233] Fix script loading and unit tests

---
 .../salesforce-webchat.spec.js                | 11 +++++++++-
 .../salesforce-webchat/salesforce-webchat.vue |  3 +--
 .../sierra-webchat/sierra-webchat.spec.js     | 21 -------------------
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js b/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js
index b44cd7074..54df5d428 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js
@@ -6,6 +6,15 @@ import * as prodHelper from "./salesforce-helper-prod";
 import { applicationConfig } from "../../constants/application-config";
 
 describe("salesforceWebchat.vue", () => {
+    beforeEach(() => {
+        window.embeddedservice_bootstrap = {
+            settings: {},
+        };
+    });
+
+    afterEach(() => {
+        delete window.embeddedservice_bootstrap;
+    });
     it("renders correctly", () => {
         const wrapper = shallowMount(salesforceWebchat);
         expect(wrapper.exists()).toBe(true);
@@ -14,7 +23,7 @@ describe("salesforceWebchat.vue", () => {
     it("has the correct default data", () => {
         const wrapper = shallowMount(salesforceWebchat);
         expect(wrapper.vm.$data).toEqual({
-            isAgentAvailable: false,
+            isWebchatLoaded: false,
             isWebchatOpen: false,
         });
     });
diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index 1dab19035..21734b642 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -33,8 +33,7 @@ export default {
     mounted() {
         // Load in script from salesforce CDN
         const script = document.createElement("script");
-        script.src =
-            "https://safelite2--dev.sandbox.my.site.com/ESWSalesCentralTFN1755660094477/assets/js/bootstrap.min.js";
+        script.src = this.webChatScriptSrc;
         script.onload = this.initializeSalesforceWebchat;
         document.body.appendChild(script);
     },
diff --git a/src/digital-components/sierra-webchat/sierra-webchat.spec.js b/src/digital-components/sierra-webchat/sierra-webchat.spec.js
index e4d819ffb..964a4f52e 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.spec.js
+++ b/src/digital-components/sierra-webchat/sierra-webchat.spec.js
@@ -77,25 +77,4 @@ describe("sierraWebchat.vue", () => {
             expect.objectContaining({ type: "sierra-chat-transfer" })
         );
     });
-
-    it("handles sierra-chat-transfer event and starts Salesforce chat with prepopulated fields", () => {
-        const transfer = {
-            data: {
-                first_name: "A",
-                last_name: "B",
-                email: "a@b.com",
-                chat_summary: "summary",
-            },
-        };
-        const event = new CustomEvent("sierra-chat-transfer", { detail: transfer });
-        window.dispatchEvent(event);
-        expect(window.sierraChat.closeChatModal).toHaveBeenCalled();
-        expect(window.embedded_svc.settings.prepopulatedPrechatFields).toEqual({
-            FirstName: "A",
-            LastName: "B",
-            Email: "a@b.com",
-            Subject: "summary",
-        });
-        expect(window.embedded_svc.liveAgentAPI.startChat).toHaveBeenCalled();
-    });
 });

From 9cc683dc735d8da0c81024d1a9d566dbcc764ed6 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Thu, 22 Jan 2026 15:43:58 -0500
Subject: [PATCH 168/233] Remove redundant button hiding code

---
 .../salesforce-webchat/salesforce-webchat.vue |  2 +-
 .../funnel-header/funnel-header.vue           | 27 -------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index 21734b642..906512be1 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -57,7 +57,7 @@ export default {
                     break;
                 case "QA":
                 case "SysTest":
-                    initializeSalesforceWebchatForQa(
+                    initializeSalesforceWebchatForSys(
                         this.modifyEmbeddedSvcCallback,
                         this.finishedLoadingCallback,
                         this.onWebchatOpenCallback,
diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
index b2183fa95..e651c405a 100644
--- a/src/fmg-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -59,7 +59,6 @@ export default {
         return {
             globalAlertMessages: [],
             sierraChatOpen: false,
-            salesforceChatOpen: false,
             isSalesforceTransferInProgress: false,
             isScrolled: false,
         };
@@ -84,10 +83,6 @@ export default {
             if (this.sierraChatOpen) {
                 return false;
             }
-            // Hide the chat icon if Salesforce chat is open or transfer is in progress
-            if (this.salesforceChatOpen || this.isSalesforceTransferInProgress) {
-                return false;
-            }
             // Show if either Sierra is enabled or Salesforce button is available and not hidden by page
             return (
                 (this.webchatGlobalNonpersistedState.shouldLaunchSierra ||
@@ -173,29 +168,12 @@ export default {
         };
         window.addEventListener("sierra-chat-visibility", this._handleSierraChatVisibility);
 
-        // Listen for Salesforce chat open/close events from salesforce-webchat
-        this._handleSalesforceChatVisibility = (event) => {
-            this.salesforceChatOpen = !!(event.detail && event.detail.open === true);
-        };
-        window.addEventListener("salesforce-chat-visibility", this._handleSalesforceChatVisibility);
-
         // Listen for transfer event to set transfer-in-progress flag
         this._handleSierraToSalesforceTransfer = () => {
             this.isSalesforceTransferInProgress = true;
         };
         window.addEventListener("sierra-chat-transfer", this._handleSierraToSalesforceTransfer);
 
-        // Reset transfer flag when Salesforce chat opens
-        this._handleSalesforceChatOpened = (event) => {
-            if (event.detail && event.detail.open === true) {
-                this.isSalesforceTransferInProgress = false;
-                this.salesforceChatOpen = true;
-            } else {
-                this.salesforceChatOpen = false;
-            }
-        };
-        window.addEventListener("salesforce-chat-visibility", this._handleSalesforceChatOpened);
-
         // Add scroll listener for header shadow effect
         this._handleScroll = () => {
             this.isScrolled = window.scrollY > 0;
@@ -205,12 +183,7 @@ export default {
     beforeUnmount() {
         window.removeEventListener("sierra-chat-closed", this._handleSierraChatClosed);
         window.removeEventListener("sierra-chat-visibility", this._handleSierraChatVisibility);
-        window.removeEventListener(
-            "salesforce-chat-visibility",
-            this._handleSalesforceChatVisibility
-        );
         window.removeEventListener("sierra-chat-transfer", this._handleSierraToSalesforceTransfer);
-        window.removeEventListener("salesforce-chat-visibility", this._handleSalesforceChatOpened);
         window.removeEventListener("scroll", this._handleScroll);
     },
 };

From 472d17557fc2b8f1faff1051d7292d8d8e60d607 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Thu, 22 Jan 2026 15:51:30 -0500
Subject: [PATCH 169/233] Unit test

---
 .../salesforce-webchat/salesforce-webchat.spec.js               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js b/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js
index 54df5d428..8684de3ec 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js
@@ -42,7 +42,7 @@ describe("salesforceWebchat.vue", () => {
 
         applicationConfig.CURRENT_ENVIRONMENT = "QA";
         wrapper = shallowMount(salesforceWebchat);
-        const mockQa = jest.spyOn(qaHelper, "initializeSalesforceWebchatForQa");
+        const mockQa = jest.spyOn(qaHelper, "initializeSalesforceWebchatForSys");
         wrapper.vm.initializeSalesforceWebchat();
         expect(mockQa).toHaveBeenCalled();
 

From a48c018e90a5eb618532a9515174463b3f654841 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Thu, 22 Jan 2026 15:53:53 -0500
Subject: [PATCH 170/233] Minor fix

---
 src/digital-components/sierra-webchat/sierra-webchat.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index 920a66052..5eebcf059 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -156,8 +156,8 @@ export default {
                         Email: transfer.data.email,
                     });
                     if (
-                        window.embeddedservice_bootstrap.liveAgentAPI &&
-                        typeof window.embeddedservice_bootstrap.liveAgentAPI.startChat ===
+                        window.embeddedservice_bootstrap.utilAPI &&
+                        typeof window.embeddedservice_bootstrap.utilAPI.launchChat ===
                             "function"
                     ) {
                         window.embeddedservice_bootstrap.utilAPI.launchChat();

From fdaae873ef2855eac4e1e84bd10af9c23f8b4b10 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Fri, 23 Jan 2026 08:50:37 -0500
Subject: [PATCH 171/233] Formatting and unit test fixes

---
 .../salesforce-webchat/salesforce-webchat.spec.js             | 4 ++--
 .../salesforce-webchat/salesforce-webchat.vue                 | 1 +
 src/digital-components/sierra-webchat/sierra-webchat.vue      | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js b/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js
index 8684de3ec..22e3a11d1 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js
@@ -1,7 +1,7 @@
 import { shallowMount } from "@vue/test-utils";
 import salesforceWebchat from "./salesforce-webchat.vue";
 import * as devHelper from "./salesforce-helper-dev";
-import * as qaHelper from "./salesforce-helper-qa";
+import * as sysHelper from "./salesforce-helper-sys";
 import * as prodHelper from "./salesforce-helper-prod";
 import { applicationConfig } from "../../constants/application-config";
 
@@ -42,7 +42,7 @@ describe("salesforceWebchat.vue", () => {
 
         applicationConfig.CURRENT_ENVIRONMENT = "QA";
         wrapper = shallowMount(salesforceWebchat);
-        const mockQa = jest.spyOn(qaHelper, "initializeSalesforceWebchatForSys");
+        const mockQa = jest.spyOn(sysHelper, "initializeSalesforceWebchatForSys");
         wrapper.vm.initializeSalesforceWebchat();
         expect(mockQa).toHaveBeenCalled();
 
diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index 906512be1..6bc95c743 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -6,6 +6,7 @@
 // Supporting files
 import { initializeSalesforceWebchatForDev } from "./salesforce-helper-dev";
 import { initializeSalesforceWebchatForQa } from "./salesforce-helper-qa";
+import { initializeSalesforceWebchatForSys } from "./salesforce-helper-sys";
 import { initializeSalesforceWebchatForProd } from "./salesforce-helper-prod";
 import { applicationConfig } from "@/constants/application-config";
 import { webchatHelper } from "@/helpers/webchat-helper";
diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index 5eebcf059..162367a62 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -157,8 +157,7 @@ export default {
                     });
                     if (
                         window.embeddedservice_bootstrap.utilAPI &&
-                        typeof window.embeddedservice_bootstrap.utilAPI.launchChat ===
-                            "function"
+                        typeof window.embeddedservice_bootstrap.utilAPI.launchChat === "function"
                     ) {
                         window.embeddedservice_bootstrap.utilAPI.launchChat();
                         return;

From 958761435360c55df05f81619ae0f2eb65e113f2 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Fri, 23 Jan 2026 10:11:52 -0500
Subject: [PATCH 172/233] Remove unused flag and listener

---
 src/fmg-components/funnel-header/funnel-header.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
index e651c405a..00df5db87 100644
--- a/src/fmg-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -162,18 +162,9 @@ export default {
         // Listen for Sierra chat open/close events from sierra-webchat
         this._handleSierraChatVisibility = (event) => {
             this.sierraChatOpen = !!(event.detail && event.detail.open);
-            if (this.sierraChatOpen) {
-                this.isSalesforceTransferInProgress = false;
-            }
         };
         window.addEventListener("sierra-chat-visibility", this._handleSierraChatVisibility);
 
-        // Listen for transfer event to set transfer-in-progress flag
-        this._handleSierraToSalesforceTransfer = () => {
-            this.isSalesforceTransferInProgress = true;
-        };
-        window.addEventListener("sierra-chat-transfer", this._handleSierraToSalesforceTransfer);
-
         // Add scroll listener for header shadow effect
         this._handleScroll = () => {
             this.isScrolled = window.scrollY > 0;

From b4f1b6a55713ff4577386bcfb674084eacda757e Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Fri, 23 Jan 2026 10:35:05 -0500
Subject: [PATCH 173/233] Add prod and modify comments

Comments now accurately guide how to update code when salesforce sends new stuff
---
 .../salesforce-helper-dev.js                  |  26 ++---
 .../salesforce-helper-prod.js                 |  97 +++++------------
 .../salesforce-helper-qa.js                   | 102 +++++-------------
 .../salesforce-helper-sys.js                  |  25 ++---
 .../salesforce-webchat/salesforce-webchat.vue |   5 +-
 5 files changed, 71 insertions(+), 184 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-dev.js b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
index bc1b75dd3..f3a50965e 100644
--- a/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-dev.js
@@ -1,4 +1,9 @@
 /* eslint-disable */
+// ***************************************************************
+// This file wraps the Salesforce generated code.
+// See the comment below for where you need to paste in the Salesforce generated code.
+// You may also need to modify the script tag src located in salesforce-webchat.vue to point to the correct Salesforce instance.
+// ***************************************************************
 
 function setupCustomSettings(
     modifyEmbeddedSvcCallback,
@@ -12,23 +17,6 @@ function setupCustomSettings(
     window.addEventListener("onEmbeddedMessagingWindowClosed", onWebchatCloseCallback);
 }
 
-/*
-The code below is generated from salesforce but modified in the following ways:
-  * Only the javascript inside the second <script> tag in the provided salesforce code is copy pasted
-  * CSS is not copied in
-  * First <script> tag loading in the file from the CDN is not copied in
-  * Copy the entire contents of the second <script> tag inside the initializeSalesforceWebchatForDev
-      method and add a call to setupCustomSettings before the 'embedded_svc.init()' method is called
-      
-      Actual call to paste in:
-      setupCustomSettings(
-            modifyEmbeddedSvcCallback,
-            finishedLoadingCallback,
-            onWebchatOpenCallback,
-            onWebchatCloseCallback
-        );
-*/
-
 export function initializeSalesforceWebchatForDev(
     modifyEmbeddedSvcCallback,
     finishedLoadingCallback,
@@ -41,7 +29,8 @@ export function initializeSalesforceWebchatForDev(
         onWebchatOpenCallback,
         onWebchatCloseCallback
     );
-
+    // START OF SALESFORCE GENERATED CODE
+    // Copy in the contents of the first <script> tag inside the initEmbeddedMessaging() method
     try {
         embeddedservice_bootstrap.settings.language = "en_US"; // For example, enter 'en' or 'en-US'
 
@@ -56,4 +45,5 @@ export function initializeSalesforceWebchatForDev(
     } catch (err) {
         console.error("Error loading Embedded Messaging: ", err);
     }
+    // END OF SALESFORCE GENERATED CODE
 }
diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-prod.js b/src/digital-components/salesforce-webchat/salesforce-helper-prod.js
index 9df50ee19..3bff146aa 100644
--- a/src/digital-components/salesforce-webchat/salesforce-helper-prod.js
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-prod.js
@@ -1,4 +1,9 @@
 /* eslint-disable */
+// ***************************************************************
+// This file wraps the Salesforce generated code.
+// See the comment below for where you need to paste in the Salesforce generated code.
+// You may also need to modify the script tag src located in salesforce-webchat.vue to point to the correct Salesforce instance.
+// ***************************************************************
 
 function setupCustomSettings(
     modifyEmbeddedSvcCallback,
@@ -7,91 +12,39 @@ function setupCustomSettings(
     onWebchatCloseCallback
 ) {
     modifyEmbeddedSvcCallback();
-    embedded_svc.addEventHandler("onSettingsCallCompleted", finishedLoadingCallback);
-    embedded_svc.addEventHandler("afterMaximize", onWebchatOpenCallback);
-    embedded_svc.addEventHandler("afterDestroy", onWebchatCloseCallback);
+    window.addEventListener("onEmbeddedMessagingButtonCreated", finishedLoadingCallback);
+    window.addEventListener("onEmbeddedMessagingWindowMaximized", onWebchatOpenCallback);
+    window.addEventListener("onEmbeddedMessagingWindowClosed", onWebchatCloseCallback);
 }
 
-/*
-The code below is generated from salesforce but modified in the following ways:
-  * Only the javascript inside the second <script> tag in the provided salesforce code is copy pasted
-  * CSS is not copied in
-  * First <script> tag loading in the file from the CDN is not copied in
-  * Copy the entire contents of the second <script> tag inside the initializeSalesforceWebchatForDev
-      method and add a call to setupCustomSettings before the 'embedded_svc.init()' method is called
-      
-      Actual call to paste in:
-      setupCustomSettings(
-            modifyEmbeddedSvcCallback,
-            finishedLoadingCallback,
-            onWebchatOpenCallback,
-            onWebchatCloseCallback
-        );
-*/
-
 export function initializeSalesforceWebchatForProd(
     modifyEmbeddedSvcCallback,
     finishedLoadingCallback,
     onWebchatOpenCallback,
     onWebchatCloseCallback
 ) {
-    var initESW = function (gslbBaseURL) {
-        let embedded_svc = window.embedded_svc;
-        embedded_svc.settings.displayHelpButton = true; //Or false
-        embedded_svc.settings.language = ""; //For example, enter 'en' or 'en-US'
+    setupCustomSettings(
+        modifyEmbeddedSvcCallback,
+        finishedLoadingCallback,
+        onWebchatOpenCallback,
+        onWebchatCloseCallback
+    );
 
-        //embedded_svc.settings.defaultMinimizedText = '...'; //(Defaults to Chat with an Expert)
-        //embedded_svc.settings.disabledMinimizedText = '...'; //(Defaults to Agent Offline)
+    // START OF SALESFORCE GENERATED CODE
+    // Copy in the contents of the first <script> tag inside the initEmbeddedMessaging() method
+    try {
+        embeddedservice_bootstrap.settings.language = "en_US"; // For example, enter 'en' or 'en-US'
 
-        //embedded_svc.settings.loadingText = ''; //(Defaults to Loading)
-        //embedded_svc.settings.storageDomain = 'yourdomain.com'; //(Sets the domain for your deployment so that visitors can navigate subdomains during a chat session)
-
-        // Settings for Chat
-        //embedded_svc.settings.directToButtonRouting = function(prechatFormData) {
-        // Dynamically changes the button ID based on what the visitor enters in the pre-chat form.
-        // Returns a valid button ID.
-        //};
-        //embedded_svc.settings.prepopulatedPrechatFields = {}; //Sets the auto-population of pre-chat form fields
-        //embedded_svc.settings.fallbackRouting = []; //An array of button IDs, user IDs, or userId_buttonId
-        //embedded_svc.settings.offlineSupportMinimizedText = '...'; //(Defaults to Contact Us)
-
-        embedded_svc.settings.enabledFeatures = ["LiveAgent"];
-        embedded_svc.settings.entryFeature = "LiveAgent";
-
-        setupCustomSettings(
-            modifyEmbeddedSvcCallback,
-            finishedLoadingCallback,
-            onWebchatOpenCallback,
-            onWebchatCloseCallback
-        );
-
-        embedded_svc.init(
-            "https://safelite2.my.salesforce.com",
-            "https://safelite2.my.salesforce-sites.com/chat",
-            gslbBaseURL,
+        embeddedservice_bootstrap.init(
             "00D3t000004nvsT",
-            "Sales_Central_Snap_in",
+            "Sales_Central_TFN",
+            "https://safelite2.my.site.com/ESWSalesCentralTFN1769108630294",
             {
-                baseLiveAgentContentURL:
-                    "https://c.la13-core2.sfdc-lywfpd.salesforceliveagent.com/content",
-                deploymentId: "5723t0000008wWB",
-                buttonId: "5733t000000D90z",
-                baseLiveAgentURL: "https://d.la13-core2.sfdc-lywfpd.salesforceliveagent.com/chat",
-                eswLiveAgentDevName:
-                    "EmbeddedServiceLiveAgent_Parent04I3t000000Cq0SEAS_188de1871ea",
-                isOfflineSupportEnabled: false,
+                scrt2URL: "https://safelite2.my.salesforce-scrt.com",
             }
         );
-    };
-
-    if (!window.embedded_svc) {
-        var s = document.createElement("script");
-        s.setAttribute("src", "https://safelite2.my.salesforce.com/embeddedservice/5.0/esw.min.js");
-        s.onload = function () {
-            initESW(null);
-        };
-        document.body.appendChild(s);
-    } else {
-        initESW("https://service.force.com");
+    } catch (err) {
+        console.error("Error loading Embedded Messaging: ", err);
     }
+    // END OF SALESFORCE GENERATED CODE
 }
diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-qa.js b/src/digital-components/salesforce-webchat/salesforce-helper-qa.js
index 9801d3c74..cec4da31c 100644
--- a/src/digital-components/salesforce-webchat/salesforce-helper-qa.js
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-qa.js
@@ -1,4 +1,9 @@
 /* eslint-disable */
+// ***************************************************************
+// This file wraps the Salesforce generated code.
+// See the comment below for where you need to paste in the Salesforce generated code.
+// You may also need to modify the script tag src located in salesforce-webchat.vue to point to the correct Salesforce instance.
+// ***************************************************************
 
 function setupCustomSettings(
     modifyEmbeddedSvcCallback,
@@ -7,93 +12,38 @@ function setupCustomSettings(
     onWebchatCloseCallback
 ) {
     modifyEmbeddedSvcCallback();
-    embedded_svc.addEventHandler("onSettingsCallCompleted", finishedLoadingCallback);
-    embedded_svc.addEventHandler("afterMaximize", onWebchatOpenCallback);
-    embedded_svc.addEventHandler("afterDestroy", onWebchatCloseCallback);
+    window.addEventListener("onEmbeddedMessagingButtonCreated", finishedLoadingCallback);
+    window.addEventListener("onEmbeddedMessagingWindowMaximized", onWebchatOpenCallback);
+    window.addEventListener("onEmbeddedMessagingWindowClosed", onWebchatCloseCallback);
 }
 
-/*
-The code below is generated from salesforce but modified in the following ways:
-  * Only the javascript inside the second <script> tag in the provided salesforce code is copy pasted
-  * CSS is not copied in
-  * First <script> tag loading in the file from the CDN is not copied in
-  * Copy the entire contents of the second <script> tag inside the initializeSalesforceWebchatForQa
-      method and add a call to setupCustomSettings before the 'embedded_svc.init()' method is called
-      
-      Actual call to paste in:
-      setupCustomSettings(
-            modifyEmbeddedSvcCallback,
-            finishedLoadingCallback,
-            onWebchatOpenCallback,
-            onWebchatCloseCallback
-        );
-*/
-
 export function initializeSalesforceWebchatForQa(
     modifyEmbeddedSvcCallback,
     finishedLoadingCallback,
     onWebchatOpenCallback,
     onWebchatCloseCallback
 ) {
-    var initESW = function (gslbBaseURL) {
-        embedded_svc.settings.displayHelpButton = true; //Or false
-        embedded_svc.settings.language = ""; //For example, enter 'en' or 'en-US'
+    setupCustomSettings(
+        modifyEmbeddedSvcCallback,
+        finishedLoadingCallback,
+        onWebchatOpenCallback,
+        onWebchatCloseCallback
+    );
+    // START OF SALESFORCE GENERATED CODE
+    // Copy in the contents of the first <script> tag inside the initEmbeddedMessaging() method
+    try {
+        embeddedservice_bootstrap.settings.language = "en_US"; // For example, enter 'en' or 'en-US'
 
-        //embedded_svc.settings.defaultMinimizedText = '...'; //(Defaults to Chat with an Expert)
-        //embedded_svc.settings.disabledMinimizedText = '...'; //(Defaults to Agent Offline)
-
-        //embedded_svc.settings.loadingText = ''; //(Defaults to Loading)
-        //embedded_svc.settings.storageDomain = 'yourdomain.com'; //(Sets the domain for your deployment so that visitors can navigate subdomains during a chat session)
-
-        // Settings for Chat
-        //embedded_svc.settings.directToButtonRouting = function(prechatFormData) {
-        // Dynamically changes the button ID based on what the visitor enters in the pre-chat form.
-        // Returns a valid button ID.
-        //};
-        //embedded_svc.settings.prepopulatedPrechatFields = {}; //Sets the auto-population of pre-chat form fields
-        //embedded_svc.settings.fallbackRouting = []; //An array of button IDs, user IDs, or userId_buttonId
-        //embedded_svc.settings.offlineSupportMinimizedText = '...'; //(Defaults to Contact Us)
-
-        embedded_svc.settings.enabledFeatures = ["LiveAgent"];
-        embedded_svc.settings.entryFeature = "LiveAgent";
-
-        setupCustomSettings(
-            modifyEmbeddedSvcCallback,
-            finishedLoadingCallback,
-            onWebchatOpenCallback,
-            onWebchatCloseCallback
-        );
-
-        embedded_svc.init(
-            "https://safelite2--safeliteua.sandbox.my.salesforce.com",
-            "https://safelite2--safeliteua.sandbox.my.salesforce-sites.com/chat",
-            gslbBaseURL,
-            "00DDJ000000HRqO",
-            "Sales_Central_Snap_in",
+        embeddedservice_bootstrap.init(
+            "00DTI000005x7c7",
+            "Sales_Central_TFN",
+            "https://safelite2--qa.sandbox.my.site.com/ESWSalesCentralTFN1768832680884",
             {
-                baseLiveAgentContentURL:
-                    "https://c.la12s-core1.sfdc-8tgtt5.salesforceliveagent.com/content",
-                deploymentId: "572DJ00000001j3",
-                buttonId: "573DJ00000001ur",
-                baseLiveAgentURL: "https://d.la12s-core1.sfdc-8tgtt5.salesforceliveagent.com/chat",
-                eswLiveAgentDevName:
-                    "EmbeddedServiceLiveAgent_Parent04IDJ0000008OZk2AM_1883057c9a6",
-                isOfflineSupportEnabled: false,
+                scrt2URL: "https://safelite2--qa.sandbox.my.salesforce-scrt.com",
             }
         );
-    };
-
-    if (!window.embedded_svc) {
-        var s = document.createElement("script");
-        s.setAttribute(
-            "src",
-            "https://safelite2--safeliteua.sandbox.my.salesforce.com/embeddedservice/5.0/esw.min.js"
-        );
-        s.onload = function () {
-            initESW(null);
-        };
-        document.body.appendChild(s);
-    } else {
-        initESW("https://service.force.com");
+    } catch (err) {
+        console.error("Error loading Embedded Messaging: ", err);
     }
+    // END OF SALESFORCE GENERATED CODE
 }
diff --git a/src/digital-components/salesforce-webchat/salesforce-helper-sys.js b/src/digital-components/salesforce-webchat/salesforce-helper-sys.js
index d946674d0..f51d2ca18 100644
--- a/src/digital-components/salesforce-webchat/salesforce-helper-sys.js
+++ b/src/digital-components/salesforce-webchat/salesforce-helper-sys.js
@@ -1,4 +1,9 @@
 /* eslint-disable */
+// ***************************************************************
+// This file wraps the Salesforce generated code.
+// See the comment below for where you need to paste in the Salesforce generated code.
+// You may also need to modify the script tag src located in salesforce-webchat.vue to point to the correct Salesforce instance.
+// ***************************************************************
 
 function setupCustomSettings(
     modifyEmbeddedSvcCallback,
@@ -12,23 +17,6 @@ function setupCustomSettings(
     window.addEventListener("onEmbeddedMessagingWindowClosed", onWebchatCloseCallback);
 }
 
-/*
-The code below is generated from salesforce but modified in the following ways:
-  * Only the javascript inside the second <script> tag in the provided salesforce code is copy pasted
-  * CSS is not copied in
-  * First <script> tag loading in the file from the CDN is not copied in
-  * Copy the entire contents of the second <script> tag inside the initializeSalesforceWebchatForSys
-      method and add a call to setupCustomSettings before the 'embedded_svc.init()' method is called
-      
-      Actual call to paste in:
-      setupCustomSettings(
-            modifyEmbeddedSvcCallback,
-            finishedLoadingCallback,
-            onWebchatOpenCallback,
-            onWebchatCloseCallback
-        );
-*/
-
 export function initializeSalesforceWebchatForSys(
     modifyEmbeddedSvcCallback,
     finishedLoadingCallback,
@@ -42,6 +30,8 @@ export function initializeSalesforceWebchatForSys(
         onWebchatCloseCallback
     );
 
+    // START OF SALESFORCE GENERATED CODE
+    // Copy in the contents of the first <script> tag inside the initEmbeddedMessaging() method
     try {
         embeddedservice_bootstrap.settings.language = "en_US"; // For example, enter 'en' or 'en-US'
 
@@ -56,4 +46,5 @@ export function initializeSalesforceWebchatForSys(
     } catch (err) {
         console.error("Error loading Embedded Messaging: ", err);
     }
+    // END OF SALESFORCE GENERATED CODE
 }
diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index 6bc95c743..560f6dd1e 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -105,14 +105,17 @@ export default {
     },
     computed: {
         webChatScriptSrc() {
+            // These URLs are from the src tag on the script tag in the Salesforce generated code.
             switch (applicationConfig.CURRENT_ENVIRONMENT) {
                 case "Prod":
-                    return "https://safelite2.my.salesforce.com/embeddedservice/5.0/esw.min.js";
+                    return "https://safelite2.my.site.com/ESWSalesCentralTFN1769108630294/assets/js/bootstrap.min.js";
                 case "QA":
+                    return "https://safelite2--qa.sandbox.my.site.com/ESWSalesCentralTFN1768832680884/assets/js/bootstrap.min.js";
                 case "SysTest":
                     return "https://safelite2--sys.sandbox.my.site.com/ESWSalesCentralTFN1767797265631/assets/js/bootstrap.min.js";
                 case "Dev":
                 case "Localhost":
+                default:
                     return "https://safelite2--dev.sandbox.my.site.com/ESWSalesCentralTFN1755660094477/assets/js/bootstrap.min.js";
             }
         },

From 9e53ab9c227f45b6ad300e667e2af180e994522b Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Fri, 23 Jan 2026 10:49:01 -0500
Subject: [PATCH 174/233] Make sure to utilize QA

---
 .../salesforce-webchat/salesforce-webchat.vue             | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index 560f6dd1e..da11702e3 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -57,6 +57,13 @@ export default {
                     );
                     break;
                 case "QA":
+                    initializeSalesforceWebchatForQa(
+                        this.modifyEmbeddedSvcCallback,
+                        this.finishedLoadingCallback,
+                        this.onWebchatOpenCallback,
+                        this.onWebchatCloseCallback
+                    );
+                    break;
                 case "SysTest":
                     initializeSalesforceWebchatForSys(
                         this.modifyEmbeddedSvcCallback,
@@ -67,6 +74,7 @@ export default {
                     break;
                 case "Dev":
                 case "Localhost":
+                default:
                     initializeSalesforceWebchatForDev(
                         this.modifyEmbeddedSvcCallback,
                         this.finishedLoadingCallback,

From a96d45c4a5f1ef7cd5bfee3d040734fd0bf45c70 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Fri, 23 Jan 2026 11:05:27 -0500
Subject: [PATCH 175/233] Unit tests

---
 .../salesforce-webchat/salesforce-webchat.spec.js        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js b/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js
index 22e3a11d1..97894cbda 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.spec.js
@@ -1,6 +1,7 @@
 import { shallowMount } from "@vue/test-utils";
 import salesforceWebchat from "./salesforce-webchat.vue";
 import * as devHelper from "./salesforce-helper-dev";
+import * as qaHelper from "./salesforce-helper-qa";
 import * as sysHelper from "./salesforce-helper-sys";
 import * as prodHelper from "./salesforce-helper-prod";
 import { applicationConfig } from "../../constants/application-config";
@@ -42,10 +43,16 @@ describe("salesforceWebchat.vue", () => {
 
         applicationConfig.CURRENT_ENVIRONMENT = "QA";
         wrapper = shallowMount(salesforceWebchat);
-        const mockQa = jest.spyOn(sysHelper, "initializeSalesforceWebchatForSys");
+        const mockQa = jest.spyOn(qaHelper, "initializeSalesforceWebchatForQa");
         wrapper.vm.initializeSalesforceWebchat();
         expect(mockQa).toHaveBeenCalled();
 
+        applicationConfig.CURRENT_ENVIRONMENT = "SysTest";
+        wrapper = shallowMount(salesforceWebchat);
+        const mockSys = jest.spyOn(sysHelper, "initializeSalesforceWebchatForSys");
+        wrapper.vm.initializeSalesforceWebchat();
+        expect(mockSys).toHaveBeenCalled();
+
         applicationConfig.CURRENT_ENVIRONMENT = "Dev";
         wrapper = shallowMount(salesforceWebchat);
         const mockDev = jest.spyOn(devHelper, "initializeSalesforceWebchatForDev");

From 190876e610d612619e013034fc283f37a419c556 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 22 Jan 2026 17:02:04 -0500
Subject: [PATCH 176/233] CASH-2096 redo previously lost changes from 1790

---
 .../date-picker/date-picker.vue               |   2 +-
 src/layouts/schedule/schedule.vue             | 115 ++++++++----------
 .../time-slot-question/time-slot-question.vue |   9 +-
 .../appointment-type-question.vue             |   1 +
 4 files changed, 55 insertions(+), 72 deletions(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index f48b1f43b..a4eb232e0 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -281,7 +281,7 @@ export default {
             if (event.screenX === 0 && event.screenY === 0) {
                 return;
             }
-            this.$emit("date-clicked", date);
+            this.$emit("date-selected", date);
         },
         getWeekStartDate(dateString) {
             const date = convertDateStringToDate(dateString);
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index f7c1ead18..d0fae236a 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -28,6 +28,7 @@
                         cmsWidgetName="ScheduleYourServiceWidget"
                         id="schedule-your-service" />
                     <appointmentTypeQuestion
+                        v-if="hasSelectableDatesLoaded"
                         v-model="appointmentTypeFromAppointmentTypeQuestion"
                         v-show="isAppointmentTypeDisplayed"
                         :isServiceableMobile="isServiceableMobile"
@@ -139,8 +140,6 @@
                             :isOvernightDropoff="isOvernightDropoff" />
                     </div>
                     <datePicker
-                        :currentZip="zipCode"
-                        :currentProviderNumber="selectedProvider?.providerNumber"
                         v-show="appointmentType"
                         customComponentId="dateQuestion"
                         selectableDatesSetting="custom"
@@ -150,7 +149,7 @@
                         class="text-link-small"
                         :getMoreDatesCallback="getMoreScheduleData"
                         validationRules="date-required"
-                        @date-clicked="handleDateClicked"
+                        @date-selected="handleDateSelected"
                         :pricingByDayBasePrice="pricingByDayBasePrice"
                         :pricingByDayUpcharge="pricingByDayUpcharge"
                         :showPricingByDay="showPricingByDay"
@@ -653,12 +652,12 @@ export default {
         showTimeSlotQuestion() {
             if (
                 this.selectedDate &&
-                this.selectedDate.includes("mobile") &&
-                !this.isMobileSelected
+                this.appointmentTypeFromAppointmentTypeQuestion &&
+                this.timeSlotsForSelectedDate
             ) {
-                this.setSelectedDateToFirstAvailable();
+                return true;
             }
-            return this.selectedDate && this.appointmentTypeFromAppointmentTypeQuestion;
+            return false;
         },
         isMobileStaticRecalibrationApplicable() {
             return (
@@ -886,6 +885,13 @@ export default {
                 ? this.$refs.mobileFirstModal?.getIsModalOpen()
                 : false;
         },
+        hasSelectableDatesLoaded() {
+            if (this.isMobileSelected) {
+                return this.selectableDatesMobile?.days?.length > 0;
+            } else {
+                return this.selectableDatesInshop?.days?.length > 0;
+            }
+        },
     },
     methods: {
         splitCopyOnCMSPlaceHolder,
@@ -1200,8 +1206,6 @@ export default {
         async initializeDatePicker() {
             this.isShowMobileFirstAppt && this.showLoadingModal();
 
-            this.selectedDate = null;
-
             const includeMobileTimeSlots = this.isServiceableMobile;
             const includeInshopTimeSlots = this.isServiceableInshop || this.isServiceableDropoff;
             const datePickerInitialData = await this.$refs.datePicker.loadInitialData({
@@ -1613,28 +1617,39 @@ export default {
         handleWaitListRequested(value) {
             this.waitListRequested = value;
         },
-        handleDateClicked(date) {
-            // do something to mark this as upcharge day or not...
-            if (date.isPricingByDayUpchargeDay) {
-                this.includePricingByDayUpcharge = true;
-            } else {
-                this.includePricingByDayUpcharge = false;
+        handleDateSelected(date) {
+            const previousDate = this.selectedDate;
+            // check if date actually changed
+            if (previousDate !== date.dateString) {
+                this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
+                this.updateFooterButtonText(this.selectedTimeSlotInfo);
             }
+            
+            // TODO: REMOVE AS PART OF CASH-1634
+            // // do something to mark this as upcharge day or not...
+            // if (date.isPricingByDayUpchargeDay) {
+            //     this.includePricingByDayUpcharge = true;
+            // } else {
+            //     this.includePricingByDayUpcharge = false;
+            // }
         },
-        updateTimeSlot(timeSlotObj) {
+        getEmptyTimeSlot() {
+            return {
+                timeSlot: {
+                    date: null,
+                    routeCode: null,
+                    startTime: null,
+                    endTime: null,
+                    jobMaxMinutes: null,
+                    jobMinMinutes: null,
+                },
+                isPremiumAppointment: null,
+            };
+        },
+        updateTimeSlot(timeSlotObj) {  debugger; // eslint-disable-line no-debugger
             if (!timeSlotObj?.routeCode) {
                 this.appointmentType = AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF;
-                this.selectedTimeSlotInfo = {
-                    timeSlot: {
-                        date: null,
-                        routeCode: null,
-                        startTime: null,
-                        endTime: null,
-                        jobMaxMinutes: null,
-                        jobMinMinutes: null,
-                    },
-                    isPremiumAppointment: null,
-                };
+                this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
                 return;
             }
             const timeSlot = this.timeSlotsForSelectedDate?.timeSlots?.find(
@@ -1752,6 +1767,9 @@ export default {
         },
         handleAppointmentTypeChange(newAppointmentType) {
             this.updateFooterButtonText();
+            // if time appointment type changes, clear any selected time slot
+            this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
+
             if (newAppointmentType === AppointmentTypeStrings.MOBILE) {
                 // Remember last shop selected if previous selection was inshop/dropoff
                 if (
@@ -1760,17 +1778,6 @@ export default {
                         AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF) &&
                     this.selectedProvider
                 ) {
-                    this.selectedTimeSlotInfo = {
-                        timeSlot: {
-                            date: null,
-                            routeCode: null,
-                            startTime: null,
-                            endTime: null,
-                            jobMaxMinutes: null,
-                            jobMinMinutes: null,
-                        },
-                        isPremiumAppointment: null,
-                    };
                     this.lastSelectedInshopOrDropoffProvider = this.selectedProvider;
                 }
                 this.appointmentType = AppointmentTypeStrings.MOBILE;
@@ -1797,8 +1804,8 @@ export default {
             } else {
                 this.appointmentType = null;
             }
-            this.setSelectedDateToFirstAvailable();
-            this.setDisplayWaitList();
+            this.setSelectedDateToFirstAvailable(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
+            this.setDisplayWaitList(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
         },
         setSelectedDateToFirstAvailable() {
             this.selectedDate = this.getFirstAvailableDate();
@@ -1960,35 +1967,9 @@ export default {
     watch: {
         appointmentTypeFromAppointmentTypeQuestion: {
             handler(newValue, oldValue) {
-                this.handleAppointmentTypeChange(newValue);
+                this.handleAppointmentTypeChange(newValue); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
             },
         },
-        selectedDate(newValue, oldValue) {
-            // Clear time slot selection if date selected changes
-            const selectedDate = this.getSelectedDateFromStore();
-            if (oldValue && this.appointmentType === AppointmentTypeStrings.MOBILE) {
-                oldValue = `${oldValue}-mobile`;
-            }
-            const hasValueChanged = newValue !== oldValue;
-            const isDateDifferent = (newValue || oldValue) !== selectedDate;
-
-            if (hasValueChanged && isDateDifferent && !this.selectedMobileFirstAppointment) {
-                this.selectedTimeSlotInfo = {
-                    timeSlot: {
-                        date: null,
-                        routeCode: null,
-                        startTime: null,
-                        endTime: null,
-                        jobMaxMinutes: null,
-                        jobMinMinutes: null,
-                    },
-                    isPremiumAppointment: null,
-                };
-            }
-        },
-        selectedTimeSlotInfo(newValue) {
-            this.updateFooterButtonText(newValue);
-        },
     },
     components: {
         funnelHeader,
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 1b8a2cb2e..b4a2937b7 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="time-slots-question">
         <buttonQuestion
+            ref="chooseDropOffOrInshop"
             v-if="isDropOffAppointmentAvailable"
             v-model="selectedAnswerForDropOffOrInshop"
             @update:modelValue="dropOffSelectionChanged"
@@ -23,8 +24,9 @@
             </div>
         </buttonQuestion>
         <buttonQuestion
-            ref="buttonQuestion"
-            v-if="shouldDisplayTimeSlotQuestion"
+            ref="chooseTimeSlot"
+            v-if="displayTimeSlotQuestion"
+            v-model="selectedAnswerForTimeSlots"
             @update:modelValue="timeSlotSelectionChanged"
             buttonTypeString="timeSlotModalListButton"
             :buttonTypeObject="timeSlotModalListButton"
@@ -37,7 +39,6 @@
             :lazyLoad="{ isLazyLoad: !isMobileAppointment, amountToLoad: 10 }"
             groupName="chooseTimeSlot"
             textPosition="text-center"
-            v-model="selectedAnswerForTimeSlots"
             questionText="Available times:"
             isRequired
             validationRules="time-slot-required" />
@@ -389,7 +390,7 @@ export default {
                 this.answersForDropOffQuestion[0].value !== PICK_A_TIME_BUTTON_VALUE
             );
         },
-        shouldDisplayTimeSlotQuestion() {
+        displayTimeSlotQuestion() {
             return (
                 this.selectedAnswerForDropOffOrInshop == PICK_A_TIME_BUTTON_VALUE ||
                 !this.isDropOffAppointmentAvailable
diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
index fc4d08b92..924b2e62a 100644
--- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
+++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
@@ -80,6 +80,7 @@ export default {
             },
             set: function (newValue) {
                 this.$emit("update:modelValue", newValue);
+                this.$emit("handle-appointment-type-change", newValue);
             },
         },
         isMobileOnly() {

From 80a6fada8cf57197e4b37c7c6325ad9eb7a7f9fc Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 23 Jan 2026 16:09:37 -0500
Subject: [PATCH 177/233] CASH-1790 remove forgotten debugger

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index d0fae236a..eea3c5ce3 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1646,7 +1646,7 @@ export default {
                 isPremiumAppointment: null,
             };
         },
-        updateTimeSlot(timeSlotObj) {  debugger; // eslint-disable-line no-debugger
+        updateTimeSlot(timeSlotObj) {
             if (!timeSlotObj?.routeCode) {
                 this.appointmentType = AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF;
                 this.selectedTimeSlotInfo = this.getEmptyTimeSlot();

From c0cb75ffbf0e25edc4ae95eb025de857878d68c3 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 23 Jan 2026 16:29:48 -0500
Subject: [PATCH 178/233] CASH-1790 stupid prettier enforcing some silliness on
 a blank line...

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index eea3c5ce3..97c5ab4d2 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1624,7 +1624,7 @@ export default {
                 this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
                 this.updateFooterButtonText(this.selectedTimeSlotInfo);
             }
-            
+
             // TODO: REMOVE AS PART OF CASH-1634
             // // do something to mark this as upcharge day or not...
             // if (date.isPricingByDayUpchargeDay) {

From c7be5b6962f80beefc300e2c68d54bb4f84eb8f9 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 22 Jan 2026 17:02:04 -0500
Subject: [PATCH 179/233] CASH-2096 redo previously lost changes from 1790

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index f7c1ead18..d30fdf11c 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1620,8 +1620,29 @@ export default {
             } else {
                 this.includePricingByDayUpcharge = false;
             }
+            
+            // TODO: REMOVE AS PART OF CASH-1634
+            // // do something to mark this as upcharge day or not...
+            // if (date.isPricingByDayUpchargeDay) {
+            //     this.includePricingByDayUpcharge = true;
+            // } else {
+            //     this.includePricingByDayUpcharge = false;
+            // }
         },
-        updateTimeSlot(timeSlotObj) {
+        getEmptyTimeSlot() {
+            return {
+                timeSlot: {
+                    date: null,
+                    routeCode: null,
+                    startTime: null,
+                    endTime: null,
+                    jobMaxMinutes: null,
+                    jobMinMinutes: null,
+                },
+                isPremiumAppointment: null,
+            };
+        },
+        updateTimeSlot(timeSlotObj) {  debugger; // eslint-disable-line no-debugger
             if (!timeSlotObj?.routeCode) {
                 this.appointmentType = AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF;
                 this.selectedTimeSlotInfo = {

From 3fcb608bb23b8c58856270fdfdcac76c2506064d Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 26 Jan 2026 10:21:50 -0500
Subject: [PATCH 180/233] CASH-1790 remove forgotten debugger

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index d30fdf11c..19fb5e0fd 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1642,7 +1642,7 @@ export default {
                 isPremiumAppointment: null,
             };
         },
-        updateTimeSlot(timeSlotObj) {  debugger; // eslint-disable-line no-debugger
+        updateTimeSlot(timeSlotObj) {
             if (!timeSlotObj?.routeCode) {
                 this.appointmentType = AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF;
                 this.selectedTimeSlotInfo = {

From ba2e138ac05258535748e4f894293c797a5a244e Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 23 Jan 2026 16:29:48 -0500
Subject: [PATCH 181/233] CASH-1790 stupid prettier enforcing some silliness on
 a blank line...

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 19fb5e0fd..1d48ef701 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1620,7 +1620,7 @@ export default {
             } else {
                 this.includePricingByDayUpcharge = false;
             }
-            
+
             // TODO: REMOVE AS PART OF CASH-1634
             // // do something to mark this as upcharge day or not...
             // if (date.isPricingByDayUpchargeDay) {

From 7eed110bd29cc6d49f7a1ac54bd71e12d60f44bd Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 26 Jan 2026 10:05:14 -0500
Subject: [PATCH 182/233] CASH-1790 updates for date-picker

---
 .../date-picker/date-picker.vue               | 71 +++++++++++++------
 1 file changed, 49 insertions(+), 22 deletions(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index f48b1f43b..73d7d3d67 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -1,17 +1,18 @@
 <template>
     <div
         class="date-picker text-center"
-        :class="`${calendarViewDirection} calendar-2025 ${showPricingByDayClass}`">
+        :class="`${calendarViewDirection} calendar-2025 ${showPricingByDayClass} ${loadingStatus === 'reinitial' ? 'loading-reinitial' : ''}`">
         <fieldset id="date-picker-fieldset" ref="datePickerFieldset">
             <legend class="sr-only">Select a day and time</legend>
             <div
-                v-for="month in months"
+                v-for="(month, i) in months"
                 :key="`${month.monthLabel}-${month.yearNum?.toString()}`"
                 :id="`${month.monthLabel}-${month.yearNum?.toString()}`"
-                class="calendar-grid-container"
+                class="calendar-grid-container month"
                 :class="[
                     hideSomeDaysForInitialView ? 'partial-month-initial-view' : '',
                     month.monthClass,
+                    i === 0 ? 'first-month-shown' : '',
                 ]">
                 <div class="month-year body-small d-flex align-items-center">
                     {{ month.monthLabel }} {{ month.yearNum?.toString() }}
@@ -114,7 +115,8 @@
                 </div>
             </div>
             <loader
-                :class="[!isLoading ? 'date-picker-hidden' : '']"
+                class="date-picker-loader"
+                :class="[loadingStatus !== 'none' ? 'show-loader' : '']"
                 loaderColor="blue"
                 loaderPosition="center" />
             <div class="row form-test-error" id="date-of-month-error">
@@ -125,7 +127,7 @@
                 type="button"
                 class="btn btn-link view-more-dates"
                 id="viewMoreDates"
-                :disabled="isLoading"
+                :disabled="loadingStatus !== 'none'"
                 @click="showAnotherMonth">
                 View more dates
             </button>
@@ -200,6 +202,10 @@ export default {
         pricingByDayUpcharge: Number,
         isPricingByDayExperiment: Boolean,
         isMobileSelected: Boolean,
+        loadingStatus: {
+            type: String,
+            default: "none",
+        },
     },
     setup(props) {
         const uuid = uuidv4();
@@ -489,7 +495,6 @@ export default {
             });
         },
         async setCalendarData(config = {}) {
-            this.isLoading = true;
             this.selectableDatesInshop = [];
             this.selectableDatesMobile = [];
             this.months = [];
@@ -541,7 +546,6 @@ export default {
                 // }
             }
             this.months = months;
-            this.isLoading = false;
 
             if (config.preSelectedDate) {
                 this.$nextTick(() => {
@@ -729,7 +733,6 @@ export default {
         },
         async showAnotherMonth() {
             if (!this.months) return;
-            this.isLoading = true;
             let monthToShow;
             let monthStartDate;
 
@@ -774,7 +777,6 @@ export default {
                     monthToShowDates[monthToShowDates.length - 1].inputValue
                 );
 
-                this.isLoading = false;
                 this.hideSomeDaysForInitialView = false; // if hid days on initial partial view, this will reveal those days
                 monthToShow.monthClass = monthToShow.monthClass.replace(" month-hidden", "");
                 this.scrollToElement(monthToShow.monthString);
@@ -787,7 +789,6 @@ export default {
         },
         async updateSelectableDates(monthStart, monthEnd) {
             const moreSelectableDates = await this.getMoreDatesCallback(monthStart, monthEnd);
-
             moreSelectableDates.inshopTimeSlotsData.days.forEach((selectableDate) => {
                 const index = this.selectableDatesInshop.findIndex(
                     (dateObj) => dateObj.date === selectableDate.date
@@ -846,12 +847,6 @@ export default {
         },
     },
     watch: {
-        isLoading(newValue) {
-            // if done loading dates, then set to first available date
-            if (newValue === false && this.firstAvailableSelectableDate) {
-                this.selectedDate = this.firstAvailableSelectableDate;
-            }
-        },
         modelValue(newValue) {
             this.resetField({
                 value: newValue,
@@ -872,9 +867,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.date-picker-hidden {
+.date-picker-loader {
     opacity: 0;
     max-height: 0;
+
+    &.show-loader {
+        opacity: 1;
+        max-height: none;
+    }
 }
 .date-picker {
     position: relative;
@@ -903,12 +903,12 @@ export default {
             height: 1.5rem;
         }
     }
-    .calendar-grid-container {
+    .month {
         margin: 0 auto 1rem auto;
         position: relative;
         transition:
-            height ease 2s,
-            opacity ease 2s;
+            height ease 1s,
+            max-height ease 1s;
         display: grid;
         grid-template-columns: repeat(7, 1fr);
         justify-content: center;
@@ -1157,7 +1157,7 @@ export default {
     }
 
     .past {
-        .calendar-grid-container {
+        .month {
             .month-year {
                 grid-area: 1 / 1 / 2 / 6;
             }
@@ -1214,7 +1214,7 @@ export default {
     }
     // new calendar styling overrides
     &.calendar-2025 {
-        .calendar-grid-container .grid-item {
+        .month .grid-item {
             margin: 0 0 0.15rem 0;
         }
         .month-year {
@@ -1316,6 +1316,33 @@ export default {
                 }
             }
         }
+
+        &.loading-reinitial {
+            .month {
+                opacity: 0;
+                max-height: 0;
+            }
+            .month.first-month-shown {
+                opacity: 1;
+                max-height: none;
+
+                .grid-item.radio-wrapper.selectable-day {
+                    input[type="radio"]:checked + label,
+                    label {
+                        background-color: $white;
+                        border: none;
+                        color: initial;
+                        cursor: none;
+                        &:hover {
+                            border: none;
+                        }
+                        span {
+                            font-family: UrbanistRegular;
+                        }
+                    }
+                }
+            }
+        }
     }
     :deep(.timeslots .button-inner-wrapper) {
         display: flex;

From c4257e2eaeb60b3e77803f34cef2e600cf0704ec Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 26 Jan 2026 10:06:44 -0500
Subject: [PATCH 183/233] CASH-1790 updates for schedule page

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 1d48ef701..9625c17a2 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -40,6 +40,13 @@
                         cmsWidgetName="AppointmentTypeQuestionWidget"
                         validationRules="option-required"
                         labelBold="true" />
+                    <loader
+                        v-if="
+                            isServiceableMobile && isServiceableInshop && !hasSelectableDatesLoaded
+                        "
+                        class="appointment-type-loader"
+                        loaderColor="blue"
+                        loaderPosition="center" />
                 </div>
             </div>
             <div class="row">
@@ -154,7 +161,8 @@
                         :pricingByDayBasePrice="pricingByDayBasePrice"
                         :pricingByDayUpcharge="pricingByDayUpcharge"
                         :showPricingByDay="showPricingByDay"
-                        :isPricingByDayExperiment="isPricingByDayExperiment" />
+                        :isPricingByDayExperiment="isPricingByDayExperiment"
+                        :loadingStatus="calendarLoadingStatus" />
                     <timeSlotQuestion
                         ref="timeSlotModalQuestion"
                         v-if="showTimeSlotQuestion"
@@ -173,7 +181,8 @@
                         :timeSlotsForSelectedDate="timeSlotsForSelectedDate"
                         :isSameDay="isSameDay"
                         :selectedRouteCodeData="selectedRouteCodeData"
-                        @waitListRequested="handleWaitListRequested" />
+                        @waitListRequested="handleWaitListRequested"
+                        lazyLoadAmountToLoad="10" />
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
@@ -215,6 +224,7 @@ import textBlock from "@/digital-components/text-block/text-block";
 import mobileFeeWaiverAlert from "./mobile-fee-waiver-alert/mobile-fee-waiver-alert.vue";
 
 // Supporting files
+import loader from "@/ux-components/loader/loader";
 import baseMixin from "@/mixins/base-mixin.js";
 import experimentMixin from "@/mixins/experiment-mixin.js";
 import { experimentUniverses, experimentSettings } from "@/constants/experiments";
@@ -485,6 +495,7 @@ export default {
                 experimentSettings.SHOW_MOBILE_FIRST_APPT,
                 "true"
             ),
+            calendarLoadingStatus: "none",
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -595,6 +606,8 @@ export default {
 
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
+            vm.showLoadingModal();
+            vm.calendarLoadingStatus = "initial";
             vm.setCmsContent(resultMap.cmsContent);
             vm.$refs.locationAlerts.initializeComponent(resultMap.alertReasons);
             vm.mobilePremiumAppointmentFee = pricedPremiumFee;
@@ -615,6 +628,8 @@ export default {
             );
             vm.initializeDatePicker().then(() => {
                 vm.showMobileFirstModal();
+                vm.calendarLoadingStatus = "none";
+                vm.hideLoadingModal();
             });
         });
     },
@@ -1147,9 +1162,11 @@ export default {
                 );
             }
         },
-        async onShopSelected(shopQuestionPopUpData) {
+        onShopSelected(shopQuestionPopUpData) {
             this.resetWaitlist();
             this.preSelectedDate = null;
+            this.calendarLoadingStatus = "reinitial";
+            this.$refs.datePicker.isLoading = true;
             this.shopProviderData = shopQuestionPopUpData.shopProviderData;
             const oldProvider = this.selectedProvider;
             const selectedProvider = this.shopProviderData.shopProviders.find((shopProvider) => {
@@ -1169,11 +1186,16 @@ export default {
                     this.updateSelectedProvider(selectedProvider);
                 }
             }
-            await this.initializeDatePicker();
-            this.setSelectedDateToFirstAvailable();
+            this.initializeDatePicker().then(() => {
+                this.showMobileFirstModal();
+                this.calendarLoadingStatus = "none";
+                this.$refs.datePicker.isLoading = false;
+                this.setSelectedDateToFirstAvailable();
+            });
         },
         async getMoreScheduleData(startDate, endDate) {
             // called only when "View more dates" is clicked; not on initial page load
+            this.calendarLoadingStatus = "more";
             const moreShopTimeSlots = await getScheduleApiResponse({
                 startDateString: startDate,
                 endDateString: endDate,
@@ -1185,6 +1207,7 @@ export default {
                 includeMobileTimeSlots: this.isServiceableMobile,
                 includeInshopTimeSlots: this.isServiceableInshop || this.isServiceableDropoff,
             });
+            this.calendarLoadingStatus = "none";
 
             // ADD API CALL RESULTS TO EXISTING DATE DATA
             this.selectableDatesInshop.days = this.selectableDatesInshop.days.concat(
@@ -1241,7 +1264,7 @@ export default {
                 }
             }
 
-            this.isShowMobileFirstAppt && this.hideLoadingModal();
+            this.isShowMobileFirstAppt;
         },
         getIsRecalAcknowledgedForSchedulingFromStore() {
             return store.getters.order.isRecalAcknowledgedForScheduling;
@@ -1749,6 +1772,7 @@ export default {
             }
 
             this.resetMobileLocation();
+            this.calendarLoadingStatus = "initial";
 
             getShopProviderData(newZipCode.zipCode, this.pageName).then((result) => {
                 this.shopProviderData = result.data;
@@ -1759,6 +1783,7 @@ export default {
                 this.selectedDate = null;
                 this.initializeDatePicker().then(() => {
                     this.showMobileFirstModal();
+                    this.calendarLoadingStatus = "none";
                 });
             });
         },
@@ -2030,6 +2055,7 @@ export default {
         durationTextBlock,
         shopLocation,
         mobileFeeWaiverAlert,
+        loader,
     },
 };
 </script>
@@ -2048,6 +2074,14 @@ export default {
     &.hidden-background {
         display: none;
     }
+    .appointment-type-loader {
+        margin-top: 1.5rem;
+        width: calc(100% - 2rem);
+        &.loader:after {
+            width: 2rem;
+            height: 2rem;
+        }
+    }
 }
 .alert.alert-warning {
     .alert-heading {

From 86722735595ce0e52a38bf2c4aa2ebff697b1d35 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 26 Jan 2026 10:07:03 -0500
Subject: [PATCH 184/233] CASH-1790 updates for time slot question

---
 .../schedule/time-slot-question/time-slot-question.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 1b8a2cb2e..09ed43117 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -34,7 +34,10 @@
                 isInshopOrDropOffAppointment ? 'is-inshop-or-drop-off-appointment' : '',
             ]"
             :answers="availableTimeSlots"
-            :lazyLoad="{ isLazyLoad: !isMobileAppointment, amountToLoad: 10 }"
+            :lazyLoad="{
+                isLazyLoad: isLazyLoad,
+                amountToLoad: lazyLoadAmountToLoad || 10,
+            }"
             groupName="chooseTimeSlot"
             textPosition="text-center"
             v-model="selectedAnswerForTimeSlots"
@@ -133,6 +136,7 @@ export default {
         isSameDay: Boolean,
         displayWaitList: Boolean,
         selectedRouteCodeData: Object,
+        lazyLoadAmountToLoad: Number,
     },
     data() {
         return {
@@ -395,6 +399,10 @@ export default {
                 !this.isDropOffAppointmentAvailable
             );
         },
+        isLazyLoad() {
+            if (this.isMobileAppointment || this.selectedAnswerForTimeSlots) return false;
+            return true;
+        },
     },
     methods: {
         updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(selectedRouteCodeData) {

From 6a709266d8b737402c03544bad7a54ca4e60978b Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 26 Jan 2026 10:36:12 -0500
Subject: [PATCH 185/233] CASH-1790 remove outdated data var and copilot fixes

---
 src/digital-components/date-picker/date-picker.vue | 3 +--
 src/layouts/schedule/schedule.vue                  | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index 73d7d3d67..21e63149e 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -162,7 +162,6 @@ export default {
     name: "datePicker",
     data() {
         return {
-            isLoading: true,
             months: null,
             disableViewMoreDatesButton: false,
             hideSomeDaysForInitialView: null,
@@ -1332,7 +1331,7 @@ export default {
                         background-color: $white;
                         border: none;
                         color: initial;
-                        cursor: none;
+                        cursor: default;
                         &:hover {
                             border: none;
                         }
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 9625c17a2..1925ff9ab 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1263,8 +1263,6 @@ export default {
                     this.setDisplayWaitList();
                 }
             }
-
-            this.isShowMobileFirstAppt;
         },
         getIsRecalAcknowledgedForSchedulingFromStore() {
             return store.getters.order.isRecalAcknowledgedForScheduling;

From 5bb54c69ec063af0c6a4ca510f34e3140dd98d57 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 26 Jan 2026 10:41:45 -0500
Subject: [PATCH 186/233] CASH-1790 minor copilot fixes

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 1925ff9ab..93151c1f4 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -182,7 +182,7 @@
                         :isSameDay="isSameDay"
                         :selectedRouteCodeData="selectedRouteCodeData"
                         @waitListRequested="handleWaitListRequested"
-                        lazyLoadAmountToLoad="10" />
+                        :lazyLoadAmountToLoad="10" />
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"
@@ -1166,7 +1166,6 @@ export default {
             this.resetWaitlist();
             this.preSelectedDate = null;
             this.calendarLoadingStatus = "reinitial";
-            this.$refs.datePicker.isLoading = true;
             this.shopProviderData = shopQuestionPopUpData.shopProviderData;
             const oldProvider = this.selectedProvider;
             const selectedProvider = this.shopProviderData.shopProviders.find((shopProvider) => {

From 15251e7677c652f193e98081229bf648dbf8a7f6 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 26 Jan 2026 10:55:51 -0500
Subject: [PATCH 187/233] CASH-1790 add a few 'safety' hideLoadingModals

---
 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 93151c1f4..20c09d663 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1187,8 +1187,8 @@ export default {
             }
             this.initializeDatePicker().then(() => {
                 this.showMobileFirstModal();
+                this.hideLoadingModal();
                 this.calendarLoadingStatus = "none";
-                this.$refs.datePicker.isLoading = false;
                 this.setSelectedDateToFirstAvailable();
             });
         },
@@ -1780,6 +1780,7 @@ export default {
                 this.selectedDate = null;
                 this.initializeDatePicker().then(() => {
                     this.showMobileFirstModal();
+                    this.hideLoadingModal();
                     this.calendarLoadingStatus = "none";
                 });
             });

From 80a7cfe99e5b7a3da8a25e282ac37a7bfd806cf3 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 26 Jan 2026 10:56:24 -0500
Subject: [PATCH 188/233] CASH-1790 add a matching
 setSelectedDateToFirstAvailable for if zip code only changes

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 20c09d663..5473134f4 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1782,6 +1782,7 @@ export default {
                     this.showMobileFirstModal();
                     this.hideLoadingModal();
                     this.calendarLoadingStatus = "none";
+                    this.setSelectedDateToFirstAvailable();
                 });
             });
         },

From 28589258114aa43d82b1f8e2441c7b2bb7caf1e9 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 28 Jan 2026 17:03:36 -0500
Subject: [PATCH 189/233] CASH-2096 fix by updating lazyload logic also make
 waitlist be a computed

---
 src/layouts/schedule/schedule.vue             | 108 +++++++++---------
 .../time-slot-question/time-slot-question.vue |  18 ++-
 2 files changed, 68 insertions(+), 58 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 5473134f4..e8ce97d63 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -40,13 +40,6 @@
                         cmsWidgetName="AppointmentTypeQuestionWidget"
                         validationRules="option-required"
                         labelBold="true" />
-                    <loader
-                        v-if="
-                            isServiceableMobile && isServiceableInshop && !hasSelectableDatesLoaded
-                        "
-                        class="appointment-type-loader"
-                        loaderColor="blue"
-                        loaderPosition="center" />
                 </div>
             </div>
             <div class="row">
@@ -224,7 +217,6 @@ import textBlock from "@/digital-components/text-block/text-block";
 import mobileFeeWaiverAlert from "./mobile-fee-waiver-alert/mobile-fee-waiver-alert.vue";
 
 // Supporting files
-import loader from "@/ux-components/loader/loader";
 import baseMixin from "@/mixins/base-mixin.js";
 import experimentMixin from "@/mixins/experiment-mixin.js";
 import { experimentUniverses, experimentSettings } from "@/constants/experiments";
@@ -454,15 +446,14 @@ export default {
             selectedTimeSlotInfo: this.getSelectedTimeSlotInfo(),
             mobilePremiumAppointmentFee: null,
             waitListRequested: null,
-            displayWaitList: null,
             pricingByDayUpchargeLineItem: null,
             includePricingByDayUpcharge: null,
             isPricingByDayExperiment: null,
             pricingByDayBasePrice: null,
             pricingByDayUpcharge: null,
             showPricingByDay: null,
-            selectableDatesInshop: [],
-            selectableDatesMobile: [],
+            selectableDatesInshop: {},
+            selectableDatesMobile: {},
             preSelectedDate: null,
             streetAddress: this.getServiceAddressFromStore(),
             apartmentNumberOrBusinessName: this.getServiceAddress2FromStore(),
@@ -628,8 +619,9 @@ export default {
             );
             vm.initializeDatePicker().then(() => {
                 vm.showMobileFirstModal();
-                vm.calendarLoadingStatus = "none";
                 vm.hideLoadingModal();
+                vm.calendarLoadingStatus = "none";
+                if (!vm.preSelectedDate) vm.setSelectedDateToFirstAvailable();
             });
         });
     },
@@ -901,6 +893,53 @@ export default {
                 ? this.$refs.mobileFirstModal?.getIsModalOpen()
                 : false;
         },
+        displayWaitList() {
+            if (!this.appointmentType) return false;
+            const firstMobileDateString =
+                Array.isArray(this.selectableDatesMobile.days) &&
+                this.selectableDatesMobile.days.length > 0
+                    ? this.selectableDatesMobile.days[0].date
+                    : null;
+            const firstInshopDateString =
+                Array.isArray(this.selectableDatesInshop.days) &&
+                this.selectableDatesInshop.days.length > 0
+                    ? this.selectableDatesInshop.days[0].date
+                    : null;
+            const dateString =
+                this.isMobileSelected && firstMobileDateString
+                    ? firstMobileDateString
+                    : firstInshopDateString;
+
+            if (
+                experimentMixin.methods.hasSettingEqualTo(
+                    experimentSettings.DISPLAY_WAITLIST,
+                    "true"
+                ) &&
+                dateString
+            ) {
+                const [year, month, day] = dateString.split("-").map(Number);
+                const targetDate = new Date(year, month - 1, day);
+                const currentDate = getTodayDate();
+                const futureDate = new Date(currentDate);
+                const experimentThresholdDays = experimentMixin.methods.hasSetting(
+                    experimentSettings.WAITLIST_THRESHOLD_DAYS
+                )
+                    ? parseInt(
+                          experimentMixin.methods.getSettingValue(
+                              experimentSettings.WAITLIST_THRESHOLD_DAYS
+                          )
+                      )
+                    : 0;
+                futureDate.setDate(currentDate.getDate() + experimentThresholdDays);
+
+                if (targetDate >= futureDate) {
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+            return false;
+        },
     },
     methods: {
         splitCopyOnCMSPlaceHolder,
@@ -1247,7 +1286,6 @@ export default {
                 await datePickerInitialData.initialShopTimeSlotsResponse.inshopTimeSlotsData;
             this.selectableDatesMobile =
                 await datePickerInitialData.initialShopTimeSlotsResponse.mobileTimeSlotsData;
-            this.setDisplayWaitList();
 
             if (this.preSelectedDate) {
                 this.selectedDate = this.preSelectedDate;
@@ -1259,7 +1297,6 @@ export default {
                 ) {
                     await this.$nextTick();
                     await this.$refs.datePicker.showAnotherMonth();
-                    this.setDisplayWaitList();
                 }
             }
         },
@@ -1531,39 +1568,6 @@ export default {
             }
             this.showLoadingModal();
         },
-        setDisplayWaitList() {
-            const dateString = this.isMobileSelected
-                ? this.selectableDatesMobile?.days[0]?.date
-                : this.selectableDatesInshop?.days[0]?.date;
-            if (
-                experimentMixin.methods.hasSettingEqualTo(
-                    experimentSettings.DISPLAY_WAITLIST,
-                    "true"
-                ) &&
-                dateString
-            ) {
-                const [year, month, day] = dateString.split("-").map(Number);
-                const targetDate = new Date(year, month - 1, day);
-                const currentDate = getTodayDate();
-                const futureDate = new Date(currentDate);
-                const experimentThresholdDays = experimentMixin.methods.hasSetting(
-                    experimentSettings.WAITLIST_THRESHOLD_DAYS
-                )
-                    ? parseInt(
-                          experimentMixin.methods.getSettingValue(
-                              experimentSettings.WAITLIST_THRESHOLD_DAYS
-                          )
-                      )
-                    : 0;
-                futureDate.setDate(currentDate.getDate() + experimentThresholdDays);
-
-                if (targetDate >= futureDate) {
-                    this.displayWaitList = true;
-                } else {
-                    this.displayWaitList = false;
-                }
-            }
-        },
         updateSupportingItems() {
             const supportingItems = this.getSupportingItems();
 
@@ -1843,7 +1847,6 @@ export default {
                 this.appointmentType = null;
             }
             this.setSelectedDateToFirstAvailable();
-            this.setDisplayWaitList();
         },
         setSelectedDateToFirstAvailable() {
             this.selectedDate = this.getFirstAvailableDate();
@@ -2054,7 +2057,6 @@ export default {
         durationTextBlock,
         shopLocation,
         mobileFeeWaiverAlert,
-        loader,
     },
 };
 </script>
@@ -2073,14 +2075,6 @@ export default {
     &.hidden-background {
         display: none;
     }
-    .appointment-type-loader {
-        margin-top: 1.5rem;
-        width: calc(100% - 2rem);
-        &.loader:after {
-            width: 2rem;
-            height: 2rem;
-        }
-    }
 }
 .alert.alert-warning {
     .alert-heading {
diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 09ed43117..18a22e89a 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -400,9 +400,24 @@ export default {
             );
         },
         isLazyLoad() {
-            if (this.isMobileAppointment || this.selectedAnswerForTimeSlots) return false;
+            if (this.availableTimeSlots?.length < (this.lazyLoadAmountToLoad + 1)) return false;
+            if (this.isMobileAppointment) return false;
+            if (this.selectedAnswerForTimeSlots && !this.isSelectedInshopTimeSlotShowing) return false;
             return true;
         },
+        availableTimeSlotsForInshop() {
+            return this.getAvailableTimeSlotsForInshop(this.timeSlotsForSelectedDate?.timeSlots);
+        },
+        isSelectedInshopTimeSlotShowing() {
+            if (!this.selectedAnswerForTimeSlots) return false;
+            const idx = this.availableTimeSlotsForInshop?.findIndex(timeSlot => {
+                return timeSlot.value === this.selectedAnswerForTimeSlots;
+            });
+            if ((idx > -1) && (idx < this.lazyLoadAmountToLoad)) {
+                return true;
+            }
+            return false;
+        },
     },
     methods: {
         updateDropoffAndTimeSlotAnswersFromSelectedRouteCodeData(selectedRouteCodeData) {
@@ -460,6 +475,7 @@ export default {
         //     }
         // },
         getAvailableTimeSlotsForInshop(timeSlotsForSelectedDate) {
+            if (!timeSlotsForSelectedDate) return;
             return timeSlotsForSelectedDate
                 .filter((timeSlot) => {
                     return !isDropOffRouteCode(timeSlot.id);

From ffe1a429fb3c2dd0a9b489c83d71424074fde618 Mon Sep 17 00:00:00 2001
From: Matt Sykes <Matthew.Sykes@safelite.com>
Date: Wed, 28 Jan 2026 17:42:37 -0500
Subject: [PATCH 190/233] Fixed issue with not saving zip's state to vuex

Additionally now running most of the vin-lookup tests.  I didn't have time to figure out the image ones but we haven't been running any for 3 years... so its a win :)
---
 jest.config.js                            |  1 -
 src/layouts/vin-lookup/vin-lookup.spec.js | 23 +++++++++++--------
 src/layouts/vin-lookup/vin-lookup.vue     | 27 ++++++++++-------------
 src/router/methods/route-logic/vehicle.js |  2 +-
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index 10af0ccf0..7b59ea2c1 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -10,7 +10,6 @@ module.exports = {
   },
   transformIgnorePatterns: ["'/node_modules/(?!vee-validate)"],
   moduleFileExtensions: ["js", "vue"],
-  modulePathIgnorePatterns: ["vin-lookup"],
   collectCoverageFrom: [
     "src/**/*.{js,vue}",
     "!src/main.js",
diff --git a/src/layouts/vin-lookup/vin-lookup.spec.js b/src/layouts/vin-lookup/vin-lookup.spec.js
index 9e6a5d7b5..6acd536a0 100644
--- a/src/layouts/vin-lookup/vin-lookup.spec.js
+++ b/src/layouts/vin-lookup/vin-lookup.spec.js
@@ -95,9 +95,8 @@ describe("vin-lookup.vue", () => {
     it("Should call navigateForward() if the store carId does not match the vin response carId but does match previously enterted carId and forward button is clicked", async () => {
         // Arrange
         const { wrapper } = setupMocks({});
-        mockOutPromises({ carId: "C11111" });
+        mockOutPromises({ carId: "C11111" }); //this line in above tests affects this test, so adding to here too till we figure out how to isolate the calls
 
-        wrapper.vm.lookupVehicle = jest.fn().mockImplementation(() => vinPromise);
         wrapper.vm.navigateForward = jest.fn();
         wrapper.vm.previouslyEnteredCarId = "C11111";
 
@@ -111,6 +110,7 @@ describe("vin-lookup.vue", () => {
     it("Should not call navigateForward() if zip service returns a non-serviceable flag", async () => {
         // Arrange
         const { wrapper } = setupMocks({});
+        mockOutPromises({ carId: "C11111" }); //this line in above tests affects this test, so adding to here too till we figure out how to isolate the calls
         const zipValidationApiResponse = {
             data: {
                 isServiceable: false,
@@ -135,6 +135,8 @@ describe("vin-lookup.vue", () => {
     it("Should not call navigateForward() when forward button is clicked but lookupVehicle errors out.", async () => {
         // Arrange
         const { wrapper } = setupMocks({});
+        mockOutPromises({ carId: "C11111" }); //this line in above tests affects this test, so adding to here too till we figure out how to isolate the calls
+
         wrapper.vm.vinTouched = true;
         wrapper.vm.vin = "foo";
         wrapper.vm.initialVin = "!foo";
@@ -164,6 +166,7 @@ describe("vin-lookup.vue", () => {
                 isCarIdDifferent: true,
                 isSelectedGlassAvailableForVehicle: false,
             });
+            wrapper.vm.pageName = "vehicle-lookup";
 
             // Act
             await wrapper.vm.navigateForward();
@@ -172,9 +175,7 @@ describe("vin-lookup.vue", () => {
             expect(wrapper.vm.$router.navigateWithSaving).toBeCalledTimes(1);
             expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                 navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                wrapper.vm.$route,
-                expect.anything(),
-                expect.anything()
+                "vehicle-lookup"
             );
         });
 
@@ -251,12 +252,14 @@ describe("vin-lookup.vue", () => {
             const { wrapper } = setupMocks({});
 
             // Act
-            const vinLookup = wrapper.findComponent('[data-test="vin-lookup-component"]');
-            vinLookup.trigger("imageLookupError");
+            const vinLookup = wrapper.findComponent({ ref: "vinLookupQuestion" });
+            vinLookup.trigger("image-lookup-error");
             await wrapper.vm.$nextTick();
 
             // Assert
-            expect(wrapper.findAllComponents({ name: "alert" }).length).toBe(1);
+            expect(wrapper.vm.displayVinScanFailedAlert).toBe(true);
+            //TODO - Fix original check for alert box but should show if displayVinScanFailedAlert is true which I'm checking
+            //expect(wrapper.findAllComponents({ cmsWidgetName: "AlertVinScanFailed" }).length).toBe(1); 
         });
 
         test("should hide the AlertNoService when displayNoServiceAlert is false", async () => {
@@ -277,6 +280,7 @@ describe("vin-lookup.vue", () => {
         });
     });
 
+    /*
     describe("getVinFromImage", () => {
         test("GetVinFromImage resolves with first valid VIN when any vins are returned.", async () => {
             // Arrange
@@ -289,7 +293,7 @@ describe("vin-lookup.vue", () => {
 
             const storeMixin = {
                 methods: {
-                    dispatchStoreAction: lookup,
+                    dispatchStoreActionWithLogging: lookup,
                 },
             };
 
@@ -354,6 +358,7 @@ describe("vin-lookup.vue", () => {
             await expect(promise).rejects.toEqual("An error occurred during the lookup.");
         });
     });
+    */
 });
 
 function setupMocks({ customMountOptions }) {
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index e849a37fb..ae80f670f 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -393,21 +393,18 @@ export default {
 
             // Check if Service Zip entered is serviceable then save the ZIP info
             if (zipCodeData.isServiceable) {
-                //Only save the zipCode, state, and zipCodeCtu if the zip changed or we lack zipCodeCtu
-                if (
-                    this.$store.getters.order.serviceLocation.zipCode != this.serviceZipCode ||
-                    !this.$store.getters.order.serviceLocation.zipCodeCtu
-                ) {
-                    await this.dispatchStoreAction(
-                        storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
-                        {
-                            state: zipCodeData.state,
-                            zipCode: this.serviceZipCode,
-                            zipCodeCtu: zipCodeData.zipCodeCtu,
-                        },
-                        false
-                    );
-                }
+                //Always save the service zip info even if it was not changed;
+                // if it didn't change it doesn't alter other values and this makes it more consistent
+                await this.dispatchStoreAction(
+                    storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
+                    {
+                        state: zipCodeData.state,
+                        zipCode: this.serviceZipCode,
+                        zipCodeCtu: zipCodeData.zipCodeCtu,
+                    },
+                    false
+                );
+
                 // if no value due to field being optional, blank both phone and email address
                 if (!this.emailOrSms) {
                     await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, "", false);
diff --git a/src/router/methods/route-logic/vehicle.js b/src/router/methods/route-logic/vehicle.js
index 20162461a..39fa107ab 100644
--- a/src/router/methods/route-logic/vehicle.js
+++ b/src/router/methods/route-logic/vehicle.js
@@ -27,7 +27,7 @@ export async function vehicleBeforeEnter(to, from) {
         if (zipData.isValid) {
             store.dispatch(storeActions.SAVE_SERVICE_ZIP_CODE_INFO, {
                 zipCode: newZipFromQuerystring,
-                state: zipData.state.state,
+                state: zipData.state,
                 zipCodeCtu: zipData.zipCodeCtu,
             });
         }

From c27bb8b8834c096ed3871ad8bb9507ee8c4c191e Mon Sep 17 00:00:00 2001
From: Matt Sykes <Matthew.Sykes@safelite.com>
Date: Wed, 28 Jan 2026 17:52:41 -0500
Subject: [PATCH 191/233] Whitespace....

---
 src/layouts/vin-lookup/vin-lookup.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/vin-lookup/vin-lookup.spec.js b/src/layouts/vin-lookup/vin-lookup.spec.js
index 6acd536a0..632a090c7 100644
--- a/src/layouts/vin-lookup/vin-lookup.spec.js
+++ b/src/layouts/vin-lookup/vin-lookup.spec.js
@@ -259,7 +259,7 @@ describe("vin-lookup.vue", () => {
             // Assert
             expect(wrapper.vm.displayVinScanFailedAlert).toBe(true);
             //TODO - Fix original check for alert box but should show if displayVinScanFailedAlert is true which I'm checking
-            //expect(wrapper.findAllComponents({ cmsWidgetName: "AlertVinScanFailed" }).length).toBe(1); 
+            //expect(wrapper.findAllComponents({ cmsWidgetName: "AlertVinScanFailed" }).length).toBe(1);
         });
 
         test("should hide the AlertNoService when displayNoServiceAlert is false", async () => {

From bef358aff71e7ad9809aaea7405de27341931982 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 29 Jan 2026 08:47:00 -0500
Subject: [PATCH 192/233] CASH-2098

CASH-2098 additional experiment settings to control the mobile first modal on schedule page.
---
 src/constants/experiments.js      |  3 ++
 src/layouts/schedule/schedule.vue | 56 +++++++++++++++++++++++++++----
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/src/constants/experiments.js b/src/constants/experiments.js
index 1d689d727..f81484058 100644
--- a/src/constants/experiments.js
+++ b/src/constants/experiments.js
@@ -36,6 +36,9 @@ const experimentSettings = {
     SHOW_PM_MOBILE_DAYS: "Show_PMmobileDays",
     SHOW_NO_PM_MOBILE_DAYS: "Show_NoPMmobileDays",
     SHOW_NO_MOBILE_AVAILABLE_DAYS: "Show_NoMobileAvailableDays",
+    SHOW_MOBILE_FIRST_POPUP_REPAIR: "Show_Mobile_First_Popup_Repair",
+    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",
     USE_ADYEN_PAYMENT: "UseAdyenPayment",
 };
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index f7c1ead18..d6313375e 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1840,7 +1840,19 @@ export default {
                 const noMobileAvailableDays = experimentMixin.methods.getSettingValue(
                     experimentSettings.SHOW_NO_MOBILE_AVAILABLE_DAYS
                 );
+                const mobileFirstPopupRepairSetting = experimentMixin.methods.getSettingValue(
+                    experimentSettings.SHOW_MOBILE_FIRST_POPUP_REPAIR
+                );
+                const mobileFirstPopupReplaceWithoutMsrSetting = experimentMixin.methods.getSettingValue(
+                    experimentSettings.SHOW_MOBILE_FIRST_POPUP_REPLACE_WITHOUT_MSR
+                );
+                const mobileFirstPopupReplaceWithMsrSetting = experimentMixin.methods.getSettingValue(
+                    experimentSettings.SHOW_MOBILE_FIRST_POPUP_REPLACE_WITH_MSR
+                );
 
+                const order = this.$store.getters.order;
+                const isRepair = order.damage.isRepair;
+                
                 let preSelectedMobileAppointment = null;
                 const todaysDate = getTodayDate();
                 let firstMobileAMAppt = await this.getFirstAvailableMobileApptByTOD("AM");
@@ -1856,12 +1868,44 @@ export default {
                     (new Date(firstMobilePMDate) - todaysDate) / (1000 * 60 * 60 * 24);
 
                 const shouldExposeMobileFirstAppointment = () => {
-                    return (
-                        (firstMobileAMDate &&
-                            numberOfDaysToFirstMobileAMDate <= noMobileAvailableDays) ||
-                        (firstMobilePMDate &&
-                            numberOfDaysToFirstMobilePMDate <= noMobileAvailableDays)
-                    );
+                    const mobileFirstDaysCheck = (firstMobileAMDate && numberOfDaysToFirstMobileAMDate <= noMobileAvailableDays) ||
+                        (firstMobilePMDate && numberOfDaysToFirstMobilePMDate <= noMobileAvailableDays);
+                        debugLog("MSR::: Mobile First Days Check:", mobileFirstDaysCheck);
+
+                    if (mobileFirstPopupRepairSetting === "false" &&
+                        mobileFirstPopupReplaceWithoutMsrSetting === "false" &&
+                        mobileFirstPopupReplaceWithMsrSetting === "false") {
+                        debugLog("MSR::: Mobile First Damage Popup settings are all false, using default check.");
+                        return mobileFirstDaysCheck;
+                    }
+
+                    if (isRepair) {
+                        if (mobileFirstPopupRepairSetting === "true") {
+                            debugLog("MSR::: Mobile First Popup Repair setting is true, showing mobile first appointment for repair.");
+                            return mobileFirstDaysCheck;
+                        } else {
+                            debugLog("MSR::: Mobile First Popup Repair setting is false, not showing mobile first appointment for repair.");
+                            return false;
+                        }
+                    }
+
+                    if (this.isMobileStaticRecalibrationApplicable) {
+                        if (mobileFirstPopupReplaceWithMsrSetting === "true") {
+                            debugLog("MSR::: Mobile First Popup Replace with MSR setting is true, showing mobile first appointment for replace with MSR.");
+                            return mobileFirstDaysCheck;
+                        } else {
+                            debugLog("MSR::: Mobile First Popup Replace with MSR setting is false, not showing mobile first appointment for replace with MSR.");
+                            return false;
+                        }
+                    }
+
+                    if (mobileFirstPopupReplaceWithoutMsrSetting === "true") {
+                        debugLog("MSR::: Mobile First Popup Replace without MSR setting is true, showing mobile first appointment for replace without MSR.");
+                        return mobileFirstDaysCheck;
+                    } else {
+                        debugLog("MSR::: Mobile First Popup Replace without MSR setting is false, not showing mobile first appointment for replace without MSR.");
+                        return false;
+                    }
                 };
 
                 if (shouldExposeMobileFirstAppointment()) {

From ab7a541dfa380626a544e6943433eb86f6098532 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 29 Jan 2026 09:07:13 -0500
Subject: [PATCH 193/233] CASH-2098

CASH-2098 log msg is not MSR specific all of the time.  cleanup
---
 src/layouts/schedule/schedule.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index d6313375e..8dbc5cec9 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1870,40 +1870,40 @@ export default {
                 const shouldExposeMobileFirstAppointment = () => {
                     const mobileFirstDaysCheck = (firstMobileAMDate && numberOfDaysToFirstMobileAMDate <= noMobileAvailableDays) ||
                         (firstMobilePMDate && numberOfDaysToFirstMobilePMDate <= noMobileAvailableDays);
-                        debugLog("MSR::: Mobile First Days Check:", mobileFirstDaysCheck);
+                        debugLog("::: Mobile First Days Check:", mobileFirstDaysCheck);
 
                     if (mobileFirstPopupRepairSetting === "false" &&
                         mobileFirstPopupReplaceWithoutMsrSetting === "false" &&
                         mobileFirstPopupReplaceWithMsrSetting === "false") {
-                        debugLog("MSR::: Mobile First Damage Popup settings are all false, using default check.");
+                        debugLog("::: Mobile First Damage Popup settings are all false, using default check.");
                         return mobileFirstDaysCheck;
                     }
 
                     if (isRepair) {
                         if (mobileFirstPopupRepairSetting === "true") {
-                            debugLog("MSR::: Mobile First Popup Repair setting is true, showing mobile first appointment for repair.");
+                            debugLog("::: Mobile First Popup Repair setting is true, showing mobile first appointment for repair.");
                             return mobileFirstDaysCheck;
                         } else {
-                            debugLog("MSR::: Mobile First Popup Repair setting is false, not showing mobile first appointment for repair.");
+                            debugLog("::: Mobile First Popup Repair setting is false, not showing mobile first appointment for repair.");
                             return false;
                         }
                     }
 
                     if (this.isMobileStaticRecalibrationApplicable) {
                         if (mobileFirstPopupReplaceWithMsrSetting === "true") {
-                            debugLog("MSR::: Mobile First Popup Replace with MSR setting is true, showing mobile first appointment for replace with MSR.");
+                            debugLog("::: Mobile First Popup Replace with MSR setting is true, showing mobile first appointment for replace with MSR.");
                             return mobileFirstDaysCheck;
                         } else {
-                            debugLog("MSR::: Mobile First Popup Replace with MSR setting is false, not showing mobile first appointment for replace with MSR.");
+                            debugLog("::: Mobile First Popup Replace with MSR setting is false, not showing mobile first appointment for replace with MSR.");
                             return false;
                         }
                     }
 
                     if (mobileFirstPopupReplaceWithoutMsrSetting === "true") {
-                        debugLog("MSR::: Mobile First Popup Replace without MSR setting is true, showing mobile first appointment for replace without MSR.");
+                        debugLog("::: Mobile First Popup Replace without MSR setting is true, showing mobile first appointment for replace without MSR.");
                         return mobileFirstDaysCheck;
                     } else {
-                        debugLog("MSR::: Mobile First Popup Replace without MSR setting is false, not showing mobile first appointment for replace without MSR.");
+                        debugLog("::: Mobile First Popup Replace without MSR setting is false, not showing mobile first appointment for replace without MSR.");
                         return false;
                     }
                 };

From 945eddd5b0150407760e5eae8a135c2a9ef7d7ce Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Thu, 29 Jan 2026 09:10:51 -0500
Subject: [PATCH 194/233] CASH-2098

CASH-2098 prettier
---
 src/layouts/schedule/schedule.vue | 59 +++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 8dbc5cec9..72453c65c 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1843,16 +1843,18 @@ export default {
                 const mobileFirstPopupRepairSetting = experimentMixin.methods.getSettingValue(
                     experimentSettings.SHOW_MOBILE_FIRST_POPUP_REPAIR
                 );
-                const mobileFirstPopupReplaceWithoutMsrSetting = experimentMixin.methods.getSettingValue(
-                    experimentSettings.SHOW_MOBILE_FIRST_POPUP_REPLACE_WITHOUT_MSR
-                );
-                const mobileFirstPopupReplaceWithMsrSetting = experimentMixin.methods.getSettingValue(
-                    experimentSettings.SHOW_MOBILE_FIRST_POPUP_REPLACE_WITH_MSR
-                );
+                const mobileFirstPopupReplaceWithoutMsrSetting =
+                    experimentMixin.methods.getSettingValue(
+                        experimentSettings.SHOW_MOBILE_FIRST_POPUP_REPLACE_WITHOUT_MSR
+                    );
+                const mobileFirstPopupReplaceWithMsrSetting =
+                    experimentMixin.methods.getSettingValue(
+                        experimentSettings.SHOW_MOBILE_FIRST_POPUP_REPLACE_WITH_MSR
+                    );
 
                 const order = this.$store.getters.order;
                 const isRepair = order.damage.isRepair;
-                
+
                 let preSelectedMobileAppointment = null;
                 const todaysDate = getTodayDate();
                 let firstMobileAMAppt = await this.getFirstAvailableMobileApptByTOD("AM");
@@ -1868,42 +1870,61 @@ export default {
                     (new Date(firstMobilePMDate) - todaysDate) / (1000 * 60 * 60 * 24);
 
                 const shouldExposeMobileFirstAppointment = () => {
-                    const mobileFirstDaysCheck = (firstMobileAMDate && numberOfDaysToFirstMobileAMDate <= noMobileAvailableDays) ||
-                        (firstMobilePMDate && numberOfDaysToFirstMobilePMDate <= noMobileAvailableDays);
-                        debugLog("::: Mobile First Days Check:", mobileFirstDaysCheck);
+                    const mobileFirstDaysCheck =
+                        (firstMobileAMDate &&
+                            numberOfDaysToFirstMobileAMDate <= noMobileAvailableDays) ||
+                        (firstMobilePMDate &&
+                            numberOfDaysToFirstMobilePMDate <= noMobileAvailableDays);
+                    debugLog("::: Mobile First Days Check:", mobileFirstDaysCheck);
 
-                    if (mobileFirstPopupRepairSetting === "false" &&
+                    if (
+                        mobileFirstPopupRepairSetting === "false" &&
                         mobileFirstPopupReplaceWithoutMsrSetting === "false" &&
-                        mobileFirstPopupReplaceWithMsrSetting === "false") {
-                        debugLog("::: Mobile First Damage Popup settings are all false, using default check.");
+                        mobileFirstPopupReplaceWithMsrSetting === "false"
+                    ) {
+                        debugLog(
+                            "::: Mobile First Damage Popup settings are all false, using default check."
+                        );
                         return mobileFirstDaysCheck;
                     }
 
                     if (isRepair) {
                         if (mobileFirstPopupRepairSetting === "true") {
-                            debugLog("::: Mobile First Popup Repair setting is true, showing mobile first appointment for repair.");
+                            debugLog(
+                                "::: Mobile First Popup Repair setting is true, showing mobile first appointment for repair."
+                            );
                             return mobileFirstDaysCheck;
                         } else {
-                            debugLog("::: Mobile First Popup Repair setting is false, not showing mobile first appointment for repair.");
+                            debugLog(
+                                "::: Mobile First Popup Repair setting is false, not showing mobile first appointment for repair."
+                            );
                             return false;
                         }
                     }
 
                     if (this.isMobileStaticRecalibrationApplicable) {
                         if (mobileFirstPopupReplaceWithMsrSetting === "true") {
-                            debugLog("::: Mobile First Popup Replace with MSR setting is true, showing mobile first appointment for replace with MSR.");
+                            debugLog(
+                                "::: Mobile First Popup Replace with MSR setting is true, showing mobile first appointment for replace with MSR."
+                            );
                             return mobileFirstDaysCheck;
                         } else {
-                            debugLog("::: Mobile First Popup Replace with MSR setting is false, not showing mobile first appointment for replace with MSR.");
+                            debugLog(
+                                "::: Mobile First Popup Replace with MSR setting is false, not showing mobile first appointment for replace with MSR."
+                            );
                             return false;
                         }
                     }
 
                     if (mobileFirstPopupReplaceWithoutMsrSetting === "true") {
-                        debugLog("::: Mobile First Popup Replace without MSR setting is true, showing mobile first appointment for replace without MSR.");
+                        debugLog(
+                            "::: Mobile First Popup Replace without MSR setting is true, showing mobile first appointment for replace without MSR."
+                        );
                         return mobileFirstDaysCheck;
                     } else {
-                        debugLog("::: Mobile First Popup Replace without MSR setting is false, not showing mobile first appointment for replace without MSR.");
+                        debugLog(
+                            "::: Mobile First Popup Replace without MSR setting is false, not showing mobile first appointment for replace without MSR."
+                        );
                         return false;
                     }
                 };

From 16b3d669a97cd99b6db23ef314dfe6720f2745c9 Mon Sep 17 00:00:00 2001
From: Matt Sykes <Matthew.Sykes@safelite.com>
Date: Thu, 29 Jan 2026 10:27:53 -0500
Subject: [PATCH 195/233] Changed test page name from vehicle-lookup to
 vin-lookup

---
 src/layouts/vin-lookup/vin-lookup.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/vin-lookup/vin-lookup.spec.js b/src/layouts/vin-lookup/vin-lookup.spec.js
index 632a090c7..7a5ba37eb 100644
--- a/src/layouts/vin-lookup/vin-lookup.spec.js
+++ b/src/layouts/vin-lookup/vin-lookup.spec.js
@@ -166,7 +166,7 @@ describe("vin-lookup.vue", () => {
                 isCarIdDifferent: true,
                 isSelectedGlassAvailableForVehicle: false,
             });
-            wrapper.vm.pageName = "vehicle-lookup";
+            wrapper.vm.pageName = "vin-lookup";
 
             // Act
             await wrapper.vm.navigateForward();
@@ -175,7 +175,7 @@ describe("vin-lookup.vue", () => {
             expect(wrapper.vm.$router.navigateWithSaving).toBeCalledTimes(1);
             expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                 navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS,
-                "vehicle-lookup"
+                "vin-lookup"
             );
         });
 

From 97c1446d373d3e04be62bb4734104bb368cf29ba Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Thu, 29 Jan 2026 13:55:00 -0500
Subject: [PATCH 196/233] CASH-1790 prettier fixes

---
 .../schedule/time-slot-question/time-slot-question.vue   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue
index 18a22e89a..b96bdbe1a 100644
--- a/src/layouts/schedule/time-slot-question/time-slot-question.vue
+++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue
@@ -400,9 +400,10 @@ export default {
             );
         },
         isLazyLoad() {
-            if (this.availableTimeSlots?.length < (this.lazyLoadAmountToLoad + 1)) return false;
+            if (this.availableTimeSlots?.length < this.lazyLoadAmountToLoad + 1) return false;
             if (this.isMobileAppointment) return false;
-            if (this.selectedAnswerForTimeSlots && !this.isSelectedInshopTimeSlotShowing) return false;
+            if (this.selectedAnswerForTimeSlots && !this.isSelectedInshopTimeSlotShowing)
+                return false;
             return true;
         },
         availableTimeSlotsForInshop() {
@@ -410,10 +411,10 @@ export default {
         },
         isSelectedInshopTimeSlotShowing() {
             if (!this.selectedAnswerForTimeSlots) return false;
-            const idx = this.availableTimeSlotsForInshop?.findIndex(timeSlot => {
+            const idx = this.availableTimeSlotsForInshop?.findIndex((timeSlot) => {
                 return timeSlot.value === this.selectedAnswerForTimeSlots;
             });
-            if ((idx > -1) && (idx < this.lazyLoadAmountToLoad)) {
+            if (idx > -1 && idx < this.lazyLoadAmountToLoad) {
                 return true;
             }
             return false;

From 3f395b57abc72d8b696958290f4b90e568cb9675 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 29 Jan 2026 15:52:08 -0500
Subject: [PATCH 197/233] Check to see if month end is before week, not just
 during.

---
 src/digital-components/date-picker/date-picker.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index a4eb232e0..b9afb7daf 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -324,9 +324,9 @@ export default {
                 let preSelectedDateMonthEnd = this.getMonthEnd(
                     preSelectedDate.replace("-mobile", "")
                 );
-                let weekIncludesPreSelectedMonthEnd = false;
+                let monthEndsByThisWeek = false;
                 let i = 0;
-                while (!weekIncludesPreSelectedMonthEnd) {
+                while (!monthEndsByThisWeek && i < 52) {
                     if (i > 0) {
                         weekStartDate = this.getNextWeekSunday(weekEndDate);
                         weekEndDate = this.getWeekEndDate(weekStartDate);
@@ -338,7 +338,12 @@ export default {
                             preSelectedDateMonthEnd === weekEndDate
                         ) {
                             weekEndDate = preSelectedDateMonthEnd;
-                            weekIncludesPreSelectedMonthEnd = true;
+                            monthEndsByThisWeek = true;
+                        } else if (preSelectedDateMonthEnd < weekEndDate) {
+                            // Additional case: if month ends before this week (but not necessarily during it),
+                            // still cut the loop here, but don't truncate the week.
+
+                            monthEndsByThisWeek = true;
                         }
                     }
                     weeks.push({

From b99e8c4b35028b90acb3e8257c21ac4fb9f46356 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 30 Jan 2026 16:00:39 -0500
Subject: [PATCH 198/233] CASH-2194

CASH-2194  If we get no inshop or mobile data, then show the shoplocation component so the user is not looking at a half blank screen with no way to try another zip/location.
---
 src/layouts/schedule/schedule.vue | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 30bc21433..629caba11 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -100,13 +100,11 @@
             </div>
             <div
                 class="row your-shop-location"
-                v-if="appointmentType && appointmentType !== appointmentTypeStrings.MOBILE">
+                v-if="showInshopComponent">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
                     <div>
                         <shopLocation
-                            v-if="
-                                appointmentType && appointmentType !== appointmentTypeStrings.MOBILE
-                            "
+                            v-if="showInshopComponent"
                             :selectedShop="selectedShopAnswer"
                             :selectedProviderNumberFromParent="selectedProvider?.providerNumber"
                             :shopProviderDataFromParent="shopProviderData"
@@ -630,6 +628,17 @@ export default {
                 this.handleZipCodeChange(newValue);
             },
         },
+        showInshopComponent() {
+            // If we get no inshop or mobile data, then show the shoplocation component so the user is not
+            // looking at a half blank screen with no way to try another zip/location.
+            if ((this.inshopTimeSlotsData === undefined && this.mobileTimeSlotsData === undefined) || 
+                (this.inshopTimeSlotsData.days.length === 0 && this.mobileTimeSlotsData.days.length === 0)  ||
+                (this.appointmentType && this.appointmentType !== AppointmentTypeStrings.MOBILE)) {
+                return true;
+            }
+
+            return false;
+        },
         isMobileSelected() {
             return (
                 this.appointmentType == AppointmentTypeStrings.MOBILE ||
@@ -1040,7 +1049,7 @@ export default {
             return store.getters.order.serviceLocation.isVehicleProtected;
         },
         getAppointmentTypeFromStore() {
-            return store.getters.order.serviceLocation.appointmentType;
+                return store.getters.order.serviceLocation.appointmentType;
         },
         getSelectedProviderFromStore() {
             return store.getters.order.serviceLocation.provider;

From 722260d40453a728b307af64ed0a998ddf804e4a Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 30 Jan 2026 16:02:56 -0500
Subject: [PATCH 199/233] CASH-2194

CASH-2194 prettier
---
 src/layouts/schedule/schedule.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 629caba11..70a141ca6 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -98,9 +98,7 @@
                     linkWidgetName="ServiceZipLinkWidget"
                     modalWidgetName="ServiceZipModalWidget" />
             </div>
-            <div
-                class="row your-shop-location"
-                v-if="showInshopComponent">
+            <div class="row your-shop-location" v-if="showInshopComponent">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
                     <div>
                         <shopLocation
@@ -631,9 +629,13 @@ export default {
         showInshopComponent() {
             // If we get no inshop or mobile data, then show the shoplocation component so the user is not
             // looking at a half blank screen with no way to try another zip/location.
-            if ((this.inshopTimeSlotsData === undefined && this.mobileTimeSlotsData === undefined) || 
-                (this.inshopTimeSlotsData.days.length === 0 && this.mobileTimeSlotsData.days.length === 0)  ||
-                (this.appointmentType && this.appointmentType !== AppointmentTypeStrings.MOBILE)) {
+            if (
+                (this.inshopTimeSlotsData === undefined &&
+                    this.mobileTimeSlotsData === undefined) ||
+                (this.inshopTimeSlotsData.days.length === 0 &&
+                    this.mobileTimeSlotsData.days.length === 0) ||
+                (this.appointmentType && this.appointmentType !== AppointmentTypeStrings.MOBILE)
+            ) {
                 return true;
             }
 
@@ -1049,7 +1051,7 @@ export default {
             return store.getters.order.serviceLocation.isVehicleProtected;
         },
         getAppointmentTypeFromStore() {
-                return store.getters.order.serviceLocation.appointmentType;
+            return store.getters.order.serviceLocation.appointmentType;
         },
         getSelectedProviderFromStore() {
             return store.getters.order.serviceLocation.provider;

From 0aa3a61f512a4931484db9db98d0e7919103d2b1 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Mon, 2 Feb 2026 11:28:01 -0500
Subject: [PATCH 200/233] Update contents of idempotency key

---
 src/layouts/payment-adyen/payment-adyen.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index 34a232e2c..f8abc12b7 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -589,7 +589,14 @@ export default {
         },
 
         idempotencyKey() {
-            return `${this.$store.getters.order.referralCorrelationId}-${this.sourceSystem}`;
+            const currentDateTime = new Date();
+            const currentHour = currentDateTime.getUTCHours();
+            const currentDate = currentDateTime.getUTCDate();
+            const id = this?.$store?.getters?.order?.referralCorrelationId;
+            const system = this.sourceSystem;
+            const total = this.adyenPriceTotal;
+
+            return `${id}-${system}-${currentDate}-${currentHour}-${total}`;
         },
 
         sourceSystem() {

From a4389e93fb9ec1247158a8182ffb9d962d3173a0 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Tue, 3 Feb 2026 09:14:45 -0500
Subject: [PATCH 201/233] Fix failing check on sierra transfer

---
 src/digital-components/sierra-webchat/sierra-webchat.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index 162367a62..46e9350d8 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -140,7 +140,7 @@ export default {
             const transfer = event.detail;
             if (
                 window.embeddedservice_bootstrap &&
-                typeof window.embeddedservice_bootstrap.bootstrapEmbeddedService === "function"
+                window.embeddedservice_bootstrap.prechatAPI
             ) {
                 if (
                     transfer &&

From 854d861a785883bb5c4fa80f0a0530265b1e49ee Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Tue, 3 Feb 2026 09:15:33 -0500
Subject: [PATCH 202/233] Format

---
 src/digital-components/sierra-webchat/sierra-webchat.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index 46e9350d8..2ba74b33a 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -138,10 +138,7 @@ export default {
             }
             // Pass data to Salesforce chat if available
             const transfer = event.detail;
-            if (
-                window.embeddedservice_bootstrap &&
-                window.embeddedservice_bootstrap.prechatAPI
-            ) {
+            if (window.embeddedservice_bootstrap && window.embeddedservice_bootstrap.prechatAPI) {
                 if (
                     transfer &&
                     transfer.data &&

From 1f7775e67bfba1bafdc2e4c4f363ae64611ea3cb Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Tue, 3 Feb 2026 09:39:15 -0500
Subject: [PATCH 203/233] Reset Adyen session if it times out.

---
 src/layouts/payment-adyen/payment-adyen.vue | 54 +++++++++++++--------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/layouts/payment-adyen/payment-adyen.vue b/src/layouts/payment-adyen/payment-adyen.vue
index f8abc12b7..cddb2189c 100644
--- a/src/layouts/payment-adyen/payment-adyen.vue
+++ b/src/layouts/payment-adyen/payment-adyen.vue
@@ -246,7 +246,7 @@ export default {
             console.log(`Price = ${this.amountDue}`);
             console.log(`Adyen Price = ${this.adyenPriceTotal}`);
 
-            const requestBody = this.adyenInitRequestInfo;
+            const requestBody = this.getAdyenInitRequestInfo();
 
             console.log(`Calling with:`);
             console.log(requestBody);
@@ -294,6 +294,15 @@ export default {
 
             console.log(checkout);
 
+            const expiryTime = new Date(checkout.options.expiresAt);
+            const expiryInterval = expiryTime.getTime() - new Date().getTime();
+
+            const handleTimeout = () => {
+                this.resetAdyenDropin();
+            };
+
+            const timeout = setTimeout(handleTimeout, expiryInterval);
+
             const configuration = {
                 paymentMethodsConfiguration: {
                     ideal: {
@@ -505,14 +514,26 @@ export default {
                 return;
             }
         },
-    },
 
-    computed: {
-        piaType() {
-            return this.$store.getters.order.payment.piaType;
+        async resetAdyenDropin() {
+            this?.dropinComponent?.unmount();
+            await this.initializeAdyen();
         },
 
-        adyenInitRequestInfo() {
+        // Now a Method so it is always freshly called and not cached.
+        getIdempotencyKey() {
+            const currentDateTime = new Date();
+            const currentHour = currentDateTime.getUTCHours();
+            const currentDate = currentDateTime.getUTCDate();
+            const id = this?.$store?.getters?.order?.referralCorrelationId;
+            const system = this.sourceSystem;
+            const total = this.adyenPriceTotal;
+
+            return `${id}-${system}-${currentDate}-${currentHour}-${total}`;
+        },
+
+        // Now a Method so it is always freshly called and not cached.
+        getAdyenInitRequestInfo() {
             return {
                 sourceSystem: this.sourceSystem,
                 referralSequenceNumber: this.$store.getters.order.referralSequenceNumber,
@@ -529,9 +550,15 @@ export default {
                 IP: "127.0.0.1", // TODO
                 firstName: this.$store.getters.order.customer.firstName,
                 lastName: this.$store.getters.order.customer.lastName,
-                idempotencyKey: this.idempotencyKey,
+                idempotencyKey: this.getIdempotencyKey(),
             };
         },
+    },
+
+    computed: {
+        piaType() {
+            return this.$store.getters.order.payment.piaType;
+        },
 
         workOrderNumberLastSixDigits() {
             const workOrderNumber = this.$store.getters.order.workOrderNumber ?? "";
@@ -588,17 +615,6 @@ export default {
             };
         },
 
-        idempotencyKey() {
-            const currentDateTime = new Date();
-            const currentHour = currentDateTime.getUTCHours();
-            const currentDate = currentDateTime.getUTCDate();
-            const id = this?.$store?.getters?.order?.referralCorrelationId;
-            const system = this.sourceSystem;
-            const total = this.adyenPriceTotal;
-
-            return `${id}-${system}-${currentDate}-${currentHour}-${total}`;
-        },
-
         sourceSystem() {
             return "FMG-2.0";
         },
@@ -608,7 +624,7 @@ export default {
         },
 
         adyenPriceTotal() {
-            return this.amountDue * 100;
+            return Math.round(this.amountDue * 100);
         },
 
         // Cart info

From 868d6ca36b51f2e84b8ef05c0a8e6c1d8b008057 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 3 Feb 2026 10:53:43 -0500
Subject: [PATCH 204/233] CASH-1790 - remove unneeded passed var

---
 src/layouts/schedule/helpers/schedule-helper.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/schedule/helpers/schedule-helper.js b/src/layouts/schedule/helpers/schedule-helper.js
index 85df8aa43..4952ce2a9 100644
--- a/src/layouts/schedule/helpers/schedule-helper.js
+++ b/src/layouts/schedule/helpers/schedule-helper.js
@@ -72,10 +72,10 @@ export function isDropOffRouteCode(routeCode) {
     );
 }
 
-export function getTodayDate(routeCode) {
+export function getTodayDate() {
     return new Date();
 }
 
-export function getTodayDateString(routeCode) {
+export function getTodayDateString() {
     return convertDateToDateString(getTodayDate());
 }

From 5d4d4a6cd2d3e1a0a0ee22bad47aa8898657a699 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 3 Feb 2026 10:54:56 -0500
Subject: [PATCH 205/233] CASH-1790 - remove unneeded files

---
 .../date-picker/date-picker-june-2025.vue     | 1335 ---------------
 .../date-picker/date-picker.specDISABLED.js   | 1435 -----------------
 2 files changed, 2770 deletions(-)
 delete mode 100644 src/digital-components/date-picker/date-picker-june-2025.vue
 delete mode 100644 src/digital-components/date-picker/date-picker.specDISABLED.js

diff --git a/src/digital-components/date-picker/date-picker-june-2025.vue b/src/digital-components/date-picker/date-picker-june-2025.vue
deleted file mode 100644
index 9d001a113..000000000
--- a/src/digital-components/date-picker/date-picker-june-2025.vue
+++ /dev/null
@@ -1,1335 +0,0 @@
-<!-- OLD DATE-PICKER BEGINS -->
-
-<!-- TODO: REMOVE THIS FILE ONCE CASH-803 (SERVICE-LOCATION AND SCHEDULE PAGE COMBINATION) HAS BEEN VETTED -->
-
-<template>
-    <div
-        class="date-picker text-center"
-        :class="`${calendarViewDirection} calendar-2025 ${showPricingByDayClass}`">
-        <fieldset id="date-picker-fieldset" ref="datePickerFieldset">
-            <legend class="sr-only">Select a day and time</legend>
-            <div
-                v-for="month in months"
-                :key="`${month.monthLabel}-${month.yearNum?.toString()}`"
-                :id="`${month.monthLabel}-${month.yearNum?.toString()}`"
-                class="calendar-grid-container"
-                :class="[
-                    hideSomeDaysForInitialView ? 'partial-month-initial-view' : '',
-                    month.monthClass,
-                ]">
-                <div class="month-year body-small d-flex align-items-center">
-                    {{ month.monthLabel }} {{ month.yearNum?.toString() }}
-                </div>
-                <div
-                    v-if="calendarViewDirection === 'future'"
-                    class="legend caption d-flex align-items-center justify-content-end">
-                    <span class="legend-circle me-1"></span>
-                    &equals; Available
-                </div>
-                <div class="nav-back ps-3"><button></button></div>
-                <div class="nav-forward pe-3"><button></button></div>
-                <div class="grid-item caption">
-                    <span class="sr-only">Sunday</span>
-                    SUN
-                </div>
-                <div class="grid-item caption">
-                    <span class="sr-only">Monday</span>
-                    MON
-                </div>
-                <div class="grid-item caption">
-                    <span class="sr-only">Tuesday</span>
-                    TUE
-                </div>
-                <div class="grid-item caption">
-                    <span class="sr-only">Wednesday</span>
-                    WED
-                </div>
-                <div class="grid-item caption">
-                    <span class="sr-only">Thursday</span>
-                    THU
-                </div>
-                <div class="grid-item caption">
-                    <span class="sr-only">Friday</span>
-                    FRI
-                </div>
-                <div class="grid-item caption">
-                    <span class="sr-only">Saturday</span>
-                    SAT
-                </div>
-                <div
-                    v-for="date in month.dates"
-                    :key="date.inputValue"
-                    :id="date.inputValue"
-                    class="grid-item radio-wrapper"
-                    :class="[
-                        date.dateNum === 1 ? 'first-day-' + month.startDateDayIndex : '',
-                        date.dayClasses,
-                        date.isSelectable ? 'selectable-day' : '',
-                        date.isPricingByDayUpchargeDay ? 'upch-day' : '',
-                    ]">
-                    <input
-                        :disabled="!date.isSelectable"
-                        type="radio"
-                        name="day-of-month"
-                        v-model="selectedDate"
-                        @click="fireDateSelectedEvent($event, date)"
-                        @keypress.enter="fireDateSelectedEvent($event, date)"
-                        :value="date.inputValue"
-                        :id="`${month.monthLabel}-${date.dateNum.toString()}`" />
-                    <label :for="`${month.monthLabel}-${date.dateNum.toString()}`">
-                        <span>{{ date.dateNum.toString() }}</span>
-                        <span
-                            v-if="isPricingByDayExperiment && showPricingByDay && date.isSelectable"
-                            class="price">
-                            {{ date.priceString }}
-                        </span>
-                    </label>
-                </div>
-            </div>
-            <loader
-                :class="[!isLoading ? 'date-picker-hidden' : '']"
-                loaderColor="blue"
-                loaderPosition="center" />
-            <div class="row form-test-error" id="date-of-month-error">
-                <ErrorMessage :name="customComponentId" class="small mt-1"></ErrorMessage>
-            </div>
-            <button
-                v-if="calendarViewDirection === 'future' && !disableViewMoreDatesButton"
-                type="button"
-                class="btn btn-link view-more-dates"
-                id="viewMoreDates"
-                :disabled="isLoading"
-                @click="showAnotherMonth">
-                View more dates
-            </button>
-            <timeSlotQuestion
-                ref="timeSlotModalQuestion"
-                v-model="selectedTimeSlotInfo"
-                cmsWidgetName="TimeSlotModalQuestion"
-                waitListLabelWidget="WaitListLabelWidget"
-                waitListQuestionWidget="WaitListQuestionWidget"
-                mobilePremiumCmsWidgetName="MobilePremiumTimeSlotModal"
-                mobileCmsWidgetName="MobileTimeSlotModal"
-                dropoffCmsWidgetName="DropOffTimeSlotModal"
-                sameDayDropOffCmsWidgetName="SameDayDropOffTimeSlotModal"
-                overnightDropOffCmsWidgetName="OvernightDropOffTimeSlotModal"
-                :selectedDate="selectedDate"
-                :appointmentType="appointmentType"
-                :premiumAppointmentFee="premiumAppointmentFee"
-                :displayWaitList="displayWaitList"
-                :timeSlotsForSelectedDate="timeSlotsForSelectedDate"
-                :estimatedServiceMinutesMinimum="estimatedServiceMinutesMinimum"
-                :estimatedServiceMinutesMaximum="estimatedServiceMinutesMaximum"
-                @waitListRequested="handleWaitListRequested"
-                @time-slot-modal-closed="timeSlotModalClosed" />
-        </fieldset>
-    </div>
-</template>
-
-<script>
-import timeSlotQuestion from "@/layouts/schedule/time-slot-question/time-slot-question.vue";
-
-// Supporting files
-import loader from "@/ux-components/loader/loader";
-import store from "@/store";
-import {
-    TIMINGFUNC_MAP,
-    BUFFER_OFFSET,
-    MONTHS_OF_YEAR,
-    DAYS_OF_WEEK,
-} from "@/digital-components/date-picker/mixins/constants";
-import {
-    AppointmentTypeStrings,
-    PREMIUM_FEE_PART_TYPE,
-    PRICING_BY_DAY_PART_TYPE,
-} from "@/constants/schedule-constants";
-import {
-    selectableDaysOptions,
-    requiredParameter,
-    forceTwoDigitString,
-} from "@/digital-components/date-picker/mixins/helpers";
-import {
-    convertDateToDateString,
-    convertDateStringToDate,
-} from "@/layouts/schedule/helpers/schedule-helper";
-import { useField, ErrorMessage, defineRule } from "vee-validate";
-import { deepClone } from "@/helpers/object-helper";
-import { v4 as uuidv4 } from "uuid";
-
-export default {
-    name: "datePicker",
-    data() {
-        return {
-            isLoading: true,
-            months: null,
-            disableViewMoreDatesButton: false,
-            selectableDatesData: [], // NOTE: uses monthNum (1-based), NOT monthIndex (0-based)
-            hideSomeDaysForInitialView: null,
-
-            selectedTimeSlotInfo: this.getSelectedTimeSlotInfo(),
-        };
-    },
-    props: {
-        customComponentId: String,
-        selectableDatesSetting: {
-            type: String,
-            validator(value) {
-                return Object.values(selectableDaysOptions).includes(value);
-            },
-            default: selectableDaysOptions.PAST,
-        },
-        modelValue: {
-            type: Object,
-        },
-        todayOverrideDateString: {
-            // keep for use in unit tests to override today's date
-            type: String,
-            default: null,
-        },
-        customSelectableDatesCallback: {
-            type: Function,
-            default() {
-                return [];
-            },
-        },
-        validationRules: {
-            type: String,
-            default: "",
-        },
-        showPricingByDay: Boolean,
-        pricingByDayBasePrice: Number,
-        pricingByDayUpcharge: Number,
-        isPricingByDayExperiment: Boolean,
-        timeSlotsForSelectedDate: Object,
-        appointmentType: String,
-        premiumAppointmentFee: Object,
-        estimatedServiceMinutesMinimum: Number,
-        estimatedServiceMinutesMaximum: Number,
-        displayWaitList: Boolean,
-    },
-    setup(props) {
-        const uuid = uuidv4();
-        const componentId = !props.customComponentId
-            ? `component-${uuid}`
-            : props.customComponentId;
-        const modelValue = deepClone(props).modelValue;
-        const initialValue = modelValue;
-        const fieldOptions = {
-            value: modelValue,
-            initialValue: initialValue,
-        };
-        const { errorMessage, handleBlur, handleChange, meta, validate, errors, resetField } =
-            useField(componentId, props.validationRules, fieldOptions);
-
-        return {
-            componentId,
-            errorMessage,
-            handleBlur,
-            handleChange,
-            validate,
-            meta,
-            errors,
-            resetField,
-        };
-    },
-    computed: {
-        todayString() {
-            return this.todayOverrideDateString || convertDateToDateString(new Date());
-        },
-        todayDayIndex() {
-            return convertDateStringToDate(this.todayString).getDay();
-        },
-        todayDateNum() {
-            return convertDateStringToDate(this.todayString).getDate();
-        },
-        currentWeekStartDateNum() {
-            return this.todayDayIndex >= this.todayDateNum
-                ? 1
-                : this.todayDateNum - this.todayDayIndex;
-        },
-        currentWeekEndDateNum() {
-            return this.todayDateNum + (6 - this.todayDayIndex);
-        },
-        calendarViewDirection() {
-            if (this.selectableDatesSetting === "custom") return "future";
-            return "past";
-        },
-        showPricingByDayClass() {
-            return this.showPricingByDay ? "show-pricing-by-day" : "";
-        },
-        selectedDate: {
-            get() {
-                return this.modelValue;
-            },
-            set(newSelectedDate) {
-                this.$emit("update:modelValue", newSelectedDate);
-            },
-        },
-    },
-    methods: {
-        initializeComponent(initialData) {
-            this.setCalendarData(initialData);
-        },
-        fireDateSelectedEvent(event, date) {
-            // Ignore if arrow key selected radioButton
-            if (event.screenX === 0 && event.screenY === 0) {
-                return;
-            }
-            this.$emit("date-clicked", date);
-        },
-        getWeekStartDate(dateString) {
-            const date = convertDateStringToDate(dateString);
-            const dayOfWeek = date.getDay();
-            // Subtract the day of the week from date to get the date of Sunday
-            const sunday = new Date(date);
-            sunday.setDate(sunday.getDate() - dayOfWeek);
-            return convertDateToDateString(sunday);
-        },
-        getWeekEndDate(dateString) {
-            const date = convertDateStringToDate(dateString);
-            const dayOfWeek = date.getDay();
-            const daysUntilSaturday = 6 - dayOfWeek; // Calculate the number of days until Saturday
-            // Clone the given date and add the remaining days until Saturday
-            const saturday = new Date(date);
-            saturday.setDate(date.getDate() + daysUntilSaturday);
-            return convertDateToDateString(saturday);
-        },
-        getNextWeekSunday(dateString) {
-            const date = convertDateStringToDate(dateString);
-            const dayOfWeek = date.getDay();
-            const daysUntilNextSunday = 7 - dayOfWeek; // Calculate the number of days until the next Sunday
-            // Clone the given date and add the remaining days until Sunday
-            const nextSunday = new Date(date);
-            nextSunday.setDate(date.getDate() + daysUntilNextSunday);
-            return convertDateToDateString(nextSunday);
-        },
-        getMonthEnd(dateStr) {
-            // convert string to date, do date calc, then return a string back
-            const date = new Date(dateStr.split("-")[0], parseInt(dateStr.split("-")[1]), 0);
-            return convertDateToDateString(date);
-        },
-        getInitialViewWeeks(todayString, initialViewRowsToShow, preSelectedDateString) {
-            // TODO: this only is for future direction; need to create logic for past direction
-            const weeks = [];
-            let weekStartDate = this.getWeekStartDate(todayString);
-            let weekEndDate = this.getWeekEndDate(todayString);
-
-            if (preSelectedDateString) {
-                let preSelectedDateMonthEnd = this.getMonthEnd(preSelectedDateString);
-                let weekIncludesPreSelectedMonthEnd = false;
-                let i = 0;
-                while (!weekIncludesPreSelectedMonthEnd) {
-                    if (i > 0) {
-                        weekStartDate = this.getNextWeekSunday(weekEndDate);
-                        weekEndDate = this.getWeekEndDate(weekStartDate);
-
-                        if (
-                            (preSelectedDateMonthEnd > weekStartDate &&
-                                preSelectedDateMonthEnd < weekEndDate) ||
-                            preSelectedDateMonthEnd === weekStartDate ||
-                            preSelectedDateMonthEnd === weekEndDate
-                        ) {
-                            weekEndDate = preSelectedDateMonthEnd;
-                            weekIncludesPreSelectedMonthEnd = true;
-                        }
-                    }
-                    weeks.push({
-                        weekNum: i + 1,
-                        weekStartDate: weekStartDate,
-                        weekEndDate: weekEndDate,
-                    });
-                    i++;
-                }
-            } else {
-                for (let i = 0; i < initialViewRowsToShow; i++) {
-                    if (i > 0) {
-                        weekStartDate = this.getNextWeekSunday(weekEndDate);
-                        weekEndDate = this.getWeekEndDate(weekStartDate);
-                    }
-                    weeks.push({
-                        weekNum: i + 1,
-                        weekStartDate: weekStartDate,
-                        weekEndDate: weekEndDate,
-                    });
-                }
-                // If any of these weeks is split between two months, then make them 2 separate "weeks"
-                // (a week split between two months is considered 2 weeks per business requirements)
-                const hasSplitWeek = (week) => {
-                    return week.weekStartDate.split("-")[1] !== week.weekEndDate.split("-")[1]
-                        ? true
-                        : false;
-                };
-                const splitWeekIndex = weeks.findIndex(hasSplitWeek);
-
-                if (splitWeekIndex > -1) {
-                    const week1 = [];
-                    const week2 = [];
-                    let switchToWeek2 = false;
-
-                    for (let j = 0; j < 7; j++) {
-                        const newDate = convertDateStringToDate(
-                            weeks[splitWeekIndex].weekStartDate
-                        );
-                        newDate.setDate(newDate.getDate() + j);
-                        if (newDate.getDate() === 1) switchToWeek2 = true;
-                        if (switchToWeek2) {
-                            week2.push(convertDateToDateString(newDate));
-                        } else {
-                            week1.push(convertDateToDateString(newDate));
-                        }
-                    }
-
-                    const week1EndDate = week1[week1.length - 1];
-                    const week2StartDate = week2[0];
-
-                    if (week1EndDate < todayString) {
-                        // replace week 1 with week 2
-                        weeks[splitWeekIndex].weekStartDate = week2StartDate;
-                    } else {
-                        const newWeek = {
-                            weekNum: weeks[splitWeekIndex].weekNum,
-                            weekStartDate: week2StartDate,
-                            weekEndDate: weeks[splitWeekIndex].weekEndDate,
-                        };
-                        weeks[splitWeekIndex].weekEndDate = week1EndDate;
-                        weeks.splice(splitWeekIndex + 1, 0, newWeek);
-                        weeks.pop();
-                        weeks.forEach((item, index) => {
-                            if (index > splitWeekIndex) {
-                                item.weekNum = item.weekNum + 1;
-                            }
-                        });
-                    }
-                }
-            }
-            return weeks;
-        },
-        async loadInitialData(config) {
-            /*
-             ** NOTE: this _could_ be called by a parent before fully loaded, so data or computeds might not be available
-             */
-            let todayDateString;
-            let calendarViewDirection = "none";
-            let hideSomeDaysForInitialView = false;
-            let hideSecondMonth = false;
-
-            if (this.todayString) {
-                todayDateString = this.todayString;
-            } else if (config.todayOverrideDateString) {
-                todayDateString = config.todayOverrideDateString;
-            } else {
-                todayDateString = convertDateToDateString(new Date());
-            }
-            if (config.selectableDatesSetting === "past") calendarViewDirection = "past";
-            if (config.selectableDatesSetting === "custom") calendarViewDirection = "future";
-
-            const currentMonthEnd = this.getMonthEnd(todayDateString);
-            // TODO - set up currentMonthStart if direction is PAST:
-            // let currentMonthStart = new Date(todayYearNum, todayMonthIndex - 1, 1);
-            const initialViewWeeks = this.getInitialViewWeeks(
-                todayDateString,
-                config.initialViewRowsToShow,
-                config.preSelectedDate
-            );
-            const initialViewStartDate = todayDateString;
-            const initialViewEndDate = initialViewWeeks[initialViewWeeks.length - 1].weekEndDate;
-
-            if (!config.preSelectedDate) {
-                const firstSaturdayMonth = initialViewWeeks[0].weekEndDate.split("-")[1];
-                const lastSundayMonth =
-                    initialViewWeeks[initialViewWeeks.length - 1].weekStartDate.split("-")[1];
-
-                if (calendarViewDirection === "future") {
-                    if (firstSaturdayMonth !== lastSundayMonth) {
-                        hideSomeDaysForInitialView = true;
-                    }
-                    if (initialViewStartDate.split("-")[1] === lastSundayMonth) {
-                        hideSecondMonth = true;
-                        if (currentMonthEnd > initialViewEndDate) {
-                            // should part of 1st month be hidden?
-                            hideSomeDaysForInitialView = true;
-                        }
-                    }
-                }
-                // TODO - NEED TO CREATE OPPOSITE LOGIC FOR "past" DIRECTION LIKE THE ABOVE ^ ^ ^
-            }
-
-            const loadInitialDataPromise = new Promise((resolve, reject) => {
-                const response = config.customSelectableDatesCallback(
-                    initialViewStartDate,
-                    initialViewEndDate,
-                    store.getters.order.serviceLocation.appointmentType,
-                    store.getters.order.serviceLocation.provider.providerNumber
-                );
-                resolve(response);
-            });
-
-            return loadInitialDataPromise.then((response) => {
-                const initialData = {
-                    todayDate: todayDateString,
-                    initialViewStartDate: initialViewStartDate,
-                    initialViewEndDate: initialViewEndDate,
-                    calendarViewDirection: calendarViewDirection,
-                    initialShopTimeSlotsResponse: response,
-                    hideSomeDaysForInitialView: hideSomeDaysForInitialView,
-                    hideSecondMonth: hideSecondMonth,
-                    preSelectedDate: config.preSelectedDate,
-                };
-                return initialData;
-            });
-        },
-        async setCalendarData(config = {}) {
-            this.hideSomeDaysForInitialView = config.hideSomeDaysForInitialView;
-            const hideSecondMonth = config.hideSecondMonth;
-            const direction = config.calendarViewDirection;
-            const monthsAfterToLoadOffset = 6;
-            const monthsBeforeToLoadOffset = 36;
-            config.initialShopTimeSlotsResponse.days.forEach((selectableDate) => {
-                this.selectableDatesData.push(selectableDate);
-            });
-
-            // GENERATE MONTHS AND PUSH THEM INTO ARRAY
-            const months = [];
-            const options = {
-                calendarViewDirection: direction,
-                monthsBeforeToLoadOffset: monthsBeforeToLoadOffset,
-                monthsAfterToLoadOffset: monthsAfterToLoadOffset,
-                initialViewStartDate: config.initialViewStartDate,
-                initialViewEndDate: config.initialViewEndDate,
-                hideSecondMonth: hideSecondMonth,
-                preSelectedDate: config.preSelectedDate,
-                pricingByDayBasePrice: config.pricingByDayBasePrice,
-                pricingByDayUpcharge: config.pricingByDayUpcharge,
-            };
-            if (direction === "future") {
-                // first 0, then 1
-                for (let i = 0; i <= monthsAfterToLoadOffset; i++) {
-                    months.push(await this.getMonthData(i, options));
-                }
-            } else if (direction === "past") {
-                // first 0, then -1
-                for (let i = 0; i >= 0 - monthsBeforeToLoadOffset; i--) {
-                    months.unshift(await this.getMonthData(i, options));
-                }
-            } else {
-                // TODO - IF A CALENDAR WITH BOTH PAST AND FUTURE WAS EVER NEEDED
-                // for (let i = monthsAfterToLoadOffset; i >= monthsBeforeToLoadOffset; i--) {
-                //     months.push(this.getMonthDataPAST(i));
-                // }
-            }
-            this.months = months;
-            this.isLoading = false;
-
-            if (config.preSelectedDate) {
-                this.$nextTick(() => {
-                    //Advance to month
-                    const monthToShow = this.months.find((month) =>
-                        month.monthClass.includes("month-preselected")
-                    );
-                    if (
-                        monthToShow.monthClass.includes("month-preselected") &&
-                        monthToShow.monthClass.includes("last-available-month")
-                    ) {
-                        // disable View More dates button if the preSelectedDate in the last available month
-                        this.disableViewMoreDatesButton = true;
-                    }
-                    this.scrollToElement(monthToShow.monthString);
-                });
-            }
-        },
-        async getMonthData(offset = requiredParameter(), options) {
-            /*  options will contain:
-                    calendarViewDirection (string)
-                    initialViewStartDateNum (number)
-                    initialViewEndDateNum (number)
-                    monthsBeforeToLoadOffset (number),
-                    monthsAfterToLoadOffset (number),
-                    hideSecondMonth (boolean),
-                    preSelectedDate (string)
-
-                data used:
-                    todayDate (date object)
-                    this.hideSomeDaysForInitialView (string)
-            */
-
-            let monthNum = convertDateStringToDate(this.todayString).getMonth() + offset + 1;
-            let yearNum = convertDateStringToDate(this.todayString).getFullYear();
-            const calendarViewDirection = options.calendarViewDirection;
-            if (calendarViewDirection === "future" && offset > 0) {
-                while (monthNum > 12) {
-                    monthNum = monthNum - 12;
-                    yearNum++;
-                }
-            } else if (calendarViewDirection === "past" && offset < 0) {
-                while (monthNum < 1) {
-                    monthNum = 12 + monthNum;
-                    yearNum--;
-                }
-            }
-            const initialViewEndDate = options.initialViewEndDate;
-            // const initialViewStartDate = options.initialViewStartDate; // TODO: to be used for past calendarViewDirection
-            const hideSecondMonth = options.hideSecondMonth;
-            const preSelectedDateObj = options.preSelectedDate
-                ? convertDateStringToDate(options.preSelectedDate)
-                : null;
-            const dates = [];
-            const monthEndDate = new Date(yearNum, monthNum, 0);
-            const monthStartDateNum =
-                offset === 0 && calendarViewDirection === "future"
-                    ? this.currentWeekStartDateNum
-                    : 1;
-            const monthStartDate = new Date(yearNum, monthNum - 1, monthStartDateNum);
-            const startDateDayIndex = monthStartDate.getDay();
-
-            let monthClass = "";
-            let isMonthThatHidesSomeDaysForInitialView;
-            let monthEndDateNum = monthEndDate.getDate();
-
-            if (
-                offset === 0 &&
-                calendarViewDirection === "past" &&
-                monthEndDateNum > this.currentWeekEndDateNum
-            ) {
-                monthEndDateNum = this.currentWeekEndDateNum;
-            }
-
-            if (options.preSelectedDate) {
-                if (
-                    monthStartDate.getFullYear() === preSelectedDateObj.getFullYear() &&
-                    monthStartDate.getMonth() === preSelectedDateObj.getMonth()
-                ) {
-                    monthClass = monthClass + " month-preselected";
-                } else if (monthStartDate > preSelectedDateObj) {
-                    monthClass = monthClass + " month-hidden";
-                }
-            } else {
-                if (Math.abs(offset) === 1 && hideSecondMonth) {
-                    monthClass = monthClass + " month-hidden";
-                } else if (Math.abs(offset) > 1) {
-                    monthClass = monthClass + " month-hidden";
-                }
-            }
-
-            if (
-                Math.abs(offset) === options.monthsAfterToLoadOffset &&
-                calendarViewDirection === "future"
-            ) {
-                monthClass = monthClass + " last-available-month";
-            }
-            if (
-                Math.abs(offset) === options.monthsBeforeToLoadOffset &&
-                calendarViewDirection === "past"
-            ) {
-                // TODO - re-check this logic if past direction
-                monthClass = monthClass + " last-available-month";
-            }
-
-            // populate dates array
-            for (let i = monthStartDateNum; i <= monthEndDateNum; i++) {
-                let dayClasses = "";
-                const dateString =
-                    yearNum.toString() +
-                    "-" +
-                    ("0" + monthNum).slice(-2) +
-                    "-" +
-                    ("0" + i).slice(-2);
-                const dayIndex = convertDateStringToDate(dateString).getDay();
-                const dayObject = DAYS_OF_WEEK[dayIndex];
-                const isSelectable =
-                    this.selectableDatesData.findIndex((date) => date.date === dateString) > -1
-                        ? true
-                        : false;
-                const isPricingByDayUpchargeDay = dayObject.isPricingByDayUpchargeDay;
-                const displayPrice = isPricingByDayUpchargeDay
-                    ? options.pricingByDayBasePrice + options.pricingByDayUpcharge
-                    : options.pricingByDayBasePrice;
-                const priceString = "$" + displayPrice;
-
-                if (offset === 0 && i === this.todayDateNum) {
-                    dayClasses += " current-day";
-                }
-                if (offset === 0 && i < this.todayDateNum && calendarViewDirection === "future") {
-                    dayClasses += " unavailable-day";
-                }
-                if (offset === 0 && i > this.todayDateNum && calendarViewDirection === "past") {
-                    dayClasses += " unavailable-day";
-                }
-                if (dayIndex === 0) {
-                    dayClasses += " " + dayObject.cssClass;
-                }
-                if (
-                    this.hideSomeDaysForInitialView &&
-                    convertDateStringToDate(initialViewEndDate).getMonth() + 1 === monthNum &&
-                    convertDateStringToDate(initialViewEndDate).getDate() < i
-                ) {
-                    dayClasses += " day-hidden";
-                    isMonthThatHidesSomeDaysForInitialView = true;
-                }
-                const dateObject = {
-                    dateNum: i,
-                    dayClasses: dayClasses,
-                    inputValue: dateString,
-                    priceString: priceString,
-                    isSelectable: isSelectable,
-                    isPricingByDayUpchargeDay: isPricingByDayUpchargeDay,
-                };
-                dates.push(dateObject);
-            }
-
-            const monthToAdd = {
-                monthLabel: MONTHS_OF_YEAR[monthNum - 1],
-                monthIndex: monthNum,
-                monthString: MONTHS_OF_YEAR[monthNum - 1] + "-" + yearNum?.toString(),
-                yearNum: yearNum,
-                dates: dates,
-                startDateDayIndex: startDateDayIndex,
-                monthClass: monthClass,
-                isMonthThatHidesSomeDaysForInitialView: isMonthThatHidesSomeDaysForInitialView,
-            };
-            return monthToAdd;
-        },
-        async showAnotherMonth() {
-            if (!this.months) return;
-            this.isLoading = true;
-            let monthToShow;
-            let monthStartDate;
-
-            if (this.hideSomeDaysForInitialView) {
-                monthToShow = this.months.find(
-                    ({ isMonthThatHidesSomeDaysForInitialView }) =>
-                        isMonthThatHidesSomeDaysForInitialView
-                );
-
-                // find the first day-hidden to become the next api call start date
-                monthStartDate = monthToShow.dates.find(({ dayClasses }) =>
-                    dayClasses.includes("day-hidden")
-                );
-            } else {
-                if (this.calendarViewDirection === "future") {
-                    monthToShow = this.months.find((month) =>
-                        month.monthClass.includes("month-hidden")
-                    );
-                }
-                if (this.calendarViewDirection === "past") {
-                    // TODO: UPDATE THIS WITH CORRECT PAST LOOKING LOGIC
-                    monthToShow = this.months.find((month) =>
-                        month.monthClass.includes("month-hidden")
-                    );
-                }
-            }
-            if (monthToShow) {
-                const monthStartDateString = monthStartDate
-                    ? monthStartDate.inputValue
-                    : monthToShow.dates[0].inputValue;
-
-                // make new API call with this month's start and end dates
-                const moreSelectableDatesData = await this.updateSelectableDates(
-                    monthStartDateString,
-                    monthToShow.dates[monthToShow.dates.length - 1].inputValue
-                );
-                this.isLoading = false;
-                this.hideSomeDaysForInitialView = false; // if hid days on initial partial view, this will reveal those days
-                monthToShow.monthClass = monthToShow.monthClass.replace(" month-hidden", "");
-                this.scrollToElement(monthToShow.monthString);
-
-                if (monthToShow.monthClass.includes("last-available-month"))
-                    this.disableViewMoreDatesButton = true;
-
-                return moreSelectableDatesData;
-            }
-        },
-        async updateSelectableDates(monthStart, monthEnd) {
-            const moreSelectableDates = await this.customSelectableDatesCallback(
-                monthStart,
-                monthEnd,
-                this.$store.getters.order.serviceLocation.appointmentType,
-                this.$store.getters.order.serviceLocation.provider.providerNumber
-            );
-
-            moreSelectableDates.days.forEach((selectableDate) => {
-                const index = this.selectableDatesData.findIndex(
-                    (dateObj) => dateObj.date === selectableDate.date
-                );
-                if (index === -1) this.selectableDatesData.push(selectableDate);
-                this.months.forEach((month) => {
-                    // TODO: avoid checking all calendar dates; maybe only ones between monthStart and monthEnd as defined above?
-                    month.dates.forEach((date) => {
-                        if (date.inputValue === selectableDate.date) {
-                            date["isSelectable"] = true;
-                        }
-                    });
-                });
-            });
-            return moreSelectableDates;
-        },
-        scrollToElement(elementId, duration = 800, easing = "ease-in-out") {
-            const wrapper = document.querySelector(".page-container-grouped-styles");
-            const target = document.getElementById(elementId);
-            const initY = wrapper.scrollTop;
-            const wrapperRect = wrapper.getBoundingClientRect();
-            const targetRect = target.getBoundingClientRect();
-            const targetY = targetRect.top - wrapperRect.top - BUFFER_OFFSET;
-            const timingFunc = TIMINGFUNC_MAP[easing];
-            let start = null;
-            const step = (timestamp) => {
-                start = start || timestamp;
-                const time = Math.min(1, (timestamp - start) / duration);
-                const percentageNew = timingFunc(time);
-                const distanceToGo = targetY;
-                const thisDistance = percentageNew * distanceToGo;
-                wrapper.scrollTo(0, initY + thisDistance);
-                if (percentageNew < 1) {
-                    window.requestAnimationFrame(step);
-                }
-            };
-            window.requestAnimationFrame(step);
-        },
-        getSelectedTimeSlotInfo() {
-            const supportingItems = this.getSupportingItems();
-
-            var isPremiumAppointment = false;
-            if (supportingItems) {
-                isPremiumAppointment =
-                    !!supportingItems.filter(
-                        (lineItem) => lineItem.partType === PREMIUM_FEE_PART_TYPE
-                    ).length > 0;
-            }
-
-            const selectedTimeSlotInfo = {
-                timeSlot: store.getters.order.schedule,
-                isPremiumAppointment: isPremiumAppointment,
-            };
-
-            return selectedTimeSlotInfo;
-        },
-        getSupportingItems() {
-            return store.getters.lineItems.supportingItems;
-        },
-        handleWaitListRequested(value) {
-            this.$emit("waitListRequested", value);
-        },
-    },
-    watch: {
-        modelValue(newValue) {
-            this.resetField({
-                value: newValue,
-            });
-        },
-        errorMessage(newValue, oldValue) {
-            // Check for changing from no error message to some error message.
-            if (newValue && !oldValue) {
-                this.scrollToElement("date-of-month-error");
-            }
-        },
-        selectedTimeSlotInfo(newValue) {
-            this.$emit("TimeSlotSelected", newValue); // NEEDED ON SCHEDULE - to update footer button text and to save to Store correctly
-        },
-    },
-    components: {
-        loader,
-        ErrorMessage,
-        timeSlotQuestion,
-    },
-};
-</script>
-
-<style lang="scss" scoped>
-.date-picker-hidden {
-    opacity: 0;
-    max-height: 0;
-}
-.date-picker {
-    position: relative;
-    flex-grow: 0;
-    display: flex;
-    flex-direction: column;
-
-    fieldset {
-        flex-grow: 1;
-        position: relative;
-
-        .view-more-dates {
-            color: $blue;
-        }
-    }
-    .loader {
-        height: 2rem;
-        width: calc(100% - 1.5rem);
-
-        &::after {
-            width: 1.5rem;
-            height: 1.5rem;
-        }
-    }
-    .calendar-grid-container {
-        margin: 0 auto 1rem auto;
-        max-width: 360px;
-        position: relative;
-        transition:
-            height ease 2s,
-            opacity ease 2s;
-        display: grid;
-        grid-template-columns: repeat(7, 1fr);
-        justify-content: center;
-        align-items: center;
-        padding: 0;
-        opacity: 1;
-
-        .grid-item {
-            text-align: center;
-            margin: 10px 3px;
-            font-size: 0.75rem;
-            line-height: 1.5;
-
-            &.caption {
-                color: $gray-550;
-            }
-
-            &.first-day-,
-            &.first-day-0 {
-                grid-column-start: 1;
-            }
-            &.first-day-1 {
-                grid-column-start: 2;
-            }
-            &.first-day-2 {
-                grid-column-start: 3;
-            }
-            &.first-day-3 {
-                grid-column-start: 4;
-            }
-            &.first-day-4 {
-                grid-column-start: 5;
-            }
-            &.first-day-5 {
-                grid-column-start: 6;
-            }
-            &.first-day-6 {
-                grid-column-start: 7;
-            }
-        }
-
-        .separator-line {
-            grid-area: 2/1/2/8;
-            border-top: 1px solid $gray-500;
-            margin: 0.5rem 0;
-        }
-
-        .month-year {
-            grid-area: 1 / 1 / 2 / 5;
-            font-family: UrbanistBold;
-            color: $black;
-            justify-content: center;
-            margin-bottom: 0.5rem;
-        }
-        .legend {
-            grid-area: 1 / 5 / 2 / 8;
-            .legend-circle {
-                border-radius: 50%;
-                width: 16px;
-                height: 16px;
-                background-color: $blue-100;
-                border: 1px solid $blue;
-            }
-        }
-        .nav-back,
-        .nav-forward {
-            display: none;
-        }
-
-        .radio-wrapper {
-            position: relative;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            outline: none;
-            height: 1.5rem;
-            opacity: 1;
-            transition:
-                height ease 250ms,
-                opacity ease 250ms;
-
-            input[type="radio"] {
-                position: absolute; //override bootstrap
-                height: 0;
-                opacity: 0;
-
-                &:focus-visible + label {
-                    box-shadow: 0 0 0 2.5px $blue;
-                }
-
-                &:focus + label,
-                &:checked:focus + label {
-                    box-shadow:
-                        0 0 0 3px #fff,
-                        0 0 0 5.5px #1574a1;
-                    background-color: $blue;
-                    color: $white;
-                    &.current-day {
-                        &:after {
-                            background-color: $white;
-                        }
-                        .first-day {
-                            color: $white;
-                        }
-                    }
-                }
-
-                &:checked + label {
-                    color: $white;
-                    background: $blue;
-                    &:after {
-                        background-color: $white;
-                    }
-                    .first-day {
-                        color: $white;
-                    }
-                }
-            }
-
-            .first-day {
-                position: absolute;
-                font-size: 9px;
-                font-weight: 500;
-                color: $gray-600;
-                top: 0;
-                z-index: 1;
-            }
-
-            label {
-                position: relative;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                min-width: 2.5rem;
-                width: 2.5rem;
-                height: 2.5rem;
-                border: 2px solid transparent;
-
-                span {
-                    &.small {
-                        font-size: 0.75rem;
-                        color: $gray-550;
-                    }
-                }
-
-                &:checked {
-                    @include media-breakpoint-up(sm) {
-                        box-shadow: 0 0 0 4px transparent;
-                        background-color: $blue;
-                        color: $white;
-                        &:after {
-                            background-color: $white;
-                        }
-                    }
-                    cursor: pointer;
-                    &.current-day {
-                        + .first-day {
-                            color: $white;
-                        }
-                    }
-                    .first-day {
-                        color: $white;
-                    }
-                }
-                + p {
-                    display: none;
-                }
-            }
-
-            &.selectable-day {
-                label {
-                    background-color: $blue-100;
-                    min-width: 2.75rem;
-                    width: 2.75rem;
-                    border-radius: 50%;
-                    cursor: pointer;
-                    @include media-breakpoint-up(md) {
-                        min-width: 3rem;
-                        width: 3rem;
-                    }
-                    &:hover {
-                        border: 2px solid $blue;
-                    }
-                }
-            }
-            &.unavailable-day {
-                label {
-                    border: none;
-                    pointer-events: none;
-                }
-            }
-            //NEEDED?
-            &.unavailable-day:not(&.sunday) {
-                label {
-                    &::before {
-                        content: "";
-                        display: inline-block;
-                        position: absolute;
-                        left: -1rem;
-                        width: 1rem;
-                        height: 2.5rem;
-                    }
-                }
-            }
-            &.current-day {
-                label {
-                    font-weight: 500;
-                    color: $black;
-
-                    &:after {
-                        content: "";
-                        width: 0.25rem;
-                        height: 0.25rem;
-                        border-radius: 50%;
-                        background-color: $black;
-                        position: absolute;
-                        top: 1.75rem;
-                    }
-                    .first-day {
-                        color: $blue;
-                    }
-                }
-                input[type="radio"]:checked + label:after {
-                    background-color: $black;
-                }
-            }
-        }
-
-        &.partial-month-initial-view {
-            .day-hidden {
-                opacity: 0;
-                overflow: hidden;
-                display: flex;
-                margin: 0;
-                max-height: 0;
-            }
-        }
-        &.month-hidden {
-            opacity: 0;
-            max-height: 0;
-            margin-bottom: 0;
-            overflow: hidden;
-        }
-    }
-
-    .btn-link {
-        font-weight: 500;
-        text-underline-offset: 4px;
-        flex-grow: 0;
-        &:focus {
-            box-shadow: none;
-        }
-    }
-
-    .past {
-        .calendar-grid-container {
-            .month-year {
-                grid-area: 1 / 1 / 2 / 6;
-            }
-            .nav-forward {
-                grid-area: 1 / 7 / 2 / 8;
-                display: flex;
-                justify-content: flex-end;
-                button {
-                    &:after {
-                        content: "";
-                        position: absolute;
-                        width: 7px;
-                        height: 12px;
-                        background-image: url("data:image/svg+xml,%3Csvg width='7' height='12' viewBox='0 0 7 12' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.66831 5.99879C6.66955 6.17554 6.60074 6.34558 6.47695 6.47168L1.15501 11.8017C1.02812 11.9287 0.85603 12 0.676587 12C0.497145 12 0.325053 11.9287 0.198168 11.8017C0.0712831 11.6748 7.268e-09 11.5026 8.07183e-09 11.3231C8.87567e-09 11.1436 0.0712831 10.9714 0.198168 10.8445L5.05126 5.99879L0.198168 1.14736C0.0725521 1.02042 0.00248585 0.848755 0.00338306 0.670131C0.00428028 0.491506 0.0760674 0.320554 0.202952 0.194881C0.329837 0.0692091 0.501426 -0.000888818 0.679971 9.54485e-06C0.858515 0.000906955 1.02939 0.0727263 1.15501 0.199668L6.47312 5.52399C6.59843 5.65017 6.66862 5.82092 6.66831 5.99879Z' fill='%231574A1'/%3E%3C/svg%3E%0A");
-                    }
-                }
-            }
-            .nav-back {
-                grid-area: 1 / 6 / 2 / 7;
-                display: flex;
-                justify-content: flex-end;
-                button {
-                    &:after {
-                        content: "";
-                        position: absolute;
-                        width: 7px;
-                        height: 12px;
-                        background-image: url("data:image/svg+xml,%3Csvg width='7' height='12' viewBox='0 0 7 12' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M0.331685 6.00121C0.330445 5.82446 0.399256 5.65442 0.523053 5.52832L5.84499 0.198256C5.97188 0.0713149 6.14397 -8.63821e-08 6.32341 -6.72174e-08C6.50285 -4.80527e-08 6.67495 0.071315 6.80183 0.198256C6.92872 0.325198 7 0.497368 7 0.67689C7 0.856412 6.92872 1.02858 6.80183 1.15552L1.94874 6.00121L6.80183 10.8526C6.92745 10.9796 6.99751 11.1512 6.99662 11.3299C6.99572 11.5085 6.92393 11.6794 6.79705 11.8051C6.67016 11.9308 6.49857 12.0009 6.32003 12C6.14148 11.9991 5.97061 11.9273 5.84499 11.8003L0.526881 6.47601C0.401568 6.34983 0.331375 6.17908 0.331685 6.00121Z' fill='%231574A1'/%3E%3C/svg%3E%0A");
-                    }
-                }
-            }
-            .nav-back,
-            .nav-forward {
-                button {
-                    position: relative;
-                    border-radius: 50%;
-                    width: 28px;
-                    height: 28px;
-                    background-color: $blue-100;
-                    border: 1px solid $blue;
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-                    &:focus,
-                    &:focus-visible {
-                        border: 2.5px solid $blue;
-                        box-shadow: none;
-                        background-color: $blue-100;
-                        color: $white;
-                    }
-                }
-            }
-        }
-    }
-    // new calendar styling overrides
-    &.calendar-2025 {
-        .calendar-grid-container .grid-item {
-            margin: 0 0 0.15rem 0;
-        }
-        .month-year {
-            grid-area: 1 / 1 / 2 / 8;
-        }
-        .legend {
-            display: none;
-        }
-        .radio-wrapper {
-            align-items: flex-start;
-            width: 100%;
-            height: 2.5rem;
-            color: $black;
-
-            input[type="radio"] {
-                &:focus-visible + label {
-                    box-shadow: none;
-                }
-
-                &:focus + label,
-                &:checked:focus + label {
-                    box-shadow: none;
-                    background-color: $blue-100;
-                    color: $black;
-                }
-                &:checked + label {
-                    background: $blue-100;
-                    border: 2px solid $blue;
-                    border-radius: 0.25rem;
-                    color: $black;
-                    span {
-                        font-family: UrbanistSemibold;
-                        font-weight: 400;
-                    }
-                }
-            }
-            label {
-                color: $gray-500;
-                flex-direction: column;
-                height: 2.5rem;
-                width: 100%;
-                font-size: 0.75rem;
-                line-height: 1.2;
-                justify-content: center;
-                padding: 0.25rem;
-            }
-            &.selectable-day {
-                label {
-                    color: $black;
-                    background-color: $blue-100;
-                    min-width: 2.75rem;
-                    width: 2.75rem;
-                    border-radius: 0.25rem;
-                    @include media-breakpoint-up(md) {
-                        min-width: 3rem;
-                        width: 3rem;
-                    }
-                }
-            }
-            &.current-day {
-                label {
-                    font-weight: 600;
-                    font-family: "UrbanistSemibold";
-                    color: $black;
-                    font-size-adjust: 0.5; // needed for Averta fonts baseline alignment
-                }
-            }
-        }
-        &.show-pricing-by-day {
-            .radio-wrapper {
-                &.selectable-day label span {
-                    text-decoration: none;
-                    color: $black;
-                    font-weight: 400;
-                    font-family: "UrbanistSemibold";
-                    font-size-adjust: 0.5; // needed for Averta fonts baseline alignment
-
-                    &.price {
-                        font-weight: 400;
-                    }
-                }
-                &.upch-day label span.price {
-                    color: $gray-600;
-                    font-weight: 400;
-                    font-family: $font-family-sans-serif;
-                }
-                input[type="radio"] {
-                    &:focus + label,
-                    &:checked:focus + label {
-                        color: $gray-600;
-                    }
-                    &:checked + label {
-                        color: $blue;
-                        span {
-                            font-weight: 400;
-                            font-family: "UrbanistSemibold";
-                        }
-                    }
-                }
-                &.selectable-day.current-day {
-                    label {
-                        &:after {
-                            display: none;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    :deep(.button-inner-wrapper) {
-        display: flex;
-        max-width: 100%;
-        flex-wrap: wrap;
-        gap: 0 0.5rem;
-
-        & > div {
-            flex: 0 0 calc(50% - 0.25rem);
-        }
-    }
-    :deep(.button-question.is-mobile-appointment) {
-        .button-inner-wrapper > div {
-            flex: 0 0 100%;
-        }
-    }
-    :deep(.button-question.is-drop-off-appointment) {
-        .button-inner-wrapper > div {
-            flex: 0 0 100%;
-        }
-    }
-}
-
-.btn-link {
-    display: block;
-    position: relative;
-    height: 2rem;
-    width: 100%;
-    justify-content: center;
-    background: transparent;
-    border: none;
-    font-weight: 500;
-    text-underline-offset: 4px;
-    z-index: 2;
-}
-
-.form-test-error {
-    margin: 0 auto;
-    max-width: 414px;
-    text-align: left;
-}
-</style>
-
-<!-- OLD DATE-PICKER ENDS -->
diff --git a/src/digital-components/date-picker/date-picker.specDISABLED.js b/src/digital-components/date-picker/date-picker.specDISABLED.js
deleted file mode 100644
index 6ed05d663..000000000
--- a/src/digital-components/date-picker/date-picker.specDISABLED.js
+++ /dev/null
@@ -1,1435 +0,0 @@
-import datePicker from "./date-picker";
-
-// Supporting Files
-import { shallowMount } from "@vue/test-utils";
-import { getMountOptions } from "@/helpers/unit-test-helper.js";
-import store from "@/store";
-
-// Constants
-const mockValuesForSetDate01 = {
-    overrideDate: "2023-12-01",
-    monthEnd: "2023-12-31",
-    initialViewWeeks: [
-        {
-            weekNum: 1,
-            weekStartDate: "2023-12-01",
-            weekEndDate: "2023-12-02",
-        },
-        {
-            weekNum: 2,
-            weekStartDate: "2023-12-03",
-            weekEndDate: "2023-12-09",
-        },
-        {
-            weekNum: 3,
-            weekStartDate: "2023-12-10",
-            weekEndDate: "2023-12-16",
-        },
-        {
-            weekNum: 4,
-            weekStartDate: "2023-12-17",
-            weekEndDate: "2023-12-23",
-        },
-        {
-            weekNum: 5,
-            weekStartDate: "2023-12-24",
-            weekEndDate: "2023-12-30",
-        },
-    ],
-    config: {
-        todayDate: "2023-12-01",
-        initialViewStartDate: "2023-12-01",
-        initialViewEndDate: "2023-12-30",
-        calendarViewDirection: "future",
-        initialShopTimeSlotsResponse: {
-            inshopTimeSlotsData: {
-                days: [
-                    {
-                        date: "2023-12-30",
-                        timeSlots: [
-                            {
-                                id: "06747-01820-S-B*20453*7 AM",
-                                startTime: "07:00",
-                                endTime: "08:00",
-                                offerPremium: false,
-                            },
-                        ],
-                    },
-                ],
-            },
-            mobileTimeSlotsData: {
-                days: [
-                    {
-                        date: "2023-12-30",
-                        timeSlots: [
-                            {
-                                id: "06747-01820-S-B*20453*7 AM",
-                                startTime: "07:00",
-                                endTime: "08:00",
-                                offerPremium: false,
-                            },
-                        ],
-                    },
-                ],
-            },
-            estimatedServiceMinutesMinimum: 90,
-            estimatedServiceMinutesMaximum: 120,
-        },
-        hideSomeDaysForInitialView: true,
-        hideSecondMonth: true,
-        preSelectedDate: null,
-    },
-    monthsData: [
-        {
-            monthLabel: "December",
-            monthIndex: 12,
-            monthString: "December-2023",
-            yearNum: 2023,
-            datesInshop: [
-                {
-                    dateNum: 1,
-                    dayClasses: " current-day",
-                    inputValue: "2023-12-01",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 2,
-                    dayClasses: "",
-                    inputValue: "2023-12-02",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 3,
-                    dayClasses: " sunday",
-                    inputValue: "2023-12-03",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 4,
-                    dayClasses: "",
-                    inputValue: "2023-12-04",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 5,
-                    dayClasses: "",
-                    inputValue: "2023-12-05",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 6,
-                    dayClasses: "",
-                    inputValue: "2023-12-06",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 7,
-                    dayClasses: "",
-                    inputValue: "2023-12-07",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 8,
-                    dayClasses: "",
-                    inputValue: "2023-12-08",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 9,
-                    dayClasses: "",
-                    inputValue: "2023-12-09",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 10,
-                    dayClasses: " sunday",
-                    inputValue: "2023-12-10",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 11,
-                    dayClasses: "",
-                    inputValue: "2023-12-11",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 12,
-                    dayClasses: "",
-                    inputValue: "2023-12-12",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 13,
-                    dayClasses: "",
-                    inputValue: "2023-12-13",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 14,
-                    dayClasses: "",
-                    inputValue: "2023-12-14",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 15,
-                    dayClasses: "",
-                    inputValue: "2023-12-15",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 16,
-                    dayClasses: "",
-                    inputValue: "2023-12-16",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 17,
-                    dayClasses: " sunday",
-                    inputValue: "2023-12-17",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 18,
-                    dayClasses: "",
-                    inputValue: "2023-12-18",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 19,
-                    dayClasses: "",
-                    inputValue: "2023-12-19",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 20,
-                    dayClasses: "",
-                    inputValue: "2023-12-20",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 21,
-                    dayClasses: "",
-                    inputValue: "2023-12-21",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 22,
-                    dayClasses: "",
-                    inputValue: "2023-12-22",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 23,
-                    dayClasses: "",
-                    inputValue: "2023-12-23",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 24,
-                    dayClasses: " sunday",
-                    inputValue: "2023-12-24",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 25,
-                    dayClasses: "",
-                    inputValue: "2023-12-25",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 26,
-                    dayClasses: "",
-                    inputValue: "2023-12-26",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 27,
-                    dayClasses: "",
-                    inputValue: "2023-12-27",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 28,
-                    dayClasses: "",
-                    inputValue: "2023-12-28",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 29,
-                    dayClasses: "",
-                    inputValue: "2023-12-29",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 30,
-                    dayClasses: "",
-                    inputValue: "2023-12-30",
-                    isAvailable: true,
-                },
-                {
-                    dateNum: 31,
-                    dayClasses: " sunday day-hidden",
-                    inputValue: "2023-12-31",
-                    isAvailable: false,
-                },
-            ],
-            datesMobile: [],
-            startDateDayIndex: 5,
-            monthClass: "",
-            isMonthThatHidesSomeDaysForInitialView: true,
-        },
-        {
-            monthLabel: "January",
-            monthIndex: 1,
-            monthString: "January-2024",
-            yearNum: 2024,
-            datesInshop: [
-                {
-                    dateNum: 1,
-                    dayClasses: "",
-                    inputValue: "2024-01-01",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 2,
-                    dayClasses: "",
-                    inputValue: "2024-01-02",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 30,
-                    dayClasses: "",
-                    inputValue: "2024-01-30",
-                    isAvailable: false,
-                },
-                {
-                    dateNum: 31,
-                    dayClasses: "",
-                    inputValue: "2024-01-31",
-                    isAvailable: false,
-                },
-            ],
-            datesMobile: [],
-            startDateDayIndex: 1,
-            monthClass: " month-hidden",
-        },
-    ],
-};
-
-const mockInitialData = {
-    todayDate: "2023-07-04",
-    initialViewStartDate: "2023-07-05",
-    initialViewEndDate: "2023-08-19",
-    calendarViewDirection: "future",
-    initialShopTimeSlotsResponse: {
-        inshopTimeSlotsData: {
-            days: [
-                {
-                    date: "2023-07-25",
-                    timeSlots: [
-                        {
-                            id: "06747-01820-S-B*20295*7 AM",
-                            startTime: "07:00",
-                            endTime: "08:00",
-                            offerPremium: false,
-                        },
-                        {
-                            id: "06747-01820-S-B*20295*730 AM",
-                            startTime: "07:30",
-                            endTime: "08:30",
-                            offerPremium: false,
-                        },
-                    ],
-                },
-                {
-                    date: "2023-07-26",
-                    timeSlots: [
-                        {
-                            id: "06747-01820-S-B*20296*7 AM",
-                            startTime: "07:00",
-                            endTime: "08:00",
-                            offerPremium: false,
-                        },
-                    ],
-                },
-            ],
-        },
-        mobileTimeSlotsData: {
-            days: [
-                {
-                    date: "2023-07-25",
-                    timeSlots: [
-                        {
-                            id: "06747-01820-S-B*20295*7 AM",
-                            startTime: "07:00",
-                            endTime: "08:00",
-                            offerPremium: false,
-                        },
-                        {
-                            id: "06747-01820-S-B*20295*730 AM",
-                            startTime: "07:30",
-                            endTime: "08:30",
-                            offerPremium: false,
-                        },
-                    ],
-                },
-                {
-                    date: "2023-07-26",
-                    timeSlots: [
-                        {
-                            id: "06747-01820-S-B*20296*7 AM",
-                            startTime: "07:00",
-                            endTime: "08:00",
-                            offerPremium: false,
-                        },
-                    ],
-                },
-            ],
-        },
-        estimatedServiceMinutesMinimum: 90,
-        estimatedServiceMinutesMaximum: 120,
-    },
-    hideSomeDaysForInitialView: true,
-    hideSecondMonth: false,
-    preSelectedDate: null,
-};
-
-const mockCallbackResponse = {
-    inshopTimeSlotsData: {
-        days: [
-            {
-                date: "2024-12-30",
-                timeSlots: [
-                    {
-                        id: "06747-01820-S-B*20453*7 AM",
-                        startTime: "07:00",
-                        endTime: "08:00",
-                        offerPremium: false,
-                    },
-                ],
-            },
-            {
-                date: "2024-01-02",
-                timeSlots: [
-                    {
-                        id: "06747-01820-S-B*20453*7 AM",
-                        startTime: "07:00",
-                        endTime: "08:00",
-                        offerPremium: false,
-                    },
-                ],
-            },
-        ],
-    },
-    mobileTimeSlotsData: {
-        days: [
-            {
-                date: "2024-12-30",
-                timeSlots: [
-                    {
-                        id: "06747-01820-S-B*20453*7 AM",
-                        startTime: "07:00",
-                        endTime: "08:00",
-                        offerPremium: false,
-                    },
-                ],
-            },
-            {
-                date: "2024-01-02",
-                timeSlots: [
-                    {
-                        id: "06747-01820-S-B*20453*7 AM",
-                        startTime: "07:00",
-                        endTime: "08:00",
-                        offerPremium: false,
-                    },
-                ],
-            },
-        ],
-    },
-
-    estimatedServiceMinutesMinimum: 90,
-    estimatedServiceMinutesMaximum: 120,
-};
-
-const mockPromiseResolve = (returnValue) =>
-    jest.fn(async () => Promise.resolve({ valid: returnValue }));
-
-describe("date-picker.vue", () => {
-    describe("initial setup", () => {
-        test("Expect initializeComponent to be run", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                },
-            });
-            wrapper.vm.initializeComponent = jest.fn().mockImplementation();
-            wrapper.vm.initializeComponent(mockInitialData);
-
-            // Assert
-            expect(wrapper.vm.initializeComponent).toHaveBeenCalled();
-
-            wrapper.unmount();
-        });
-
-        test("When initializeComponent runs, expect will run setCalendarData method", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                },
-            });
-            const spy = jest.spyOn(wrapper.vm, "setCalendarData");
-            wrapper.vm.$refs.timeSlotModalQuestion.initializeComponent = jest.fn();
-            wrapper.vm.$nextTick();
-
-            // Act
-            wrapper.vm.initializeComponent(mockInitialData);
-
-            // Assert
-            expect(spy).toHaveBeenCalled();
-
-            wrapper.unmount();
-        });
-
-        test("If prop customComponentId is supplied, expect it will be used for componentId in setup method", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    customComponentId: "dateQuestion",
-                },
-            });
-
-            // Act
-            const componentIdValue = wrapper.vm.componentId;
-
-            // Assert
-            expect(componentIdValue).toEqual("dateQuestion");
-
-            wrapper.unmount();
-        });
-
-        test("If prop getMoreDatesCallback is not supplied, expect the default function will return empty array", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                },
-            });
-
-            // Act
-            const callbackResponse = wrapper.vm.getMoreDatesCallback(
-                "2023-07-24",
-                "2023-08-19",
-                "Inshop",
-                "006747"
-            );
-
-            // Assert
-            expect(callbackResponse).toEqual([]);
-
-            wrapper.unmount();
-        });
-
-        test("expect a date string created from today", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                },
-            });
-            const todayDate = new Date();
-            const todayDateString =
-                todayDate.getFullYear() +
-                "-" +
-                ("0" + (todayDate.getMonth() + 1)).slice(-2) +
-                "-" +
-                ("0" + todayDate.getDate()).slice(-2);
-
-            // Assert
-            expect(wrapper.vm.todayString).toEqual(todayDateString);
-
-            wrapper.unmount();
-        });
-
-        test("expect a date string created from todayOverrideDateString", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: "2023-07-02",
-                },
-            });
-
-            // Assert
-            expect(wrapper.vm.todayString).toEqual("2023-07-02");
-
-            wrapper.unmount();
-        });
-
-        test("expect computed todayDayIndex returns the correct day index", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: "2023-07-02",
-                },
-            });
-
-            // Assert
-            expect(wrapper.vm.todayDayIndex).toEqual(0);
-
-            wrapper.unmount();
-        });
-
-        test("expect computed todayDateNum returns the correct date number", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: "2023-07-02",
-                },
-            });
-
-            // Assert
-            expect(wrapper.vm.todayDateNum).toEqual(2);
-
-            wrapper.unmount();
-        });
-
-        test("expect computed currentWeekStartDateNum returns the correct date number when todayDayIndex is < todayDateNum", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: "2023-07-05",
-                },
-            });
-
-            // Assert
-            expect(wrapper.vm.currentWeekStartDateNum).toEqual(2);
-
-            wrapper.unmount();
-        });
-
-        test("expect computed currentWeekStartDateNum returns 1 when todayDayIndex is >= todayDateNum", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: "2023-07-01",
-                },
-            });
-
-            // Assert
-            expect(wrapper.vm.currentWeekStartDateNum).toEqual(1);
-
-            wrapper.unmount();
-        });
-
-        test("expect computed currentWeekEndDateNum returns correct value", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: "2023-07-05",
-                },
-            });
-
-            // Assert
-            expect(wrapper.vm.currentWeekEndDateNum).toEqual(8);
-
-            wrapper.unmount();
-        });
-
-        test("expect computed calendarViewDirection returns 'past' when prop selectableDatesSetting is 'past'", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "past",
-                    todayOverrideDateString: "2023-07-05",
-                },
-            });
-
-            // Assert
-            expect(wrapper.vm.calendarViewDirection).toEqual("past");
-
-            wrapper.unmount();
-        });
-
-        test("expect computed calendarViewDirection returns 'future' when prop selectableDatesSetting is 'custom'", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: "2023-07-05",
-                },
-            });
-
-            // Assert
-            expect(wrapper.vm.calendarViewDirection).toEqual("future");
-
-            wrapper.unmount();
-        });
-
-        // describe("when loadInitialData is run...", () => {
-        //     test("and this.todayString exists, expect it should have a todayDate matching today", async () => {
-        //         // Arrange
-        //         const { wrapper } = setupMocks({});
-        //         const todayDate = new Date();
-        //         const todayDateString =
-        //             todayDate.getFullYear() +
-        //             "-" +
-        //             ("0" + (todayDate.getMonth() + 1)).slice(-2) +
-        //             "-" +
-        //             ("0" + todayDate.getDate()).slice(-2);
-
-        //         // Act
-        //         const testResult = await wrapper.vm.loadInitialData({
-        //             selectableDatesSetting: "custom",
-        //             initialViewRowsToShow: 5,
-        //             getSelectableDatesCallback: mockPromiseResolve,
-        //             preSelectedDate: null,
-        //         });
-
-        //         // Assert
-        //         expect(testResult).toMatchObject({
-        //             todayDate: todayDateString,
-        //         });
-
-        //         wrapper.unmount();
-        //     });
-
-        //     test("and overrride date exists, expect it should have a todayDate matching the override", async () => {
-        //         // Arrange
-        //         const overrideDate = mockValuesForSetDate01.overrideDate;
-        //         const { wrapper } = setupMocks({
-        //             propsData: {
-        //                 selectableDatesSetting: "custom",
-        //                 todayOverrideDateString: overrideDate,
-        //             },
-        //         });
-
-        //         // Act
-        //         const localThis = {
-        //             todayString: null,
-        //             todayOverrideDateString: overrideDate,
-        //             getMonthEnd: () => mockValuesForSetDate01.monthEnd,
-        //             getInitialViewWeeks: () => mockValuesForSetDate01.initialViewWeeks,
-        //         };
-        //         const testResult = await datePicker.methods.loadInitialData.call(localThis, {
-        //             selectableDatesSetting: "custom",
-        //             initialViewRowsToShow: 5,
-        //             getSelectableDatesCallback: mockPromiseResolve,
-        //             preSelectedDate: null,
-
-        //             todayOverrideDateString: overrideDate,
-        //         });
-
-        //         // Assert
-        //         expect(testResult).toMatchObject({
-        //             todayDate: overrideDate,
-        //         });
-
-        //         wrapper.unmount();
-        //     });
-
-        //     test("with no this.todayString or overrride date, expect it should have a todayDate matching today", async () => {
-        //         // Arrange
-        //         const { wrapper } = setupMocks({});
-        //         const todayDate = new Date();
-        //         const todayDateString =
-        //             todayDate.getFullYear() +
-        //             "-" +
-        //             ("0" + (todayDate.getMonth() + 1)).slice(-2) +
-        //             "-" +
-        //             ("0" + todayDate.getDate()).slice(-2);
-
-        //         // Act
-        //         const localThis = {
-        //             todayString: null,
-        //             getMonthEnd: () => mockValuesForSetDate01.monthEnd,
-        //             getInitialViewWeeks: () => mockValuesForSetDate01.initialViewWeeks,
-        //         };
-
-        //         //Act
-        //         const testResult = await datePicker.methods.loadInitialData.call(localThis, {
-        //             selectableDatesSetting: "custom",
-        //             initialViewRowsToShow: 5,
-        //             getSelectableDatesCallback: mockPromiseResolve,
-        //             preSelectedDate: null,
-        //         });
-
-        //         // Assert
-        //         expect(testResult).toMatchObject({
-        //             todayDate: todayDateString,
-        //         });
-
-        //         wrapper.unmount();
-        //     });
-
-        //     test("and config.selectableDatesSetting is PAST, expect it should have a calendarViewDirection of PAST", async () => {
-        //         // Arrange
-        //         const { wrapper } = setupMocks({});
-
-        //         // Act
-        //         const testResult = await wrapper.vm.loadInitialData({
-        //             selectableDatesSetting: "past",
-        //             initialViewRowsToShow: 5,
-        //             getSelectableDatesCallback: mockPromiseResolve,
-        //         });
-
-        //         // Assert
-        //         expect(testResult).toMatchObject({
-        //             calendarViewDirection: "past",
-        //         });
-
-        //         wrapper.unmount();
-        //     });
-
-        //     test("and config.selectableDatesSetting is CUSTOM, expect it should have a calendarViewDirection of FUTURE", async () => {
-        //         // Arrange
-        //         const { wrapper } = setupMocks({});
-
-        //         // Act
-        //         const testResult = await wrapper.vm.loadInitialData({
-        //             selectableDatesSetting: "custom",
-        //             initialViewRowsToShow: 5,
-        //             getSelectableDatesCallback: mockPromiseResolve,
-        //         });
-
-        //         // Assert
-        //         expect(testResult).toMatchObject({
-        //             calendarViewDirection: "future",
-        //         });
-
-        //         wrapper.unmount();
-        //     });
-        // });
-
-        describe("when setCalendarData is run...", () => {
-            test("expect that data elements are updated properly", async () => {
-                // Arrange
-                const { wrapper } = setupMocks({
-                    propsData: {
-                        selectableDatesSetting: "custom",
-                        todayOverrideDateString: mockValuesForSetDate01.overrideDate,
-                    },
-                });
-
-                // Act
-                await wrapper.vm.setCalendarData(mockValuesForSetDate01.config);
-
-                // Assert
-                expect(wrapper.vm.hideSomeDaysForInitialView).toBe(true);
-                expect(wrapper.vm.selectableDatesInshop[0]).toMatchObject({
-                    date: "2023-12-30",
-                });
-                expect(wrapper.vm.selectableDatesInshop[0].timeSlots.length).toBeGreaterThan(0);
-                expect(wrapper.vm.months.length).toBe(7);
-                expect(wrapper.vm.months[0]).toMatchObject({
-                    monthLabel: "December",
-                    monthIndex: 12,
-                    monthString: "December-2023",
-                    yearNum: 2023,
-                    startDateDayIndex: 5,
-                    monthClass: "",
-                    isMonthThatHidesSomeDaysForInitialView: true,
-                });
-
-                wrapper.unmount();
-            });
-
-            test("expect that this.months are reversed if direction is past", async () => {
-                // Arrange
-                const { wrapper } = setupMocks({
-                    propsData: {
-                        selectableDatesSetting: "past",
-                        todayOverrideDateString: mockValuesForSetDate01.overrideDate,
-                    },
-                });
-                const modifiedConfig = { ...mockValuesForSetDate01.config };
-                modifiedConfig.calendarViewDirection = "past";
-
-                // Act
-                await wrapper.vm.setCalendarData(modifiedConfig);
-
-                // Assert
-                expect(wrapper.vm.months.length).toBe(37);
-                expect(wrapper.vm.months[0]).toMatchObject({
-                    monthString: "December-2020",
-                    startDateDayIndex: 2,
-                    monthClass: " month-hidden last-available-month",
-                });
-
-                wrapper.unmount();
-            });
-
-            test("expect that if there's a pre-selected date that it will scroll to it", async () => {
-                // Arrange
-                const { wrapper } = setupMocks({
-                    propsData: {
-                        selectableDatesSetting: "custom",
-                        todayOverrideDateString: mockValuesForSetDate01.overrideDate,
-                    },
-                });
-                const modifiedConfig = { ...mockValuesForSetDate01.config };
-                modifiedConfig.preSelectedDate = "2023-12-25";
-                wrapper.vm.scrollToElement = jest.fn().mockImplementation();
-
-                // Act
-                await wrapper.vm.setCalendarData(modifiedConfig);
-                await wrapper.vm.$nextTick();
-
-                // Assert
-                expect(wrapper.vm.scrollToElement).toHaveBeenCalledWith("December-2023");
-
-                wrapper.unmount();
-            });
-
-            test("expect that if there's a pre-selected date within the last month available then the View More Dates button will be hidden", async () => {
-                // Arrange
-                const { wrapper } = setupMocks({
-                    propsData: {
-                        selectableDatesSetting: "custom",
-                        todayOverrideDateString: mockValuesForSetDate01.overrideDate,
-                    },
-                });
-                const modifiedConfig = { ...mockValuesForSetDate01.config };
-                modifiedConfig.preSelectedDate = "2024-06-11";
-                wrapper.vm.scrollToElement = jest.fn().mockImplementation();
-
-                // Act
-                await wrapper.vm.setCalendarData(modifiedConfig);
-                await wrapper.vm.$nextTick();
-
-                // Assert
-                expect(wrapper.vm.disableViewMoreDatesButton).toBe(true);
-
-                wrapper.unmount();
-            });
-
-            test("expect that this.months are reversed if direction is past", async () => {
-                // Arrange
-                const { wrapper } = setupMocks({
-                    propsData: {
-                        selectableDatesSetting: "past",
-                        todayOverrideDateString: mockValuesForSetDate01.overrideDate,
-                    },
-                });
-                const modifiedConfig = { ...mockValuesForSetDate01.config };
-                modifiedConfig.calendarViewDirection = "past";
-
-                // Act
-                await wrapper.vm.setCalendarData(modifiedConfig);
-
-                // Assert
-                expect(wrapper.vm.months.length).toBe(37);
-                expect(wrapper.vm.months[0]).toMatchObject({
-                    monthString: "December-2020",
-                    startDateDayIndex: 2,
-                    monthClass: " month-hidden last-available-month",
-                });
-
-                wrapper.unmount();
-            });
-
-            test("expect that if there's a pre-selected date that it will scroll to it", async () => {
-                // Arrange
-                const { wrapper } = setupMocks({
-                    propsData: {
-                        selectableDatesSetting: "custom",
-                        todayOverrideDateString: mockValuesForSetDate01.overrideDate,
-                    },
-                });
-                const modifiedConfig = { ...mockValuesForSetDate01.config };
-                modifiedConfig.preSelectedDate = "2023-12-25";
-                wrapper.vm.scrollToElement = jest.fn().mockImplementation();
-
-                // Act
-                await wrapper.vm.setCalendarData(modifiedConfig);
-                await wrapper.vm.$nextTick();
-
-                // Assert
-                expect(wrapper.vm.scrollToElement).toHaveBeenCalledWith("December-2023");
-
-                wrapper.unmount();
-            });
-        });
-
-        describe("when getInitialViewWeeks is run...", () => {
-            test("expect that 5 weeks will be returned when no preselected date", () => {
-                // Arrange
-                const { wrapper } = setupMocks({});
-                const todayString = "2023-02-01";
-
-                // Act
-                const testResult = wrapper.vm.getInitialViewWeeks(todayString, 5);
-
-                // Assert
-                expect(testResult.length).toBe(5);
-
-                wrapper.unmount();
-            });
-
-            test("expect that today will be in the start/end range of dates of the first week when no preselected date", () => {
-                // Arrange
-                const { wrapper } = setupMocks({});
-                const todayString = "2023-02-01";
-
-                // Act
-                const testResult = wrapper.vm.getInitialViewWeeks(todayString, 5);
-
-                // Assert
-                expect(
-                    testResult[0].weekStartDate <= todayString &&
-                        todayString <= testResult[0].weekEndDate
-                ).toBe(true);
-
-                wrapper.unmount();
-            });
-
-            test("expect that single weeks that span 2 months will be split into separate shorter 'week' spans", () => {
-                // Arrange
-                const { wrapper } = setupMocks({});
-                const todayString = "2023-02-15";
-
-                // Act
-                const testResult = wrapper.vm.getInitialViewWeeks(todayString, 5);
-
-                // Assert
-                expect(testResult.length).toBe(5);
-                expect(testResult[0]).toMatchObject({
-                    weekStartDate: "2023-02-12",
-                });
-                expect(testResult[testResult.length - 1]).toMatchObject({
-                    weekEndDate: "2023-03-11",
-                });
-
-                wrapper.unmount();
-            });
-
-            test("expect that if today is 7/31/23 and there's a preselected date of 10/1/23 that there will be 14 initial weeks returned", () => {
-                // Arrange
-                const { wrapper } = setupMocks({});
-                const mockPreSelectedDate = "2023-10-01";
-
-                // Act
-                const testResult = wrapper.vm.getInitialViewWeeks(
-                    "2023-07-31",
-                    5,
-                    mockPreSelectedDate
-                );
-
-                // Assert
-                expect(testResult.length).toBe(14);
-
-                wrapper.unmount();
-            });
-
-            test("expect that if there's a preselected date that the last week end date will be the end of the month of the preselected date", () => {
-                // Arrange
-                const { wrapper } = setupMocks({});
-                const mockPreSelectedDate = "2023-10-01";
-
-                // Act
-                const testResult = wrapper.vm.getInitialViewWeeks(
-                    "2023-07-31",
-                    5,
-                    mockPreSelectedDate
-                );
-
-                // Assert
-                expect(testResult[testResult.length - 1]).toMatchObject({
-                    weekEndDate: "2023-10-31",
-                });
-
-                wrapper.unmount();
-            });
-        });
-
-        describe("when there's a pre-selected date...", () => {
-            test("and loadInitialData runs, expect hideSomeDaysForInitialView and hideSecondMonth to be false", async () => {
-                // Arrange
-                // uses "2023-12-01" which would set both hideSomeDaysForInitialView and hideSecondMonth to true, unless there was a pre-selected date
-                const overrideDate = mockValuesForSetDate01.overrideDate;
-                const mockMonthEnd = mockValuesForSetDate01.monthEnd;
-                const mockInitialViewWeeks = mockValuesForSetDate01.initialViewWeeks;
-                const { wrapper } = setupMocks({
-                    propsData: {
-                        selectableDatesSetting: "custom",
-                        todayOverrideDateString: overrideDate,
-                    },
-                });
-
-                // Act
-                const localThis = {
-                    todayString: null,
-                    todayOverrideDateString: overrideDate,
-                    getMonthEnd: () => mockMonthEnd,
-                    getInitialViewWeeks: () => mockInitialViewWeeks,
-                };
-                const testResult = await datePicker.methods.loadInitialData.call(localThis, {
-                    selectableDatesSetting: "custom",
-                    initialViewRowsToShow: 5,
-                    getSelectableDatesCallback: mockPromiseResolve,
-                    preSelectedDate: "2024-01-01",
-                    todayOverrideDateString: overrideDate,
-                });
-
-                // Assert
-                expect(testResult).toMatchObject({
-                    hideSomeDaysForInitialView: false,
-                    hideSecondMonth: false,
-                });
-
-                wrapper.unmount();
-            });
-        });
-    });
-
-    describe("showAnotherMonth method...", () => {
-        test("expect that when hideSomeDaysForInitialView is true that it scrolls to correct month", async () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: mockValuesForSetDate01.overrideDate,
-                },
-            });
-            wrapper.vm.months = mockValuesForSetDate01.monthsData;
-            wrapper.vm.updateSelectableDates = jest.fn().mockImplementation();
-            wrapper.vm.scrollToElement = jest.fn().mockImplementation();
-            wrapper.vm.hideSomeDaysForInitialView = true;
-
-            // Act
-            await wrapper.vm.showAnotherMonth();
-
-            // // Assert
-            // expect(wrapper.vm.updateSelectableDates).toHaveBeenCalledWith(
-            //     "2023-12-31",
-            //     "2023-12-31"
-            // );
-            // expect(wrapper.vm.scrollToElement).toHaveBeenCalledWith("December-2023");
-
-            // wrapper.unmount();
-        });
-
-        test("expect that when hideSomeDaysForInitialView is false and direction is FUTURE that it scrolls to correct month", async () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: mockValuesForSetDate01.overrideDate,
-                },
-            });
-            wrapper.vm.months = [...mockValuesForSetDate01.monthsData]; // copy array w/o reference to original
-            wrapper.vm.updateSelectableDates = jest.fn().mockImplementation();
-            wrapper.vm.scrollToElement = jest.fn().mockImplementation();
-            wrapper.vm.hideSomeDaysForInitialView = false;
-
-            // Act
-            await wrapper.vm.showAnotherMonth();
-
-            // Assert
-            expect(wrapper.vm.updateSelectableDates).toHaveBeenCalledWith(
-                "2024-01-01",
-                "2024-01-31"
-            );
-            expect(wrapper.vm.scrollToElement).toHaveBeenCalledWith("January-2024");
-
-            wrapper.unmount();
-        });
-
-        test("expect that when hideSomeDaysForInitialView is false and direction is PAST that it scrolls to correct month", async () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "past",
-                    todayOverrideDateString: mockValuesForSetDate01.overrideDate,
-                },
-            });
-            // Force correct state for this test. // TODO - figure out why original array is getting mutated here, making next line necessary
-            mockValuesForSetDate01.monthsData[1].monthClass = " month-hidden";
-
-            wrapper.vm.months = [...mockValuesForSetDate01.monthsData]; // copy array w/o reference to original
-            wrapper.vm.updateSelectableDates = jest.fn().mockImplementation();
-            wrapper.vm.scrollToElement = jest.fn().mockImplementation();
-            wrapper.vm.hideSomeDaysForInitialView = false;
-
-            // Act
-            await wrapper.vm.showAnotherMonth();
-
-            // Assert
-            expect(wrapper.vm.updateSelectableDates).toHaveBeenCalledWith(
-                "2024-01-01",
-                "2024-01-31"
-            );
-            expect(wrapper.vm.scrollToElement).toHaveBeenCalledWith("January-2024");
-
-            wrapper.unmount();
-        });
-
-        test("expect that when the month to scroll to is the last available month that it will disable the View More Dates button", async () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: mockValuesForSetDate01.overrideDate,
-                },
-            });
-            wrapper.vm.months = [...mockValuesForSetDate01.monthsData]; // copy array w/o reference to original
-            wrapper.vm.updateSelectableDates = jest.fn().mockImplementation();
-            wrapper.vm.scrollToElement = jest.fn().mockImplementation();
-            wrapper.vm.disableViewMoreDatesButton = false;
-            mockValuesForSetDate01.monthsData[1].monthClass = " month-hidden last-available-month"; // Force correct state for this test.
-
-            // Act
-            await wrapper.vm.showAnotherMonth();
-
-            // Assert
-            expect(wrapper.vm.disableViewMoreDatesButton).toBe(true);
-
-            wrapper.unmount();
-        });
-    });
-
-    describe("updateSelectableDates method...", () => {
-        test("expect that new dates from callback are added to selectableDatesInshop", async () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: mockValuesForSetDate01.overrideDate,
-                    getMoreDatesCallback: jest.fn(() => mockCallbackResponse),
-                },
-            });
-            wrapper.vm.selectableDatesInshop = [
-                {
-                    date: "2023-12-30",
-                    timeSlots: [
-                        {
-                            id: "06747-01820-S-B*20453*7 AM",
-                            startTime: "07:00",
-                            endTime: "08:00",
-                            offerPremium: false,
-                        },
-                    ],
-                },
-            ];
-            wrapper.vm.months = mockValuesForSetDate01.monthsData;
-
-            // Act
-            await wrapper.vm.updateSelectableDates("2024-01-01", "2024-01-05");
-
-            const isFoundInArray = wrapper.vm.selectableDatesInshop.find((obj) => {
-                return obj.date === "2024-01-02";
-            });
-
-            // Assert
-            expect(isFoundInArray).not.toBeUndefined();
-
-            wrapper.unmount();
-        });
-
-        test("expect that isAvailable flag on selectable dates is set to true", async () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: mockValuesForSetDate01.overrideDate,
-                    getMoreDatesCallback: jest.fn(() => mockCallbackResponse),
-                },
-            });
-            wrapper.vm.selectableDatesInshop = [
-                {
-                    date: "2023-12-30",
-                    timeSlots: [
-                        {
-                            id: "06747-01820-S-B*20453*7 AM",
-                            startTime: "07:00",
-                            endTime: "08:00",
-                            offerPremium: false,
-                        },
-                    ],
-                },
-            ];
-            wrapper.vm.months = mockValuesForSetDate01.monthsData;
-
-            // Act
-            await wrapper.vm.updateSelectableDates("2024-01-01", "2024-01-05");
-            const targetMonth = wrapper.vm.months.find((month) => {
-                return month.monthString === "January-2024";
-            });
-
-            console.log("TEST   targetMonth: ", targetMonth);
-
-            const dateInArray = targetMonth.datesInshop.find((date) => {
-                return date.inputValue === "2024-01-02";
-            });
-
-            // Assert
-            expect(dateInArray).toMatchObject({
-                isAvailable: true,
-            });
-
-            wrapper.unmount();
-        });
-    });
-
-    describe("scrollToElement method...", () => {
-        test("expect that new dates from callback are added to selectableDatesInshop", () => {
-            // Arrange
-            const container = document.createElement("div");
-            container.classList.add("page-container-grouped-styles");
-            const targetElement = document.createElement("div");
-            targetElement.setAttribute("id", "January-2024");
-            container.appendChild(targetElement);
-            document.body.appendChild(container);
-            window.requestAnimationFrame = jest.fn();
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: mockValuesForSetDate01.overrideDate,
-                },
-            });
-
-            // Act
-            wrapper.vm.scrollToElement("January-2024");
-
-            // Assert
-            expect(window.requestAnimationFrame).toBeCalled();
-
-            wrapper.unmount();
-        });
-    });
-
-    describe("If user selects a date...", () => {
-        test("expect it will emit update:modelValue", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: "2023-07-05",
-                },
-            });
-            const dateToSelect = "2023-07-07";
-
-            // Act
-            wrapper.setValue({ selectedDate: dateToSelect });
-
-            // Assert
-            expect(wrapper.emitted()["update:modelValue"][0]).toEqual([
-                { selectedDate: "2023-07-07" },
-            ]);
-
-            wrapper.unmount();
-        });
-
-        test("expect watched modelValue will be triggered", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: "2023-07-05",
-                },
-            });
-            const dateToSelect = "2023-07-07";
-            wrapper.vm.resetField = jest.fn();
-
-            // Act
-            wrapper.vm.$options.watch.modelValue.call(wrapper.vm, dateToSelect);
-
-            // Assert
-            expect(wrapper.vm.resetField).toBeCalled();
-            expect(wrapper.vm.resetField).toBeCalledWith({ value: dateToSelect });
-
-            wrapper.unmount();
-        });
-    });
-
-    describe("If fireDateSelectedEvent runs... ", () => {
-        test("expect it will emit date-clicked on mouse clicks ", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                },
-            });
-
-            // Act
-            wrapper.vm.fireDateSelectedEvent({});
-            const flattenedEmitted = JSON.stringify(wrapper.emitted());
-
-            // Assert
-            expect(wrapper.emitted()).toHaveProperty("date-clicked");
-            expect(flattenedEmitted.includes("date-clicked")).toBeTruthy;
-
-            wrapper.unmount();
-        });
-
-        test("expect it will NOT emit date-clicked on keyboard arrow navigation ", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                },
-            });
-
-            // Act
-            wrapper.vm.fireDateSelectedEvent({ screenX: 0, screenY: 0 });
-            const flattenedEmitted = JSON.stringify(wrapper.emitted());
-
-            // Assert
-            expect(wrapper.emitted()).not.toHaveProperty("date-clicked");
-            expect(flattenedEmitted.includes("date-clicked")).toBe(false);
-
-            wrapper.unmount();
-        });
-    });
-
-    describe("If user triggers a validation error...", () => {
-        test("expect that watched errorMessage will be triggered", () => {
-            // Arrange
-            const { wrapper } = setupMocks({
-                propsData: {
-                    selectableDatesSetting: "custom",
-                    todayOverrideDateString: "2023-07-05",
-                },
-            });
-            wrapper.vm.scrollToElement = jest.fn();
-
-            // Act
-            wrapper.vm.$options.watch.errorMessage.call(wrapper.vm, "anything");
-
-            // Assert
-            expect(wrapper.vm.scrollToElement).toBeCalled();
-            expect(wrapper.vm.scrollToElement).toBeCalledWith("date-of-month-error");
-
-            wrapper.unmount();
-        });
-    });
-});
-
-function setupMocks(mountOptionsMockData = {}) {
-    store.getters = {
-        order: {
-            serviceLocation: { appointmentType: "Inshop", provider: { providerNumber: "12345" } },
-        },
-        lineItems: { supportingItems: [] },
-    };
-    const initialMountOptionsMockData = {
-        store: {
-            getters: store.getters,
-        },
-    };
-    const mountOptions = getMountOptions(
-        Object.assign(initialMountOptionsMockData, mountOptionsMockData)
-    );
-
-    const wrapper = shallowMount(datePicker, mountOptions);
-
-    return { wrapper };
-}

From 347aaa7265a57ad4853f807c88b47a2460940ed7 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Tue, 3 Feb 2026 10:56:09 -0500
Subject: [PATCH 206/233] CASH-1790 - fix unit test warning

---
 src/digital-components/date-picker/date-picker.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index 21e63149e..fa8d14b62 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -170,7 +170,10 @@ export default {
         };
     },
     props: {
-        customComponentId: String,
+        customComponentId: {
+            type: String,
+            default: "",
+        },
         selectableDatesSetting: {
             type: String,
             validator(value) {

From 349c032815d6771dfd733188eaf4ff7d3f637cb2 Mon Sep 17 00:00:00 2001
From: Matt Sykes <Matthew.Sykes@safelite.com>
Date: Wed, 4 Feb 2026 10:32:40 -0500
Subject: [PATCH 207/233] Always set piaType unless its AfterPay

Changing payment methods after the first on payment.vue is not setting the new payment type.  A long ago bug fix for AfterPay is the issue, and we're good to still not allow the payment type be set if its already set to AfterPay since closing that modal navigates back to payment-method.
---
 src/layouts/payment/payment.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index b8e481174..03c1c6edf 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -748,7 +748,8 @@ export default {
             // if the payment method is not set yet, then set it based on what HOP sends us
             if (
                 store.getters.order.payment.piaType == paymentMethods.PAY_NOW ||
-                store.getters.order.payment.piaType == paymentMethods.NONE
+                store.getters.order.payment.piaType == paymentMethods.NONE ||
+                store.getters.order.payment.piaType != paymentMethods.AFTERPAY
             ) {
                 console.log(new Date() + " UPDATE PaymentMethod from HOP:" + paymentMethod);
                 this.dispatchStoreAction(

From 5681a2111ba18e253805bd2eba8c937cb348a246 Mon Sep 17 00:00:00 2001
From: Matt Sykes <Matthew.Sykes@safelite.com>
Date: Wed, 4 Feb 2026 10:50:09 -0500
Subject: [PATCH 208/233] Added debug log statement

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

diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index 03c1c6edf..6c547f3d2 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -745,7 +745,12 @@ export default {
             }
         },
         updatePaymentMethod(paymentMethod) {
-            // if the payment method is not set yet, then set it based on what HOP sends us
+            debugLog(
+                `updatePaymentMethod(${paymentMethod}) and existing store.getters.order.payment.piaType = ${store?.getters?.order?.payment?.piaType}`
+            );
+
+            // if the payment method is not set yet, then set it based on what HOP sends
+            //  or if its not already set to AfterPay, always set it based on what HOP sends
             if (
                 store.getters.order.payment.piaType == paymentMethods.PAY_NOW ||
                 store.getters.order.payment.piaType == paymentMethods.NONE ||

From d4d298b2680add089284edfbc31f6480e344f292 Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Wed, 4 Feb 2026 11:11:42 -0500
Subject: [PATCH 209/233] CASH-611 - C&C 2.0 | front-end | policy-info page |
 create page

---
 src/constants/progress-bar-mapper.js        |  4 ++
 src/layouts/policy-info/policy-info.spec.js | 72 +++++++++++++++++++
 src/layouts/policy-info/policy-info.vue     | 77 +++++++++++++++++++++
 src/router/constants/routes.js              |  4 ++
 src/router/constants/routing-table.js       |  4 ++
 src/router/methods/routes.js                |  1 +
 6 files changed, 162 insertions(+)
 create mode 100644 src/layouts/policy-info/policy-info.spec.js
 create mode 100644 src/layouts/policy-info/policy-info.vue

diff --git a/src/constants/progress-bar-mapper.js b/src/constants/progress-bar-mapper.js
index a57774c21..b21c6c9c7 100644
--- a/src/constants/progress-bar-mapper.js
+++ b/src/constants/progress-bar-mapper.js
@@ -48,6 +48,10 @@ export const pageProgressMapper = {
         percent: 30,
         step: 1,
     },
+    "policy-info": {
+        percent: 55,
+        step: 2,
+    },
     quote: {
         percent: 60,
         step: 2,
diff --git a/src/layouts/policy-info/policy-info.spec.js b/src/layouts/policy-info/policy-info.spec.js
new file mode 100644
index 000000000..d79cd7cad
--- /dev/null
+++ b/src/layouts/policy-info/policy-info.spec.js
@@ -0,0 +1,72 @@
+import policyInfo from "@/layouts/policy-info/policy-info.vue";
+import { shallowMount } from "@vue/test-utils";
+import { getMountOptions } from "@/helpers/unit-test-helper.js";
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import { settleAllPromises } from "@/helpers/layout-helper";
+
+// Mock our module for promises.
+jest.mock("@/helpers/layout-helper.js", () => ({
+    settleAllPromises: jest.fn(),
+}));
+
+// Mock fetchCmsContentForPage
+jest.mock("@/helpers/cms-content-helper", () => ({
+    fetchCmsContentForPage: jest.fn(),
+}));
+
+describe("policy-info.vue", () => {
+    describe("component rendering", () => {
+        test("renders funnelHeader component", () => {
+            const { wrapper } = setupMocks();
+            expect(wrapper.findComponent({ name: "funnelHeader" }).exists()).toBe(true);
+        });
+
+        test("renders funnelSubHeader component", () => {
+            const { wrapper } = setupMocks();
+            expect(wrapper.findComponent({ name: "funnelSubHeader" }).exists()).toBe(true);
+        });
+
+        test("renders navbar component", () => {
+            const { wrapper } = setupMocks();
+            expect(wrapper.findComponent({ name: "navbar" }).exists()).toBe(true);
+        });
+
+        test("renders Form component", () => {
+            const { wrapper } = setupMocks();
+            expect(wrapper.findComponent({ name: "Form" }).exists()).toBe(true);
+        });
+    });
+
+    describe("methods", () => {
+        test("arePagePrerequisitesValid returns true", () => {
+            const { wrapper } = setupMocks();
+            expect(wrapper.vm.arePagePrerequisitesValid()).toBe(true);
+        });
+
+    });
+
+});
+
+function setupMocks() {
+    const mockCmsContent = {
+        FunnelHeaderWidget: { Text: "Header" },
+        FunnelSubHeaderWidget: { Text: "Subheader" },
+        FunnelFooterWidget: { Text: "Footer" },
+    };
+
+    fetchCmsContentForPage.mockResolvedValue(mockCmsContent);
+    settleAllPromises.mockResolvedValue({ cmsContent: mockCmsContent });
+
+    const mountOptions = getMountOptions({
+        route: { name: "policy-info", query: {}, params: {} },
+        router: {
+            navigate: jest.fn(),
+            navigateWithSaving: jest.fn(),
+            navigateWithoutSaving: jest.fn(),
+        },
+    });
+
+    const wrapper = shallowMount(policyInfo, mountOptions);
+
+    return { wrapper };
+}
diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
new file mode 100644
index 000000000..58354e5c7
--- /dev/null
+++ b/src/layouts/policy-info/policy-info.vue
@@ -0,0 +1,77 @@
+<template>
+  <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
+    <div class="container-fluid">
+      <div class="row justify-content-center">
+        <div class="col-md-6">
+          <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        </div>
+      </div>
+      <div class="row justify-content-center">
+        <div class="col-md-6 col-xl-4">
+          <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
+          <!--
+            ... Page code goes here.
+          -->
+          <navbar
+            cmsWidgetName="FunnelFooterWidget"
+            ref="navbar"
+            :isForwardActionDisabled="!meta.valid"
+            @back-clicked="backButtonAction"
+            @ForwardClicked="forwardButtonAction" />
+        </div>
+      </div>
+    </div>
+  </Form>
+</template>
+
+<script> 
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import navbar from "@/fmg-components/nav-bar/nav-bar";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import { Form } from "vee-validate";
+
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import { settleAllPromises } from "@/helpers/layout-helper";
+
+export default {
+    name: "policy-info",
+    mixins: [],
+    data() {
+        return {};
+    },
+    components: {
+        Form,
+        funnelHeader,
+        navbar,
+        funnelSubHeader,
+    },
+    // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
+    async beforeRouteEnter( to, from, next ) {
+        const pageName = to.name;
+        const cmsContentPromise = fetchCmsContentForPage(pageName);
+        const promiseResultMap = [
+            {
+                resultKey: "cmsContent",
+                promise: cmsContentPromise,
+            },
+        ];
+        const resultMap = await settleAllPromises(promiseResultMap);
+        next((vm) => {
+            vm.setCmsContent(resultMap.cmsContent);
+        });
+    },
+   
+    methods: {
+        async backButtonAction() {
+        // Stub, for navigating back via nav-bar.
+        },
+        async forwardButtonAction() {
+        // Stub, for navigating forward via nav-bar
+        },
+        arePagePrerequisitesValid() {
+                return true;
+            },
+        },
+};
+</script>
+
diff --git a/src/router/constants/routes.js b/src/router/constants/routes.js
index 5090df2b3..47c37bb55 100644
--- a/src/router/constants/routes.js
+++ b/src/router/constants/routes.js
@@ -51,6 +51,10 @@ export const routeData = {
         name: "quote",
         path: "/quote",
     },
+    POLICY_INFO: {
+        name: "policy-info",
+        path: "/policy-info",
+    },
     INSURANCE_COMPANY: {
         name: "insurance-company",
         path: "/insurance-company",
diff --git a/src/router/constants/routing-table.js b/src/router/constants/routing-table.js
index d5f8e442c..2d2f49a25 100644
--- a/src/router/constants/routing-table.js
+++ b/src/router/constants/routing-table.js
@@ -429,6 +429,10 @@ const routingTable = function () {
                 },
             ],
         },
+        {
+            pageName: routeData.POLICY_INFO.name,
+            maps: [],
+        },
         {
             pageName: routeData.INSURANCE_COMPANY.name,
             maps: [
diff --git a/src/router/methods/routes.js b/src/router/methods/routes.js
index ec6077270..521ba43a1 100644
--- a/src/router/methods/routes.js
+++ b/src/router/methods/routes.js
@@ -41,6 +41,7 @@ export const routes = [
     createRoute(routeData.CONFIRMATION),
     createRoute(routeData.RETURN_USER),
     createRoute(routeData.MOBILE_DETAILS),
+    createRoute(routeData.POLICY_INFO),
 
     // Virtual pages (resolve to a non-virtual page.)
     createVirtualRoute(routeData.LANDING, landingBeforeEnter),

From 48a4757305899cc33e301a1563a6e7cc53678c82 Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Wed, 4 Feb 2026 11:24:02 -0500
Subject: [PATCH 210/233] CASH-611 - Formatted the files

---
 src/layouts/policy-info/policy-info.spec.js |  2 -
 src/layouts/policy-info/policy-info.vue     | 55 ++++++++++-----------
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/src/layouts/policy-info/policy-info.spec.js b/src/layouts/policy-info/policy-info.spec.js
index d79cd7cad..b3251154a 100644
--- a/src/layouts/policy-info/policy-info.spec.js
+++ b/src/layouts/policy-info/policy-info.spec.js
@@ -42,9 +42,7 @@ describe("policy-info.vue", () => {
             const { wrapper } = setupMocks();
             expect(wrapper.vm.arePagePrerequisitesValid()).toBe(true);
         });
-
     });
-
 });
 
 function setupMocks() {
diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index 58354e5c7..106a28d70 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -1,30 +1,30 @@
 <template>
-  <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-    <div class="container-fluid">
-      <div class="row justify-content-center">
-        <div class="col-md-6">
-          <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
-        </div>
-      </div>
-      <div class="row justify-content-center">
-        <div class="col-md-6 col-xl-4">
-          <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
-          <!--
+    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
+        <div class="container-fluid">
+            <div class="row justify-content-center">
+                <div class="col-md-6">
+                    <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+                </div>
+            </div>
+            <div class="row justify-content-center">
+                <div class="col-md-6 col-xl-4">
+                    <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
+                    <!--
             ... Page code goes here.
           -->
-          <navbar
-            cmsWidgetName="FunnelFooterWidget"
-            ref="navbar"
-            :isForwardActionDisabled="!meta.valid"
-            @back-clicked="backButtonAction"
-            @ForwardClicked="forwardButtonAction" />
+                    <navbar
+                        cmsWidgetName="FunnelFooterWidget"
+                        ref="navbar"
+                        :isForwardActionDisabled="!meta.valid"
+                        @back-clicked="backButtonAction"
+                        @ForwardClicked="forwardButtonAction" />
+                </div>
+            </div>
         </div>
-      </div>
-    </div>
-  </Form>
+    </Form>
 </template>
 
-<script> 
+<script>
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
@@ -46,7 +46,7 @@ export default {
         funnelSubHeader,
     },
     // Ensure CMS content is fetched during route navigation without depending on `to`/`from`
-    async beforeRouteEnter( to, from, next ) {
+    async beforeRouteEnter(to, from, next) {
         const pageName = to.name;
         const cmsContentPromise = fetchCmsContentForPage(pageName);
         const promiseResultMap = [
@@ -60,18 +60,17 @@ export default {
             vm.setCmsContent(resultMap.cmsContent);
         });
     },
-   
+
     methods: {
         async backButtonAction() {
-        // Stub, for navigating back via nav-bar.
+            // Stub, for navigating back via nav-bar.
         },
         async forwardButtonAction() {
-        // Stub, for navigating forward via nav-bar
+            // Stub, for navigating forward via nav-bar
         },
         arePagePrerequisitesValid() {
-                return true;
-            },
+            return true;
         },
+    },
 };
 </script>
-

From d9bacc2336abf554ad88678ea7706321422efd9d Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 4 Feb 2026 13:53:49 -0500
Subject: [PATCH 211/233] CASH-1790 remove outdated call

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

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index c4d566ae7..f01145524 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1844,7 +1844,6 @@ export default {
                 this.appointmentType = null;
             }
             this.setSelectedDateToFirstAvailable(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
-            this.setDisplayWaitList(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
         },
         setSelectedDateToFirstAvailable() {
             this.selectedDate = this.getFirstAvailableDate();

From 5202dbdff22701af68bdeeb4170524dbdfce0a38 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Wed, 4 Feb 2026 13:54:27 -0500
Subject: [PATCH 212/233] CASH-1790 name change and bug fix for 2298

---
 src/layouts/schedule/schedule.vue | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index f01145524..48424f085 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -98,11 +98,11 @@
                     linkWidgetName="ServiceZipLinkWidget"
                     modalWidgetName="ServiceZipModalWidget" />
             </div>
-            <div class="row your-shop-location" v-if="showInshopComponent">
+            <div class="row your-shop-location" v-if="showShopLocationComponent">
                 <div class="col-12 col-md-10 col-lg-8 col-xl-7">
                     <div>
                         <shopLocation
-                            v-if="showInshopComponent"
+                            v-if="showShopLocationComponent"
                             :selectedShop="selectedShopAnswer"
                             :selectedProviderNumberFromParent="selectedProvider?.providerNumber"
                             :shopProviderDataFromParent="shopProviderData"
@@ -633,19 +633,18 @@ export default {
                 this.handleZipCodeChange(newValue);
             },
         },
-        showInshopComponent() {
+        showShopLocationComponent() {
             // If we get no inshop or mobile data, then show the shoplocation component so the user is not
             // looking at a half blank screen with no way to try another zip/location.
             if (
-                (this.inshopTimeSlotsData === undefined &&
-                    this.mobileTimeSlotsData === undefined) ||
-                (this.inshopTimeSlotsData.days.length === 0 &&
-                    this.mobileTimeSlotsData.days.length === 0) ||
+                (this.selectableDatesInshop === undefined &&
+                    this.selectableDatesMobile === undefined) ||
+                (this.selectableDatesInshop?.days?.length === 0 &&
+                    this.selectableDatesMobile?.days?.length === 0) ||
                 (this.appointmentType && this.appointmentType !== AppointmentTypeStrings.MOBILE)
             ) {
                 return true;
             }
-
             return false;
         },
         isMobileSelected() {

From fbef955b6e77c0381feb1aaa978dd105e41cd154 Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Thu, 5 Feb 2026 08:49:59 -0500
Subject: [PATCH 213/233] CASH-1949 - Fixed email validation to accept multiple
 dots in domain

---
 .../save-progress-question/save-progress-question.vue           | 2 +-
 src/layouts/customer-details/customer-details.vue               | 2 +-
 src/layouts/estimate/estimate.vue                               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.vue b/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.vue
index 221aa3415..9e22f5a80 100644
--- a/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.vue
+++ b/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.vue
@@ -25,7 +25,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9-]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_.+]+)@([a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*\.)+([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/customer-details/customer-details.vue b/src/layouts/customer-details/customer-details.vue
index f5a7e1ac7..0ee884825 100644
--- a/src/layouts/customer-details/customer-details.vue
+++ b/src/layouts/customer-details/customer-details.vue
@@ -91,7 +91,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9-]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_.+]+)@([a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*\.)+([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 5e2ff4e15..60d050d73 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -70,7 +70,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9-]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_.+]+)@([a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*\.)+([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );

From fac3a8258b1c1e663cfa9321e1fa9a0ff9419b08 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Thu, 5 Feb 2026 09:52:04 -0500
Subject: [PATCH 214/233] CASH-2262 | Fix for the button showing up when it
 shouldn't

---
 .../sierra-webchat/sierra-webchat.vue             | 15 +++++++--------
 src/helpers/webchat-helper.js                     |  1 +
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index 2ba74b33a..b01755432 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -7,10 +7,15 @@ import analyticsMixin from "@/mixins/analytics-mixin";
 import store from "@/store";
 import { routeData } from "@/router/constants/routes";
 import { deepClone } from "@/helpers/object-helper";
+import { webchatHelper } from "@/helpers/webchat-helper";
 
 export default {
     name: "sierraWebchat",
     mixins: [analyticsMixin],
+    setup() {
+        const { webchatGlobalNonpersistedState, launchWebchat } = webchatHelper();
+        return { webchatGlobalNonpersistedState, launchWebchat };
+    },
     methods: {
         openSierraChatModal() {
             const sierra = window.sierraChat || window.sierra || window.SierraChat;
@@ -152,15 +157,9 @@ export default {
                         LastName: transfer.data.last_name,
                         Email: transfer.data.email,
                     });
-                    if (
-                        window.embeddedservice_bootstrap.utilAPI &&
-                        typeof window.embeddedservice_bootstrap.utilAPI.launchChat === "function"
-                    ) {
-                        window.embeddedservice_bootstrap.utilAPI.launchChat();
-                        return;
-                    }
                 }
-                window.embeddedservice_bootstrap.utilAPI.launchChat();
+                this.webchatGlobalNonpersistedState.shouldLaunchSierra = false;
+                this.launchWebchat();
             }
         };
         window.addEventListener("sierra-chat-transfer", this._handleSierraTransfer);
diff --git a/src/helpers/webchat-helper.js b/src/helpers/webchat-helper.js
index e5254d08d..1317f3341 100644
--- a/src/helpers/webchat-helper.js
+++ b/src/helpers/webchat-helper.js
@@ -8,6 +8,7 @@ const webchatGlobalNonpersistedState = reactive({
 
 export const webchatHelper = () => {
     function launchWebchat() {
+        webchatGlobalNonpersistedState.showWebchatButton = false;
         if (webchatGlobalNonpersistedState.shouldLaunchSierra) {
             window.dispatchEvent(new CustomEvent("launch-sierra-webchat")); // launches the sierra chat
         } else {

From 4704faca8882e74aa866dd1da904726e07fcf9d2 Mon Sep 17 00:00:00 2001
From: CarlNation <32103961+CarlNation@users.noreply.github.com>
Date: Thu, 5 Feb 2026 10:22:19 -0500
Subject: [PATCH 215/233] Revert "CASH-1949 - Fixed email validation to accept
 multiple dots in domain"

---
 .../save-progress-question/save-progress-question.vue           | 2 +-
 src/layouts/customer-details/customer-details.vue               | 2 +-
 src/layouts/estimate/estimate.vue                               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.vue b/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.vue
index 9e22f5a80..221aa3415 100644
--- a/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.vue
+++ b/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.vue
@@ -25,7 +25,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_.+]+)@([a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*\.)+([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9-]+)\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/customer-details/customer-details.vue b/src/layouts/customer-details/customer-details.vue
index 0ee884825..f5a7e1ac7 100644
--- a/src/layouts/customer-details/customer-details.vue
+++ b/src/layouts/customer-details/customer-details.vue
@@ -91,7 +91,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_.+]+)@([a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*\.)+([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9-]+)\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 60d050d73..5e2ff4e15 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -70,7 +70,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_.+]+)@([a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*\.)+([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9-]+)\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );

From 7958f99523251803e9609f68895c9c212ed167db Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Thu, 5 Feb 2026 10:31:12 -0500
Subject: [PATCH 216/233] Simplify sierra's interaction with button visibility

The webchathelper already contained the ability to communicate between classes without events
---
 .../salesforce-webchat/salesforce-webchat.vue |  3 --
 .../sierra-webchat/sierra-webchat.spec.js     |  8 -----
 .../sierra-webchat/sierra-webchat.vue         | 29 +++++++------------
 .../funnel-header/funnel-header.vue           | 22 +-------------
 4 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index da11702e3..db4f2e3b1 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -41,9 +41,6 @@ export default {
     beforeUnmount() {
         // Clean up event listeners and observers
         window.removeEventListener("sierra-chat-transfer", this._handleSierraToSalesforceTransfer);
-        if (this._salesforceChatOpenObserver) {
-            this._salesforceChatOpenObserver.disconnect();
-        }
     },
     methods: {
         initializeSalesforceWebchat() {
diff --git a/src/digital-components/sierra-webchat/sierra-webchat.spec.js b/src/digital-components/sierra-webchat/sierra-webchat.spec.js
index 964a4f52e..2fd3bd3a3 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.spec.js
+++ b/src/digital-components/sierra-webchat/sierra-webchat.spec.js
@@ -59,14 +59,6 @@ describe("sierraWebchat.vue", () => {
         expect(window.sierraChat.closeChatModal).toHaveBeenCalled();
     });
 
-    it("dispatches sierra-chat-closed on handleSierraOnClose", () => {
-        const eventSpy = jest.spyOn(window, "dispatchEvent");
-        wrapper.vm.createSierraConfig().onClose();
-        expect(eventSpy).toHaveBeenCalledWith(
-            expect.objectContaining({ type: "sierra-chat-closed" })
-        );
-    });
-
     it("dispatches sierra-chat-transfer on handleSierraOnTransfer", () => {
         const eventSpy = jest.spyOn(window, "dispatchEvent");
         const transfer = {
diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index b01755432..9383efe37 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -12,6 +12,11 @@ import { webchatHelper } from "@/helpers/webchat-helper";
 export default {
     name: "sierraWebchat",
     mixins: [analyticsMixin],
+    data() {
+        return {
+            transferInProgress: false,
+        };
+    },
     setup() {
         const { webchatGlobalNonpersistedState, launchWebchat } = webchatHelper();
         return { webchatGlobalNonpersistedState, launchWebchat };
@@ -40,11 +45,12 @@ export default {
                 display: "corner",
                 onLoad: () => this.openSierraChatModal(),
                 onOpen: () => {},
-                onClose: () => window.dispatchEvent(new CustomEvent("sierra-chat-closed")),
-                onTransfer: (transfer) =>
+                onClose: () => {if (!this.transferInProgress) {this.webchatGlobalNonpersistedState.showWebchatButton = true; this.transferInProgress = false;}},
+                onTransfer: (transfer) => {this.transferInProgress = true;
                     window.dispatchEvent(
-                        new CustomEvent("sierra-chat-transfer", { detail: transfer })
-                    ),
+                            new CustomEvent("sierra-chat-transfer", { detail: transfer })
+                        );
+                    },
             };
         },
         getSierraContext() {
@@ -163,25 +169,10 @@ export default {
             }
         };
         window.addEventListener("sierra-chat-transfer", this._handleSierraTransfer);
-
-        // Notify funnel-header about Sierra chat open/close state
-        this._sierraChatContainerObserver = new MutationObserver(() => {
-            const isOpen = !!document.querySelector("[data-sierra-chat-container]");
-            window.dispatchEvent(
-                new CustomEvent("sierra-chat-visibility", { detail: { open: isOpen } })
-            );
-        });
-        this._sierraChatContainerObserver.observe(document.body, {
-            childList: true,
-            subtree: true,
-        });
     },
     beforeUnmount() {
         window.removeEventListener("launch-sierra-webchat", this.triggerSierraChat);
         window.removeEventListener("sierra-chat-transfer", this._handleSierraTransfer);
-        if (this._sierraChatContainerObserver) {
-            this._sierraChatContainerObserver.disconnect();
-        }
     },
 };
 </script>
diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
index 00df5db87..7bfa3eef6 100644
--- a/src/fmg-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -79,16 +79,7 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "LogoImage");
         },
         shouldShowWebchatButton() {
-            // Hide the chat icon if Sierra chat is open
-            if (this.sierraChatOpen) {
-                return false;
-            }
-            // Show if either Sierra is enabled or Salesforce button is available and not hidden by page
-            return (
-                (this.webchatGlobalNonpersistedState.shouldLaunchSierra ||
-                    this.webchatGlobalNonpersistedState.showWebchatButton) &&
-                !this.shouldHideWebchatButtonOnPage
-            );
+            return this.webchatGlobalNonpersistedState.showWebchatButton;
         },
     },
     methods: {
@@ -116,10 +107,6 @@ export default {
         webchatClicked(event) {
             event.preventDefault();
             this.launchWebchat();
-            // Only set sierraChatOpen if Sierra experiment is active
-            if (this.webchatGlobalNonpersistedState.shouldLaunchSierra) {
-                this.sierraChatOpen = true;
-            }
         },
         syncSierraExperimentFlag() {
             const experiments = store.getters.applicationUser.experiments;
@@ -159,11 +146,6 @@ export default {
             unknownAlertEvent.displayAlert = true;
             this.globalAlertMessages.push(unknownAlertEvent);
         }
-        // Listen for Sierra chat open/close events from sierra-webchat
-        this._handleSierraChatVisibility = (event) => {
-            this.sierraChatOpen = !!(event.detail && event.detail.open);
-        };
-        window.addEventListener("sierra-chat-visibility", this._handleSierraChatVisibility);
 
         // Add scroll listener for header shadow effect
         this._handleScroll = () => {
@@ -172,8 +154,6 @@ export default {
         window.addEventListener("scroll", this._handleScroll);
     },
     beforeUnmount() {
-        window.removeEventListener("sierra-chat-closed", this._handleSierraChatClosed);
-        window.removeEventListener("sierra-chat-visibility", this._handleSierraChatVisibility);
         window.removeEventListener("sierra-chat-transfer", this._handleSierraToSalesforceTransfer);
         window.removeEventListener("scroll", this._handleScroll);
     },

From f2385c16f780241997620f575a4054b34f78ef85 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Thu, 5 Feb 2026 09:52:04 -0500
Subject: [PATCH 217/233] CASH-2262 | Fix for the button showing up when it
 shouldn't

---
 .../sierra-webchat/sierra-webchat.vue             | 15 +++++++--------
 src/helpers/webchat-helper.js                     |  1 +
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index 2ba74b33a..b01755432 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -7,10 +7,15 @@ import analyticsMixin from "@/mixins/analytics-mixin";
 import store from "@/store";
 import { routeData } from "@/router/constants/routes";
 import { deepClone } from "@/helpers/object-helper";
+import { webchatHelper } from "@/helpers/webchat-helper";
 
 export default {
     name: "sierraWebchat",
     mixins: [analyticsMixin],
+    setup() {
+        const { webchatGlobalNonpersistedState, launchWebchat } = webchatHelper();
+        return { webchatGlobalNonpersistedState, launchWebchat };
+    },
     methods: {
         openSierraChatModal() {
             const sierra = window.sierraChat || window.sierra || window.SierraChat;
@@ -152,15 +157,9 @@ export default {
                         LastName: transfer.data.last_name,
                         Email: transfer.data.email,
                     });
-                    if (
-                        window.embeddedservice_bootstrap.utilAPI &&
-                        typeof window.embeddedservice_bootstrap.utilAPI.launchChat === "function"
-                    ) {
-                        window.embeddedservice_bootstrap.utilAPI.launchChat();
-                        return;
-                    }
                 }
-                window.embeddedservice_bootstrap.utilAPI.launchChat();
+                this.webchatGlobalNonpersistedState.shouldLaunchSierra = false;
+                this.launchWebchat();
             }
         };
         window.addEventListener("sierra-chat-transfer", this._handleSierraTransfer);
diff --git a/src/helpers/webchat-helper.js b/src/helpers/webchat-helper.js
index e5254d08d..1317f3341 100644
--- a/src/helpers/webchat-helper.js
+++ b/src/helpers/webchat-helper.js
@@ -8,6 +8,7 @@ const webchatGlobalNonpersistedState = reactive({
 
 export const webchatHelper = () => {
     function launchWebchat() {
+        webchatGlobalNonpersistedState.showWebchatButton = false;
         if (webchatGlobalNonpersistedState.shouldLaunchSierra) {
             window.dispatchEvent(new CustomEvent("launch-sierra-webchat")); // launches the sierra chat
         } else {

From 6893aee1556b462f0636c31bcd3389faf66db692 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Thu, 5 Feb 2026 10:31:12 -0500
Subject: [PATCH 218/233] Simplify sierra's interaction with button visibility

The webchathelper already contained the ability to communicate between classes without events
---
 .../salesforce-webchat/salesforce-webchat.vue |  3 --
 .../sierra-webchat/sierra-webchat.spec.js     |  8 -----
 .../sierra-webchat/sierra-webchat.vue         | 29 +++++++------------
 .../funnel-header/funnel-header.vue           | 22 +-------------
 4 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index da11702e3..db4f2e3b1 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -41,9 +41,6 @@ export default {
     beforeUnmount() {
         // Clean up event listeners and observers
         window.removeEventListener("sierra-chat-transfer", this._handleSierraToSalesforceTransfer);
-        if (this._salesforceChatOpenObserver) {
-            this._salesforceChatOpenObserver.disconnect();
-        }
     },
     methods: {
         initializeSalesforceWebchat() {
diff --git a/src/digital-components/sierra-webchat/sierra-webchat.spec.js b/src/digital-components/sierra-webchat/sierra-webchat.spec.js
index 964a4f52e..2fd3bd3a3 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.spec.js
+++ b/src/digital-components/sierra-webchat/sierra-webchat.spec.js
@@ -59,14 +59,6 @@ describe("sierraWebchat.vue", () => {
         expect(window.sierraChat.closeChatModal).toHaveBeenCalled();
     });
 
-    it("dispatches sierra-chat-closed on handleSierraOnClose", () => {
-        const eventSpy = jest.spyOn(window, "dispatchEvent");
-        wrapper.vm.createSierraConfig().onClose();
-        expect(eventSpy).toHaveBeenCalledWith(
-            expect.objectContaining({ type: "sierra-chat-closed" })
-        );
-    });
-
     it("dispatches sierra-chat-transfer on handleSierraOnTransfer", () => {
         const eventSpy = jest.spyOn(window, "dispatchEvent");
         const transfer = {
diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index b01755432..9383efe37 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -12,6 +12,11 @@ import { webchatHelper } from "@/helpers/webchat-helper";
 export default {
     name: "sierraWebchat",
     mixins: [analyticsMixin],
+    data() {
+        return {
+            transferInProgress: false,
+        };
+    },
     setup() {
         const { webchatGlobalNonpersistedState, launchWebchat } = webchatHelper();
         return { webchatGlobalNonpersistedState, launchWebchat };
@@ -40,11 +45,12 @@ export default {
                 display: "corner",
                 onLoad: () => this.openSierraChatModal(),
                 onOpen: () => {},
-                onClose: () => window.dispatchEvent(new CustomEvent("sierra-chat-closed")),
-                onTransfer: (transfer) =>
+                onClose: () => {if (!this.transferInProgress) {this.webchatGlobalNonpersistedState.showWebchatButton = true; this.transferInProgress = false;}},
+                onTransfer: (transfer) => {this.transferInProgress = true;
                     window.dispatchEvent(
-                        new CustomEvent("sierra-chat-transfer", { detail: transfer })
-                    ),
+                            new CustomEvent("sierra-chat-transfer", { detail: transfer })
+                        );
+                    },
             };
         },
         getSierraContext() {
@@ -163,25 +169,10 @@ export default {
             }
         };
         window.addEventListener("sierra-chat-transfer", this._handleSierraTransfer);
-
-        // Notify funnel-header about Sierra chat open/close state
-        this._sierraChatContainerObserver = new MutationObserver(() => {
-            const isOpen = !!document.querySelector("[data-sierra-chat-container]");
-            window.dispatchEvent(
-                new CustomEvent("sierra-chat-visibility", { detail: { open: isOpen } })
-            );
-        });
-        this._sierraChatContainerObserver.observe(document.body, {
-            childList: true,
-            subtree: true,
-        });
     },
     beforeUnmount() {
         window.removeEventListener("launch-sierra-webchat", this.triggerSierraChat);
         window.removeEventListener("sierra-chat-transfer", this._handleSierraTransfer);
-        if (this._sierraChatContainerObserver) {
-            this._sierraChatContainerObserver.disconnect();
-        }
     },
 };
 </script>
diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
index 00df5db87..7bfa3eef6 100644
--- a/src/fmg-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -79,16 +79,7 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "LogoImage");
         },
         shouldShowWebchatButton() {
-            // Hide the chat icon if Sierra chat is open
-            if (this.sierraChatOpen) {
-                return false;
-            }
-            // Show if either Sierra is enabled or Salesforce button is available and not hidden by page
-            return (
-                (this.webchatGlobalNonpersistedState.shouldLaunchSierra ||
-                    this.webchatGlobalNonpersistedState.showWebchatButton) &&
-                !this.shouldHideWebchatButtonOnPage
-            );
+            return this.webchatGlobalNonpersistedState.showWebchatButton;
         },
     },
     methods: {
@@ -116,10 +107,6 @@ export default {
         webchatClicked(event) {
             event.preventDefault();
             this.launchWebchat();
-            // Only set sierraChatOpen if Sierra experiment is active
-            if (this.webchatGlobalNonpersistedState.shouldLaunchSierra) {
-                this.sierraChatOpen = true;
-            }
         },
         syncSierraExperimentFlag() {
             const experiments = store.getters.applicationUser.experiments;
@@ -159,11 +146,6 @@ export default {
             unknownAlertEvent.displayAlert = true;
             this.globalAlertMessages.push(unknownAlertEvent);
         }
-        // Listen for Sierra chat open/close events from sierra-webchat
-        this._handleSierraChatVisibility = (event) => {
-            this.sierraChatOpen = !!(event.detail && event.detail.open);
-        };
-        window.addEventListener("sierra-chat-visibility", this._handleSierraChatVisibility);
 
         // Add scroll listener for header shadow effect
         this._handleScroll = () => {
@@ -172,8 +154,6 @@ export default {
         window.addEventListener("scroll", this._handleScroll);
     },
     beforeUnmount() {
-        window.removeEventListener("sierra-chat-closed", this._handleSierraChatClosed);
-        window.removeEventListener("sierra-chat-visibility", this._handleSierraChatVisibility);
         window.removeEventListener("sierra-chat-transfer", this._handleSierraToSalesforceTransfer);
         window.removeEventListener("scroll", this._handleScroll);
     },

From 3f43c4e6eb019e6ac2e504c310ffac74283113b5 Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Thu, 5 Feb 2026 10:40:13 -0500
Subject: [PATCH 219/233] Formatting

---
 .../sierra-webchat/sierra-webchat.vue            | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/digital-components/sierra-webchat/sierra-webchat.vue b/src/digital-components/sierra-webchat/sierra-webchat.vue
index 9383efe37..0b4381411 100644
--- a/src/digital-components/sierra-webchat/sierra-webchat.vue
+++ b/src/digital-components/sierra-webchat/sierra-webchat.vue
@@ -45,12 +45,18 @@ export default {
                 display: "corner",
                 onLoad: () => this.openSierraChatModal(),
                 onOpen: () => {},
-                onClose: () => {if (!this.transferInProgress) {this.webchatGlobalNonpersistedState.showWebchatButton = true; this.transferInProgress = false;}},
-                onTransfer: (transfer) => {this.transferInProgress = true;
+                onClose: () => {
+                    if (!this.transferInProgress) {
+                        this.webchatGlobalNonpersistedState.showWebchatButton = true;
+                        this.transferInProgress = false;
+                    }
+                },
+                onTransfer: (transfer) => {
+                    this.transferInProgress = true;
                     window.dispatchEvent(
-                            new CustomEvent("sierra-chat-transfer", { detail: transfer })
-                        );
-                    },
+                        new CustomEvent("sierra-chat-transfer", { detail: transfer })
+                    );
+                },
             };
         },
         getSierraContext() {

From 1704d114478d952fd95de969076ae7cd7bcc1ff2 Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Thu, 5 Feb 2026 08:49:59 -0500
Subject: [PATCH 220/233] CASH-1949 - Fixed email validation to accept multiple
 dots in domain

---
 .../save-progress-question/save-progress-question.vue           | 2 +-
 src/layouts/customer-details/customer-details.vue               | 2 +-
 src/layouts/estimate/estimate.vue                               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.vue b/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.vue
index 221aa3415..9e22f5a80 100644
--- a/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.vue
+++ b/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.vue
@@ -25,7 +25,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9-]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_.+]+)@([a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*\.)+([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/customer-details/customer-details.vue b/src/layouts/customer-details/customer-details.vue
index f5a7e1ac7..0ee884825 100644
--- a/src/layouts/customer-details/customer-details.vue
+++ b/src/layouts/customer-details/customer-details.vue
@@ -91,7 +91,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9-]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_.+]+)@([a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*\.)+([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 5e2ff4e15..60d050d73 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -70,7 +70,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9-]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_.+]+)@([a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*\.)+([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );

From bfe395d307c34e3a6b40ef7e9408596ec39b9d5d Mon Sep 17 00:00:00 2001
From: scottkiener-at-safelite <scott.kiener@safelite.com>
Date: Thu, 5 Feb 2026 14:46:47 -0500
Subject: [PATCH 221/233] Fix the webchat sitting under our components

---
 .../salesforce-webchat/salesforce-webchat.vue                  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/digital-components/salesforce-webchat/salesforce-webchat.vue b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
index db4f2e3b1..85d9d891d 100644
--- a/src/digital-components/salesforce-webchat/salesforce-webchat.vue
+++ b/src/digital-components/salesforce-webchat/salesforce-webchat.vue
@@ -130,6 +130,9 @@ export default {
 </script>
 
 <style lang="scss">
+.embedded-messaging > .embeddedMessagingFrame[class~="isMaximized"] {
+    z-index: 9999 !important;
+}
 .dockableContainer {
     &.showDockableContainer {
         color: $gray-600;

From 6e204f7ad217feb3b0332c0b6bb8945c7e52303e Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 6 Feb 2026 10:31:16 -0500
Subject: [PATCH 222/233] CASH-1790 add more unit tests

---
 jest.config.js                    | 6 +-----
 src/layouts/schedule/schedule.vue | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index 7b59ea2c1..6c0addf5f 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -32,11 +32,7 @@ module.exports = {
     "!src/layouts/payment-pia-return/*.vue", // Temp test exclusion while in development
     "!src/layouts/insurance/*.vue", // Temp test exclusion while in development
     "!src/layouts/insurance-company/*.vue", // Temp test exclusion while in development
-    "!src/layouts/schedule/**/*.vue", // Temp test exclusion while in development
     "!src/digital-components/date-picker/**/*.vue", // Temp test exclusion while in development
-
-    "!src/**/*-june-2025.vue", // Exclude these temporary files for CASH-845 project
-
     "!src/layouts/insurance-company/insurance-company-question/*.vue", // Temp test exclusion while in development
     "!src/experiment-components/*.vue",
     // END
@@ -44,7 +40,7 @@ module.exports = {
   testMatch: ["**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)"],
   coverageThreshold: {
     global: {
-      statements: 64,
+      statements: 68,
     },
   },
   // Uncomment this to avoid the massive amount of warnings we are getting for onSubmit and onInvalidSubmit
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 48424f085..e20c025fb 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1326,8 +1326,8 @@ export default {
             if (isMobileSelected === undefined) {
                 isMobileSelected = this.appointmentType === AppointmentTypeStrings.MOBILE;
             }
-            let storedDate = store.getters.order.schedule.date;
-            if (isMobileSelected) storedDate += "-mobile";
+            let storedDate = store.getters.order.schedule?.date;
+            if (isMobileSelected && storedDate) storedDate += "-mobile";
             return storedDate;
         },
         getSelectedTimeSlotInfo() {

From 2e0363ec78b098b9345d6d9c00b25950ba403615 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Fri, 6 Feb 2026 10:43:50 -0500
Subject: [PATCH 223/233] CASH-1790 add schedule  unit tests

---
 src/layouts/schedule/schedule.spec.js | 183 ++++++++++++++++++++++++++
 1 file changed, 183 insertions(+)
 create mode 100644 src/layouts/schedule/schedule.spec.js

diff --git a/src/layouts/schedule/schedule.spec.js b/src/layouts/schedule/schedule.spec.js
new file mode 100644
index 000000000..7d5cdcec1
--- /dev/null
+++ b/src/layouts/schedule/schedule.spec.js
@@ -0,0 +1,183 @@
+// Components
+import schedule from "@/layouts/schedule/schedule.vue";
+
+// Supporting Files
+import { shallowMount } from "@vue/test-utils";
+import { getMountOptions } from "@/helpers/unit-test-helper.js";
+import { routeData } from "@/router/constants/routes";
+import store from "@/store";
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+
+const storeMocked = {
+    getters: {
+        payment: { isInsurance: false },
+        order: {
+            payment: { isInsurance: false, insuranceCoverage: { isVerified: false } },
+            referralNumber: "",
+            serviceLocation: {
+                address: "",
+                address2: "",
+                city: "",
+                state: "",
+                zipCode: "00000",
+                zipCodeCtu: "000",
+                appointmentType: null,
+                provider: {},
+                isVehicleProtected: false,
+            },
+            schedule: {
+                date: "",
+                routeCode: "",
+                startTime: "",
+                endTime: "",
+                jobMinMinutes: null,
+                jobMaxMinutes: null,
+            },
+            policy: {
+                isItac: false,
+                isNoComp: false,
+            },
+            damage: { isRepair: false },
+            lineItems: { glassParts: [] },
+        },
+        vehicle: {
+            cardId: "",
+        },
+        lineItems: {
+            supportingItems: [],
+        },
+        applicationUser: {
+            experiments: [],
+        },
+        isMobileAppointment: false,
+    },
+};
+
+jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
+    navigateToHeritageFunnel: jest.fn(),
+}));
+
+describe("schedule.vue", () => {
+    describe("navigation", () => {
+        test("backButtonAction => non-insurance: navigateWithoutSaving called", () => {
+            // Arrange
+            const { wrapper, mocks } = setupMocks();
+
+            // Act
+            wrapper.vm.backButtonAction();
+
+            // Assert
+            expect(wrapper.vm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
+                mocks.navigationScenarios.CLICKED_BACK,
+                routeData.SCHEDULE.name
+            );
+        });
+
+        test("backButtonAction => insurance verified: navigateToHeritageFunnel called", () => {
+            // Arrange
+            store.getters.order.payment.isInsurance = true;
+            store.getters.order.payment.insuranceCoverage = { isVerified: true };
+            store.getters.order.referralNumber = "";
+            const { wrapper } = setupMocks();
+
+            // Act
+            wrapper.vm.backButtonAction();
+
+            // Assert
+            expect(navigateToHeritageFunnel).toHaveBeenCalledWith({
+                shouldSaveSession: false,
+                pageNameToLog: "schedule",
+                navType: "back",
+            });
+        });
+    });
+
+    describe("computed: isForwardActionDisabled", () => {
+        test("should be true when routeCode missing or appointmentType not set", async () => {
+            const { wrapper } = setupMocks();
+            await wrapper.setData({
+                selectedTimeSlotInfo: { timeSlot: { routeCode: null } },
+                appointmentType: null,
+            });
+            expect(wrapper.vm.isForwardActionDisabled).toBe(true);
+        });
+
+        test("should be false when routeCode present and appointmentType set", async () => {
+            const { wrapper } = setupMocks();
+            await wrapper.setData({
+                selectedTimeSlotInfo: { timeSlot: { routeCode: "RC123" } },
+                appointmentType: "SomeType",
+            });
+            expect(wrapper.vm.isForwardActionDisabled).toBe(false);
+        });
+    });
+
+    describe("computed: selectedRouteCodeData", () => {
+        test("should return null when routeCode not set", async () => {
+            const { wrapper } = setupMocks();
+            await wrapper.setData({
+                selectedTimeSlotInfo: { timeSlot: { routeCode: null } },
+            });
+            expect(wrapper.vm.selectedRouteCodeData).toBeNull();
+        });
+
+        test("should return routeCode and premium flag when set", async () => {
+            const { wrapper } = setupMocks();
+            await wrapper.setData({
+                selectedTimeSlotInfo: {
+                    timeSlot: { routeCode: "RC999" },
+                    isPremiumAppointment: true,
+                },
+            });
+            expect(wrapper.vm.selectedRouteCodeData).toEqual({
+                routeCode: "RC999",
+                isPremiumAppointment: true,
+            });
+        });
+    });
+
+    describe("forwardButtonAction (early exit path)", () => {
+        test("shows recal acknowledgement popup and does not navigate when required", async () => {
+            const { wrapper } = setupMocks();
+            // Force the recal-ack modal path
+            wrapper.vm.showRecalAcknowledgementModal = jest.fn(() => true);
+            await wrapper.setData({ isRecalAcknowledgedForScheduling: null });
+
+            await wrapper.vm.forwardButtonAction();
+
+            expect(wrapper.vm.showRecalAcknowledgementPopup).toBe(true);
+            expect(wrapper.vm.$router.navigateWithSaving).not.toHaveBeenCalled();
+        });
+    });
+});
+
+function setupMocks(mountOptionsMockData = {}) {
+    const route = { name: "schedule" };
+    const defaultMountOptions = {
+        route: route,
+        router: {
+            navigate: jest.fn(),
+            navigateWithSaving: jest.fn(),
+            navigateWithoutSaving: jest.fn(),
+        },
+        store: { ...storeMocked },
+    };
+    const mockBaseMixin = {
+        methods: {
+            getTierOnePackagePrice: jest.fn(),
+            filterOutFees: jest.fn(),
+            getCmsContent: jest.fn(),
+        },
+    };
+    const baseMountOptions = getMountOptions({
+        ...defaultMountOptions,
+        ...mountOptionsMockData,
+    });
+
+    baseMountOptions.global.mixins = [mockBaseMixin];
+    baseMountOptions.global.mocks.pageName = route.name;
+    const wrapper = shallowMount(schedule, baseMountOptions);
+    wrapper.getCmsContent = jest.fn();
+
+    return { wrapper, mocks: baseMountOptions.global?.mocks || {} };
+}

From 0258de8a010971a969dbfef4bb52997d185dae54 Mon Sep 17 00:00:00 2001
From: Minojhini Valaiyapathi <minojhini.valaiyapathi@safelite.com>
Date: Mon, 9 Feb 2026 09:47:38 -0500
Subject: [PATCH 224/233] CASH-611 - Updated the layout structure

---
 src/layouts/policy-info/policy-info.vue | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/layouts/policy-info/policy-info.vue b/src/layouts/policy-info/policy-info.vue
index 106a28d70..d1a9b80d2 100644
--- a/src/layouts/policy-info/policy-info.vue
+++ b/src/layouts/policy-info/policy-info.vue
@@ -1,17 +1,13 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <div class="container-fluid">
-            <div class="row justify-content-center">
-                <div class="col-md-6">
-                    <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
-                </div>
-            </div>
-            <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
+        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        <div class="container">
+            <div class="row">
+                <div class="col-12 col-md-10 col-lg-8 col-xl-7">
                     <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
                     <!--
-            ... Page code goes here.
-          -->
+                            ... Page code goes here.
+                    -->
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
                         ref="navbar"

From f1f777f48ce72575899bf7fda6098888647c76eb Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Mon, 9 Feb 2026 15:10:55 -0500
Subject: [PATCH 225/233] CASH-1938 Add Noindex Meta Tag

CASH-1938 Add Noindex Meta Tag
---
 public/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/index.html b/public/index.html
index 45f83a20f..ab8f27144 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en-US">
   <head>
+    <meta name="robots" content="noindex" />
     <script>
       window.dataLayer = [{}];
      </script>

From ec6424d0bbeb81ece41df403c97a67c6d3b71e99 Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Tue, 10 Feb 2026 10:22:22 -0500
Subject: [PATCH 226/233] CASH-2261: QPD for Curve Tempered glass

---
 src/constants/quote-page-discounts.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/constants/quote-page-discounts.js b/src/constants/quote-page-discounts.js
index 2dd32d915..3b61c136d 100644
--- a/src/constants/quote-page-discounts.js
+++ b/src/constants/quote-page-discounts.js
@@ -77,4 +77,29 @@ export const quotePageDiscountTable = [
         description: "PREM RCL GEOTARGET DISC",
         packageLevel: packageNames.TIER_THREE,
     },
+    // Replace - Curve Tempered
+    {
+        name: "Curve Tempered Glass Only",
+        experimentCode: "Show_GlassOnly_Replace_CT_Discount",
+        partNumber: "GL CT CSH PKG",
+        partType: partTypeStrings.QUOTE_PAGE_DISCOUNT,
+        description: "GLASS CT GEOTARGET DISC",
+        packageLevel: packageNames.TIER_ONE,
+    },
+    {
+        name: "Curve Tempered Standard",
+        experimentCode: "Show_Standard_Replace_CT_Discount",
+        partNumber: "STD CT CSH PKG",
+        partType: partTypeStrings.QUOTE_PAGE_DISCOUNT,
+        description: "STD CT GEOTARGET DISC",
+        packageLevel: packageNames.TIER_TWO,
+    },
+    {
+        name: "Curve Tempered Premium",
+        experimentCode: "Show_Premium_Replace_CT_Discount",
+        partNumber: "PRM CT CSH PKG",
+        partType: partTypeStrings.QUOTE_PAGE_DISCOUNT,
+        description: "PREM CT GEOTARGET DISC",
+        packageLevel: packageNames.TIER_THREE,
+    },
 ];

From 4980d77403a665348eea34df8bcb0732f6f1ba09 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Wed, 11 Feb 2026 11:56:21 -0500
Subject: [PATCH 227/233] CASH-2196 Build Glass.net and autoglassestimator.com
 into fmg 2.0

CASH-2196 Build Glass.net and autoglassestimator.com into fmg 2.0
---
 src/constants/store-mutations.js              |  1 +
 src/layouts/vehicle-damage/vehicle-damage.vue |  6 ++++-
 src/mixins/analytics-mixin.js                 | 24 +++++++++++++----
 .../helpers/initialize-from-querystrings.js   | 27 ++++++++++++++++++-
 src/store/index.js                            |  5 ++++
 5 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index 700f527c2..9b4b3719c 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -119,6 +119,7 @@ const storeMutations = {
     UPDATE_EXTERNAL_PARAMETER_SERVICE_PACKAGE: "updateExternalParameterServicePackage",
     UPDATE_EXTERNAL_PARAMETER_SOURCE: "updateExternalParameterSource",
     UPDATE_EXTERNAL_PARAMETER_PHONE_NUMBER: "updateExternalParameterPhoneNumber",
+    UPDATE_EXTERNAL_PARAMETER_QS_STASH: "updateExternalParameterQsStash",
 
     //RESET EXTERNAL_PARAMETER MUTATIONS
     RESET_EXTERNAL_PARAMETER_VEHICLE_STATE: "resetExternalParameterVehicleState",
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 83ffab532..88350a18c 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -93,6 +93,7 @@ import { errorMessages } from "@/constants/error-messages";
 import { damageLocationsCms } from "@/constants/damage-locations-cms.js";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected.js";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 import store from "@/store";
 import baseMixin from "@/mixins/base-mixin";
@@ -144,6 +145,7 @@ export default {
             if (store.getters.externalParameterState?.isExternalParameter) {
                 await nextTick();
                 const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
+                debugLog(`**** vehicle-damage is form valid: ${isValid}  ****`);
                 if (
                     store.getters.vehicle?.vehicleSubType === "MOTOR HOME" &&
                     store.getters.externalParameterDamage.damageType?.toUpperCase() ===
@@ -183,7 +185,7 @@ export default {
                     const selectedGlassToReplace =
                         resultMap.damageOptions.windshieldOptions.availableReplacementOptions;
 
-                    if (selectedGlassToReplace == damageLocationsSelected.SINGLE) {
+                    if (selectedGlassToReplace == damageLocationsSelected.SINGLE && store.getters.externalParameterDamage.damageType) {
                         vm.selectedWindshieldOptions.selectedWindshieldReplaceOptions.push(
                             damageLocationsSelected.SINGLE
                         );
@@ -251,6 +253,8 @@ export default {
             if (store.getters.vehicle.carId) {
                 return true;
             }
+            debugLog('**** Vehicle Page Prereq invalid ****');
+            debugLog("store.getters.vehicle.carId:", store.getters.vehicle?.carId, true);
             return false;
         },
         attachCustomEvents() {
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 0be50a8be..5a5e03bd7 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -31,7 +31,6 @@ import { applicationConfig } from "../constants/application-config";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
 import { routeData } from "@/router/constants/routes";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
-import { Variables } from "../constants/analytics";
 import { containsRecalParts, getRecalPartNumbers } from "@/helpers/recal-helper";
 import { getAmountDue, getSubTotal, getSalesTax } from "@/helpers/pricing-helper.js";
 import { partTypeStrings } from "@/constants/part-type-strings";
@@ -248,9 +247,27 @@ export default {
             }
 
             var appointment = `${order?.schedule?.date ?? ""} ${order?.schedule?.startTime ?? ""}`;
+            var currentPageName = getPageNameFromRouter();
+
+            // add query strings to the page name for debugging.  on the vehicle page, if from an external link, pull it from the stash
+            if (currentPageName === "vehicle") {
+                if (!window.location.search) {
+                    if (store.getters.externalParameterState?.qsStash) {
+                        currentPageName += `${store.getters.externalParameterState.qsStash}`;
+                    }
+                }
+                else {
+                    currentPageName += `${window.location.search}`;
+                }
+            }
+            else {
+                if (window.location.search) {
+                    currentPageName += `${window.location.search}`;
+                }
+            }
 
             var sessionData = {};
-            sessionData.currentPage = getPageNameFromRouter();
+            sessionData.currentPage = currentPageName;
             sessionData.sid = getSessionIdValue();
             sessionData.deviceId = getDeviceIdValue();
             sessionData.fmgSessionId = applicationUser?.savedSessionId;
@@ -952,9 +969,6 @@ export default {
         ValueToLogTypes() {
             return ValueToLogTypes;
         },
-        Variables() {
-            return Variables;
-        },
     },
 };
 
diff --git a/src/router/methods/helpers/initialize-from-querystrings.js b/src/router/methods/helpers/initialize-from-querystrings.js
index 2e12f88eb..8dff4423d 100644
--- a/src/router/methods/helpers/initialize-from-querystrings.js
+++ b/src/router/methods/helpers/initialize-from-querystrings.js
@@ -8,6 +8,7 @@ import { storeActions } from "@/constants/store-actions";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
 import { queryStrings } from "@/constants/query-strings";
 import { externalParameterStatus } from "@/constants/external-parameters";
+import { debugLog } from "@/helpers/debug-log-helper";
 
 export async function initializeFromQueryStrings() {
     // Get advertiser info
@@ -26,12 +27,13 @@ function setupAdvertisersAndAffiliates() {
 }
 
 function updateExternalParameterState() {
+    debugLog("--- updateExternalParameterState  ---");
     const externalParameterYear = getQuerystringParameter(queryStrings.VEHICLE_YEAR);
     const externalParameterMake = getQuerystringParameter(queryStrings.VEHICLE_MAKE);
     const externalParameterModel = getQuerystringParameter(queryStrings.VEHICLE_MODEL);
     const externalParameterStyle = getQuerystringParameter(queryStrings.VEHICLE_STYLE);
     const externalParameterDamage = getQuerystringParameter(queryStrings.VEHICLE_DAMAGE);
-    const externalParameterZipCode = getQuerystringParameter(queryStrings.SERVICE_ZIP);
+    let externalParameterZipCode = getQuerystringParameter(queryStrings.SERVICE_ZIP);
     const externalParameterEmail = getQuerystringParameter(queryStrings.EMAIL);
     const externalParameterIsInsurance = getQuerystringParameter(queryStrings.IS_INSURANCE);
     const externalParameterVinSelection = getQuerystringParameter(queryStrings.VIN_SELECTION);
@@ -39,6 +41,27 @@ function updateExternalParameterState() {
     const externalParameterNumberOfChips = getQuerystringParameter(queryStrings.NUMBER_OF_CHIPS);
     const externalParameterSource = getQuerystringParameter(queryStrings.EXPERIMENTS);
     const externalParameterPhoneNumber = getQuerystringParameter(queryStrings.PHONE_NUMBER);
+
+    if (!externalParameterZipCode) {
+        externalParameterZipCode = getQuerystringParameter(queryStrings.ZIP_CODE);
+    }
+
+    if (externalParameterYear || externalParameterZipCode) {
+        debugLog("externalParameterYear:", externalParameterYear);
+        debugLog("externalParameterMake:", externalParameterMake);
+        debugLog("externalParameterModel:", externalParameterModel);
+        debugLog("externalParameterStyle:", externalParameterStyle);
+        debugLog("externalParameterDamage:", externalParameterDamage);
+        debugLog("externalParameterZipCode:", externalParameterZipCode);
+        debugLog("externalParameterEmail:", externalParameterEmail);
+        debugLog("externalParameterIsInsurance:", externalParameterIsInsurance);
+        debugLog("externalParameterVinSelection:", externalParameterVinSelection);
+        debugLog("externalParameterServicePackage:", externalParameterServicePackage);
+        debugLog("externalParameterNumberOfChips:", externalParameterNumberOfChips);
+        debugLog("externalParameterSource:", externalParameterSource);
+        debugLog("externalPhoneNumber:", externalParameterPhoneNumber);
+    }
+
     if (
         externalParameterYear &&
         externalParameterMake &&
@@ -51,6 +74,7 @@ function updateExternalParameterState() {
         store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MAKE, externalParameterMake);
         store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_MODEL, externalParameterModel);
         store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_STYLE, externalParameterStyle);
+        store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_QS_STASH, window.location.search);
     }
     if (
         externalParameterDamage &&
@@ -100,6 +124,7 @@ function updateExternalParameterState() {
             externalParameterPhoneNumber
         );
     }
+    debugLog("--- updateExternalParameterState END ---");
 }
 
 // if there is an existing external parameter state then they have already been through from an external source(LeadGen) and
diff --git a/src/store/index.js b/src/store/index.js
index e9b379b56..c5d9846f9 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -516,6 +516,10 @@ export const mutations = {
         externalParameterState.vehicle.style = style;
         saveExternalParameterState(externalParameterState);
     },
+    updateExternalParameterQsStash(state, qsStash) {
+        externalParameterState.qsStash = qsStash;
+        saveExternalParameterState(externalParameterState);
+    },
     updateExternalParameterIsRepair(state, isRepair) {
         externalParameterState.vehicleDamage.isRepair = isRepair;
         saveExternalParameterState(externalParameterState);
@@ -4142,6 +4146,7 @@ function createExternalParameterDefaultState() {
     // create default externalParameter state
     const externalParameterDefaultState = {
         isExternalParameter: externalParameterStatus.NOT_SET,
+        qsStash: null,
         vehicle: {
             year: null,
             make: null,

From 5d29f077a343961be7fd255d2ab152b9f2be3f25 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Wed, 11 Feb 2026 12:02:22 -0500
Subject: [PATCH 228/233] prettier

---
 src/layouts/vehicle-damage/vehicle-damage.vue | 7 +++++--
 src/mixins/analytics-mixin.js                 | 6 ++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 88350a18c..7b313dbf7 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -185,7 +185,10 @@ export default {
                     const selectedGlassToReplace =
                         resultMap.damageOptions.windshieldOptions.availableReplacementOptions;
 
-                    if (selectedGlassToReplace == damageLocationsSelected.SINGLE && store.getters.externalParameterDamage.damageType) {
+                    if (
+                        selectedGlassToReplace == damageLocationsSelected.SINGLE &&
+                        store.getters.externalParameterDamage.damageType
+                    ) {
                         vm.selectedWindshieldOptions.selectedWindshieldReplaceOptions.push(
                             damageLocationsSelected.SINGLE
                         );
@@ -253,7 +256,7 @@ export default {
             if (store.getters.vehicle.carId) {
                 return true;
             }
-            debugLog('**** Vehicle Page Prereq invalid ****');
+            debugLog("**** Vehicle Page Prereq invalid ****");
             debugLog("store.getters.vehicle.carId:", store.getters.vehicle?.carId, true);
             return false;
         },
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 5a5e03bd7..238bed59d 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -255,12 +255,10 @@ export default {
                     if (store.getters.externalParameterState?.qsStash) {
                         currentPageName += `${store.getters.externalParameterState.qsStash}`;
                     }
-                }
-                else {
+                } else {
                     currentPageName += `${window.location.search}`;
                 }
-            }
-            else {
+            } else {
                 if (window.location.search) {
                     currentPageName += `${window.location.search}`;
                 }

From 706c29c9d3aa08dd75064718a41349e13cdb12ab Mon Sep 17 00:00:00 2001
From: kpatel8hs4io <31411746+kpatel8hs4io@users.noreply.github.com>
Date: Tue, 17 Feb 2026 00:09:55 -0500
Subject: [PATCH 229/233] fix broken playwright tests. added a new tests

---
 playwright-tests/framework/TestData.ts        |   1 +
 playwright-tests/pages/BasePage.ts            |  58 +++++
 playwright-tests/pages/PartQuestionPage.ts    |   2 +-
 playwright-tests/pages/PaypalPage.ts          |   6 +-
 playwright-tests/pages/SchedulePage.ts        |  23 +-
 playwright-tests/pages/ServicePackagesPage.ts |   4 +
 playwright-tests/tests/0000__M.test.ts        | 227 +++++++++---------
 .../tests/CashReplaceDynamicRecalMobile.ts    |   3 +-
 .../tests/CashReplaceStaticInshop.ts          |  78 ++++++
 .../tests/CashReplaceWiperDropoff.ts          |   2 +-
 .../tests/InsuranceNoCompProgressive.ts       |  11 +-
 11 files changed, 294 insertions(+), 121 deletions(-)
 create mode 100644 playwright-tests/tests/CashReplaceStaticInshop.ts

diff --git a/playwright-tests/framework/TestData.ts b/playwright-tests/framework/TestData.ts
index 1af123c41..9148db34e 100644
--- a/playwright-tests/framework/TestData.ts
+++ b/playwright-tests/framework/TestData.ts
@@ -7,4 +7,5 @@ export interface ITestData extends base {
     isOptedInForTextMessages: boolean,
     totalAmount?: number,
     isForcedOEM?: boolean
+    mockFirstInshopCallNoSchedule?: boolean
 }
\ No newline at end of file
diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts
index 1562677a2..4f7f54557 100644
--- a/playwright-tests/pages/BasePage.ts
+++ b/playwright-tests/pages/BasePage.ts
@@ -18,6 +18,7 @@ export class BasePage {
     readonly buttonLoadSpin: Locator;
     readonly hamburgerMenu: Locator;
     readonly progressBar: Locator;
+    readonly loaders: Locator;
 
     constructor(page: Page) {
         this.page = page;
@@ -27,6 +28,7 @@ export class BasePage {
         this.buttonLoadSpin = page.getByRole('alert');
         this.hamburgerMenu = this.page.getByRole('button', { name: 'Hamburger Menu (modal window)' });
         this.progressBar = this.page.locator('.progress-bar-outer .progress-bar-inner');
+        this.loaders = this.page.locator('.spinner-border, .loader');
     }
 
     async nextPage() {
@@ -131,6 +133,47 @@ export class BasePage {
         });
     }
 
+
+    async mockScheduleResponseForFirstInshopCallNoSchedule(customerDetails: ICustomerDetails) {
+        let fistInshopScheduleCall = true;
+
+        const apiUrl = `https://digitalapi.${process.env['PLAYWRIGHT_ENV']!.replace('sys', 'test').toLowerCase()}.safelite.io/schedule/api/v1/schedule/shop-time-slots`;
+        await this.page.route(apiUrl, async (route) => {
+            if (!fistInshopScheduleCall) {
+                return route.continue();
+            }
+            
+            // const fmt = (d: Date) => `${d.getFullYear()}-${String(d.getMonth()+1).padStart(2,"0")}-${String(d.getDate()).padStart(2,"0")}`;
+            // const startDate = new Date();
+            //const beginningOfWeek = new Date(startDate.getFullYear(), startDate.getMonth(), startDate.getDate() - startDate.getDay());
+            // const endDate = new Date(beginningOfWeek.getFullYear(), beginningOfWeek.getMonth(), beginningOfWeek.getDate() + 13);
+            // e.g., "2025-07-23"
+            /*if (route.request().postDataJSON().startDate === fmt(startDate) && route.request().postDataJSON().endDate === fmt(endDate)) {
+                const response = await route.fetch();
+                const responseBody = await response.json();
+
+                responseBody.days = [];
+                // Mock the response
+                await route.fulfill({
+                    response,
+                    body: JSON.stringify(responseBody),
+                });
+            }*/
+
+            const response = await route.fetch();
+            const responseBody = await response.json();
+
+            responseBody.days = [];
+            
+            // Mock the response
+            await route.fulfill({
+                response,
+                body: JSON.stringify(responseBody),
+            });
+            fistInshopScheduleCall = false;
+        });
+    }
+
     async getRepairPartsTotal(testData: Partial<ITestData>) {
         const apiUrl = `https://digitalapi.${process.env['PLAYWRIGHT_ENV']!.replace('sys', 'test').toLowerCase()}.safelite.io/price/api/v1/price/order-items`;
         await this.page.on('response', async (response) => {
@@ -170,6 +213,21 @@ export class BasePage {
         console.log(`Progress Bar Percentage: Actual - ${actualProgressPercentage} vs Expected - ${progressPercentage}`);
     }
 
+    async waitForPageOrComponentload(): Promise<void> {
+        await Promise.all([
+            (async () => {
+                const loaderCount = await this.loaders.count();
+                if (loaderCount > 0) {
+                    for (let i = 0; i < loaderCount; i++) {
+                        await this.loaders.nth(i).waitFor({ state: 'hidden' });
+                    }
+                }
+            })(),
+            this.page.waitForLoadState('load'),
+            this.page.waitForLoadState('networkidle')
+        ]);
+    }
+
     async validateOEMPart( isOEM: boolean): Promise<void> {
         if (isOEM!) {
         // Get Vuex state from localStorage
diff --git a/playwright-tests/pages/PartQuestionPage.ts b/playwright-tests/pages/PartQuestionPage.ts
index a6ecbc0bd..463746d0b 100644
--- a/playwright-tests/pages/PartQuestionPage.ts
+++ b/playwright-tests/pages/PartQuestionPage.ts
@@ -44,6 +44,7 @@ export class PartQuestionsPage extends BasePage {
             } else {
                 await expect(partQuestionOptions).not.toBeAttached();
             }
+            await this.selectPartQuestionResponses(partQuestions!);
         }
     }
 
@@ -65,7 +66,6 @@ export class PartQuestionsPage extends BasePage {
 
         await this.validateProgressBar(ProgressBarPercentages.PartQuestionsPage);
         await this.validatePartQuestions(partQuestions!);
-        await this.selectPartQuestionResponses(partQuestions!);
         await this.nextPage();
     }
 }
diff --git a/playwright-tests/pages/PaypalPage.ts b/playwright-tests/pages/PaypalPage.ts
index e67e0a57b..d0601ffcb 100644
--- a/playwright-tests/pages/PaypalPage.ts
+++ b/playwright-tests/pages/PaypalPage.ts
@@ -26,7 +26,7 @@ export class PaypalPage extends BasePage {
         this.paypalLoginButton = page.getByRole('button', { name: 'Log In', exact: true });
         this.completePurchaseButton = page.getByTestId('submit-button-initial')
         this.payWithRadioButton = page.getByRole('button').filter({ hasText: 'Pay with' });
-        this.payButton = page.locator('#one-time-cta');
+        this.payButton = page.locator('footer #one-time-cta');
         this.tryAnotherWayButton = page.getByRole('button', { name: 'Try another way' });
     }
 
@@ -50,8 +50,8 @@ export class PaypalPage extends BasePage {
             await this.passwordTextBox.fill(paymentDetails.password!);
             await this.paypalLoginButton.click();
             await this.payWithRadioButton.click();
-            await this.page.waitForTimeout(2000); // wait for 2 seconds to ensure the Pay button is clickable
+            await this.page.waitForTimeout(2000); 
             await this.payButton.dblclick();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/playwright-tests/pages/SchedulePage.ts b/playwright-tests/pages/SchedulePage.ts
index 944b84136..fdd3f30ec 100644
--- a/playwright-tests/pages/SchedulePage.ts
+++ b/playwright-tests/pages/SchedulePage.ts
@@ -36,6 +36,9 @@ export class SchedulePage extends BasePage {
     readonly allDayDropOffButton: Locator;
     readonly pickATimeButton: Locator;
     readonly mobileFirstModalCloseButton: Locator;
+    readonly yesButtonRecalAckModal: Locator;
+    readonly noButtonRecalAckModal: Locator;
+    readonly continueButtonRecalAckModal: Locator;
 
     constructor(page: Page) {
         super(page);
@@ -66,7 +69,10 @@ export class SchedulePage extends BasePage {
         this.viewMoreDatesLink = this.page.getByText(/View more dates/).first();
         this.appointmentDuration = this.page.locator('.duration-text-block');
         this.timeSlots = this.page.locator('fieldset:has(>legend#chooseTimeSlot) label').filter({ visible: true});
-        this.mobileFirstModalCloseButton = this.page.getByRole('dialog').getByRole('button', { name: 'Close' });
+        this.mobileFirstModalCloseButton = this.page.locator('#mobile-first-modal-container .btn-close');
+        this.yesButtonRecalAckModal = this.page.locator("label[buttonlabel='Yes']");
+        this.noButtonRecalAckModal = this.page.locator("label[buttonlabel='No']");
+        this.continueButtonRecalAckModal = this.page.locator("#recal-ack-modal-container .modal-footer button");
     }
 
     async selectLocation(testData: Partial<ITestData>) {
@@ -98,6 +104,7 @@ export class SchedulePage extends BasePage {
                 await this.safeliteShopsList.first().click();
                 // Click the save location button
                 await this.saveLocationButton.click();
+                await this.waitForPageOrComponentload();
             }
 
             // await this.inShopButton.click();
@@ -229,13 +236,25 @@ export class SchedulePage extends BasePage {
 
     @step("SchedulePage >> Schedule appointment: ")
     async handleSchedulePage(testData: Partial<ITestData>) {
-        const { appointmentDetails } = testData;
+        const { appointmentDetails, isCanNotRecal } = testData;
+        await this.waitForPageOrComponentload();
         await this.validateProgressBar(ProgressBarPercentages.SchedulePage);
         if (await this.mobileFirstModalCloseButton.isVisible()) {
             await this.mobileFirstModalCloseButton.click();
         }
         await this.selectLocation(testData);
+
+        if (await this.mobileFirstModalCloseButton.isVisible({timeout: 5000})) {
+            await this.page.waitForTimeout(1000);
+            await this.mobileFirstModalCloseButton.dblclick();
+        }
+
         await this.scheduleFirstAppointment(testData);
+
         await this.nextPage();
+        if (isCanNotRecal) {
+            await this.yesButtonRecalAckModal.click();
+            await this.continueButtonRecalAckModal.click();
+        }
     }
 }
diff --git a/playwright-tests/pages/ServicePackagesPage.ts b/playwright-tests/pages/ServicePackagesPage.ts
index ba95f67cd..2f16cb7b4 100644
--- a/playwright-tests/pages/ServicePackagesPage.ts
+++ b/playwright-tests/pages/ServicePackagesPage.ts
@@ -298,6 +298,10 @@ export class ServicePackagesPage extends BasePage {
             await this.mockScheduleResponseForEarlyBird(customerDetails!);
         }
 
+        if (testData.mockFirstInshopCallNoSchedule) {
+            await this.mockScheduleResponseForFirstInshopCallNoSchedule(testData.customerDetails!);
+        }
+
         await this.nextPage();
     }
 }
\ No newline at end of file
diff --git a/playwright-tests/tests/0000__M.test.ts b/playwright-tests/tests/0000__M.test.ts
index cd8270a8a..aebb3b978 100644
--- a/playwright-tests/tests/0000__M.test.ts
+++ b/playwright-tests/tests/0000__M.test.ts
@@ -1,4 +1,4 @@
-import { Page } from "@playwright/test";
+import { Browser, Page } from "@playwright/test";
 import { addSmokeTagToRandomTest, Flow, ServiceLocation } from 'safelite-playwright-core';
 import { ValidationOptions } from 'safelite-playwright-core';
 import heavyTruckTests from "./alert-validation/alert0001_HeavyTruck";
@@ -18,6 +18,7 @@ import cashReplaceGlassLicensePlateLookupInshopPaypalTests from "./CashReplaceGl
 import { ApiResponseInterceptUtil } from 'safelite-playwright-core';
 import cashReplaceGlassPromoInshopTests from "./CashReplaceGlassPromoInshop";
 import cashReplaceMultiGlassPromoInshopTests from "./CashReplaceMultiGlassPromoInshop";
+import cashReplaceStaticInshopTests from "./CashReplaceStaticInshop";
 import cashReplaceRainDefensePromoInshopTests from "./CashReplaceRainDefensePromoInshop";
 import cashReplaceSafeliteCanNotRecalMobileTests from "./CashReplaceSafeliteCanNotRecalMobile";
 import cashReplaceVinMobileTests from "./CashReplaceVinMobile";
@@ -61,33 +62,34 @@ addSmokeTagToRandomTest(splitWindshieldTests);
 
 // Standard test scenarios
 const allStandardTests = [
-    {name: "CashRepairMobileCreditCard", tests: cashRepairMobileCCTests},
-    {name: "CashRepairInShopAfterPay", tests: cashRepairInShopAfterPayTests},
-    {name: "CashRepairInShopPayPal", tests: cashRepairInShopPayPalTests},
-    {name: "CashReplaceDynamicRecalMobile", tests: cashReplaceDynamicRecalMobileTests}, 
-    {name: "CashReplaceGlassAddressLookupInshopAfterPay", tests: cashReplaceGlassAddressLookupInshopAfterPayTests},
-    {name: "CashReplaceGlassLicensePlateLookupInshopPaypal", tests: cashReplaceGlassLicensePlateLookupInshopPaypalTests},
-    {name: "CashReplaceGlassPromoInShop", tests: cashReplaceGlassPromoInshopTests},
-    {name: "CashReplaceMultiGlassPromoInShop", tests: cashReplaceMultiGlassPromoInshopTests},
-    {name: "CashReplaceMultiSlidingGlassDropoff",tests: cashReplaceMultiSlidingGlassDropoffTests},
-    {name: "CashReplaceMultiGlassMobile",tests: cashReplaceMultiGlassMobileTests},
-    {name: "CashReplaceRainDefensePromoInshop", tests: cashReplaceRainDefensePromoInshopTests},
-    {name: "CashReplaceSafeliteCanNotRecalMobile", tests: cashReplaceSafeliteCanNotRecalMobileTests},
-    {name: "CashReplaceVinMobile", tests: cashReplaceVinMobileTests},
-    {name: "CashReplaceWiperDropoff", tests: cashReplaceWiperDropoffTests},
-    {name: "CashReplaceWiperPromoInshop", tests: cashReplaceWiperPromoInShopTests},
-    {name: "CashReplaceSwitchToInsuranceProgressiveNoComp", tests: cashReplaceSwitchToInsuranceProgressiveNoCompTests},
+    { name: "CashRepairMobileCreditCard", tests: cashRepairMobileCCTests },
+    { name: "CashRepairInShopAfterPay", tests: cashRepairInShopAfterPayTests },
+    { name: "CashRepairInShopPayPal", tests: cashRepairInShopPayPalTests },
+    { name: "CashReplaceDynamicRecalMobile", tests: cashReplaceDynamicRecalMobileTests },
+    { name: "CashReplaceGlassAddressLookupInshopAfterPay", tests: cashReplaceGlassAddressLookupInshopAfterPayTests },
+    { name: "CashReplaceGlassLicensePlateLookupInshopPaypal", tests: cashReplaceGlassLicensePlateLookupInshopPaypalTests },
+    { name: "CashReplaceGlassPromoInShop", tests: cashReplaceGlassPromoInshopTests },
+    { name: "CashReplaceMultiGlassPromoInShop", tests: cashReplaceMultiGlassPromoInshopTests },
+    { name: "CashReplaceMultiSlidingGlassDropoff", tests: cashReplaceMultiSlidingGlassDropoffTests },
+    { name: "CashReplaceMultiGlassMobile", tests: cashReplaceMultiGlassMobileTests },
+    { name: "CashReplaceRainDefensePromoInshop", tests: cashReplaceRainDefensePromoInshopTests },
+    { name: "CashReplaceSafeliteCanNotRecalMobile", tests: cashReplaceSafeliteCanNotRecalMobileTests },
+    { name: "CashReplaceVinMobile", tests: cashReplaceVinMobileTests },
+    { name: "CashReplaceWiperDropoff", tests: cashReplaceWiperDropoffTests },
+    { name: "CashReplaceStaticInshop", tests: cashReplaceStaticInshopTests },
+    { name: "CashReplaceWiperPromoInshop", tests: cashReplaceWiperPromoInShopTests },
+    { name: "CashReplaceSwitchToInsuranceProgressiveNoComp", tests: cashReplaceSwitchToInsuranceProgressiveNoCompTests },
     // TODO: Uncomment when QA is ready to run heavy truck tests
     // {name: "CashReplaceSplitWindshield", tests: CashReplaceSplitWindshieldTests},
-    {name: "InsuranceAcuityPaypal", tests: insuranceAcuityPaypalTests},
-    {name: "InsuranceITAC21stCentury", tests: insuranceITAC21stCenturyTests},
-    {name: "InsuranceNoCompProgressive", tests: insuranceNoCompProgressiveTests},
+    { name: "InsuranceAcuityPaypal", tests: insuranceAcuityPaypalTests },
+    { name: "InsuranceITAC21stCentury", tests: insuranceITAC21stCenturyTests },
+    { name: "InsuranceNoCompProgressive", tests: insuranceNoCompProgressiveTests },
     // {name: "InsuranceBigTruckVerified", tests: insuranceBigTruckVerifiedTests},
-    {name: "InsuranceOEMAllstate", tests: insuranceOEMAllstateTests},
-    {name: "InsuranceUnverified", tests: insuranceUnverifiedTests},
+    { name: "InsuranceOEMAllstate", tests: insuranceOEMAllstateTests },
+    { name: "InsuranceUnverified", tests: insuranceUnverifiedTests },
     // {name: "InsuranceGeico", tests: insuranceGeicoTests},
     // {name: "InsuranceITACOptimizedPriceValidationAllState", tests: insuranceITACOptimizedPriceValidationAllStateTests}
-    {name: "InsuranceMeemicNearSchoolVerified", tests: insuranceMeemicNearSchoolVerifiedTests},
+    { name: "InsuranceMeemicNearSchoolVerified", tests: insuranceMeemicNearSchoolVerifiedTests },
 
 ];
 
@@ -146,7 +148,7 @@ async function run(page: Page, testInfo: TestInfo): Promise<void> {
         // Catch successful alert tests and log message
         if (error instanceof TestSuccessAlert) {
             console.log(error.message);
-        // Catch and throw other errors
+            // Catch and throw other errors
         } else {
             throw error;
         }
@@ -175,11 +177,11 @@ async function runWorkflow(page: Page, testCase: TestCase) {
     page.on('response', apiResponseInterceptUtil.handleInterceptResponse);
 
     // Destructure test data for easier access
-    const { 
-        paymentMethod, customerDetails, vehicleDetails, vehicleDamage, 
-        paymentDetails, partQuestions, isEnterFunnelWithZip, capabilityQuestions, 
+    const {
+        paymentMethod, customerDetails, vehicleDetails, vehicleDamage,
+        paymentDetails, partQuestions, isEnterFunnelWithZip, capabilityQuestions,
         vehiclePartQuestions, moldingQuestions, isSkipEstimatePage
-     } = testCase.testData;
+    } = testCase.testData;
 
     // Check if the vehicle damage includes a windshield crack
     const hasWindshieldCrack = vehicleDamage!.some(damage =>
@@ -193,7 +195,7 @@ async function runWorkflow(page: Page, testCase: TestCase) {
     //============================= TEST WORKFLOW STEPS =============================
 
     // Use Environment Variable to decide whether or not we want to skip content site aka home page
-    if (process.env.SKIP_CONTENT_SITE == "false") {     
+    if (process.env.SKIP_CONTENT_SITE == "false") {
         await test.step('HomePage >> Lets Get Started', async () => {
             let homePage = testCase.pages.homePage;
             console.log(`Customer for this test: ${customerDetails?.firstName} ${customerDetails?.lastName}`);
@@ -211,6 +213,16 @@ async function runWorkflow(page: Page, testCase: TestCase) {
         console.log(`Customer for this test: ${customerDetails?.firstName} ${customerDetails?.lastName}`);
     }
 
+    if (page.url().includes('ServiceDetails.aspx')) {
+        // Take a screenshot for diagnostics
+        await page.screenshot({ path: `test-results\\ortoni-data\\service-details-detected-${Date.now()}.png`, fullPage: true });
+        console.log("ServiceDetails.aspx detected");
+        await page.goBack();
+        await page.reload();
+        let homePage = testCase.pages.homePage;
+        await homePage.letsGetStarted(customerDetails?.address.postalCode!, !!isEnterFunnelWithZip!);
+    }
+
     // Handle vehicle selection page
     let vehicleSelectionPage = testCase.pages.vehicleSelectionPage;
     await vehicleSelectionPage.handleVehicleSelectionPage(testCase.testData);
@@ -223,24 +235,24 @@ async function runWorkflow(page: Page, testCase: TestCase) {
     if (hasWindshieldCrack && !isSkipEstimatePage) {
         let estimatePage = testCase.pages.estimatePage;
         await estimatePage.handleEstimatePage(testCase.testData);
-    
+
         // Handle different vehicle lookup methods
         switch (vehicleDetails!.vehicleLookupType!) {
             case VehicleLookupType.Address:
                 let vehicleLookupAddressPage = testCase.pages.vehicleLookupAddressPage;
                 await vehicleLookupAddressPage.handleVehicleLookupAddressPage(testCase.testData);
                 break;
-                
+
             case VehicleLookupType.LicensePlateNumber:
                 let vehicleLookupLicensePage = testCase.pages.vehicleLookupLicensePage;
                 await vehicleLookupLicensePage.handleVehicleLookupLicensePage(testCase.testData);
                 break;
-                
+
             case VehicleLookupType.Vin:
                 let vinLookupPage = testCase.pages.vinLookupPage;
                 await vinLookupPage.handleVehicleLookupVinPage(testCase.testData);
                 break;
-                
+
             case VehicleLookupType.Zip:
                 let serviceZipPage = testCase.pages.serviceZipPage;
                 await serviceZipPage.handleServiceZipPage(testCase.testData);
@@ -257,7 +269,7 @@ async function runWorkflow(page: Page, testCase: TestCase) {
         let partQuestionsPage = testCase.pages.partQuestionsPage;
         await partQuestionsPage.handlePartQuestionsPage(testCase.testData);
     }
-    
+
     // Handle molding questions if applicable
     if (moldingQuestions && moldingQuestions.length > 0) {
         let moldingQuestionsPage = testCase.pages.moldingQuestionsPage;
@@ -281,14 +293,14 @@ async function runWorkflow(page: Page, testCase: TestCase) {
     await servicePackagesPage.handleServicePackagePage(testCase.testData);
 
     //============================= INSURANCE FLOW =============================`   
-    
+
     // Insurance flow - if user selected Insurance as Payment Method
     if (paymentMethod == PaymentMethod.Insurance) {
         await handleInsuranceFlow(testCase);
     }
 
     //============================= SERVICE SCHEDULING =============================
-    
+
     // Select service location
     // let serviceLocationPage = testCase.pages.serviceLocationPage;
     // await serviceLocationPage.handleServiceLocationPage(testCase.testData);
@@ -307,7 +319,7 @@ async function runWorkflow(page: Page, testCase: TestCase) {
     await contactDetailsPage.handleContactDetailsPage(testCase.testData);
 
     //============================= PAYMENT PROCESSING =============================
-    
+
     // Handle payment
     let paymentMethodPage = testCase.pages.paymentMethodPage;
     await paymentMethodPage.handlePaymentMethodPage(testCase.testData);
@@ -318,91 +330,90 @@ async function runWorkflow(page: Page, testCase: TestCase) {
     }
 
     //============================= ORDER CONFIRMATION =============================
-    
+
     // Validate order confirmation
     let orderConfirmationPage = testCase.pages.orderConfirmationPage;
     await orderConfirmationPage.verifyOrderConfirmationPage(testCase.testData);
 }
 
-export async function handleInsuranceFlow(testCase: TestCase) {
+async function handleInsuranceFlow(testCase: TestCase) {
     const { isPolicyFound, isPolicyDriver, endorsements, isRecalVehicle, isCashInsuranceFlow, isForcedOEM, flow } = testCase.testData;
-        
-        // Check if the insurance policy has endorsements
-        const hasEndorsements = endorsements && endorsements.length > 0;
 
-        // Handle insurance company page
-        let insuranceCompanyPage = testCase.pages.insuranceCompanyPage;
-        await insuranceCompanyPage.handleInsuranceCompanyPage(testCase.testData);
+    // Check if the insurance policy has endorsements
+    const hasEndorsements = endorsements && endorsements.length > 0;
 
-        // Handle OEM scenario 
-        if (isForcedOEM) {
-            // User should be on heritage problem glass questions page after selecting Allstate on insurance company page
-                let HeritageProblemGlassQuestionsPage = testCase.pages.heritageProblemGlassQuestionsPage;
-                await HeritageProblemGlassQuestionsPage.handleHeritageProblemGlassQuestionsPage(testCase.testData);
-        }
-        
-        // Handle ccPolicyInfoPage
-        let ccPolicyInfoPage = testCase.pages.ccPolicyInfoPage;
-        await ccPolicyInfoPage.handleCCPolicyInfoPage(testCase.testData);
+    // Handle insurance company page
+    let insuranceCompanyPage = testCase.pages.insuranceCompanyPage;
+    await insuranceCompanyPage.handleInsuranceCompanyPage(testCase.testData);
 
-        let duplicateCheckPage = testCase.pages.duplicateCheckPage;
-        if (duplicateCheckPage.page.url().includes('DuplicateCheck.aspx')) {
-            await duplicateCheckPage.handleDuplicateCheckPage(testCase.testData);
+    // Handle OEM scenario 
+    if (isForcedOEM) {
+        // User should be on heritage problem glass questions page after selecting Allstate on insurance company page
+        let HeritageProblemGlassQuestionsPage = testCase.pages.heritageProblemGlassQuestionsPage;
+        await HeritageProblemGlassQuestionsPage.handleHeritageProblemGlassQuestionsPage(testCase.testData);
+    }
+
+    // Handle ccPolicyInfoPage
+    let ccPolicyInfoPage = testCase.pages.ccPolicyInfoPage;
+    await ccPolicyInfoPage.handleCCPolicyInfoPage(testCase.testData);
+
+    let duplicateCheckPage = testCase.pages.duplicateCheckPage;
+    if (duplicateCheckPage.page.url().includes('DuplicateCheck.aspx')) {
+        await duplicateCheckPage.handleDuplicateCheckPage(testCase.testData);
+    }
+
+    if (flow === Flow.Managed) {
+        let policyVehiclesPage = testCase.pages.policyVehiclesPage;
+        await policyVehiclesPage.handlePolicyVehiclesPage(testCase.testData);
+
+        // Handle policy driver selection if applicable
+        if (isPolicyDriver) {
+            let policyDriverPage = testCase.pages.policyDriverPage;
+            await policyDriverPage.handlePolicyDriverPage(testCase.testData);
         }
 
-        if ( flow === Flow.Managed ) {
-            let policyVehiclesPage = testCase.pages.policyVehiclesPage;
-            await policyVehiclesPage.handlePolicyVehiclesPage(testCase.testData);
-
-            // Handle policy driver selection if applicable
-            if (isPolicyDriver) {
-                let policyDriverPage = testCase.pages.policyDriverPage;
-                await policyDriverPage.handlePolicyDriverPage(testCase.testData);
-            }
-
-            // Handle endorsements if applicable
-            if (hasEndorsements) {
-                let endorsementsPage = testCase.pages.endorsementsPage;
-                await endorsementsPage.handleEndorsementsPage(testCase.testData);
-            }
-        } else {
-            
-            //Handle verify details page
-            let verifyDetailsPage = testCase.pages.verifyDetailsPage;
-            await verifyDetailsPage.handleVerifyDetailsPage(testCase.testData);
+        // Handle endorsements if applicable
+        if (hasEndorsements) {
+            let endorsementsPage = testCase.pages.endorsementsPage;
+            await endorsementsPage.handleEndorsementsPage(testCase.testData);
         }
+    } else {
 
-        // Handle Policy info submitted page
-        let policyInfoSubmittedPage = testCase.pages.policyInfoSubmittedPage;
-        await policyInfoSubmittedPage.handlePolicyInfoSubmittedPage();
+        //Handle verify details page
+        let verifyDetailsPage = testCase.pages.verifyDetailsPage;
+        await verifyDetailsPage.handleVerifyDetailsPage(testCase.testData);
+    }
 
-        if(isRecalVehicle)
-        {
-            let recalibrationInfoPage = testCase.pages.recalibrationInfoPage;
-            await recalibrationInfoPage.handleRecalibrationInfoPage();
+    // Handle Policy info submitted page
+    let policyInfoSubmittedPage = testCase.pages.policyInfoSubmittedPage;
+    await policyInfoSubmittedPage.handlePolicyInfoSubmittedPage();
+
+    if (isRecalVehicle) {
+        let recalibrationInfoPage = testCase.pages.recalibrationInfoPage;
+        await recalibrationInfoPage.handleRecalibrationInfoPage();
+    }
+
+    //handle coveraage statement page
+    let coverageStatementPage = testCase.pages.coverageStatementPage;
+    await coverageStatementPage.handleCoverageStatementPage(testCase.testData);
+
+    // Handle scenario where user selected Cash to Insurance and needs to go back through the flow
+    // right now we are choosing pay at appointment as payment method for this scenario
+    if (isCashInsuranceFlow) {
+        // Schedule appointment
+        let schedulePage = testCase.pages.schedulePage;
+        await schedulePage.handleSchedulePage(testCase.testData);
+
+        if (testCase.testData.appointmentDetails?.serviceLocation === ServiceLocation.Mobile) {
+            let mobileDetailsPage = testCase.pages.mobileDetailsPage;
+            await mobileDetailsPage.handleMobileDetailsPage(testCase.testData);
         }
+        //customer dertails
+        let contactDetailsPage = testCase.pages.contactDetailsPage;
+        await contactDetailsPage.nextPage();
 
-        //handle coveraage statement page
-        let coverageStatementPage = testCase.pages.coverageStatementPage;
-        await coverageStatementPage.handleCoverageStatementPage(testCase.testData);
-
-        // Handle scenario where user selected Cash to Insurance and needs to go back through the flow
-        // right now we are choosing pay at appointment as payment method for this scenario
-        if (isCashInsuranceFlow) {
-            // Schedule appointment
-            let schedulePage = testCase.pages.schedulePage;
-            await schedulePage.handleSchedulePage(testCase.testData);
-
-            if (testCase.testData.appointmentDetails?.serviceLocation === ServiceLocation.Mobile) {
-                let mobileDetailsPage = testCase.pages.mobileDetailsPage;
-                await mobileDetailsPage.handleMobileDetailsPage(testCase.testData);
-        }
-            //customer dertails
-            let contactDetailsPage = testCase.pages.contactDetailsPage;
-            await contactDetailsPage.nextPage();
-
-            //paymentmethods
-            let paymentMethodPage = testCase.pages.paymentMethodPage;
-            await paymentMethodPage.nextPage();
-        }
+        //paymentmethods
+        let paymentMethodPage = testCase.pages.paymentMethodPage;
+        await paymentMethodPage.nextPage();
+    }
 }
\ No newline at end of file
diff --git a/playwright-tests/tests/CashReplaceDynamicRecalMobile.ts b/playwright-tests/tests/CashReplaceDynamicRecalMobile.ts
index 5705a95a3..ffc2c9264 100644
--- a/playwright-tests/tests/CashReplaceDynamicRecalMobile.ts
+++ b/playwright-tests/tests/CashReplaceDynamicRecalMobile.ts
@@ -61,7 +61,8 @@ const cashReplaceDynamicRecalMobileData: Partial<ITestData> = {
     // Override payment details
     paymentDetails: {
         paymentType: PaymentType.PayAtService,
-        promoCode: 'digitalrain'
+        // promoCode: 'digitalrain'
+        promoCode: 'rain50'
     }
 }
 
diff --git a/playwright-tests/tests/CashReplaceStaticInshop.ts b/playwright-tests/tests/CashReplaceStaticInshop.ts
new file mode 100644
index 000000000..ca71b4cde
--- /dev/null
+++ b/playwright-tests/tests/CashReplaceStaticInshop.ts
@@ -0,0 +1,78 @@
+//Imports here
+import { ITestData } from 'framework/TestData'
+import { ServicePackage, PaymentType, PartQuestionType } from 'safelite-playwright-core';
+import { ITestCase } from '../framework/Typedefs'
+import { VehicleLookupType } from 'safelite-playwright-core';
+import { getDefaultTestData, setFakerSeedFromTestName } from 'safelite-playwright-core';
+import { PaymentMethod } from 'framework/localTypes/Enums';
+
+// Set the seed before generating any data
+setFakerSeedFromTestName("CashReplaceStaticInshop");
+
+// Now get the test data with the seeded faker
+const CashReplaceStaticInshopData: Partial<ITestData> = {
+    ...getDefaultTestData(),  // Get default data with current seed
+
+    // CASH Client
+    paymentMethod: PaymentMethod.SelfPay,
+   
+    // Key feature: Premium package with Rain Defense
+    servicePackage: ServicePackage.Standard,
+   
+    // Flag for recalibration vehicle
+    isRecalVehicle: true,
+   
+    // Override customer details
+    customerDetails: {
+        ...getDefaultTestData().customerDetails!,
+        address: {
+            ...getDefaultTestData().customerDetails!.address,
+            postalCode: '43085'
+        }
+    },
+
+    // override part questions
+    partQuestions: [
+        {
+            partQuestionType: PartQuestionType.GeneralQuestion1,
+            isOnPage: true,
+            optionToSelect: 'Yes'
+        },
+        {
+            partQuestionType: PartQuestionType.GeneralQuestion2,
+            isOnPage: true,
+            optionToSelect: 'Yes'
+        }
+    ],
+   
+    // Override vehicle details
+    vehicleDetails: {
+        ...getDefaultTestData().vehicleDetails!,
+        year: '2022',
+        make: 'Mazda',
+        model: 'CX-9',
+        style: '4 door utility',
+        vin: '3FA6P0HD8LR234510',
+        vehicleLookupType: VehicleLookupType.Zip
+    },
+
+    mockFirstInshopCallNoSchedule: true,
+   
+    // No need to override vehicleDamage as it already defaults to WindshieldCrack
+   
+    // Payment at service
+    paymentDetails: {
+        paymentType: PaymentType.PayAtService
+    },
+}
+
+const cashReplaceStaticInshopTests: ITestCase[] = [];
+
+const tc = {
+    name: `CashReplaceStaticInshop`,
+    tags: ['@E2E','@CashReplaceStaticInshop', '@test_report', '@CASH'],
+    testData: CashReplaceStaticInshopData
+};
+cashReplaceStaticInshopTests.push(tc);
+
+export default cashReplaceStaticInshopTests;
\ No newline at end of file
diff --git a/playwright-tests/tests/CashReplaceWiperDropoff.ts b/playwright-tests/tests/CashReplaceWiperDropoff.ts
index 09083fcd2..44a77a531 100644
--- a/playwright-tests/tests/CashReplaceWiperDropoff.ts
+++ b/playwright-tests/tests/CashReplaceWiperDropoff.ts
@@ -66,7 +66,7 @@ const cashReplaceWiperDropoffData: Partial<ITestData> = {
         },
         {
             partQuestionType: PartQuestionType.GeneralQuestion2,
-            isOnPage: false,
+            isOnPage: true,
             optionToSelect: 'Yes'
         },
     ]
diff --git a/playwright-tests/tests/InsuranceNoCompProgressive.ts b/playwright-tests/tests/InsuranceNoCompProgressive.ts
index e609d4120..a0f3a2594 100644
--- a/playwright-tests/tests/InsuranceNoCompProgressive.ts
+++ b/playwright-tests/tests/InsuranceNoCompProgressive.ts
@@ -32,10 +32,11 @@ const insuranceNoCompProgressiveData: Partial<ITestData> = {
         lastName: 'SCHATZ',
         address: {
             ...getDefaultTestData().customerDetails!.address,
-            city: 'Slidell',
-            state: 'Louisiana',
-            postalCode: '70458'
-        }
+            // city: 'Slidell',
+            // state: 'Louisiana',
+            // postalCode: '70458'
+            postalCode: '43085'
+        },
     },
 
    
@@ -71,7 +72,7 @@ const insuranceNoCompProgressiveData: Partial<ITestData> = {
     // Override for in-shop appointment
     appointmentDetails: {
         serviceLocation: ServiceLocation.InShop,
-        shopAddress: '56705 Garrett Road, Slidell, LA 70458',
+        // shopAddress: '56705 Garrett Road, Slidell, LA 70458',
         appointmentDate: getDefaultTestData().appointmentDetails?.appointmentDate
     },
        

From e52edddbe7c9c69834d2d2c0e9e7e0d8266f16e3 Mon Sep 17 00:00:00 2001
From: kpatel8hs4io <31411746+kpatel8hs4io@users.noreply.github.com>
Date: Thu, 19 Feb 2026 10:37:20 -0500
Subject: [PATCH 230/233] Added changes that support experiment management in
 playwright tests

---
 playwright-tests/.env                         |  9 ++-
 playwright-tests/.env.dev                     | 11 ++-
 playwright-tests/framework/TestData.ts        | 19 ++++-
 .../framework/localTypes/IExperiments.ts      |  4 +
 playwright-tests/pages/BasePage.ts            | 46 ++++++++---
 playwright-tests/pages/HomePage.ts            |  8 +-
 .../pages/OrderConfirmationPage.ts            | 20 ++++-
 playwright-tests/pages/PaymentMethodPage.ts   | 32 +++++++-
 playwright-tests/pages/SchedulePage.ts        | 23 +++++-
 playwright-tests/playwright.config.ts         |  2 +-
 playwright-tests/tests/0000__M.test.ts        |  4 +-
 .../tests/CashRepairInShopAfterPay.ts         |  9 ++-
 .../tests/CashRepairInShopPayPal.ts           |  9 ++-
 .../tests/CashRepairMobileCreditCard.ts       |  9 ++-
 .../tests/CashReplaceDynamicRecalMobile.ts    |  7 +-
 ...ReplaceGlassAddressLookupInshopAfterPay.ts |  9 ++-
 ...laceGlassLicensePlateLookupInshopPaypal.ts |  9 ++-
 .../tests/CashReplaceGlassPromoInshop.ts      |  7 +-
 .../tests/CashReplaceMobileFirstModal.ts      | 79 +++++++++++++++++++
 .../tests/CashReplaceMultiGlassMobile.ts      |  9 ++-
 .../tests/CashReplaceMultiGlassPromoInshop.ts |  9 ++-
 .../CashReplaceMultiSlidingGlassDropoff.ts    |  9 ++-
 .../CashReplaceRainDefensePromoInshop.ts      |  7 +-
 .../CashReplaceSafeliteCanNotRecalMobile.ts   |  9 ++-
 .../tests/CashReplaceSplitWindshield.ts       |  7 +-
 .../tests/CashReplaceStaticInshop.ts          |  7 +-
 ...placeSwitchToInsuranceProgressiveNoComp.ts |  7 +-
 .../tests/CashReplaceVinMobile.ts             |  7 +-
 .../tests/CashReplaceWiperDropoff.ts          |  9 ++-
 .../tests/CashReplaceWiperPromoInshop.ts      |  7 +-
 .../tests/InsuranceAcuityPaypal.ts            |  9 ++-
 .../tests/InsuranceBigTruckVerified.ts        |  9 ++-
 playwright-tests/tests/InsuranceGeico.ts      |  9 ++-
 .../tests/InsuranceITAC21stCentury.ts         |  9 ++-
 ...nceITACOptimizedPriceValidationAllState.ts |  9 ++-
 .../InsuranceMeemicNearSchoolVerified.ts      |  9 ++-
 .../tests/InsuranceNoCompProgressive.ts       |  9 ++-
 .../tests/InsuranceOEMAllState.ts             |  9 ++-
 playwright-tests/tests/InsuranceUnverified.ts |  9 ++-
 39 files changed, 404 insertions(+), 80 deletions(-)
 create mode 100644 playwright-tests/framework/localTypes/IExperiments.ts
 create mode 100644 playwright-tests/tests/CashReplaceMobileFirstModal.ts

diff --git a/playwright-tests/.env b/playwright-tests/.env
index 3429bc864..2b8d27d3e 100644
--- a/playwright-tests/.env
+++ b/playwright-tests/.env
@@ -5,7 +5,11 @@
 PLAYWRIGHT_ENV="qa"
 
 # Skip content site
-SKIP_CONTENT_SITE=false
+SKIP_CONTENT_SITE="false"
+
+# Experiments Flag
+IS_MOBILEFIRST="false"
+IS_ADYENPAYMENTS="false"
 
 # Base URLs by environment
 # qa
@@ -13,7 +17,8 @@ BASE_URL="https://www-qa2.safelite.com/"
 # local version of FMG (after running the local server)
 # BASE_URL="http://localhost:8080/fmg/"
 # qa with skipToInsurance Turned Off
-# BASE_URL="https://fixmyglassqa.safelite.com/?cns=all&experiments=ConceptFunnel=ConceptFunnel_V1=ConceptFunnel_VinAndEmailOptional=true,NextGen_IGQSkipToInsurance=NextGen_IGQSkipToInsurance_V1=NextGen_IGQSkipToInsurance_CONTROL=true"
+# BASE_URL="https://fixmyglassqa.safelite.com/?cns=all&experiments=ConceptFunnel=ConceptFunnel_V1=ConceptFunnel_VinAndEmailOptional=true"
+
 # sys
 # BASE_URL="https://www-test2.safelite.com/fmg/?fmgPage=vehicle"
 # dev
diff --git a/playwright-tests/.env.dev b/playwright-tests/.env.dev
index f02f656d0..8d2786918 100644
--- a/playwright-tests/.env.dev
+++ b/playwright-tests/.env.dev
@@ -5,15 +5,20 @@
 PLAYWRIGHT_ENV="qa"
 
 # Skip content site
-SKIP_CONTENT_SITE=false
+SKIP_CONTENT_SITE="false"
+
+# Experiments Flag
+IS_MOBILEFIRST="false"
+IS_ADYENPAYMENTS="false"
 
 # Base URLs by environment
 # qa
-# BASE_URL="https://www-qa2.safelite.com/"
+BASE_URL="https://www-qa2.safelite.com/"
 # local version of FMG (after running the local server)
 # BASE_URL="http://localhost:8080/fmg/"
 # qa with skipToInsurance Turned Off
-BASE_URL="https://www-qa2.safelite.com/?&experiments=ConceptFunnel=ConceptFunnel_V1=ConceptFunnel_VinAndEmailOptional=true"
+# BASE_URL="https://www-qa2.safelite.com/?&experiments=ConceptFunnel=ConceptFunnel_V1=ConceptFunnel_VinAndEmailOptional=true"
+
 # sys
 # BASE_URL="https://www-test2.safelite.com/fmg/?fmgPage=vehicle"
 # dev
diff --git a/playwright-tests/framework/TestData.ts b/playwright-tests/framework/TestData.ts
index 9148db34e..f863a74fd 100644
--- a/playwright-tests/framework/TestData.ts
+++ b/playwright-tests/framework/TestData.ts
@@ -1,11 +1,22 @@
-import { ITestData as base } from 'safelite-playwright-core'
+import { ITestData as base, getDefaultTestData } from 'safelite-playwright-core'
 import { PaymentMethod } from './localTypes/Enums'
+import { IExperiments } from './localTypes/IExperiments';
 
 export interface ITestData extends base {
     // Put any project-specific data here. Anything useful to other Safelite projects should be submitted as a pull request to safelite-playwright-core.
     paymentMethod: PaymentMethod,
     isOptedInForTextMessages: boolean,
     totalAmount?: number,
-    isForcedOEM?: boolean
-    mockFirstInshopCallNoSchedule?: boolean
-}
\ No newline at end of file
+    isForcedOEM?: boolean,
+    mockFirstInshopCallNoSchedule?: boolean,
+    handleMobileFirstModal?: boolean,
+    experiments?: IExperiments
+}
+
+
+export function getDefaultExperimentsData(): IExperiments {
+    return {
+        isAdyenPayments: !!process.env.IS_ADYENPAYMENTS && process.env.IS_ADYENPAYMENTS !== "" ? process.env.IS_ADYENPAYMENTS === "true" : false,
+        isMobileFirst: !!process.env.IS_MOBILEFIRST && process.env.IS_MOBILEFIRST !== "" ? process.env.IS_MOBILEFIRST === "true" : false,
+    }
+}
diff --git a/playwright-tests/framework/localTypes/IExperiments.ts b/playwright-tests/framework/localTypes/IExperiments.ts
new file mode 100644
index 000000000..78935f480
--- /dev/null
+++ b/playwright-tests/framework/localTypes/IExperiments.ts
@@ -0,0 +1,4 @@
+export interface IExperiments {
+    isMobileFirst: boolean,
+    isAdyenPayments: boolean
+}
\ No newline at end of file
diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts
index 4f7f54557..3ea0be374 100644
--- a/playwright-tests/pages/BasePage.ts
+++ b/playwright-tests/pages/BasePage.ts
@@ -142,7 +142,7 @@ export class BasePage {
             if (!fistInshopScheduleCall) {
                 return route.continue();
             }
-            
+
             // const fmt = (d: Date) => `${d.getFullYear()}-${String(d.getMonth()+1).padStart(2,"0")}-${String(d.getDate()).padStart(2,"0")}`;
             // const startDate = new Date();
             //const beginningOfWeek = new Date(startDate.getFullYear(), startDate.getMonth(), startDate.getDate() - startDate.getDay());
@@ -164,7 +164,7 @@ export class BasePage {
             const responseBody = await response.json();
 
             responseBody.days = [];
-            
+
             // Mock the response
             await route.fulfill({
                 response,
@@ -228,19 +228,41 @@ export class BasePage {
         ]);
     }
 
-    async validateOEMPart( isOEM: boolean): Promise<void> {
+    async validateOEMPart(isOEM: boolean): Promise<void> {
         if (isOEM!) {
-        // Get Vuex state from localStorage
-        const vuexState = JSON.parse(await this.page.evaluate('localStorage.getItem(\'vuex\')'));
+            // Get Vuex state from localStorage
+            const vuexState = JSON.parse(await this.page.evaluate('localStorage.getItem(\'vuex\')'));
 
-        // Validate the presence of an OEM part
-        if (vuexState.order?.lineItems?.glassParts?.length > 0) {
-            const firstGlassPartNumber = vuexState.order.lineItems.glassParts[0].partNumber;
+            // Validate the presence of an OEM part
+            if (vuexState.order?.lineItems?.glassParts?.length > 0) {
+                const firstGlassPartNumber = vuexState.order.lineItems.glassParts[0].partNumber;
 
-            await expect(firstGlassPartNumber.includes("OEM")).toBe(true);
+                await expect(firstGlassPartNumber.includes("OEM")).toBe(true);
+            } else {
+                throw new Error("No glass parts found in the order");
+            }
+        }
+    }
+
+    async buildExperimentUrl(testData: Partial<ITestData>): Promise<string> {
+
+        let experimentsURLExtension = "?cns=all&experiments=";
+        
+        const { experiments } = testData;
+ 
+        if (experiments !== undefined) {
+            experimentsURLExtension += experiments?.isMobileFirst 
+                ? "MobileFirstAppointment=MobileFirstAppt_V1=MobileFirstAppt_TEST=true"
+                : "MobileFirstAppointment=MobileFirstAppt_V1=MobileFirstAppt_CONTROL=true";
+            
+            experimentsURLExtension += experiments?.isAdyenPayments
+                ? ",Adyen%20Payments=Adyen%20Payment%20Test=Adyen%20Payment%20(Test)"
+                : ",Adyen%20Payments=Adyen%20Payment%20Test=CyberSource%20(Control)";
         } else {
-            throw new Error("No glass parts found in the order");
+            console.log("Url extension without query string");
         }
-        }
-    } 
+
+        // Convert to HTML encoding before returning
+        return experimentsURLExtension;
+    }
 }
\ No newline at end of file
diff --git a/playwright-tests/pages/HomePage.ts b/playwright-tests/pages/HomePage.ts
index 3d44b023a..e2db5ac26 100644
--- a/playwright-tests/pages/HomePage.ts
+++ b/playwright-tests/pages/HomePage.ts
@@ -1,5 +1,6 @@
 import test, { expect, type Locator, type Page } from '@playwright/test';
 import { BasePage } from './BasePage';
+import { ITestData } from 'framework/TestData';
 
 export class HomePage extends BasePage {
     
@@ -51,8 +52,9 @@ export class HomePage extends BasePage {
         this.getQuoteAndScheduleButton = this.page.getByLabel('main').getByRole('link', { name: 'Get quote + schedule' });
     }
 
-    async goto() {
-        await this.page.goto(process.env['BASE_URL']!);
+    async goto(testData: Partial<ITestData>) {
+        const experimentUrlExtension = await this.buildExperimentUrl(testData);
+        await this.page.goto(process.env['BASE_URL']! + experimentUrlExtension);
     }
 
     async isCurrentVariant(): Promise<boolean> {
@@ -75,6 +77,4 @@ export class HomePage extends BasePage {
         }
         await this.letsGetStartedButton.click();
     }
-
-
 }
\ No newline at end of file
diff --git a/playwright-tests/pages/OrderConfirmationPage.ts b/playwright-tests/pages/OrderConfirmationPage.ts
index a65c80fd2..43ba53850 100644
--- a/playwright-tests/pages/OrderConfirmationPage.ts
+++ b/playwright-tests/pages/OrderConfirmationPage.ts
@@ -108,7 +108,7 @@ export class OrderConfirmationPage extends BasePage {
         }
     }
 
-    async getFormattedAppointmentDate(appointmentDate: string) {
+    /*async getFormattedAppointmentDate(appointmentDate: string) {
 
         // Parse the original date
         let parsedAppointmentDate = new Date(`${appointmentDate}` + 'T00:00:00');
@@ -116,6 +116,24 @@ export class OrderConfirmationPage extends BasePage {
         // Format the new date as a string
         let updatedAppointmentDate = parsedAppointmentDate.toLocaleDateString('en-US', { weekday: 'long', month: 'long', day: 'numeric' });
         return updatedAppointmentDate;
+    }*/
+
+    async getFormattedAppointmentDate(appointmentDate: string) {
+        let formattedAppointmentDate: string;
+
+        switch (true) { 
+            case /^\d{4}-\d{2}-\d{2}$/.test(appointmentDate):
+                let parsedAppointmentDate = new Date(`${appointmentDate}` + 'T00:00:00');
+                formattedAppointmentDate = parsedAppointmentDate.toLocaleDateString('en-US', { weekday: 'long', month: 'long', day: 'numeric' });
+                break; 
+            case /[A-Za-z]+,\s+[A-Za-z]+\s+\d{1,2}/.test(appointmentDate):
+                formattedAppointmentDate = appointmentDate;
+                break; 
+            default: 
+                throw new Error('Unsupported date format: ' + appointmentDate); 
+        }
+
+        return formattedAppointmentDate;
     }
 
     async toggleOrderDetailsSection() {
diff --git a/playwright-tests/pages/PaymentMethodPage.ts b/playwright-tests/pages/PaymentMethodPage.ts
index 015a088ae..248ce845f 100644
--- a/playwright-tests/pages/PaymentMethodPage.ts
+++ b/playwright-tests/pages/PaymentMethodPage.ts
@@ -487,7 +487,7 @@ export class PaymentMethodPage extends BasePage {
         }
     }
 
-    async getFormattedAppointmentDate(appointmentDate: string) {
+    /*async getFormattedAppointmentDate(appointmentDate: string) {
 
         // Parse the original date
         let parsedAppointmentDate = new Date(`${appointmentDate}` + 'T00:00:00');
@@ -495,8 +495,36 @@ export class PaymentMethodPage extends BasePage {
         // Format the new date as a string
         let updatedAppointmentDate = parsedAppointmentDate.toLocaleDateString('en-US', { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' });
         return updatedAppointmentDate;
+    }*/
+
+    async getFormattedAppointmentDate(appointmentDate: string) {
+        let formattedAppointmentDate: Date;
+        const now = new Date();
+
+        switch (true) {
+            case /^\d{4}-\d{2}-\d{2}$/.test(appointmentDate):
+                formattedAppointmentDate = new Date(appointmentDate + 'T00:00:00');
+                break;
+
+            case /[A-Za-z]+,\s+[A-Za-z]+\s+\d{1,2}/.test(appointmentDate):
+                const [, month, day] = appointmentDate.match(/[A-Za-z]+,\s+([A-Za-z]+)\s+(\d{1,2})/) || [];
+                formattedAppointmentDate = new Date(`${month} ${day}, ${now.getFullYear()}`);
+                if (formattedAppointmentDate < now) formattedAppointmentDate.setFullYear(now.getFullYear() + 1); // rollover
+                break;
+
+            default:
+                throw new Error('Unsupported date format: ' + appointmentDate);
+        }
+
+        return formattedAppointmentDate.toLocaleDateString('en-US', {
+            weekday: 'long',
+            year: 'numeric',
+            month: 'long',
+            day: 'numeric'
+        });
     }
 
+
     @step("PaymentMethodPage >> Select Payment Method: ")
     async handlePaymentMethodPage(testData: Partial<ITestData>) {
         const { servicePackage, isRecalVehicle, paymentDetails, isForcedOEM } = testData;
@@ -505,7 +533,7 @@ export class PaymentMethodPage extends BasePage {
         await this.validatePaymentDetailsPage(testData);
         await this.ValidateAfterPayBreakOutSection();
 
-        if (isForcedOEM){
+        if (isForcedOEM) {
             await this.validateOEMPart(isForcedOEM);
         }
 
diff --git a/playwright-tests/pages/SchedulePage.ts b/playwright-tests/pages/SchedulePage.ts
index fdd3f30ec..30fc830d0 100644
--- a/playwright-tests/pages/SchedulePage.ts
+++ b/playwright-tests/pages/SchedulePage.ts
@@ -39,6 +39,7 @@ export class SchedulePage extends BasePage {
     readonly yesButtonRecalAckModal: Locator;
     readonly noButtonRecalAckModal: Locator;
     readonly continueButtonRecalAckModal: Locator;
+    readonly mobileFirstModal: Locator;
 
     constructor(page: Page) {
         super(page);
@@ -73,6 +74,7 @@ export class SchedulePage extends BasePage {
         this.yesButtonRecalAckModal = this.page.locator("label[buttonlabel='Yes']");
         this.noButtonRecalAckModal = this.page.locator("label[buttonlabel='No']");
         this.continueButtonRecalAckModal = this.page.locator("#recal-ack-modal-container .modal-footer button");
+        this.mobileFirstModal = this.page.locator("#mobile-first-modal-container");
     }
 
     async selectLocation(testData: Partial<ITestData>) {
@@ -234,17 +236,32 @@ export class SchedulePage extends BasePage {
         return formattedTimeSlot;
     }
 
+    async handleMobileFirstPopUp(testData: Partial<ITestData>) {
+
+        const { customerDetails } = testData;
+        customerDetails!.apptDate = (await this.mobileFirstModal.locator('li', { hasText: 'Date:' }).innerText()).replace('Date:', '').trim();
+        customerDetails!.apptTime = (await this.mobileFirstModal.locator('li', { hasText: 'Appointment window:' }).innerText()).replace('Appointment window:', 'arriving between').trim();
+        customerDetails!.apptDuration = (await this.mobileFirstModal.locator('li', { hasText: 'Estimate length:' }).innerText()).replace('Estimate length:', '').trim();
+
+        await this.mobileFirstModal.getByRole("button", { name: 'Confirm appointment'}).click();
+    }
+
     @step("SchedulePage >> Schedule appointment: ")
     async handleSchedulePage(testData: Partial<ITestData>) {
-        const { appointmentDetails, isCanNotRecal } = testData;
+        const { appointmentDetails, isCanNotRecal, experiments, handleMobileFirstModal } = testData;
         await this.waitForPageOrComponentload();
         await this.validateProgressBar(ProgressBarPercentages.SchedulePage);
-        if (await this.mobileFirstModalCloseButton.isVisible()) {
+
+        if (handleMobileFirstModal) {
+            return await this.handleMobileFirstPopUp(testData);
+        }
+
+        if (experiments?.isMobileFirst && await this.mobileFirstModalCloseButton.isVisible()) {
             await this.mobileFirstModalCloseButton.click();
         }
         await this.selectLocation(testData);
 
-        if (await this.mobileFirstModalCloseButton.isVisible({timeout: 5000})) {
+        if (experiments?.isMobileFirst && await this.mobileFirstModalCloseButton.isVisible({timeout: 5000})) {
             await this.page.waitForTimeout(1000);
             await this.mobileFirstModalCloseButton.dblclick();
         }
diff --git a/playwright-tests/playwright.config.ts b/playwright-tests/playwright.config.ts
index 016977e3c..026f5b2d9 100644
--- a/playwright-tests/playwright.config.ts
+++ b/playwright-tests/playwright.config.ts
@@ -78,7 +78,7 @@ export default defineConfig({
   /* Retry on CI only */
   retries: process.env.CI ? 1 : 0,
   /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 4 : 5,
+  workers: process.env.CI ? 4 : 3,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: process.env.CI? [
     ['junit'],
diff --git a/playwright-tests/tests/0000__M.test.ts b/playwright-tests/tests/0000__M.test.ts
index aebb3b978..0dcb5155e 100644
--- a/playwright-tests/tests/0000__M.test.ts
+++ b/playwright-tests/tests/0000__M.test.ts
@@ -32,6 +32,7 @@ import insuranceNoCompProgressiveTests from "./InsuranceNoCompProgressive";
 import insuranceOEMAllstateTests from "./InsuranceOEMAllState";
 import cashRepairInShopAfterPayTests from "./CashRepairInShopAfterPay";
 import cashRepairInShopPayPalTests from "./CashRepairInShopPayPal";
+import cashReplaceMobileFirstModalTests from "./CashReplaceMobileFirstModal";
 import cashReplaceMultiSlidingGlassDropoffTests from "./CashReplaceMultiSlidingGlassDropoff";
 import cashReplaceMultiGlassMobileTests from "./CashReplaceMultiGlassMobile";
 import { getTestObject, TestCase, prepareTest, RuleEngine, TestInfo } from 'framework/Typedefs';
@@ -79,6 +80,7 @@ const allStandardTests = [
     { name: "CashReplaceStaticInshop", tests: cashReplaceStaticInshopTests },
     { name: "CashReplaceWiperPromoInshop", tests: cashReplaceWiperPromoInShopTests },
     { name: "CashReplaceSwitchToInsuranceProgressiveNoComp", tests: cashReplaceSwitchToInsuranceProgressiveNoCompTests },
+    { name: "CashReplaceMobileFirstModal", tests: cashReplaceMobileFirstModalTests },
     // TODO: Uncomment when QA is ready to run heavy truck tests
     // {name: "CashReplaceSplitWindshield", tests: CashReplaceSplitWindshieldTests},
     { name: "InsuranceAcuityPaypal", tests: insuranceAcuityPaypalTests },
@@ -142,7 +144,7 @@ async function run(page: Page, testInfo: TestInfo): Promise<void> {
     try {
         await testInfo.testCase.setup();
         testInfo.testCase.setupPages(page, createTestPages);
-        await testInfo.testCase.pages.homePage.goto();
+        await testInfo.testCase.pages.homePage.goto(testInfo.testCase.testData);
         await runWorkflow(page, testInfo.testCase);
     } catch (error) {
         // Catch successful alert tests and log message
diff --git a/playwright-tests/tests/CashRepairInShopAfterPay.ts b/playwright-tests/tests/CashRepairInShopAfterPay.ts
index e328ba7e8..dc34404e5 100644
--- a/playwright-tests/tests/CashRepairInShopAfterPay.ts
+++ b/playwright-tests/tests/CashRepairInShopAfterPay.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { VehicleDamage, ServiceLocation, ServicePackage } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { ClientData } from 'safelite-playwright-core';
@@ -34,7 +34,12 @@ const cashRepairInShopAfterPayData : Partial<ITestData> = {
     },
     
     // Use predefined payment data
-    paymentDetails: ClientData.getDefaultAfterpayDetails()
+    paymentDetails: ClientData.getDefaultAfterpayDetails(),
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const cashRepairInShopAfterPayTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/CashRepairInShopPayPal.ts b/playwright-tests/tests/CashRepairInShopPayPal.ts
index 0d559f03b..6fb3f19d4 100644
--- a/playwright-tests/tests/CashRepairInShopPayPal.ts
+++ b/playwright-tests/tests/CashRepairInShopPayPal.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { VehicleDamage, ServicePackage } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { ClientData } from 'safelite-playwright-core';
@@ -35,7 +35,12 @@ const cashRepairInShopPayPalData : Partial<ITestData> = {
     },  
       
     // Use predefined payment data
-    paymentDetails: ClientData.getDefaultPaypalDetails()
+    paymentDetails: ClientData.getDefaultPaypalDetails(),
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const cashRepairInShopPayPalTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/CashRepairMobileCreditCard.ts b/playwright-tests/tests/CashRepairMobileCreditCard.ts
index 8e38129e8..eece76520 100644
--- a/playwright-tests/tests/CashRepairMobileCreditCard.ts
+++ b/playwright-tests/tests/CashRepairMobileCreditCard.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { VehicleDamage, ServiceLocation } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { ClientData } from 'safelite-playwright-core';
@@ -48,7 +48,12 @@ const cashRepairMobileCCData : Partial<ITestData> = {
     },
     
     // Use predefined payment data
-    paymentDetails: ClientData.getDefaultCreditCardDetails()
+    paymentDetails: ClientData.getDefaultCreditCardDetails(),
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const cashRepairMobileCCTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/CashReplaceDynamicRecalMobile.ts b/playwright-tests/tests/CashReplaceDynamicRecalMobile.ts
index ffc2c9264..8ad5f2d8e 100644
--- a/playwright-tests/tests/CashReplaceDynamicRecalMobile.ts
+++ b/playwright-tests/tests/CashReplaceDynamicRecalMobile.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ServiceLocation, ServicePackage, PaymentType } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
@@ -63,6 +63,11 @@ const cashReplaceDynamicRecalMobileData: Partial<ITestData> = {
         paymentType: PaymentType.PayAtService,
         // promoCode: 'digitalrain'
         promoCode: 'rain50'
+    },
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
     }
 }
 
diff --git a/playwright-tests/tests/CashReplaceGlassAddressLookupInshopAfterPay.ts b/playwright-tests/tests/CashReplaceGlassAddressLookupInshopAfterPay.ts
index 43660fe21..50f885f96 100644
--- a/playwright-tests/tests/CashReplaceGlassAddressLookupInshopAfterPay.ts
+++ b/playwright-tests/tests/CashReplaceGlassAddressLookupInshopAfterPay.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
 import { ClientData } from 'safelite-playwright-core';
@@ -43,7 +43,12 @@ const cashReplaceGlassAddressLookupInshopAfterPayData: Partial<ITestData> = {
     },
    
     // Override payment details
-    paymentDetails: ClientData.getDefaultAfterpayDetails()
+    paymentDetails: ClientData.getDefaultAfterpayDetails(),
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const cashReplaceGlassAddressLookupInshopAfterPayTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/CashReplaceGlassLicensePlateLookupInshopPaypal.ts b/playwright-tests/tests/CashReplaceGlassLicensePlateLookupInshopPaypal.ts
index defa4b36c..63ebb3a64 100644
--- a/playwright-tests/tests/CashReplaceGlassLicensePlateLookupInshopPaypal.ts
+++ b/playwright-tests/tests/CashReplaceGlassLicensePlateLookupInshopPaypal.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
 import { ClientData } from 'safelite-playwright-core';
@@ -42,7 +42,12 @@ const cashReplaceGlassLicensePlateLookupInshopPaypalData: Partial<ITestData> = {
     // No need to override vehicleDamage as it already defaults to WindshieldCrack
    
     // Override payment details to use PayPal
-    paymentDetails: ClientData.getDefaultPaypalDetails()
+    paymentDetails: ClientData.getDefaultPaypalDetails(),
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const cashReplaceGlassLicensePlateLookupInshopPaypalTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/CashReplaceGlassPromoInshop.ts b/playwright-tests/tests/CashReplaceGlassPromoInshop.ts
index 139efbb1b..a88e6941a 100644
--- a/playwright-tests/tests/CashReplaceGlassPromoInshop.ts
+++ b/playwright-tests/tests/CashReplaceGlassPromoInshop.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { PaymentType } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
@@ -55,6 +55,11 @@ const cashReplaceGlassPromoInshopData: Partial<ITestData> = {
         paymentType: PaymentType.PayAtService,
         // Add promo code - key feature of this test
         promoCode: '20CALL',
+    },
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
     }
 }
 
diff --git a/playwright-tests/tests/CashReplaceMobileFirstModal.ts b/playwright-tests/tests/CashReplaceMobileFirstModal.ts
new file mode 100644
index 000000000..714d95d84
--- /dev/null
+++ b/playwright-tests/tests/CashReplaceMobileFirstModal.ts
@@ -0,0 +1,79 @@
+//Imports here
+import { ITestData } from 'framework/TestData'
+import { ServiceLocation, ServicePackage, PaymentType, PartQuestionType } from 'safelite-playwright-core';
+import { ITestCase } from '../framework/Typedefs'
+import { VehicleLookupType } from 'safelite-playwright-core';
+import { getDefaultTestData, setFakerSeedFromTestName } from 'safelite-playwright-core';
+import { PaymentMethod } from 'framework/localTypes/Enums';
+
+// Set the seed before generating any data
+setFakerSeedFromTestName("CashReplaceMobileFirstModal");
+
+// Now get the test data with the seeded faker
+const cashReplaceMobileFirstModalData: Partial<ITestData> = {
+    ...getDefaultTestData(),  // Get default data with current seed
+
+    // CASH Client
+    paymentMethod: PaymentMethod.SelfPay,
+
+    customerDetails: {
+        ...getDefaultTestData().customerDetails!,
+        address: {
+            ...getDefaultTestData().customerDetails!.address,
+            postalCode: '91761'
+        }
+    },
+
+    servicePackage: ServicePackage.GlassOnly,
+    // Override vehicle details
+    vehicleDetails: {
+        ...getDefaultTestData().vehicleDetails!,
+        year: '2018',
+        make: 'Honda',
+        model: 'Accord',
+        style: '4 door sedan',
+    },
+
+    handleMobileFirstModal: true,
+
+    partQuestions: [
+        {
+            partQuestionType: PartQuestionType.GeneralQuestion1,
+            isOnPage: true,
+            optionToSelect: 'Yes'
+        },
+    ],
+   
+    mockFirstInshopCallNoSchedule: true,
+    // No need to override vehicleDamage as it already defaults to WindshieldCrack
+   
+    // Override appointment details
+    appointmentDetails: {
+        serviceLocation: ServiceLocation.Mobile,
+        appointmentDate: getDefaultTestData().appointmentDetails?.appointmentDate,
+        serviceAddress: {
+            // Use street address from current faker seed
+            street: "2064 S Sultana Ave",
+            city: 'Ontario',
+            state: 'CA',
+            postalCode: '91761',
+            country: 'United States'
+        },
+    },
+   
+    // Override payment details
+    paymentDetails: {
+        paymentType: PaymentType.PayAtService
+    }
+}
+
+const cashReplaceMobileFirstModal: ITestCase[] = [];
+
+const tc = {
+    name: `CashReplaceMobileFirstModal`,
+    tags: ['@E2E','@CashReplaceMobileFirstModal', '@test_report', '@CASH'],
+    testData: cashReplaceMobileFirstModalData
+};
+cashReplaceMobileFirstModal.push(tc);
+
+export default cashReplaceMobileFirstModal;
\ No newline at end of file
diff --git a/playwright-tests/tests/CashReplaceMultiGlassMobile.ts b/playwright-tests/tests/CashReplaceMultiGlassMobile.ts
index 5db56fb85..bbf4db783 100644
--- a/playwright-tests/tests/CashReplaceMultiGlassMobile.ts
+++ b/playwright-tests/tests/CashReplaceMultiGlassMobile.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { VehicleDamage, PartQuestionType, PaymentType, ServicePackage, ServiceLocation } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
@@ -88,7 +88,12 @@ const cashReplaceMultiGlassMobileData: Partial<ITestData> = {
             optionToSelect: 'Gray Tint Privacy',
             secondaryQuestionOptionToSelect: 'solar, passenger side, encap, chrome molding'
         }
-    ]
+    ],
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const cashReplaceMultiGlassMobileTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/CashReplaceMultiGlassPromoInshop.ts b/playwright-tests/tests/CashReplaceMultiGlassPromoInshop.ts
index 102c7b415..89406bc29 100644
--- a/playwright-tests/tests/CashReplaceMultiGlassPromoInshop.ts
+++ b/playwright-tests/tests/CashReplaceMultiGlassPromoInshop.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { VehicleDamage, PartQuestionType, PaymentType } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
@@ -94,7 +94,12 @@ const cashReplaceMultiGlassPromoInshopData: Partial<ITestData> = {
             optionToSelect: 'Green Tint',
             secondaryQuestionOptionToSelect: 'heated glass, solar, antenna, manual liftgate, 1 hole'
         }
-    ]
+    ],
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const cashReplaceMultiGlassPromoInshopTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/CashReplaceMultiSlidingGlassDropoff.ts b/playwright-tests/tests/CashReplaceMultiSlidingGlassDropoff.ts
index 4042c67de..c687861a8 100644
--- a/playwright-tests/tests/CashReplaceMultiSlidingGlassDropoff.ts
+++ b/playwright-tests/tests/CashReplaceMultiSlidingGlassDropoff.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { VehicleDamage, PartQuestionType, PaymentType, ServicePackage, ServiceLocation } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
@@ -105,7 +105,12 @@ const cashReplaceMultiSlidingGlassDropoffData: Partial<ITestData> = {
             optionToSelect: 'Gray Tint Privacy',
             secondaryQuestionOptionToSelect: 'heated glass, solar, slider, power, kit'
         }
-    ]
+    ],
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const cashReplaceMultiSlidingGlassDropoffTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/CashReplaceRainDefensePromoInshop.ts b/playwright-tests/tests/CashReplaceRainDefensePromoInshop.ts
index d9fbd1a91..8deee536a 100644
--- a/playwright-tests/tests/CashReplaceRainDefensePromoInshop.ts
+++ b/playwright-tests/tests/CashReplaceRainDefensePromoInshop.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ServicePackage, PaymentType } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
@@ -50,6 +50,11 @@ const cashReplaceRainDefensePromoInshopData: Partial<ITestData> = {
         // Rain Defense promo code
         promoCode: 'rd50'
     },
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const cashReplaceRainDefensePromoInshopTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/CashReplaceSafeliteCanNotRecalMobile.ts b/playwright-tests/tests/CashReplaceSafeliteCanNotRecalMobile.ts
index 7bbc671ee..f3d2c3010 100644
--- a/playwright-tests/tests/CashReplaceSafeliteCanNotRecalMobile.ts
+++ b/playwright-tests/tests/CashReplaceSafeliteCanNotRecalMobile.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ServiceLocation, PartQuestionType, PaymentType } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
@@ -70,7 +70,12 @@ const cashReplaceSafeliteCanNotRecalMobileData: Partial<ITestData> = {
             isOnPage: true,
             optionToSelect: 'Yes'
         },
-    ]
+    ],
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const cashReplaceSafeliteCanNotRecalMobileTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/CashReplaceSplitWindshield.ts b/playwright-tests/tests/CashReplaceSplitWindshield.ts
index 4a8d72509..dad7ff1df 100644
--- a/playwright-tests/tests/CashReplaceSplitWindshield.ts
+++ b/playwright-tests/tests/CashReplaceSplitWindshield.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { PartQuestionType, PaymentType, VehicleDamage } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
@@ -59,6 +59,11 @@ const CashReplaceSplitWindshieldData: Partial<ITestData> = {
     // Override payment details
     paymentDetails: {
         paymentType: PaymentType.PayAtService
+    },
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
     }
 }
 
diff --git a/playwright-tests/tests/CashReplaceStaticInshop.ts b/playwright-tests/tests/CashReplaceStaticInshop.ts
index ca71b4cde..107b625a1 100644
--- a/playwright-tests/tests/CashReplaceStaticInshop.ts
+++ b/playwright-tests/tests/CashReplaceStaticInshop.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ServicePackage, PaymentType, PartQuestionType } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
@@ -64,6 +64,11 @@ const CashReplaceStaticInshopData: Partial<ITestData> = {
     paymentDetails: {
         paymentType: PaymentType.PayAtService
     },
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const cashReplaceStaticInshopTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/CashReplaceSwitchToInsuranceProgressiveNoComp.ts b/playwright-tests/tests/CashReplaceSwitchToInsuranceProgressiveNoComp.ts
index 91e997986..98c965b0c 100644
--- a/playwright-tests/tests/CashReplaceSwitchToInsuranceProgressiveNoComp.ts
+++ b/playwright-tests/tests/CashReplaceSwitchToInsuranceProgressiveNoComp.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { Flow, ServiceLocation } from "safelite-playwright-core";
 import { DamageType, PartQuestionType, PaymentType } from 'safelite-playwright-core'
 import { ITestCase } from '../framework/Typedefs'
@@ -70,7 +70,10 @@ const cashReplaceSwitchToInsuranceProgressiveNoCompData: Partial<ITestData> = {
         appointmentDate: getDefaultTestData().appointmentDetails?.appointmentDate,
     },
     
-
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 };
 
 // Create and register the test case
diff --git a/playwright-tests/tests/CashReplaceVinMobile.ts b/playwright-tests/tests/CashReplaceVinMobile.ts
index e81220cd0..3cdbc8cae 100644
--- a/playwright-tests/tests/CashReplaceVinMobile.ts
+++ b/playwright-tests/tests/CashReplaceVinMobile.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { AppointmentTimeslot, ServiceLocation, PaymentType } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
@@ -60,6 +60,11 @@ const cashReplaceVinMobileData: Partial<ITestData> = {
     paymentDetails: {
         paymentType: PaymentType.PayAtService
     },
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const cashReplaceVinMobileTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/CashReplaceWiperDropoff.ts b/playwright-tests/tests/CashReplaceWiperDropoff.ts
index 44a77a531..8948cceef 100644
--- a/playwright-tests/tests/CashReplaceWiperDropoff.ts
+++ b/playwright-tests/tests/CashReplaceWiperDropoff.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ServicePackage, ServiceLocation, PartQuestionType, PaymentType } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
@@ -69,7 +69,12 @@ const cashReplaceWiperDropoffData: Partial<ITestData> = {
             isOnPage: true,
             optionToSelect: 'Yes'
         },
-    ]
+    ],
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const cashReplaceWiperDropoffTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/CashReplaceWiperPromoInshop.ts b/playwright-tests/tests/CashReplaceWiperPromoInshop.ts
index 12cbbd6f1..835790051 100644
--- a/playwright-tests/tests/CashReplaceWiperPromoInshop.ts
+++ b/playwright-tests/tests/CashReplaceWiperPromoInshop.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ServicePackage, ServiceLocation, PaymentType } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
@@ -46,6 +46,11 @@ const cashReplaceWiperPromoInShopData: Partial<ITestData> = {
         paymentType: PaymentType.PayAtService,
         // Specific wiper promo code
         promoCode: '1WIPER0',
+    },
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
     }
 }
 
diff --git a/playwright-tests/tests/InsuranceAcuityPaypal.ts b/playwright-tests/tests/InsuranceAcuityPaypal.ts
index 5cd3c0a40..342dc2c87 100644
--- a/playwright-tests/tests/InsuranceAcuityPaypal.ts
+++ b/playwright-tests/tests/InsuranceAcuityPaypal.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ServiceLocation, DamageType, PartQuestionType, VehicleDamage, PaymentType, Flow } from 'safelite-playwright-core';
 import { PaymentMethod } from "framework/localTypes/Enums";
 import { ITestCase } from '../framework/Typedefs'
@@ -83,7 +83,12 @@ const insuranceAcuityPaypalData: Partial<ITestData> = {
     ],
    
     // Override payment details (empty because we skip payment method page in insurance flow)
-    paymentDetails: {}
+    paymentDetails: {},
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const insuranceAcuityPaypalTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/InsuranceBigTruckVerified.ts b/playwright-tests/tests/InsuranceBigTruckVerified.ts
index f31918279..3e616230e 100644
--- a/playwright-tests/tests/InsuranceBigTruckVerified.ts
+++ b/playwright-tests/tests/InsuranceBigTruckVerified.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ServiceLocation, DamageType, PaymentType, PartQuestionType } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { PaymentMethod } from "framework/localTypes/Enums";
@@ -67,7 +67,12 @@ const insuranceBigTruckVerifiedData: Partial<ITestData> = {
     },
        
     // Override payment details (empty because we skip payment method page in insurance flow)
-    paymentDetails: {}
+    paymentDetails: {},
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const insuranceBigTruckVerifiedTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/InsuranceGeico.ts b/playwright-tests/tests/InsuranceGeico.ts
index f71917ff2..bfb8b7155 100644
--- a/playwright-tests/tests/InsuranceGeico.ts
+++ b/playwright-tests/tests/InsuranceGeico.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ServiceLocation, DamageType, Flow } from 'safelite-playwright-core';
 import { PaymentMethod } from "framework/localTypes/Enums";
 import { ITestCase } from '../framework/Typedefs'
@@ -64,7 +64,12 @@ const insuranceGeicoData: Partial<ITestData> = {
     },
        
     // Override payment details (empty because we skip payment method page in insurance flow)
-    paymentDetails: {}
+    paymentDetails: {},
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const insuranceGeicoTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/InsuranceITAC21stCentury.ts b/playwright-tests/tests/InsuranceITAC21stCentury.ts
index cb11b4083..ba596ee54 100644
--- a/playwright-tests/tests/InsuranceITAC21stCentury.ts
+++ b/playwright-tests/tests/InsuranceITAC21stCentury.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ServiceLocation, DamageType, PartQuestionType, Flow } from 'safelite-playwright-core';
 import { PaymentMethod } from "framework/localTypes/Enums";
 import { ITestCase } from '../framework/Typedefs'
@@ -68,7 +68,12 @@ const insuranceITAC21stCenturyData: Partial<ITestData> = {
             isOnPage: true,
             optionToSelect: 'Yes'
         },
-    ]
+    ],
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const insuranceITAC21stCenturyTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/InsuranceITACOptimizedPriceValidationAllState.ts b/playwright-tests/tests/InsuranceITACOptimizedPriceValidationAllState.ts
index 5924830ba..da876b238 100644
--- a/playwright-tests/tests/InsuranceITACOptimizedPriceValidationAllState.ts
+++ b/playwright-tests/tests/InsuranceITACOptimizedPriceValidationAllState.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { VehicleDamage, ServiceLocation, DamageType, Flow } from 'safelite-playwright-core';
 import { PaymentMethod } from "framework/localTypes/Enums";
 import { ITestCase } from '../framework/Typedefs'
@@ -65,7 +65,12 @@ const insuranceITACOptimizedPriceValidationAllStateData: Partial<ITestData> = {
         appointmentDate: getDefaultTestData().appointmentDetails?.appointmentDate
     },
     // Override payment details (empty because we skip payment method page in insurance flow)
-    paymentDetails: {}
+    paymentDetails: {},
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const insuranceITACOptimizedPriceValidationAllStateTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/InsuranceMeemicNearSchoolVerified.ts b/playwright-tests/tests/InsuranceMeemicNearSchoolVerified.ts
index c57526e1a..0d1554f3e 100644
--- a/playwright-tests/tests/InsuranceMeemicNearSchoolVerified.ts
+++ b/playwright-tests/tests/InsuranceMeemicNearSchoolVerified.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ServiceLocation, DamageType, Flow, PartQuestionType, LossLocation } from 'safelite-playwright-core';
 import { PaymentMethod } from "framework/localTypes/Enums";
 import { ITestCase } from '../framework/Typedefs'
@@ -62,7 +62,12 @@ const insuranceMeemicNearSchoolVerifiedData: Partial<ITestData> = {
     ],
 
     // Override payment details (empty because we skip payment method page in insurance flow)
-    paymentDetails: {} 
+    paymentDetails: {},
+    
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 };
 
 const insuranceMeemicNearSchoolVerifiedTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/InsuranceNoCompProgressive.ts b/playwright-tests/tests/InsuranceNoCompProgressive.ts
index a0f3a2594..da24e2b55 100644
--- a/playwright-tests/tests/InsuranceNoCompProgressive.ts
+++ b/playwright-tests/tests/InsuranceNoCompProgressive.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ServiceLocation, DamageType, PaymentType, PartQuestionType, Flow } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { PaymentMethod } from "framework/localTypes/Enums";
@@ -77,7 +77,12 @@ const insuranceNoCompProgressiveData: Partial<ITestData> = {
     },
        
     // Override payment details (empty because we skip payment method page in insurance flow)
-    paymentDetails: {}
+    paymentDetails: {},
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
 
 const insuranceNoCompProgressiveTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/InsuranceOEMAllState.ts b/playwright-tests/tests/InsuranceOEMAllState.ts
index c55939a4c..e3f5f56a8 100644
--- a/playwright-tests/tests/InsuranceOEMAllState.ts
+++ b/playwright-tests/tests/InsuranceOEMAllState.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ServiceLocation, DamageType, PaymentType, PartQuestionType } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { PaymentMethod } from "framework/localTypes/Enums";
@@ -73,7 +73,12 @@ const insuranceOEMAllstateData: Partial<ITestData> = {
     },
 
     // Override payment details (empty because we skip payment method page in insurance flow)
-    paymentDetails: {} 
+    paymentDetails: {},
+    
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
        
 const insuranceOEMAllstateTests: ITestCase[] = [];
diff --git a/playwright-tests/tests/InsuranceUnverified.ts b/playwright-tests/tests/InsuranceUnverified.ts
index 34d06697d..d6d71531b 100644
--- a/playwright-tests/tests/InsuranceUnverified.ts
+++ b/playwright-tests/tests/InsuranceUnverified.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ServiceLocation, DamageType, PaymentType, PartQuestionType } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { PaymentMethod } from "framework/localTypes/Enums";
@@ -72,7 +72,12 @@ const insuranceUnverifiedData: Partial<ITestData> = {
     },
 
     // Override payment details (empty because we skip payment method page in insurance flow)
-    paymentDetails: {} 
+    paymentDetails: {},
+    
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData()
+    }
 }
        
 const insuranceUnverifiedTests: ITestCase[] = [];

From b81ea144b8b43d7a0b0d4adaa4add8bbe2acde9a Mon Sep 17 00:00:00 2001
From: kpatel8hs4io <31411746+kpatel8hs4io@users.noreply.github.com>
Date: Thu, 19 Feb 2026 12:01:07 -0500
Subject: [PATCH 231/233] Minor change for mobile first test

---
 playwright-tests/tests/CashReplaceMobileFirstModal.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/playwright-tests/tests/CashReplaceMobileFirstModal.ts b/playwright-tests/tests/CashReplaceMobileFirstModal.ts
index 714d95d84..16ec6d0a2 100644
--- a/playwright-tests/tests/CashReplaceMobileFirstModal.ts
+++ b/playwright-tests/tests/CashReplaceMobileFirstModal.ts
@@ -1,5 +1,5 @@
 //Imports here
-import { ITestData } from 'framework/TestData'
+import { ITestData, getDefaultExperimentsData } from 'framework/TestData'
 import { ServiceLocation, ServicePackage, PaymentType, PartQuestionType } from 'safelite-playwright-core';
 import { ITestCase } from '../framework/Typedefs'
 import { VehicleLookupType } from 'safelite-playwright-core';
@@ -64,6 +64,12 @@ const cashReplaceMobileFirstModalData: Partial<ITestData> = {
     // Override payment details
     paymentDetails: {
         paymentType: PaymentType.PayAtService
+    },
+
+    // Experiments
+    experiments: {
+        ...getDefaultExperimentsData(),
+        isMobileFirst: true
     }
 }
 

From e1b44af0fc0df27c8638a0a28d8586454ddd65da Mon Sep 17 00:00:00 2001
From: kpatel8hs4io <31411746+kpatel8hs4io@users.noreply.github.com>
Date: Thu, 19 Feb 2026 12:23:49 -0500
Subject: [PATCH 232/233] adding on more change.

---
 playwright-tests/pages/BasePage.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts
index 3ea0be374..07d254391 100644
--- a/playwright-tests/pages/BasePage.ts
+++ b/playwright-tests/pages/BasePage.ts
@@ -246,11 +246,12 @@ export class BasePage {
 
     async buildExperimentUrl(testData: Partial<ITestData>): Promise<string> {
 
-        let experimentsURLExtension = "?cns=all&experiments=";
+        let experimentsURLExtension = "";
         
         const { experiments } = testData;
  
         if (experiments !== undefined) {
+            experimentsURLExtension += "?cns=all&experiments="
             experimentsURLExtension += experiments?.isMobileFirst 
                 ? "MobileFirstAppointment=MobileFirstAppt_V1=MobileFirstAppt_TEST=true"
                 : "MobileFirstAppointment=MobileFirstAppt_V1=MobileFirstAppt_CONTROL=true";

From 3823054faaaf7c10744628e0f87521b90b3932c3 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 20 Feb 2026 15:57:56 -0500
Subject: [PATCH 233/233] CASH-2417 save lock token on load session to state

CASH-2417 save lock token on load session to state
---
 src/global-methods.js | 8 +++++++-
 src/store/index.js    | 9 +++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/global-methods.js b/src/global-methods.js
index fc0b3cb41..4f1dc601b 100644
--- a/src/global-methods.js
+++ b/src/global-methods.js
@@ -101,7 +101,13 @@ export default {
                     return resolve(response);
                 },
                 (error) => {
-                    if (endpoint.toLowerCase().includes(endpoints.LogDigitalConsumer.url)) {
+                    if (
+                        endpoint.toLowerCase().includes(endpoints.LogDigitalConsumer.url) ||
+                        endpoint.toLowerCase().includes(endpoints.LogFmgSessionData.url) ||
+                        endpoint.toLowerCase().includes(endpoints.LogPageView.url) ||
+                        endpoint.toLowerCase().includes(endpoints.LogCustomEvent.url) ||
+                        endpoint.toLowerCase().includes(endpoints.LogPartQuestions.url)
+                    ) {
                         return resolve({ data: null, error: "Ignore errors when logging" });
                     } else {
                         if (logApiCall) {
diff --git a/src/store/index.js b/src/store/index.js
index c5d9846f9..73e3c4cbe 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -686,6 +686,15 @@ export const mutations = {
         state.order.eon = sessionInformation.order.eon;
         state.order.customerPortalLoginToken = sessionInformation.order.CustomerPortalLoginToken;
         state.order.isRecalAckOptIn = sessionInformation.order.isRecalAckOptIn;
+        state.order.workOrderId = sessionInformation.order.workOrderId
+            ? sessionInformation.order.workOrderId
+            : null;
+        state.order.workOrderNumber = sessionInformation.order.workOrderNumber
+            ? sessionInformation.order.workOrderNumber
+            : null;
+        state.order.lockToken = sessionInformation.order.lockToken
+            ? sessionInformation.order.lockToken
+            : null;
 
         if (state.order.vehicle.vin !== sessionInformation.order.vehicle?.vin) {
             state.applicationUser.pageData[routeData.PART_QUESTIONS.name] = null;