Merge pull request #2089 from Safelite/rlsmerge/2024.11.21-to-develop

Rlsmerge/2024.11.21 to develop

src/layouts/confirmation/confirmation.vue

@@ -16,10 +16,7 @@
                             </div>
                             <div class="main">
                                 <div>
-                                    <vehicleBanner
+                                    
-                                        cmsWidgetName="VehicleBannerWidget"
-                                        :displayVehicleImage="vehicleBannerImageUrl"
-                                        :displayGenericVehicleImage="false" />
                                 </div>
 
                                 <div class="scheduleText">
@@ -88,7 +85,6 @@
 <script>
 // Components
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import navbar from "@/fmg-components/nav-bar/nav-bar";
 import addToCalendar from "@/layouts/confirmation/add-to-calendar/add-to-calendar";
 import cart from "@/fmg-components/cart/cart";
@@ -447,7 +443,6 @@ export default {
         funnelHeader,
         Form,
         navbar,
-        vehicleBanner,
         addToCalendar,
         cart,
         textBlock,

src/layouts/quote/quote.vue

@@ -9,12 +9,7 @@
             </div>
             <div class="row justify-content-center">
                 <div class="col-md-6 col-xl-4">
-                    <vehicleBanner
-                        cmsWidgetName="VehicleBannerWidget"
-                        :displayGenericVehicleImage="false" />
-
                     <funnelSubHeader class="mb-5" cmsWidgetName="FunnelSubHeaderWidget" />
-
                     <cashOrInsuranceQuestion
                         ref="cashOrInsurance"
                         cmsWidgetName="CashOrInsuranceQuestionWidget"
@@ -94,7 +89,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 cashOrInsuranceQuestion from "./cash-or-insurance-question/cash-or-insurance-question";
 import servicePackageQuestion from "./service-package-question/service-package-question";
@@ -648,7 +642,6 @@ export default {
     components: {
         funnelHeader,
         navbar,
-        vehicleBanner,
         funnelSubHeader,
         Form,
         textBlock,

src/layouts/service-location/service-location.vue

@@ -9,7 +9,7 @@
             </div>
             <div class="row justify-content-center">
                 <div class="col-md-6 col-xl-4">
-                    <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" class="mt-5" />
+                    <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" class="mt-2" />
 
                     <serviceZipModalQuestion
                         editScreenReaderTextCmsWidgetName="ScreenReaderZipEditWidget"

src/layouts/vehicle-damage/vehicle-damage.vue

@@ -7,13 +7,8 @@
                 </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">
-                    <vehicleBanner
-                        cmsWidgetName="VehicleBannerWidget"
-                        :displayGenericVehicleImage="false" />
-
                     <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
-
                     <alert
                         ref="vehicleChangeAlert"
                         v-if="shouldDisplayVehicleChangeAlert"
@@ -84,7 +79,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 sideDoorOptions from "@/layouts/vehicle-damage/side-door-options/side-door-options";
 import damageLocationQuestion from "@/layouts/vehicle-damage/damage-location-question/damage-location-question";
@@ -718,7 +712,6 @@ export default {
     components: {
         funnelHeader,
         navbar,
-        vehicleBanner,
         funnelSubHeader,
         sideDoorOptions,
         damageLocationQuestion,

src/layouts/vehicle/vehicle.vue

@@ -48,14 +48,6 @@
                         validationRules="style-required"
                         placeHolderText="Select style"
                         customDropdownId="styleQuestionField" />
-                    <vehicleBanner
-                        cmsWidgetName="VehicleBannerWidget"
-                        :displayGenericVehicleImage="displayGeneric"
-                        :displayVehicleImage="imageUrl"
-                        :vehicleCategory="category"
-                        :displayUnmatchedVehicleIcon="unmatchedVehicleIcon"
-                        class="mt-5 vehicle-footer"
-                        ref="banner" />
                     <alert
                         ref="AlertNoService"
                         v-if="displayNoServiceAlert"
@@ -82,7 +74,6 @@
 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 vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import alert from "@/ux-components/alert/alert";
 import vehicleQuestion from "@/layouts/vehicle/vehicle-question/vehicle-question";
 
@@ -541,7 +532,6 @@ export default {
         funnelHeader,
         navbar,
         funnelSubHeader,
-        vehicleBanner,
         Form,
         alert,
         vehicleQuestion,

src/layouts/vin-lookup/vin-lookup.vue

@@ -8,13 +8,8 @@
                 </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">
-                    <vehicleBanner
-                        cmsWidgetName="VehicleBannerWidget"
-                        :displayGenericVehicleImage="false" />
-
                     <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
-
                     <textboxQuestion
                         class="mb-2 mt-5"
                         cmsWidgetName="VinNumberQuestionWidget"
@@ -132,7 +127,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";
@@ -506,7 +500,6 @@ export default {
     components: {
         funnelHeader,
         navbar,
-        vehicleBanner,
         funnelSubHeader,
         textboxQuestion,
         alert,

src/store/index.js

@@ -819,7 +819,15 @@ export const getters = {
         return false;
     },
     shouldHideRecalibration: (state) => {
-        if (state.order.policy.isNoComp || state.order.policy.isItac) {
+        let order;
+        if (window.sessionStorage.getItem("submittedOrder") !== null) {
+            order = JSON.parse(window.sessionStorage.getItem("submittedOrder"));
+        }
+        else {
+            order = getters.order;
+        }
+        
+        if (order.payment.isInsurance) {
             return false;
         }