From 901db2e4b02bbd6ac16e644fc767ac178dbf2819 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 10 Jul 2023 10:35:53 -0400 Subject: [PATCH 1/5] CSR-1478 remove perfect match alert when zip is invalid. --- src/layouts/vin-lookup/vin-lookup.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index e820723bd..709029459 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -79,7 +79,7 @@ :manualHeadline="AlertPerfectMatchInsuranceVerifiedHeader" :manualCopy="AlertPerfectMatchInsuranceVerifiedBody" v-model="customAlertData" - v-if="vinPopulatedOnPageLoad && isInsuranceVerified" + v-if="vinPopulatedOnPageLoad && isInsuranceVerified && !displayInvalidZipAlert" alertClass="alert-success" /> Date: Tue, 11 Jul 2023 08:38:18 -0400 Subject: [PATCH 2/5] CSR-1474: set max-height to prevent iphone problems --- .../date-picker/date-picker.vue | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index 8b2cdc9ce..6c6cd48a4 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -6,7 +6,7 @@ v-for="month in months" :key="`${month.monthLabel}-${month.yearNum?.toString()}`" :id="`${month.monthLabel}-${month.yearNum?.toString()}`" - class="calendar-grid-container position-relative" + class="calendar-grid-container" :class="[ hideSomeDaysForInitialView ? 'partial-month-initial-view' : '', month.monthClass, @@ -628,12 +628,16 @@ export default { .date-picker { overflow: hidden; position: relative; - height: 100%; + flex-grow: 1; + display: flex; + flex-direction: column; fieldset { overflow-y: auto; - height: 88%; + flex-grow: 1; position: relative; + padding-bottom: 6rem; // arbitrary amount to provide enough spacing for scroll animation + max-height: 21.25rem; // 340px... arbitrary amount to not push View More link out of view on iphones } .loader { position: absolute; @@ -648,6 +652,7 @@ export default { .calendar-grid-container { margin: 0 auto 2rem auto; max-width: 414px; + position: relative; transition: height ease 2s, opacity ease 2s; display: grid; grid-template-columns: repeat(7, 1fr); @@ -864,21 +869,17 @@ export default { opacity: 0; max-height: 0; margin-bottom: 0; + overflow: hidden; } &.last-available-month:not(&.month-hidden) { margin-bottom: 14rem; } } - #bottom-spacer { - height: 20rem; - background: lightblue; - } .btn-link { font-weight: 500; text-underline-offset: 4px; - position: absolute; - top: 90%; + flex-grow: 0; } .past { From edab92d71bac9dd88e46c9b9b05830afc1480c92 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Tue, 11 Jul 2023 10:08:12 -0400 Subject: [PATCH 3/5] CSR-1497 | Same-day disclaimer fix --- .../time-slot-modal-question.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue b/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue index c4fbd4b50..59b1e2e42 100644 --- a/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue +++ b/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue @@ -183,10 +183,12 @@ export default { }, disclaimerTextBlockCopy() { if (this.appointmentType === AppointmentTypeStrings.DROP_OFF) { - if (this.isSameDay) { - return this.sameDayDropOffDisclaimerText; - } else if (this.selectedTimeSlotId?.includes(RouteCodeFlags.ALL_DAY_DROP_OFF)) { - return this.dropoffDisclaimerText; + if (this.selectedTimeSlotId?.includes(RouteCodeFlags.ALL_DAY_DROP_OFF)) { + if (this.isSameDay) { + return this.sameDayDropOffDisclaimerText; + } else { + return this.dropoffDisclaimerText; + } } else if (this.selectedTimeSlotId?.includes(RouteCodeFlags.OVERNIGHT_DROP_OFF)) { return this.overnightDropOffDisclaimerText; } else { From 6361c05cd67ddccf92ef53a00266206c90d4657d Mon Sep 17 00:00:00 2001 From: Chloe Herd Date: Tue, 11 Jul 2023 13:05:06 -0400 Subject: [PATCH 4/5] Update appointment time check to not auto-fail for same-day --- src/store/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/store/index.js b/src/store/index.js index a40c7eaeb..315a424c2 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -2189,6 +2189,7 @@ async function resetScheduleIfUnavailable(context, order) { // If you put any kind of time stamp on the date string with dashes, then it IS parsed as local time. var aptDate = new Date(order.schedule.date + "T00:00:00"); var curDate = new Date(); + curDate.setHours(0, 0, 0, 0); // if appointment date is in the past, clear schedule if (aptDate.getTime() < curDate.getTime()) { From 7f546164d4d176773777115776315a7fb13d76f0 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 11 Jul 2023 16:15:57 -0400 Subject: [PATCH 5/5] CSR-1409 remove margin from row and apply to error. --- src/digital-components/button-question/button-question.vue | 4 ++-- src/digital-components/textbox-question/textbox-question.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue index 7441ab422..610f8d4f8 100644 --- a/src/digital-components/button-question/button-question.vue +++ b/src/digital-components/button-question/button-question.vue @@ -72,9 +72,9 @@ https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Com -
+
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue index 1c87a2ac5..5e9662c87 100644 --- a/src/digital-components/textbox-question/textbox-question.vue +++ b/src/digital-components/textbox-question/textbox-question.vue @@ -64,9 +64,9 @@
-
+
{{ errorMessage }}