From 147b6c24b41f984f2254e53a9c47cf5be4b75598 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 11 Nov 2024 09:44:33 -0500
Subject: [PATCH 1/7] CSR-2341 change position of disclaimer on quote page.

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

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 1c8aac24e..f2c514e22 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -62,12 +62,6 @@
                         :useDefaultCashParentAccount="true"
                         modalWidgetName="PromoModalWidget" />
 
-                    <textBlock
-                        cmsWidgetName="quoteDisclaimer"
-                        justifyText="center"
-                        typeStyle="caption"
-                        class="mt-6 quote-disclaimer" />
-
                     <contentGroupModal ref="RainDefenseModal" cmsWidgetName="RainDefenseModal" />
                     <contentGroupModal ref="FrontWiperModal" cmsWidgetName="FrontWiperModal" />
                     <contentGroupModal ref="RearWiperModal" cmsWidgetName="RearWiperModal" />
@@ -79,6 +73,12 @@
                         :isBackButtonHidden="shouldHideBackButton"
                         @back-clicked="backButtonAction"
                         @ForwardClicked="forwardButtonAction" />
+
+                    <textBlock
+                        cmsWidgetName="quoteDisclaimer"
+                        justifyText="center"
+                        typeStyle="caption"
+                        class="mb-5 quote-disclaimer" />
                 </div>
             </div>
         </div>

From 421741bff3db185939c4c75f574971ced88eba7e Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 11 Nov 2024 10:48:07 -0500
Subject: [PATCH 2/7] CSR-2343 change Terms of use to Terms of service

---
 src/fmg-components/funnel-header/menu-modal/menu-modal.vue | 4 ++--
 src/layouts/payment/payment.vue                            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
index be2cdab23..825e5e0fb 100644
--- a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
@@ -42,8 +42,8 @@
                 <div class="modal-body d-flex flex-column">
                     <textLink
                         linkType="newWindowLink"
-                        text="Terms of use"
-                        href="//www.safelite.com/terms-of-use"
+                        text="Terms of service"
+                        href="//www.safelite.com/terms-of-service"
                         target="_blank" />
                     <textLink
                         linkType="newWindowLink"
diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue
index de74071c2..f301c46a8 100644
--- a/src/layouts/payment/payment.vue
+++ b/src/layouts/payment/payment.vue
@@ -139,8 +139,8 @@
             type="hidden"
             name="sgtermsofusedisplaytext"
             value="By selecting submit, I agree to Safelite's" />
-        <input type="hidden" name="sgtermsofuseurl" value="http://www.safelite.com/terms-of-use/" />
-        <input type="hidden" name="sgtermsofuselinkdisplaytext" value="terms of use" />
+        <input type="hidden" name="sgtermsofuseurl" value="http://www.safelite.com/terms-of-service/" />
+        <input type="hidden" name="sgtermsofuselinkdisplaytext" value="Terms of service" />
         <input type="hidden" name="sgtermsofcancelrefunddisplaytext" value="and" />
         <input
             type="hidden"

From d93289ba20c8e77eeb92b2a874ed807992dc9c49 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Mon, 11 Nov 2024 14:13:55 -0500
Subject: [PATCH 3/7] CSR-2362 quickquote leadgen fails returning from heritage

