From b5562ee714b7187cf204e7f1daee235786c6f615 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Thu, 10 Jul 2025 15:06:50 -0400 Subject: [PATCH 1/4] CASH-816 CASH-816 fix for issues with 816,updating watcher for now, but can try to use a different approach for refactoring. added in css from before --- src/layouts/schedule/schedule.vue | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 809c2d069..24db46594 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -422,6 +422,7 @@ export default { navigatingForward: false, isMobileAddressValid: true, shopListButton: shopListButton, + lastInshopProvider: null, }; }, async beforeRouteEnter(to, from, next) { @@ -1601,11 +1602,28 @@ export default { appointmentType: { handler(newValue, oldValue) { if (newValue === AppointmentTypeStrings.MOBILE) { + const providerExists = this.shopProviderData.shopProviders.some( + (p) => p.providerNumber === this.selectedProvider?.providerNumber + ); + if (providerExists) { + this.lastInshopProvider = this.selectedProvider; + } this.selectedProvider = new Provider( this.shopProviderData.mobileProviderNumber ); this.isMobileSelected = true; - } else { + } + else if(newValue === AppointmentTypeStrings.DROP_OFF || newValue === AppointmentTypeStrings.IN_SHOP || newValue === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF) { + const providerExists = this.shopProviderData.shopProviders.some( + (p) => p.providerNumber === this.selectedProvider?.providerNumber + ); + if (providerExists) { + this.selectedProvider = this.lastInshopProvider; + } else { + this.selectedProvider = this.shopProviderData.shopProviders[0] + } + } + else { this.selectedProvider = this.shopProviderData.shopProviders[0]; } }, @@ -1707,4 +1725,8 @@ export default { } } } +.shop-question-button .list-button-content { + background: $blue-100; + box-shadow: 0 0 0 1px $primary; +} From 2c1bbff8af44d93910b0e772c94eb155d6793915 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Thu, 10 Jul 2025 15:17:55 -0400 Subject: [PATCH 2/4] CASH-816 formatting --- src/layouts/schedule/schedule.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 24db46594..26f1e7ad7 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -1612,18 +1612,20 @@ export default { this.shopProviderData.mobileProviderNumber ); this.isMobileSelected = true; - } - else if(newValue === AppointmentTypeStrings.DROP_OFF || newValue === AppointmentTypeStrings.IN_SHOP || newValue === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF) { + } else if ( + newValue === AppointmentTypeStrings.DROP_OFF || + newValue === AppointmentTypeStrings.IN_SHOP || + newValue === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF + ) { const providerExists = this.shopProviderData.shopProviders.some( (p) => p.providerNumber === this.selectedProvider?.providerNumber ); if (providerExists) { this.selectedProvider = this.lastInshopProvider; } else { - this.selectedProvider = this.shopProviderData.shopProviders[0] + this.selectedProvider = this.shopProviderData.shopProviders[0]; } - } - else { + } else { this.selectedProvider = this.shopProviderData.shopProviders[0]; } }, From 835cfb01ac56b05afb053123f9eadccf4b9f4a39 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Fri, 11 Jul 2025 09:23:55 -0400 Subject: [PATCH 3/4] CASH-818 defect fixes for CASH-1149 and CASH-1154 --- src/layouts/schedule/schedule.vue | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index bede93c4e..675b54e2e 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -119,6 +119,7 @@ @update:modelValue="onShopModelUpdated" @updated-zipcode-ctu="setZipcodeCtu" @update-shop-provider-data="shopProviderData = $event" + @updated-contains-military-base="setContainsMilitaryBase" :zipCode="zipCode" :isDisplayed="isShopQuestionDisplayed" cmsWidgetName="YourSafeliteShopWidget" /> @@ -1607,35 +1608,15 @@ export default { appointmentType: { handler(newValue, oldValue) { if (newValue === AppointmentTypeStrings.MOBILE) { - const providerExists = this.shopProviderData.shopProviders.some( - (p) => p.providerNumber === this.selectedProvider?.providerNumber - ); - if (providerExists) { - this.lastInshopProvider = this.selectedProvider; - } this.selectedProvider = new Provider( this.shopProviderData.mobileProviderNumber ); this.isMobileSelected = true; - } else if ( - newValue === AppointmentTypeStrings.DROP_OFF || - newValue === AppointmentTypeStrings.IN_SHOP || - newValue === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF - ) { - const providerExists = this.shopProviderData.shopProviders.some( - (p) => p.providerNumber === this.selectedProvider?.providerNumber - ); - if (providerExists) { - this.selectedProvider = this.lastInshopProvider; - } else { - this.selectedProvider = this.shopProviderData.shopProviders[0]; - } } else { this.selectedProvider = this.shopProviderData.shopProviders[0]; } }, }, - appointmentTypeFromAppointmentTypeQuestion: { handler(newValue, oldValue) { if (newValue === AppointmentTypeStrings.MOBILE) { From 72ae9ae2abd1eace5c27e344fd792e5623384f58 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Fri, 11 Jul 2025 09:26:57 -0400 Subject: [PATCH 4/4] CASH-818 removing unused data property not being used for this PR --- src/layouts/schedule/schedule.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index c861035f2..56c18da12 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -428,7 +428,6 @@ export default { navigatingForward: false, isMobileAddressValid: true, shopListButton: shopListButton, - lastInshopProvider: null, }; }, async beforeRouteEnter(to, from, next) {