diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 6ef2ba362..1dfa69ce8 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -742,7 +742,14 @@ export default { return store.getters.order.policy.isNoComp; }, isForwardActionDisabled() { - return this.displayNoShopsAlert; + if ( + (this.appointmentType === AppointmentTypeStrings.IN_SHOP || + this.appointmentType === AppointmentTypeStrings.DROP_OFF) && + !this.selectedTimeSlotInfo?.timeSlot?.date + ) { + return true; + } + return this.displayNoShopsAlert || this.appointmentType === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF; }, additionalButtonData() { return {