diff --git a/src/constants/scheduling.js b/src/constants/scheduling.js index c656ac60a..0ded16a32 100644 --- a/src/constants/scheduling.js +++ b/src/constants/scheduling.js @@ -13,4 +13,6 @@ const monthsOfYear = [ "December", ]; -export { monthsOfYear }; +const daysOfWeek = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]; + +export { monthsOfYear, daysOfWeek }; diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue index 5d8db68d4..26288c036 100644 --- a/src/digital-components/button-question/button-question.vue +++ b/src/digital-components/button-question/button-question.vue @@ -119,7 +119,6 @@ export default { isRequired: Boolean, isOverflowScrollable: Boolean, isWide: Boolean, - isCashOrInsurance: Boolean, modelValue: [Array, Number, String], value: [Number, String], validationRules: String, diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue index cec960fa1..823df0f98 100644 --- a/src/digital-components/modal/modal.vue +++ b/src/digital-components/modal/modal.vue @@ -56,6 +56,13 @@ export default { onModalClosedCallback: { type: Function, }, + allowManualFooterDisableOverride: { + type: Boolean, + default: false, + }, + isFooterDisabledManualOverride: { + type: Boolean, + }, }, setup() { const modalId = `modal-${crypto.randomUUID()}`; @@ -98,10 +105,13 @@ export default { }, computed: { isFooterButtonDisabled() { - if (!this.meta.touched) { + if (this.allowManualFooterDisableOverride !== null) { + return this.isFooterDisabledManualOverride; + } else if (!this.meta.touched) { return !this.meta.valid; + } else { + return !this.meta.dirty || !this.meta.valid; } - return !this.meta.dirty || !this.meta.valid; }, }, components: { diff --git a/src/digital-components/text-block/text-block.vue b/src/digital-components/text-block/text-block.vue index 9e7df6312..2eb45bf74 100644 --- a/src/digital-components/text-block/text-block.vue +++ b/src/digital-components/text-block/text-block.vue @@ -1,6 +1,6 @@ diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index f81d5c0aa..69dc7455b 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -23,6 +23,14 @@ selectableDatesSetting="custom" v-model="selectedDate" :customSelectableDatesCallback="getAvailableDates" /> + + diff --git a/src/layouts/schedule/time-slot-selection-modal/time-slot-selection-modal.vue b/src/layouts/schedule/time-slot-selection-modal/time-slot-selection-modal.vue new file mode 100644 index 000000000..9763b5359 --- /dev/null +++ b/src/layouts/schedule/time-slot-selection-modal/time-slot-selection-modal.vue @@ -0,0 +1,109 @@ + + + + +