diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 7fe982fdb..6b0a3f224 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -64,14 +64,6 @@ /> - - - + @@ -313,34 +298,36 @@ export default { this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route); }, async forwardButtonAction() { - const zipValidation = await this.validateZip(this.zip); - if (!zipValidation.data.isServiceable) { + const zipValidation = this.validateZip(this.zip); + const vehicleLookup = this.lookupVehicle(this.vin); + const zipValidationResponse = await zipValidation; + const vehicleLookupResponse = await vehicleLookup.catch(() => { + this.vinNotFound = true; + this.$refs.funnelFooter.removeLoader(); + this.noServiceZip = false; + return; + }); + if (!zipValidationResponse.data.isServiceable) { this.customAlertData.zip = this.zip; this.$refs.funnelFooter.removeLoader(); this.noServiceZip = true; this.invalidZip = this.zip; return; } - const vehicleLookup = await this.lookupVehicle(this.vin).catch(() => { - this.vinNotFound = true; - this.$refs.funnelFooter.removeLoader(); - this.noServiceZip = false; - return; - }); - this.isCarIdDifferent = vehicleLookup.data.carId !== store.getters.vehicle.carId; + this.isCarIdDifferent = vehicleLookupResponse.data.carId !== store.getters.vehicle.carId; - if (this.isCarIdDifferent && (vehicleLookup.data.carId !== this.previouslyEnteredCarId)) { - this.previouslyEnteredCarId = vehicleLookup.data.carId; + if (this.isCarIdDifferent && (vehicleLookupResponse.data.carId !== this.previouslyEnteredCarId)) { + this.previouslyEnteredCarId = vehicleLookupResponse.data.carId; this.noServiceZip = false; - this.customAlertData.vehicleInfo = vehicleLookup.data; - this.$refs.funnelFooter.updateButtonText(`Continue with ${vehicleLookup.data.year} ${vehicleLookup.data.make} ${vehicleLookup.data.model}`); + this.customAlertData.vehicleInfo = vehicleLookupResponse.data; + this.$refs.funnelFooter.updateButtonText(`Continue with ${vehicleLookupResponse.data.year} ${vehicleLookupResponse.data.make} ${vehicleLookupResponse.data.model}`); this.isVinValid = true; - this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(vehicleLookup.data.carId); + this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(vehicleLookupResponse.data.carId); this.$refs.funnelFooter.removeLoader(); this.isCarIdDifferent = true; return; } - this.updateStore(vehicleLookup.data); + this.updateStore(vehicleLookupResponse.data); this.navigateForward(); }, navigateForward(){