From 5c17e51124631b2c7745e45c06bfb424b26b3735 Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Wed, 31 May 2023 16:28:41 -0400 Subject: [PATCH 1/9] Check for if 2nd tier should be shown wasn't being used. Fixed the preparation of the tiers so that it will be hidden when it should be. --- .../service-package-question.vue | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/src/layouts/service-packages/service-package-question/service-package-question.vue b/src/layouts/service-packages/service-package-question/service-package-question.vue index ecfa647b..50a3afc5 100644 --- a/src/layouts/service-packages/service-package-question/service-package-question.vue +++ b/src/layouts/service-packages/service-package-question/service-package-question.vue @@ -63,20 +63,28 @@ }, servicePackageAnswers() { if (!this.cmsWidgetName) return []; - const cmsAnswersContent = [ + const cmsAnswersContent = []; + cmsAnswersContent.push( { Name: 'TierOne', cmsWidgetName: 'EconomyServicePackage' - }, - { - Name: 'TierTwo', - cmsWidgetName: 'StandardServicePackage' - }, + } + ); + if(this.shouldDisplayTierTwoPackage) + { + cmsAnswersContent.push( + { + Name: 'TierTwo', + cmsWidgetName: 'StandardServicePackage' + }, + ); + } + cmsAnswersContent.push( { Name: 'TierThree', cmsWidgetName: 'PremiumServicePackage' } - ]; + ); //if cms content has not yet loaded, skip if (this.getCmsContent(cmsAnswersContent[0].cmsWidgetName, 'HeaderText') == '') { return {}; @@ -96,27 +104,18 @@ return this.lineItemsContainsPartType(partTypeStrings.RECALIBRATION); }, frontWipersApplicableForTierTwo() { - const store = useMainStore(); const frontWipersAreAvailable = this.lineItemsContainsPartType( partTypeStrings.FRONT_WIPER ); - const isRepair = store.order.damage.isRepair; - const glassToReplaceContainsWindshield = this.glassToReplaceContainsGlassLocation( - glassLocations.WINDSHIELD - ); - if (frontWipersAreAvailable) { - if (isRepair) { - return true; - } else { - if (glassToReplaceContainsWindshield) { - return true; - } else { - return false; - } - } - } else { - return false; + const glassToReplaceContainsWindshield = this.glassToReplaceContainsGlassLocation(glassLocations.WINDSHIELD); + + if(frontWipersAreAvailable && (useMainStore().order.damage.isRepair || glassToReplaceContainsWindshield)) + { + return true; } + + return false; + }, rearWiperApplicableForTierTwo() { const rearWiperIsAvailable = this.lineItemsContainsPartType(partTypeStrings.REAR_WIPER); From 8879944fe07c574ab5148280ca80e6b575d445be Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Wed, 31 May 2023 16:41:35 -0400 Subject: [PATCH 2/9] updated so that it will show the line drawing of a vehicle if image url not found --- src/layouts/vehicle-selection/vehicle-selection.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/vehicle-selection/vehicle-selection.vue b/src/layouts/vehicle-selection/vehicle-selection.vue index 1e86b9fb..5e0aa53b 100644 --- a/src/layouts/vehicle-selection/vehicle-selection.vue +++ b/src/layouts/vehicle-selection/vehicle-selection.vue @@ -207,7 +207,7 @@ export default { }, computed: { displayGeneric() { - return !useMainStore().order.vehicle.imageUrl || !this.selectedStyle; + return !this.selectedStyle; } }, components: { From 94db0bf63b985beba2bf77f719b92ccdfe7b28e2 Mon Sep 17 00:00:00 2001 From: Katie Kroell Date: Thu, 1 Jun 2023 13:32:02 -0400 Subject: [PATCH 3/9] back button navigation from coverage-statement --- src/layouts/coverage-statement/coverage-statement.vue | 11 ++++++++++- src/router/router-constants/navigation-scenarios.js | 3 +++ src/router/router-constants/routing-table.js | 6 +++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue index 20f86f32..1dadeee7 100644 --- a/src/layouts/coverage-statement/coverage-statement.vue +++ b/src/layouts/coverage-statement/coverage-statement.vue @@ -33,7 +33,7 @@ @@ -140,6 +140,15 @@ export default { return false; }, + backButtonAction() { + if (useMainStore().order.damage.isRepair) { + this.$router.navigate(this.navigationScenarios.CLICKED_BACK_WITH_REPAIR, this.$route); + } + else { + this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route); + } + }, + async forwardButtonAction() { return this.navigateForward(); }, diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index 7c9e90da..5331ac76 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -52,6 +52,9 @@ const navigationScenarios = { CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS: "CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS", CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS: "CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS", + // Coverage Statement + CLICKED_BACK_WITH_REPAIR: "CLICKED_BACK_WITH_REPAIR", + //Provider Preference CLICKED_FORWARD_WITH_SAFELITE: "CLICKED_FORWARD_WITH_SAFELITE", CLICKED_FORWARD_WITH_TPA_ENABLED: "CLICKED_FORWARD_WITH_TPA_ENABLED", diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index b2aba7a7..7d3945a0 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -474,10 +474,14 @@ const routingTable = function(store) { scenario: navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS, destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS }, + { + scenario: navigationScenarios.CLICKED_BACK_WITH_REPAIR, + destinationIssPageValue: issPageValues.VEHICLE_DAMAGE + }, { scenario: navigationScenarios.CLICKED_FORWARD, destinationIssPageValue: issPageValues.PROVIDER_PREFERENCE - } + }, ] }, { From 30782afadbffdf23cd84f850990ea951de7e24f3 Mon Sep 17 00:00:00 2001 From: Katie Kroell Date: Thu, 1 Jun 2023 13:34:54 -0400 Subject: [PATCH 4/9] formatting clean up --- .../coverage-statement/coverage-statement.vue | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue index 1dadeee7..020847af 100644 --- a/src/layouts/coverage-statement/coverage-statement.vue +++ b/src/layouts/coverage-statement/coverage-statement.vue @@ -9,34 +9,29 @@
+ cmsWidgetName="verifyingCoverageStatement" + typeStyle="h5" + justifyText="center" + class="mt-4 mb-4" + id="coverage-statement-text-block" />
-

