From c3b113d301909295a58c7d08ed4b4e47fc0c8a90 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Mon, 16 Jan 2023 15:50:36 -0500
Subject: [PATCH 01/22] CSR-1083 | Child part prices not included in service
 package quotes

---
 src/mixins/base-mixin.js | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 0bebdc372..896a663ef 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -64,17 +64,12 @@ export default {
             };
         },
         getTierOnePackagePrice(lineItems) {
-            let totalPrice = 0;
-            lineItems.forEach((lineItem) => {
-                const partType = lineItem.partType.toUpperCase();
-                if (
-                    partType != partTypeStrings.FRONT_WIPER &&
-                    partType != partTypeStrings.REAR_WIPER &&
-                    partType != partTypeStrings.RAIN_DEFENSE
-                ) {
-                    totalPrice += this.getTotalLineItemPrice(lineItem);
-                }
+            let lineItemsToPrice = lineItems.filter(lineItem => {
+                return lineItem.partType != partTypeStrings.FRONT_WIPER &&
+                lineItem.partType != partTypeStrings.REAR_WIPER &&
+                lineItem.partType != partTypeStrings.RAIN_DEFENSE
             });
+            let totalPrice = this.getTotalPriceOfAllLineItemsAndChildParts(lineItemsToPrice);
             return totalPrice;
         },
         filterOutFees(lineItems) {
@@ -86,6 +81,16 @@ export default {
             });
             return filteredLineItems;
         },
+        getTotalPriceOfAllLineItemsAndChildParts(lineItems) {
+            let totalPrice = 0;
+            lineItems.forEach((lineItem) => {
+                totalPrice += this.getTotalLineItemPrice(lineItem);
+                if (lineItem.childParts) {
+                    totalPrice += this.getTotalPriceOfAllLineItemsAndChildParts(lineItem.childParts);
+                }
+            });
+            return totalPrice;
+        },
         getTotalLineItemPrice(lineItem) {
             return lineItem.kitPrice + lineItem.laborAmount + lineItem.sellingPrice;
         },

From 3e0d4a789fc989f0bac332922ddfa963c5d277f7 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Mon, 16 Jan 2023 15:59:02 -0500
Subject: [PATCH 02/22] CSR-1083 | Formatting

---
 src/mixins/base-mixin.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 896a663ef..9018de79b 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -64,10 +64,12 @@ export default {
             };
         },
         getTierOnePackagePrice(lineItems) {
-            let lineItemsToPrice = lineItems.filter(lineItem => {
-                return lineItem.partType != partTypeStrings.FRONT_WIPER &&
-                lineItem.partType != partTypeStrings.REAR_WIPER &&
-                lineItem.partType != partTypeStrings.RAIN_DEFENSE
+            let lineItemsToPrice = lineItems.filter((lineItem) => {
+                return (
+                    lineItem.partType != partTypeStrings.FRONT_WIPER &&
+                    lineItem.partType != partTypeStrings.REAR_WIPER &&
+                    lineItem.partType != partTypeStrings.RAIN_DEFENSE
+                );
             });
             let totalPrice = this.getTotalPriceOfAllLineItemsAndChildParts(lineItemsToPrice);
             return totalPrice;
@@ -86,7 +88,9 @@ export default {
             lineItems.forEach((lineItem) => {
                 totalPrice += this.getTotalLineItemPrice(lineItem);
                 if (lineItem.childParts) {
-                    totalPrice += this.getTotalPriceOfAllLineItemsAndChildParts(lineItem.childParts);
+                    totalPrice += this.getTotalPriceOfAllLineItemsAndChildParts(
+                        lineItem.childParts
+                    );
                 }
             });
             return totalPrice;

From b3edba964dcc6425c6f9b3e4237fa21f85801a5b Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Tue, 17 Jan 2023 10:19:54 -0500
Subject: [PATCH 03/22] CSR-1086 Recover from old saved sessions and errors

---
 .../heritage-integration/order-helper.js      |  2 +-
 src/store/index.js                            | 38 ++++++++++++-------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 05b4c4dc4..7cf3cc12b 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -44,7 +44,7 @@ export async function loadSessionIfPresent(isConceptInsurance) {
             funnelCookie.ReferralCorrelationId,
             isConceptInsurance
         )
-    ).data;
+    )?.data;
 }
 
 /*
diff --git a/src/store/index.js b/src/store/index.js
index c41f38ddf..d2634dd10 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -10,6 +10,7 @@ import { experimentTriggers } from "@/constants/experiments";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
 import router from "@/router";
+import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper.js";
 
 // Export State
 const getDefaultState = () => {
@@ -1059,23 +1060,32 @@ export const actions = {
                     referralCorrelationId: referralCorrelationId,
                 },
             })
-            .then((response) => {
-                // Flatten location and name properties
-                response.data.order.damage?.glassToReplace?.map((glass) => {
-                    glass.glassLocation = glass.location;
-                    glass.glassName = glass.name;
-                    delete glass.location;
-                    delete glass.name;
-                    return glass;
-                });
+            .then(
+                (response) => {
+                    // Flatten location and name properties
+                    response.data.order.damage?.glassToReplace?.map((glass) => {
+                        glass.glassLocation = glass.location;
+                        glass.glassName = glass.name;
+                        delete glass.location;
+                        delete glass.name;
+                        return glass;
+                    });
 
-                // clear the state if the existing EON does not equal what is returned from loadSession
-                if (context.state.order.eon && context.state.order.eon != response.data.eon) {
+                    // clear the state if the existing EON does not equal what is returned from loadSession
+                    if (context.state.order.eon && context.state.order.eon != response.data.eon) {
+                        context.commit(storeMutations.RESET_STATE);
+                    }
+                    context.commit(
+                        storeMutations.UPDATE_STATE_WITH_ORDER_INFORMATION,
+                        response.data
+                    );
+                    return response;
+                },
+                (error) => {
+                    deleteFunnelCookie();
                     context.commit(storeMutations.RESET_STATE);
                 }
-                context.commit(storeMutations.UPDATE_STATE_WITH_ORDER_INFORMATION, response.data);
-                return response;
-            });
+            );
     },
 
     // Business domain actions

From 6e5b98058a01da78230c227659a4205eeaf9cfe6 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 30 Jan 2023 15:39:50 -0500
Subject: [PATCH 04/22] CSR-896 Fix regex to error on more than one dot in
 email address prior to domain extension.

---
 .../address-lookup/customer-questions/customer-questions.vue    | 2 +-
 src/layouts/estimate/estimate.vue                               | 2 +-
 src/layouts/license-plate-lookup/license-plate-lookup.vue       | 2 +-
 src/layouts/vin-lookup/vin-lookup.vue                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index 5c8ee6b4e..f73d21b9c 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -56,7 +56,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.])+\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 0f8508921..e92a0bc9f 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -120,7 +120,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.])+\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 5b7c0b568..1abf2daf7 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -120,7 +120,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.])+\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 6db8736c3..b5a39b310 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -145,7 +145,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.])+\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );

From 10e1c9a17293e982d045e81b8a4c47e8244aa9a2 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 30 Jan 2023 16:59:15 -0500
Subject: [PATCH 05/22] Update regex.

---
 .../address-lookup/customer-questions/customer-questions.vue    | 2 +-
 src/layouts/estimate/estimate.vue                               | 2 +-
 src/layouts/license-plate-lookup/license-plate-lookup.vue       | 2 +-
 src/layouts/vin-lookup/vin-lookup.vue                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index f73d21b9c..172973e28 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -56,7 +56,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.])+\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9]+)\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index e92a0bc9f..2efff8d21 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -120,7 +120,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.])+\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9]+)\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 1abf2daf7..9714e2ead 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -120,7 +120,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.])+\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9]+)\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index b5a39b310..e118f9664 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -145,7 +145,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.])+\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9]+)\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );

From 9817c7d3282a456ddbca89590c11a915fe5dcffa Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 31 Jan 2023 08:26:18 -0500
Subject: [PATCH 06/22] Add dash to regex.

---
 .../address-lookup/customer-questions/customer-questions.vue    | 2 +-
 src/layouts/estimate/estimate.vue                               | 2 +-
 src/layouts/license-plate-lookup/license-plate-lookup.vue       | 2 +-
 src/layouts/vin-lookup/vin-lookup.vue                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index 172973e28..f0b2e9b33 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -56,7 +56,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 2efff8d21..c6d691e16 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -120,7 +120,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 9714e2ead..afa442e09 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -120,7 +120,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index e118f9664..e48f0e42b 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -145,7 +145,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );

From 081eab992cb4535d46394f766e0902e8ebf7bc3d Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 31 Jan 2023 16:15:38 -0500
Subject: [PATCH 07/22] Remove errant text and fix regex build error.

---
 .../address-lookup/customer-questions/customer-questions.vue   | 2 +-
 src/layouts/estimate/estimate.vue                              | 2 +-
 src/layouts/license-plate-lookup/license-plate-lookup.vue      | 2 +-
 src/layouts/vin-lookup/vin-lookup.vue                          | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index f0b2e9b33..cfc121731 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -56,7 +56,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9-]+)\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index c6d691e16..f46034412 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -120,7 +120,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9-]+)\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index afa442e09..9f3b8c349 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -120,7 +120,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9-]+)\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index e48f0e42b..75d7b019f 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -1,4 +1,3 @@
-fmg
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
@@ -145,7 +144,7 @@ defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIR
 defineRule(
     "email-address-format",
     regex(
-        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9\-]+)\.([a-zA-Z]{2,})$/,
+        /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9-]+)\.([a-zA-Z]{2,})$/,
         errorMessages.EMAIL_ADDRESS_FORMAT
     )
 );

From 024ac5cf81ad1bae6c58c01f6d3cb23899316243 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Tue, 31 Jan 2023 17:05:05 -0500
Subject: [PATCH 08/22] CSR-1058 | URI encode the serverData

---
 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 d2634dd10..93a3e5a25 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1432,7 +1432,7 @@ export const actions = {
             `${availableLineItemsFormattedForRequest}`;
         const lineItemServerData = context.getters.order.lineItems.serverData;
         if (lineItemServerData) {
-            queryString += `&ServerData=${lineItemServerData}`;
+            queryString += `&ServerData=${encodeURIComponent(lineItemServerData)}`;
         }
         const response = await globalMethods.callHttpClient({
             method: endpoints.PriceOrderItems.method,

From 4deebe3ed61a9aee74c1e502cc8d5a188a14557b Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 1 Feb 2023 13:17:09 -0500
Subject: [PATCH 09/22] CSR-1110 remove reveal page and references.

---
 src/layouts/reveal/reveal.vue                 | 66 -------------------
 src/router/router-constants/fmgPage-values.js |  1 -
 src/router/router-constants/routing-table.js  | 13 ----
 3 files changed, 80 deletions(-)
 delete mode 100644 src/layouts/reveal/reveal.vue

diff --git a/src/layouts/reveal/reveal.vue b/src/layouts/reveal/reveal.vue
deleted file mode 100644
index b416b5318..000000000
--- a/src/layouts/reveal/reveal.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
-    <div class="container-fluid shadow rounded-3 p-2 position-relative make-tall">
-        <funnelHeader cmsWidgetName="FunnelHeaderWidget" ref="funnelHeader" />
-        <h1>Reveal Confetti Page Placeholder</h1>
-        <funnelFooter
-            cmsWidgetName="FunnelFooterWidget"
-            ref="funnelFooter"
-            @back-clicked="backButtonAction" />
-    </div>
-</template>
-
-<script>
-// Components
-import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
-
-// Supporting Files
-import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
-import { settleAllPromises } from "@/helpers/layout-helper";
-import { storeMutations } from "@/constants/store-mutations";
-import { storeActions } from "@/constants/store-actions";
-import store from "@/store";
-
-export default {
-    name: "quote",
-    async beforeRouteEnter(to, from, next) {
-        // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
-
-        // Settle promises and get results
-        const promiseResultMap = [
-            {
-                resultKey: "cmsContent",
-                promise: cmsContentPromise,
-            },
-        ];
-
-        const resultMap = await settleAllPromises(promiseResultMap);
-
-        // Call the "next" function to complete the transition to this page.
-        next((vm) => {
-            vm.setCmsContent(resultMap.cmsContent);
-        });
-    },
-    methods: {
-        backButtonAction() {
-            // route to move backwards
-            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
-        },
-        arePagePrerequisitesValid() {
-            return true;
-        },
-        resetDependentState() {
-            // Set
-            store.commit(storeMutations.UPDATE_GLASS_PARTS, null);
-            // Invokes
-            store.dispatch(storeActions.RESET_PARTS_AND_DEPS);
-        },
-    },
-    data() {},
-    components: {
-        funnelHeader,
-        funnelFooter,
-    },
-};
-</script>
diff --git a/src/router/router-constants/fmgPage-values.js b/src/router/router-constants/fmgPage-values.js
index c237d3c5b..65ef99be4 100644
--- a/src/router/router-constants/fmgPage-values.js
+++ b/src/router/router-constants/fmgPage-values.js
@@ -11,7 +11,6 @@ const fmgPageValues = {
     MOLDING_QUESTIONS: "molding-questions",
     CAPABILITY_QUESTIONS: "capability-questions",
     LICENSE_PLATE_LOOKUP: "license-plate-lookup",
-    REVEAL: "reveal",
     ESTIMATE: "estimate",
     ADDRESS_VEHICLES: "address-vehicles",
     QUOTE: "quote",
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 26fd55476..dbd1ca9bb 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -79,15 +79,6 @@ const routingTable = function (store) {
                 },
             ],
         },
-        {
-            fmgPageValue: fmgPageValues.REVEAL,
-            maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_BACK,
-                    destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE,
-                },
-            ],
-        },
         {
             fmgPageValue: fmgPageValues.VIN_LOOKUP,
             maps: [
@@ -305,10 +296,6 @@ const routingTable = function (store) {
         {
             fmgPageValue: fmgPageValues.VEHICLE_PARTS,
             maps: [
-                {
-                    scenario: navigationScenarios.CLICKED_FORWARD,
-                    destinationFmgPageValue: fmgPageValues.REVEAL,
-                },
                 {
                     scenario: navigationScenarios.CLICKED_BACK_WITH_PART_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.PART_QUESTIONS,

From b0ff984f75a9ef78c87e6299e60b9e602f592daf Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 1 Feb 2023 14:42:10 -0500
Subject: [PATCH 10/22] CSR-1156 move css to appropriate pages.

---
 .../button-question/button-question.vue        | 18 ------------------
 .../questions-page-layout.vue                  |  3 ++-
 src/layouts/vehicle-parts/vehicle-parts.vue    | 10 ++++++++++
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 4c60b0708..ec73b348b 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -255,22 +255,4 @@ export default {
         text-align: center;
     }
 }
-
-.vehicle-parts {
-    .question-text {
-        span {
-            font-size: 0.875rem;
-            text-align: left;
-            margin: 0 0 0.5rem 0;
-        }
-    }
-    .question-text {
-        margin: 0;
-    }
-    fieldset {
-        .ui-radio {
-            margin: 0;
-        }
-    }
-}
 </style>
diff --git a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
index f6bb2a656..a900cfba9 100644
--- a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
+++ b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
@@ -98,9 +98,10 @@ export default {
 .questions-page {
     .question-text {
         margin-bottom: 0.5rem;
-
         span {
+            font-size: 0.875rem;
             text-align: left;
+            margin: 0 0 0.5rem 0;
         }
     }
 }
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 5723cd0a8..6df0b7393 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -227,3 +227,13 @@ export default {
     },
 };
 </script>
+
+<style lang="scss">
+.vehicle-parts {
+    fieldset {
+        .ui-radio {
+            margin: 0;
+        }
+    }
+}
+</style>

From bc617b8d793fcf84fc741e193c7313da495fba78 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 2 Feb 2023 13:43:56 -0500
Subject: [PATCH 11/22] Revert "CSR-1156 move css to appropriate pages."

This reverts commit b0ff984f75a9ef78c87e6299e60b9e602f592daf.
---
 .../button-question/button-question.vue        | 18 ++++++++++++++++++
 .../questions-page-layout.vue                  |  3 +--
 src/layouts/vehicle-parts/vehicle-parts.vue    | 10 ----------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index ec73b348b..4c60b0708 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -255,4 +255,22 @@ export default {
         text-align: center;
     }
 }
+
+.vehicle-parts {
+    .question-text {
+        span {
+            font-size: 0.875rem;
+            text-align: left;
+            margin: 0 0 0.5rem 0;
+        }
+    }
+    .question-text {
+        margin: 0;
+    }
+    fieldset {
+        .ui-radio {
+            margin: 0;
+        }
+    }
+}
 </style>
diff --git a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
index a900cfba9..f6bb2a656 100644
--- a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
+++ b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
@@ -98,10 +98,9 @@ export default {
 .questions-page {
     .question-text {
         margin-bottom: 0.5rem;
+
         span {
-            font-size: 0.875rem;
             text-align: left;
-            margin: 0 0 0.5rem 0;
         }
     }
 }
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 6df0b7393..5723cd0a8 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -227,13 +227,3 @@ export default {
     },
 };
 </script>
-
-<style lang="scss">
-.vehicle-parts {
-    fieldset {
-        .ui-radio {
-            margin: 0;
-        }
-    }
-}
-</style>

From db056adf44f8a005780b4f96c3158e6d1fa73d5e Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Thu, 2 Feb 2023 13:59:41 -0500
Subject: [PATCH 12/22] CSR-1157 button question change from ISS

---
 src/digital-components/button-question/button-question.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 4c60b0708..e874a40f6 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -209,7 +209,7 @@ export default {
     },
     methods: {
         formatString(str) {
-            return str?.replaceAll(" ", "-");
+            return String(str).replaceAll(" ", "-");
         },
         setLastValuePushedToGa(lastValuePushedToGa) {
             this.lastValuePushedToGa = lastValuePushedToGa;

From 5c3937798b9e49a802d554cae704b54eeae277aa Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 2 Feb 2023 15:46:08 -0500
Subject: [PATCH 13/22] Remove unused css.

This reverts commit b0ff984f75a9ef78c87e6299e60b9e602f592daf.
---
 .../button-question/button-question.vue        | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 4c60b0708..ec73b348b 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -255,22 +255,4 @@ export default {
         text-align: center;
     }
 }
-
-.vehicle-parts {
-    .question-text {
-        span {
-            font-size: 0.875rem;
-            text-align: left;
-            margin: 0 0 0.5rem 0;
-        }
-    }
-    .question-text {
-        margin: 0;
-    }
-    fieldset {
-        .ui-radio {
-            margin: 0;
-        }
-    }
-}
 </style>

From 6ee2e80a23c9b6918ad0176ab4b252fd5356b150 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Thu, 2 Feb 2023 16:16:15 -0500
Subject: [PATCH 14/22] CSR-976 always nav back to vin-lookup when vin exists

---
 src/mixins/vehicle-questions-mixin.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 93e57daeb..32739426f 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -493,6 +493,11 @@ export default {
                     ? navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS
                     : navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS;
 
+            if (vin) {
+                backNavigationScenario =
+                    navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS;
+            }
+
             if (
                 hasCapabilityQuestions &&
                 this.currentPageComesAfterPage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)

From adeba5d936c8d873e29e7423aa2a1a9070e93644 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Fri, 3 Feb 2023 09:46:54 -0500
Subject: [PATCH 15/22] CSR-976 cleanup back vin condition

---
 src/mixins/vehicle-questions-mixin.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 32739426f..718f8fc50 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -485,19 +485,13 @@ export default {
                 this.hasGlassLocationWithMultipleParts(allPartsOrQuestions);
             const hasChildPartQuestions = this.hasChildPartQuestions(allPartsOrQuestions);
             const hasCapabilityQuestions = this.hasCapabilityQuestions(allPartsOrQuestions);
-            const skipVinLookup = await store.dispatch(storeActions.IS_VIN_OPTIONAL_VEHICLE);
 
             const vin = self.$store.getters.vehicle.vin;
             let backNavigationScenario =
-                !vin || vin === "" || skipVinLookup
+                !vin || vin === ""
                     ? navigationScenarios.CLICKED_BACK_WITH_NO_VIN_NOR_QUESTIONS
                     : navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS;
 
-            if (vin) {
-                backNavigationScenario =
-                    navigationScenarios.CLICKED_BACK_WITH_VIN_AND_NO_MORE_QUESTIONS;
-            }
-
             if (
                 hasCapabilityQuestions &&
                 this.currentPageComesAfterPage(currentPage, fmgPageValues.CAPABILITY_QUESTIONS)

From 31d787d62d8231d08878efeafb79ca4fd670b899 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 3 Feb 2023 10:55:12 -0500
Subject: [PATCH 16/22] Refactor method, add prop.

---
 .../button-question/button-question.vue       | 39 +++++++++++++++----
 .../glass-part-question.vue                   |  1 +
 src/layouts/vehicle-parts/vehicle-parts.vue   |  2 +-
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index ec73b348b..7e32f6f08 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -5,7 +5,10 @@ https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Com
         :class="
             isOverflowScrollable ? 'button-question button-question-overflow' : 'button-question'
         ">
-        <div v-if="questionText && answers && answers.length > 0" class="question-text d-flex">
+        <div
+            v-if="questionText && answers && answers.length > 0"
+            class="question-text d-flex"
+            :class="{ 'small-question-text': isSmallQuestionText }">
             <span class="fw-bold w-100">{{ questionText }}</span>
         </div>
 
@@ -123,6 +126,7 @@ export default {
         useTextForValue: Boolean,
         valueToLogType: String,
         additionalButtonStyling: String,
+        isSmallQuestionText: Boolean,
     },
     beforeMount() {
         if (this.buttonTypeObject) {
@@ -136,13 +140,15 @@ export default {
     },
     computed: {
         getFieldSetClasses() {
-            if (this.isOverflowScrollable) {
-                return "container-fluid overflow-scroll position-absolute px-5 pt-1 py-0";
-            } else if (this.buttonTypeString == "listCard") {
-                return "w-100";
-            } else {
-                return "";
-            }
+            const baseClasses = this.isOverflowScrollable
+                ? "container-fluid overflow-scroll position-absolute px-5 pt-1 py-0"
+                : this.buttonTypeString == "listCard"
+                ? "w-100"
+                : "";
+            const withSmallQuestionClass = this.isSmallQuestionText
+                ? baseClasses + " small-question-text"
+                : baseClasses;
+            return withSmallQuestionClass;
         },
         getComponentLoopWrapperClasses() {
             let classes;
@@ -255,4 +261,21 @@ export default {
         text-align: center;
     }
 }
+.small-question-text {
+    &.question-text {
+        span {
+            font-size: 0.875rem;
+            text-align: left;
+            margin: 1rem 0 0.5rem 0;
+        }
+    }
+    &.question-text {
+        margin: 0;
+    }
+    & fieldset {
+        .ui-radio {
+            margin: 0;
+        }
+    }
+}
 </style>
diff --git a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
index a6f5e3f0a..7317b743d 100644
--- a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
+++ b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue
@@ -25,6 +25,7 @@
                                 textPosition="text-start"
                                 :loaderEnabled="false"
                                 isRequired
+                                isSmallQuestionText
                                 :groupName="`${glassLocation}-${glassName}-${selectedTint}`"
                                 :validationRules="partValidationRules" />
                         </div>
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 5723cd0a8..56ac2ed15 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -1,6 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
-        <div class="page-container-grouped-styles vehicle-parts">
+        <div class="page-container-grouped-styles vehicle-parts small-question-text">
             <loadingModal ref="loadingModal" />
             <funnelHeader ref="funnelHeader" cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner

From 475317e37ef1717a2f86d741deaff68b6670bbb7 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 3 Feb 2023 13:25:12 -0500
Subject: [PATCH 17/22] CSR-1164 fix error font weight.

---
 src/styles/common-error-styles.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss
index 0065c126d..8129702fc 100644
--- a/src/styles/common-error-styles.scss
+++ b/src/styles/common-error-styles.scss
@@ -182,7 +182,9 @@ html {
     .form-test-error {
         color: $red;
         font-size: 0.875rem;
-        font-weight: 500;
+        .small {
+            font-weight: 500;
+        }
     }
 
     .form-test-invalid {

From 97d347f9c82340f9f12383141e79585b8220f343 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Tue, 7 Feb 2023 13:50:24 -0500
Subject: [PATCH 18/22] CSR-1077 supporting items changes

This was required to get repair orders to load when the customer didn't progress past the parts page to quote.  the load wouldn't have any parts and no chips to indicate repair.
---
 src/layouts/estimate/estimate.vue             | 19 +++++++++++++
 .../service-package-question.vue              | 28 ++++++++++---------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index f46034412..36a52a2ff 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -223,6 +223,25 @@ export default {
                 } else if (this.$store.getters.order.referralNumber?.length === 6) {
                     await this.navigateForwardWithSingleCarMatch();
                 } else if (this.isRepair) {
+                    const supportingItemsPromise = await this.dispatchStoreAction(
+                        storeActions.GET_SUPPORTING_ITEMS
+                    );
+
+                    const promiseResultMap = [
+                        {
+                            resultKey: "supportingItems",
+                            promise: supportingItemsPromise,
+                        },
+                    ];
+
+                    const resultMap = await settleAllPromises(promiseResultMap);
+
+                    this.dispatchStoreAction(
+                        this.storeActions.SAVE_SUPPORTING_ITEMS,
+                        resultMap.supportingItems,
+                        false
+                    );
+
                     // call saveSession here - navigateWithSaving saves too late in the flow
                     await saveSession({});
                     return this.$router.navigateWithoutSaving(
diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue
index 4f543064c..796da19e9 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -42,7 +42,7 @@ export default {
     },
     watch: {
         availableLineItems() {
-            if (this.$store.getters.lineItems.supportingItems) {
+            if (this.$store.getters.lineItems.vaps) {
                 this.selectDefaultPackage();
             }
         },
@@ -212,18 +212,20 @@ export default {
         selectDefaultPackage() {
             const vapsFromStore = this.$store.getters.lineItems.vaps;
             let lowestTierForPackage = packageNames.TIER_ONE;
-            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;
-                }
-            });
+            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;
         },
         getLowestTierForThisItem(vapsItem) {

From c8e7bc79ee87ef7113383bfc45494c504e974f17 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Tue, 7 Feb 2023 13:56:31 -0500
Subject: [PATCH 19/22] CSR-1166 | Update navigation rules with Quote page

---
 src/helpers/heritage-integration/navigation-helper.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 6fa248c63..0e756a8a4 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -28,7 +28,11 @@ 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)) {
+    if (
+        toRoute.query[queryStrings.FMG_PAGE] !== undefined &&
+        toRoute.query[queryStrings.FMG_PAGE] !== fmgPageValues.QUOTE &&
+        !isVinRelatedPage(toRoute)
+    ) {
         return overrideYmmsDirectionIfNeeded(toRoute);
     }
 
@@ -107,6 +111,7 @@ async function getLatestPageForRedirection() {
     const capabilityQuestionsComponent = await getLazyLoadedComponent(
         fmgPageValues.CAPABILITY_QUESTIONS
     );
+    const quoteComponent = await getLazyLoadedComponent(fmgPageValues.QUOTE);
 
     const skipVin = await skipVinLookup();
 
@@ -121,7 +126,9 @@ async function getLatestPageForRedirection() {
     } else if (!estimateComponent.methods.arePagePrerequisitesValid()) {
         return fmgPageValues.VEHICLE_DAMAGE;
     } else {
-        if (capabilityQuestionsComponent.methods.arePagePrerequisitesValid()) {
+        if (quoteComponent.methods.arePagePrerequisitesValid()) {
+            return fmgPageValues.QUOTE;
+        } else if (capabilityQuestionsComponent.methods.arePagePrerequisitesValid()) {
             return fmgPageValues.CAPABILITY_QUESTIONS;
         } else if (moldingQuestionsComponent.methods.arePagePrerequisitesValid()) {
             return fmgPageValues.MOLDING_QUESTIONS;

From e5bfae5811c4d3dc98d467d1b8f7cdb2d111cc7b Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Fri, 10 Feb 2023 16:16:27 -0500
Subject: [PATCH 20/22] CSR-1108

navigate to service-location from quote on cash
---
 src/layouts/quote/quote.spec.js               | 130 ++++++++++++++++++
 src/layouts/quote/quote.vue                   |  12 +-
 .../service-location/service-location.vue     |   6 +-
 src/router/router-constants/fmgPage-values.js |   1 +
 .../router-constants/navigation-scenarios.js  |   1 +
 src/router/router-constants/routing-table.js  |  13 ++
 6 files changed, 159 insertions(+), 4 deletions(-)
 create mode 100644 src/layouts/quote/quote.spec.js

diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
new file mode 100644
index 000000000..b233bc7e3
--- /dev/null
+++ b/src/layouts/quote/quote.spec.js
@@ -0,0 +1,130 @@
+import { shallowMount, flushPromises } from "@vue/test-utils";
+import { getMountOptions } from "@/helpers/unit-test-helper.js";
+import { applicationConfig } from "@/constants/application-config";
+import quote from "@/layouts/quote/quote.vue";
+import store from "@/store";
+import * as navigateToHeritage from "@/helpers/heritage-integration/navigation-helper";
+
+jest.mock("@/store", () => ({
+    commit: jest.fn(),
+    dispatch: jest.fn()
+}));
+
+// Mock our module for promises.
+jest.mock("@/helpers/layout-helper.js", () => ({
+    settleAllPromises: jest.fn(),
+}));
+
+// Mock fetchCmsContentForPage
+jest.mock("@/helpers/cms-content-helper", () => ({
+    fetchCmsContentForPage: jest.fn(),
+}));
+
+jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
+    navigateToHeritageFunnel: jest.fn(),
+}));
+
+jest.mock(
+    "@/store",
+    () => {
+        return {};
+    },
+    { virtual: true }
+);
+
+
+store.getters = {
+    order: {
+        accountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
+    },
+    payment: {
+        insuranceCoverage: {},
+        isInsurance: false,
+    }
+};
+
+afterEach(() => {
+    // reset store after each test
+    store.getters = {
+        order: {
+            accountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
+        },
+        payment: {
+            insuranceCoverage: {},
+            isInsurance: false,
+        }
+    };
+});
+
+describe("quote.vue", () => {
+    test("IsInsurance false should navigateWithSaving", async () => {
+        //Arrange
+        const { wrapper } = setupMocks({
+            customMountOptions: {
+                router: {
+                    navigateWithSaving: jest.fn(),
+                },
+                route: { quote }
+            },
+        });
+        
+        store.getters.payment = {
+            insuranceCoverage: {},
+            isInsurance : false
+        };
+
+        wrapper.vm.dispatchStoreAction = jest.fn(() => {
+            return {
+                data: [],
+            };
+        });
+
+        //Act
+        await wrapper.vm.forwardButtonAction();
+
+        //Assert
+        expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalled();
+    });
+
+    test("IsInsurance true should navigateToHeritageFunnel", async () => {
+        //Arrange
+        const { wrapper } = setupMocks({
+            customMountOptions: {
+                router: {
+                    navigateWithSaving: jest.fn(),
+                },
+                route: { quote }
+            },
+        });
+        
+        store.getters.payment = {
+            insuranceCoverage: {},
+            isInsurance : true
+        };
+
+        wrapper.vm.dispatchStoreAction = jest.fn(() => {
+            return {
+                data: [],
+            };
+        });
+
+        //Act
+        await wrapper.vm.forwardButtonAction();
+
+        //Assert
+        expect(navigateToHeritage.navigateToHeritageFunnel).toHaveBeenCalled();
+    });
+});
+
+
+function setupMocks({ customMountOptions }) {
+    const mountOptions = getMountOptions({
+        ...customMountOptions,
+    });
+
+    mountOptions.global.mocks["$store"] = store;
+    mountOptions["attachTo"] = document.body;
+
+    const wrapper = shallowMount(quote, mountOptions);
+    return { wrapper };
+}
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 21f5753bb..853cd2abf 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -1,4 +1,3 @@
-digital
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
@@ -180,6 +179,7 @@ export default {
                     false
                 );
             }
+
             if (this.$store.getters.order.accountNumber != applicationConfig.CASH_ACCOUNT_NUMBER) {
                 this.supportingItems = this.filterOutFees(this.supportingItems);
             }
@@ -190,7 +190,15 @@ export default {
             );
             this.dispatchStoreAction(this.storeActions.SAVE_VAPS, this.selectedVaps, false);
 
-            navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
+            const payment = this.$store.getters.payment;
+            if (payment.isInsurance) {
+                navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
+            } else {
+                this.$router.navigateWithSaving(
+                    this.navigationScenarios.CLICKED_FORWARD_WITH_CASH,
+                    this.$route
+                );
+            }
         },
     },
     components: {
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index e29ebdb5e..f837bb726 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -1,4 +1,3 @@
-fmg
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
@@ -6,6 +5,7 @@ fmg
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
+                ref="funnelFooter"
                 :isForwardActionDisabled="!meta.valid"
                 @back-clicked="backButtonAction"
                 @ForwardClicked="forwardButtonAction" />
@@ -53,7 +53,9 @@ export default {
             return true;
         },
 
-        backButtonAction() {},
+        backButtonAction() {
+            this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
+        },
         forwardButtonAction() {},
     },
     components: {
diff --git a/src/router/router-constants/fmgPage-values.js b/src/router/router-constants/fmgPage-values.js
index 65ef99be4..c83b4e4bb 100644
--- a/src/router/router-constants/fmgPage-values.js
+++ b/src/router/router-constants/fmgPage-values.js
@@ -14,6 +14,7 @@ const fmgPageValues = {
     ESTIMATE: "estimate",
     ADDRESS_VEHICLES: "address-vehicles",
     QUOTE: "quote",
+    SERVICE_LOCATION: "service-location",
     HERITAGE: "heritage",
 };
 
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index cea67f73a..b302320ba 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -10,6 +10,7 @@ const navigationScenarios = {
     // General
     CLICKED_BACK: "CLICKED_BACK",
     CLICKED_FORWARD: "CLICKED_FORWARD",
+    CLICKED_FORWARD_WITH_CASH: "CLICKED_FORWARD_WITH_CASH",
 
     // YMMS
     SELECTED_YEAR: "SELECTED_YEAR",
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index dbd1ca9bb..7d780df1a 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -407,6 +407,19 @@ const routingTable = function (store) {
                     scenario: navigationScenarios.CLICKED_BACK_WITH_CAPABILITY_QUESTIONS,
                     destinationFmgPageValue: fmgPageValues.CAPABILITY_QUESTIONS,
                 },
+                {
+                    scenario: navigationScenarios.CLICKED_FORWARD_WITH_CASH,
+                    destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION,
+                },
+            ],
+        },
+        {
+            fmgPageValue: fmgPageValues.SERVICE_LOCATION,
+            maps: [
+                {
+                    scenario: navigationScenarios.CLICKED_BACK,
+                    destinationFmgPageValue: fmgPageValues.QUOTE,
+                },
             ],
         },
     ];

From 68cca959a79c29bb845fb8b925856303b2c7d28a Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Fri, 10 Feb 2023 16:20:34 -0500
Subject: [PATCH 21/22] CSR-1108

Prettier
---
 src/layouts/quote/quote.spec.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
index b233bc7e3..e5d4d54fb 100644
--- a/src/layouts/quote/quote.spec.js
+++ b/src/layouts/quote/quote.spec.js
@@ -7,7 +7,7 @@ import * as navigateToHeritage from "@/helpers/heritage-integration/navigation-h
 
 jest.mock("@/store", () => ({
     commit: jest.fn(),
-    dispatch: jest.fn()
+    dispatch: jest.fn(),
 }));
 
 // Mock our module for promises.
@@ -32,7 +32,6 @@ jest.mock(
     { virtual: true }
 );
 
-
 store.getters = {
     order: {
         accountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
@@ -40,7 +39,7 @@ store.getters = {
     payment: {
         insuranceCoverage: {},
         isInsurance: false,
-    }
+    },
 };
 
 afterEach(() => {
@@ -52,7 +51,7 @@ afterEach(() => {
         payment: {
             insuranceCoverage: {},
             isInsurance: false,
-        }
+        },
     };
 });
 
@@ -64,13 +63,13 @@ describe("quote.vue", () => {
                 router: {
                     navigateWithSaving: jest.fn(),
                 },
-                route: { quote }
+                route: { quote },
             },
         });
-        
+
         store.getters.payment = {
             insuranceCoverage: {},
-            isInsurance : false
+            isInsurance: false,
         };
 
         wrapper.vm.dispatchStoreAction = jest.fn(() => {
@@ -93,13 +92,13 @@ describe("quote.vue", () => {
                 router: {
                     navigateWithSaving: jest.fn(),
                 },
-                route: { quote }
+                route: { quote },
             },
         });
-        
+
         store.getters.payment = {
             insuranceCoverage: {},
-            isInsurance : true
+            isInsurance: true,
         };
 
         wrapper.vm.dispatchStoreAction = jest.fn(() => {
@@ -116,7 +115,6 @@ describe("quote.vue", () => {
     });
 });
 
-
 function setupMocks({ customMountOptions }) {
     const mountOptions = getMountOptions({
         ...customMountOptions,

From 44c9bb3e1ebed7cc06de654f29d41623a2109486 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Mon, 13 Feb 2023 12:16:23 -0500
Subject: [PATCH 22/22] CSR-1108 allow cash to flow to heritage

---
 src/layouts/service-location/service-location.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index f837bb726..37a4cda43 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -1,6 +1,7 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
+            <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <funnel-footer
@@ -18,11 +19,13 @@
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import { Form } from "vee-validate";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
+import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 
 export default {
     name: "service-location",
@@ -56,13 +59,16 @@ export default {
         backButtonAction() {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
-        forwardButtonAction() {},
+        forwardButtonAction() {
+            navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
+        },
     },
     components: {
         funnelHeader,
         funnelFooter,
         funnelSubHeader,
         Form,
+        loadingModal,
     },
 };
 </script>