From d1fff5162f5e9cda41cc6aad74d7e9392a31c5c1 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Mon, 21 Jul 2025 16:05:17 -0400 Subject: [PATCH 1/2] CASH-1145 CASH-1145 prevented continue button from being selected before a timeslot has been picked for happy path and for when they navigate forward and back --- src/layouts/schedule/schedule.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 { From 94a3fbcc72931b06c622157d49a36da4ba26b2c0 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Mon, 21 Jul 2025 16:11:27 -0400 Subject: [PATCH 2/2] CASH-1145 formatting --- src/layouts/schedule/schedule.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 1dfa69ce8..90360ede3 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -744,12 +744,15 @@ export default { isForwardActionDisabled() { if ( (this.appointmentType === AppointmentTypeStrings.IN_SHOP || - this.appointmentType === AppointmentTypeStrings.DROP_OFF) && + this.appointmentType === AppointmentTypeStrings.DROP_OFF) && !this.selectedTimeSlotInfo?.timeSlot?.date ) { return true; } - return this.displayNoShopsAlert || this.appointmentType === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF; + return ( + this.displayNoShopsAlert || + this.appointmentType === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF + ); }, additionalButtonData() { return {