+

+ cmsWidgetName="whatHappensNextCopy" + class="mt-4 mb-2 fw-bold" + id="coverage-statement-text-block" />
-

+

- -
+ cmsWidgetName="SiteFooterWidget" + :isForwardActionDisabled="!meta.valid" + @backClicked="backButtonAction" + @forwardClicked="forwardButtonAction" + ref="siteFooter" />
From 26a0d5086b6582bb61cdb1bfbe70838c857d4976 Mon Sep 17 00:00:00 2001 From: Katie Kroell Date: Thu, 1 Jun 2023 14:46:40 -0400 Subject: [PATCH 5/9] changes to vehicle-questions-mixin to account for repairs --- .../coverage-statement/coverage-statement.spec.js | 14 +++----------- .../coverage-statement/coverage-statement.vue | 13 ++----------- src/mixins/vehicle-questions-mixin.js | 12 +++++++++--- src/mixins/vehicle-questions-mixin.spec.js | 15 +++++++++++++++ 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/layouts/coverage-statement/coverage-statement.spec.js b/src/layouts/coverage-statement/coverage-statement.spec.js index 6254f006..92cc7215 100644 --- a/src/layouts/coverage-statement/coverage-statement.spec.js +++ b/src/layouts/coverage-statement/coverage-statement.spec.js @@ -122,8 +122,7 @@ const mockMixin = { function setupMocks({ pageHeaderWidgetHeaderText, -// cmsPageContent = "CMS content goes here", -// unverifiedNonADASRepairBodyText = "repair body text", +mountOptionsMockData = {}, }) { //Mock api responses const apiResponses = { @@ -142,6 +141,7 @@ pageHeaderWidgetHeaderText, unverifiedNonADASRepairBodyText: "Repair body text", }, }; + useMainStore().order = { vehicle: { vin: "TESTVIN", @@ -171,9 +171,7 @@ pageHeaderWidgetHeaderText, settleAllPromises.mockImplementation(() => apiPromise); fetchCmsContentForPage.mockImplementation(() => Promise.resolve()); - const mountOptions = getMountOptions({ - - }); + const mountOptions = getMountOptions({}); mountOptions.mixins = [baseMixin, vehicleQuestionsMixin]; @@ -181,12 +179,6 @@ pageHeaderWidgetHeaderText, wrapper.vm.setCmsContent = baseMixin.methods.setCmsContent; - // //Mock CMS content - // const cmsContent = { - // PageContent: cmsPageContent, - // NonADASRepairBodyText: unverifiedNonADASRepairBodyText, - // }; - return { wrapper }; } diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue index 020847af..f1128f8a 100644 --- a/src/layouts/coverage-statement/coverage-statement.vue +++ b/src/layouts/coverage-statement/coverage-statement.vue @@ -29,7 +29,7 @@ @@ -134,16 +134,7 @@ export default { } return false; }, - - backButtonAction() { - if (useMainStore().order.damage.isRepair) { - this.$router.navigate(this.navigationScenarios.CLICKED_BACK_WITH_REPAIR, this.$route); - } - else { - this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route); - } - }, - + async forwardButtonAction() { return this.navigateForward(); }, diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js index 28fdc4b7..aa9d5542 100644 --- a/src/mixins/vehicle-questions-mixin.js +++ b/src/mixins/vehicle-questions-mixin.js @@ -452,9 +452,15 @@ export default { this.hasGlassLocationWithMultipleParts(partsOrQuestions); const hasChildPartQuestions = this.hasChildPartQuestions(partsOrQuestions); const hasCapabilityQuestions = this.hasCapabilityQuestions(partsOrQuestions); - let backNavigationScenario = self.mainStore.vehicle.vin - ? navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS - : navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS; + let backNavigationScenario = ""; + if (self.mainStore.order.damage.isRepair) { + backNavigationScenario = navigationScenarios.CLICKED_BACK_WITH_REPAIR; + } + else { + backNavigationScenario = self.mainStore.vehicle.vin + ? navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS + : navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS; + } const currentPage = self.$route.query.issPage; if ( diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js index 2ee9bffc..a9bc209c 100644 --- a/src/mixins/vehicle-questions-mixin.spec.js +++ b/src/mixins/vehicle-questions-mixin.spec.js @@ -2080,6 +2080,21 @@ describe("vehicle-questions-mixin", () => { }); describe("navigateBack", () => { + test("current page is coverage-statement and damage is repair => go to vehicle-damage", () => { + // Arrange + const { wrapper } = setupMocks({ issPage: issPageValues.COVERAGE_STATEMENT }); + useMainStore().order.damage.isRepair = true; + + // Act + wrapper.vm.navigateBack(); + + // Assert + expect(wrapper.vm.$router.navigate).toHaveBeenCalledWith( + navigationScenarios.CLICKED_BACK_WITH_REPAIR, + { query: { issPage: issPageValues.COVERAGE_STATEMENT } } + ); + }); + test("current page is molding questions and there are part questions, multiple parts to choose, and capability questions => go to vehicle-parts", () => { // Arrange const { wrapper } = setupMocks({ issPage: issPageValues.MOLDING_QUESTIONS }); From dd76ba88f92fec036dfb2b3c05d81790fe849960 Mon Sep 17 00:00:00 2001 From: brydon1 Date: Mon, 5 Jun 2023 11:09:38 -0400 Subject: [PATCH 6/9] Removing z index --- src/iss-components/site-header/menu-modal/menu-modal.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/iss-components/site-header/menu-modal/menu-modal.vue b/src/iss-components/site-header/menu-modal/menu-modal.vue index 1330a6da..98caab16 100644 --- a/src/iss-components/site-header/menu-modal/menu-modal.vue +++ b/src/iss-components/site-header/menu-modal/menu-modal.vue @@ -99,7 +99,6 @@ export default { justify-content: center; align-items: center; padding: 0;//Required to prevent 'squish' on iPhone - z-index: 1060; .bar1, .bar2, .bar3 { From a0f93042719676b9a5e7a8fffaf743fe12d542fa Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Mon, 5 Jun 2023 15:53:10 -0400 Subject: [PATCH 7/9] Devyn requested they be able to input text on date fields --- .../textbox-question/textbox-question.vue | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue index e13f5c4b..bbbafa9e 100644 --- a/src/digital-components/textbox-question/textbox-question.vue +++ b/src/digital-components/textbox-question/textbox-question.vue @@ -16,7 +16,6 @@ class="form-control" v-model.trim="value" v-maska="mask" - @keydown="preventDateInput" :type="type" :ref="inputId" :id="inputId" @@ -138,17 +137,6 @@ export default { this.$emit("update:modelValue", value); }, - - preventDateInput(evt) { - if (this.type === "date") { - if (/\d/.test(evt.key)) { - evt.stopPropagation(); - evt.preventDefault(); - return false; - } - } - } - }, computed: { questionText() { @@ -203,18 +191,6 @@ export default {