From 99d223b2877ed3875115acc23a175ae317e9c02a Mon Sep 17 00:00:00 2001 From: Minojhini Valaiyapathi Date: Thu, 10 Apr 2025 11:24:56 -0400 Subject: [PATCH 1/2] CASH-353 - Added a check to see if it is heavy truck --- src/layouts/address-lookup/address-lookup.vue | 16 +++++++++------- .../license-plate-lookup.vue | 17 +++++++++-------- src/layouts/service-zip/service-zip.vue | 16 +++++++++------- src/layouts/vin-lookup/vin-lookup.vue | 18 ++++++++++-------- 4 files changed, 37 insertions(+), 30 deletions(-) diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index 6c24c2076..887b2db8e 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/src/layouts/address-lookup/address-lookup.vue @@ -301,13 +301,15 @@ export default { return this.$refs.navbar.removeLoader(); } this.displayInvalidZipAlert = false; - const closestShops = await this.findClosestApplicableShops( - this.serviceZipCode, - this.carId - ); - this.displayNoServiceAlert = !closestShops?.data?.providers?.length; - if (this.displayNoServiceAlert) { - return this.$refs.navbar.removeLoader(); + if (this.isHeavyTruck && this.serviceZipCode != null) { + const closestShops = await this.findClosestApplicableShops( + this.serviceZipCode, + this.carId + ); + this.displayNoServiceAlert = !closestShops?.data?.providers?.length; + if (this.displayNoServiceAlert) { + return this.$refs.navbar.removeLoader(); + } } const carsFound = resultMap.vinLookupResponse.vinVehicles; diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index 3ce42fc80..a359d3a9d 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -281,14 +281,15 @@ export default { this.displayInvalidZipAlert = true; return this.$refs.navbar.removeLoader(); } - - const closestShops = await this.findClosestApplicableShops( - this.serviceZipCode, - this.carId - ); - this.displayNoServiceAlert = !closestShops?.data?.providers?.length; - if (this.displayNoServiceAlert) { - 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(); + } } // Check if the CarId has changed. diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue index f8952a206..7d53d105d 100644 --- a/src/layouts/service-zip/service-zip.vue +++ b/src/layouts/service-zip/service-zip.vue @@ -276,13 +276,15 @@ export default { return this.$refs.navbar.removeLoader(); } this.displayNonServiceableZipAlert = false; - const closestShops = await this.findClosestApplicableShops( - this.serviceZipCode, - this.carId - ); - this.displayNoServiceAlert = !closestShops?.data?.providers?.length; - if (this.displayNoServiceAlert) { - 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; diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index aaef69fe8..788425861 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -303,14 +303,16 @@ export default { return this.$refs.navbar.removeLoader(); } this.displayInvalidZipAlert = false; - // If a VIN has already been found. Validate the Service Zip (in case of changes) - var closestShops = await this.findClosestApplicableShops( - this.serviceZipCode, - this.carId - ); - this.displayNoServiceAlert = !closestShops?.data?.providers?.length; - if (this.displayNoServiceAlert) { - return this.$refs.navbar.removeLoader(); + if (this.isHeavyTruck) { + // If a VIN has already been found. Validate the Service Zip (in case of changes) + var closestShops = await this.findClosestApplicableShops( + this.serviceZipCode, + this.carId + ); + this.displayNoServiceAlert = !closestShops?.data?.providers?.length; + if (this.displayNoServiceAlert) { + return this.$refs.navbar.removeLoader(); + } } // If either lookup fails, remove the loader and stop processing the page. From c68dac598273d254f2da1f9544f22c0d758d3640 Mon Sep 17 00:00:00 2001 From: Minojhini Valaiyapathi Date: Thu, 10 Apr 2025 11:40:59 -0400 Subject: [PATCH 2/2] CASH-353 - Resolving conflicts --- src/layouts/address-lookup/address-lookup.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index 887b2db8e..c33ef68e5 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/src/layouts/address-lookup/address-lookup.vue @@ -301,7 +301,7 @@ export default { return this.$refs.navbar.removeLoader(); } this.displayInvalidZipAlert = false; - if (this.isHeavyTruck && this.serviceZipCode != null) { + if (this.serviceZipCode != null && this.isHeavyTruck) { const closestShops = await this.findClosestApplicableShops( this.serviceZipCode, this.carId