From 76b058077bf32a84f2df917f01c889ed73b71cb5 Mon Sep 17 00:00:00 2001 From: Minojhini Valaiyapathi Date: Thu, 17 Apr 2025 09:27:13 -0400 Subject: [PATCH] CASH-353 - Redoing 353 revert branch to get merged to develop --- src/layouts/address-lookup/address-lookup.vue | 6 ++-- .../license-plate-lookup.vue | 9 +++--- src/layouts/service-zip/service-zip.vue | 18 ++++++++++-- src/layouts/vin-lookup/vin-lookup.vue | 28 +++++++++++-------- 4 files changed, 39 insertions(+), 22 deletions(-) diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index c33ef68e5..44dbaaa5e 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/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() { - return store.getters.isHeavyTruckVehicle; + getIsVehicleHeavyTruckServiceableFromStore() { + return store.getters.vehicle.isBigTruck && store.getters.vehicle.canSafeliteService; }, async findClosestApplicableShops() { return await this.dispatchStoreActionWithLogging( diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index a359d3a9d..a8c68215a 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -76,7 +76,6 @@ :manualCopy="AlertMatchedDifferentVehicleBody" alertClass="alert-warning" v-bind:isDismissible="false" /> - + @ForwardClicked="forwardButtonAction || displayNoServiceAlert" /> @@ -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() { - return store.getters.isHeavyTruckVehicle; + getIsVehicleHeavyTruckServiceableFromStore() { + return store.getters.vehicle.isBigTruck && store.getters.vehicle.canSafeliteService; }, async findClosestApplicableShops() { return await this.dispatchStoreActionWithLogging( diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue index 7d53d105d..a991119ef 100644 --- a/src/layouts/service-zip/service-zip.vue +++ b/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() { - return store.getters.isHeavyTruckVehicle; + getIsVehicleHeavyTruckServiceableFromStore() { + 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: { diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 788425861..b439b5e5e 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/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() {