From 50aec788ff26ba6cc3479773b93aaaba696ae4a7 Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Tue, 5 Aug 2025 11:06:10 -0400 Subject: [PATCH 1/4] CASH-1314: fix to ensure that null values are not allowed to update timeSlots --- src/layouts/schedule/schedule.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 948662e91..b323022e4 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -1559,6 +1559,7 @@ export default { } }, updateTimeSlot(timeSlotObj) { + if (!timeSlotObj?.timeSlot?.date) return; this.selectedTimeSlotInfo = timeSlotObj; if ( this.appointmentType !== AppointmentTypeStrings.MOBILE && From 470a72e1ee53a42f29c48964a4b858f7ebeced1f Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Wed, 6 Aug 2025 16:38:44 -0400 Subject: [PATCH 2/4] CASH-1314: make the null check more specific --- src/layouts/schedule/schedule.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index b323022e4..7710c3095 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -1559,7 +1559,7 @@ export default { } }, updateTimeSlot(timeSlotObj) { - if (!timeSlotObj?.timeSlot?.date) return; + if (this.preSelectedDate && !timeSlotObj?.timeSlot?.date) return; this.selectedTimeSlotInfo = timeSlotObj; if ( this.appointmentType !== AppointmentTypeStrings.MOBILE && From 7aaa152a1442236933e1923cadb9b0d9b7c4acd9 Mon Sep 17 00:00:00 2001 From: Chris Redelinghuys Date: Mon, 11 Aug 2025 16:12:39 -0400 Subject: [PATCH 3/4] CASH-1183: Parity styling fixes --- src/layouts/schedule/schedule.vue | 2 +- src/layouts/schedule/shop-location/shop-location.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 9ba443b46..4a4148818 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -1795,7 +1795,7 @@ export default { font-size: 1.25rem; } -:deep(.funnel-sub-header) { +:deep(.funnel-sub-header:not(.mb-5)) { h5.dark-header { font-weight: 600; font-size: 1rem; diff --git a/src/layouts/schedule/shop-location/shop-location.vue b/src/layouts/schedule/shop-location/shop-location.vue index 111b1a69b..33ec097e8 100644 --- a/src/layouts/schedule/shop-location/shop-location.vue +++ b/src/layouts/schedule/shop-location/shop-location.vue @@ -107,13 +107,14 @@ export default { width: fit-content; background-color: $blue; border-radius: $border-radius-pill; - padding: 0.75rem 3rem; a { + display: inline-block; text-decoration: none; color: $white; font-weight: $font-weight-600; line-height: 1.5rem; + padding: 0.75rem 3rem; } } } From 622d3fe598f597ed19345e88f29efa0446461aea Mon Sep 17 00:00:00 2001 From: CarlNation Date: Mon, 11 Aug 2025 16:29:04 -0400 Subject: [PATCH 4/4] Always log --- src/mixins/analytics-mixin.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js index 72ede2538..d8010b267 100644 --- a/src/mixins/analytics-mixin.js +++ b/src/mixins/analytics-mixin.js @@ -133,15 +133,6 @@ export default { const currentPageName = getPageNameFromRouter(); const universes = store.getters.applicationUser.experiments; - let hasDynamoLogging = experimentMixin.methods.hasSettingEqualTo( - experimentSettings.DYNAMO_LOGGING, - "true", - universes - ); - if (!hasDynamoLogging) { - return; - } - const variationNames = universes .filter((item) => item.universeName === experimentUniverses.CONCEPT_FUNNEL) .map((item) => item.variationName)