diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index c3ada3dcc..e26a6c76c 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -215,7 +215,7 @@ export default { const alertReasonsPromise = locationAlerts.methods.loadInitialData( store.getters.order.serviceLocation.zipCodeCtu, - store.getters.order.serviceLocation.provider?.address?.zipCtu + store.getters.order.serviceLocation.provider?.address?.zipCodeCtu ); // Settle promises and get results const promiseResultMap = [ diff --git a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js index 81d336968..c89ddf973 100644 --- a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js +++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js @@ -42,7 +42,8 @@ jest.mock("@/store", () => ({ streetAddress: null, city: null, state: null, - zip: null, + zipCode: null, + zipCodeCtu: null, }, }, }, diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue index 3b4cd4458..2c0e0619b 100644 --- a/src/layouts/service-location/service-location.vue +++ b/src/layouts/service-location/service-location.vue @@ -393,8 +393,8 @@ export default { streetAddress: this.selectedProvider?.address?.streetAddress, city: this.selectedProvider?.address?.city, state: this.selectedProvider?.address?.state, - zip: this.selectedProvider?.address?.zipCode, - zipCtu: this.selectedProvider?.address?.zipCodeCtu, + zipCode: this.selectedProvider?.address?.zipCode, + zipCodeCtu: this.selectedProvider?.address?.zipCodeCtu, }, }, }, diff --git a/src/store/index.js b/src/store/index.js index 5c290b1cd..7e7dfffaf 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -54,7 +54,8 @@ const getDefaultState = () => { streetAddress: null, city: null, state: null, - zip: null, + zipCode: null, + zipCodeCtu: null, }, }, }, @@ -265,7 +266,8 @@ export const mutations = { streetAddress: serviceLocationInfo.provider?.address?.streetAddress, city: serviceLocationInfo.provider?.address?.city, state: serviceLocationInfo.provider?.address?.state, - zip: serviceLocationInfo.provider?.address?.zip, + zipCode: serviceLocationInfo.provider?.address?.zipCode, + zipCodeCtu: serviceLocationInfo.provider?.address?.zipCodeCtu, }, }; }, @@ -380,7 +382,8 @@ export const mutations = { streetAddress: null, city: null, state: null, - zip: null, + zipCode: null, + zipCodeCtu: null, }, }; }, @@ -469,8 +472,10 @@ export const mutations = { sessionInformation.order.serviceLocation.provider?.address?.city; state.order.serviceLocation.provider.address.state = sessionInformation.order.serviceLocation.provider?.address?.state; - state.order.serviceLocation.provider.address.zip = - sessionInformation.order.serviceLocation.provider?.address?.zip; + state.order.serviceLocation.provider.address.zipCode = + sessionInformation.order.serviceLocation.provider?.address?.zipCode; + state.order.serviceLocation.provider.address.zipCodeCtu = + sessionInformation.order.serviceLocation.provider?.address?.zipCodeCtu; state.order.payment.isInsurance = sessionInformation.order.payment.isInsurance; state.order.payment.insuranceCoverage.isVerified = @@ -1406,8 +1411,8 @@ export const actions = { order.serviceLocation.provider?.address?.streetAddress, city: order.serviceLocation.provider?.address?.city, state: order.serviceLocation.provider?.address?.state, - zip: order.serviceLocation.provider?.address?.zip, - zipCtu: order.serviceLocation.provider?.address?.zipCtu, + zipCode: order.serviceLocation.provider?.address?.zipCode, + zipCodeCtu: order.serviceLocation.provider?.address?.zipCodeCtu, }, }, }, @@ -1917,7 +1922,7 @@ export const actions = { if (context.state.order.serviceLocation) { if ( serviceLocationInfo.zipCode !== context.state.order.serviceLocation.zipCode || - !deepEqual( + !providersEqual( serviceLocationInfo.provider, context.state.order.serviceLocation.provider ) || @@ -2147,6 +2152,17 @@ function convertGlassPieceToBackEndCompatibleFormat(glassPieces) { }); } +function providersEqual(providerA, providerB) { + return ( + providerA.providerNumber === providerB.providerNumber && + providerA.address?.city === providerB.address?.city && + providerA.address?.state === providerB.address?.state && + providerA.address?.streetAddress === providerB.address?.streetAddress && + providerA.address?.zipCode === providerB.address?.zipCode + ); + //TODO: Change back to deepEqual once zipCodeCtu is added to saveSession. +} + // This function will verify schedule info is still valid. // check to see if we have an appointment date on the order object. // if so, make sure it's not in the past. if in the past, clear schedule info in store. diff --git a/src/store/store.spec.js b/src/store/store.spec.js index 0cc06cf3e..1ea0125b0 100644 --- a/src/store/store.spec.js +++ b/src/store/store.spec.js @@ -1071,7 +1071,8 @@ describe("Actions", () => { streetAddress: "123 Test Lane", city: "Columbus", state: "OH", - zip: "43212", + zipCode: "43212", + zipCodeCtu: "01820", }, }, }, @@ -1099,7 +1100,8 @@ describe("Actions", () => { streetAddress: "123 Test Lane", city: "Columbus", state: "OH", - zip: "43212", + zipCode: "43212", + zipCodeCtu: "01820", }, }, }; @@ -1130,7 +1132,8 @@ describe("Actions", () => { streetAddress: "123 Test Lane", city: "Columbus", state: "OH", - zip: "43212", + zipCode: "43212", + zipCodeCtu: "01820", }, }, }, @@ -1158,7 +1161,8 @@ describe("Actions", () => { streetAddress: "321 Test Lane", city: "Columbus", state: "OH", - zip: "43212", + zipCode: "43212", + zipCodeCtu: "01820", }, }, }; @@ -1189,7 +1193,8 @@ describe("Actions", () => { streetAddress: "123 Test Lane", city: "Columbus", state: "OH", - zip: "43212", + zipCode: "43212", + zipCodeCtu: "01820", }, }, }, @@ -1217,7 +1222,8 @@ describe("Actions", () => { streetAddress: "123 Test Lane", city: "Columbus", state: "OH", - zip: "43212", + zipCode: "43212", + zipCodeCtu: "01820", }, }, }; @@ -1248,7 +1254,8 @@ describe("Actions", () => { streetAddress: "123 Test Lane", city: "Columbus", state: "OH", - zip: "43212", + zipCode: "43212", + zipCodeCtu: "01820", }, }, }, @@ -1276,7 +1283,8 @@ describe("Actions", () => { streetAddress: "123 Test Lane", city: "Columbus", state: "OH", - zip: "43212", + zipCode: "43212", + zipCodeCtu: "01820", }, }, };