CASH-353 - Redoing 353 revert branch to get merged to develop

src/layouts/address-lookup/address-lookup.vue

@@ -172,7 +172,7 @@ export default {
             },
             serviceZipCode: this.getServiceZipFromStore(),
             carId: this.getCarIdfromStore(),
-            isHeavyTruck: this.getIsVehicleHeavyTruckFromStore(),
+            isHeavyTruck: this.getIsVehicleHeavyTruckServiceableFromStore(),
             displayNonServiceableZipAlert: false,
             displayVinNotFoundAlert: false,
             displayMatchedDifferentVehicleAlert: false,
@@ -232,8 +232,8 @@ export default {
         getCarIdfromStore() {
             return store.getters.vehicle.carId;
         },
-        getIsVehicleHeavyTruckFromStore() {
+        getIsVehicleHeavyTruckServiceableFromStore() {
-            return store.getters.isHeavyTruckVehicle;
+            return store.getters.vehicle.isBigTruck && store.getters.vehicle.canSafeliteService;
         },
         async findClosestApplicableShops() {
             return await this.dispatchStoreActionWithLogging(

src/layouts/license-plate-lookup/license-plate-lookup.vue

@@ -76,7 +76,6 @@
                         :manualCopy="AlertMatchedDifferentVehicleBody"
                         alertClass="alert-warning"
                         v-bind:isDismissible="false" />
-
                     <alert
                         ref="AlertNoService"
                         v-if="displayNoServiceAlert"
@@ -90,7 +89,7 @@
                         cmsWidgetName="FunnelFooterWidget"
                         :isForwardActionDisabled="!meta.valid"
                         @back-clicked="backButtonAction"
-                        @ForwardClicked="forwardButtonAction" />
+                        @ForwardClicked="forwardButtonAction || displayNoServiceAlert" />
                 </div>
             </div>
         </div>
@@ -167,7 +166,7 @@ export default {
             emailOrSms: this.getEmailOrSmsFromStore(),
             serviceZipCode: this.getServiceZipFromStore(),
             carId: this.getCarIdfromStore(),
-            isHeavyTruck: this.getIsVehicleHeavyTruckFromStore(),
+            isHeavyTruck: this.getIsVehicleHeavyTruckServiceableFromStore(),
             displayNonServiceableZipAlert: false,
             displayVinNotFoundAlert: false,
             displayMatchedDifferentVehicleAlert: false,
@@ -214,8 +213,8 @@ export default {
         getCarIdfromStore() {
             return store.getters.vehicle.carId;
         },
-        getIsVehicleHeavyTruckFromStore() {
+        getIsVehicleHeavyTruckServiceableFromStore() {
-            return store.getters.isHeavyTruckVehicle;
+            return store.getters.vehicle.isBigTruck && store.getters.vehicle.canSafeliteService;
         },
         async findClosestApplicableShops() {
             return await this.dispatchStoreActionWithLogging(

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

@@ -119,7 +119,7 @@ export default {
             serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
             emailOrSms: this.getEmailOrSmsFromStore(),
             carId: this.getCarIdfromStore(),
-            isHeavyTruck: this.getIsVehicleHeavyTruckFromStore(),
+            isHeavyTruck: this.getIsVehicleHeavyTruckServiceableFromStore(),
             displayInvalidZipAlert: false,
             displayNonServiceableZipAlert: false,
             displayNoServiceAlert: false,
@@ -198,8 +198,8 @@ export default {
         getCarIdfromStore() {
             return store.getters.vehicle.carId;
         },
-        getIsVehicleHeavyTruckFromStore() {
+        getIsVehicleHeavyTruckServiceableFromStore() {
-            return store.getters.isHeavyTruckVehicle;
+            return store.getters.vehicle.isBigTruck && store.getters.vehicle.canSafeliteService;
         },
         async findClosestApplicableShops() {
             return await this.dispatchStoreActionWithLogging(
@@ -208,6 +208,7 @@ export default {
                 "service-zip"
             );
         },
+
         async backButtonAction() {
             const skipVin = await skipVinLookup();
             // route to move backwards
@@ -286,6 +287,16 @@ export default {
                     return this.$refs.navbar.removeLoader();
                 }
             }
+            if (this.isHeavyTruck) {
+                const closestShops = await this.findClosestApplicableShops(
+                    this.serviceZipCode,
+                    this.carId
+                );
+                this.displayNoServiceAlert = !closestShops?.data?.providers?.length;
+                if (this.displayNoServiceAlert) {
+                    return this.$refs.navbar.removeLoader();
+                }
+            }
 
             const payment = this.$store.getters.payment;
             const policy = this.$store.getters.policy;
@@ -344,6 +355,7 @@ export default {
         serviceZipCode() {
             this.displayNonServiceableZipAlert = false;
             this.displayNoServiceAlert = false;
+            this.displayNoServiceAlert = false;
         },
     },
     components: {

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

@@ -208,7 +208,7 @@ export default {
             serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
             emailOrSms: this.getEmailOrSmsFromStore(),
             carId: this.getCarIdfromStore(),
-            isHeavyTruck: this.getIsVehicleHeavyTruckFromStore(),
+            isHeavyTruck: this.getIsVehicleHeavyTruckServiceableFromStore(),
             isCarIdDifferent: false,
             customAlertData: {},
             previouslyEnteredCarId: "",
@@ -264,6 +264,9 @@ export default {
                 );
             }
         },
+        getIsVehicleHeavyTruckServiceableFromStore() {
+            return store.getters.vehicle.isBigTruck && store.getters.vehicle.canSafeliteService;
+        },
         async findClosestApplicableShops() {
             return await this.dispatchStoreActionWithLogging(
                 storeActions.GET_CLOSEST_APPLICABLE_SHOPS,
@@ -366,6 +369,18 @@ export default {
                     },
                     false
                 );
+                if (this.isHeavyTruck) {
+                    closestShops = await this.findClosestApplicableShops(
+                        this.serviceZipCode,
+                        this.carId
+                    );
+                    this.displayNoServiceAlert = !closestShops?.data?.providers?.length;
+                    if (this.displayNoServiceAlert) {
+                        return this.$refs.navbar.removeLoader();
+                    }
+                }
+
+                // if no value due to field being optional, blank both phone and email address
 
                 // if no value due to field being optional, blank both phone and email address
                 if (!this.emailOrSms) {
@@ -430,16 +445,6 @@ export default {
                         false
                     );
                 }
-
-                closestShops = await this.findClosestApplicableShops(
-                    this.serviceZipCode,
-                    this.carId
-                );
-                this.displayNoServiceAlert = !closestShops?.data?.providers?.length;
-                if (this.displayNoServiceAlert) {
-                    return this.$refs.navbar.removeLoader();
-                }
-
                 // if no value due to field being optional, blank both phone and email address
                 if (!this.emailOrSms) {
                     await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, "", false);
@@ -523,6 +528,7 @@ export default {
             this.displayVinNotFoundAlert = false;
             this.displayVinScanFailedAlert = false;
             this.displayNoServiceAlert = false;
+            this.displayNoServiceAlert = false;
         },
     },
     mounted() {