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

Merge branch 'release/2025.07.31' into nation/CASH-1225

Browse source
This commit is contained in:
CarlNation 2025-07-24 13:33:40 -04:00 committed by GitHub
commit 33241a8ecb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1394,12 +1394,15 @@ export default {
} }
if (this.selectedTimeSlotInfo.timeSlot.jobMinMinutes == null) { if (this.selectedTimeSlotInfo.timeSlot.jobMinMinutes == null) {
this.selectedTimeSlotInfo.timeSlot.jobMinMinutes = this.isMobileSelected this.selectedTimeSlotInfo = this.getSelectedTimeSlotInfo();
? this.selectableDatesMobile.estimatedServiceMinutesMinimum?.toString() if (this.selectedTimeSlotInfo.timeSlot.jobMinMinutes == null) {
: this.selectableDatesInshop.estimatedServiceMinutesMinimum?.toString(); this.selectedTimeSlotInfo.timeSlot.jobMinMinutes = this.isMobileSelected
this.selectedTimeSlotInfo.timeSlot.jobMaxMinutes = this.isMobileSelected ? this.selectableDatesMobile.estimatedServiceMinutesMinimum?.toString()
? this.selectableDatesMobile.estimatedServiceMinutesMaximum?.toString() : this.selectableDatesInshop.estimatedServiceMinutesMinimum?.toString();
: this.selectableDatesInshop.estimatedServiceMinutesMaximum?.toString(); this.selectedTimeSlotInfo.timeSlot.jobMaxMinutes = this.isMobileSelected
? this.selectableDatesMobile.estimatedServiceMinutesMaximum?.toString()
: this.selectableDatesInshop.estimatedServiceMinutesMaximum?.toString();
}
} }
this.dispatchStoreAction( this.dispatchStoreAction(
@ -1663,7 +1666,14 @@ export default {
}, },
selectedDate(newValue, oldValue) { selectedDate(newValue, oldValue) {
// Clear time slot selection if date selected changes // Clear time slot selection if date selected changes
if (newValue !== oldValue) { const selectedDate = this.getSelectedDateFromStore();
if (oldValue && this.appointmentType === AppointmentTypeStrings.MOBILE) {
oldValue = `${oldValue}-mobile`;
}
const hasValueChanged = newValue !== oldValue;
const isDateDifferent = (newValue || oldValue) !== selectedDate;
if (hasValueChanged && isDateDifferent) {
this.selectedTimeSlotInfo = { this.selectedTimeSlotInfo = {
timeSlot: { timeSlot: {
date: null, date: null,