From e370fc80725d320d68e0de044d288be586d9e5fb Mon Sep 17 00:00:00 2001 From: FrankRua Date: Mon, 18 Apr 2022 17:19:31 -0400 Subject: [PATCH] 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();