Merge remote-tracking branch 'origin/release/2023.08.10' into rlsmerge/2023.08.10-to-develop

This commit is contained in:
Scott Kiener 2023-07-28 11:21:45 -04:00
commit feeb1130b4
2 changed files with 13 additions and 30 deletions

View file

@ -338,12 +338,10 @@ export default {
false false
); );
await this.dispatchStoreAction( await this.dispatchStoreAction(
storeActions.SAVE_SERVICE_LOCATION, storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
{ {
address: this.customerQuestions.addressQuestions.streetAddress,
city: this.customerQuestions.addressQuestions.city,
zipCode: this.serviceZipCode,
state: resultMap.serviceZipValidationResponse.state, state: resultMap.serviceZipValidationResponse.state,
zipCode: this.serviceZipCode,
zipCodeCtu: resultMap.serviceZipValidationResponse.zipCodeCtu, zipCodeCtu: resultMap.serviceZipValidationResponse.zipCodeCtu,
}, },
false false

View file

@ -350,27 +350,13 @@ export default {
// If a VIN has already been found. Validate the Service Zip (in case of changes) // If a VIN has already been found. Validate the Service Zip (in case of changes)
const zipCodeData = await this.getZipCodeData(this.serviceZipCode); const zipCodeData = await this.getZipCodeData(this.serviceZipCode);
// Check if Service Zip entered is serviceable then save the ZIP info and email address // Check if Service Zip entered is serviceable then save the ZIP info
if (zipCodeData.isServiceable) { if (zipCodeData.isServiceable) {
//Only save the service location if the zip changed or we lack zipCodeCtu //Only save the zipCode, state, and zipCodeCtu if the zip changed or we lack zipCodeCtu
if ( if (
this.$store.getters.order.serviceLocation.zipCode != this.serviceZipCode || this.$store.getters.order.serviceLocation.zipCode != this.serviceZipCode ||
!this.$store.getters.order.serviceLocation.zipCodeCtu !this.$store.getters.order.serviceLocation.zipCodeCtu
) { ) {
const vehicleRegistrationInfo = this.$store.getters.vehicle.registration;
if (vehicleRegistrationInfo.zipCode == this.serviceZipCode) {
await this.dispatchStoreAction(
storeActions.SAVE_SERVICE_LOCATION,
{
address: vehicleRegistrationInfo.address,
city: vehicleRegistrationInfo.city,
state: vehicleRegistrationInfo.state,
zipCode: vehicleRegistrationInfo.zipCode,
zipCodeCtu: zipCodeData.zipCodeCtu,
},
false
);
} else {
await this.dispatchStoreAction( await this.dispatchStoreAction(
storeActions.SAVE_SERVICE_ZIP_CODE_INFO, storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
{ {
@ -381,7 +367,6 @@ export default {
false false
); );
} }
}
await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailAddress, false); await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailAddress, false);