diff --git a/src/layouts/schedule-page/schedule-page.vue b/src/layouts/schedule-page/schedule-page.vue index b0e8e612..99139a0a 100644 --- a/src/layouts/schedule-page/schedule-page.vue +++ b/src/layouts/schedule-page/schedule-page.vue @@ -176,7 +176,7 @@ const getAvailableDates = async ( storeAction.payload.shopAppointmentType, storeAction.payload.providerNumber ); - } else { + } else if (storeAction.payload?.zipCodeOverride) { timeSlotsResponse = await useMainStore().getMobileTimeSlots( storeAction.payload.startDate, storeAction.payload.endDate, @@ -461,7 +461,7 @@ export default { const initialEndDate = new Date(); initialEndDate.setDate(initialEndDate.getDate() + (initialDays - 1)); let initialViewEndDate = convertDateToDateString(initialEndDate); - const preSelectedDate = this.mainStore.order.schedule.date; + const preSelectedDate = this.selectedDate; const endDateObject = this.getEndDateForExistingDate( todayDateObject, @@ -609,12 +609,18 @@ export default { } }, async refreshDatePicker() { + this.resetLocalFlags(); await this.getDatePickerInitialData().then((data) => { this.selectableDatesData = data.initialShopTimeSlotsResponse; this.$refs.datePicker.initializeComponent(data); showIssLoadingModal(false); }); }, + resetLocalFlags() { + this.selectedDate = null; + this.selectedTimeSlotInfo = null; + this.showDatePickerError = false; + }, timeSlotSelectedFromPicker(timeSlot) { this.selectedTimeSlotInfo = timeSlot; this.showDatePickerError = false; diff --git a/src/layouts/schedule-page/service-location/service-location.vue b/src/layouts/schedule-page/service-location/service-location.vue index 92312f35..ea0911c6 100644 --- a/src/layouts/schedule-page/service-location/service-location.vue +++ b/src/layouts/schedule-page/service-location/service-location.vue @@ -47,8 +47,21 @@ v-if="displayLowAvailabilityInshop" ref="alertLowAvailabilityInshop" cmsWidgetName="AlertLowAvailabilityInshopWidget" + :manualHeadlineLineTwo="getLowAvailabilityHeadlineLineTwoText" :isCollapsible="true" - alertClass="alert-warning" /> + :startCollapsed="true" + alertClass="alert-warning"> + + diff --git a/src/layouts/schedule-page/service-location/shop-address/shop-address.vue b/src/layouts/schedule-page/service-location/shop-address/shop-address.vue index 53c39061..f6e7b0a8 100644 --- a/src/layouts/schedule-page/service-location/shop-address/shop-address.vue +++ b/src/layouts/schedule-page/service-location/shop-address/shop-address.vue @@ -6,8 +6,8 @@ class="shop-address" aria-live="polite">
-{{ questionText }} -
+ {{ questionText }} +
@@ -16,8 +16,8 @@ {{ modelValue.distanceInMiles?.toFixed(2) }} mi
-{{ getProviderAddress(modelValue) }} -
+ {{ getProviderAddress(modelValue) }} +
{{ getProviderCityZipState(modelValue) }}
diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue index b6c0e697..1a74bdf9 100644 --- a/src/ux-components/alert/alert.vue +++ b/src/ux-components/alert/alert.vue @@ -23,9 +23,14 @@ 0 0 0-.127-.37.489.489 0 0 0-.388-.205z" /> - - {{ alertHeadline }} - +