From 23421846a1db49c460f9917787ad74fe7e4aec30 Mon Sep 17 00:00:00 2001 From: Sneha Date: Thu, 7 Nov 2024 11:57:46 +0530 Subject: [PATCH 1/4] CSR-2308 --- src/digital-components/modal/modal.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue index 3cc5ce76b..37ebee18e 100644 --- a/src/digital-components/modal/modal.vue +++ b/src/digital-components/modal/modal.vue @@ -73,6 +73,11 @@ export default { resetForm, }; }, + data() { + return { + isEnterClicked: false, + }; + }, methods: { async validateAndEmit() { const validationResult = await this.validate(); @@ -84,9 +89,14 @@ export default { }, async onEnter(e) { e.preventDefault(); + if (this.isEnterClicked) return; + this.isEnterClicked = true; document.getElementById("modalbtn")?.focus(); this.$refs.modalButtonMain.clicked(); document.getElementById(this.modalId)?.focus(); + setTimeout(() => { + this.isEnterClicked = false; + }, 2000); }, resetButtonStyle() { this.$refs.modalButtonMain?.resetButtonStyle(); From 68e1cbcf61b8475f1361e4845b7dc67141cd1fee Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Thu, 7 Nov 2024 11:26:26 -0500 Subject: [PATCH 2/4] CSR-2322 | Fix shouldHideRecalibration response --- src/store/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/index.js b/src/store/index.js index 22b9c4776..81aa5ad62 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -826,7 +826,7 @@ export const getters = { return ( experimentMixin.methods .getSettingValue(experimentSettings.RECAL_PRICE_REMOVE) - ?.toLowerCase() === "true" && getters.isRecalibrationOnOrder + ?.toLowerCase() === "true" && getters.isRecalibrationOnOrder(state) ); }, areRearWipersOnOrder: (state) => { From b22a7d91b91c3b640034ebedd359e7f9946731b5 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Fri, 8 Nov 2024 08:13:33 -0500 Subject: [PATCH 3/4] CSR-2321 lost estimated job time on save quote CSR-2321 lost estimated job time on save quote mobile order --- src/layouts/payment-method/payment-method.vue | 27 ++++++++++++- src/layouts/quote/quote.vue | 22 +++++----- src/layouts/schedule/schedule.vue | 40 +++++++++++-------- 3 files changed, 61 insertions(+), 28 deletions(-) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index d278a3c1c..33961696d 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -423,7 +423,32 @@ export default { customer.emailAddress ); - return serviceLocationReqs && isInsuranceSet && scheduleReqs && customerReqs; + const preReqResult = serviceLocationReqs && isInsuranceSet() && scheduleReqs && customerReqs; + + // prettier-ignore + { + const log = getQuerystringParameter(queryStrings.LOG); + if (eval(log) || !preReqResult) { + console.log("------------- payment-method.vue pagePrereqs start -----------------"); + console.log(new Date() + " serviceLocationReqs::isMobile: " + isMobile); + console.log(new Date() + " serviceLocationReqs::mobileReqs: " + mobileReqs); + console.log(new Date() + " serviceLocationReqs::dropOffInshopReqs: " + dropOffInshopReqs); + console.log(new Date() + " serviceLocationReqs:: result " + serviceLocationReqs); + console.log(new Date() + " isInsuranceSet:: " + isInsuranceSet()); + console.log(new Date() + " scheduleReqs::schedule.date:" + schedule.date); + console.log(new Date() + " scheduleReqs::schedule.startTime:" + schedule.startTime); + console.log(new Date() + " scheduleReqs::schedule.endTime:" + schedule.endTime); + console.log(new Date() + " scheduleReqs::schedule.jobMaxMinutes:" + schedule.jobMaxMinutes); + console.log(new Date() + " scheduleReqs::schedule.jobMinMinutes:" + schedule.jobMinMinutes); + console.log(new Date() + " customerReqs::customer.firstName:" + customer.firstName); + console.log(new Date() + " customerReqs::customer.lastName:" + customer.lastName); + console.log(new Date() + " customerReqs::customer.phoneNumber:" + customer.phoneNumber); + console.log(new Date() + " customerReqs::customer.emailAddress:" + customer.emailAddress); + console.log("------------- payment-method.vue pagePrereqs end -----------------"); + } + } + + return preReqResult; }, getPaymentMethodFromStore() { const piaType = store.getters.order.payment.piaType; diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index 528e76a7b..fe409bd59 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -453,10 +453,20 @@ export default { arePagePrerequisitesValid() { const payment = store.getters.order.payment; + const preReqResult = ( + store.getters.order.serviceLocation.zipCode && + store.getters.order.serviceLocation.zipCodeCtu && + (store.getters.order.damage.isRepair || + (store.getters.order.lineItems?.glassParts != null && + store.getters.order.lineItems.glassParts.length > 0)) && + (payment.insuranceCoverage?.isVerified == null || + payment.insuranceCoverage?.isVerified === false) + ); + // prettier-ignore { const log = getQuerystringParameter(queryStrings.LOG); - if (eval(log)) { + if (eval(log) || !preReqResult) { console.log("------------- quote.vue pagePrereqs start -----------------"); console.log(new Date() + " store.getters.order.serviceLocation.zipCode: " + store.getters.order.serviceLocation?.zipCode); console.log(new Date() +" store.getters.order.serviceLocation.zipCodeCtu: " + store.getters.order.serviceLocation?.zipCodeCtu); @@ -467,15 +477,7 @@ export default { } } - return ( - store.getters.order.serviceLocation.zipCode && - store.getters.order.serviceLocation.zipCodeCtu && - (store.getters.order.damage.isRepair || - (store.getters.order.lineItems?.glassParts != null && - store.getters.order.lineItems.glassParts.length > 0)) && - (payment.insuranceCoverage?.isVerified == null || - payment.insuranceCoverage?.isVerified === false) - ); + return preReqResult; }, vapsItemsSelectedAction(vapsItemsSelected) { this.lineItems.vaps = vapsItemsSelected; diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 2e4e1d057..8063d8532 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -307,22 +307,6 @@ export default { arePagePrerequisitesValid() { const serviceLocation = store.getters.order.serviceLocation; - // prettier-ignore - { - const log = getQuerystringParameter(queryStrings.LOG); - if (eval(log)) { - console.log("------------- schedule.vue pagePrereqs start -----------------"); - console.log(new Date() + " store.getters.order.serviceLocation.zipCode: " + serviceLocation.zipCode); - console.log(new Date() + " store.getters.order.serviceLocation.zipCodeCtu: " + serviceLocation.zipCodeCtu); - console.log(new Date() + " store.getters.order.serviceLocation.appointmentType: " + serviceLocation.appointmentType); - console.log(new Date() + " store.getters.order.serviceLocation.provider.providerNumber: " + serviceLocation.provider.providerNumber); - console.log(new Date() + " store.getters.payment.isInsurance: " + store.getters.payment?.isInsurance); - console.log(new Date() + " store.getters.order.damage.isRepair: " + store.getters.order.damage.isRepair); - console.log(new Date() + " store.getters.order.lineItems.glassParts: " + JSON.stringify(store.getters.order.lineItems?.glassParts)); - console.log("------------- schedule.vue pagePrereqs end -------------------"); - } - } - const serviceLocationPreReqs = serviceLocation.zipCode && serviceLocation.zipCodeCtu && @@ -337,7 +321,24 @@ export default { (store.getters.order.lineItems?.glassParts != null && store.getters.order.lineItems.glassParts.length > 0); - return serviceLocationPreReqs && paymentInfo && damageInfo; + const preReqResult = serviceLocationPreReqs && paymentInfo && damageInfo; + + // prettier-ignore + { + const log = getQuerystringParameter(queryStrings.LOG); + if (eval(log) || !preReqResult) { + console.log("------------- schedule.vue pagePrereqs start -----------------"); + console.log(new Date() + " store.getters.order.serviceLocation.zipCode: " + serviceLocation.zipCode); + console.log(new Date() + " store.getters.order.serviceLocation.zipCodeCtu: " + serviceLocation.zipCodeCtu); + console.log(new Date() + " store.getters.order.serviceLocation.appointmentType: " + serviceLocation.appointmentType); + console.log(new Date() + " store.getters.order.serviceLocation.provider.providerNumber: " + serviceLocation.provider.providerNumber); + console.log(new Date() + " store.getters.payment.isInsurance: " + store.getters.payment?.isInsurance); + console.log(new Date() + " store.getters.order.damage.isRepair: " + store.getters.order.damage.isRepair); + console.log(new Date() + " store.getters.order.lineItems.glassParts: " + JSON.stringify(store.getters.order.lineItems?.glassParts)); + console.log("------------- schedule.vue pagePrereqs end -------------------"); + } + } + return preReqResult; }, async getAvailableDatesMethod(startDate, endDate) { const newShopTimeSlots = await getAvailableDates( @@ -445,6 +446,11 @@ export default { forwardButtonAction() { this.updateSupportingItems(); + if (this.selectedTimeSlotInfo.timeSlot.jobMinMinutes == null) { + this.selectedTimeSlotInfo.timeSlot.jobMinMinutes = this.selectableDatesData?.estimatedServiceMinutesMinimum?.toString(); + this.selectedTimeSlotInfo.timeSlot.jobMaxMinutes = this.selectableDatesData?.estimatedServiceMinutesMaximum?.toString(); + } + this.dispatchStoreAction( this.storeActions.SAVE_SCHEDULE, this.selectedTimeSlotInfo.timeSlot, From dbb2621e671c65a473803c4fdd3a5ce6d6af1e11 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 8 Nov 2024 09:10:51 -0500 Subject: [PATCH 4/4] CSR-2346 fix misaligned promo copy. Update colors and font sizes with variable and REM values. --- .../promo-modal-question/promo-modal-question.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/fmg-components/promo-modal-question/promo-modal-question.vue b/src/fmg-components/promo-modal-question/promo-modal-question.vue index a6b591e67..9f102fd52 100644 --- a/src/fmg-components/promo-modal-question/promo-modal-question.vue +++ b/src/fmg-components/promo-modal-question/promo-modal-question.vue @@ -50,7 +50,7 @@ cmsWidgetName="AlertInshopPromoWidget" alertClass="alert-danger" v-bind:isDismissible="false" /> -
+
Promo code {{ promoCode }} applied @@ -357,19 +357,18 @@ export default {