From b3e243585a2f988d9366147adbfeb37250e5e6ed Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Mon, 15 Dec 2025 13:49:24 -0500 Subject: [PATCH 1/3] CASH-1953 Attempt to correct possible provider number bug for shop-time-slots --- src/digital-components/date-picker/date-picker.vue | 2 +- src/layouts/schedule/schedule.vue | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index 9d620ec77..42e24adf2 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -466,7 +466,7 @@ export default { const response = config.getSelectableDatesCallback({ startDateString: initialViewStartDate, endDateString: initialViewEndDate, - providerNumber: config.providerNumber, + inshopProviderNumber: config.inshopProviderNumber, // TODO FOR CASH-1953 zipCode: config.zipCode, includeMobileTimeSlots: config.includeMobileTimeSlots, includeInshopTimeSlots: config.includeInshopTimeSlots, diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index bee86a537..a99c0b36a 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -285,6 +285,7 @@ const getScheduleApiResponse = async ({ startDateString, endDateString, providerNumber, + inshopProviderNumber, // TODO FOR CASH-1953 zipCode, includeMobileTimeSlots = true, includeInshopTimeSlots = true, @@ -327,7 +328,7 @@ const getScheduleApiResponse = async ({ startDate: apiStartDate, endDate: apiEndDate, shopAppointmentType: "InshopOrDropoff", - providerNumber: providerNumber, + providerNumber: inshopProviderNumber, // TODO FOR CASH-1953 }, }; if (apiStartDate < apiEndDate) { @@ -631,6 +632,9 @@ export default { return this.isGlassServiceableMobile; } }, + closestInshopProviderNumber() { // TODO FOR CASH-1953 + return this.shopProviderData?.shopProviders[0]?.providerNumber; + }, showTimeSlotQuestion() { if ( this.selectedDate && @@ -1158,6 +1162,7 @@ export default { startDateString: startDate, endDateString: endDate, providerNumber: this.selectedProvider?.providerNumber, + inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber, // TODO FOR CASH-1953 zipCode: this.zipCode, includeMobileTimeSlots: this.isServiceableMobile, includeInshopTimeSlots: this.isServiceableInshop || this.isServiceableDropoff, @@ -1186,6 +1191,7 @@ export default { getSelectableDatesCallback: getScheduleApiResponse, preSelectedDate: this.preSelectedDate, providerNumber: this.selectedProvider?.providerNumber, + inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber, // TODO FOR CASH-1953 zipCode: this.zipCode, includeMobileTimeSlots: includeMobileTimeSlots, includeInshopTimeSlots: includeInshopTimeSlots, From 9a613de8a3f81fe56dd5574a5b324fab79566991 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Tue, 23 Dec 2025 11:34:56 -0500 Subject: [PATCH 2/3] CACH-1953: remove comments --- src/digital-components/date-picker/date-picker.vue | 2 +- src/layouts/schedule/schedule.vue | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index 42e24adf2..f38df0372 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -466,7 +466,7 @@ export default { const response = config.getSelectableDatesCallback({ startDateString: initialViewStartDate, endDateString: initialViewEndDate, - inshopProviderNumber: config.inshopProviderNumber, // TODO FOR CASH-1953 + inshopProviderNumber: config.inshopProviderNumber, zipCode: config.zipCode, includeMobileTimeSlots: config.includeMobileTimeSlots, includeInshopTimeSlots: config.includeInshopTimeSlots, diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index b6809795a..2fbaf4610 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -285,7 +285,7 @@ const getScheduleApiResponse = async ({ startDateString, endDateString, providerNumber, - inshopProviderNumber, // TODO FOR CASH-1953 + inshopProviderNumber, zipCode, includeMobileTimeSlots = true, includeInshopTimeSlots = true, @@ -328,7 +328,7 @@ const getScheduleApiResponse = async ({ startDate: apiStartDate, endDate: apiEndDate, shopAppointmentType: "InshopOrDropoff", - providerNumber: inshopProviderNumber, // TODO FOR CASH-1953 + providerNumber: inshopProviderNumber, }, }; if (apiStartDate < apiEndDate) { @@ -632,7 +632,7 @@ export default { return this.isGlassServiceableMobile; } }, - closestInshopProviderNumber() { // TODO FOR CASH-1953 + closestInshopProviderNumber() { return this.shopProviderData?.shopProviders[0]?.providerNumber; }, showTimeSlotQuestion() { @@ -1162,7 +1162,7 @@ export default { startDateString: startDate, endDateString: endDate, providerNumber: this.selectedProvider?.providerNumber, - inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber, // TODO FOR CASH-1953 + inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber, zipCode: this.zipCode, includeMobileTimeSlots: this.isServiceableMobile, includeInshopTimeSlots: this.isServiceableInshop || this.isServiceableDropoff, @@ -1191,7 +1191,7 @@ export default { getSelectableDatesCallback: getScheduleApiResponse, preSelectedDate: this.preSelectedDate, providerNumber: this.selectedProvider?.providerNumber, - inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber, // TODO FOR CASH-1953 + inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber, zipCode: this.zipCode, includeMobileTimeSlots: includeMobileTimeSlots, includeInshopTimeSlots: includeInshopTimeSlots, From 2590a1739c9294d03b9c4f74a6cb52fba18c362a Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Tue, 23 Dec 2025 17:20:41 -0500 Subject: [PATCH 3/3] CASH-1953: prettier --- src/layouts/schedule/schedule.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 2fbaf4610..5f5b87969 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -1162,7 +1162,9 @@ export default { startDateString: startDate, endDateString: endDate, providerNumber: this.selectedProvider?.providerNumber, - inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber, + inshopProviderNumber: this.isMobileSelected + ? this.closestInshopProviderNumber + : this.selectedProvider?.providerNumber, zipCode: this.zipCode, includeMobileTimeSlots: this.isServiceableMobile, includeInshopTimeSlots: this.isServiceableInshop || this.isServiceableDropoff, @@ -1191,7 +1193,9 @@ export default { getSelectableDatesCallback: getScheduleApiResponse, preSelectedDate: this.preSelectedDate, providerNumber: this.selectedProvider?.providerNumber, - inshopProviderNumber: this.isMobileSelected ? this.closestInshopProviderNumber : this.selectedProvider?.providerNumber, + inshopProviderNumber: this.isMobileSelected + ? this.closestInshopProviderNumber + : this.selectedProvider?.providerNumber, zipCode: this.zipCode, includeMobileTimeSlots: includeMobileTimeSlots, includeInshopTimeSlots: includeInshopTimeSlots,