From 70abefd5240776ec9c5965191655bc4cc081f760 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Fri, 18 Jul 2025 11:04:05 -0400 Subject: [PATCH 1/6] CASH-1164 | Fix issue where pick a time stayed selected when date change --- src/layouts/schedule/time-slot-question/time-slot-question.vue | 3 ++- 1 file changed, 2 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 d59497703..ee1c8b341 100644 --- a/src/layouts/schedule/time-slot-question/time-slot-question.vue +++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue @@ -544,7 +544,8 @@ export default { }, selectedDate: { handler() { - this.selectedRouteCode = null; + this.selectedAnswerForDropOffOrInshop = null; + this.selectedAnswerForTimeSlots = null; this.autoSelectTimeSlotIfOnlyOneIsAvailable(); }, }, From 143a5b672c66187ce8dd2494b3d38bc0cd822187 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Fri, 18 Jul 2025 11:13:15 -0400 Subject: [PATCH 2/6] CASH-1160 | Fix premium slot display --- src/layouts/schedule/time-slot-question/time-slot-question.vue | 2 +- 1 file changed, 1 insertion(+), 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 d59497703..9642a2d7f 100644 --- a/src/layouts/schedule/time-slot-question/time-slot-question.vue +++ b/src/layouts/schedule/time-slot-question/time-slot-question.vue @@ -222,7 +222,7 @@ export default { }, premiumAppointmentButtonText() { return this.getCmsContent( - this.dropOffOrPickATimeQuestionCmsWidgetName, + this.mobilePremiumCmsWidgetName, cmsWidgetFieldMappings.TIME_SLOT_BUTTON ); }, From caf67637b3466ae5c66cf8af24305a05804b28e1 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Fri, 18 Jul 2025 11:46:14 -0400 Subject: [PATCH 3/6] CASH-1077 CASH-1077 added loader to popup --- .../shop-question/shop-question-popup.vue | 100 +++++++++++------- 1 file changed, 62 insertions(+), 38 deletions(-) diff --git a/src/layouts/service-location/shop-question/shop-question-popup.vue b/src/layouts/service-location/shop-question/shop-question-popup.vue index 84b6f3d3a..3198ca50f 100644 --- a/src/layouts/service-location/shop-question/shop-question-popup.vue +++ b/src/layouts/service-location/shop-question/shop-question-popup.vue @@ -31,43 +31,48 @@ :isRequired="false" :validationRules="''" /> - - -
- -
- +
+ +
+
+ + +
+ +
+ +
@@ -87,6 +92,7 @@ import { defineRule } from "vee-validate"; import { required } from "@/helpers/validation-rules"; import { errorMessages } from "@/constants/error-messages"; import baseMixin from "@/mixins/base-mixin.js"; +import loader from "@/ux-components/loader/loader"; import { AppointmentTypeStrings } from "@/constants/schedule-constants"; @@ -109,6 +115,7 @@ export default { localShopProviderData: this.shopProviderDataFromParent, localSelectedProviderNumber: null, zipCodeData: null, + isLoading: false, }; }, props: { @@ -160,6 +167,7 @@ export default { }, isModalFooterButtonDisabled() { return ( + this.isLoading || this.displayInvalidZipAlert || this.displayNoShopsAlert || !this.localSelectedProviderNumber @@ -248,8 +256,14 @@ export default { this.modal.closeModal(); }, async onSearchZip(event) { + this.isLoading = true; event.preventDefault(); - this.zipCodeData = await this.getZipCodeData(this.localZipCode, "service-location"); + if (this.localZipCode) { + this.zipCodeData = await this.getZipCodeData(this.localZipCode, "service-location"); + } else { + this.zipCodeData = { containsMilitaryBase: false, isServiceable: false, isValid: false, state: "", zipCode: this.localZipCode, zipCodeCtu: "" }; + this.isLoading = false; + } // Add zipCode to zipCodeData as it does not come back from endpoint this.zipCodeData.zipCode = this.localZipCode; if (this.zipCodeData.isValid) { @@ -270,8 +284,11 @@ export default { this.localShopProviderData = result.data; this.numberOfShopsToDisplay = 3; this.updateShopsForZip(); + this.isLoading = false; }); } + } else { + this.isLoading = false; } }, updateShopsForZip() { @@ -317,6 +334,7 @@ export default { serviceZipQuestion, buttonQuestion, alert, + loader, }, }; @@ -444,4 +462,10 @@ export default { display: block; width: 100%; } +.loader-wrapper { + display: flex; + justify-content: center; + align-items: center; + max-width: 100%; +} From d94f5c03f65951eb6e82cb5da578dc735fe52df8 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Fri, 18 Jul 2025 12:08:55 -0400 Subject: [PATCH 4/6] CASH-1077 formatting --- .../shop-question/shop-question-popup.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/layouts/service-location/shop-question/shop-question-popup.vue b/src/layouts/service-location/shop-question/shop-question-popup.vue index fc1b225b7..f6586d444 100644 --- a/src/layouts/service-location/shop-question/shop-question-popup.vue +++ b/src/layouts/service-location/shop-question/shop-question-popup.vue @@ -262,7 +262,14 @@ export default { if (this.localZipCode) { this.zipCodeData = await this.getZipCodeData(this.localZipCode, "service-location"); } else { - this.zipCodeData = { containsMilitaryBase: false, isServiceable: false, isValid: false, state: "", zipCode: this.localZipCode, zipCodeCtu: "" }; + this.zipCodeData = { + containsMilitaryBase: false, + isServiceable: false, + isValid: false, + state: "", + zipCode: this.localZipCode, + zipCodeCtu: "", + }; this.isLoading = false; } // Add zipCode to zipCodeData as it does not come back from endpoint From 339a2343dee38127e0c2d26cb5ade83c0be19f38 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Fri, 18 Jul 2025 12:20:07 -0400 Subject: [PATCH 5/6] CASH-1077 | Remove extra zip call --- .../shop-question/shop-question-popup.vue | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/layouts/service-location/shop-question/shop-question-popup.vue b/src/layouts/service-location/shop-question/shop-question-popup.vue index f6586d444..699452caf 100644 --- a/src/layouts/service-location/shop-question/shop-question-popup.vue +++ b/src/layouts/service-location/shop-question/shop-question-popup.vue @@ -257,21 +257,15 @@ export default { this.modal.closeModal(); }, async onSearchZip(event) { - this.isLoading = true; event.preventDefault(); - if (this.localZipCode) { - this.zipCodeData = await this.getZipCodeData(this.localZipCode, "service-location"); - } else { + if (!this.localZipCode) { this.zipCodeData = { - containsMilitaryBase: false, - isServiceable: false, - isValid: false, - state: "", - zipCode: this.localZipCode, - zipCodeCtu: "", - }; - this.isLoading = false; + isValid: false + } + return; } + this.isLoading = true; + this.zipCodeData = await this.getZipCodeData(this.localZipCode, "service-location"); // Add zipCode to zipCodeData as it does not come back from endpoint this.zipCodeData.zipCode = this.localZipCode; if (this.zipCodeData.isValid) { From 8a2c087e6cf5d8ca6ac3e406c7b74b7f76cb7820 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Fri, 18 Jul 2025 12:25:48 -0400 Subject: [PATCH 6/6] Formatting --- .../service-location/shop-question/shop-question-popup.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layouts/service-location/shop-question/shop-question-popup.vue b/src/layouts/service-location/shop-question/shop-question-popup.vue index 699452caf..a9ca720ad 100644 --- a/src/layouts/service-location/shop-question/shop-question-popup.vue +++ b/src/layouts/service-location/shop-question/shop-question-popup.vue @@ -260,8 +260,8 @@ export default { event.preventDefault(); if (!this.localZipCode) { this.zipCodeData = { - isValid: false - } + isValid: false, + }; return; } this.isLoading = true;