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

Rlsmerge/2024.11.21 to develop

src/fmg-components/cart/cart.vue

@@ -9,7 +9,7 @@
                     aria-label="expand cart"
                     href="javascript:void(0)"
                     class="col d-flex justify-content-between py-0">
-                    <span class="label">{{ amountDueText }}</span>
+                    <span class="label">{{ OrderDetailsText }}</span>
                     <span class="label amount-due">{{
                         getLineItemAmount(amountDue, showCoverageAsPending)
                     }}</span>
@@ -1015,6 +1015,9 @@ export default {
             return this.getCmsContent("SalesTaxTextWidget", "Text");
         },
         amountDueText() {
+            return this.getCmsContent("AmountDueTextWidget", "Text");
+        },
+        OrderDetailsText() {
             return this.getCmsContent("OrderDetailsTextWidget", "Text");
         },
         amountPaidText() {

src/layouts/insurance-company/insurance-company.vue

@@ -1,10 +1,5 @@
 <template>
-    <Form
+    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        @submit="onSubmit"
-        @invalid-submit="onInvalidSubmit"
-        ref="theForm"
-        v-slot="{ meta }"
-        id="insurance-company">
         <loadingModal ref="loadingModal" />
         <div class="container-fluid page-container-grouped-styles">
             <div class="row justify-content-center">
@@ -111,10 +106,6 @@ export default {
                 : "";
             return accountNumber;
         },
-        handleBeforeUnload() {            
-            const insuranceCompanyPage = document.getElementById("insurance-company");
-            insuranceCompanyPage.parentElement.removeChild(insuranceCompanyPage);
-        },
         arePagePrerequisitesValid() {
             return store.getters.order.payment.isInsurance === true;
         },
@@ -144,17 +135,20 @@ export default {
                 billToAccountNumber,
                 false
             );
-            //Manually unmount component in case navigate to external application.
+            //Reload page when navigate with browser back button
-            window.addEventListener("beforeunload", this.handleBeforeUnload);
+            window.addEventListener("pageshow", this.handlePageShow);
 
             navigateToHeritageFunnel({
                 shouldSaveSession: true,
                 pageNameToLog: "insurance-company",
             });
         },
+        handlePageShow() {
+            window.location.reload();
+        },
     },
     unmounted() {
-        window.removeEventListener("beforeunload", this.handleBeforeUnload);
+        window.removeEventListener("pageshow", this.handlePageShow);
     },
     components: {
         funnelHeader,

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

@@ -515,7 +515,11 @@ export default {
         },
         backButtonAction() {
             const payment = store.getters.order.payment;
-            if (payment?.isInsurance && payment?.insuranceCoverage?.isVerified) {
+            if (
+                payment?.isInsurance &&
+                (payment?.insuranceCoverage?.isVerified ||
+                    store.getters.order.referralNumber.length === 6)
+            ) {
                 navigateToHeritageFunnel({ shouldSaveSession: false });
             } else {
                 this.$router.navigateWithoutSaving(

src/layouts/vehicle/vehicle.vue

@@ -398,7 +398,12 @@ export default {
     },
     methods: {
         isDisabled(options) {
-            if (!options.length || store.getters.payment?.insuranceCoverage?.isVerified) {
+            if (
+                !options.length ||
+                store.getters.payment?.insuranceCoverage?.isVerified ||
+                (store.getters.order.payment?.isInsurance &&
+                    getFunnelCookie().HasDelayedClaimRegistration)
+            ) {
                 return true;
             } else {
                 return false;

src/store/index.js

@@ -826,10 +826,6 @@ export const getters = {
             order = state.order;
         }
 
-        if (order.payment.isInsurance) {
-            return false;
-        }
-
         return (
             experimentMixin.methods
                 .getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)