Merge branch 'release/2025.07.31' into feature/CASH-1224

This commit is contained in:
scottkiener-at-safelite 2025-07-22 16:02:19 -04:00 committed by GitHub
commit 92620b1dcd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1186,34 +1186,27 @@ export default {
(this.isServiceableInshop && !selectedDateInshop) || (this.isServiceableInshop && !selectedDateInshop) ||
(this.isServiceableDropoff && !selectedDateInshop) (this.isServiceableDropoff && !selectedDateInshop)
) { ) {
this.$nextTick(() => { await this.$nextTick();
this.$refs.datePicker.showAnotherMonth().then((moreSelectableDates) => { await this.$refs.datePicker.showAnotherMonth();
// update all dates
// > CHLOE HERD 7/22 -- CASH-1207 // update all dates
// > Do not update the available dates again here;
// > they have already been updated by `showAnotherMonth`.
// > Doing so will likely add or remove dates,
// > desyncing the schedule page and the date-picker.
if (!selectedDateInshop) { // > CHLOE HERD 7/22 -- CASH-1207
selectedDateInshop = this.getSelectedDateForInshop(); // > Do not update the available dates again here;
} // > they have already been updated by `showAnotherMonth`.
if (!selectedDateMobile) { // > Doing so will likely add or remove dates,
selectedDateMobile = this.getSelectedDateForMobile(); // > desyncing the schedule page and the date-picker.
}
this.setDisplayWaitList(); this.setDisplayWaitList();
}); }
});
await this.$nextTick();
if (this.isMobileSelected) {
this.selectedDate = this.getSelectedDateForMobile();
} else {
this.selectedDate = this.getSelectedDateForInshop();
} }
this.$nextTick(() => {
if (this.isMobileSelected) {
this.selectedDate = selectedDateMobile;
} else {
this.selectedDate = selectedDateInshop;
}
});
} }
}, },
getScheduleApiResponse, getScheduleApiResponse,