From 9c4d2daa3ecc90cda38995353739ca1eac03dd39 Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Wed, 31 Dec 2025 17:04:33 -0500 Subject: [PATCH 1/8] CASH-1315: move all today getters into helper --- src/digital-components/date-picker/date-picker.vue | 5 +++-- src/layouts/schedule/helpers/schedule-helper.js | 8 ++++++++ src/layouts/schedule/schedule.vue | 9 +++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index cbaba9193..b77e90e3e 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -150,6 +150,7 @@ import { import { convertDateToDateString, convertDateStringToDate, + getTodayDateString, } from "@/layouts/schedule/helpers/schedule-helper"; import { useField, ErrorMessage } from "vee-validate"; import { deepClone } from "@/helpers/object-helper"; @@ -227,7 +228,7 @@ export default { }, computed: { todayString() { - return this.todayOverrideDateString || convertDateToDateString(new Date()); + return this.todayOverrideDateString || getTodayDateString(); }, todayDayIndex() { return convertDateStringToDate(this.todayString).getDay(); @@ -414,7 +415,7 @@ export default { } else if (config.todayOverrideDateString) { todayDateString = config.todayOverrideDateString; } else { - todayDateString = convertDateToDateString(new Date()); + todayDateString = getTodayDateString(); } if (config.selectableDatesSetting === "past") calendarViewDirection = "past"; if (config.selectableDatesSetting === "custom") calendarViewDirection = "future"; diff --git a/src/layouts/schedule/helpers/schedule-helper.js b/src/layouts/schedule/helpers/schedule-helper.js index 41a1cd66a..85df8aa43 100644 --- a/src/layouts/schedule/helpers/schedule-helper.js +++ b/src/layouts/schedule/helpers/schedule-helper.js @@ -71,3 +71,11 @@ export function isDropOffRouteCode(routeCode) { routeCode.includes(RouteCodeFlags.OVERNIGHT_DROP_OFF) ); } + +export function getTodayDate(routeCode) { + return new Date(); +} + +export function getTodayDateString(routeCode) { + return convertDateToDateString(getTodayDate()); +} diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index af7e67bd0..01b9841c0 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -233,6 +233,7 @@ import { convertDateStringToDate, sumDateString, isDropOffRouteCode, + getTodayDate, } from "@/layouts/schedule/helpers/schedule-helper"; import { DAYS_OF_WEEK } from "@/digital-components/date-picker/mixins/constants"; @@ -826,7 +827,7 @@ export default { } }, isSameDay() { - const todaysDate = new Date().toISOString().split("T")[0]; + const todaysDate = getTodayDate().toISOString().split("T")[0]; return this.selectedDate === todaysDate; }, isOvernightDropoff() { @@ -1100,7 +1101,7 @@ export default { }, getTimeSlotInfo() { // Get the current date - const currentDate = new Date(); + const currentDate = getTodayDate(); // Add 10 days to the current date currentDate.setDate(currentDate.getDate() + 10); @@ -1403,7 +1404,7 @@ export default { const type = store.getters.isMobileAppointment ? "mobile" : "inshop"; gaLabel = `${status}_${type}`; - const currentDate = new Date(); + const currentDate = getTodayDate(); const dateString = this.isMobileSelected ? this.selectableDatesMobile.days[0].date : this.selectableDatesInshop.days[0].date; @@ -1477,7 +1478,7 @@ export default { ) { const [year, month, day] = dateString.split("-").map(Number); const targetDate = new Date(year, month - 1, day); - const currentDate = new Date(); + const currentDate = getTodayDate(); const futureDate = new Date(currentDate); const experimentThresholdDays = experimentMixin.methods.hasSetting( experimentSettings.WAITLIST_THRESHOLD_DAYS From f2322450781b679a753dc5be8177de75ee04b568 Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Wed, 31 Dec 2025 17:13:20 -0500 Subject: [PATCH 2/8] CASH-1315: ensure that date picker selects first available date once loaded --- .../date-picker/date-picker.vue | 17 +++++ src/layouts/schedule/schedule.vue | 72 +++++++------------ 2 files changed, 42 insertions(+), 47 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index b77e90e3e..3f9b1f668 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -200,6 +200,7 @@ export default { pricingByDayUpcharge: Number, isPricingByDayExperiment: Boolean, isMobileSelected: Boolean, + isLoadingDates: Boolean, }, setup(props) { const uuid = uuidv4(); @@ -260,6 +261,15 @@ export default { this.dispatchStoreAction(this.storeActions.SAVE_WAITLIST_REQUESTED, false, false); }, }, + firstAvailableSelectableDate() { + const mobileFirstDate = Array.isArray(this.selectableDatesMobile) + ? this.selectableDatesMobile[0]?.date + : null; + const inshopFirstDate = Array.isArray(this.selectableDatesInshop) + ? this.selectableDatesInshop[0]?.date + : null; + return this.isMobileSelected ? mobileFirstDate + "-mobile" : inshopFirstDate; + }, }, methods: { async initializeComponent(initialData) { @@ -835,6 +845,13 @@ export default { }, }, watch: { + isLoadingDates(newValue) { + // if done loading dates, then set to first available date + if (newValue === false && this.firstAvailableSelectableDate) { + this.selectedDate = this.firstAvailableSelectableDate; + } + }, + modelValue(newValue) { this.resetField({ value: newValue, diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 01b9841c0..178a15d7b 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -134,6 +134,7 @@ selectableDatesSetting="custom" ref="datePicker" v-model="selectedDate" + :isLoadingDates="isLoadingDates" :isMobileSelected="isMobileSelected" class="text-link-small" :getMoreDatesCallback="getMoreScheduleData" @@ -332,12 +333,16 @@ const getScheduleApiResponse = async ({ const mobileTimeSlotsData = { days: [], }; - function compareDayStrings(a, b) { if (a.date < b.date) return -1; if (a.date > b.date) return 1; return 0; } + function removePastDates(array, todaysDate) { + return array.filter(function (a) { + return !(a.date < todaysDate); + }); + } const makeParallelCalls = async () => { await Promise.all( @@ -390,6 +395,10 @@ const getScheduleApiResponse = async ({ inshopTimeSlotsData.days.sort(compareDayStrings); mobileTimeSlotsData.days.sort(compareDayStrings); + const todaysDate = getTodayDate().toISOString().split("T")[0]; + inshopTimeSlotsData.days = removePastDates(inshopTimeSlotsData.days, todaysDate); + mobileTimeSlotsData.days = removePastDates(mobileTimeSlotsData.days, todaysDate); + return { inshopTimeSlotsData: inshopTimeSlotsData, mobileTimeSlotsData: mobileTimeSlotsData, @@ -423,7 +432,7 @@ export default { selectableDatesInshop: [], selectableDatesMobile: [], preSelectedDate: null, - + isLoadingDates: true, streetAddress: this.getServiceAddressFromStore(), apartmentNumberOrBusinessName: this.getServiceAddress2FromStore(), carId: this.getCarIdfromStore(), @@ -613,7 +622,7 @@ export default { this.selectedDate.includes("mobile") && !this.isMobileSelected ) { - this.getNewSelectedDate(); + this.setSelectedDateToFirstAvailable(); } return this.selectedDate && this.appointmentTypeFromAppointmentTypeQuestion; }, @@ -1180,45 +1189,24 @@ export default { datePickerInitialData.pricingByDayUpcharge = this.pricingByDayUpcharge; await this.$refs.datePicker.initializeComponent(datePickerInitialData); this.selectableDatesInshop = - datePickerInitialData.initialShopTimeSlotsResponse.inshopTimeSlotsData; + await datePickerInitialData.initialShopTimeSlotsResponse.inshopTimeSlotsData; this.selectableDatesMobile = - datePickerInitialData.initialShopTimeSlotsResponse.mobileTimeSlotsData; + await datePickerInitialData.initialShopTimeSlotsResponse.mobileTimeSlotsData; this.setDisplayWaitList(); - if (this.preSelectedDate) this.selectedDate = this.preSelectedDate; - - if (!this.preSelectedDate) { - // if no date is preselected on load, then select the first available - let selectedDateMobile = this.getSelectedDateForMobile(); - let selectedDateInshop = this.getSelectedDateForInshop(); - - // if there is still no selected date, then load more and try again + if (this.preSelectedDate) { + this.selectedDate = this.preSelectedDate; + } else { + // if no date is preselected on load, make sure there are some dates available if ( - (this.isServiceableMobile && !selectedDateMobile) || - (this.isServiceableInshop && !selectedDateInshop) || - (this.isServiceableDropoff && !selectedDateInshop) + this.selectableDatesInshop.days.length < 1 || + this.selectableDatesMobile.days.length < 1 ) { await this.$nextTick(); await this.$refs.datePicker.showAnotherMonth(); - - // update all dates - - // > CHLOE HERD 7/22 -- CASH-1207 - // > Do not update the available dates again here; - // > they have already been updated by `showAnotherMonth`. - // > Doing so will likely add or remove dates, - // > desyncing the schedule page and the date-picker. - + this.isLoadingDates = false; this.setDisplayWaitList(); } - - await this.$nextTick(); - - if (this.isMobileSelected) { - this.selectedDate = this.getSelectedDateForMobile(); - } else { - this.selectedDate = this.getSelectedDateForInshop(); - } } }, getScheduleApiResponse, @@ -1623,7 +1611,7 @@ export default { ? AppointmentTypeStrings.DROP_OFF : AppointmentTypeStrings.IN_SHOP; }, - getSelectedDate() { + getFirstAvailableDate() { let dateToSelect; if (this.isMobileSelected) { dateToSelect = returnFirstDate(this.selectableDatesMobile); @@ -1633,16 +1621,6 @@ export default { if (!dateToSelect) return null; return this.isMobileSelected ? dateToSelect + "-mobile" : dateToSelect; }, - getSelectedDateForMobile() { - let dateToSelect = returnFirstDate(this.selectableDatesMobile); - if (!dateToSelect) return null; - return dateToSelect + "-mobile"; - }, - getSelectedDateForInshop() { - let dateToSelect = returnFirstDate(this.selectableDatesInshop); - if (!dateToSelect) return null; - return dateToSelect; - }, resetSelectedProvider() { this.selectedProvider = new Provider(); this.updateSelectedProvider(); @@ -1741,11 +1719,11 @@ export default { } else { this.appointmentType = null; } - this.selectedDate = this.getSelectedDate(); + this.setSelectedDateToFirstAvailable(); this.setDisplayWaitList(); }, - getNewSelectedDate() { - this.selectedDate = this.getSelectedDate(); + setSelectedDateToFirstAvailable() { + this.selectedDate = this.getFirstAvailableDate(); }, }, watch: { From cfc36ca247c4d4c2e88c48941c4e76f304e32665 Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Wed, 31 Dec 2025 18:31:32 -0500 Subject: [PATCH 3/8] CASH-1315: remove redundent isLoading check --- src/digital-components/date-picker/date-picker.vue | 4 +--- src/layouts/schedule/schedule.vue | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index 3f9b1f668..a531244a5 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -200,7 +200,6 @@ export default { pricingByDayUpcharge: Number, isPricingByDayExperiment: Boolean, isMobileSelected: Boolean, - isLoadingDates: Boolean, }, setup(props) { const uuid = uuidv4(); @@ -845,13 +844,12 @@ export default { }, }, watch: { - isLoadingDates(newValue) { + isLoading(newValue) { // if done loading dates, then set to first available date if (newValue === false && this.firstAvailableSelectableDate) { this.selectedDate = this.firstAvailableSelectableDate; } }, - modelValue(newValue) { this.resetField({ value: newValue, diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 178a15d7b..7c9d9f444 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -134,7 +134,6 @@ selectableDatesSetting="custom" ref="datePicker" v-model="selectedDate" - :isLoadingDates="isLoadingDates" :isMobileSelected="isMobileSelected" class="text-link-small" :getMoreDatesCallback="getMoreScheduleData" @@ -432,7 +431,6 @@ export default { selectableDatesInshop: [], selectableDatesMobile: [], preSelectedDate: null, - isLoadingDates: true, streetAddress: this.getServiceAddressFromStore(), apartmentNumberOrBusinessName: this.getServiceAddress2FromStore(), carId: this.getCarIdfromStore(), @@ -1204,7 +1202,6 @@ export default { ) { await this.$nextTick(); await this.$refs.datePicker.showAnotherMonth(); - this.isLoadingDates = false; this.setDisplayWaitList(); } } From 4b65a9ddb3119b9785c95a03727cf6964693a0c3 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Tue, 14 Oct 2025 08:37:10 -0400 Subject: [PATCH 4/8] CASH-1426 CASH-1426 use a part number (DISCOUNT) that exists on mainframe IPF file so that work order submission does not fail in ESL. --- src/helpers/promotions-helper.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/helpers/promotions-helper.js b/src/helpers/promotions-helper.js index b9e3327b6..57e3dc7e7 100644 --- a/src/helpers/promotions-helper.js +++ b/src/helpers/promotions-helper.js @@ -6,7 +6,11 @@ import baseMixin from "@/mixins/base-mixin.js"; export const promoPartNumberStrings = { WIPER_DISCOUNT_PART_NUMBER: "WIPER DISCOUNT", +<<<<<<< HEAD RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISC RAIN DEFEN", +======= + RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISCOUNT", +>>>>>>> 2730b0650 (CASH-1426) GLASS_DISCOUNT_PART_NUMBER: "DISCOUNT", GLASS_CLEANER_DISCOUNT_PART_NUMBER: "DISC GLASS CLN", }; From 63b3ef642f8b4ef0ce89317f619d26eae9cbe2a2 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Sun, 19 Oct 2025 10:31:00 -0400 Subject: [PATCH 5/8] CASH-1426 CASH-1426 use correct part number for rain repel discount. rain defen is the actual part number on the part file. --- src/helpers/promotions-helper.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/helpers/promotions-helper.js b/src/helpers/promotions-helper.js index 57e3dc7e7..af93af3c9 100644 --- a/src/helpers/promotions-helper.js +++ b/src/helpers/promotions-helper.js @@ -6,11 +6,15 @@ import baseMixin from "@/mixins/base-mixin.js"; export const promoPartNumberStrings = { WIPER_DISCOUNT_PART_NUMBER: "WIPER DISCOUNT", +<<<<<<< HEAD <<<<<<< HEAD RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISC RAIN DEFEN", ======= RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISCOUNT", >>>>>>> 2730b0650 (CASH-1426) +======= + RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISC RAIN DEFEN", +>>>>>>> 3b171fe57 (CASH-1426) GLASS_DISCOUNT_PART_NUMBER: "DISCOUNT", GLASS_CLEANER_DISCOUNT_PART_NUMBER: "DISC GLASS CLN", }; From 222f27ee75350156a417af44cbc788e994fa74e1 Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Mon, 20 Oct 2025 08:25:16 -0400 Subject: [PATCH 6/8] CASH-1315 - fix accidental merge crud --- src/helpers/promotions-helper.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/helpers/promotions-helper.js b/src/helpers/promotions-helper.js index af93af3c9..b9e3327b6 100644 --- a/src/helpers/promotions-helper.js +++ b/src/helpers/promotions-helper.js @@ -6,15 +6,7 @@ import baseMixin from "@/mixins/base-mixin.js"; export const promoPartNumberStrings = { WIPER_DISCOUNT_PART_NUMBER: "WIPER DISCOUNT", -<<<<<<< HEAD -<<<<<<< HEAD RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISC RAIN DEFEN", -======= - RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISCOUNT", ->>>>>>> 2730b0650 (CASH-1426) -======= - RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISC RAIN DEFEN", ->>>>>>> 3b171fe57 (CASH-1426) GLASS_DISCOUNT_PART_NUMBER: "DISCOUNT", GLASS_CLEANER_DISCOUNT_PART_NUMBER: "DISC GLASS CLN", }; From 504a774863e0c7f6411d11b8aa21b448ce4e6a10 Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Mon, 20 Oct 2025 08:48:44 -0400 Subject: [PATCH 7/8] CASH-1315 refactor to avoid null being coerced into a string --- src/digital-components/date-picker/date-picker.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index a531244a5..63449320c 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -267,7 +267,7 @@ export default { const inshopFirstDate = Array.isArray(this.selectableDatesInshop) ? this.selectableDatesInshop[0]?.date : null; - return this.isMobileSelected ? mobileFirstDate + "-mobile" : inshopFirstDate; + return (this.isMobileSelected && mobileFirstDate) ? mobileFirstDate + "-mobile" : inshopFirstDate; }, }, methods: { From efee6aa70aff4c9170acacf1c3dc625f8ef8ffc8 Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Wed, 31 Dec 2025 09:37:39 -0500 Subject: [PATCH 8/8] CASH-1315: refactoring from PR review - remove watch --- .../date-picker/date-picker.vue | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index 63449320c..32fe7f5f3 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -267,7 +267,9 @@ export default { const inshopFirstDate = Array.isArray(this.selectableDatesInshop) ? this.selectableDatesInshop[0]?.date : null; - return (this.isMobileSelected && mobileFirstDate) ? mobileFirstDate + "-mobile" : inshopFirstDate; + return this.isMobileSelected && mobileFirstDate + ? mobileFirstDate + "-mobile" + : inshopFirstDate; }, }, methods: { @@ -540,6 +542,8 @@ export default { } this.months = months; this.isLoading = false; + // if done loading dates, then set to first available date + if (!this.selectedDate) this.selectedDate = this.firstAvailableSelectableDate; if (config.preSelectedDate) { this.$nextTick(() => { @@ -773,6 +777,9 @@ export default { ); this.isLoading = false; + // if done loading dates, then set to first available date + if (!this.selectedDate) this.selectedDate = this.firstAvailableSelectableDate; + this.hideSomeDaysForInitialView = false; // if hid days on initial partial view, this will reveal those days monthToShow.monthClass = monthToShow.monthClass.replace(" month-hidden", ""); this.scrollToElement(monthToShow.monthString); @@ -844,12 +851,6 @@ export default { }, }, watch: { - isLoading(newValue) { - // if done loading dates, then set to first available date - if (newValue === false && this.firstAvailableSelectableDate) { - this.selectedDate = this.firstAvailableSelectableDate; - } - }, modelValue(newValue) { this.resetField({ value: newValue,