From b5f180099f00bc6ecffd2cf8e644996940d05d88 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 14 Jun 2024 15:21:11 -0400 Subject: [PATCH 01/40] WIP CSR-2115 remove recal glass only --- src/layouts/payment-method/payment-method.vue | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index 29f36306d..f4a4b060c 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -45,6 +45,20 @@ v-bind:isDismissible="false" /> +
+ + +
+ +
+ + From b0377459d54950fc201c5d7957e929c41b118436 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 21 Jun 2024 13:40:13 -0400 Subject: [PATCH 08/40] WIP uncomment lines at end of testing. --- src/layouts/payment-method/payment-method.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index 4f08d86df..a1224353d 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -45,7 +45,7 @@ v-bind:isDismissible="false" /> - +
- + Date: Fri, 21 Jun 2024 15:58:11 -0400 Subject: [PATCH 09/40] WIP add store info. --- src/layouts/payment-method/payment-method.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index a1224353d..c9e8ffcdf 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -53,8 +53,13 @@
- - + +
@@ -332,7 +337,7 @@ export default { availableVaps: [], paymentMethodInternalModel: this.getPaymentMethodFromStore(), inactivePromos: this.getInactivePromosFromStore(), - isRecalAckOptIn: this.getIsRecalAckOptInFromStore(), + isRecalAck: this.getIsRecalAckFromStore(), }; }, methods: { @@ -402,8 +407,8 @@ export default { return serviceLocationReqs && isInsuranceSet && scheduleReqs && customerReqs; }, - getIsRecalAckOptInFromStore() { - return store.getters.order.customer.isRecalAckOptIn; + getIsRecalAckFromStore() { + return store.getters.order.customer.isRecalAck; }, getPaymentMethodFromStore() { const piaType = store.getters.order.payment.piaType; From 4db562212b1339b6d824e58e26dc686df23d4e70 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 24 Jun 2024 15:29:25 -0400 Subject: [PATCH 10/40] WIP add store actions for recal ack. --- src/constants/store-actions.js | 1 + src/layouts/payment-method/payment-method.vue | 37 ++++++++++++------- src/store/index.js | 4 ++ 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js index bd772cafe..6b3adc110 100644 --- a/src/constants/store-actions.js +++ b/src/constants/store-actions.js @@ -81,6 +81,7 @@ const storeActions = { SAVE_CAPABILITY_QUESTION_ANSWERS: "saveCapabilityQuestionAnswers", SAVE_PAYMENT_TYPE: "savePaymentType", SAVE_PAYMENT_METHOD_CHOICE: "savePaymentMethodChoice", + SAVE_RECAL_ACK_CHOICE: "saveRecalAckChoice", SAVE_PARENT_ACCOUNT_NUMBER: "saveParentAccountNumber", SAVE_BILL_TO_ACCOUNT_NUMBER: "saveBillToAccountNumber", SAVE_SUPPORTING_ITEMS: "saveSupportingItems", diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index c9e8ffcdf..0b0ce2af4 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -84,7 +84,9 @@ @back-clicked="backButtonAction" @ForwardClicked="forwardButtonAction" /> - + @@ -489,6 +491,13 @@ export default { false ); + // save recalibration acknowledgement checkbox + await this.dispatchStoreAction( + storeActions.SAVE_RECAL_ACK_CHOICE, + this.paymentMethod, + false + ); + // save lineitems as they now have salestax added await this.dispatchStoreAction( storeActions.SAVE_GLASS_PARTS_SUPPRESSING_STATE_RESETTING, @@ -733,18 +742,20 @@ export default { margin: 0; } .payment-method { - :deep(.modal-body) { - display: flex; - flex-direction: column; - h5 { - text-align: center; - order: 1; - } - p { - order: 3 - } - img { - order: 2; + .recal-modal { + :deep(.modal-body) { + display: flex; + flex-direction: column; + h5 { + text-align: center; + order: 1; + } + p { + order: 3 + } + img { + order: 2; + } } } } diff --git a/src/store/index.js b/src/store/index.js index 3ccfa4c01..fc4557458 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -2222,6 +2222,10 @@ export const actions = { context.commit(storeMutations.UPDATE_BILL_TO_ACCT_NUMBER, billToAccountNumber); }, + saveRecalAckChoice(context, recalAckChoice) { + context.commit(storeMutations.SAVE_RECAL_ACK_CHOICE, recalAckChoice); + }, + saveSupportingItems(context, supportingItems) { syncLineItemIds(supportingItems, context.state.order.lineItems.supportingItems); if (!supportingItemsEqual(supportingItems, context.state.order.lineItems.supportingItems)) { From dce4c0726034683339c542530ea71f8668a247f5 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 25 Jun 2024 10:26:17 -0400 Subject: [PATCH 11/40] Revert "WIP add store actions for recal ack." This reverts commit 4db562212b1339b6d824e58e26dc686df23d4e70. --- src/constants/store-actions.js | 1 - src/layouts/payment-method/payment-method.vue | 37 +++++++------------ src/store/index.js | 4 -- 3 files changed, 13 insertions(+), 29 deletions(-) diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js index 6b3adc110..bd772cafe 100644 --- a/src/constants/store-actions.js +++ b/src/constants/store-actions.js @@ -81,7 +81,6 @@ const storeActions = { SAVE_CAPABILITY_QUESTION_ANSWERS: "saveCapabilityQuestionAnswers", SAVE_PAYMENT_TYPE: "savePaymentType", SAVE_PAYMENT_METHOD_CHOICE: "savePaymentMethodChoice", - SAVE_RECAL_ACK_CHOICE: "saveRecalAckChoice", SAVE_PARENT_ACCOUNT_NUMBER: "saveParentAccountNumber", SAVE_BILL_TO_ACCOUNT_NUMBER: "saveBillToAccountNumber", SAVE_SUPPORTING_ITEMS: "saveSupportingItems", diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index 0b0ce2af4..c9e8ffcdf 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -84,9 +84,7 @@ @back-clicked="backButtonAction" @ForwardClicked="forwardButtonAction" /> - + @@ -491,13 +489,6 @@ export default { false ); - // save recalibration acknowledgement checkbox - await this.dispatchStoreAction( - storeActions.SAVE_RECAL_ACK_CHOICE, - this.paymentMethod, - false - ); - // save lineitems as they now have salestax added await this.dispatchStoreAction( storeActions.SAVE_GLASS_PARTS_SUPPRESSING_STATE_RESETTING, @@ -742,20 +733,18 @@ export default { margin: 0; } .payment-method { - .recal-modal { - :deep(.modal-body) { - display: flex; - flex-direction: column; - h5 { - text-align: center; - order: 1; - } - p { - order: 3 - } - img { - order: 2; - } + :deep(.modal-body) { + display: flex; + flex-direction: column; + h5 { + text-align: center; + order: 1; + } + p { + order: 3 + } + img { + order: 2; } } } diff --git a/src/store/index.js b/src/store/index.js index fc4557458..3ccfa4c01 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -2222,10 +2222,6 @@ export const actions = { context.commit(storeMutations.UPDATE_BILL_TO_ACCT_NUMBER, billToAccountNumber); }, - saveRecalAckChoice(context, recalAckChoice) { - context.commit(storeMutations.SAVE_RECAL_ACK_CHOICE, recalAckChoice); - }, - saveSupportingItems(context, supportingItems) { syncLineItemIds(supportingItems, context.state.order.lineItems.supportingItems); if (!supportingItemsEqual(supportingItems, context.state.order.lineItems.supportingItems)) { From f2f8c2bead9c2e2d42ba0501ba6ef9be2c4bc796 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 25 Jun 2024 10:26:37 -0400 Subject: [PATCH 12/40] Revert "WIP add store info." This reverts commit b24b33e5ed50b380c1bba5af96c2f45afd2b6f27. --- src/layouts/payment-method/payment-method.vue | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index c9e8ffcdf..a1224353d 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -53,13 +53,8 @@
- - + +
@@ -337,7 +332,7 @@ export default { availableVaps: [], paymentMethodInternalModel: this.getPaymentMethodFromStore(), inactivePromos: this.getInactivePromosFromStore(), - isRecalAck: this.getIsRecalAckFromStore(), + isRecalAckOptIn: this.getIsRecalAckOptInFromStore(), }; }, methods: { @@ -407,8 +402,8 @@ export default { return serviceLocationReqs && isInsuranceSet && scheduleReqs && customerReqs; }, - getIsRecalAckFromStore() { - return store.getters.order.customer.isRecalAck; + getIsRecalAckOptInFromStore() { + return store.getters.order.customer.isRecalAckOptIn; }, getPaymentMethodFromStore() { const piaType = store.getters.order.payment.piaType; From 60a63891df0dfca825a2d1a25a2ce4c2308fc5be Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 25 Jun 2024 10:31:12 -0400 Subject: [PATCH 13/40] Revert "WIP uncomment lines at end of testing." This reverts commit b0377459d54950fc201c5d7957e929c41b118436. --- src/layouts/payment-method/payment-method.vue | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index a1224353d..2a293957f 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -53,8 +53,13 @@
- - + +
@@ -79,7 +84,10 @@ @back-clicked="backButtonAction" @ForwardClicked="forwardButtonAction" /> - + @@ -728,18 +736,20 @@ export default { margin: 0; } .payment-method { - :deep(.modal-body) { - display: flex; - flex-direction: column; - h5 { - text-align: center; - order: 1; - } - p { - order: 3 - } - img { - order: 2; + .recal-modal { + :deep(.modal-body) { + display: flex; + flex-direction: column; + h5 { + text-align: center; + order: 1; + } + p { + order: 3 + } + img { + order: 2; + } } } } From da89f0929f9caca62442a80c0670ca73f078e02b Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Wed, 26 Jun 2024 11:27:20 -0400 Subject: [PATCH 14/40] WIP CSR-2115 --- src/constants/error-messages.js | 1 + .../checkbox-question/checkbox-question.vue | 32 ++++++++ src/layouts/payment-method/payment-method.vue | 79 ++++++++++--------- src/main.js | 10 +-- 4 files changed, 79 insertions(+), 43 deletions(-) diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js index 71c782856..4326a5412 100644 --- a/src/constants/error-messages.js +++ b/src/constants/error-messages.js @@ -24,6 +24,7 @@ const errorMessages = { VIN_FORMAT: "Invalid VIN. Please make sure that you entered the correct 17-digit, alpha-numeric number. VINs do not contain the letters I, O, or Q", OPTION_REQUIRED: "Please select an option", + RECAL_ACK_REQUIRED: "Please acknowledge recalibration alert", VEHICLE_REQUIRED: "Please select a vehicle", MOBILE_LOCATION_REQUIRED: "Please enter your service address", DATE_REQUIRED: "Please select a date", diff --git a/src/digital-components/checkbox-question/checkbox-question.vue b/src/digital-components/checkbox-question/checkbox-question.vue index fc95555e4..c256fd0aa 100644 --- a/src/digital-components/checkbox-question/checkbox-question.vue +++ b/src/digital-components/checkbox-question/checkbox-question.vue @@ -10,6 +10,7 @@ type="checkbox" aria-checked="false" :name="checkboxName" + :validationRules="validationRules" :id="buttonID" :tabindex="tabIndex" :aria-required="isRequired" /> @@ -20,6 +21,10 @@ - + From b3a41f828d2b16f4e0e7129445cfd3ea85902ba0 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 8 Jul 2024 14:08:15 -0400 Subject: [PATCH 28/40] Add comment. --- src/styles/common-styles.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss index 0743f8322..be01f3ed8 100644 --- a/src/styles/common-styles.scss +++ b/src/styles/common-styles.scss @@ -37,6 +37,7 @@ body { max-width: 100%; } } + // Quote page desktop &.quote { .col-md-6, .col-lg-4 { From bcbf9359b8628d544ec3ea103ff3e2b8d6b753cd Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 8 Jul 2024 14:23:32 -0400 Subject: [PATCH 29/40] Format code. --- .../service-package-radio/service-package-radio.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue index d637fd21c..1b4468230 100644 --- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue +++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue @@ -12,7 +12,9 @@ ]" for="testradio">
-
+

@@ -136,7 +138,6 @@ export default {