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

Merge pull request #2669 from Safelite/feature/CASH-845-stage-6

Browse source 
CASH-845 a few more bug fixes
This commit is contained in:
AdamCaouetteSafelite 2025-07-18 16:05:55 -04:00 committed by GitHub
commit ef99e473a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/digital-components/date-picker/date-picker.vue
View file

@ -335,11 +335,32 @@ export default {
this.estimatedServiceMinutesMaximum
);
return `${inshopDurationTextWithoutTime} ${inshopDurationTime}`;
if (this.estimatedServiceMinutesMinimum && this.estimatedServiceMinutesMaximum) {
return `${inshopDurationTextWithoutTime} ${inshopDurationTime}`;
}
return null;
},
mobileDurationText() {
const mobileDurationTextWithoutTime = this.getCmsContent(
"TimeSlotModalQuestion",
cmsWidgetFieldMappings.DURATION
);
const mobileDurationTime = getDisplayTextForDurationLength(
this.estimatedServiceMinutesMinimum,
this.estimatedServiceMinutesMaximum
);
if (this.estimatedServiceMinutesMinimum && this.estimatedServiceMinutesMaximum) {
return `${mobileDurationTextWithoutTime} ${mobileDurationTime}`;
}
return null;
},
durationTextBlockCopy() {
if (this.appointmentType === AppointmentTypeStrings.MOBILE) {
return null;
return this.mobileDurationText;
} else if (this.appointmentType === AppointmentTypeStrings.IN_SHOP) {
return this.inshopDurationText;
} else if (

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

@ -1151,7 +1151,7 @@ export default {
});
datePickerInitialData.pricingByDayBasePrice = this.pricingByDayBasePrice;
datePickerInitialData.pricingByDayUpcharge = this.pricingByDayUpcharge;
this.$refs.datePicker.initializeComponent(datePickerInitialData);
await this.$refs.datePicker.initializeComponent(datePickerInitialData);
this.selectableDatesInshop =
datePickerInitialData.initialShopTimeSlotsResponse.inshopTimeSlotsData;
this.selectableDatesMobile =
@ -1182,11 +1182,13 @@ export default {
});
});
}
if (this.isMobileSelected) {
this.selectedDate = selectedDateMobile;
} else {
this.selectedDate = selectedDateInshop;
}
this.$nextTick(() => {
if (this.isMobileSelected) {
this.selectedDate = selectedDateMobile;
} else {
this.selectedDate = selectedDateInshop;
}
});
}
},
getScheduleApiResponse,