From b55451ec9dbda5a225411383d17433e2e2872f76 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Wed, 6 May 2026 09:21:08 -0400
Subject: [PATCH 1/6] CASH-2563

---
 src/constants/bailout-codes.js                |   5 +
 .../heritage-integration/order-helper.js      |  17 +-
 .../bailout-success/bailout-success.vue       |  91 +++++++++
 src/layouts/bailout/bailout.vue               | 177 +++++++++++++++---
 src/router/constants/navigation-scenarios.js  |   5 +
 src/router/constants/routes.js                |   8 +
 src/router/constants/routing-table.js         |  18 ++
 src/router/methods/navigate.js                |  20 +-
 src/router/methods/routes.js                  |   2 +
 9 files changed, 312 insertions(+), 31 deletions(-)
 create mode 100644 src/constants/bailout-codes.js
 create mode 100644 src/layouts/bailout-success/bailout-success.vue

diff --git a/src/constants/bailout-codes.js b/src/constants/bailout-codes.js
new file mode 100644
index 000000000..caf265292
--- /dev/null
+++ b/src/constants/bailout-codes.js
@@ -0,0 +1,5 @@
+const bailoutCodes = {
+    PARTS_NOT_FOUND: "PartsNotFound",
+};
+
+export { bailoutCodes };
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index a3dc363f5..b15a0a6e3 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -57,13 +57,15 @@ export async function saveSession({
     shouldAwaitSaveSessionQueue = false,
     submitAfterSave = false,
     createUnscheduledStatusWorkOrderForPIA = false,
+    bailoutCode = null,
 }) {
     // Add next save session to end of queue
     const saveSessionPromise = flushSaveSessionQueue().then(() => {
         return saveSessionHelper(
             pageNameToLog,
             submitAfterSave,
-            createUnscheduledStatusWorkOrderForPIA
+            createUnscheduledStatusWorkOrderForPIA,
+            bailoutCode
         );
     });
 
@@ -106,6 +108,15 @@ export async function saveQuote({ pageNameToLog }) {
     return;
 }
 
+export async function submitBailout({ pageNameToLog, bailoutCode }) {
+    await saveSession({
+        pageNameToLog: pageNameToLog,
+        shouldAwaitSaveSessionQueue: true,
+        submitAfterSave: false,
+        bailoutCode: bailoutCode,
+    });
+}
+
 // PRIVATE FUNCTIONS //
 
 /*
@@ -147,13 +158,15 @@ async function loadSession(
 async function saveSessionHelper(
     pageNameToLog,
     submitAfterSave = false,
-    createUnscheduledStatusWorkOrderForPIA = false
+    createUnscheduledStatusWorkOrderForPIA = false,
+    bailoutCode = null
 ) {
     const savedSessionInfo = await baseMixin.methods.dispatchStoreActionWithLogging(
         storeActions.SAVE_SESSION,
         {
             submitAfterSave: submitAfterSave,
             createUnscheduledStatusWorkOrderForPIA: createUnscheduledStatusWorkOrderForPIA,
+            bailoutCode: bailoutCode,
         },
         pageNameToLog
     );
diff --git a/src/layouts/bailout-success/bailout-success.vue b/src/layouts/bailout-success/bailout-success.vue
new file mode 100644
index 000000000..73bbadfbb
--- /dev/null
+++ b/src/layouts/bailout-success/bailout-success.vue
@@ -0,0 +1,91 @@
+<template>
+    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
+        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        <div class="container ymm-return">
+            <div class="row">
+                <div class="col-12 col-md-10 col-lg-8 col-xl-7">
+                    <funnelSubHeader
+                        class="mb-5"
+                        cmsWidgetName="FunnelSubHeaderWidget"
+                        :alignLeft="true" />
+
+                    <buttonMain
+                        id="btn-vehicle-not-listed"
+                        :isPrimary="true"
+                        :buttonText="ReturnToHomeButtonText"
+                        class="mb-3"
+                        @click-event="forwardButtonAction" />
+                </div>
+            </div>
+        </div>
+    </Form>
+</template>
+
+<script>
+import Form from "vee-validate";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import buttonMain from "@/ux-components/button-main/button-main";
+import store from "@/store";
+
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import { settleAllPromises } from "@/helpers/layout-helper";
+
+export default {
+    name: "bailout-success",
+    mixins: [],
+    data() {
+        return {};
+    },
+
+    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 forwardButtonAction() {
+            this.$router.navigateWithoutSaving(
+                this.navigationScenarios.CLICKED_BACK_TO_HOMEPAGE,
+                "bailout-success"
+            );
+        },
+        arePagePrerequisitesValid() {
+            return (
+                store.getters.order.customer.firstName &&
+                store.getters.order.customer.lastName &&
+                store.getters.order.customer.emailAddress &&
+                store.getters.order.customer.phoneNumber
+            );
+        },
+    },
+
+    computed: {
+        ReturnToHomeButtonText() {
+            return this.getCmsContent("ReturnToHomeButtonText", "Text");
+        },
+    },
+
+    components: {
+        Form,
+        funnelHeader,
+        funnelSubHeader,
+        buttonMain,
+    },
+};
+</script>
diff --git a/src/layouts/bailout/bailout.vue b/src/layouts/bailout/bailout.vue
index a64f7a416..754409794 100644
--- a/src/layouts/bailout/bailout.vue
+++ b/src/layouts/bailout/bailout.vue
@@ -1,21 +1,63 @@
 <template>
-    <Form>
-        <loadingModal ref="loadingModal" />
-        <div class="container-fluid page-container-grouped-styles">
-            <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 mt-4">
-                    <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
+    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
+        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
+        <div class="container ymm-return">
+            <div class="row">
+                <div class="col-12 col-md-10 col-lg-8 col-xl-7">
+                    <funnelSubHeader
+                        class="mb-5"
+                        :cmsWidgetName="getSubHeaderWidget"
+                        :alignLeft="true" />
+
+                    <textboxQuestion
+                        isRequired
+                        class="mb-4"
+                        cmsWidgetName="FirstNameQuestionWidget"
+                        v-model="firstName"
+                        ref="firstName"
+                        customInputId="firstName"
+                        validationRules="first-name-required" />
+
+                    <textboxQuestion
+                        isRequired
+                        class="mb-4"
+                        cmsWidgetName="LastNameQuestionWidget"
+                        v-model="lastName"
+                        ref="lastName"
+                        customInputId="lastName"
+                        validationRules="last-name-required" />
+
+                    <textboxQuestion
+                        isRequired
+                        class="mb-4"
+                        cmsWidgetName="EmailQuestionWidget"
+                        v-model="emailAddress"
+                        inputId="email"
+                        validationRules="email-address-required|email-address-format" />
+
+                    <phoneNumberQuestion
+                        isRequired
+                        class="mb-4"
+                        cmsWidgetName="PhoneNumberQuestionWidget"
+                        v-model="phoneNumber"
+                        validationRules="phone-number-required" />
+
+                    <checkboxQuestion
+                        class="mb-5"
+                        cmsWidgetName="TextMeQuestionWidget"
+                        v-model="isSmsOptIn" />
 
                     <navbar
                         cmsWidgetName="FunnelFooterWidget"
-                        isForwardActionDisabled="true"
-                        isSubmitHidden="true"
-                        @back-clicked="backButtonAction" />
+                        ref="navbar"
+                        :isForwardActionDisabled="!meta.valid"
+                        @back-clicked="backButtonAction"
+                        @ForwardClicked="forwardButtonAction" />
+
+                    <textBlock
+                        class="mb-5"
+                        cmsWidgetName="DisclaimerCopyWidget"
+                        typeStyle="caption" />
                 </div>
             </div>
         </div>
@@ -23,23 +65,56 @@
 </template>
 
 <script>
-// Components
+import { Form, defineRule } 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 loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
+import phoneNumberQuestion from "@/digital-components/phone-number-question/phone-number-question";
+import textBlock from "@/digital-components/text-block/text-block";
+import checkboxQuestion from "@/digital-components/checkbox-question/checkbox-question";
+import { routeData } from "@/router/constants/routes";
+import { bailoutCodes } from "@/constants/bailout-codes";
 
-// Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 
+import store from "@/store";
+import { errorMessages } from "@/constants/error-messages";
+import { required, regex } from "@/helpers/validation-rules";
+
+// DEFINE VALIDATION RULES
+defineRule("first-name-required", required(errorMessages.FIRST_NAME_REQUIRED));
+defineRule("last-name-required", required(errorMessages.LAST_NAME_REQUIRED));
+defineRule("phone-number-required", required(errorMessages.PHONE_REQUIRED));
+defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIRED));
+defineRule(
+    "email-address-format",
+    regex(
+        /^([a-zA-Z0-9_.+]+)@([a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*\.)+([a-zA-Z]{2,})$/,
+        errorMessages.EMAIL_ADDRESS_FORMAT
+    )
+);
+
 export default {
     name: "bailout",
+    mixins: [],
+    data() {
+        return {
+            bailoutCode: this.getBailoutCodeFromStore(),
+            firstName: this.getFirstNameFromStore(),
+            lastName: this.getLastNameFromStore(),
+            emailAddress: this.getEmailAddressFromStore(),
+            phoneNumber: this.getPhoneNumberFromStore(),
+            isSmsOptIn: this.getIsSmsOptInFromStore(),
+        };
+    },
+
     async beforeRouteEnter(to, from, next) {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.name);
 
-        // Settle promises and get results
+        // Settle API calls in parallel before handling results.
         const promiseResultMap = [
             {
                 resultKey: "cmsContent",
@@ -49,25 +124,79 @@ export default {
 
         const resultMap = await settleAllPromises(promiseResultMap);
 
-        // Call the "next" function to complete the transition to this page.
-        next((vm) => {
+        // Hydrate page with results
+        next(async (vm) => {
             vm.setCmsContent(resultMap.cmsContent);
         });
     },
 
     methods: {
+        getBailoutCodeFromStore() {
+            return bailoutCodes.PARTS_NOT_FOUND;
+        },
+        getFirstNameFromStore() {
+            return store.getters.order.customer.firstName;
+        },
+        getLastNameFromStore() {
+            return store.getters.order.customer.lastName;
+        },
+        getEmailAddressFromStore() {
+            return store.getters.order.customer.emailAddress;
+        },
+        getPhoneNumberFromStore() {
+            return store.getters.order.customer.phoneNumber;
+        },
+        getIsSmsOptInFromStore() {
+            return store.getters.order.customer.isSmsOptIn;
+        },
+        async backButtonAction() {
+            this.$router.go(-1);
+        },
+        async forwardButtonAction() {
+            await this.dispatchStoreAction(
+                this.storeActions.SAVE_CUSTOMER_DETAILS,
+                {
+                    firstName: this.firstName,
+                    lastName: this.lastName,
+                    emailAddress: this.emailAddress,
+                    phoneNumber: this.phoneNumber,
+                    isSmsOptIn: this.isSmsOptIn,
+                },
+                false
+            ).then(() => {
+                this.$router.navigateWithPageData(
+                    this.navigationScenarios.CLICKED_FORWARD,
+                    this.pageName,
+                    {
+                        bailoutCode: this.bailoutCode,
+                    }
+                );
+            });
+        },
         arePagePrerequisitesValid() {
             return true;
         },
-        backButtonAction() {
-            this.$router.go(-1);
+    },
+
+    computed: {
+        getSubHeaderWidget() {
+            if (this.bailoutCode === bailoutCodes.PARTS_NOT_FOUND) {
+                return "PartsNotFoundSubHeaderWidget";
+            } else {
+                return "FunnelSubHeaderWidget";
+            }
         },
     },
+
     components: {
+        Form,
         funnelHeader,
-        navbar,
         funnelSubHeader,
-        loadingModal,
+        navbar,
+        textBlock,
+        phoneNumberQuestion,
+        checkboxQuestion,
+        textboxQuestion,
     },
 };
 </script>
diff --git a/src/router/constants/navigation-scenarios.js b/src/router/constants/navigation-scenarios.js
index fef66ddbb..e4aac41c1 100644
--- a/src/router/constants/navigation-scenarios.js
+++ b/src/router/constants/navigation-scenarios.js
@@ -13,6 +13,11 @@ const navigationScenarios = {
     CLICKED_FORWARD_WITH_CASH: "CLICKED_FORWARD_WITH_CASH",
     CLICKED_FORWARD_WITH_INSURANCE: "CLICKED_FORWARD_WITH_INSURANCE",
 
+    // Bailout
+    BAILOUT: "BAILOUT",
+    BAILOUT_SUCCESS: "BAILOUT_SUCCESS",
+    CLICKED_BACK_TO_HOMEPAGE: "CLICKED_BACK_TO_HOMEPAGE",
+
     // TODO: use virtual page?
     // Vin selection
     CLICKED_BACK_WITH_VIN: "CLICKED_BACK_WITH_VIN",
diff --git a/src/router/constants/routes.js b/src/router/constants/routes.js
index fc54025ef..479d0899d 100644
--- a/src/router/constants/routes.js
+++ b/src/router/constants/routes.js
@@ -171,6 +171,14 @@ export const routeData = {
         path: "/virtual/restart",
         virtual: true,
     },
+    BAILOUT: {
+        name: "bailout",
+        path: "/bailout",
+    },
+    BAILOUT_SUCCESS: {
+        name: "bailout-success",
+        path: "/bailout-success",
+    },
 };
 
 export const FUNNEL_START_PAGE = routeData.VEHICLE;
diff --git a/src/router/constants/routing-table.js b/src/router/constants/routing-table.js
index 77876a096..b85320973 100644
--- a/src/router/constants/routing-table.js
+++ b/src/router/constants/routing-table.js
@@ -802,6 +802,24 @@ const routingTable = function () {
                 },
             ],
         },
+        {
+            pageName: routeData.BAILOUT.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD,
+                    destinationPageData: routeData.BAILOUT_SUCCESS,
+                },
+            ],
+        },
+        {
+            pageName: routeData.BAILOUT_SUCCESS.name,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK_TO_HOMEPAGE,
+                    destinationPageData: routeData.VEHICLE,
+                },
+            ],
+        },
     ];
 };
 
diff --git a/src/router/methods/navigate.js b/src/router/methods/navigate.js
index b80d31769..a6d3148f0 100644
--- a/src/router/methods/navigate.js
+++ b/src/router/methods/navigate.js
@@ -7,7 +7,13 @@ import store from "@/store";
 
 import { handleSoftError } from "@/router/methods/error";
 
-async function navigate(scenario, currentPageName, withSaving = false, forceTopLevelNav = false) {
+async function navigate(
+    scenario,
+    currentPageName,
+    withSaving = false,
+    forceTopLevelNav = false,
+    bailoutCode = null
+) {
     // Check to see if calling page is same as current page.
     // If not, cancel navigation before it begins.
     const callingRoute = currentPageName;
@@ -39,7 +45,7 @@ async function navigate(scenario, currentPageName, withSaving = false, forceTopL
             store.getters?.applicationUser?.savedSessionId ||
             store.getters?.order?.customer?.emailAddress
         ) {
-            await saveSession({ pageNameToLog: nextPage.name });
+            await saveSession({ pageNameToLog: nextPage.name, bailoutCode: bailoutCode });
         }
     }
 
@@ -70,9 +76,13 @@ export async function navigateWithSaving(scenario, currentPageName) {
 
 export async function navigateWithPageData(scenario, currentPageName, pageData = {}) {
     const nextPage = getDestination(currentPageName, scenario);
-    await savePageData(nextPage.name, pageData);
-
-    return await navigate(scenario, currentPageName, true);
+    if (pageData && pageData.bailoutCode) {
+        await savePageData(currentPageName, pageData);
+        return await navigate(scenario, currentPageName, true, false, pageData.bailoutCode);
+    } else {
+        await savePageData(nextPage.name, pageData);
+        return await navigate(scenario, currentPageName, true);
+    }
 }
 
 export async function navigateAndForceTopLevelNavigation(
diff --git a/src/router/methods/routes.js b/src/router/methods/routes.js
index 88cc17f94..34056ba76 100644
--- a/src/router/methods/routes.js
+++ b/src/router/methods/routes.js
@@ -51,6 +51,8 @@ export const routes = [
     createRoute(routeData.RECALIBRATION_INFO),
     createRoute(routeData.COVERAGE_STATEMENT),
     createRoute(routeData.VERIFY_DETAILS),
+    createRoute(routeData.BAILOUT),
+    createRoute(routeData.BAILOUT_SUCCESS),
     // Virtual pages (resolve to a non-virtual page.)
     createVirtualRoute(routeData.LANDING, landingBeforeEnter),
     createVirtualRoute(routeData.HERITAGE, heritageBeforeEnter),

From dd291a980c5f7b930b6d728cf80adbde72516592 Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Thu, 7 May 2026 12:52:02 -0400
Subject: [PATCH 2/6] CASH-2563

---
 src/constants/bailout-codes.js                |  2 +-
 .../heritage-integration/order-helper.js      | 11 +--
 .../bailout-success/bailout-success.spec.js   | 56 ++++++++++++
 .../bailout-success/bailout-success.vue       |  4 +-
 src/layouts/bailout/bailout.spec.js           | 20 +++++
 src/layouts/bailout/bailout.vue               | 87 +++++++++++++++++--
 src/router/constants/routing-table.js         |  2 +-
 src/router/methods/navigate.js                | 16 ++--
 src/store/index.js                            |  8 +-
 9 files changed, 172 insertions(+), 34 deletions(-)
 create mode 100644 src/layouts/bailout-success/bailout-success.spec.js

diff --git a/src/constants/bailout-codes.js b/src/constants/bailout-codes.js
index caf265292..af6290363 100644
--- a/src/constants/bailout-codes.js
+++ b/src/constants/bailout-codes.js
@@ -1,5 +1,5 @@
 const bailoutCodes = {
-    PARTS_NOT_FOUND: "PartsNotFound",
+    PARTS_NOT_FOUND: 10,
 };
 
 export { bailoutCodes };
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index b15a0a6e3..613f239f2 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -57,15 +57,13 @@ export async function saveSession({
     shouldAwaitSaveSessionQueue = false,
     submitAfterSave = false,
     createUnscheduledStatusWorkOrderForPIA = false,
-    bailoutCode = null,
 }) {
     // Add next save session to end of queue
     const saveSessionPromise = flushSaveSessionQueue().then(() => {
         return saveSessionHelper(
             pageNameToLog,
             submitAfterSave,
-            createUnscheduledStatusWorkOrderForPIA,
-            bailoutCode
+            createUnscheduledStatusWorkOrderForPIA
         );
     });
 
@@ -108,12 +106,11 @@ export async function saveQuote({ pageNameToLog }) {
     return;
 }
 
-export async function submitBailout({ pageNameToLog, bailoutCode }) {
+export async function submitBailout({ pageNameToLog }) {
     await saveSession({
         pageNameToLog: pageNameToLog,
         shouldAwaitSaveSessionQueue: true,
         submitAfterSave: false,
-        bailoutCode: bailoutCode,
     });
 }
 
@@ -158,15 +155,13 @@ async function loadSession(
 async function saveSessionHelper(
     pageNameToLog,
     submitAfterSave = false,
-    createUnscheduledStatusWorkOrderForPIA = false,
-    bailoutCode = null
+    createUnscheduledStatusWorkOrderForPIA = false
 ) {
     const savedSessionInfo = await baseMixin.methods.dispatchStoreActionWithLogging(
         storeActions.SAVE_SESSION,
         {
             submitAfterSave: submitAfterSave,
             createUnscheduledStatusWorkOrderForPIA: createUnscheduledStatusWorkOrderForPIA,
-            bailoutCode: bailoutCode,
         },
         pageNameToLog
     );
diff --git a/src/layouts/bailout-success/bailout-success.spec.js b/src/layouts/bailout-success/bailout-success.spec.js
new file mode 100644
index 000000000..5d5f73f14
--- /dev/null
+++ b/src/layouts/bailout-success/bailout-success.spec.js
@@ -0,0 +1,56 @@
+// Components
+import bailoutSuccess from "@/layouts/bailout-success/bailout-success.vue";
+
+// Supporting Files
+import { shallowMount } from "@vue/test-utils";
+import { getMountOptions } from "@/helpers/unit-test-helper.js";
+
+// 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("bailout-success.vue", () => {
+    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 Form component", () => {
+        const { wrapper } = setupMocks();
+        expect(wrapper.findComponent({ name: "Form" }).exists()).toBe(true);
+    });
+
+    test("renders buttonMain component", () => {
+        const { wrapper } = setupMocks();
+        expect(wrapper.findComponent({ name: "buttonMain" }).exists()).toBe(true);
+    });
+});
+
+function setupMocks() {
+    const mountOptions = getMountOptions({});
+
+    //Mock props
+    const mockMixin = {
+        methods: {
+            getCmsContent: jest.fn(),
+        },
+    };
+
+    mountOptions.mixins = [mockMixin];
+    const wrapper = shallowMount(bailoutSuccess, mountOptions);
+
+    wrapper.vm.setCmsContent = jest.fn();
+
+    return { wrapper };
+}
diff --git a/src/layouts/bailout-success/bailout-success.vue b/src/layouts/bailout-success/bailout-success.vue
index 73bbadfbb..97f186ca6 100644
--- a/src/layouts/bailout-success/bailout-success.vue
+++ b/src/layouts/bailout-success/bailout-success.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import Form from "vee-validate";
+import { Form } from "vee-validate";
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import buttonMain from "@/ux-components/button-main/button-main";
@@ -62,7 +62,7 @@ export default {
         async forwardButtonAction() {
             this.$router.navigateWithoutSaving(
                 this.navigationScenarios.CLICKED_BACK_TO_HOMEPAGE,
-                "bailout-success"
+                this.pageName
             );
         },
         arePagePrerequisitesValid() {
diff --git a/src/layouts/bailout/bailout.spec.js b/src/layouts/bailout/bailout.spec.js
index ebed2697a..905f9e5a0 100644
--- a/src/layouts/bailout/bailout.spec.js
+++ b/src/layouts/bailout/bailout.spec.js
@@ -16,6 +16,26 @@ jest.mock("@/helpers/cms-content-helper", () => ({
 }));
 
 describe("bailout.vue", () => {
+    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 Form component", () => {
+        const { wrapper } = setupMocks();
+        expect(wrapper.findComponent({ name: "Form" }).exists()).toBe(true);
+    });
+
+    test("renders navbar component", () => {
+        const { wrapper } = setupMocks();
+        expect(wrapper.findComponent({ name: "navbar" }).exists()).toBe(true);
+    });
+
     test("arePagePrerequisitesValid should be true ", async () => {
         //Arrange
         const { wrapper } = setupMocks();
diff --git a/src/layouts/bailout/bailout.vue b/src/layouts/bailout/bailout.vue
index 754409794..3bb5c33b1 100644
--- a/src/layouts/bailout/bailout.vue
+++ b/src/layouts/bailout/bailout.vue
@@ -42,6 +42,23 @@
                         v-model="phoneNumber"
                         validationRules="phone-number-required" />
 
+                    <textboxQuestion
+                        class="mb-4"
+                        cmsWidgetName="ServiceZipQuestionWidget"
+                        v-model="serviceZipCode"
+                        ref="serviceZip"
+                        customInputId="serviceZip"
+                        mask="#####"
+                        validationRules="service-zip-required|service-zip-format" />
+
+                    <alert
+                        ref="alertInvalidZip"
+                        v-if="displayInvalidZipAlert"
+                        class="mb-4"
+                        cmsWidgetName="AlertInvalidZipWidget"
+                        alertClass="alert-danger"
+                        v-bind:isDismissible="false" />
+
                     <checkboxQuestion
                         class="mb-5"
                         cmsWidgetName="TextMeQuestionWidget"
@@ -69,6 +86,7 @@ import { Form, defineRule } 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 textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import phoneNumberQuestion from "@/digital-components/phone-number-question/phone-number-question";
 import textBlock from "@/digital-components/text-block/text-block";
@@ -95,6 +113,11 @@ defineRule(
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
+defineRule("service-zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
+defineRule(
+    "service-zip-format",
+    regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT)
+);
 
 export default {
     name: "bailout",
@@ -106,7 +129,9 @@ export default {
             lastName: this.getLastNameFromStore(),
             emailAddress: this.getEmailAddressFromStore(),
             phoneNumber: this.getPhoneNumberFromStore(),
+            serviceZipCode: this.getServiceZipFromStore(),
             isSmsOptIn: this.getIsSmsOptInFromStore(),
+            displayInvalidZipAlert: false,
         };
     },
 
@@ -146,6 +171,9 @@ export default {
         getPhoneNumberFromStore() {
             return store.getters.order.customer.phoneNumber;
         },
+        getServiceZipFromStore() {
+            return store.getters.order.serviceLocation.zipCode;
+        },
         getIsSmsOptInFromStore() {
             return store.getters.order.customer.isSmsOptIn;
         },
@@ -153,7 +181,17 @@ export default {
             this.$router.go(-1);
         },
         async forwardButtonAction() {
-            await this.dispatchStoreAction(
+            this.displayInvalidZipAlert = false;
+
+            const validateZipResponse = this.dispatchStoreActionWithLogging(
+                this.storeActions.VALIDATE_ZIP,
+                {
+                    zip: this.serviceZipCode,
+                },
+                this.pageName
+            );
+
+            const saveCustomerDetailsResponse = this.dispatchStoreAction(
                 this.storeActions.SAVE_CUSTOMER_DETAILS,
                 {
                     firstName: this.firstName,
@@ -163,15 +201,45 @@ export default {
                     isSmsOptIn: this.isSmsOptIn,
                 },
                 false
-            ).then(() => {
-                this.$router.navigateWithPageData(
-                    this.navigationScenarios.CLICKED_FORWARD,
-                    this.pageName,
+            );
+
+            const promiseResultMap = [
+                {
+                    resultKey: "validateZipResponse",
+                    promise: validateZipResponse,
+                },
+                {
+                    resultKey: "saveCustomerDetailsResponse",
+                    promise: saveCustomerDetailsResponse,
+                },
+            ];
+
+            const resultMap = await settleAllPromises(promiseResultMap);
+            const isZipValid = resultMap.validateZipResponse.isValid;
+
+            if (isZipValid) {
+                await this.dispatchStoreActionWithLogging(
+                    this.storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
                     {
-                        bailoutCode: this.bailoutCode,
-                    }
-                );
-            });
+                        zipCode: this.serviceZipCode,
+                        state: resultMap.validateZipResponse.state,
+                        zipCodeCtu: resultMap.validateZipResponse.zipCodeCtu,
+                    },
+                    false
+                ).then(() => {
+                    this.$router.navigateWithPageData(
+                        this.navigationScenarios.CLICKED_FORWARD,
+                        this.pageName,
+                        {
+                            bailoutCode: this.bailoutCode,
+                            submit: true,
+                        }
+                    );
+                });
+            } else {
+                this.displayInvalidZipAlert = true;
+                return this.$refs.navbar.removeLoader();
+            }
         },
         arePagePrerequisitesValid() {
             return true;
@@ -192,6 +260,7 @@ export default {
         Form,
         funnelHeader,
         funnelSubHeader,
+        alert,
         navbar,
         textBlock,
         phoneNumberQuestion,
diff --git a/src/router/constants/routing-table.js b/src/router/constants/routing-table.js
index b85320973..81c010d5b 100644
--- a/src/router/constants/routing-table.js
+++ b/src/router/constants/routing-table.js
@@ -816,7 +816,7 @@ const routingTable = function () {
             maps: [
                 {
                     scenario: navigationScenarios.CLICKED_BACK_TO_HOMEPAGE,
-                    destinationPageData: routeData.VEHICLE,
+                    destinationPageData: routeData.RESTART,
                 },
             ],
         },
diff --git a/src/router/methods/navigate.js b/src/router/methods/navigate.js
index a6d3148f0..1cdd87aac 100644
--- a/src/router/methods/navigate.js
+++ b/src/router/methods/navigate.js
@@ -7,13 +7,7 @@ import store from "@/store";
 
 import { handleSoftError } from "@/router/methods/error";
 
-async function navigate(
-    scenario,
-    currentPageName,
-    withSaving = false,
-    forceTopLevelNav = false,
-    bailoutCode = null
-) {
+async function navigate(scenario, currentPageName, withSaving = false, forceTopLevelNav = false) {
     // Check to see if calling page is same as current page.
     // If not, cancel navigation before it begins.
     const callingRoute = currentPageName;
@@ -45,7 +39,7 @@ async function navigate(
             store.getters?.applicationUser?.savedSessionId ||
             store.getters?.order?.customer?.emailAddress
         ) {
-            await saveSession({ pageNameToLog: nextPage.name, bailoutCode: bailoutCode });
+            await saveSession({ pageNameToLog: nextPage.name });
         }
     }
 
@@ -76,13 +70,15 @@ export async function navigateWithSaving(scenario, currentPageName) {
 
 export async function navigateWithPageData(scenario, currentPageName, pageData = {}) {
     const nextPage = getDestination(currentPageName, scenario);
+
     if (pageData && pageData.bailoutCode) {
+        pageData.AppName = "FixMyGlass";
         await savePageData(currentPageName, pageData);
-        return await navigate(scenario, currentPageName, true, false, pageData.bailoutCode);
     } else {
         await savePageData(nextPage.name, pageData);
-        return await navigate(scenario, currentPageName, true);
     }
+
+    return await navigate(scenario, currentPageName, true);
 }
 
 export async function navigateAndForceTopLevelNavigation(
diff --git a/src/store/index.js b/src/store/index.js
index a58200a96..0d64fc51f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -462,9 +462,11 @@ export const mutations = {
         state.order.vehicle.registration.licensePlate = registrationInfo?.licensePlate;
     },
     updateServiceZip(state, serviceZipInfo) {
-        state.order.serviceLocation.state = serviceZipInfo.state;
-        state.order.serviceLocation.zipCode = serviceZipInfo.zipCode;
-        state.order.serviceLocation.zipCodeCtu = serviceZipInfo.zipCodeCtu;
+        state.order.serviceLocation.state = serviceZipInfo.state || serviceZipInfo.payload?.state;
+        state.order.serviceLocation.zipCode =
+            serviceZipInfo.zipCode || serviceZipInfo.payload?.zipCode;
+        state.order.serviceLocation.zipCodeCtu =
+            serviceZipInfo.zipCodeCtu || serviceZipInfo.payload?.zipCodeCtu;
     },
     updateServiceLocation(state, serviceLocationInfo) {
         state.order.serviceLocation.address = serviceLocationInfo.address;

From 75f018431472be41ced81c55655b057519de1f7a Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Thu, 7 May 2026 18:35:54 -0400
Subject: [PATCH 3/6] CASH-2563: Bailout on 500 from GetPartsOrQuestions

---
 src/constants/store-actions.js        |   2 +
 src/constants/store-mutations.js      |   3 +
 src/layouts/bailout/bailout.vue       |  11 +--
 src/mixins/bailout-mixin.js           |  13 ++++
 src/mixins/bailout-mixin.spec.js      | 103 ++++++++++++++++++++++++++
 src/mixins/vin-pages-mixin.js         |   7 ++
 src/router/constants/routing-table.js |   4 +
 src/store/index.js                    |  48 ++++++++----
 8 files changed, 171 insertions(+), 20 deletions(-)
 create mode 100644 src/mixins/bailout-mixin.js
 create mode 100644 src/mixins/bailout-mixin.spec.js

diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 702f7c737..84241a2f8 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -131,6 +131,8 @@ const storeActions = {
     UPDATE_HAS_TRIGGERED_ERROR: "updateHasTriggeredError",
     GET_VALID_IDEMPOTENCY_KEY: "getValidIdempotencyKey",
     CORRECT_IDEMPOTENCY_KEY_EXPIRY: "correctIdempotencyKeyExpiry",
+
+    SAVE_BAILOUT_CODE: "saveBailoutCode",
 };
 
 export { storeActions };
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index c43e737d3..238898bb9 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -114,6 +114,9 @@ const storeMutations = {
     UPDATE_EXPERIMENTS: "updateExperiments",
     UPDATE_TRIGGERED_SITE_ENTRY: "updateTriggeredSiteEntry",
 
+    // BAILOUT MUTATIONS
+    UPDATE_BAILOUT_CODE: "updateBailoutCode",
+
     // EXTERNAL_PARAMETER MUTATIONS
     UPDATE_IS_EXTERNAL_PARAMETER: "updateIsExternalParameter",
     UPDATE_EXTERNAL_PARAMETER_YEAR: "updateExternalParameterYear",
diff --git a/src/layouts/bailout/bailout.vue b/src/layouts/bailout/bailout.vue
index 3bb5c33b1..ae5600e08 100644
--- a/src/layouts/bailout/bailout.vue
+++ b/src/layouts/bailout/bailout.vue
@@ -157,7 +157,7 @@ export default {
 
     methods: {
         getBailoutCodeFromStore() {
-            return bailoutCodes.PARTS_NOT_FOUND;
+            return store.getters.applicationUser.bailoutCode;
         },
         getFirstNameFromStore() {
             return store.getters.order.customer.firstName;
@@ -248,10 +248,11 @@ export default {
 
     computed: {
         getSubHeaderWidget() {
-            if (this.bailoutCode === bailoutCodes.PARTS_NOT_FOUND) {
-                return "PartsNotFoundSubHeaderWidget";
-            } else {
-                return "FunnelSubHeaderWidget";
+            switch (this.bailoutCode) {
+                case bailoutCodes.PARTS_NOT_FOUND:
+                    return "PartsNotFoundSubHeaderWidget";
+                default:
+                    return "FunnelSubHeaderWidget";
             }
         },
     },
diff --git a/src/mixins/bailout-mixin.js b/src/mixins/bailout-mixin.js
new file mode 100644
index 000000000..f8c724da2
--- /dev/null
+++ b/src/mixins/bailout-mixin.js
@@ -0,0 +1,13 @@
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
+
+export default {
+    methods: {
+        navigateToBailoutPage(vm, bailoutCode) {
+            const self = vm ?? this;
+
+            self.dispatchStoreAction(self.storeActions.SAVE_BAILOUT_CODE, bailoutCode).then(() => {
+                self.$router.navigateWithoutSaving(navigationScenarios.BAILOUT, self.pageName);
+            });
+        },
+    },
+};
diff --git a/src/mixins/bailout-mixin.spec.js b/src/mixins/bailout-mixin.spec.js
new file mode 100644
index 000000000..c213de767
--- /dev/null
+++ b/src/mixins/bailout-mixin.spec.js
@@ -0,0 +1,103 @@
+import bailoutMixin from "@/mixins/bailout-mixin";
+import { storeActions } from "@/constants/store-actions.js";
+import { navigationScenarios } from "@/router/constants/navigation-scenarios";
+import { bailoutCodes } from "@/constants/bailout-codes.js";
+
+describe("bailout-mixin.js", () => {
+    test("navigateToBailoutPage: dispatches SAVE_BAILOUT_CODE action with bailout code", async () => {
+        // Arrange
+        const mockVm = createMockVm();
+        const bailoutCode = bailoutCodes.PARTS_NOT_FOUND;
+
+        // Act
+        await bailoutMixin.methods.navigateToBailoutPage(mockVm, bailoutCode);
+
+        // Assert
+        expect(mockVm.dispatchStoreAction).toHaveBeenCalledWith(
+            storeActions.SAVE_BAILOUT_CODE,
+            bailoutCode
+        );
+    });
+
+    test("navigateToBailoutPage: navigates to bailout page after saving bailout code", async () => {
+        // Arrange
+        const mockVm = createMockVm();
+        const bailoutCode = bailoutCodes.PARTS_NOT_FOUND;
+
+        // Act
+        await bailoutMixin.methods.navigateToBailoutPage(mockVm, bailoutCode);
+
+        // Assert
+        expect(mockVm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
+            navigationScenarios.BAILOUT,
+            mockVm.pageName
+        );
+    });
+
+    test("navigateToBailoutPage: uses current context (this) when vm is not provided", async () => {
+        // Arrange
+        const mockRouter = {
+            navigateWithoutSaving: jest.fn().mockResolvedValue(undefined),
+        };
+        const mockThis = {
+            dispatchStoreAction: jest.fn().mockResolvedValue(undefined),
+            $router: mockRouter,
+            storeActions: storeActions,
+            pageName: "test-page",
+        };
+
+        const bailoutCode = bailoutCodes.PARTS_NOT_FOUND;
+
+        // Act
+        await bailoutMixin.methods.navigateToBailoutPage.call(mockThis, undefined, bailoutCode);
+
+        // Assert
+        expect(mockThis.dispatchStoreAction).toHaveBeenCalledWith(
+            storeActions.SAVE_BAILOUT_CODE,
+            bailoutCode
+        );
+    });
+
+    test("navigateToBailoutPage: passes correct bailout code to store", async () => {
+        // Arrange
+        const mockVm = createMockVm();
+        const customBailoutCode = 999;
+
+        // Act
+        await bailoutMixin.methods.navigateToBailoutPage(mockVm, customBailoutCode);
+
+        // Assert
+        expect(mockVm.dispatchStoreAction).toHaveBeenCalledWith(
+            storeActions.SAVE_BAILOUT_CODE,
+            customBailoutCode
+        );
+    });
+
+    test("navigateToBailoutPage: calls navigateWithoutSaving with correct parameters", async () => {
+        // Arrange
+        const mockVm = createMockVm();
+        const mockPageName = "vehicle-damage";
+        mockVm.pageName = mockPageName;
+        const bailoutCode = bailoutCodes.PARTS_NOT_FOUND;
+
+        // Act
+        await bailoutMixin.methods.navigateToBailoutPage(mockVm, bailoutCode);
+
+        // Assert
+        expect(mockVm.$router.navigateWithoutSaving).toHaveBeenCalledWith(
+            navigationScenarios.BAILOUT,
+            mockPageName
+        );
+    });
+});
+
+function createMockVm() {
+    return {
+        dispatchStoreAction: jest.fn().mockResolvedValue(undefined),
+        $router: {
+            navigateWithoutSaving: jest.fn().mockResolvedValue(undefined),
+        },
+        storeActions,
+        pageName: "test-page",
+    };
+}
diff --git a/src/mixins/vin-pages-mixin.js b/src/mixins/vin-pages-mixin.js
index fc195d910..2309cbde5 100644
--- a/src/mixins/vin-pages-mixin.js
+++ b/src/mixins/vin-pages-mixin.js
@@ -1,9 +1,11 @@
 import { storeActions } from "@/constants/store-actions.js";
 import store from "@/store";
 import vehicleQuestionsMixin from "@/mixins/vehicle-questions-mixin";
+import bailoutMixin from "@/mixins/bailout-mixin";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import { experimentSettings } from "@/constants/experiments";
 import { vinLookupMethodSelections } from "@/constants/vin-lookup-method-selections.js";
+import { bailoutCodes } from "@/constants/bailout-codes";
 
 export default {
     computed: {
@@ -34,6 +36,11 @@ export default {
             const result = await this.dispatchStoreAction(storeActions.GET_PARTS_OR_QUESTIONS, {
                 pageNameToLog: pageName,
             });
+
+            if (result.PartsNotFound) {
+                bailoutMixin.methods.navigateToBailoutPage(this, bailoutCodes.PARTS_NOT_FOUND);
+            }
+
             const partsOrQuestions = result.data.partsOrQuestions;
 
             vehicleQuestionsMixin.methods.navigateForward(partsOrQuestions, this);
diff --git a/src/router/constants/routing-table.js b/src/router/constants/routing-table.js
index 81c010d5b..877802995 100644
--- a/src/router/constants/routing-table.js
+++ b/src/router/constants/routing-table.js
@@ -274,6 +274,10 @@ const routingTable = function () {
                     scenario: navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
                     destinationPageData: routeData.QUOTE,
                 },
+                {
+                    scenario: navigationScenarios.BAILOUT,
+                    destinationPageData: routeData.BAILOUT,
+                },
             ],
         },
         {
diff --git a/src/store/index.js b/src/store/index.js
index 0d64fc51f..e8d6cc7fe 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -216,6 +216,7 @@ const getDefaultState = () => {
             affiliateCookies: [],
             loggingOption: false,
             hasAlreadyTriggeredError: false,
+            bailoutCode: null,
         },
         idempotencyKeyFields: {
             referralCorrelationId: null,
@@ -950,6 +951,9 @@ export const mutations = {
         state.idempotencyKeyFields.totalInCents = totalInCents;
         state.idempotencyKeyFields.expiryTime = expiryTime;
     },
+    updateBailoutCode(state, bailoutCode) {
+        state.applicationUser.bailoutCode = bailoutCode;
+    },
 };
 
 // Export Getters
@@ -1903,21 +1907,31 @@ export const actions = {
         // create a new array to avoid mutating state
         const glassArrayForPayload = convertGlassPieceNamingForApi(glassArray);
 
-        const response = await globalMethods.callHttpClient({
-            method: endpoints.GetPartsOrQuestions.method,
-            endpoint: endpoints.GetPartsOrQuestions.url,
-            payload: {
-                carId: carId,
-                glassPieces: glassArrayForPayload,
-                zip: zipCode,
-                vin: vin,
-                serviceType: serviceType,
-                referralSeqNumber: referralSeqNumber,
-                parentAccountNumber: parentAccountNumber,
-            },
-            logApiCall: true,
-            pageNameToLog: pageNameToLog,
-        });
+        const response = await globalMethods
+            .callHttpClient({
+                method: endpoints.GetPartsOrQuestions.method,
+                endpoint: endpoints.GetPartsOrQuestions.url,
+                payload: {
+                    carId: carId,
+                    glassPieces: glassArrayForPayload,
+                    zip: zipCode,
+                    vin: vin,
+                    serviceType: serviceType,
+                    referralSeqNumber: referralSeqNumber,
+                    parentAccountNumber: parentAccountNumber,
+                },
+                logApiCall: true,
+                pageNameToLog: pageNameToLog,
+            })
+            .catch((error) => {
+                if (error.status == 500) {
+                    return { PartsNotFound: true };
+                }
+            });
+
+        if (response.PartsNotFound) {
+            return response;
+        }
 
         // Flatten location and name properties
         response.data.partsOrQuestions = convertGlassPieceNamingFromApi(
@@ -3820,6 +3834,10 @@ export const actions = {
             context.commit(storeMutations.UPDATE_IDEMPOTENCY_KEY, newKey);
         }
     },
+
+    saveBailoutCode(context, bailoutCode) {
+        context.commit(storeMutations.UPDATE_BAILOUT_CODE, bailoutCode);
+    },
 };
 
 export default createStore({

From 0086b1c1fee0dda55ff8e5e7630c36c162079819 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 8 May 2026 15:29:15 -0400
Subject: [PATCH 4/6] CASH-2570 unverified message incorrectly showing

CASH-2570 the unverified message shows if you go through initially unverified and get assigned the experiment and create a new order as cash.  You're still assigned the unverified deductible experiment.  So qualified the alert message to include a check for isInsurance.  Also noticed in vuex, when switching from insurance to cash, the insurance properties in vuex are still set.  Added code to clear them when selecting  a cash order
---
 src/constants/store-actions.js                |  1 +
 src/constants/store-mutations.js              |  1 +
 src/layouts/payment-method/payment-method.vue |  5 ++--
 src/layouts/quote/quote.vue                   |  1 +
 src/store/index.js                            | 23 +++++++++++++++++++
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 702f7c737..ad31474c3 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -123,6 +123,7 @@ const storeActions = {
 
     CREATE_SUBMITTED_STATE: "createSubmittedState",
     RESET_SUBMITTED_STATE: "resetSubmittedState",
+    RESET_INSURANCE_DETAILS: "resetInsuranceDetails",
     ADD_DONATION_TO_SUBMITTED_STATE: "addDonationToSubmittedState",
     RESET_EXTERNAL_PARAMETER_STATE: "resetExternalParameterState",
     UPDATE_EXTERNAL_PARAMETER_MMS: "updateExternalParameterMMS",
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index c43e737d3..e8bde83a5 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -100,6 +100,7 @@ const storeMutations = {
     RESET_SERVICE_LOCATION_MOBILE_ADDRESS: "resetServiceLocationMobileAddress",
     RESET_SCHEDULE: "resetSchedule",
     RESET_PAYMENT_METHOD_CHOICE: "resetPaymentMethodChoice",
+    RESET_INSURANCE_DETAILS: "resetInsuranceDetails",
 
     // OTHER MUTATIONS
     UPDATE_PAGE_DATA: "updatePageData",
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index da49aa039..b0347f581 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -834,11 +834,12 @@ export default {
             return getBoolFromString(this.$route?.query?.piaError);
         },
         shouldDisplayUnverifiedInsuranceAlert() {
-            const shouldDisplayUnverifiedDeduct = experimentMixin.methods.hasSettingEqualTo(
+            const hasExperimentSetting = experimentMixin.methods.hasSettingEqualTo(
                 experimentSettings.SHOW_UNVERIFIED_DEDUCT_ENTRY,
                 "true"
             );
-            return shouldDisplayUnverifiedDeduct;
+
+            return hasExperimentSetting && this.isInsurance;
         },
         // Necessary to make the watcher of lineItems work
         // JavaScript does not keep a record of the old value, only a reference to it's location in the memory.
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index d9f238733..206ff2050 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -799,6 +799,7 @@ export default {
                     false,
                     false
                 );
+                this.dispatchStoreAction(this.storeActions.RESET_INSURANCE_DETAILS, false, false);
                 this.dispatchStoreAction(this.storeActions.SAVE_CAN_SCHEDULE_ONLINE, false, false);
                 this.dispatchStoreAction(this.storeActions.SAVE_ACCOUNT_NAME, null, false);
             } else {
diff --git a/src/store/index.js b/src/store/index.js
index 4f729efa3..18b34f023 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -374,6 +374,26 @@ export const mutations = {
     updateIsInsurance(state, isInsurance) {
         state.order.payment.isInsurance = isInsurance;
     },
+    resetInsuranceDetails(state) {
+        state.order.payment.insuranceCoverage = {
+            isVerified: null,
+            coverageStatus: null,
+            coverageSubStatus: null,
+            coverageType: null,
+            coverageVerificationType: null,
+        };
+
+        state.order.policy.policyNumber = null;
+        state.order.policy.claimNumber = null;
+        state.order.policy.insuranceCompanyName = null;
+        state.order.policy.streetAddress = null;
+        state.order.policy.apartment = null;
+        state.order.policy.city = null;
+        state.order.policy.state = null;
+        state.order.policy.zipCode = null;
+        state.order.damage.dateOfLoss = null;
+        state.order.damage.damageCause = null;
+    },
     updateIsPia(state, isPia) {
         state.order.payment.isPia = isPia;
     },
@@ -3116,6 +3136,9 @@ export const actions = {
     saveBillToAccountNumber(context, billToAccountNumber) {
         context.commit(storeMutations.UPDATE_BILL_TO_ACCT_NUMBER, billToAccountNumber);
     },
+    resetInsuranceDetails(context) {
+        context.commit(storeMutations.RESET_INSURANCE_DETAILS);
+    },
 
     saveSupportingItems(context, supportingItems) {
         syncLineItemIds(supportingItems, context.state.order.lineItems.supportingItems);

From f425ff3fc8fd203fe19c6c2f921ecc9bd5abed98 Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Mon, 11 May 2026 09:43:07 -0400
Subject: [PATCH 5/6] CASH-2654: Set IsInsurable on mobile fee

---
 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 6f2db110b..788b7c388 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1234,6 +1234,7 @@ export default {
                     supportingItems[mobileFeeIndex].laborAmount = this.mobileFeePart.laborAmount;
                     supportingItems[mobileFeeIndex].sellingPrice = this.mobileFeePart.sellingPrice;
                     supportingItems[mobileFeeIndex].kitPrice = this.mobileFeePart.kitPrice;
+                    supportingItems[mobileFeeIndex].isInsurable = this.mobileFeePart.isInsurable;
                 } else {
                     if (this.mobileFeePart !== null) supportingItems.push(this.mobileFeePart);
                 }

From 590473878e9290cc1137f469d1613a074190bdca Mon Sep 17 00:00:00 2001
From: credelinghuys <Chris.Redelinghuys@safelite.com>
Date: Mon, 11 May 2026 14:12:17 -0400
Subject: [PATCH 6/6] CASH-2563: Check for MISC parts

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

diff --git a/src/store/index.js b/src/store/index.js
index e77212cac..5b7449c4b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1954,10 +1954,17 @@ export const actions = {
                 }
             });
 
+        // Triggers bailout
         if (response.PartsNotFound) {
             return response;
         }
 
+        // Check if we only have MISC parts to trigger bailout
+        const miscPartsResponse = checkIfMiscParts(response.data.partsOrQuestions);
+        if (miscPartsResponse.PartsNotFound) {
+            return miscPartsResponse;
+        }
+
         // Flatten location and name properties
         response.data.partsOrQuestions = convertGlassPieceNamingFromApi(
             response.data.partsOrQuestions
@@ -4407,3 +4414,17 @@ const timeSlotCallFlags = {
     shop: false,
     mobile: false,
 };
+
+function checkIfMiscParts(partsOrQuestions) {
+    if (!partsOrQuestions || partsOrQuestions.length === 0) {
+        return { PartsNotFound: true };
+    } else if (
+        partsOrQuestions.length === 1 &&
+        partsOrQuestions[0].parts &&
+        partsOrQuestions[0].parts.length === 1 &&
+        partsOrQuestions[0].parts[0].partNumber.startsWith("MISC")
+    ) {
+        return { PartsNotFound: true };
+    }
+    return { PartsNotFound: false };
+}