Merge pull request #3116 from Safelite/CASH-2481-r3

Cash 2481 r3

src/layouts/estimate/estimate.vue

@@ -62,6 +62,7 @@ import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { nextTick } from "vue";
 import { peekQueryFromStash } from "@/router/methods/helpers/querystring-stash";
+import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -169,7 +170,7 @@ export default {
                         baseMixin.methods.ResetExternalParamsAndHideModal();
                     }
                 } else {
-                    baseMixin.methods.ResetExternalParamsAndHideModal();
+                    showFmgLoadingModal(false);
                 }
             } else {
                 baseMixin.methods.ResetExternalParamsAndHideModal();

src/layouts/service-zip/service-zip.vue

@@ -80,6 +80,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { routeData } from "@/router/constants/routes";
+import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -137,6 +138,13 @@ export default {
                         },
                         false
                     );
+                    vm.serviceZipCode = store.getters.externalParameterServiceZip.zipCode;
+                    const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
+                    if (isValid) {
+                        showFmgLoadingModal(true);
+                        vm.forwardButtonAction();
+                        return;
+                    }
                 }
 
                 if (store.getters.externalParameterCustomer?.phoneNumber) {

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

@@ -93,6 +93,7 @@ import { errorMessages } from "@/constants/error-messages";
 import { damageLocationsCms } from "@/constants/damage-locations-cms.js";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected.js";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { debugLog } from "@/helpers/debug-log-helper";
 
 import store from "@/store";
@@ -199,7 +200,7 @@ export default {
                             return vm.forwardButtonAction();
                         }
                     }
-                    baseMixin.methods.ResetExternalParamsAndHideModal();
+                    showFmgLoadingModal(false);
 
                     //clear any validation errors for external parameter flow
                     const form = vm.$refs.theForm;
@@ -209,7 +210,7 @@ export default {
                     }
                 }
             } else {
-                baseMixin.methods.ResetExternalParamsAndHideModal();
+                showFmgLoadingModal(false);
             }
         });
     },

src/layouts/vehicle/vehicle.spec.js

@@ -93,8 +93,11 @@ describe("vehicle.vue", () => {
 });
 
 describe("vehicle.vue", () => {
-    test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
+    test("should call forwardButtonAction if isExternalParameter is true, has a year, make and model, and form is valid", async () => {
         store.getters.externalParameterState.isExternalParameter = true;
+        store.getters.externalParameterVehicle.year = "1886";
+        store.getters.externalParameterVehicle.make = "Benz";
+        store.getters.externalParameterVehicle.model = "Patent-Motorwagen";
         // Create a shallow mount of MyComponent
         const { wrapper } = setupMocks();
         // Set displayNoServiceAlert to false

src/layouts/vehicle/vehicle.vue

@@ -109,6 +109,7 @@ import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
 import { applicationConfig } from "../../constants/application-config";
 import { queryStrings } from "@/constants/query-strings";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { debugLog } from "@/helpers/debug-log-helper";
 
 //define validation rules
@@ -291,7 +292,12 @@ export default {
                     resultMap.modelQuestionInitialData,
                     resultMap.styleQuestionInitialData
                 );
-            if (store.getters.externalParameterState?.isExternalParameter) {
+            if (
+                store.getters.externalParameterState?.isExternalParameter &&
+                store.getters.externalParameterVehicle.year &&
+                store.getters.externalParameterVehicle.make &&
+                store.getters.externalParameterVehicle.model
+            ) {
                 await vm.getVehicleDetails();
                 if (!vm.displayNoServiceAlert) {
                     const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
@@ -304,7 +310,7 @@ export default {
                     baseMixin.methods.ResetExternalParamsAndHideModal();
                 }
             } else {
-                baseMixin.methods.ResetExternalParamsAndHideModal();
+                showFmgLoadingModal(false);
             }
         });
     },

src/router/methods/helpers/initialize-from-querystrings.js

@@ -95,6 +95,7 @@ function updateExternalParameterState() {
     }
     if (externalParameterZipCode) {
         store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_ZIP_CODE, externalParameterZipCode);
+        store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.ACTIVE);
     }
     if (externalParameterEmail) {
         store.commit(