jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release/2025.04.24' into feature/CASH-489

Browse source
This commit is contained in:
Johnny Shultz 2025-04-10 11:59:57 -04:00 committed by GitHub
commit f53da0f62e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/layouts/address-lookup/address-lookup.vue
View file

@ -301,7 +301,7 @@ export default {
return this.$refs.navbar.removeLoader(); return this.$refs.navbar.removeLoader();
} }
this.displayInvalidZipAlert = false; this.displayInvalidZipAlert = false;
if (this.serviceZipCode != null) { if (this.serviceZipCode != null && this.isHeavyTruck) {
const closestShops = await this.findClosestApplicableShops( const closestShops = await this.findClosestApplicableShops(
this.serviceZipCode, this.serviceZipCode,
this.carId this.carId

17
src/layouts/license-plate-lookup/license-plate-lookup.vue
View file

@ -281,14 +281,15 @@ export default {
this.displayInvalidZipAlert = true; this.displayInvalidZipAlert = true;
return this.$refs.navbar.removeLoader(); return this.$refs.navbar.removeLoader();
} }
if (this.isHeavyTruck) {
const closestShops = await this.findClosestApplicableShops( const closestShops = await this.findClosestApplicableShops(
this.serviceZipCode, this.serviceZipCode,
this.carId this.carId
); );
this.displayNoServiceAlert = !closestShops?.data?.providers?.length; this.displayNoServiceAlert = !closestShops?.data?.providers?.length;
if (this.displayNoServiceAlert) { if (this.displayNoServiceAlert) {
return this.$refs.navbar.removeLoader(); return this.$refs.navbar.removeLoader();
}
} }
// Check if the CarId has changed. // Check if the CarId has changed.

16
src/layouts/service-zip/service-zip.vue
View file

@ -276,13 +276,15 @@ export default {
return this.$refs.navbar.removeLoader(); return this.$refs.navbar.removeLoader();
} }
this.displayNonServiceableZipAlert = false; this.displayNonServiceableZipAlert = false;
const closestShops = await this.findClosestApplicableShops( if (this.isHeavyTruck) {
this.serviceZipCode, const closestShops = await this.findClosestApplicableShops(
this.carId this.serviceZipCode,
); this.carId
this.displayNoServiceAlert = !closestShops?.data?.providers?.length; );
if (this.displayNoServiceAlert) { this.displayNoServiceAlert = !closestShops?.data?.providers?.length;
return this.$refs.navbar.removeLoader(); if (this.displayNoServiceAlert) {
return this.$refs.navbar.removeLoader();
}
} }
const payment = this.$store.getters.payment; const payment = this.$store.getters.payment;

18
src/layouts/vin-lookup/vin-lookup.vue
View file

@ -303,14 +303,16 @@ export default {
return this.$refs.navbar.removeLoader(); return this.$refs.navbar.removeLoader();
} }
this.displayInvalidZipAlert = false; this.displayInvalidZipAlert = false;
// If a VIN has already been found. Validate the Service Zip (in case of changes) if (this.isHeavyTruck) {
var closestShops = await this.findClosestApplicableShops( // If a VIN has already been found. Validate the Service Zip (in case of changes)
this.serviceZipCode, var closestShops = await this.findClosestApplicableShops(
this.carId this.serviceZipCode,
); this.carId
this.displayNoServiceAlert = !closestShops?.data?.providers?.length; );
if (this.displayNoServiceAlert) { this.displayNoServiceAlert = !closestShops?.data?.providers?.length;
return this.$refs.navbar.removeLoader(); if (this.displayNoServiceAlert) {
return this.$refs.navbar.removeLoader();
}
} }
// If either lookup fails, remove the loader and stop processing the page. // If either lookup fails, remove the loader and stop processing the page.