From a8e6dfa9c30439ec1801c223bc1f79a628eb9c21 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Tue, 21 Jan 2025 06:29:02 -0500
Subject: [PATCH] CASH-126

CASH-126 prevent back from safeliteHop pages from navigating to return-user.  also turn prettier back on for pipeline
---
 azure-pipelines.yml                            | 18 +++++++++---------
 src/layouts/quote/quote.vue                    |  2 +-
 .../service-package-radio.vue                  |  4 ++--
 src/router/index.js                            |  7 +++++--
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 23d5e6806..c47e1a8fb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -37,15 +37,15 @@ variables:
 stages:
     # PR's
     - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-        #   - stage: TestFormat
-        #     displayName: Test Code Format
-        #     jobs:
-        #         - job: checkFormatting
-        #           displayName: Check formatting
-        #           container: prettier-node
-        #           steps:
-        #               - bash: prettier --check "$(Build.SourcesDirectory)/src/**/*.(js|vue)"
-        #                 displayName: Run Prettier check
+          - stage: TestFormat
+            displayName: Test Code Format
+            jobs:
+                - job: checkFormatting
+                  displayName: Check formatting
+                  container: prettier-node
+                  steps:
+                      - bash: prettier --check "$(Build.SourcesDirectory)/src/**/*.(js|vue)"
+                        displayName: Run Prettier check
 
           - stage: TestPr
             displayName: Run Unit Tests For PullRequest
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