From 0d826f478e145207a9d046dc6d33dba5edd1b5d1 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Thu, 24 Jul 2025 09:53:06 -0400 Subject: [PATCH 1/3] CASH-1230 CASH-1230 modified waitlist to display for mobile and for inshop when it should/shouldnt --- src/layouts/schedule/schedule.vue | 15 ++++++++++++--- .../time-slot-question/time-slot-question.vue | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 3c37adde5..5dd7316ad 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -1441,9 +1441,17 @@ export default { } }, setDisplayWaitList() { - const dateString = this.isMobileSelected - ? this.selectableDatesMobile?.days[0]?.date - : this.selectableDatesInshop?.days[0]?.date; + let dateString = null; + if (this.appointmentType === AppointmentTypeStrings.MOBILE && this.selectableDatesMobile.days.length > 0) { + dateString = this.selectableDatesMobile?.days[0]?.date; + } else if ( + this.appointmentType === AppointmentTypeStrings.IN_SHOP || + this.appointmentType === AppointmentTypeStrings.DROP_OFF || + this.appointmentType === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF && + this.selectableDatesInshop.days.length > 0 + ) { + dateString = this.selectableDatesInshop?.days[0]?.date; + } if ( experimentMixin.methods.hasSettingEqualTo( experimentSettings.DISPLAY_WAITLIST, @@ -1663,6 +1671,7 @@ export default { this.appointmentType = null; } this.selectedDate = this.getSelectedDate(); + this.setDisplayWaitList(); }, }, watch: { diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue index 38f97d756..c3e178a30 100644 --- a/src/layouts/schedule/time-slot-question/time-slot-question.vue +++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue @@ -53,7 +53,7 @@ v-model="waitListRequested" @click="waitListChecked" /> -
+
From 1b7eb2962e507b86385af45d49f7b6cc042ae92c Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Thu, 24 Jul 2025 10:07:09 -0400 Subject: [PATCH 2/3] CASH-1230 formatting --- src/layouts/schedule/schedule.vue | 11 +++++++---- .../time-slot-question/time-slot-question.vue | 5 ++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 5dd7316ad..2e328c1eb 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -1442,16 +1442,19 @@ export default { }, setDisplayWaitList() { let dateString = null; - if (this.appointmentType === AppointmentTypeStrings.MOBILE && this.selectableDatesMobile.days.length > 0) { + if ( + this.appointmentType === AppointmentTypeStrings.MOBILE && + this.selectableDatesMobile.days.length > 0 + ) { dateString = this.selectableDatesMobile?.days[0]?.date; } else if ( this.appointmentType === AppointmentTypeStrings.IN_SHOP || this.appointmentType === AppointmentTypeStrings.DROP_OFF || - this.appointmentType === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF && - this.selectableDatesInshop.days.length > 0 + (this.appointmentType === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF && + this.selectableDatesInshop.days.length > 0) ) { dateString = this.selectableDatesInshop?.days[0]?.date; - } + } if ( experimentMixin.methods.hasSettingEqualTo( experimentSettings.DISPLAY_WAITLIST, diff --git a/src/layouts/schedule/time-slot-question/time-slot-question.vue b/src/layouts/schedule/time-slot-question/time-slot-question.vue index c3e178a30..e7c603f65 100644 --- a/src/layouts/schedule/time-slot-question/time-slot-question.vue +++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue @@ -53,7 +53,10 @@ v-model="waitListRequested" @click="waitListChecked" />
-
+
From 905eeb9e3174ce9c359b385c9791be82dbbca12b Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Thu, 24 Jul 2025 12:41:19 -0400 Subject: [PATCH 3/3] CASH-1230 CASH-1230 simplifed code back to the way it was in setDisplayWaitlist, only need to call this method on an appointment type change --- src/layouts/schedule/schedule.vue | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 2e328c1eb..23671a356 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -1441,20 +1441,9 @@ export default { } }, setDisplayWaitList() { - let dateString = null; - if ( - this.appointmentType === AppointmentTypeStrings.MOBILE && - this.selectableDatesMobile.days.length > 0 - ) { - dateString = this.selectableDatesMobile?.days[0]?.date; - } else if ( - this.appointmentType === AppointmentTypeStrings.IN_SHOP || - this.appointmentType === AppointmentTypeStrings.DROP_OFF || - (this.appointmentType === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF && - this.selectableDatesInshop.days.length > 0) - ) { - dateString = this.selectableDatesInshop?.days[0]?.date; - } + const dateString = this.isMobileSelected + ? this.selectableDatesMobile?.days[0]?.date + : this.selectableDatesInshop?.days[0]?.date; if ( experimentMixin.methods.hasSettingEqualTo( experimentSettings.DISPLAY_WAITLIST,