CSR-2362 quickquote leadgen fails returning from heritage.  This is because the router clears specific information if there is an inactive external parameter indicating that they have been through the flow already.  This handles when they click back in a browser back to the content site.  If they are returning from heritage skip this step.
---
 .../service-location/service-location.vue     | 27 +++++++++----------
 src/router/index.js                           |  6 +++--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 8a7f46bae..de907a237 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -389,14 +389,13 @@ export default {
                 ) {
                     return true;
                 } else {
-                    console.log(
-                        "ins: servce-location invalid prereq:" +
-                            store.getters.payment.parentAccountNumber +
-                            ":" +
-                            store.getters.order.policy.policyNumber +
-                            ":" +
-                            store.getters.order.serviceLocation.zipCode
-                    );
+                    // prettier-ignore
+                    {
+                        console.log(new Date() + "Insurance: servce-location invalid prereqs");
+                        console.log(new Date() + "store.getters.payment.parentAccountNumber:" + store.getters.payment.parentAccountNumber);
+                        console.log(new Date() + "store.getters.order.policy.policyNumber:" + store.getters.order.policy.policyNumber);
+                        console.log(new Date() + "store.getters.order.serviceLocation.zipCode:" + store.getters.order.serviceLocation.zipCode);
+                    }
                     return false;
                 }
             } else {
@@ -406,12 +405,12 @@ export default {
                 ) {
                     return true;
                 } else {
-                    console.log(
-                        "cash: servce-location invalid prereq:" +
-                            JSON.stringify(store.getters.lineItems.supportingItems) +
-                            ":" +
-                            store.getters.order.serviceLocation.zipCode
-                    );
+                    // prettier-ignore
+                    {
+                        console.log(new Date() + "Cash: servce-location invalid prereqs");
+                        console.log(new Date() + "store.getters.lineItems.supportingItems:" + JSON.stringify(store.getters.lineItems.supportingItems));
+                        console.log(new Date() + "store.getters.order.serviceLocation.zipCode:" + store.getters.order.serviceLocation.zipCode);
+                    }                    
                     return false;
                 }
             }
diff --git a/src/router/index.js b/src/router/index.js
index a3584b442..9fac41bb0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -113,8 +113,10 @@ const routes = [
                             to.query.fmgPage
                         );
 
