jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release/2025.07.10' into feature/CASH-845-stage-2

Browse source
This commit is contained in:
AdamCaouetteSafelite 2025-07-09 10:28:02 -04:00
commit 7193090020
1 changed files with 48 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
src/layouts/schedule/time-slot-question/time-slot-question.vue
View file

@ -195,26 +195,25 @@ export default {
let appointmentTypeCmsWidgetName;
if (this.appointmentType === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF) {
// This is planned to be used again for drop-off
// Leaving this here with that in mind, move logic from the final else in here
// and only apply it when a dropoff slot is selected
return null;
} else if (this.appointmentType === AppointmentTypeStrings.MOBILE) {
// This is planned to be used again for drop-off
// Wrote this to be ready for that eventuality, is untested and no HTML work done yet
// if (this.selectedRouteCode == null || !this.isDropOffRouteCode(this.selectedRouteCode)) {
// return null;
// } else {
// appointmentTypeCmsWidgetName =
// this.getRelevantDropOffCmsWidgetNameForSelectedTimeSlot(
// this.selectedRouteCode,
// true
// );
// }
} else {
appointmentTypeCmsWidgetName = this.selectedRouteCode?.includes(
PREMIUM_TIME_SLOT_ID_FLAG
)
? this.mobilePremiumCmsWidgetName
: this.mobileCmsWidgetName;
} else {
if (!this.selectedRouteCode) {
return null;
} else {
appointmentTypeCmsWidgetName =
this.getRelevantDropOffCmsWidgetNameForSelectedTimeSlot(
this.selectedRouteCode,
true
);
}
}
return this.getCmsContent(
@ -222,12 +221,6 @@ export default {
cmsWidgetFieldMappings.SUPPLEMENTAL_INFORMATION
);
},
footerCloseButtonText() {
return this.getCmsContent(
this.cmsWidgetName,
cmsWidgetFieldMappings.MODAL_CLOSE_BUTTON
);
},
dropOffOrPickATimeQuestionLabelText() {
return this.getCmsContent(this.dropOffOrPickATimeQuestionCmsWidgetName, "QuestionText");
},
@ -259,38 +252,40 @@ export default {
cmsWidgetFieldMappings.TIME_SLOT_BUTTON
);
},
dropoffDisclaimerText() {
return this.getCmsContent(this.dropoffCmsWidgetName, cmsWidgetFieldMappings.DISCLAIMER);
},
sameDayDropOffDisclaimerText() {
return this.getCmsContent(
this.sameDayDropOffCmsWidgetName,
cmsWidgetFieldMappings.DISCLAIMER
);
},
overnightDropOffDisclaimerText() {
return this.getCmsContent(
this.overnightDropOffCmsWidgetName,
cmsWidgetFieldMappings.DISCLAIMER
);
},
disclaimerTextBlockCopy() {
if (this.appointmentType === AppointmentTypeStrings.DROP_OFF) {
if (this.selectedRouteCode?.includes(RouteCodeFlags.ALL_DAY_DROP_OFF)) {
if (this.isSameDay) {
return this.sameDayDropOffDisclaimerText;
} else {
return this.dropoffDisclaimerText;
}
} else if (this.selectedRouteCode?.includes(RouteCodeFlags.OVERNIGHT_DROP_OFF)) {
return this.overnightDropOffDisclaimerText;
} else {
return null;
}
} else {
return null;
}
},
// None of this is used, but apparently could be re-activated if we go back to
// complete parity with Heritage. If that plan is dropped, delete this
// dropoffDisclaimerText() {
// return this.getCmsContent(this.dropoffCmsWidgetName, cmsWidgetFieldMappings.DISCLAIMER);
// },
// sameDayDropOffDisclaimerText() {
// return this.getCmsContent(
// this.sameDayDropOffCmsWidgetName,
// cmsWidgetFieldMappings.DISCLAIMER
// );
// },
// overnightDropOffDisclaimerText() {
// return this.getCmsContent(
// this.overnightDropOffCmsWidgetName,
// cmsWidgetFieldMappings.DISCLAIMER
// );
// },
// disclaimerTextBlockCopy() {
// if (this.appointmentType === AppointmentTypeStrings.DROP_OFF) {
// if (this.selectedRouteCode?.includes(RouteCodeFlags.ALL_DAY_DROP_OFF)) {
// if (this.isSameDay) {
// return this.sameDayDropOffDisclaimerText;
// } else {
// return this.dropoffDisclaimerText;
// }
// } else if (this.selectedRouteCode?.includes(RouteCodeFlags.OVERNIGHT_DROP_OFF)) {
// return this.overnightDropOffDisclaimerText;
// } else {
// return null;
// }
// } else {
// return null;
// }
// },
dropOffDurationText() {
return this.getCmsContent(this.dropoffCmsWidgetName, cmsWidgetFieldMappings.DURATION);
},
@ -343,20 +338,6 @@ export default {
const todaysDate = new Date().toISOString().split("T")[0];
return this.selectedDate === todaysDate;
},
dateSelectedReadableDate() {
if (!this.timeSlotsForSelectedDate) {
return null;
}
// This conversion ensures we don't get get GMT induced date changes
const dateObject = convertDateStringToDate(this.timeSlotsForSelectedDate.date);
// Ex: Tuesday, April 22
return dateObject.toLocaleDateString("en-us", {
weekday: "long",
month: "long",
day: "numeric",
});
},
availableTimeSlots() {
if (!this.timeSlotsForSelectedDate) {
return null;
@ -390,6 +371,7 @@ export default {
buttonLabel: buttonLabelValue,
};
});
// Only add the pick a time button if inShop timeslots are available
if (
this.getAvailableTimeSlotsForInshop(this.timeSlotsForSelectedDate.timeSlots)
.length !== 0
@ -457,7 +439,6 @@ export default {
"update:modelValue",
this.getSelectedTimeSlotInfoObject(this.selectedRouteCode)
);
this.$emit("TimeSlotSelected");
},
getRelevantDropOffCmsWidgetNameForSelectedTimeSlot(
selectedRouteCode,
@ -656,7 +637,6 @@ export default {
},
},
components: {
// Removed modal
textBlock,
buttonQuestion,
checkboxQuestion,