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

Merge pull request #2693 from Safelite/feature/CASH-1159

Browse source 
CASH-1159
This commit is contained in:
Johnny Shultz 2025-07-25 09:40:12 -04:00 committed by GitHub
commit c1fca7eac3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/layouts/schedule/schedule.vue
View file

@ -425,6 +425,7 @@ export default {
shopProviderData: null, shopProviderData: null,
navigatingForward: false, navigatingForward: false,
shopListButton: shopListButton, shopListButton: shopListButton,
lastInshopProvider: this.getSelectedProviderFromStore() || null,
}; };
}, },
async beforeRouteEnter(to, from, next) { async beforeRouteEnter(to, from, next) {
@ -1116,6 +1117,13 @@ export default {
} else { } else {
this.updateSelectedProvider(selectedProvider); this.updateSelectedProvider(selectedProvider);
} }
if (
this.appointmentType === this.appointmentTypeStrings.IN_SHOP ||
this.appointmentType === this.appointmentTypeStrings.DROP_OFF ||
this.appointmentType === this.appointmentTypeStrings.IN_SHOP_OR_DROP_OFF
) {
this.lastInshopProvider = this.selectedProvider;
}
}, },
async getMoreScheduleData(startDate, endDate) { async getMoreScheduleData(startDate, endDate) {
// called only when "View more dates" is clicked; not on initial page load // called only when "View more dates" is clicked; not on initial page load
@ -1608,9 +1616,13 @@ export default {
}, },
}; };
} else if ( } else if (
!this.selectedProvider?.address?.streetAddress && (this.appointmentType === this.appointmentTypeStrings.IN_SHOP ||
this.shopProviderData?.shopProviders?.length this.appointmentType === this.appointmentTypeStrings.DROP_OFF ||
this.appointmentType === this.appointmentTypeStrings.IN_SHOP_OR_DROP_OFF) &&
this.lastInshopProvider.address.city
) { ) {
this.selectedProvider = this.lastInshopProvider;
} else {
this.selectedProvider = this.shopProviderData.shopProviders[0]; this.selectedProvider = this.shopProviderData.shopProviders[0];
} }
}, },