-                        //Update external parameter state
-                        updateExternalParameterState();
+                        //Update external parameter state but not when returning from heritage
+                        if (!to.query.fmgPage?.startsWith("service-location")) {
+                            updateExternalParameterState();
+                        }
 
                         // clear part related state because heritage selected a new vehicle
                         if (

From ca06d2013d1afc2466db7ee6f01f24325645edc4 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 11 Nov 2024 15:03:14 -0500
Subject: [PATCH 4/7] CSR-2337 remove references to EVOX and vehicle-banner.

---
 .../questions-page-layout.vue                 |   8 +-
 .../vehicle-banner/vehicle-banner.spec.js     | 134 ------------------
 .../vehicle-banner/vehicle-banner.vue         |  98 -------------
 src/layouts/address-lookup/address-lookup.vue |   8 +-
 .../address-vehicles/address-vehicles.vue     |   7 +-
 src/layouts/bailout/bailout.vue               |   7 +-
 src/layouts/confirmation/confirmation.vue     |   2 +-
 src/layouts/estimate/estimate.vue             |   5 +-
 .../license-plate-lookup.vue                  |   7 +-
 src/layouts/payment-method/payment-method.vue |   7 +-
 src/layouts/quote/quote.vue                   |   2 +-
 .../service-location/service-location.vue     |   4 +-
 src/layouts/service-zip/service-zip.vue       |   5 +-
 src/layouts/vehicle-parts/vehicle-parts.vue   |   8 +-
 14 files changed, 14 insertions(+), 288 deletions(-)
 delete mode 100644 src/fmg-components/vehicle-banner/vehicle-banner.spec.js
 delete mode 100644 src/fmg-components/vehicle-banner/vehicle-banner.vue

diff --git a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
index e6bf18aae..982738394 100644
--- a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
+++ b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
@@ -8,11 +8,7 @@
                 </div>
             </div>
             <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
-                    <vehicleBanner
-                        cmsWidgetName="VehicleBannerWidget"
-                        :displayGenericVehicleImage="false" />
-
+                <div class="col-md-6 col-xl-4 mt-4">
                     <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
                 </div>
             </div>
@@ -56,7 +52,6 @@
 <script>
 // Components
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import alert from "@/ux-components/alert/alert";
 import questionChain from "@/digital-components/question-chain/question-chain";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
@@ -99,7 +94,6 @@ export default {
     },
     components: {
         funnelHeader,
-        vehicleBanner,
         alert,
         questionChain,
         funnelSubHeader,
diff --git a/src/fmg-components/vehicle-banner/vehicle-banner.spec.js b/src/fmg-components/vehicle-banner/vehicle-banner.spec.js
deleted file mode 100644
index 1a9222299..000000000
--- a/src/fmg-components/vehicle-banner/vehicle-banner.spec.js
+++ /dev/null
@@ -1,134 +0,0 @@
-import { shallowMount } from "@vue/test-utils";
-import vehicleBanner from "./vehicle-banner";
-import { getMountOptions } from "@/helpers/unit-test-helper.js";
-import store from "@/store";
-import { vehicleCategories } from "@/constants/vehicle-categories.js";
-
-jest.mock(
-    "@/store",
-    () => {
-        return {};
-    },
-    { virtual: true }
-);
-
-describe("vehicleBanner", () => {
-    test("renders the blurrycar image", async () => {
-        // Arrange
-        const { wrapper } = setupMocks({
-            displayGenericVehicleImageProp: true,
-            imageUrlValue: "NULL",
-            displayUnmatchedVehicleIconProp: true,
-        });
-
-        // Assert
-        expect(wrapper.vm.vehicleImageToDisplay).toEqual(wrapper.vm.genericVehicleImage);
-        expect(wrapper.find("img").attributes("class")).toContain("vehicle-image");
-        wrapper.unmount();
-    });
-});
-
-describe("vehicleBanner", () => {
-    test("renders expected vehicle image", async () => {
-        // Arrange
-        const { wrapper } = setupMocks({
-            displayGenericVehicleImageProp: false,
-            imageUrlValue: "url_to_vehicle_image",
-        });
-
-        // Assert
-        expect(wrapper.vm.vehicleImageToDisplay).toEqual("url_to_vehicle_image");
-        expect(wrapper.find("img").attributes("class")).toContain("vehicle-image");
-        wrapper.unmount();
-    });
-});
-
-describe("vehicleBanner", () => {
-    test("should render car icon when imageUrl is null and category is default", async () => {
-        // Arrange
-        const { wrapper } = setupMocks({
-            displayGenericVehicleImageProp: false,
-            imageUrlValue: "NULL",
-        });
-
-        var iconUrl = wrapper.vm.vehicleImageToDisplay;
-
-        // Assert
-        expect(iconUrl).toEqual(undefined);
-        wrapper.unmount();
-    });
-});
-
-const params = [
-    ["CAR", "car_icon_url"],
-    ["TRUCK", "truck_icon_url"],
-    ["VAN", "van_icon_url"],
-    ["COMMERCIAL VAN", "commercial_van_icon_url"],
-    ["SUV", "suv_icon_url"],
-    ["OTHER", "car_icon_url"],
-];
-
-describe("vehicleBanner", () => {
-    test.each(params)(
-        "renders an icon instead of an image for %s and %s",
-        async (category, expectedIcon) => {
-            // Arrange
-            const { wrapper, cmsContent } = setupMocks({
-                displayGenericVehicleImageProp: false,
-                imageUrlValue: expectedIcon,
-                categoryValue: category,
-            });
-            //Act
-            var vehicleIcon = wrapper.vm.getUnmatchedVehicleIcon();
-            // Assert
-            expect(store.getters.vehicle.category).toEqual(category);
-            expect(wrapper.find("img").attributes("class")).toContain("vehicle-image");
-            wrapper.unmount();
-        }
-    );
-});
-
-function setupMocks({
-    displayGenericVehicleImageProp,
-    displayUnmatchedVehicleIconProp,
-    imageUrlValue,
-    categoryValue = "CAR",
-}) {
-    const mockGetCmsContent = jest.fn();
-    mockGetCmsContent((cmsWidget, field) => {
-        return field;
-    });
-    const mockMixin = {
-        methods: {
-            getCmsContent: mockGetCmsContent,
-        },
-    };
-    //Mock store
-    store.dispatch = jest.fn(() => {});
-    store.getters = { vehicle: { category: categoryValue, imageUrl: imageUrlValue } };
-    const mountOptions = getMountOptions({
-        store: {
-            dispatch: store.dispatch,
-            getters: store.getters,
-        },
-    });
-
-    //Mock props
-    mountOptions.propsData = {
-        displayGenericVehicleImage: displayGenericVehicleImageProp,
-        displayUnmatchedVehicleIconProp: displayUnmatchedVehicleIconProp,
-    };
-    mountOptions.mixins = [mockMixin];
-    const wrapper = shallowMount(vehicleBanner, mountOptions);
-
-    //Mock CMS content
-    const cmsContent = {
-        GenericVehicleImage: "image_url",
-        CarUnmatchedVehicleIcon: "car_icon_url",
-        TruckUnmatchedVehicleIcon: "truck_icon_url",
-        VanUnmatchedVehicleIcon: "van_icon_url",
-        CommercialVanUnmatchedVehicleIcon: "commercial_van_icon_url",
-        SuvUnmatchedVehicleIcon: "suv_icon_url",
-    };
-    return { wrapper, cmsContent };
-}
diff --git a/src/fmg-components/vehicle-banner/vehicle-banner.vue b/src/fmg-components/vehicle-banner/vehicle-banner.vue
deleted file mode 100644
index e88f5b719..000000000
--- a/src/fmg-components/vehicle-banner/vehicle-banner.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-<template>
-    <div class="vehicle_banner mb-4 text-center">
-        <img class="vehicle-image img-fluid" :src="vehicleImageToDisplay" alt="" />
-    </div>
-</template>
-
-<script>
-export default {
-    name: "vehicle-banner",
-    props: {
-        displayGenericVehicleImage: {
-            type: Boolean,
-            required: true,
-        },
-        cmsWidgetName: String,
-        displayVehicleImage: {
-            type: String,
-            required: false,
-            default: null,
-        },
-        displayUnmatchedVehicleIcon: {
-            type: Boolean,
-            required: false,
-            default: false,
-        },
-        vehicleCategory: {
-            type: String,
-            required: false,
-            default: null,
-        },
-    },
-    computed: {
-        vehicleImageToDisplay() {
-            if (this.displayVehicleImage !== null) {
-                return this.displayVehicleImage;
-            }
-            if (this.displayGenericVehicleImage) {
-                return this.genericVehicleImage;
-            }
-            if (
-                this.$store.getters.vehicle.imageUrl === null ||
-                this.$store.getters.vehicle.imageUrl === "NULL" ||
-                this.displayUnmatchedVehicleIcon
-            ) {
-                return this.getUnmatchedVehicleIcon();
-            }
-
-            return this.$store.getters.vehicle.imageUrl;
-        },
-        genericVehicleImage() {
-            return this.getCmsContent(this.cmsWidgetName, "GenericVehicleImage");
-        },
-        carUnmatchedVehicleIcon() {
-            return this.getCmsContent(this.cmsWidgetName, "CarUnmatchedVehicleIcon");
-        },
-        truckUnmatchedVehicleIcon() {
-            return this.getCmsContent(this.cmsWidgetName, "TruckUnmatchedVehicleIcon");
-        },
-        vanUnmatchedVehicleIcon() {
-            return this.getCmsContent(this.cmsWidgetName, "VanUnmatchedVehicleIcon");
-        },
-        commercialUnmatchedVehicleIcon() {
-            return this.getCmsContent(this.cmsWidgetName, "CommercialVanUnmatchedVehicleIcon");
-        },
-        suvUnmatchedVehicleIcon() {
-            return this.getCmsContent(this.cmsWidgetName, "SuvUnmatchedVehicleIcon");
-        },
-    },
-    methods: {
-        getUnmatchedVehicleIcon() {
-            const category = this.vehicleCategory ?? this.$store.getters.vehicle.category;
-            switch (category) {
-                case this.vehicleCategories.CAR:
-                    return this.carUnmatchedVehicleIcon;
-                case this.vehicleCategories.SUV:
-                    return this.suvUnmatchedVehicleIcon;
-                case this.vehicleCategories.TRUCK:
-                    return this.truckUnmatchedVehicleIcon;
-                case this.vehicleCategories.VAN:
-                    return this.vanUnmatchedVehicleIcon;
-                case this.vehicleCategories.COMMERCIALVAN:
-                    return this.commercialUnmatchedVehicleIcon;
-                default:
-                    return this.carUnmatchedVehicleIcon;
-            }
-        },
-    },
-};
-</script>
-
-<style lang="scss" scoped>
-.vehicle-image {
-    max-width: 290px;
-    object-fit: cover;
-    width: 100%;
-    height: 132px;
-}
-</style>
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 6ac7a3d9a..50a3f0e11 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -12,11 +12,7 @@
                 </div>
             </div>
             <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
-                    <vehicleBanner
-                        cmsWidgetName="VehicleBannerWidget"
-                        ref="vehicleBanner"
-                        :displayGenericVehicleImage="false" />
+                <div class="col-md-6 col-xl-4 mt-4">
 
                     <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" ref="funnelSubHeader" />
 
@@ -103,7 +99,6 @@
 // Components
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
-import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import customerQuestions from "@/layouts/address-lookup/customer-questions/customer-questions";
 import alert from "@/ux-components/alert/alert";
@@ -480,7 +475,6 @@ export default {
     components: {
         funnelHeader,
         navbar,
-        vehicleBanner,
         funnelSubHeader,
         customerQuestions,
         textboxQuestion,
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index 7b5fc72b2..495e66de9 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -7,10 +7,7 @@
                 </div>
             </div>
             <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
-                    <vehicleBanner
-                        cmsWidgetName="VehicleBannerWidget"
-                        :displayGenericVehicleImage="false" />
+                <div class="col-md-6 col-xl-4 mt-4">
 
                     <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
 
@@ -54,7 +51,6 @@
 // Components
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
-import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import alert from "@/ux-components/alert/alert";
 import addressVehiclesQuestion from "@/layouts/address-vehicles/address-vehicles-question/address-vehicles-question";
@@ -243,7 +239,6 @@ export default {
     components: {
         Form,
         funnelHeader,
-        vehicleBanner,
         funnelSubHeader,
         alert,
         navbar,
diff --git a/src/layouts/bailout/bailout.vue b/src/layouts/bailout/bailout.vue
index a7cf017b4..66720baba 100644
--- a/src/layouts/bailout/bailout.vue
+++ b/src/layouts/bailout/bailout.vue
@@ -8,10 +8,7 @@
                 </div>
             </div>
             <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
-                    <vehicleBanner
-                        cmsWidgetName="VehicleBannerWidget"
-                        :displayGenericVehicleImage="false" />
+                <div class="col-md-6 col-xl-4 mt-4">
 
                     <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
 
@@ -30,7 +27,6 @@
 // Components
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
-import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 
@@ -71,7 +67,6 @@ export default {
     components: {
         funnelHeader,
         navbar,
-        vehicleBanner,
         funnelSubHeader,
         loadingModal,
     },
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 0add1633a..f8b27a01e 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -512,7 +512,7 @@ export default {
     display: flex;
     align-items: center;
     justify-content: center;
-    padding: 1rem 0 1.5rem 0;
+    padding: 1.5rem 0;
 
     p {
         display: inline-block;
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 25217d74b..6a85ae349 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -8,8 +8,7 @@
                 </div>
             </div>
             <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
-                    <vehicleBanner cmsWidgetName="VehicleBannerWidget" />
+                <div class="col-md-6 col-xl-4 mt-4">
                     <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
                     <div>
                         <div class="vinlookupquestion" v-html="this.VinLookupQuestionText"></div>
@@ -40,7 +39,6 @@
 // Components
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
-import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import buttonQuestion from "@/digital-components/button-question/button-question";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
@@ -218,7 +216,6 @@ export default {
     },
     components: {
         funnelHeader,
-        vehicleBanner,
         funnelSubHeader,
         navbar,
         buttonQuestion,
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 2f82691ce..4c04b4e26 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -7,10 +7,7 @@
                 </div>
             </div>
             <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
-                    <vehicleBanner
-                        cmsWidgetName="VehicleBannerWidget"
-                        :displayGenericVehicleImage="false" />
+                <div class="col-md-6 col-xl-4 mt-4">
 
                     <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
 
@@ -97,7 +94,6 @@
 // Components
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
-import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 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";
@@ -403,7 +399,6 @@ export default {
     components: {
         funnelHeader,
         navbar,
-        vehicleBanner,
         funnelSubHeader,
         textboxQuestion,
         alert,
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 33961696d..f7f8d4781 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -8,12 +8,9 @@
                 </div>
             </div>
             <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
-                    <vehicleBanner
-                        cmsWidgetName="VehicleBannerWidget"
-                        :displayGenericVehicleImage="false" />
+                <div class="col-md-6 col-xl-4 mt-4">
 
-                    <funnelSubHeader class="mb-5 mt-4" cmsWidgetName="FunnelSubHeaderWidget" />
+                    <funnelSubHeader class="mb-5" cmsWidgetName="FunnelSubHeaderWidget" />
 
                     <hr class="my-0" />
 
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 1c8aac24e..fa82f6bb3 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -8,7 +8,7 @@
                 </div>
             </div>
             <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
+                <div class="col-md-6 col-xl-4 mt-4">
                     <funnelSubHeader class="mb-5" cmsWidgetName="FunnelSubHeaderWidget" />
                     <cashOrInsuranceQuestion
                         ref="cashOrInsurance"
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 8a7f46bae..37041c069 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -8,8 +8,8 @@
                 </div>
             </div>
             <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
-                    <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" class="mt-2" />
+                <div class="col-md-6 col-xl-4 mt-4">
+                    <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
 
                     <serviceZipModalQuestion
                         editScreenReaderTextCmsWidgetName="ScreenReaderZipEditWidget"
diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue
index 25045af0a..b74db95dc 100644
--- a/src/layouts/service-zip/service-zip.vue
+++ b/src/layouts/service-zip/service-zip.vue
@@ -8,8 +8,7 @@
                 </div>
             </div>
             <div class="row justify-content-center">
-                <div class="col-md-6 col-xl-4">
-                    <vehicleBanner cmsWidgetName="VehicleBannerWidget" />
+                <div class="col-md-6 col-xl-4 mt-4">
                     <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
                     <div>
                         <textboxQuestion
@@ -65,7 +64,6 @@
 // Components
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
-import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import buttonQuestion from "@/digital-components/button-question/button-question";
 import alert from "@/ux-components/alert/alert";
@@ -278,7 +276,6 @@ export default {
     },
     components: {
         funnelHeader,
-        vehicleBanner,
         funnelSubHeader,
         navbar,
         Form,
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index bf21b1749..b95964104 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -9,11 +9,7 @@
                     </div>
                 </div>
                 <div class="row justify-content-center">
-                    <div class="col-md-6 col-xl-4">
-                        <vehicleBanner
-                            ref="vehicleBanner"
-                            cmsWidgetName="VehicleBannerWidget"
-                            :displayGenericVehicleImage="false" />
+                    <div class="col-md-6 col-xl-4 mt-4">
                         <funnelSubHeader
                             ref="funnelSubHeader"
                             cmsWidgetName="FunnelSubHeaderWidget" />
@@ -60,7 +56,6 @@
 // Components
 import glassPartQuestion from "@/layouts/vehicle-parts/glass-part-question/glass-part-question";
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
 import alert from "@/ux-components/alert/alert";
@@ -238,7 +233,6 @@ export default {
         Form,
         glassPartQuestion,
         funnelHeader,
-        vehicleBanner,
         funnelSubHeader,
         navbar,
         alert,

From 18fc191576125c7af943098bdaeb513394980604 Mon Sep 17 00:00:00 2001
From: hiteshkumar87 <hitesh.kumar@safelite.com>
Date: Tue, 12 Nov 2024 13:49:36 +0530
Subject: [PATCH 5/7] CSR-2066

Cleanup Before Navigate to External
---
 src/helpers/heritage-integration/navigation-helper.js | 8 +++++++-
 src/layouts/insurance-company/insurance-company.vue   | 8 +-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index e510959db..3ca43147f 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -106,7 +106,11 @@ export async function getImplicitNavigation(toRoute) {
     Used to navigate to the heritage funnel with the correct query string and url.
 */
 
-export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog }) {
+export async function navigateToHeritageFunnel({
+    shouldSaveSession,
+    pageNameToLog,
+    cleanupBeforeNavigateExternalMethod = null,
+}) {
     const log = getQuerystringParameter(queryStrings.LOG);
     if (eval(log)) {
         console.log("------------- Navigate to heritage start -----------------");
@@ -143,6 +147,8 @@ export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLo
     ) {
         heritageParms["forceEndToEndInsurance"] = true;
     }
+    //Cleanup Before Navigate to External
+    cleanupBeforeNavigateExternalMethod?.();
 
     router.navigateToExternalUrl(applicationConfig.HERITAGE_FUNNEL, heritageParms);
 }
diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue
index a13755ea0..c6576cb34 100644
--- a/src/layouts/insurance-company/insurance-company.vue
+++ b/src/layouts/insurance-company/insurance-company.vue
@@ -74,10 +74,6 @@ export default {
 
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
-            //Reload page if serve from bfcache.
-            if (performance.getEntriesByType("navigation")[0].type === "back_forward") {
-                vm.handlePageShow();
-            }
             vm.setCmsContent(resultMap.cmsContent);
             vm.originalList = resultMap.insuranceCompanyList;
             if (store.getters.externalParameterState?.isExternalParameter) {
@@ -97,9 +93,6 @@ export default {
         },
     },
     methods: {
-        handlePageShow() {
-            window.location.reload();
-        },
         isCashParentAccountNumber() {
             return (
                 applicationConfig.CASH_PARENT_ACCOUNT_NUMBER.toString() ===
@@ -145,6 +138,7 @@ export default {
             navigateToHeritageFunnel({
                 shouldSaveSession: true,
                 pageNameToLog: "insurance-company",
+                cleanupBeforeNavigateExternalMethod: this.$refs.navbar.removeLoader,
             });
         },
     },

From e63697762b3bf6e8b76782652c989a82e113df18 Mon Sep 17 00:00:00 2001
From: hiteshkumar87 <hitesh.kumar@safelite.com>
Date: Tue, 12 Nov 2024 16:13:12 +0530
Subject: [PATCH 6/7] CSR-2066

reload page before navigate to external
---
 src/layouts/insurance-company/insurance-company.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/layouts/insurance-company/insurance-company.vue b/src/layouts/insurance-company/insurance-company.vue
index c6576cb34..ef881ebde 100644
--- a/src/layouts/insurance-company/insurance-company.vue
+++ b/src/layouts/insurance-company/insurance-company.vue
@@ -138,9 +138,12 @@ export default {
             navigateToHeritageFunnel({
                 shouldSaveSession: true,
                 pageNameToLog: "insurance-company",
-                cleanupBeforeNavigateExternalMethod: this.$refs.navbar.removeLoader,
+                cleanupBeforeNavigateExternalMethod: this.reloadPage,
             });
         },
+        reloadPage(){
+            window.location.reload();
+        }
     },
     components: {
         funnelHeader,

From 21166330d5e6f2442114d7197b4ad7cdcc94e306 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 12 Nov 2024 05:53:57 -0500
Subject: [PATCH 7/7] CSR-2364 recycling in cart missing amount

CSR-2364 recycling in cart missing amount
---
 src/fmg-components/cart/cart.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 0e3093007..2dcafb154 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -96,7 +96,7 @@
                         </span>
                         <span
                             v-if="
-                                !showCoverageAsVerified ||
+                                !showCoverageAsVerified || cartItem.name === 'Recycling' ||
                                 (showCoverageAsVerified && !cartItem.isCoveredByInsurance)
                             "
                             >{{