From 25717e674b19df9d547b72d370bae3e1aa79853f Mon Sep 17 00:00:00 2001 From: CarlNation Date: Tue, 14 Jan 2025 11:30:28 -0500 Subject: [PATCH 01/17] CASH-79 move save-session after save quote CASH-79 move save-session after save quote so that the email is still empty in Dynamo when the save-quote is called --- src/helpers/heritage-integration/order-helper.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js index e88a64c27..76729e49f 100644 --- a/src/helpers/heritage-integration/order-helper.js +++ b/src/helpers/heritage-integration/order-helper.js @@ -99,6 +99,13 @@ export async function submitWorkOrder({ } export async function saveQuote({ pageNameToLog }) { + await baseMixin.methods.dispatchStoreActionWithLogging( + storeActions.SAVE_QUOTE, + {}, + pageNameToLog, + false + ); + // save session back to sv2 so the email gets saved just in case they refresh or step away and come back later await saveSession({ pageNameToLog: pageNameToLog, @@ -107,12 +114,7 @@ export async function saveQuote({ pageNameToLog }) { createUnscheduledStatusWorkOrderForPIA: false, }); - return await baseMixin.methods.dispatchStoreActionWithLogging( - storeActions.SAVE_QUOTE, - {}, - pageNameToLog, - false - ); + return; } // PRIVATE FUNCTIONS // From 96b9606fe3e047e98a2debeeef301fa179bf972b Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Tue, 14 Jan 2025 22:05:31 -0500 Subject: [PATCH 02/17] CASH-77: add before-load popup for Save Progress to /quote page --- src/digital-components/modal/modal.vue | 51 +++- .../save-progress-modal-question.vue | 73 +++--- .../save-progress-popup-question.spec.js | 51 ++++ .../save-progress-popup-question.vue | 227 ++++++++++++++++++ .../capability-questions.vue | 4 +- .../molding-questions/molding-questions.vue | 4 +- src/layouts/part-questions/part-questions.vue | 4 +- src/layouts/quote/quote.spec.js | 4 +- src/layouts/quote/quote.vue | 49 +++- 9 files changed, 399 insertions(+), 68 deletions(-) create mode 100644 src/fmg-components/save-progress-popup-question/save-progress-popup-question.spec.js create mode 100644 src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue index e412678ff..679f7eb4b 100644 --- a/src/digital-components/modal/modal.vue +++ b/src/digital-components/modal/modal.vue @@ -2,7 +2,9 @@
{ @@ -108,10 +111,12 @@ export default { onModalClosed() { this.resetButtonStyle(); this.onModalClosedCallback?.(); - if (this.suppressPageScroll) document.querySelector("body").classList.remove("prevent-modal-scroll"); + if (this.suppressPageScroll) + document.querySelector("body").classList.remove("prevent-modal-scroll"); }, openModal() { - if (this.suppressPageScroll) document.querySelector("body").classList.add("prevent-modal-scroll"); + if (this.suppressPageScroll) + document.querySelector("body").classList.add("prevent-modal-scroll"); const modal = Modal.getOrCreateInstance(document.getElementById(this.modalId)); modal.show(); this.$emit("isModalOpened", true); @@ -129,6 +134,9 @@ export default { } return !this.meta.dirty || !this.meta.valid; }, + backdropSetting() { + return this.staticBackdrop ? "static" : "true"; + }, }, components: { modalButtonMain, @@ -241,20 +249,45 @@ export default { .modal-body { display: flex; flex-direction: column; + .textbox-question { - padding: .25rem 0; + padding: 0; + + margin: 0 0 1.5rem 0; + } + } +} + +.save-progress-modal-question, +.save-progress-popup-question { + p.modal-body { + padding: 0; + } + .modal-body { + display: flex; + flex-direction: column; + + .textbox-question { + padding: 0; + label { text-align: left; - font-weight: 600; + font-weight: 900; } } } + .modal-body-inner { + text-align: center; + margin-bottom: 1.5rem; + } .modal-disclaimer { - font-size: .75rem; + font-size: 0.75rem; order: 2; } .modal-footer { - padding: 1.5rem 0; + margin: 0 0 1.5rem 0; + padding-top: 0; + padding-bottom: 0; } } body { diff --git a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue b/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue index 4ff6304f5..c8465fef7 100644 --- a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue +++ b/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue @@ -6,6 +6,7 @@ :buttonText="buttonText" loaderColor="white" :suppressLoader="true" + class="save-progress-button" @click-event="openModal" /> -

{{ modalBodyText }}

+

{{ modalBodyText }}

.save-progress-modal-question { - order: 2; margin-bottom: 1.5rem; + order: 2; + text-align: center; + background: $blue-100; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + border-radius: 0.5rem; - .btn-secondary { + .save-progress-button { + order: 4; position: relative; - background: $blue-100; - border: 1px solid transparent; - border-radius: $border-radius-lg; color: $blue; - font-weight: 500; - font-size: .875rem; - transition: all 150ms linear; - height: 3.5rem; - width: 100%; + border: none; + font-weight: 900; + font-size: 0.875rem; + text-align: center; + display: inline-block; + width: auto; + height: auto; text-decoration: underline; - text-underline-offset: .5rem; - &:hover { - background: linear-gradient(270deg, $blue 0%, $blue-800 100%); - color: $white; - } - &:focus, // Mouse, touch, stylus focus - &:focus-visible { - // Keyboard focus for accessibility - outline: none; - box-shadow: - 0 0 0 3px $white, - 0 0 0 5.5px $blue-700; - color: $white; - background: linear-gradient(270deg, rgba(6, 87, 124, 1) 0%, rgba(6, 87, 124, 1) 100%); - } - &:disabled { - background: transparent; - color: $gray-550 !important; - font-weight: 400; - height: 48px; - border: 1px solid $gray-550; - border-radius: $border-radius-lg; - cursor: pointer; - pointer-events: all; - } - &.has-loader { - color: $blue; - background-color: $blue; - pointer-events: none; + text-underline-offset: 0.375rem; + line-height: 1rem; + padding: 1rem; + margin: 0 auto; + transition: all 150ms linear; + background: none; + + &:hover, + &:active, + &:focus, + &:focus-visible { + color: $blue-700; + background: none; + box-shadow: none; } &.delay { // fixes flicker while transitioning between states diff --git a/src/fmg-components/save-progress-popup-question/save-progress-popup-question.spec.js b/src/fmg-components/save-progress-popup-question/save-progress-popup-question.spec.js new file mode 100644 index 000000000..e2ca84f1d --- /dev/null +++ b/src/fmg-components/save-progress-popup-question/save-progress-popup-question.spec.js @@ -0,0 +1,51 @@ +import { mount, shallowMount } from "@vue/test-utils"; +import saveProgressPopupQuestion from "./save-progress-popup-question"; +import { getMountOptions } from "@/helpers/unit-test-helper.js"; + +jest.mock("@/digital-components/modal/modal", () => ({ + methods: { + closeModal: jest.fn(), + resetButtonStyle: jest.fn(), + }, +})); + +describe("save-progress-popup-question ", () => { + describe("when closeModal is run ", () => { + test("the modal should close ", () => { + // Arrange + const { wrapper } = setupMocks({ + props: { + modelValue: "", + modalWidgetName: "testModal", + }, + }); + + // Act + wrapper.vm.closeModal(); + + // Assert + expect(wrapper.vm.modal).not.toBeNull(); + }); + }); +}); + +function setupMocks({ options, props }) { + const mountOptions = getMountOptions({ + ...options, + }); + + const mockBaseMixin = { + methods: { + getCmsContent: jest.fn(), + dispatchStoreAction: jest.fn(), + }, + }; + + if (props) mountOptions.propsData = props; + + mountOptions.global.mixins = [mockBaseMixin]; + + const wrapper = mount(saveProgressPopupQuestion, mountOptions); + + return { wrapper }; +} diff --git a/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue b/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue new file mode 100644 index 000000000..740385dac --- /dev/null +++ b/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue @@ -0,0 +1,227 @@ + + + + + diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue index d189f0f44..9d51ec2f7 100644 --- a/src/layouts/capability-questions/capability-questions.vue +++ b/src/layouts/capability-questions/capability-questions.vue @@ -13,13 +13,11 @@ @back-click="navigateBack" :key="currentGlassIndex" :index="currentGlassIndex"> - - - diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue index c314d7225..2f2cc346c 100644 --- a/src/layouts/molding-questions/molding-questions.vue +++ b/src/layouts/molding-questions/molding-questions.vue @@ -13,13 +13,11 @@ @back-click="navigateBack" :key="currentGlassIndex" :index="currentGlassIndex"> - - - diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue index 199a39493..a5441acd6 100644 --- a/src/layouts/part-questions/part-questions.vue +++ b/src/layouts/part-questions/part-questions.vue @@ -13,13 +13,11 @@ @back-click="navigateBack" :key="currentGlassIndex" :index="currentGlassIndex"> - - - diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js index 0d25eed9b..deca0d6d1 100644 --- a/src/layouts/quote/quote.spec.js +++ b/src/layouts/quote/quote.spec.js @@ -123,7 +123,7 @@ store.getters = { }, customer: { emailAddress: "test@test.com", - } + }, }, }; @@ -141,7 +141,7 @@ afterEach(() => { }, customer: { emailAddress: "test@test.com", - } + }, }; }); diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index 7fcb506ce..d8cab15ff 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -1,8 +1,10 @@ @@ -106,6 +121,7 @@ import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue"; import afterpayModalBanner from "@/layouts/quote/afterpay-modal-banner/afterpay-modal-banner"; import recalDisclaimer from "@/layouts/quote/recal-disclaimer/recal-disclaimer.vue"; import saveProgressModalQuestion from "@/fmg-components/save-progress-modal-question/save-progress-modal-question"; +import saveProgressPopupQuestion from "@/fmg-components/save-progress-popup-question/save-progress-popup-question"; // Supporting files import baseMixin from "@/mixins/base-mixin.js"; @@ -191,7 +207,9 @@ export default { const resultMap = await settleAllPromises(promiseResultMap); const emailFromStore = store.getters.order.customer.emailAddress; - + const isEmailInStoreOnPageLoad = emailFromStore?.length > 0; + const showSaveProgressPopup = isEmailInStoreOnPageLoad ? false : true; + const lineItems = deepClone(store.getters.order.lineItems); lineItems.vaps = lineItems.vaps ?? []; const nullSafeGlassParts = lineItems.glassParts ?? []; @@ -272,7 +290,8 @@ export default { // Call the "next" function to complete the transition to this page. next(async (vm) => { vm.setCmsContent(resultMap.cmsContent); - vm.isEmailInStoreOnPageLoad = emailFromStore?.length > 0; + vm.isEmailInStoreOnPageLoad = isEmailInStoreOnPageLoad; + vm.showSaveProgressPopup = showSaveProgressPopup; vm.addableVaps = addableVaps; vm.lineItems = lineItems; vm.availableLineItems = pricingResults; @@ -420,6 +439,7 @@ export default { holdParentAccountNumber: null, holdBillToAccountNumber: null, isEmailInStoreOnPageLoad: null, + showSaveProgressPopup: null, }; }, computed: { @@ -466,9 +486,6 @@ export default { }, }, methods: { - async handleClick() { - await saveQuote({ pageNameToLog: "quote" }); - }, openModalAction(modalName) { this.$refs[modalName].openModal(); }, @@ -510,8 +527,13 @@ export default { vehicleQuestionsMixin.methods.navigateBack(this); }, saveProgress() { + this.isEmailInStoreOnPageLoad = true; + this.showSaveProgressPopup = false; saveQuote({ pageNameToLog: "quote" }); }, + closeSaveProgressPopup() { + this.showSaveProgressPopup = false; + }, forwardButtonAction() { this.dispatchStoreAction( this.storeActions.SAVE_PAYMENT_TYPE, @@ -698,10 +720,21 @@ export default { promoModalQuestion, recalDisclaimer, saveProgressModalQuestion, + saveProgressPopupQuestion, }, }; + diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue index 9d51ec2f7..d189f0f44 100644 --- a/src/layouts/capability-questions/capability-questions.vue +++ b/src/layouts/capability-questions/capability-questions.vue @@ -13,11 +13,13 @@ @back-click="navigateBack" :key="currentGlassIndex" :index="currentGlassIndex"> + - + diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue index 2f2cc346c..c314d7225 100644 --- a/src/layouts/molding-questions/molding-questions.vue +++ b/src/layouts/molding-questions/molding-questions.vue @@ -13,11 +13,13 @@ @back-click="navigateBack" :key="currentGlassIndex" :index="currentGlassIndex"> + - + diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue index a5441acd6..199a39493 100644 --- a/src/layouts/part-questions/part-questions.vue +++ b/src/layouts/part-questions/part-questions.vue @@ -13,11 +13,13 @@ @back-click="navigateBack" :key="currentGlassIndex" :index="currentGlassIndex"> + - + diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js index deca0d6d1..0d25eed9b 100644 --- a/src/layouts/quote/quote.spec.js +++ b/src/layouts/quote/quote.spec.js @@ -123,7 +123,7 @@ store.getters = { }, customer: { emailAddress: "test@test.com", - }, + } }, }; @@ -141,7 +141,7 @@ afterEach(() => { }, customer: { emailAddress: "test@test.com", - }, + } }; }); diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index 366a9d2cc..7fcb506ce 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -1,10 +1,8 @@ @@ -121,7 +106,6 @@ import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue"; import afterpayModalBanner from "@/layouts/quote/afterpay-modal-banner/afterpay-modal-banner"; import recalDisclaimer from "@/layouts/quote/recal-disclaimer/recal-disclaimer.vue"; import saveProgressModalQuestion from "@/fmg-components/save-progress-modal-question/save-progress-modal-question"; -import saveProgressPopupQuestion from "@/fmg-components/save-progress-popup-question/save-progress-popup-question"; // Supporting files import baseMixin from "@/mixins/base-mixin.js"; @@ -207,9 +191,7 @@ export default { const resultMap = await settleAllPromises(promiseResultMap); const emailFromStore = store.getters.order.customer.emailAddress; - const isEmailInStoreOnPageLoad = emailFromStore?.length > 0; - const showSaveProgressPopup = isEmailInStoreOnPageLoad ? false : true; - + const lineItems = deepClone(store.getters.order.lineItems); lineItems.vaps = lineItems.vaps ?? []; const nullSafeGlassParts = lineItems.glassParts ?? []; @@ -290,8 +272,7 @@ export default { // Call the "next" function to complete the transition to this page. next(async (vm) => { vm.setCmsContent(resultMap.cmsContent); - vm.isEmailInStoreOnPageLoad = isEmailInStoreOnPageLoad; - vm.showSaveProgressPopup = showSaveProgressPopup; + vm.isEmailInStoreOnPageLoad = emailFromStore?.length > 0; vm.addableVaps = addableVaps; vm.lineItems = lineItems; vm.availableLineItems = pricingResults; @@ -439,7 +420,6 @@ export default { holdParentAccountNumber: null, holdBillToAccountNumber: null, isEmailInStoreOnPageLoad: null, - showSaveProgressPopup: null, }; }, computed: { @@ -486,6 +466,9 @@ export default { }, }, methods: { + async handleClick() { + await saveQuote({ pageNameToLog: "quote" }); + }, openModalAction(modalName) { this.$refs[modalName].openModal(); }, @@ -527,13 +510,8 @@ export default { vehicleQuestionsMixin.methods.navigateBack(this); }, saveProgress() { - this.isEmailInStoreOnPageLoad = true; - this.showSaveProgressPopup = false; saveQuote({ pageNameToLog: "quote" }); }, - closeSaveProgressPopup() { - this.showSaveProgressPopup = false; - }, forwardButtonAction() { this.dispatchStoreAction( this.storeActions.SAVE_PAYMENT_TYPE, @@ -720,21 +698,10 @@ export default { promoModalQuestion, recalDisclaimer, saveProgressModalQuestion, - saveProgressPopupQuestion, }, }; - diff --git a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.spec.js b/src/fmg-components/save-progress-modal-question/save-progress-modal-question.spec.js deleted file mode 100644 index 15fb1481d..000000000 --- a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.spec.js +++ /dev/null @@ -1,51 +0,0 @@ -import { mount, shallowMount } from "@vue/test-utils"; -import saveProgressModalQuestion from "./save-progress-modal-question"; -import { getMountOptions } from "@/helpers/unit-test-helper.js"; - -jest.mock("@/digital-components/modal/modal", () => ({ - methods: { - openModal: jest.fn(), - resetButtonStyle: jest.fn(), - }, -})); - -describe("save-progress-modal-question ", () => { - describe("when openModal is run ", () => { - test("the modal should open ", () => { - // Arrange - const { wrapper } = setupMocks({ - props: { - modelValue: "", - modalWidgetName: "testModal", - }, - }); - - // Act - wrapper.vm.openModal(); - - // Assert - expect(wrapper.vm.modal).not.toBeNull(); - }); - }); -}); - -function setupMocks({ options, props }) { - const mountOptions = getMountOptions({ - ...options, - }); - - const mockBaseMixin = { - methods: { - getCmsContent: jest.fn(), - dispatchStoreAction: jest.fn(), - }, - }; - - if (props) mountOptions.propsData = props; - - mountOptions.global.mixins = [mockBaseMixin]; - - const wrapper = mount(saveProgressModalQuestion, mountOptions); - - return { wrapper }; -} diff --git a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue b/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue deleted file mode 100644 index dcbc5d76e..000000000 --- a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue +++ /dev/null @@ -1,191 +0,0 @@ - - - - - diff --git a/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.spec.js b/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.spec.js deleted file mode 100644 index 7cc3d100c..000000000 --- a/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.spec.js +++ /dev/null @@ -1,40 +0,0 @@ -import { shallowMount } from "@vue/test-utils"; -import saveProgressQuestion from "./save-progress-question"; - -describe("save-progress-question.vue", () => { - it("Should get the modelValue", async () => { - // Arrange - const text = "test"; - const wrapper = shallowMount(saveProgressQuestion, { - props: { - modelValue: text, - }, - attachTo: document.body, - }); - - // Act - const modelValueText = wrapper.vm.value; - wrapper.vm.value = "test also"; - - // Assert - expect(modelValueText).toEqual("test"); - }); - - it("Should emit to set value", async () => { - // Arrange - const text = "test"; - const wrapper = shallowMount(saveProgressQuestion, { - props: { - modelValue: text, - }, - attachTo: document.body, - }); - - // Act - const modelValueText = wrapper.vm.value; - wrapper.vm.value = "test also"; - - // Assert - expect(wrapper.emitted("update:modelValue")).toEqual([["test also"]]); - }); -}); diff --git a/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.vue b/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.vue deleted file mode 100644 index 221aa3415..000000000 --- a/src/fmg-components/save-progress-modal-question/save-progress-question/save-progress-question.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue index d189f0f44..4d637c978 100644 --- a/src/layouts/capability-questions/capability-questions.vue +++ b/src/layouts/capability-questions/capability-questions.vue @@ -12,22 +12,13 @@ @forwardButtonAction="forwardButtonAction" @back-click="navigateBack" :key="currentGlassIndex" - :index="currentGlassIndex"> - - - - - + :index="currentGlassIndex" /> diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue index c314d7225..00df8c04b 100644 --- a/src/layouts/molding-questions/molding-questions.vue +++ b/src/layouts/molding-questions/molding-questions.vue @@ -12,22 +12,13 @@ @forwardButtonAction="forwardButtonAction" @back-click="navigateBack" :key="currentGlassIndex" - :index="currentGlassIndex"> - - - - - + :index="currentGlassIndex" /> diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue index 199a39493..bc1ec308e 100644 --- a/src/layouts/part-questions/part-questions.vue +++ b/src/layouts/part-questions/part-questions.vue @@ -12,22 +12,13 @@ @forwardButtonAction="forwardButtonAction" @back-click="navigateBack" :key="currentGlassIndex" - :index="currentGlassIndex"> - - - - - + :index="currentGlassIndex" /> diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss index a378f881e..002debed8 100644 --- a/src/styles/common-styles.scss +++ b/src/styles/common-styles.scss @@ -77,7 +77,7 @@ body { } } } -.modal-open:not(.prevent-modal-scroll) { +.modal-open { .container-fluid { &.page-container-grouped-styles { overflow: hidden; diff --git a/src/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue index 848cf3866..9cc61e051 100644 --- a/src/ux-components/button-main/button-main.vue +++ b/src/ux-components/button-main/button-main.vue @@ -5,7 +5,7 @@ :class="[ isPrimary ? 'btn-primary' : 'btn-secondary', isFloat ? 'float-end' : '', - (isLoaderDisplayed && !suppressLoader) ? 'has-loader' : '', + isLoaderDisplayed ? 'has-loader' : '', ]" @click="clicked"> {{ this.buttonText }} @@ -47,7 +47,7 @@ export default { true ); if (!this.isDisabled) { - if (!this.suppressLoader) this.isLoaderDisplayed = true; + this.isLoaderDisplayed = true; this.$emit("click-event"); } }, From 8d6cae5b761d03e0a78601f9c273584e68b58065 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Wed, 15 Jan 2025 12:27:40 -0500 Subject: [PATCH 14/17] Revert "Merge pull request #2190 from Safelite/feature/CASH-79-BE" This reverts commit 38792cabe487846dfd1d6870d9d04f154dba5bf8, reversing changes made to 09612a19dc087fba39da5ec4e4223177a14ba2e5. --- src/helpers/heritage-integration/order-helper.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js index e88a64c27..bc6b70730 100644 --- a/src/helpers/heritage-integration/order-helper.js +++ b/src/helpers/heritage-integration/order-helper.js @@ -99,14 +99,6 @@ export async function submitWorkOrder({ } export async function saveQuote({ pageNameToLog }) { - // save session back to sv2 so the email gets saved just in case they refresh or step away and come back later - await saveSession({ - pageNameToLog: pageNameToLog, - shouldAwaitSaveSessionQueue: true, - submitAfterSave: false, - createUnscheduledStatusWorkOrderForPIA: false, - }); - return await baseMixin.methods.dispatchStoreActionWithLogging( storeActions.SAVE_QUOTE, {}, From 73e0cbfa261b5a6d233f63f71346d41bc4e85bbc Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Wed, 15 Jan 2025 12:29:57 -0500 Subject: [PATCH 15/17] Revert "Merge pull request #2189 from Safelite/feature/CASH-79-BE" This reverts commit 09612a19dc087fba39da5ec4e4223177a14ba2e5, reversing changes made to b045d6e1354dcdd5532fa96c41c6816d39271c5a. --- 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 1ef9d7e59..18c2834a4 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1946,7 +1946,7 @@ export const actions = { referralCorrelationId: order.referralCorrelationId, referralNumber: order.referralNumber?.toString(), referralSequenceNumber: order.referralSequenceNumber, - emailAddress: order.customer.emailAddress, + emailAddress: "cn@gm.com", //order.customer.emailAddress, lastPage: pageNameToLog, isRepair: damage.isRepair, firstName: order.customer.firstName, From 16be256d51b4c9f6bfc93fcf6d4a570203c98265 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Wed, 15 Jan 2025 12:31:13 -0500 Subject: [PATCH 16/17] Revert "Merge pull request #2188 from Safelite/feature/CASH-79-BE" This reverts commit b045d6e1354dcdd5532fa96c41c6816d39271c5a, reversing changes made to 92a854abd1f1cfcbd369a8bc0931879fbb03479d. --- src/constants/endpoints.js | 4 -- src/constants/store-actions.js | 1 - .../heritage-integration/order-helper.js | 9 ---- src/layouts/quote/quote.vue | 9 ---- src/store/index.js | 46 +------------------ 5 files changed, 2 insertions(+), 67 deletions(-) diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js index c972d8118..16e0803e6 100644 --- a/src/constants/endpoints.js +++ b/src/constants/endpoints.js @@ -124,10 +124,6 @@ const endpoints = { url: "/order/api/v1/order/load-session", method: "POST", }, - SaveQuote: { - url: "/order/api/v1/order/initiate-saved-progress-email", - method: "POST", - }, GetSignature: { url: "/order/api/v1/order/sign", method: "POST", diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js index 45a18bace..41e5896bd 100644 --- a/src/constants/store-actions.js +++ b/src/constants/store-actions.js @@ -37,7 +37,6 @@ const storeActions = { GET_MOBILE_PREMIUM_FEE: "getMobilePremiumFee", SAVE_SESSION: "saveSession", LOAD_SESSION: "loadSession", - SAVE_QUOTE: "saveQuote", UPDATE_STORE_WITH_SAVE_SESSION_RESPONSE: "updateStoreWithSaveSessionResponse", VALIDATE_ZIP: "validateZip", PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA: "priceOrderItemsAndSaveServerData", diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js index bc6b70730..555c41325 100644 --- a/src/helpers/heritage-integration/order-helper.js +++ b/src/helpers/heritage-integration/order-helper.js @@ -98,15 +98,6 @@ export async function submitWorkOrder({ }); } -export async function saveQuote({ pageNameToLog }) { - return await baseMixin.methods.dispatchStoreActionWithLogging( - storeActions.SAVE_QUOTE, - {}, - pageNameToLog, - false - ); -} - // PRIVATE FUNCTIONS // /* diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index c83e61b23..6f3809304 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -84,11 +84,6 @@ class="mb-5 quote-disclaimer" />
-
-
- -
-
@@ -139,7 +134,6 @@ import { packageNames } from "@/constants/package-names"; import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper"; import { containsRecalParts } from "@/helpers/recal-helper"; import { externalParameterStatus } from "@/constants/external-parameters"; -import { saveQuote } from "@/helpers/heritage-integration/order-helper.js"; defineRule("option-required", required(errorMessages.OPTION_REQUIRED)); @@ -461,9 +455,6 @@ export default { }, }, methods: { - async handleClick() { - await saveQuote({ pageNameToLog: "quote" }); - }, openModalAction(modalName) { this.$refs[modalName].openModal(); }, diff --git a/src/store/index.js b/src/store/index.js index 18c2834a4..4f9bf61e3 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1931,49 +1931,6 @@ export const actions = { }, // Session API Actions - saveQuote(context, { pageNameToLog, payload }) { - const vehicle = context.getters.vehicle; - const damage = context.getters.damage; - const order = context.state.order; - const applicationUser = context.getters.applicationUser; - const lineItems = context.state.order.lineItems; - const excludeRecalInquote = context.getters.shouldHideRecalibration; - - return globalMethods.callHttpClient({ - method: endpoints.SaveQuote.method, - endpoint: endpoints.SaveQuote.url, - payload: { - referralCorrelationId: order.referralCorrelationId, - referralNumber: order.referralNumber?.toString(), - referralSequenceNumber: order.referralSequenceNumber, - emailAddress: "cn@gm.com", //order.customer.emailAddress, - lastPage: pageNameToLog, - isRepair: damage.isRepair, - firstName: order.customer.firstName, - lastName: order.customer.lastName, - savedSessionId: applicationUser.savedSessionId, - serviceState: order.serviceLocation.state, - serviceZipCode: order.serviceLocation.zipCode, - parentAccountNumber: order.payment.parentAccountNumber, - excludeRecalInquote: excludeRecalInquote, - year: vehicle.year, - make: vehicle.make, - model: vehicle.model, - isInsurance: order.payment.isInsurance ?? false, - isVerified: order.payment.insuranceCoverage.isVerified ?? false, - lineItems: { - glassParts: lineItems.glassParts, - supportingItems: lineItems.supportingItems, - vaps: lineItems.vaps, - serverData: lineItems.serverData, - promos: lineItems.promos, - }, - }, - logApiCall: true, - pageNameToLog: pageNameToLog, - }); - }, - saveSession(context, { pageNameToLog, payload }) { const vehicle = context.getters.vehicle; const damage = context.getters.damage; @@ -2051,7 +2008,8 @@ export const actions = { order.payment.insuranceCoverage.coverageStatus?.toString(), coverageVerificationType: order.payment.insuranceCoverage.coverageVerificationType, - coverageSubStatus: order.payment.insuranceCoverage.coverageSubStatus, + coverageSubStatus: + order.payment.insuranceCoverage.coverageSubStatus, }, isInsurance: order.payment.isInsurance, parentAccountNumber: order.payment.parentAccountNumber, From 9791542dc0883a7aac557a5922dc897e312b91d7 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Wed, 15 Jan 2025 13:08:41 -0500 Subject: [PATCH 17/17] Revert "Revert "Merge pull request #2199 from Safelite/feature/CASH-79-BE"" This reverts commit a90b330d466396c85eb682dc1c5c3fe6f38b15b3. --- src/helpers/logger.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/helpers/logger.js b/src/helpers/logger.js index 53c2cb808..8af062c3b 100644 --- a/src/helpers/logger.js +++ b/src/helpers/logger.js @@ -32,7 +32,12 @@ export class Logger { } formatLogEntry(message, details) { - return `Application: ${applicationConfig.APPLICATION_NAME}\n${message}\n${ + const refSeqNumber = store.getters.order.referralSequenceNumber ?? ""; + const year = store.getters.vehicle.year ?? ""; + const make = store.getters.vehicle.make ?? ""; + const model = store.getters.vehicle.model ?? ""; + const vehicle = `${year} ${make} ${model}`; + return `${new Date()} ReferralSequenceNumber: ${refSeqNumber}\nVehicle: ${vehicle}\nApplication: ${applicationConfig.APPLICATION_NAME}\n${message}\n${ details ? JSON.stringify(details, undefined, 2) : "" }`; }