From 4ed29efa3b63f09bf51b69afd2d3026039f52895 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Fri, 25 Jul 2025 09:10:35 -0400 Subject: [PATCH 1/4] CASH-1159 CASH-1159 fixed selected shop from not persisting when switching from mobile back to inshop --- src/layouts/schedule/schedule.vue | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index b43087bff..34b6e91dc 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -425,6 +425,7 @@ export default { shopProviderData: null, navigatingForward: false, shopListButton: shopListButton, + lastInshopProvider: this.getSelectedProviderFromStore() || null, }; }, async beforeRouteEnter(to, from, next) { @@ -1116,6 +1117,13 @@ export default { } else { this.updateSelectedProvider(selectedProvider); } + if ( + this.appointmentType === this.appointmentTypeStrings.IN_SHOP || + this.appointmentType === this.appointmentTypeStrings.DROP_OFF || + this.appointmentType === this.appointmentTypeStrings.IN_SHOP_OR_DROP_OFF + ) { + this.lastInshopProvider = this.selectedProvider; + } }, async getMoreScheduleData(startDate, endDate) { // called only when "View more dates" is clicked; not on initial page load @@ -1605,9 +1613,13 @@ export default { }, }; } else if ( - !this.selectedProvider?.address?.streetAddress && - this.shopProviderData?.shopProviders?.length + (this.appointmentType === this.appointmentTypeStrings.IN_SHOP || + this.appointmentType === this.appointmentTypeStrings.DROP_OFF || + this.appointmentType === this.appointmentTypeStrings.IN_SHOP_OR_DROP_OFF) && + this.lastInshopProvider.address.city ) { + this.selectedProvider = this.lastInshopProvider; + } else { this.selectedProvider = this.shopProviderData.shopProviders[0]; } }, From 095c8aad7b121ce6935631193319f894ce88ff22 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Fri, 25 Jul 2025 09:23:21 -0400 Subject: [PATCH 2/4] CASH-1237 | Fix CTA text for overnight dropoff --- src/layouts/schedule/schedule.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index b43087bff..42ea1b578 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -1246,7 +1246,10 @@ export default { this.appointmentType === AppointmentTypeStrings.DROP_OFF ) { if ( - !timeSlotInfo.timeSlot.routeCode.includes(RouteCodeFlags.ALL_DAY_DROP_OFF) + !timeSlotInfo.timeSlot.routeCode.includes( + RouteCodeFlags.ALL_DAY_DROP_OFF + ) && + !timeSlotInfo.timeSlot.routeCode.includes(RouteCodeFlags.OVERNIGHT_DROP_OFF) ) { navbarButtonText += ` at ${this.getDisplayTextForMilitaryTime( timeSlotInfo.timeSlot.startTime From fb1eb0487a8db417874223be74c50844f14ea293 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Fri, 25 Jul 2025 12:22:03 -0400 Subject: [PATCH 3/4] CASH-1159 CASH-1159 reverting changes for now --- src/layouts/schedule/schedule.vue | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 34b6e91dc..2610eefb3 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -425,7 +425,6 @@ export default { shopProviderData: null, navigatingForward: false, shopListButton: shopListButton, - lastInshopProvider: this.getSelectedProviderFromStore() || null, }; }, async beforeRouteEnter(to, from, next) { @@ -1117,13 +1116,6 @@ export default { } else { this.updateSelectedProvider(selectedProvider); } - if ( - this.appointmentType === this.appointmentTypeStrings.IN_SHOP || - this.appointmentType === this.appointmentTypeStrings.DROP_OFF || - this.appointmentType === this.appointmentTypeStrings.IN_SHOP_OR_DROP_OFF - ) { - this.lastInshopProvider = this.selectedProvider; - } }, async getMoreScheduleData(startDate, endDate) { // called only when "View more dates" is clicked; not on initial page load @@ -1613,15 +1605,11 @@ export default { }, }; } else if ( - (this.appointmentType === this.appointmentTypeStrings.IN_SHOP || - this.appointmentType === this.appointmentTypeStrings.DROP_OFF || - this.appointmentType === this.appointmentTypeStrings.IN_SHOP_OR_DROP_OFF) && - this.lastInshopProvider.address.city + !this.selectedProvider?.address?.streetAddress && + this.shopProviderData?.shopProviders?.length ) { - this.selectedProvider = this.lastInshopProvider; - } else { this.selectedProvider = this.shopProviderData.shopProviders[0]; - } + } }, handleZipCodeChange(newZipCode) { this.resetMobileLocation(); From 0cff68f49a2ad00863ed14fd81f65f826c45af2c Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Fri, 25 Jul 2025 12:27:03 -0400 Subject: [PATCH 4/4] CASH-1159 formatting --- 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 3b2e26a89..42ea1b578 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -1612,7 +1612,7 @@ export default { this.shopProviderData?.shopProviders?.length ) { this.selectedProvider = this.shopProviderData.shopProviders[0]; - } + } }, handleZipCodeChange(newZipCode) { this.resetMobileLocation();