From d450cee5e3090fde14d37deea40bb0039e943fa6 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Fri, 25 Apr 2025 15:11:30 -0400 Subject: [PATCH 1/4] CASH-464: fix supplemental info styling --- src/layouts/schedule/time-slot-question/time-slot-question.vue | 1 + 1 file changed, 1 insertion(+) 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 cbfb6e4db..c31f1b4c7 100644 --- a/src/layouts/schedule/time-slot-question/time-slot-question.vue +++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue @@ -563,6 +563,7 @@ export default { .supplemental-information { line-height: 1.5rem; font-size: 0.875rem; + text-align: left; li strong { font-weight: bold; } From b8545709ba8d1cc95006a90a8acaa8a52e01501e Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Tue, 29 Apr 2025 09:57:30 -0400 Subject: [PATCH 2/4] CASH-464: fix premium and mobile appointment time slot button styling --- src/digital-components/date-picker/date-picker.vue | 5 +++++ src/layouts/schedule/schedule.vue | 2 +- .../schedule/time-slot-question/time-slot-question.vue | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index aaab331e3..13348f5fe 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -1265,6 +1265,11 @@ export default { flex: 0 0 calc(50% - 0.25rem); } } + :deep(.button-question.is-mobile-appointment) { + .button-inner-wrapper > div { + flex: 0 0 100%; + } + } } .btn-link { diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 4a5a91324..715705cbb 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -257,7 +257,7 @@ export default { } else { // Check to see if pre-selected date should have pricing by day upcharge if (showPricingByDay) { - // is this preSelectedDate a premium day? + // is this preSelectedDate a higher priced pricingByDay day? const dayIndex = convertDateStringToDate(preSelectedSlot?.date).getDay(); const dayObject = DAYS_OF_WEEK[dayIndex]; if (dayObject.isPricingByDayUpchargeDay) { 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 c31f1b4c7..36a94cf59 100644 --- a/src/layouts/schedule/time-slot-question/time-slot-question.vue +++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue @@ -12,6 +12,7 @@ buttonTypeString="timeSlotModalListButton" :buttonTypeObject="timeSlotModalListButton" class="mt-4" + :class="isMobileAppointment ? 'is-mobile-appointment' : ''" :answers="availableTimeSlots" groupName="chooseTimeSlot" textPosition="text-center" @@ -353,6 +354,9 @@ export default { waitListSuccessText() { return this.getCmsContent("WaitListSuccessWidget", "BodyText"); }, + isMobileAppointment() { + return this.appointmentType === AppointmentTypeStrings.MOBILE; + }, }, methods: { async setSelectedTimeSlot() { From 5fae2e79a879cc1028c90118fc1a8ef4dfe34bf7 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Tue, 29 Apr 2025 10:35:26 -0400 Subject: [PATCH 3/4] CASH-464: more styling changes if drop off appointment --- src/digital-components/date-picker/date-picker.vue | 6 ++++++ .../schedule/time-slot-question/time-slot-question.vue | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index 13348f5fe..ac8514ea4 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -1260,6 +1260,7 @@ export default { max-width: 100%; flex-wrap: wrap; gap: 0 0.5rem; + justify-content: center; & > div { flex: 0 0 calc(50% - 0.25rem); @@ -1270,6 +1271,11 @@ export default { flex: 0 0 100%; } } + :deep(.button-question.is-drop-off-appointment) { + .button-inner-wrapper > div { + flex: 0 0 100%; + } + } } .btn-link { 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 36a94cf59..d28e82bb8 100644 --- a/src/layouts/schedule/time-slot-question/time-slot-question.vue +++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue @@ -12,7 +12,7 @@ buttonTypeString="timeSlotModalListButton" :buttonTypeObject="timeSlotModalListButton" class="mt-4" - :class="isMobileAppointment ? 'is-mobile-appointment' : ''" + :class="[isMobileAppointment ? 'is-mobile-appointment' : '', isDropOffAppointment ? 'is-drop-off-appointment' : '']" :answers="availableTimeSlots" groupName="chooseTimeSlot" textPosition="text-center" @@ -357,6 +357,9 @@ export default { isMobileAppointment() { return this.appointmentType === AppointmentTypeStrings.MOBILE; }, + isDropOffAppointment() { + return this.appointmentType === AppointmentTypeStrings.DROP_OFF; + }, }, methods: { async setSelectedTimeSlot() { From a77a9eb1000b1afe3c4004c0f05fd666e956e958 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Tue, 29 Apr 2025 10:38:34 -0400 Subject: [PATCH 4/4] CASH-464: prettier formatting edits that just slow us down --- .../schedule/time-slot-question/time-slot-question.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 d28e82bb8..507f7dea9 100644 --- a/src/layouts/schedule/time-slot-question/time-slot-question.vue +++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue @@ -12,7 +12,10 @@ buttonTypeString="timeSlotModalListButton" :buttonTypeObject="timeSlotModalListButton" class="mt-4" - :class="[isMobileAppointment ? 'is-mobile-appointment' : '', isDropOffAppointment ? 'is-drop-off-appointment' : '']" + :class="[ + isMobileAppointment ? 'is-mobile-appointment' : '', + isDropOffAppointment ? 'is-drop-off-appointment' : '', + ]" :answers="availableTimeSlots" groupName="chooseTimeSlot" textPosition="text-center"