diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index d4a45969a..7256acc69 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -495,7 +495,7 @@ export default { }, methods: { getColCount() { - if(this.packageNumber > 2) { + if (this.packageNumber > 2) { return "col-xl-8"; } else { return "col-xl-6"; diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue index fa905c975..f16ff4821 100644 --- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue +++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue @@ -152,10 +152,10 @@ export default { display: flex; flex-direction: column; &:first-child { - margin: 1rem .5rem 0 0; + margin: 1rem 0.5rem 0 0; } &:last-child { - margin: 1rem 0 0 .5rem; + margin: 1rem 0 0 0.5rem; } } diff --git a/src/router/index.js b/src/router/index.js index 594630221..ac1269eed 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -82,6 +82,7 @@ const routes = [ const fromHeritage = getQuerystringParameter(queryStrings.FROM_HERITAGE) === "true"; const fromReturnUser = from?.name === fmgPageValues.RETURN_USER; + const toPaymentPage = to.query.fmgPage?.startsWith("payment"); // Intercept all navigation if a submitted order exists in storage if (window.sessionStorage.getItem("submittedOrder") !== null) { @@ -93,12 +94,14 @@ const routes = [ // On entering the funnel "fresh", read cookie information, decide what to do next. else if (from.redirectedFrom === undefined || fromReturnUser) { // if entering the funnel from non-funnel check and see if there is already a funnel cookie. - // if so, send them to return-user page + // if so, send them to return-user page. this is catching navigation from an external page. + // safeliteHop(payment) cancel or clicking back also trigger it so exclude payment. const funnelCookieLastTouched = getFunnelCookie()?.LastTouched; if ( to?.query?.fmgPage !== fmgPageValues.RETURN_USER && !fromReturnUser && !fromHeritage && + !toPaymentPage && funnelCookieLastTouched !== null && funnelCookieLastTouched !== undefined ) { @@ -115,7 +118,7 @@ const routes = [ log(" --clear promise"); baseMixin.methods.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE); - if (!to.query.fmgPage?.startsWith("payment")) { + if (!toPaymentPage) { //payment pages used to return from safelitehop so exclude here // Remove the parameter after quote release