Merge branch 'release/2026.01.15' into feature/CASH-2114

src/digital-components/date-picker/date-picker.vue

@@ -281,7 +281,7 @@ export default {
             if (event.screenX === 0 && event.screenY === 0) {
                 return;
             }
-            this.$emit("date-selected", date);
+            this.$emit("date-clicked", date);
         },
         getWeekStartDate(dateString) {
             const date = convertDateStringToDate(dateString);
@@ -846,6 +846,12 @@ 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,

src/layouts/schedule/schedule.vue

@@ -22,7 +22,6 @@
                         cmsWidgetName="ScheduleYourServiceWidget"
                         id="schedule-your-service" />
                     <appointmentTypeQuestion
-                        v-if="hasSelectableDatesLoaded"
                         v-model="appointmentTypeFromAppointmentTypeQuestion"
                         v-show="isAppointmentTypeDisplayed"
                         :isServiceableMobile="isServiceableMobile"
@@ -134,6 +133,8 @@
                             :isOvernightDropoff="isOvernightDropoff" />
                     </div>
                     <datePicker
+                        :currentZip="zipCode"
+                        :currentProviderNumber="selectedProvider?.providerNumber"
                         v-show="appointmentType"
                         customComponentId="dateQuestion"
                         selectableDatesSetting="custom"
@@ -143,7 +144,7 @@
                         class="text-link-small"
                         :getMoreDatesCallback="getMoreScheduleData"
                         validationRules="date-required"
-                        @date-selected="handleDateSelected"
+                        @date-clicked="handleDateClicked"
                         :pricingByDayBasePrice="pricingByDayBasePrice"
                         :pricingByDayUpcharge="pricingByDayUpcharge"
                         :showPricingByDay="showPricingByDay"
@@ -639,12 +640,12 @@ export default {
         showTimeSlotQuestion() {
             if (
                 this.selectedDate &&
-                this.appointmentTypeFromAppointmentTypeQuestion &&
+                this.selectedDate.includes("mobile") &&
-                this.timeSlotsForSelectedDate
+                !this.isMobileSelected
             ) {
-                return true;
+                this.setSelectedDateToFirstAvailable();
             }
-            return false;
+            return this.selectedDate && this.appointmentTypeFromAppointmentTypeQuestion;
         },
         isMobileStaticRecalibrationApplicable() {
             return (
@@ -872,13 +873,6 @@ export default {
                 ? this.$refs.mobileFirstModal?.getIsModalOpen()
                 : false;
         },
-        hasSelectableDatesLoaded() {
-            if (this.isMobileSelected) {
-                return this.selectableDatesMobile?.days?.length > 0;
-            } else {
-                return this.selectableDatesInshop?.days?.length > 0;
-            }
-        },
     },
     methods: {
         splitCopyOnCMSPlaceHolder,
@@ -1140,6 +1134,29 @@ export default {
                 );
             }
         },
+        getTimeSlotInfo() {
+            // Get the current date
+            const currentDate = getTodayDate();
+
+            // Add 10 days to the current date
+            currentDate.setDate(currentDate.getDate() + 10);
+
+            // Format the date as yyyy-mm-dd
+            const year = currentDate.getFullYear();
+            const month = String(currentDate.getMonth() + 1).padStart(2, "0");
+            const day = String(currentDate.getDate()).padStart(2, "0");
+
+            const formattedDate = `${year}-${month}-${day}`;
+
+            return {
+                date: formattedDate,
+                endTime: "12:00",
+                jobMaxMinutes: "180",
+                jobMinMinutes: "120",
+                routeCode: "3357I-03357-M-I*20988*AM",
+                startTime: "08:00",
+            };
+        },
         onShopSelected(shopQuestionPopUpData) {
             this.resetWaitlist();
             this.preSelectedDate = null;
@@ -1192,6 +1209,8 @@ export default {
         async initializeDatePicker() {
             this.isShowMobileFirstAppt && this.showLoadingModal();
 
+            this.selectedDate = null;
+
             const includeMobileTimeSlots = this.isServiceableMobile;
             const includeInshopTimeSlots = this.isServiceableInshop || this.isServiceableDropoff;
             const datePickerInitialData = await this.$refs.datePicker.loadInitialData({
@@ -1582,40 +1601,28 @@ export default {
         handleWaitListRequested(value) {
             this.waitListRequested = value;
         },
-        handleDateSelected(date) {
+        handleDateClicked(date) {
-            const previousDate = this.selectedDate;
+            // do something to mark this as upcharge day or not...
-
+            if (date.isPricingByDayUpchargeDay) {
-            // check if date actually changed
+                this.includePricingByDayUpcharge = true;
-            if (previousDate !== date.dateString) {
+            } else {
-                this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
+                this.includePricingByDayUpcharge = false;
-                this.updateFooterButtonText(this.selectedTimeSlotInfo);
             }
-
-            // TODO: REMOVE AS PART OF CASH-1634
-            // // do something to mark this as upcharge day or not...
-            // if (date.isPricingByDayUpchargeDay) {
-            //     this.includePricingByDayUpcharge = true;
-            // } else {
-            //     this.includePricingByDayUpcharge = false;
-            // }
-        },
-        getEmptyTimeSlot() {
-            return {
-                timeSlot: {
-                    date: null,
-                    routeCode: null,
-                    startTime: null,
-                    endTime: null,
-                    jobMaxMinutes: null,
-                    jobMinMinutes: null,
-                },
-                isPremiumAppointment: null,
-            };
         },
         updateTimeSlot(timeSlotObj) {
             if (!timeSlotObj?.routeCode) {
                 this.appointmentType = AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF;
-                this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
+                this.selectedTimeSlotInfo = {
+                    timeSlot: {
+                        date: null,
+                        routeCode: null,
+                        startTime: null,
+                        endTime: null,
+                        jobMaxMinutes: null,
+                        jobMinMinutes: null,
+                    },
+                    isPremiumAppointment: null,
+                };
                 return;
             }
             const timeSlot = this.timeSlotsForSelectedDate?.timeSlots?.find(
@@ -1714,9 +1721,6 @@ export default {
         },
         handleAppointmentTypeChange(newAppointmentType) {
             this.updateFooterButtonText();
-            // if time appointment type changes, clear any selected time slot
-            this.selectedTimeSlotInfo = this.getEmptyTimeSlot();
-
             if (newAppointmentType === AppointmentTypeStrings.MOBILE) {
                 // Remember last shop selected if previous selection was inshop/dropoff
                 if (
@@ -1725,6 +1729,17 @@ export default {
                         AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF) &&
                     this.selectedProvider
                 ) {
+                    this.selectedTimeSlotInfo = {
+                        timeSlot: {
+                            date: null,
+                            routeCode: null,
+                            startTime: null,
+                            endTime: null,
+                            jobMaxMinutes: null,
+                            jobMinMinutes: null,
+                        },
+                        isPremiumAppointment: null,
+                    };
                     this.lastSelectedInshopOrDropoffProvider = this.selectedProvider;
                 }
                 this.appointmentType = AppointmentTypeStrings.MOBILE;
@@ -1751,8 +1766,8 @@ export default {
             } else {
                 this.appointmentType = null;
             }
-            this.setSelectedDateToFirstAvailable(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
+            this.setSelectedDateToFirstAvailable();
-            this.setDisplayWaitList(); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
+            this.setDisplayWaitList();
         },
         setSelectedDateToFirstAvailable() {
             this.selectedDate = this.getFirstAvailableDate();
@@ -1884,9 +1899,35 @@ export default {
     watch: {
         appointmentTypeFromAppointmentTypeQuestion: {
             handler(newValue, oldValue) {
-                this.handleAppointmentTypeChange(newValue); // v-if on appointmentTypeQuestion ensures dates have been loaded by now
+                this.handleAppointmentTypeChange(newValue);
             },
         },
+        selectedDate(newValue, oldValue) {
+            // Clear time slot selection if date selected changes
+            const selectedDate = this.getSelectedDateFromStore();
+            if (oldValue && this.appointmentType === AppointmentTypeStrings.MOBILE) {
+                oldValue = `${oldValue}-mobile`;
+            }
+            const hasValueChanged = newValue !== oldValue;
+            const isDateDifferent = (newValue || oldValue) !== selectedDate;
+
+            if (hasValueChanged && isDateDifferent && !this.selectedMobileFirstAppointment) {
+                this.selectedTimeSlotInfo = {
+                    timeSlot: {
+                        date: null,
+                        routeCode: null,
+                        startTime: null,
+                        endTime: null,
+                        jobMaxMinutes: null,
+                        jobMinMinutes: null,
+                    },
+                    isPremiumAppointment: null,
+                };
+            }
+        },
+        selectedTimeSlotInfo(newValue) {
+            this.updateFooterButtonText(newValue);
+        },
     },
     components: {
         funnelHeader,
@@ -1899,6 +1940,7 @@ export default {
         textBlock,
         timeSlotQuestion,
         mobileFirstModal,
+
         alert,
         serviceZipModalQuestion,
         appointmentTypeQuestion,

src/layouts/schedule/time-slot-question/time-slot-question.vue

@@ -1,7 +1,6 @@
 <template>
     <div class="time-slots-question">
         <buttonQuestion
-            ref="chooseDropOffOrInshop"
             v-if="isDropOffAppointmentAvailable"
             v-model="selectedAnswerForDropOffOrInshop"
             @update:modelValue="dropOffSelectionChanged"
@@ -24,9 +23,8 @@
             </div>
         </buttonQuestion>
         <buttonQuestion
-            ref="chooseTimeSlot"
+            ref="buttonQuestion"
-            v-if="displayTimeSlotQuestion"
+            v-if="shouldDisplayTimeSlotQuestion"
-            v-model="selectedAnswerForTimeSlots"
             @update:modelValue="timeSlotSelectionChanged"
             buttonTypeString="timeSlotModalListButton"
             :buttonTypeObject="timeSlotModalListButton"
@@ -36,12 +34,10 @@
                 isInshopOrDropOffAppointment ? 'is-inshop-or-drop-off-appointment' : '',
             ]"
             :answers="availableTimeSlots"
-            :lazyLoad="{
+            :lazyLoad="{ isLazyLoad: !isMobileAppointment, amountToLoad: 10 }"
-                isLazyLoad: !isMobileAppointment && !selectedAnswerForTimeSlots,
-                amountToLoad: 10,
-            }"
             groupName="chooseTimeSlot"
             textPosition="text-center"
+            v-model="selectedAnswerForTimeSlots"
             questionText="Available times:"
             isRequired
             validationRules="time-slot-required" />
@@ -393,7 +389,7 @@ export default {
                 this.answersForDropOffQuestion[0].value !== PICK_A_TIME_BUTTON_VALUE
             );
         },
-        displayTimeSlotQuestion() {
+        shouldDisplayTimeSlotQuestion() {
             return (
                 this.selectedAnswerForDropOffOrInshop == PICK_A_TIME_BUTTON_VALUE ||
                 !this.isDropOffAppointmentAvailable

src/layouts/service-location/appointment-type-question/appointment-type-question.vue

@@ -80,7 +80,6 @@ export default {
             },
             set: function (newValue) {
                 this.$emit("update:modelValue", newValue);
-                this.$emit("handle-appointment-type-change", newValue);
             },
         },
         isMobileOnly() {