From bae00307333a9ace3377690491b67dad347d81ff Mon Sep 17 00:00:00 2001 From: sheena Date: Mon, 24 Apr 2023 15:49:32 +0530 Subject: [PATCH 01/19] SSR-428 Created TPA-confirmation shell page --- .../tpa-confirmation/tpa-confirmation.vue | 80 +++++++++++++++++++ src/router/router-constants/issPage-values.js | 1 + .../router-constants/navigation-scenarios.js | 2 + src/router/router-constants/routing-table.js | 19 ++++- 4 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 src/layouts/tpa-confirmation/tpa-confirmation.vue diff --git a/src/layouts/tpa-confirmation/tpa-confirmation.vue b/src/layouts/tpa-confirmation/tpa-confirmation.vue new file mode 100644 index 00000000..53f273ee --- /dev/null +++ b/src/layouts/tpa-confirmation/tpa-confirmation.vue @@ -0,0 +1,80 @@ + + + \ No newline at end of file diff --git a/src/router/router-constants/issPage-values.js b/src/router/router-constants/issPage-values.js index f4bc54c1..327d33b0 100644 --- a/src/router/router-constants/issPage-values.js +++ b/src/router/router-constants/issPage-values.js @@ -17,6 +17,7 @@ export const issPageValues = { REVIEW_ORDER: 'review-order', SERVICE_LOCATION: 'service-location', SERVICE_PACKAGE: 'service-package', + TPA_CONFIRMATION:'tpa-confirmation', VEHICLE_DAMAGE: 'vehicle-damage', VEHICLE_LOOKUP: 'vehicle-lookup', VEHICLE_MAKE: 'vehicle-make', diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index 50ce575d..e144083f 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -46,6 +46,8 @@ const navigationScenarios = { CLICKED_FORWARD_WITH_SAFELITE: "CLICKED_FORWARD_WITH_SAFELITE", CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", + + CLICKED_FORWARD_TPA_CONFIRMATION:"CLICKED_FORWARD_TPA_CONFIRMATION", }; diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 8581612b..39c512b4 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -489,11 +489,11 @@ const routingTable = function(store) { maps: [ { scenario: navigationScenarios.CLICKED_BACK, - destinationIssPageValue: issPageValues.SERVICE_PACKAGE, + destinationIssPageValue: issPageValues.SERVICE_PACKAGE }, { scenario: navigationScenarios.CLICKED_FORWARD_WITH_REVIEW, - destinationIssPageValue: issPageValues.PAYMENT_PAGE, + destinationIssPageValue: issPageValues.PAYMENT_PAGE }, ], @@ -507,7 +507,20 @@ const routingTable = function(store) { destinationIssPageValue: issPageValues.REVIEW_PAGE } ] - } + }, + + { + issPageValue: issPageValues.TPA_CONFIRMATION, + maps: [ + + { + scenario: navigationScenarios.CLICKED_FORWARD_TPA_CONFIRMATION, + destinationIssPageValue: issPageValues.WELCOME_PAGE + }, + + ], + }, + ]; }; From 6d38d231e5d9d6a491a3eeb9f69871e0258f52d1 Mon Sep 17 00:00:00 2001 From: sheena Date: Tue, 25 Apr 2023 17:18:26 +0530 Subject: [PATCH 02/19] SSR-428 Removed the CLICKED_FORWARD_TPA_CONFIRMATION --- src/layouts/tpa-confirmation/tpa-confirmation.vue | 2 +- src/router/router-constants/navigation-scenarios.js | 2 +- src/router/router-constants/routing-table.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/layouts/tpa-confirmation/tpa-confirmation.vue b/src/layouts/tpa-confirmation/tpa-confirmation.vue index 53f273ee..d3157c9f 100644 --- a/src/layouts/tpa-confirmation/tpa-confirmation.vue +++ b/src/layouts/tpa-confirmation/tpa-confirmation.vue @@ -64,7 +64,7 @@ export default { navigateForward() { this.$router.navigate( - this.navigationScenarios.CLICKED_FORWARD_TPA_CONFIRMATION, + this.navigationScenarios.CLICKED_FORWARD, this.$route ); }, diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index e144083f..d6737d06 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -47,7 +47,7 @@ const navigationScenarios = { CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", - CLICKED_FORWARD_TPA_CONFIRMATION:"CLICKED_FORWARD_TPA_CONFIRMATION", + }; diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 39c512b4..0c821883 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -514,7 +514,7 @@ const routingTable = function(store) { maps: [ { - scenario: navigationScenarios.CLICKED_FORWARD_TPA_CONFIRMATION, + scenario: navigationScenarios.CLICKED_FORWARD, destinationIssPageValue: issPageValues.WELCOME_PAGE }, From 26f51fb24a8cff03a88afa878ff3268b07f075b1 Mon Sep 17 00:00:00 2001 From: sheena Date: Tue, 25 Apr 2023 17:20:14 +0530 Subject: [PATCH 03/19] Update navigation-scenarios.js --- src/router/router-constants/navigation-scenarios.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index d6737d06..d0a34081 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -45,9 +45,7 @@ const navigationScenarios = { CLICKED_FORWARD_WITH_SAFELITE: "CLICKED_FORWARD_WITH_SAFELITE", - CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", - - + CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", }; From 698296d72f47f129aa0e3cceab47a59ca2c95aca Mon Sep 17 00:00:00 2001 From: sheena Date: Tue, 25 Apr 2023 17:21:02 +0530 Subject: [PATCH 04/19] Update navigation-scenarios.js --- src/router/router-constants/navigation-scenarios.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index d0a34081..50ce575d 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -45,7 +45,7 @@ const navigationScenarios = { CLICKED_FORWARD_WITH_SAFELITE: "CLICKED_FORWARD_WITH_SAFELITE", - CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", + CLICKED_FORWARD_WITH_REVIEW:"CLICKED_FORWARD_WITH_REVIEW", }; From dfbda3b9d7056f21e52541e21f1116c71989c090 Mon Sep 17 00:00:00 2001 From: sheena Date: Tue, 25 Apr 2023 20:07:53 +0530 Subject: [PATCH 05/19] Update routing-table.js --- src/router/router-constants/routing-table.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 87e792a9..bd6de4c7 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -500,7 +500,7 @@ const routingTable = function(store) { destinationIssPageValue: issPageValues.SERVICE_PACKAGE }, { - scenario: navigationScenarios.CLICKED_FORWARD_WITH_REVIEW, + scenario: navigationScenarios.CLICKED_FORWARD, destinationIssPageValue: issPageValues.PAYMENT_PAGE }, From 3bedee41db3f762bebf9cf865687a17c5d10372e Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Tue, 25 Apr 2023 11:05:16 -0400 Subject: [PATCH 06/19] Fixed some routing issues caused by bad merges --- .../coverage-statement/coverage-statement.vue | 2 +- src/layouts/payment-page/payment-page.vue | 1 + src/router/router-constants/navigation-scenarios.js | 6 ++++-- src/router/router-constants/routing-table.js | 12 ++++++++---- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue index 6a52f045..d6aa5d42 100644 --- a/src/layouts/coverage-statement/coverage-statement.vue +++ b/src/layouts/coverage-statement/coverage-statement.vue @@ -145,7 +145,7 @@ export default { navigateForward() { this.$router.navigate( - this.navigationScenarios.CLICKED_FORWARD_COVERAGE_STATEMENT, + this.navigationScenarios.CLICKED_FORWARD, this.$route ); }, diff --git a/src/layouts/payment-page/payment-page.vue b/src/layouts/payment-page/payment-page.vue index 682aa32b..6982d394 100644 --- a/src/layouts/payment-page/payment-page.vue +++ b/src/layouts/payment-page/payment-page.vue @@ -65,6 +65,7 @@ export default { }, forwardButtonAction() { + this.$router.navigate(this.navigationScenarios.CLICKED_FORWARD, this.$route); }, navigateForward() { diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index 61978b87..7767781d 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -41,9 +41,11 @@ 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", - CLICKED_FORWARD_COVERAGE_STATEMENT: "CLICKED_FORWARD_COVERAGE_STATEMENT", - + //Provider Preference CLICKED_FORWARD_WITH_SAFELITE: "CLICKED_FORWARD_WITH_SAFELITE", + CLICKED_FORWARD_WITH_TPA: "CLICKED_FORWARD_WITH_TPA" + + }; diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index bd6de4c7..1376ed00 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -421,7 +421,7 @@ const routingTable = function(store) { destinationIssPageValue: issPageValues.CAPABILITY_QUESTIONS }, { - scenario: navigationScenarios.CLICKED_FORWARD_COVERAGE_STATEMENT, + scenario: navigationScenarios.CLICKED_FORWARD, destinationIssPageValue: issPageValues.PROVIDER_PREFERENCE } ] @@ -483,11 +483,11 @@ const routingTable = function(store) { maps: [ { scenario: navigationScenarios.CLICKED_BACK, - destinationIssPageValue: issPageValues.SERVICE_LOCATION + destinationIssPageValue: issPageValues.PROVIDER_PREFERENCE }, { scenario: navigationScenarios.CLICKED_FORWARD, - destinationIssPageValue: issPageValues.PROVIDER_PREFERENCE + destinationIssPageValue: issPageValues.SERVICE_LOCATION } ] }, @@ -497,7 +497,7 @@ const routingTable = function(store) { maps: [ { scenario: navigationScenarios.CLICKED_BACK, - destinationIssPageValue: issPageValues.SERVICE_PACKAGE + destinationIssPageValue: issPageValues.CONTACT_DETAILS }, { scenario: navigationScenarios.CLICKED_FORWARD, @@ -513,6 +513,10 @@ const routingTable = function(store) { { scenario: navigationScenarios.CLICKED_BACK, destinationIssPageValue: issPageValues.REVIEW_PAGE + }, + { + scenario: navigationScenarios.CLICKED_FORWARD, + destinationIssPageValue: issPageValues.WELCOME_PAGE } ] }, From 74ce3989574ecc0dd4ef7e6ea86aaacc7a4752c3 Mon Sep 17 00:00:00 2001 From: Sneha Date: Tue, 25 Apr 2023 20:48:11 +0530 Subject: [PATCH 07/19] SSR-412 Placeholder for bailout page --- src/layouts/bailout-page/bailout-page.vue | 74 +++++++++++++++++++ src/router/router-constants/issPage-values.js | 3 +- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 src/layouts/bailout-page/bailout-page.vue diff --git a/src/layouts/bailout-page/bailout-page.vue b/src/layouts/bailout-page/bailout-page.vue new file mode 100644 index 00000000..11164f8c --- /dev/null +++ b/src/layouts/bailout-page/bailout-page.vue @@ -0,0 +1,74 @@ + + + \ No newline at end of file diff --git a/src/router/router-constants/issPage-values.js b/src/router/router-constants/issPage-values.js index 2964849d..70da2a0e 100644 --- a/src/router/router-constants/issPage-values.js +++ b/src/router/router-constants/issPage-values.js @@ -28,6 +28,7 @@ export const issPageValues = { VEHICLE_STYLE: 'vehicle-style', VEHICLE_YEAR: 'vehicle-year', VIN_LOOKUP: 'vin-lookup', - TPA_SUBMIT: 'tpa-submit' + TPA_SUBMIT: 'tpa-submit', + BAILOUT_PAGE: 'bailout-page', }; \ No newline at end of file From 69866a4275ffb15f027f1fceac738c52e825599c Mon Sep 17 00:00:00 2001 From: Jeremy Zimmerman Date: Tue, 25 Apr 2023 11:46:45 -0400 Subject: [PATCH 08/19] Updated logic to support client display name. --- src/layouts/entry-page/entry-page.vue | 5 +++-- src/store/index.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/layouts/entry-page/entry-page.vue b/src/layouts/entry-page/entry-page.vue index c1a2d011..db24c722 100644 --- a/src/layouts/entry-page/entry-page.vue +++ b/src/layouts/entry-page/entry-page.vue @@ -74,6 +74,7 @@ populateISSConfigValues(data) { this.mainStore.issConfig.clientName = data.accountName; + this.mainStore.issConfig.clientDisplayName = data.accountName; // Defaults to use the client name. this.mainStore.issConfig.accountNumber = data.accountNumber; this.mainStore.issConfig.styleSheet = data.styleSheet; this.mainStore.issConfig.isCoverageEnabled = data.coverageEnabled; @@ -91,9 +92,9 @@ this.mainStore.issConfig.enableTPAFlow = true; } - if ( clientFlags.clientDisplayName != null ) + if ( clientFlags.ClientDisplayName != null ) { - this.mainStore.issConfig.clientDisplayName = clientFlags.clientDisplayName; + this.mainStore.issConfig.clientDisplayName = clientFlags.ClientDisplayName; } } catch ( e ) diff --git a/src/store/index.js b/src/store/index.js index eec2a8c4..371175bf 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -97,7 +97,7 @@ const getDefaultState = () => { }, issConfig: { clientName: "Generic Insurance", // this is the default and will be overriden by the client's name - clientDisplayName: "Generic Insurance", + clientDisplayName: "Generic Insurance", // this is the default and will be overriden by the client's name or client display name. styleSheet: "", accountNumber: 0, isCoverageEnabled: false, // Indicates if we should be calling coverage on this flow. From bd67138c978135e99807416c153104ea115dadcf Mon Sep 17 00:00:00 2001 From: Jeremy Zimmerman Date: Tue, 25 Apr 2023 11:49:42 -0400 Subject: [PATCH 09/19] comment sp --- 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 371175bf..bec787df 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -97,7 +97,7 @@ const getDefaultState = () => { }, issConfig: { clientName: "Generic Insurance", // this is the default and will be overriden by the client's name - clientDisplayName: "Generic Insurance", // this is the default and will be overriden by the client's name or client display name. + clientDisplayName: "Generic Insurance", // this is the default and will be overridden by the client's name or client display name. styleSheet: "", accountNumber: 0, isCoverageEnabled: false, // Indicates if we should be calling coverage on this flow. From cd8b36df77b2aa93ae568d322a4395daf9cf90c9 Mon Sep 17 00:00:00 2001 From: Jason Wheeler Date: Tue, 25 Apr 2023 12:26:48 -0400 Subject: [PATCH 10/19] fixed navigation issue --- src/layouts/service-packages/service-packages.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/layouts/service-packages/service-packages.vue b/src/layouts/service-packages/service-packages.vue index 1104bbd8..1158c14c 100644 --- a/src/layouts/service-packages/service-packages.vue +++ b/src/layouts/service-packages/service-packages.vue @@ -35,6 +35,7 @@ + \ No newline at end of file diff --git a/src/router/router-constants/issPage-values.js b/src/router/router-constants/issPage-values.js index 70da2a0e..6f8877bf 100644 --- a/src/router/router-constants/issPage-values.js +++ b/src/router/router-constants/issPage-values.js @@ -10,6 +10,7 @@ export const issPageValues = { COVERAGE_STATEMENT: 'coverage-statement', LICENSE_PLATE_LOOKUP: 'license-plate-lookup', MOLDING_QUESTIONS: 'molding-questions', + ORDER_CONFIRMATION: 'order-confirmation', PAYMENT_PAGE: 'payment-page', PART_QUESTIONS: 'part-questions', POLICY_HOLDER_DETAILS: 'policy-holder-details', diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 1376ed00..fe335080 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -516,7 +516,7 @@ const routingTable = function(store) { }, { scenario: navigationScenarios.CLICKED_FORWARD, - destinationIssPageValue: issPageValues.WELCOME_PAGE + destinationIssPageValue: issPageValues.ORDER_CONFIRMATION, } ] }, @@ -545,7 +545,18 @@ const routingTable = function(store) { destinationIssPageValue: issPageValues.TPA_CONFIRMATION, }, ] - } + }, + { + issPageValue: issPageValues.ORDER_CONFIRMATION, + maps: [ + + { + scenario: navigationScenarios.CLICKED_FORWARD, + destinationIssPageValue: issPageValues.WELCOME_PAGE + }, + + ], + }, ]; }; From f28b9625aa06ee68a5956ccad5d72b4f9046627c Mon Sep 17 00:00:00 2001 From: Jethe Date: Wed, 26 Apr 2023 10:57:47 +0530 Subject: [PATCH 13/19] Added TPA Search page SSR-416 --- src/layouts/tpa-search/tpa-search.vue | 78 +++++++++++++++++++ src/router/router-constants/issPage-values.js | 1 + src/router/router-constants/routing-table.js | 13 ++++ 3 files changed, 92 insertions(+) create mode 100644 src/layouts/tpa-search/tpa-search.vue diff --git a/src/layouts/tpa-search/tpa-search.vue b/src/layouts/tpa-search/tpa-search.vue new file mode 100644 index 00000000..4bbd0fba --- /dev/null +++ b/src/layouts/tpa-search/tpa-search.vue @@ -0,0 +1,78 @@ + + + \ No newline at end of file diff --git a/src/router/router-constants/issPage-values.js b/src/router/router-constants/issPage-values.js index 70da2a0e..66e82635 100644 --- a/src/router/router-constants/issPage-values.js +++ b/src/router/router-constants/issPage-values.js @@ -30,5 +30,6 @@ export const issPageValues = { VIN_LOOKUP: 'vin-lookup', TPA_SUBMIT: 'tpa-submit', BAILOUT_PAGE: 'bailout-page', + TPA_SEARCH: 'tpa-search' }; \ No newline at end of file diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 1376ed00..6424ca64 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -545,6 +545,19 @@ const routingTable = function(store) { destinationIssPageValue: issPageValues.TPA_CONFIRMATION, }, ] + }, + { + issPageValue: issPageValues.TPA_SEARCH, + maps: [ + { + scenario: navigationScenarios.CLICKED_BACK, + destinationIssPageValue: issPageValues.PROVIDER_PREFERENCE + }, + { + scenario: navigationScenarios.CLICKED_FORWARD, + destinationIssPageValue: issPageValues.TPA_SUBMIT, + }, + ] } ]; }; From 06d642e980d107170422c48ca74580df1be00f62 Mon Sep 17 00:00:00 2001 From: Jethe Date: Wed, 26 Apr 2023 12:30:26 +0530 Subject: [PATCH 14/19] Update tpa-search.vue --- src/layouts/tpa-search/tpa-search.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/layouts/tpa-search/tpa-search.vue b/src/layouts/tpa-search/tpa-search.vue index 4bbd0fba..20f579f1 100644 --- a/src/layouts/tpa-search/tpa-search.vue +++ b/src/layouts/tpa-search/tpa-search.vue @@ -73,6 +73,4 @@ export default { Form, }, } - - \ No newline at end of file + \ No newline at end of file From 051bdad4dd0b26cfc0484106c48a47ddcce434c2 Mon Sep 17 00:00:00 2001 From: Jethe Date: Wed, 26 Apr 2023 12:33:10 +0530 Subject: [PATCH 15/19] Update tpa-search.vue --- src/layouts/tpa-search/tpa-search.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/layouts/tpa-search/tpa-search.vue b/src/layouts/tpa-search/tpa-search.vue index 20f579f1..f3bb24f5 100644 --- a/src/layouts/tpa-search/tpa-search.vue +++ b/src/layouts/tpa-search/tpa-search.vue @@ -26,16 +26,11 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper"; import { settleAllPromises } from "@/helpers/layout-helper"; import { Form } from "vee-validate"; import BaseFormMixin from '@/mixins/base-form-mixin.js'; -import { useMainStore } from '@/store'; export default { name: "tpa-search", mixins: [BaseFormMixin], data() { }, - setup() { - const mainStore = useMainStore(); - return { mainStore }; - }, async beforeRouteEnter(to, from, next) { // Call APIs From ed4e772575c0dc81f7c76893ef1f636060de8121 Mon Sep 17 00:00:00 2001 From: Reddy Date: Wed, 26 Apr 2023 14:06:21 +0530 Subject: [PATCH 16/19] Update order-confirmation.vue Added the changes --- .../order-confirmation/order-confirmation.vue | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/layouts/order-confirmation/order-confirmation.vue b/src/layouts/order-confirmation/order-confirmation.vue index c1685696..2cdbc680 100644 --- a/src/layouts/order-confirmation/order-confirmation.vue +++ b/src/layouts/order-confirmation/order-confirmation.vue @@ -9,7 +9,7 @@ cmsWidgetName="SiteFooterWidget" ref="siteFooter" :isForwardActionDisabled="!meta.valid" - @ForwardClicked="navigateForward" + @ForwardClicked="forwardButtonAction" @back-clicked="backButtonAction" /> @@ -26,16 +26,9 @@ import { fetchCmsContentForPage } from "@/helpers/cms-content-helper"; import { settleAllPromises } from "@/helpers/layout-helper"; import { Form } from "vee-validate"; import BaseFormMixin from '@/mixins/base-form-mixin.js'; -import { useMainStore } from '@/store'; export default { name: "order-confirmation", - mixins: [BaseFormMixin], - data() { - }, - setup() { - const mainStore = useMainStore(); - return { mainStore }; - }, + mixins: [BaseFormMixin], async beforeRouteEnter(to, from, next) { // Call APIs @@ -58,6 +51,7 @@ export default { this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route); }, forwardButtonAction() { + return this.navigateForward(); }, navigateForward() { this.$router.navigate( @@ -73,5 +67,3 @@ export default { }, } - \ No newline at end of file From 0acf888dc00ccd77c8b365179432249701828215 Mon Sep 17 00:00:00 2001 From: Jethe Date: Wed, 26 Apr 2023 17:28:44 +0530 Subject: [PATCH 17/19] Created policy vehicle page SSR-385 --- .../policy-vehicles-question.vue | 28 ++++++++ .../policy-vehicles/policy-vehicles.vue | 71 +++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 src/layouts/policy-vehicles/policy-vehicles-question/policy-vehicles-question.vue create mode 100644 src/layouts/policy-vehicles/policy-vehicles.vue diff --git a/src/layouts/policy-vehicles/policy-vehicles-question/policy-vehicles-question.vue b/src/layouts/policy-vehicles/policy-vehicles-question/policy-vehicles-question.vue new file mode 100644 index 00000000..46d9d2d2 --- /dev/null +++ b/src/layouts/policy-vehicles/policy-vehicles-question/policy-vehicles-question.vue @@ -0,0 +1,28 @@ + + + \ No newline at end of file diff --git a/src/layouts/policy-vehicles/policy-vehicles.vue b/src/layouts/policy-vehicles/policy-vehicles.vue new file mode 100644 index 00000000..6a747bcd --- /dev/null +++ b/src/layouts/policy-vehicles/policy-vehicles.vue @@ -0,0 +1,71 @@ + + \ No newline at end of file From b801bba42eb3afaa396a5bdd6d788af5de1e3e9d Mon Sep 17 00:00:00 2001 From: Jethe Date: Wed, 26 Apr 2023 17:30:15 +0530 Subject: [PATCH 18/19] Update policy-vehicles-question.vue --- .../policy-vehicles-question/policy-vehicles-question.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/policy-vehicles/policy-vehicles-question/policy-vehicles-question.vue b/src/layouts/policy-vehicles/policy-vehicles-question/policy-vehicles-question.vue index 46d9d2d2..a69fb31c 100644 --- a/src/layouts/policy-vehicles/policy-vehicles-question/policy-vehicles-question.vue +++ b/src/layouts/policy-vehicles/policy-vehicles-question/policy-vehicles-question.vue @@ -2,7 +2,7 @@ From 8a39ff798925a18c4710470ae74dc09fd9e6608e Mon Sep 17 00:00:00 2001 From: David Back Date: Wed, 26 Apr 2023 08:18:12 -0400 Subject: [PATCH 19/19] SSR-316 and SSR-289. Please keep in mind that prices are present but incorrect. Also note that in cases of very short view height, tall modals appear underneath the header hamburger menu. This is endemic to all such situations, and not specific to these cards. --- src/global-methods.js | 2 +- .../service-package-question.vue | 64 ++++--------------- .../service-package-radio.vue | 17 ++--- .../service-packages/service-packages.vue | 61 ++++++++++++++---- src/router/router-constants/routing-table.js | 4 +- src/store/index.js | 16 +++-- 6 files changed, 85 insertions(+), 79 deletions(-) diff --git a/src/global-methods.js b/src/global-methods.js index 3f7e75b8..92e31d54 100644 --- a/src/global-methods.js +++ b/src/global-methods.js @@ -21,7 +21,7 @@ export default { url: cfDistroUrl + endpoint, data: payloadAndAnalyticsData, crossDomain: true, - responseType: {}, + responseType: 'json', headers: headers, }) .then((response) => { 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 ede27160..1a44ba9b 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 @@ -24,6 +24,7 @@ }; export default { name: 'servicePackageQuestion', + emits: ['vapsItemsSelected'], props: { cmsWidgetName: String, groupName: String, @@ -34,16 +35,10 @@ data() { return { servicePackageRadio: servicePackageRadio, - selectedPackageName: null + selectedPackageName: packageNames.TIER_ONE }; }, watch: { - availableLineItems() { - const store = useMainStore(); - if (this.allGlassPartsAndSupportingItemsHavePrices(store.order.lineItems)) { - this.selectDefaultPackage(); - } - }, selectedPackageName(newValue) { const VapsProductsInSelectedPackage = this.getVapsLineItemsForSelectedPackage(newValue); this.$emit('vapsItemsSelected', VapsProductsInSelectedPackage); @@ -51,10 +46,14 @@ }, computed: { nullSafeAvailableLineItems() { + if (this.availableLineItems?.lineItems) { + return this.availableLineItems.lineItems; + } + return this.availableLineItems ?? []; }, servicePackageAnswers() { - if (!this.cmsWidgetName) return {}; + if (!this.cmsWidgetName) return []; const cmsAnswersContent = [ { Name: 'TierOne', @@ -84,6 +83,9 @@ )); return modifiedAnswers; }, + isRecalibrationOnOrder() { + return this.lineItemsContainsPartType(partTypeStrings.RECALIBRATION); + }, frontWipersApplicableForTierTwo() { const store = useMainStore(); const frontWipersAreAvailable = this.lineItemsContainsPartType( @@ -205,50 +207,6 @@ }); return vapsPrice; }, - selectDefaultPackage() { - const store = useMainStore(); - const vapsFromStore = store.lineItems.vaps; - let lowestTierForPackage = packageNames.TIER_ONE; - if (vapsFromStore?.length > 0) { - vapsFromStore.every((vapsItem) => { - let lowestTierForThisItem = this.getLowestTierForThisItem(vapsItem); - if (lowestTierForThisItem === packageNames.TIER_THREE) { - lowestTierForPackage = packageNames.TIER_THREE; - return false; - } else if (lowestTierForThisItem === packageNames.TIER_TWO) { - lowestTierForPackage = packageNames.TIER_TWO; - return true; - } else { - return true; - } - }); - } - this.selectedPackageName = lowestTierForPackage; - }, - allGlassPartsAndSupportingItemsHavePrices(lineItems) { - if (lineItems?.glassParts) { - for (let i = 0; i < lineItems.glassParts.length; i++) { - if (this.priceIsNullOrZero(lineItems.glassParts[i])) { - return false; - } - } - } - if (lineItems?.supportingItems) { - for (let i = 0; i < lineItems.supportingItems.length; i++) { - if (this.priceIsNullOrZero(lineItems.supportingItems[i])) { - return false; - } - } - } - return true; - }, - priceIsNullOrZero(lineItem) { - return ( - (lineItem.kitPrice == null || lineItem.kitPrice == 0) && - (lineItem.laborAmount == null || lineItem.laborAmount == 0) && - (lineItem.sellingPrice == null || lineItem.sellingPrice == 0) - ); - }, getLowestTierForThisItem(vapsItem) { let lowestTierForThisItem = null; switch (vapsItem.partType) { @@ -345,7 +303,7 @@ return !!glassLocationMatches.length; }, getTotalLineItemPrice(lineItem) { - return lineItem.kitPrice + lineItem.laborAmount + lineItem.sellingPrice + return lineItem.kitPrice + lineItem.laborAmount + lineItem.sellingPrice; } }, components: { diff --git a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue index c32dd9d3..fbf3f111 100644 --- a/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue +++ b/src/layouts/service-packages/service-package-question/service-package-radio/service-package-radio.vue @@ -1,5 +1,5 @@