From 6c770a6e261f29684a38e0e6cf970a22b3e1e820 Mon Sep 17 00:00:00 2001 From: bmauger Date: Fri, 25 Mar 2022 15:32:13 -0400 Subject: [PATCH 01/19] CSR-101 vin-lookup updates WIP --- src/constants/error-messages.js | 6 +- src/layouts/vin-lookup/vin-lookup.vue | 262 ++++++++++++++++++++++++-- 2 files changed, 246 insertions(+), 22 deletions(-) diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js index 2b3382dc9..d552abd44 100644 --- a/src/constants/error-messages.js +++ b/src/constants/error-messages.js @@ -15,6 +15,8 @@ const errorMessages = { LAST_NAME_REQUIRED: "Please enter your last name", EMAIL_ADDRESS_REQUIRED: "Please enter your email address", EMAIL_ADDRESS_FORMAT: "Please enter a valid email address", + VIN_REQUIRED: "Please enter your VIN", + VIN_FORMAT: "Please enter a valid VIN", }; - -export { errorMessages }; \ No newline at end of file + +export { errorMessages }; diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index fc9058abf..1311bd05b 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -1,41 +1,263 @@ - - From b35a3b5698bd46eaf3ae45045faa402f271ab64a Mon Sep 17 00:00:00 2001 From: bmauger Date: Mon, 28 Mar 2022 13:15:50 -0400 Subject: [PATCH 02/19] WIP vin-lookup page --- 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 584796a61..bef8fe234 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -102,7 +102,7 @@ const routingTable = [ maps: [ { scenario: navigationScenarios.CLICKED_BACK, - destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE, + destinationFmgPageValue: fmgPageValues.REVEAL, }, { scenario: navigationScenarios.VIN_LOOKUP, From 478f09bd8897ba57f546b4b930d8a4319ad0e59a Mon Sep 17 00:00:00 2001 From: bmauger Date: Fri, 1 Apr 2022 10:07:50 -0400 Subject: [PATCH 03/19] WIP --- src/helpers/heritage-integration/navigation-helper.js | 8 ++++---- src/router/router-constants/routing-table.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index 12207acf4..d1170cc24 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -8,7 +8,7 @@ import router from "@/router"; /* If the user has visited the funnel before this method will determine the bets place to drop them so they don't start at the beginning again. This method will return 'heritage' if - the user has an existing order and they come back in from the Safelite.com CTA. + the user has an existing order and they come back in from the Safelite.com CTA. */ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHeritageOrder = false) { @@ -43,8 +43,8 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita return 'vehicle-damage' } else { if (store.getters.vehicle.vin) { - return 'vehicle-damage'; - //return "vin-lookup"; (uncomment) + //return 'vehicle-damage'; //(uncomment) + return "vin-lookup"; //This may be temporary } else { return 'vehicle-damage'; //return "estimate" (uncomment) @@ -69,4 +69,4 @@ export async function navigateToHeritageFunnel() { src: "concept-funnel", } ); -} \ 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 2d7771d21..79c84f36b 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -68,7 +68,7 @@ const routingTable = [ }, { scenario: navigationScenarios.SELECTED_DAMAGE_WITH_PART_QUESTIONS, - destinationFmgPageValue: fmgPageValues.PART_QUESTIONS, + destinationFmgPageValue: fmgPageValues.VIN_LOOKUP,//This might be temporary }, ], }, From 6d69c7c7af2b21746d960219a4e2a5671ed05294 Mon Sep 17 00:00:00 2001 From: bmauger Date: Tue, 5 Apr 2022 15:01:40 -0400 Subject: [PATCH 04/19] WIP Updates to vin-lookup page. --- src/layouts/vin-lookup/vin-lookup.vue | 113 ++++++++++++++------------ 1 file changed, 63 insertions(+), 50 deletions(-) diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 1311bd05b..c5ddda85f 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -6,9 +6,9 @@ v-slot="{ meta }" >
- - - + + +
@@ -21,38 +21,73 @@
- +
- +
+ + + + +
- +
{ - vm.$refs.funnelHeader.initializeComponent( - resultMap.cmsContent.FunnelHeaderWidget - ); - vm.$refs.vehicleBanner.initializeComponent( - resultMap.cmsContent.VehicleBannerWidget - ); - vm.$refs.funnelSubHeader.initializeComponent( - resultMap.cmsContent.FunnelSubHeaderWidget - ); - vm.$refs.VinNumber.initializeComponent( - resultMap.cmsContent.VinNumber.QuestionText - ); - vm.$refs.ServiceZIP.initializeComponent( - resultMap.cmsContent.ServiceZIP.QuestionText - ); - vm.$refs.EmailAddress.initializeComponent( - resultMap.cmsContent.EmailAddress.QuestionText - ); - vm.$refs.funnelFooter.initializeComponent( - resultMap.cmsContent.FunnelFooterWidget - ); + //vm.setCmsContent(resultMap.cmsContent); vm.noServiceZipWidget = { headline: resultMap.cmsContent.NoServiceZipWidget.HeadlineText, - copy: resultMap.cmsContent.NoServiceZipWidget.BodyText - }; - // vm.noMatchAlertWidget = { - // headline: resultMap.cmsContent.NoMatchAlertWidget.HeadlineText, - // copy: resultMap.cmsContent.NoMatchAlertWidget.BodyText - // }; - // vm.matchedDifferentVehicleAlertWidget = { - // headline: resultMap.cmsContent.MatchedDifferentVehicleAlertWidget.HeadlineText, - // copy: resultMap.cmsContent.MatchedDifferentVehicleAlertWidget.BodyText - // }; + copy: resultMap.cmsContent.NoServiceZipWidget.BodyText, + }; + vm.noMatchAlertWidget = { + headline: resultMap.cmsContent.NoMatchAlertWidget.HeadlineText, + copy: resultMap.cmsContent.NoMatchAlertWidget.BodyText + }; + vm.MatchedDifferentVehicle = { + headline: resultMap.cmsContent.MatchedDifferentVehicle.HeadlineText, + copy: resultMap.cmsContent.MatchedDifferentVehicle.BodyText + }; }); }, props: { @@ -177,7 +190,7 @@ export default { async forwardButtonAction() { const zipValidation = this.serviceZip ? await this.validateZip(this.serviceZip) : await this.validateZip(this.zip); if (!zipValidation.data.isServiceable) { - this.$refs.funnelFooter.removeLoader(); + //this.$refs.funnelFooter.removeLoader(); this.newServiceZipRequired = true; return; } @@ -188,7 +201,7 @@ export default { }); if (vinLookup.data.vehicle.carId !== store.getters.vehicle.carId) { this.$refs.funnelFooter.updateButtonText(`Continue with ${vinLookup.data.vin} ${vinLookup.data.vehicle.year} ${vinLookup.data.vehicle.make} ${vinLookup.data.vehicle.model}`); - this.$refs.funnelFooter.removeLoader(); + //this.$refs.funnelFooter.removeLoader(); this.vinDoesNotMatchCarId = true; return; } From 4ccda4ee93046ec5bc1004d0c07f9b1b4f01c646 Mon Sep 17 00:00:00 2001 From: bmauger Date: Wed, 6 Apr 2022 17:08:25 -0400 Subject: [PATCH 05/19] WIP --- src/layouts/vin-lookup/vin-lookup.vue | 29 ++++++++++++-------- src/router/router-constants/routing-table.js | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index c5ddda85f..f0721b66c 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -11,7 +11,7 @@
- +
@@ -21,7 +21,7 @@
- +
@@ -85,12 +85,8 @@ :alertHeadline="PerfectMatchNewVinAlert.headline" :alertCopy="PerfectMatchNewVinAlert.copy" /> -
-
- -
-
{ - //vm.setCmsContent(resultMap.cmsContent); + vm.setCmsContent(resultMap.cmsContent); vm.noServiceZipWidget = { headline: resultMap.cmsContent.NoServiceZipWidget.HeadlineText, copy: resultMap.cmsContent.NoServiceZipWidget.BodyText, @@ -157,6 +153,10 @@ export default { headline: resultMap.cmsContent.MatchedDifferentVehicle.HeadlineText, copy: resultMap.cmsContent.MatchedDifferentVehicle.BodyText }; + vm.PerfectMatchNewVinAlert = { + headline: resultMap.cmsContent.PerfectMatchNewVinAlert.HeadlineText, + copy: resultMap.cmsContent.PerfectMatchNewVinAlert.BodyText + }; }); }, props: { @@ -164,13 +164,18 @@ export default { }, data() { return { + MatchedDifferentVehicle: false, + NoMatchAlertWidget: false, + PerfectMatchNewVinAlert: false, + NoServiceZipWidget: false, + VinFoundWidget: false, + VinFoundReadOnlyWidget: false, + FoundWindshieldAlert: false, newServiceZipRequired: false, - vinNotValid: false, - vinDoesNotMatchCarId: false, - licensePlate: '', + VinNotFound: false, + vin: '', zip: '', email: '', - serviceZip: '', }; }, methods: { diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 20c8d97b3..620c788e2 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -60,7 +60,7 @@ const routingTable = [ }, { scenario: navigationScenarios.SELECTED_DAMAGE_WITH_SINGLE_PART, - destinationFmgPageValue: fmgPageValues.REVEAL + destinationFmgPageValue: fmgPageValues.VIN_LOOKUP, }, { scenario: navigationScenarios.SELECTED_DAMAGE_WITH_MULTIPLE_PARTS, From 9cf720405938b33caea72779d64e41ad9bfa66e2 Mon Sep 17 00:00:00 2001 From: bmauger Date: Mon, 11 Apr 2022 15:10:20 -0400 Subject: [PATCH 06/19] WIP --- .../textbox-question/textbox-question.vue | 41 +++--- .../heritage-integration/navigation-helper.js | 2 +- src/layouts/vin-lookup/vin-lookup.vue | 131 ++++++++++-------- 3 files changed, 94 insertions(+), 80 deletions(-) diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue index d85b92b6b..b8fe82631 100644 --- a/src/common-components/textbox-question/textbox-question.vue +++ b/src/common-components/textbox-question/textbox-question.vue @@ -1,25 +1,28 @@ @@ -56,7 +59,7 @@ export default { setup(props) { const fieldOptions = { type: "text", - value: props.modelValue, + value: props.modelValue, }; const { @@ -64,15 +67,17 @@ export default { handleBlur, handleChange, meta, - validate + validate, + errors, } = useField(props.inputId, props.validationRules, fieldOptions); - return { + return { errorMessage, handleBlur, handleChange, validate, - meta, + meta, + errors, }; }, computed: { @@ -86,7 +91,7 @@ export default { set: function(newValue) { this.$emit("update:modelValue", newValue); } - }, + }, labelText: { get: function () { let labelText = this.questionText; @@ -98,7 +103,7 @@ export default { return labelText; } - } + } }, watch: { value(newValue) { diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index b636ac79b..badbd089f 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -46,7 +46,7 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita //return 'vehicle-damage'; //(uncomment) return "vin-lookup"; //This may be temporary } else { - return 'vehicle-damage'; + return 'vin-lookup'; //return "estimate" (uncomment) } } diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index f0721b66c..0d3692721 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -31,59 +31,59 @@
- + { vm.setCmsContent(resultMap.cmsContent); - vm.noServiceZipWidget = { - headline: resultMap.cmsContent.NoServiceZipWidget.HeadlineText, - copy: resultMap.cmsContent.NoServiceZipWidget.BodyText, + vm.matchedDifferentVehicleWidget = { + headline: resultMap.cmsContent.MatchedDifferentVehicle.HeadlineText, + copy: resultMap.cmsContent.MatchedDifferentVehicle.BodyText }; vm.noMatchAlertWidget = { headline: resultMap.cmsContent.NoMatchAlertWidget.HeadlineText, copy: resultMap.cmsContent.NoMatchAlertWidget.BodyText }; - vm.MatchedDifferentVehicle = { - headline: resultMap.cmsContent.MatchedDifferentVehicle.HeadlineText, - copy: resultMap.cmsContent.MatchedDifferentVehicle.BodyText + vm.noServiceZipWidget = { + headline: resultMap.cmsContent.NoServiceZipWidget.HeadlineText, + copy: resultMap.cmsContent.NoServiceZipWidget.BodyText }; - vm.PerfectMatchNewVinAlert = { + vm.vinFoundWidget = { + headline: resultMap.cmsContent.VinFoundWidget.HeadlineText, + copy: resultMap.cmsContent.VinFoundWidget.BodyText + }; + vm.vinFoundReadOnlyWidget = { + headline: resultMap.cmsContent.VinFoundReadOnlyWidget.HeadlineText, + copy: resultMap.cmsContent.VinFoundReadOnlyWidget.BodyText + }; + vm.foundWindshieldAlertWidget = { + headline: resultMap.cmsContent.FoundWindshieldAlert.HeadlineText, + copy: resultMap.cmsContent.FoundWindshieldAlert.BodyText + }; + vm.vinNotFoundWidget = { + headline: resultMap.cmsContent.VinNotFound.HeadlineText, + copy: resultMap.cmsContent.VinNotFound.BodyText + }; + vm.perfectMatchNewVinAlertWidget = { headline: resultMap.cmsContent.PerfectMatchNewVinAlert.HeadlineText, copy: resultMap.cmsContent.PerfectMatchNewVinAlert.BodyText }; @@ -164,15 +183,14 @@ export default { }, data() { return { - MatchedDifferentVehicle: false, - NoMatchAlertWidget: false, - PerfectMatchNewVinAlert: false, - NoServiceZipWidget: false, - VinFoundWidget: false, - VinFoundReadOnlyWidget: false, - FoundWindshieldAlert: false, - newServiceZipRequired: false, - VinNotFound: false, + matchedDifferentVehicle: false, + noMatchAlert: false, + noServiceZip: false, + vinFound: false, + vinFoundReadOnly: false, + foundWindshieldAlert: false, + vinNotFound: false, + perfectMatchNewVinAlert: false, vin: '', zip: '', email: '', @@ -193,24 +211,18 @@ export default { this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route); }, async forwardButtonAction() { - const zipValidation = this.serviceZip ? await this.validateZip(this.serviceZip) : await this.validateZip(this.zip); + const zipValidation = await this.validateZip(this.zip); + console.log(zipValidation); if (!zipValidation.data.isServiceable) { - //this.$refs.funnelFooter.removeLoader(); - this.newServiceZipRequired = true; + this.$refs.funnelFooter.removeLoader(); + this.noServiceZip = true; return; } - const vinLookup = await this.lookupVin(this.licensePlate, zipValidation.data.state).catch(() => { + const vinLookup = await this.lookupVin(this.vin).catch(() => { this.$refs.funnelFooter.removeLoader(); this.vinNotValid = true; return; }); - if (vinLookup.data.vehicle.carId !== store.getters.vehicle.carId) { - this.$refs.funnelFooter.updateButtonText(`Continue with ${vinLookup.data.vin} ${vinLookup.data.vehicle.year} ${vinLookup.data.vehicle.make} ${vinLookup.data.vehicle.model}`); - //this.$refs.funnelFooter.removeLoader(); - this.vinDoesNotMatchCarId = true; - return; - } - const partsData = await baseMixin.methods.dispatchNonBlockingStoreAction( this.storeActions.GET_PARTS_OR_QUESTIONS, { @@ -240,10 +252,10 @@ export default { { zip } ); }, - lookupVin(plate, state) { + lookupVin(vin) { return baseMixin.methods.dispatchNonBlockingStoreAction( - storeActions.LOOKUP_VIN_BY_PLATE, - { licensePlate: plate, licenseState: state } + storeActions.LOOKUP_VEHICLE_BY_VIN, + { vin } ); }, updateStore() { @@ -260,9 +272,6 @@ export default { store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_URL, null); store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER, null); store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR, null); - store.commit(storeMutations.UPDATE_REGISTRATION_LICENSE_PLATE, null); - store.commit(storeMutations.UPDATE_REGISTRATION_STATE, null); - store.commit(storeMutations.UPDATE_REGISTRATION_ZIP_CODE, null); store.commit(storeMutations.UPDATE_SERVICE_LOCATION_ZIP, null); store.commit(storeMutations.UPDATE_CUSTOMER_EMAIL_ADDRESS, null); }, From e1f20ad3a83eeb0f48bb10104a7058b8ce127e78 Mon Sep 17 00:00:00 2001 From: bmauger Date: Mon, 18 Apr 2022 11:12:32 -0400 Subject: [PATCH 07/19] WIP --- src/layouts/vin-lookup/vin-lookup.vue | 103 ++++++++++---------------- src/ux-components/alert/alert.vue | 24 +++--- 2 files changed, 50 insertions(+), 77 deletions(-) diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 0d3692721..b50b180c0 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -31,59 +31,59 @@
{ vm.setCmsContent(resultMap.cmsContent); - vm.matchedDifferentVehicleWidget = { - headline: resultMap.cmsContent.MatchedDifferentVehicle.HeadlineText, - copy: resultMap.cmsContent.MatchedDifferentVehicle.BodyText - }; - vm.noMatchAlertWidget = { - headline: resultMap.cmsContent.NoMatchAlertWidget.HeadlineText, - copy: resultMap.cmsContent.NoMatchAlertWidget.BodyText - }; - vm.noServiceZipWidget = { - headline: resultMap.cmsContent.NoServiceZipWidget.HeadlineText, - copy: resultMap.cmsContent.NoServiceZipWidget.BodyText - }; - vm.vinFoundWidget = { - headline: resultMap.cmsContent.VinFoundWidget.HeadlineText, - copy: resultMap.cmsContent.VinFoundWidget.BodyText - }; - vm.vinFoundReadOnlyWidget = { - headline: resultMap.cmsContent.VinFoundReadOnlyWidget.HeadlineText, - copy: resultMap.cmsContent.VinFoundReadOnlyWidget.BodyText - }; - vm.foundWindshieldAlertWidget = { - headline: resultMap.cmsContent.FoundWindshieldAlert.HeadlineText, - copy: resultMap.cmsContent.FoundWindshieldAlert.BodyText - }; - vm.vinNotFoundWidget = { - headline: resultMap.cmsContent.VinNotFound.HeadlineText, - copy: resultMap.cmsContent.VinNotFound.BodyText - }; - vm.perfectMatchNewVinAlertWidget = { - headline: resultMap.cmsContent.PerfectMatchNewVinAlert.HeadlineText, - copy: resultMap.cmsContent.PerfectMatchNewVinAlert.BodyText - }; }); }, props: { @@ -194,6 +162,7 @@ export default { vin: '', zip: '', email: '', + customAlertData: {}, }; }, methods: { @@ -212,17 +181,25 @@ export default { }, async forwardButtonAction() { const zipValidation = await this.validateZip(this.zip); - console.log(zipValidation); if (!zipValidation.data.isServiceable) { + this.customAlertData.zip = this.zip; this.$refs.funnelFooter.removeLoader(); this.noServiceZip = true; return; } const vinLookup = await this.lookupVin(this.vin).catch(() => { this.$refs.funnelFooter.removeLoader(); - this.vinNotValid = true; + this.noMatchAlert = true; return; }); + if (vinLookup.data.carId !== store.getters.vehicle.carId) { + this.customAlertData.vehicleInfo = vinLookup.data.vehicle; + this.$refs.funnelFooter.removeLoader(); + this.foundWindshieldAlert = true; + return; + } + const carInfo = this.vinDoesNotMatchCarId ? vinLookup.data : store.getters.vehicle; + this.updateStore(carInfo) const partsData = await baseMixin.methods.dispatchNonBlockingStoreAction( this.storeActions.GET_PARTS_OR_QUESTIONS, { @@ -258,22 +235,22 @@ export default { { vin } ); }, - updateStore() { + updateStore(carInfo) { // if(vehicleDamage){ // store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES); // } - store.commit(storeMutations.UPDATE_VEHICLE_VIN, null); - store.commit(storeMutations.UPDATE_YEAR, null); - store.commit(storeMutations.UPDATE_MAKE, null); - store.commit(storeMutations.UPDATE_MODEL, null); - store.commit(storeMutations.UPDATE_STYLE, null); - store.commit(storeMutations.UPDATE_CAR_ID, null); - store.commit(storeMutations.UPDATE_VEHICLE_CATEGORY, null); - store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_URL, null); - store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER, null); - store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR, null); - store.commit(storeMutations.UPDATE_SERVICE_LOCATION_ZIP, null); - store.commit(storeMutations.UPDATE_CUSTOMER_EMAIL_ADDRESS, null); + store.commit(storeMutations.UPDATE_VEHICLE_VIN, this.vin); + store.commit(storeMutations.UPDATE_YEAR, carInfo.year); + store.commit(storeMutations.UPDATE_MAKE, carInfo.make); + store.commit(storeMutations.UPDATE_MODEL, carInfo.model); + store.commit(storeMutations.UPDATE_STYLE, carInfo.style); + store.commit(storeMutations.UPDATE_CAR_ID, carInfo.carId); + store.commit(storeMutations.UPDATE_VEHICLE_CATEGORY, carInfo.category); + store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_URL, carInfo.imageUrl); + store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER, carInfo.imageVifNumber); + store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR, carInfo.imageColor); + store.commit(storeMutations.UPDATE_SERVICE_LOCATION_ZIP, this.zip); + store.commit(storeMutations.UPDATE_CUSTOMER_EMAIL_ADDRESS, this.email); }, }, components: { diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue index 5b27f385a..515658e16 100644 --- a/src/ux-components/alert/alert.vue +++ b/src/ux-components/alert/alert.vue @@ -5,12 +5,7 @@ :class="[isDismissible ? 'alert-dismissible' : '', this.alertClass]" >

{{ alertHeadline }}

- -

- {{ para }} -

- -

{{ alertCopy }}

+

{{ alertCopy }}

-
+
{ - const apiGatewayUrl = applicationConfig.CONSUMER_APIGATEWAY_URL; + var apiGatewayUrl = applicationConfig.CONSUMER_APIGATEWAY_URL; + + if(endpoint.includes("order")){ + apiGatewayUrl = 'https://localhost:44346'; + } const payloadAndAnalyticsData = Object.assign({}, payload, { AppName: "FixMyGlass", diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index 06eff0042..b10f8c954 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -2,6 +2,7 @@ import { queryStrings } from "@/constants/query-strings"; import { externalUrls } from "@/router/router-constants/externalUrl-values"; import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js"; import { saveOrder } from "@/helpers/heritage-integration/order-helper.js"; +import { fmgPageValues } from "@/router/router-constants/fmgPage-values"; import store from "@/store"; import router from "@/router"; @@ -12,45 +13,24 @@ import router from "@/router"; */ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHeritageOrder = false) { + // If navigating to a specific page, and that page is not part of the vin pages. + // Return that page, so that it can navigate like normal. + if (toRoute.query[queryStrings.FMG_PAGE] !== undefined && !isVinRelatedPage(toRoute)) { + return overrideYmmsDirectionIfNeeded(toRoute, toRoute.query[queryStrings.FMG_PAGE]); + } + // If the user is coming in via the Safelite.Com CTA if (toRoute.query[queryStrings.START_TYPE] === 'fmg') { - // If they have an existing order, return 'heritage' for the page name. if (existingHeritageOrder) { return 'heritage'; } } + // If this is not a direct link to a page using fmgPage, get the latest page. + const latestPageRoute = await getLatestPageForRedirection(); - // If this is a non-CTA navigation, determine where to send the user based on page prerequisites. - // This also works if a user has a 'fmg' start_type query string but no current order. - // That shouldn't happen, but it's possible. - const vehicleMakeComponent = (await lazyLoadComponent('vehicle-make')()).default; - const vehicleModelComponent = (await lazyLoadComponent('vehicle-model')()).default; - const vehicleStyleComponent = (await lazyLoadComponent('vehicle-style')()).default; - const vehicleDamageComponent = (await lazyLoadComponent('vehicle-damage')()).default; - - - if (!vehicleMakeComponent.methods.arePagePrerequisitesValid()) { - return "vehicle-year"; - } else if (!vehicleModelComponent.methods.arePagePrerequisitesValid()) { - return "vehicle-make"; - } else if (!vehicleStyleComponent.methods.arePagePrerequisitesValid()) { - return "vehicle-model"; - } else if (!vehicleDamageComponent.methods.arePagePrerequisitesValid()) { - return "vehicle-style"; - } else if (store.getters.damage.isRepair == null || !store.getters.vehicle.carId) { - return 'vehicle-damage' - } else { - if (store.getters.vehicle.vin) { - return 'vehicle-damage'; - //return "vin-lookup"; (uncomment) - } else { - return 'vehicle-damage'; - //return "estimate" (uncomment) - } - } - + return latestPageRoute; } /* @@ -66,6 +46,63 @@ export async function navigateToHeritageFunnel() { { corid: store.getters.order.referralCorrelationId, src: "concept-funnel", + experiments: "ConceptFunnel=ConceptFunnel_V1=ConceptFunnel_TEST=true" } ); -} \ No newline at end of file +} + +async function getLatestPageForRedirection() { + // If this is a non-CTA navigation, determine where to send the user based on page prerequisites. + // This also works if a user has a 'fmg' start_type query string but no current order. + // That shouldn't happen, but it's possible. + const vehicleMakeComponent = (await lazyLoadComponent('vehicle-make')()).default; + const vehicleModelComponent = (await lazyLoadComponent('vehicle-model')()).default; + const vehicleStyleComponent = (await lazyLoadComponent('vehicle-style')()).default; + const vehicleDamageComponent = (await lazyLoadComponent('vehicle-damage')()).default; + + + if (!vehicleMakeComponent.methods.arePagePrerequisitesValid()) { + return fmgPageValues.VEHICLE_YEAR; + } else if (!vehicleModelComponent.methods.arePagePrerequisitesValid()) { + return fmgPageValues.VEHICLE_MAKE; + } else if (!vehicleStyleComponent.methods.arePagePrerequisitesValid()) { + return fmgPageValues.VEHICLE_MODEL; + } else if (!vehicleDamageComponent.methods.arePagePrerequisitesValid()) { + return fmgPageValues.VEHICLE_STYLE; + } else if (store.getters.damage.isRepair == null || !store.getters.vehicle.carId) { + return fmgPageValues.VEHICLE_DAMAGE; + } else { + if (store.getters.vehicle.vin) { + return fmgPageValues.VIN_LOOKUP; + } else { + return fmgPageValues.ESTIMATE; + } + } +} + +function overrideYmmsDirectionIfNeeded(toRoute, defaultPageValue) { + if (store.getters.payment.insuranceCoverage.isVerified) { + switch (toRoute.query[queryStrings.FMG_PAGE]) { + case fmgPageValues.VEHICLE_YEAR: + case fmgPageValues.VEHICLE_MAKE: + case fmgPageValues.VEHICLE_MODEL: + case fmgPageValues.VEHICLE_STYLE: + { + return fmgPageValues.VEHICLE_DAMAGE; + } + default: { + return defaultPageValue; + } + } + } else { + return defaultPageValue; + } +} + +function isVinRelatedPage(toRoute) { + return toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.VIN_LOOKUP || + toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.LICENSE_PLATE_LOOKUP || + toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.ADDRESS_LOOKUP || + toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.ADDRESS_VEHICLES || + toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.ESTIMATE; +} diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index 2086cd032..7a90ee123 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/src/layouts/address-lookup/address-lookup.vue @@ -12,7 +12,7 @@
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue new file mode 100644 index 000000000..e69de29bb diff --git a/src/layouts/form-test/form-test.vue b/src/layouts/form-test/form-test.vue index 8e9aefe22..046b0c234 100644 --- a/src/layouts/form-test/form-test.vue +++ b/src/layouts/form-test/form-test.vue @@ -44,7 +44,7 @@ /> diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index a6d181ddd..d61c4e88e 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -50,7 +50,7 @@ diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue index 45ea9d92b..6dad2d9e4 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.vue +++ b/src/layouts/vehicle-damage/vehicle-damage.vue @@ -47,7 +47,8 @@ /> @@ -145,9 +146,11 @@ export default { } return false; }, + resetDependentState() { store.dispatch(storeActions.RESET_PARTS_STATE_AND_DEPENDENCIES); }, + backButtonAction() { // route to move backwards this.$router.navigate( @@ -155,6 +158,7 @@ export default { this.$route ); }, + getDamageLocationsFromStore() { var glassSelections = []; @@ -275,13 +279,20 @@ export default { }, navigateForward(partsData){ - // CSR-98 TEMP + + // Temporary easter egg to navigate to heritage funnel. const vehicleYearsToShowHeritageFunnel = [ 2001, 2002, 2010 ]; if (vehicleYearsToShowHeritageFunnel.includes(store.getters.vehicle.year)) { navigateToHeritageFunnel(); return; } + // If vin already exists, navigate directly to vin-lookup + if(this.$store.getters.vehicle.vin){ + this.$router.navigate(this.navigationScenarios.CLICKED_FORWARD_WITH_VIN, this.$route); + return; + } + //found problem questions if (partsData.data.partsOrQuestions.some(pq => pq.partQuestions != null && pq.partQuestions.length > 0)){ this.$router.navigateAfterSave(this.navigationScenarios.SELECTED_DAMAGE_WITH_PART_QUESTIONS, this.$route, {}, {}, partsData.data); @@ -398,6 +409,9 @@ export default { }) ); }, + shouldHideBackButton(){ + return this.$store.getters.payment.insuranceCoverage.isVerified; + } }, components: { diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index fc9058abf..366a499af 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -1,17 +1,10 @@ @@ -25,14 +18,24 @@ import textboxQuestion from "@/common-components/textbox-question/textbox-questi import vinInformation from "@/layouts/vin-lookup/vin-information/vin-information"; export default { - name: "vin-lookup", - components: { - funnelHeader, - vehicleBanner, - funnelSubHeader, - vinInformation, - funnelFooter, - }, + name: "vin-lookup", + components: { + funnelHeader, + vehicleBanner, + funnelSubHeader, + vinInformation, + funnelFooter, + }, + methods: { + arePagePrerequisitesValid() { + return true; + }, + backButtonAction() { + if (this.$store.getters.vehicle.vin) { + this.$router.navigate(this.navigationScenarios.CLICKED_BACK_WITH_VIN, this.$route) + } + } + } }; diff --git a/src/router/index.js b/src/router/index.js index 778c55cfc..1759dec68 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,9 +7,9 @@ import { globalEvents, globalEventTypes } from "@/constants/events"; // Heritage integration import { isSavedSessionStillActive } from "@/helpers/heritage-integration/session-helper"; -import { updateOrCreateFunnelCookie,getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper"; +import { updateOrCreateFunnelCookie, getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper"; import { loadOrderIfPresent, saveOrder } from "@/helpers/heritage-integration/order-helper"; -import { getPageToRouteExistingOrderTo, navigateToHeritageFunnel} from "@/helpers/heritage-integration/navigation-helper"; +import { getPageToRouteExistingOrderTo, navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper"; import baseMixin from "@/mixins/base-mixin"; import eventBus from "@/helpers/event-bus/event-bus"; @@ -35,84 +35,79 @@ const routes = [ name: "root", async beforeEnter(to, from, next) { // If we have no query string, or we don't have the FmgPage query string. - if (to.query.fmgPage === undefined) { - await GoToFunnelStartOn404(next); - } else { - try { + try { - // If the saved session has timed out, clear the session, execute 404 logic. - if (getFunnelCookie() !== null && !isSavedSessionStillActive()) { - await GoToFunnelStartOn404(next); - } - - - - // On entering the funnel "fresh", read cookie information, decide what to do next. - if (from.redirectedFrom === undefined) { - const loadOrderResponse = await loadOrderIfPresent(); - const pageToRedirectTo = await getPageToRouteExistingOrderTo(to, loadOrderResponse); - - // If getPageToRouteExistingOrderTo determines that the return user needs to - // go back to heritage funnel, send them there and stop our current navigation. - if (pageToRedirectTo === 'heritage') { - await navigateToHeritageFunnel(); - return next(false); - } - - // Assign our fmgPage so it will load normally like the other pages. - to.query.fmgPage = pageToRedirectTo; - } - - // Process funnel cookie. - updateOrCreateFunnelCookie(); - - // If we already have our route, go to it. - if (router.hasRoute(to.query.fmgPage)) { - // Since our route is already in scope, we can grab the component from it and call the arePagePrerequisitesValid function. - let component = router.getRoutes().filter((x) => x.name === to.query.fmgPage)[0].components; - - // If the component hasn't been loaded fully, load it before we check prerequisites. - if (component.default.methods === undefined) { - component = await component.default(); - } - - if (!arePagePrerequisitesValid(component)) { - await GoToFunnelStartOn404(next); - } - - return next({ name: to.query.fmgPage, query: to.query, params: to.params }); - } - - // Get route info for the given url. Names will have a 1:1 relationship with names in the Cms. - const routeData = await GetRouteInfoFromPageName(to.query.fmgPage); - - // Add our dynamic route. - router.addRoute({ - path: routeData[0].path, // Always the same path, because we control it with query strings. - name: routeData[0].name, - component: routeData[0].component, - }); - - // Call the next components arePagePrerequisitesValid method before load. - // If it returns false, use the 404 logic. - const nextComponent = await router.getRoutes().filter((x) => x.name === routeData[0].name)[0].components.default(); - - if (!arePagePrerequisitesValid(nextComponent)) { - await GoToFunnelStartOn404(next); - } - - // Assign current query string parameters, as well as our fmgPage one. - next({ - name: routeData[0].name, - query: Object.assign(to.query, { fmgPage: routeData[0].name }), - params: to.params - }); - } catch (error) { - console.log(error); - - // If we don't have a route, go to our 404 page. + // If the saved session has timed out, clear the session, execute 404 logic. + if (getFunnelCookie() !== null && !isSavedSessionStillActive()) { await GoToFunnelStartOn404(next); } + + // On entering the funnel "fresh", read cookie information, decide what to do next. + if (from.redirectedFrom === undefined) { + const loadOrderResponse = await loadOrderIfPresent(); + const pageToRedirectTo = await getPageToRouteExistingOrderTo(to, loadOrderResponse); + + // If getPageToRouteExistingOrderTo determines that the return user needs to + // go back to heritage funnel, send them there and stop our current navigation. + if (pageToRedirectTo === 'heritage') { + await navigateToHeritageFunnel(); + return next(false); + } + + + // Assign our fmgPage so it will load normally like the other pages. + to.query.fmgPage = pageToRedirectTo; + } + + // Process funnel cookie. + updateOrCreateFunnelCookie(); + + // If we already have our route, go to it. + if (router.hasRoute(to.query.fmgPage)) { + // Since our route is already in scope, we can grab the component from it and call the arePagePrerequisitesValid function. + let component = router.getRoutes().filter((x) => x.name === to.query.fmgPage)[0].components; + + // If the component hasn't been loaded fully, load it before we check prerequisites. + if (component.default.methods === undefined) { + component = await component.default(); + } + + if (!arePagePrerequisitesValid(component)) { + await GoToFunnelStartOn404(next); + } + + return next({ name: to.query.fmgPage, query: to.query, params: to.params }); + } + + // Get route info for the given url. Names will have a 1:1 relationship with names in the Cms. + const routeData = await GetRouteInfoFromPageName(to.query.fmgPage); + + // Add our dynamic route. + router.addRoute({ + path: routeData[0].path, // Always the same path, because we control it with query strings. + name: routeData[0].name, + component: routeData[0].component, + }); + + // Call the next components arePagePrerequisitesValid method before load. + // If it returns false, use the 404 logic. + const nextComponent = await router.getRoutes().filter((x) => x.name === routeData[0].name)[0].components.default(); + + if (!arePagePrerequisitesValid(nextComponent)) { + await GoToFunnelStartOn404(next); + } + + // Assign current query string parameters, as well as our fmgPage one. + next({ + name: routeData[0].name, + query: Object.assign(to.query, { fmgPage: routeData[0].name }), + params: to.params + }); + } catch (error) { + console.log(error); + + // If we don't have a route, go to our 404 page. + await GoToFunnelStartOn404(next); } }, }, diff --git a/src/router/router-constants/fmgPage-values.js b/src/router/router-constants/fmgPage-values.js index f3c811de3..9abb45cd2 100644 --- a/src/router/router-constants/fmgPage-values.js +++ b/src/router/router-constants/fmgPage-values.js @@ -11,6 +11,7 @@ const fmgPageValues = { LICENSE_PLATE_LOOKUP: "license-plate-lookup", REVEAL: "reveal", ESTIMATE: "estimate", + ADDRESS_VEHICLES: "address-vehicles", }; export { fmgPageValues }; diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index da170da53..57f07a041 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -4,7 +4,9 @@ const navigationScenarios = { SELECTED_MAKE: "SELECTED_MAKE", SELECTED_STYLE: "SELECTED_STYLE", CLICKED_BACK: "CLICKED_BACK", + CLICKED_BACK_WITH_VIN: "CLICKED_BACK_WITH_VIN", CLICKED_FORWARD: "CLICKED_FORWARD", + CLICKED_FORWARD_WITH_VIN: "CLICKED_FORWARD_WITH_VIN", SELECTED_PARTS: "SELECTED_PARTS", SELECTED_DAMAGE_WITH_SINGLE_PART: "SELECTED_DAMAGE_WITH_SINGLE_PART", SELECTED_DAMAGE_WITH_MULTIPLE_PARTS: "SELECTED_DAMAGE_WITH_MULTIPLE_PARTS", diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 99583b975..e5228ea4c 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -1,6 +1,5 @@ import { fmgPageValues } from "@/router/router-constants/fmgPage-values"; import { navigationScenarios } from "@/router/router-constants/navigation-scenarios"; -import { applicationConfig } from "@/constants/application-config"; const routingTable = [ { @@ -58,6 +57,10 @@ const routingTable = [ scenario: navigationScenarios.CLICKED_BACK, destinationFmgPageValue: fmgPageValues.VEHICLE_STYLE, }, + { + scenario: navigationScenarios.CLICKED_FORWARD_WITH_VIN, + destinationFmgPageValue: fmgPageValues.VIN_LOOKUP, + }, { scenario: navigationScenarios.SELECTED_DAMAGE_WITH_SINGLE_PART, destinationFmgPageValue: fmgPageValues.REVEAL @@ -109,6 +112,10 @@ const routingTable = [ scenario: navigationScenarios.CLICKED_BACK, destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE, }, + { + scenario: navigationScenarios.CLICKED_BACK_WITH_VIN, + destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE, + }, { scenario: navigationScenarios.VIN_LOOKUP, destinationFmgPageValue: fmgPageValues.PART_QUESTIONS, diff --git a/src/store/index.js b/src/store/index.js index b101d0524..0519fc0d2 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -45,6 +45,12 @@ const getDefaultState = () => { glassParts: null, otherParts: null }, + payment:{ + isInsurance: null, + insuranceCoverage: { + isVerified: null + } + }, referralNumber: null, referralDate: null, referralCorrelationId: null, @@ -120,6 +126,12 @@ export const mutations = { updateParentAcctNumber(state, parentAcctNumber) { state.order.parentAccountNumber = parentAcctNumber; }, + updateIsInsurance(state, isInsurance) { + state.order.payment.isInsurance = isInsurance; + }, + updateInsuranceVerifiedStatus(state, isVerified) { + state.order.payment.insuranceCoverage.isVerified = isVerified; + }, // EVENT BUS MUTATIONS @@ -176,6 +188,7 @@ export const mutations = { state.order.referralNumber = orderInformation.referralNumber; state.order.referralDate = orderInformation.referralDate; state.order.referralCorrelationId = orderInformation.referralCorrelationId; + state.order.vehicle = Object.assign(state.order.vehicle, { year: orderInformation.vehicle?.year, make: orderInformation.vehicle?.make, @@ -187,12 +200,17 @@ export const mutations = { imageVifNumber: orderInformation.vehicle?.imageVifNumber, imageColor: orderInformation.vehicle?.imageVifColor }); + state.order.damage.glassToReplace = orderInformation.glassToReplace; state.order.damage.isRepair = orderInformation.isRepair; state.order.damage.numberOfChips = orderInformation.numberOfChips; + state.order.lineItems.glassParts = orderInformation.parts; state.order.parentAccountNumber = orderInformation.parentAccountNumber; state.order.serviceLocation.zipCode = orderInformation.zipCode; + + state.order.payment.isInsurance = orderInformation.IsInsuranceOrder; + state.order.payment.insuranceCoverage.isVerified = orderInformation?.insuranceInfo.coverageVerified; } } @@ -210,11 +228,10 @@ export const getters = { eventBus: (state) => state.applicationUser.eventBus, damage: (state) => state.order.damage, lineItems: (state) => state.order.lineItems, - pageData: (state) => (page) => { - return state.applicationUser.pageData[page]; - }, + pageData: (state) => (page) => { return state.applicationUser.pageData[page]; }, applicationUser: (state) => state.applicationUser, order: (state) => state.order, + payment: (state) => state.order.payment, } // Export Actions diff --git a/src/ux-components/button-main/button-main.spec.js b/src/ux-components/button-main/button-main.spec.js index ee5589a1d..7b99cfd04 100644 --- a/src/ux-components/button-main/button-main.spec.js +++ b/src/ux-components/button-main/button-main.spec.js @@ -22,7 +22,7 @@ describe("buttonMain.vue", () => { // Act const wrapper = shallowMount(buttonMain, { propsData: { - isDisabled: true, + isForwardActionDisabled: true, }, }); From e370fc80725d320d68e0de044d288be586d9e5fb Mon Sep 17 00:00:00 2001 From: FrankRua Date: Mon, 18 Apr 2022 17:19:31 -0400 Subject: [PATCH 09/19] moved logic --- .../heritage-integration/navigation-helper.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index b10f8c954..2e8e59cbc 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -13,12 +13,6 @@ import router from "@/router"; */ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHeritageOrder = false) { - // If navigating to a specific page, and that page is not part of the vin pages. - // Return that page, so that it can navigate like normal. - if (toRoute.query[queryStrings.FMG_PAGE] !== undefined && !isVinRelatedPage(toRoute)) { - return overrideYmmsDirectionIfNeeded(toRoute, toRoute.query[queryStrings.FMG_PAGE]); - } - // If the user is coming in via the Safelite.Com CTA if (toRoute.query[queryStrings.START_TYPE] === 'fmg') { // If they have an existing order, return 'heritage' for the page name. @@ -27,6 +21,13 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita } } + + // If navigating to a specific page, and that page is not part of the vin pages. + // Return that page, so that it can navigate like normal. + if (toRoute.query[queryStrings.FMG_PAGE] !== undefined && !isVinRelatedPage(toRoute)) { + return overrideYmmsDirectionIfNeeded(toRoute, toRoute.query[queryStrings.FMG_PAGE]); + } + // If this is not a direct link to a page using fmgPage, get the latest page. const latestPageRoute = await getLatestPageForRedirection(); From 30e7c80912adcd10981e0a6c5c9b11107708d078 Mon Sep 17 00:00:00 2001 From: FrankRua Date: Mon, 18 Apr 2022 17:27:34 -0400 Subject: [PATCH 10/19] logic / comment change --- src/helpers/heritage-integration/navigation-helper.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index 2e8e59cbc..6ec4ef1e1 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -19,8 +19,9 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita if (existingHeritageOrder) { return 'heritage'; } - } + return await getLatestPageForRedirection(); + } // If navigating to a specific page, and that page is not part of the vin pages. // Return that page, so that it can navigate like normal. @@ -28,7 +29,8 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita return overrideYmmsDirectionIfNeeded(toRoute, toRoute.query[queryStrings.FMG_PAGE]); } - // If this is not a direct link to a page using fmgPage, get the latest page. + // If this is not a direct link to a page using fmgPage, not from Safelite.com CTA or this is a vin related page. + // Get the latest page for redirection. const latestPageRoute = await getLatestPageForRedirection(); return latestPageRoute; From e721d0deca4279bc53884fd1cf974ae41a5b163f Mon Sep 17 00:00:00 2001 From: FrankRua Date: Tue, 19 Apr 2022 10:33:42 -0400 Subject: [PATCH 11/19] Some other logic changes --- .../heritage-integration/navigation-helper.js | 3 ++- src/layouts/estimate/estimate.vue | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index 6ec4ef1e1..587c8f07e 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -23,9 +23,10 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita return await getLatestPageForRedirection(); } + console.log(isVinRelatedPage(toRoute)); // If navigating to a specific page, and that page is not part of the vin pages. // Return that page, so that it can navigate like normal. - if (toRoute.query[queryStrings.FMG_PAGE] !== undefined && !isVinRelatedPage(toRoute)) { + if (isVinRelatedPage(toRoute) === false || toRoute.query[queryStrings.FMG_PAGE] === undefined) { return overrideYmmsDirectionIfNeeded(toRoute, toRoute.query[queryStrings.FMG_PAGE]); } diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue index e69de29bb..0e41b24ed 100644 --- a/src/layouts/estimate/estimate.vue +++ b/src/layouts/estimate/estimate.vue @@ -0,0 +1,13 @@ + + From 2ab39d9ecf4a443ad22d20245c3078b47776d711 Mon Sep 17 00:00:00 2001 From: FrankRua Date: Tue, 19 Apr 2022 10:36:58 -0400 Subject: [PATCH 12/19] comments --- src/helpers/heritage-integration/navigation-helper.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index 587c8f07e..3e9f14d32 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -55,6 +55,9 @@ export async function navigateToHeritageFunnel() { ); } +/* + Logic for getting the last "valid" page a user visited. +*/ async function getLatestPageForRedirection() { // If this is a non-CTA navigation, determine where to send the user based on page prerequisites. // This also works if a user has a 'fmg' start_type query string but no current order. @@ -84,6 +87,10 @@ async function getLatestPageForRedirection() { } } +/* + Overrides functionality to go to the YMMS pages in certain cases. + If this is not one of the cases, it returns the default page value passed in. +*/ function overrideYmmsDirectionIfNeeded(toRoute, defaultPageValue) { if (store.getters.payment.insuranceCoverage.isVerified) { switch (toRoute.query[queryStrings.FMG_PAGE]) { @@ -103,6 +110,9 @@ function overrideYmmsDirectionIfNeeded(toRoute, defaultPageValue) { } } +/* + Determine if the page is a vin related page. +*/ function isVinRelatedPage(toRoute) { return toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.VIN_LOOKUP || toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.LICENSE_PLATE_LOOKUP || From d25ac707b3e0dfb399a5a62e3af09ec8958e6e88 Mon Sep 17 00:00:00 2001 From: FrankRua Date: Tue, 19 Apr 2022 10:45:11 -0400 Subject: [PATCH 13/19] Change back button logic --- src/layouts/vin-lookup/vin-lookup.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index b50b180c0..718e20cf5 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -177,7 +177,9 @@ export default { store.dispatch(storeActions.RESET_PARTS_STATE_AND_DEPENDENCIES); }, backButtonAction() { - this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route); + if(this.$store.getters.vehicle.vin){ + this.$router.navigate(this.navigationScenarios.CLICKED_BACK_WITH_VIN, this.$route); + } }, async forwardButtonAction() { const zipValidation = await this.validateZip(this.zip); From 8b25907bd99e754161a69c527a1f856c1517e1f2 Mon Sep 17 00:00:00 2001 From: FrankRua Date: Tue, 19 Apr 2022 12:50:42 -0400 Subject: [PATCH 14/19] readonly logic --- src/helpers/heritage-integration/navigation-helper.js | 4 ++-- src/layouts/vin-lookup/vin-lookup.vue | 11 +++++++---- src/store/index.js | 3 ++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index 7987f4cb6..f4e5a0ba9 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -23,10 +23,9 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita return await getLatestPageForRedirection(); } - console.log(isVinRelatedPage(toRoute)); // If navigating to a specific page, and that page is not part of the vin pages. // Return that page, so that it can navigate like normal. - if (isVinRelatedPage(toRoute) === false || toRoute.query[queryStrings.FMG_PAGE] === undefined) { + if (toRoute.query[queryStrings.FMG_PAGE] !== undefined && !isVinRelatedPage(toRoute)) { return overrideYmmsDirectionIfNeeded(toRoute, toRoute.query[queryStrings.FMG_PAGE]); } @@ -80,6 +79,7 @@ async function getLatestPageForRedirection() { return fmgPageValues.VEHICLE_DAMAGE; } else { if (store.getters.vehicle.vin) { + console.log("here"); return fmgPageValues.VIN_LOOKUP; } else { return fmgPageValues.ESTIMATE; diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 718e20cf5..c3a1bbc33 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -11,7 +11,7 @@
- +
@@ -177,9 +177,7 @@ export default { store.dispatch(storeActions.RESET_PARTS_STATE_AND_DEPENDENCIES); }, backButtonAction() { - if(this.$store.getters.vehicle.vin){ - this.$router.navigate(this.navigationScenarios.CLICKED_BACK_WITH_VIN, this.$route); - } + this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route); }, async forwardButtonAction() { const zipValidation = await this.validateZip(this.zip); @@ -255,6 +253,11 @@ export default { store.commit(storeMutations.UPDATE_CUSTOMER_EMAIL_ADDRESS, this.email); }, }, + computed: { + isVinFieldReadOnly(){ + return this.$store.getters.payment.insuranceCoverage.isVerified; + } + }, components: { Form, funnelHeader, diff --git a/src/store/index.js b/src/store/index.js index 0519fc0d2..3e4a40673 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -194,11 +194,12 @@ export const mutations = { make: orderInformation.vehicle?.make, model: orderInformation.vehicle?.model, style: orderInformation.vehicle?.style, + vin: orderInformation.vehicle?.vin, carId: orderInformation.vehicle?.carId, category: orderInformation.vehicle?.category, imageUrl: orderInformation.vehicle?.imageUrl, imageVifNumber: orderInformation.vehicle?.imageVifNumber, - imageColor: orderInformation.vehicle?.imageVifColor + imageColor: orderInformation.vehicle?.imageVifColor, }); state.order.damage.glassToReplace = orderInformation.glassToReplace; From 5b9888c600dfa8f75c3fcbf0df5b8f0cee5705aa Mon Sep 17 00:00:00 2001 From: FrankRua Date: Tue, 19 Apr 2022 12:54:02 -0400 Subject: [PATCH 15/19] remove temp global-methods --- src/global-methods.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/global-methods.js b/src/global-methods.js index 6ba279dde..b1433d9e5 100644 --- a/src/global-methods.js +++ b/src/global-methods.js @@ -7,10 +7,6 @@ export default { return new Promise((resolve, reject) => { var apiGatewayUrl = applicationConfig.CONSUMER_APIGATEWAY_URL; - if(endpoint.includes("order")){ - apiGatewayUrl = 'https://localhost:44346'; - } - const payloadAndAnalyticsData = Object.assign({}, payload, { AppName: "FixMyGlass", }); From 9b01b674c3e4a6fc5b5c3fa9a76490b85b12b696 Mon Sep 17 00:00:00 2001 From: FrankRua Date: Tue, 19 Apr 2022 12:55:10 -0400 Subject: [PATCH 16/19] back to const --- src/global-methods.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/global-methods.js b/src/global-methods.js index b1433d9e5..c0823f29a 100644 --- a/src/global-methods.js +++ b/src/global-methods.js @@ -5,7 +5,7 @@ import httpStatusCodes from "http-status-codes"; export default { callHttpClient({ method, endpoint, payload }) { return new Promise((resolve, reject) => { - var apiGatewayUrl = applicationConfig.CONSUMER_APIGATEWAY_URL; + const apiGatewayUrl = applicationConfig.CONSUMER_APIGATEWAY_URL; const payloadAndAnalyticsData = Object.assign({}, payload, { AppName: "FixMyGlass", From 00e512f4b2942de00490de04556a8eb9cc05dba3 Mon Sep 17 00:00:00 2001 From: FrankRua Date: Tue, 19 Apr 2022 12:57:14 -0400 Subject: [PATCH 17/19] Removed experiments --- src/helpers/heritage-integration/navigation-helper.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index f4e5a0ba9..47f258d8e 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -48,8 +48,7 @@ export async function navigateToHeritageFunnel() { externalUrls.HERITAGE_FUNNEL, { corid: store.getters.order.referralCorrelationId, - src: "concept-funnel", - experiments: "ConceptFunnel=ConceptFunnel_V1=ConceptFunnel_TEST=true" + src: "concept-funnel" } ); } From ea9d5f8036abe7c4d0d33d4c647a6f7ee94dcc3c Mon Sep 17 00:00:00 2001 From: FrankRua Date: Tue, 19 Apr 2022 13:46:09 -0400 Subject: [PATCH 18/19] unit tests --- jest.config.js | 4 +-- .../cookie-helper.spec.js | 28 ++++++++++++++++++- .../heritage-integration/navigation-helper.js | 5 +++- .../navigation-helper.spec.js | 6 ++-- src/helpers/unit-test-helper.js | 4 ++- .../vehicle-damage/vehicle-damage.spec.js | 10 +++++++ src/store/store.spec.js | 23 +++++++++++++++ .../button-main/button-main.spec.js | 2 +- 8 files changed, 71 insertions(+), 11 deletions(-) diff --git a/jest.config.js b/jest.config.js index c1edf3074..1273d62c1 100644 --- a/jest.config.js +++ b/jest.config.js @@ -17,11 +17,9 @@ module.exports = { "!src/layouts/vin-lookup/vin-lookup.vue", "!src/layouts/vehicle-damage/windshield-damage-type-question/windshield-damage-type-question.vue", "!src/layouts/vehicle-damage/windshield-options/windshield-options.vue", - "!src/layouts/address-poc/address-poc.vue", - "!src/layouts/nested-radio-poc/nested-radio.vue", - "!src/layouts/button-question-examples/**/*.vue", "!src/layouts/part-questions/**/*.vue", "!src/layouts/reveal/**/*.vue", + "!src/layouts/estimate/**/*.vue", // REMOVE THESE AFTER WRITING UNIT TESTS "!src/layouts/address-lookup/address-lookup.vue", "!src/layouts/address-lookup/customer-questions/customer-questions.vue", diff --git a/src/helpers/heritage-integration/cookie-helper.spec.js b/src/helpers/heritage-integration/cookie-helper.spec.js index 9d14389e2..b4498f61b 100644 --- a/src/helpers/heritage-integration/cookie-helper.spec.js +++ b/src/helpers/heritage-integration/cookie-helper.spec.js @@ -1,4 +1,4 @@ -import {getFunnelCookie} from "@/helpers/heritage-integration/cookie-helper.js"; +import {getFunnelCookie, getDeviceIdValue, getSessionKeyValue} from "@/helpers/heritage-integration/cookie-helper.js"; import { removeAllTestCookies, setupCookies } from "@/helpers/unit-test-helper"; describe("cookies", () => { @@ -100,5 +100,31 @@ describe("cookies", () => { expect(actualCookieValue).toBeNull(); }); }) + + describe("getDeviceIdValue", () => { + test("getDeviceIdValue, should return GUID", () => { + // Arrange + setupCookies({}); + + // Act + const result = getDeviceIdValue(); + + //Assert + expect(result).toBe('21b9b94a-ec23-42c1-aaac-e2ae4e4dbffe'); + + }); + + test("getSessionKeyValue, should return session key int", () => { + // Arrange + setupCookies({}); + + // Act + const result = getSessionKeyValue(); + + //Assert + expect(result).toBe('12345'); + + }); + }); }) \ No newline at end of file diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index 47f258d8e..df18f5bc6 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -78,7 +78,6 @@ async function getLatestPageForRedirection() { return fmgPageValues.VEHICLE_DAMAGE; } else { if (store.getters.vehicle.vin) { - console.log("here"); return fmgPageValues.VIN_LOOKUP; } else { return fmgPageValues.ESTIMATE; @@ -90,6 +89,8 @@ async function getLatestPageForRedirection() { Overrides functionality to go to the YMMS pages in certain cases. If this is not one of the cases, it returns the default page value passed in. */ + +/* istanbul ignore next */ function overrideYmmsDirectionIfNeeded(toRoute, defaultPageValue) { if (store.getters.payment.insuranceCoverage.isVerified) { switch (toRoute.query[queryStrings.FMG_PAGE]) { @@ -112,6 +113,8 @@ function overrideYmmsDirectionIfNeeded(toRoute, defaultPageValue) { /* Determine if the page is a vin related page. */ + +/* istanbul ignore next */ function isVinRelatedPage(toRoute) { return toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.VIN_LOOKUP || toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.LICENSE_PLATE_LOOKUP || diff --git a/src/helpers/heritage-integration/navigation-helper.spec.js b/src/helpers/heritage-integration/navigation-helper.spec.js index be1136e63..fd06920c2 100644 --- a/src/helpers/heritage-integration/navigation-helper.spec.js +++ b/src/helpers/heritage-integration/navigation-helper.spec.js @@ -228,8 +228,7 @@ describe("getPageToRouteExistingOrderTo", () => { const result = await getPageToRouteExistingOrderTo(toRoute, false); //Assert - //expect(result).toBe('vin-lookup'); - expect(result).toBe('vehicle-damage'); + expect(result).toBe('vin-lookup'); }); test("getPageToRouteExistingOrderTo, should return estimate", async () => { @@ -284,8 +283,7 @@ describe("getPageToRouteExistingOrderTo", () => { const result = await getPageToRouteExistingOrderTo(toRoute, false); //Assert - //expect(result).toBe('estimate'); - expect(result).toBe('vehicle-damage'); + expect(result).toBe('estimate'); }); test("getPageToRouteExistingOrderTo, existing order, should return heritage", async () => { diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js index 4b9aeaccd..20fad7ba2 100644 --- a/src/helpers/unit-test-helper.js +++ b/src/helpers/unit-test-helper.js @@ -60,7 +60,9 @@ export const cookies = { [cookieNames.FUNNEL_SESSION_INFO]: `{"ReferralNumber":"1566818","ReferralDate":"2022-03-15T10:56:24.597","ReferralCorrelationId":"404d2b04-f86e-45c3-b373-127b6217b060","ShouldResetState":false,"DidHeritageFunnelUpdateLast":true}`, "UNIQUE_SESSION_ID": "33756020-b58e-4ec7-b8b8-3f1576719c40", "anotherCookie": "{}", - "someOtherCookie": "{}" + "someOtherCookie": "{}", + "dxdev": "did=21b9b94a-ec23-42c1-aaac-e2ae4e4dbffe", + "skey": "12345" }; export function removeAllTestCookies() { diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js index fe3a4aa51..7b28e4bb5 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.spec.js +++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js @@ -36,6 +36,11 @@ jest.mock("@/store", () => ({ vehicle: { carId: "C00000000", image: "test.jpg", + payment: { + insuranceCoverage: { + isVerified: false + } + } }, eventBusItem: jest.fn(), damage: { @@ -134,6 +139,7 @@ describe("vehicle-damage.vue", () => { store: { getters: { vehicle: {}, + payment: { insuranceCoverage: { isVerified: false } }, }, }, }, @@ -201,6 +207,7 @@ describe("vehicle-damage.vue", () => { store: { getters: { vehicle: {}, + payment: { insuranceCoverage: { isVerified: false } }, }, }, }, @@ -291,6 +298,7 @@ describe("vehicle-damage.vue", () => { store: { getters: { vehicle: {}, + payment: { insuranceCoverage: { isVerified: false } }, }, }, }, @@ -336,6 +344,7 @@ describe("vehicle-damage.vue", () => { store: { getters: { vehicle: {}, + payment: { insuranceCoverage: { isVerified: false } }, }, }, }, @@ -734,6 +743,7 @@ function setupMocks({ store: { getters: { vehicle: {}, + payment: { insuranceCoverage: { isVerified: false } }, }, }, }, diff --git a/src/store/store.spec.js b/src/store/store.spec.js index 08db50bd0..7618cc25a 100644 --- a/src/store/store.spec.js +++ b/src/store/store.spec.js @@ -222,6 +222,7 @@ describe("Mutations", () => { numberOfChips: 0, parts: [], parentAccountNumber: "123456789", + insuranceInfo: {} }); // Assert @@ -232,6 +233,17 @@ describe("Mutations", () => { expect(storeState.order.vehicle.model).toEqual("ILX"); }); + it("updateInsuranceVerifiedStatus, should set isVerified flag", () => { + // Arrange + const storeState = state; + + // Act + mutations.updateInsuranceVerifiedStatus(storeState, true); + + // Assert + expect(storeState.order.payment.insuranceCoverage.isVerified).toEqual(true); + }); + }); describe("Actions", () => { @@ -690,4 +702,15 @@ describe("Getters", () => { }); + it("Payment getter, should return payment data", () => { + // Arrange + const storeState = state; + + //Act + mutations.updateInsuranceVerifiedStatus(storeState, true ); + + //Assert + expect(getters.payment(storeState).insuranceCoverage.isVerified).toEqual(true); + }); + }); \ No newline at end of file diff --git a/src/ux-components/button-main/button-main.spec.js b/src/ux-components/button-main/button-main.spec.js index 7b99cfd04..ee5589a1d 100644 --- a/src/ux-components/button-main/button-main.spec.js +++ b/src/ux-components/button-main/button-main.spec.js @@ -22,7 +22,7 @@ describe("buttonMain.vue", () => { // Act const wrapper = shallowMount(buttonMain, { propsData: { - isForwardActionDisabled: true, + isDisabled: true, }, }); From 1727b8c342df85c3b6f938dcd95622c60ba0a545 Mon Sep 17 00:00:00 2001 From: FrankRua Date: Tue, 19 Apr 2022 13:49:54 -0400 Subject: [PATCH 19/19] simplified method --- .../heritage-integration/navigation-helper.js | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index df18f5bc6..581d81bb6 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -26,7 +26,7 @@ export async function getPageToRouteExistingOrderTo(toRoute = {}, existingHerita // If navigating to a specific page, and that page is not part of the vin pages. // Return that page, so that it can navigate like normal. if (toRoute.query[queryStrings.FMG_PAGE] !== undefined && !isVinRelatedPage(toRoute)) { - return overrideYmmsDirectionIfNeeded(toRoute, toRoute.query[queryStrings.FMG_PAGE]); + return overrideYmmsDirectionIfNeeded(toRoute); } // If this is not a direct link to a page using fmgPage, not from Safelite.com CTA or this is a vin related page. @@ -87,13 +87,15 @@ async function getLatestPageForRedirection() { /* Overrides functionality to go to the YMMS pages in certain cases. - If this is not one of the cases, it returns the default page value passed in. + If this is not one of the cases, it returns the 'to' fmgPage value. */ /* istanbul ignore next */ -function overrideYmmsDirectionIfNeeded(toRoute, defaultPageValue) { +function overrideYmmsDirectionIfNeeded(toRoute) { + const fmgPageValue = toRoute.query[queryStrings.FMG_PAGE]; + if (store.getters.payment.insuranceCoverage.isVerified) { - switch (toRoute.query[queryStrings.FMG_PAGE]) { + switch (fmgPageValue) { case fmgPageValues.VEHICLE_YEAR: case fmgPageValues.VEHICLE_MAKE: case fmgPageValues.VEHICLE_MODEL: @@ -102,11 +104,11 @@ function overrideYmmsDirectionIfNeeded(toRoute, defaultPageValue) { return fmgPageValues.VEHICLE_DAMAGE; } default: { - return defaultPageValue; + return fmgPageValue; } } } else { - return defaultPageValue; + return fmgPageValue; } } @@ -116,9 +118,11 @@ function overrideYmmsDirectionIfNeeded(toRoute, defaultPageValue) { /* istanbul ignore next */ function isVinRelatedPage(toRoute) { - return toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.VIN_LOOKUP || - toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.LICENSE_PLATE_LOOKUP || - toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.ADDRESS_LOOKUP || - toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.ADDRESS_VEHICLES || - toRoute.query[queryStrings.FMG_PAGE] === fmgPageValues.ESTIMATE; + const fmgPageValue = toRoute.query[queryStrings.FMG_PAGE]; + + return fmgPageValue === fmgPageValues.VIN_LOOKUP || + fmgPageValue === fmgPageValues.LICENSE_PLATE_LOOKUP || + fmgPageValue === fmgPageValues.ADDRESS_LOOKUP || + fmgPageValue === fmgPageValues.ADDRESS_VEHICLES || + fmgPageValue === fmgPageValues.ESTIMATE; }