Merge branch 'release/2025.07.31' into feature/CASH-1224
This commit is contained in:
commit
92620b1dcd
1 changed files with 17 additions and 24 deletions
|
|
@ -1186,34 +1186,27 @@ export default {
|
|||
(this.isServiceableInshop && !selectedDateInshop) ||
|
||||
(this.isServiceableDropoff && !selectedDateInshop)
|
||||
) {
|
||||
this.$nextTick(() => {
|
||||
this.$refs.datePicker.showAnotherMonth().then((moreSelectableDates) => {
|
||||
// update all dates
|
||||
await this.$nextTick();
|
||||
await this.$refs.datePicker.showAnotherMonth();
|
||||
|
||||
// > CHLOE HERD 7/22 -- CASH-1207
|
||||
// > 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.
|
||||
// update all dates
|
||||
|
||||
if (!selectedDateInshop) {
|
||||
selectedDateInshop = this.getSelectedDateForInshop();
|
||||
}
|
||||
if (!selectedDateMobile) {
|
||||
selectedDateMobile = this.getSelectedDateForMobile();
|
||||
}
|
||||
// > CHLOE HERD 7/22 -- CASH-1207
|
||||
// > 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.
|
||||
|
||||
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,
|
||||
|
|
|
|||
Loading…
Reference in a new issue