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

Merging from develop

Browse source
This commit is contained in:
Leah Schumann 2022-07-13 09:16:59 -04:00
commit c8a1938329
4 changed files with 16 additions and 12 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

@ -295,6 +295,8 @@ export default {
await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.customerQuestions.emailAddress, false); await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.customerQuestions.emailAddress, false);
await this.dispatchStoreAction(storeActions.SAVE_SERVICE_LOCATION, { await this.dispatchStoreAction(storeActions.SAVE_SERVICE_LOCATION, {
address: this.customerQuestions.addressQuestions.streetAddress,
city: this.customerQuestions.addressQuestions.city,
zipCode: this.serviceZipCode, zipCode: this.serviceZipCode,
state: resultMap.serviceZipValidationResponse.state, state: resultMap.serviceZipValidationResponse.state,
}, false); }, false);

6
src/layouts/estimate/estimate.spec.js
View file

@ -81,7 +81,7 @@ describe("estimate.vue", () => {
//Arrange //Arrange
const { wrapper } = setupMocks({}); const { wrapper } = setupMocks({});
await wrapper.setData({ await wrapper.setData({
selectedValues: [vinLookupMethodSelections.HOMEADDRESS] selectedVinLookupMethod: vinLookupMethodSelections.HOMEADDRESS
}) })
//Act //Act
@ -97,7 +97,7 @@ describe("estimate.vue", () => {
//Arrange //Arrange
const { wrapper } = setupMocks({}); const { wrapper } = setupMocks({});
await wrapper.setData({ await wrapper.setData({
selectedValues: [vinLookupMethodSelections.MANUALVIN] selectedVinLookupMethod: vinLookupMethodSelections.MANUALVIN
}) })
//Act //Act
@ -132,7 +132,7 @@ describe("estimate.vue", () => {
//Arrange //Arrange
const { wrapper } = setupMocks({}); const { wrapper } = setupMocks({});
await wrapper.setData({ await wrapper.setData({
selectedValues: [vinLookupMethodSelections.LICENSEPLATE] selectedVinLookupMethod: vinLookupMethodSelections.LICENSEPLATE
}) })
//Act //Act

10
src/layouts/estimate/estimate.vue
View file

@ -21,7 +21,7 @@
:answers="answersFromCms" :answers="answersFromCms"
groupName="vinLookupMethodOption" groupName="vinLookupMethodOption"
buttonType="listButton" buttonType="listButton"
v-model="selectedValues" v-model="selectedVinLookupMethod"
isRequired isRequired
validationRules="option-required" validationRules="option-required"
/> />
@ -60,7 +60,7 @@ export default {
name: "estimate", name: "estimate",
data() { data() {
return { return {
selectedValues: [], selectedVinLookupMethod: "",
}; };
}, },
@ -94,20 +94,20 @@ export default {
); );
}, },
async forwardButtonAction() { async forwardButtonAction() {
if (this.selectedValues[0] === vinLookupMethodSelections.MANUALVIN) { if (this.selectedVinLookupMethod === vinLookupMethodSelections.MANUALVIN) {
await this.dispatchStoreAction(storeActions.CLEAR_VIN); await this.dispatchStoreAction(storeActions.CLEAR_VIN);
return this.$router.navigate( return this.$router.navigate(
this.navigationScenarios.SELECTED_MANUAL_VIN, this.navigationScenarios.SELECTED_MANUAL_VIN,
this.$route this.$route
); );
} }
if (this.selectedValues[0] === vinLookupMethodSelections.LICENSEPLATE) { if (this.selectedVinLookupMethod === vinLookupMethodSelections.LICENSEPLATE) {
return this.$router.navigate( return this.$router.navigate(
this.navigationScenarios.SELECTED_LICENSE_PLATE, this.navigationScenarios.SELECTED_LICENSE_PLATE,
this.$route this.$route
); );
} }
if (this.selectedValues[0] === vinLookupMethodSelections.HOMEADDRESS) { if (this.selectedVinLookupMethod === vinLookupMethodSelections.HOMEADDRESS) {
return this.$router.navigate( return this.$router.navigate(
this.navigationScenarios.SELECTED_HOME_ADDRESS, this.navigationScenarios.SELECTED_HOME_ADDRESS,
this.$route this.$route

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

@ -301,10 +301,12 @@ export default {
// Check if Service Zip entered is serviceable // Check if Service Zip entered is serviceable
if (zipValidationResponse.data.isServiceable) { if (zipValidationResponse.data.isServiceable) {
// If the Service Zip entered is serviceable then save the Zip Info and Email Address and navigate forward // If the Service Zip entered is serviceable then save the Zip Info and Email Address and navigate forward
await this.dispatchStoreAction(storeActions.SAVE_SERVICE_LOCATION, { if (this.$store.getters.order.serviceLocation.zipCode != this.zip) {
zipCode: this.serviceZipCode, await this.dispatchStoreAction(storeActions.SAVE_SERVICE_LOCATION, {
state: zipValidationResponse.data.state zipCode: this.serviceZipCode,
}, false); state: zipValidationResponse.data.state
}, false);
}
await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailAddress, false); await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailAddress, false);