From c59ad4dd9ac5c11ecf667e365443470f278138ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Dec 2022 06:02:01 +0000
Subject: [PATCH 001/261] Bump qs from 6.5.2 to 6.5.3

Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.5.2...v6.5.3)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a838afe8f..d7fc25822 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19150,9 +19150,9 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
       "dev": true,
       "engines": {
         "node": ">=0.6"
@@ -39784,9 +39784,9 @@
       "dev": true
     },
     "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
       "dev": true
     },
     "query-string": {

From b311bd8738d191a29c7ad3a3ebf90d0b52f08b3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Dec 2022 16:21:59 +0000
Subject: [PATCH 002/261] Bump express from 4.17.2 to 4.18.2

Bumps [express](https://github.com/expressjs/express) from 4.17.2 to 4.18.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.2...4.18.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 495 ++++++++++++++++++++++++++++++----------------
 1 file changed, 320 insertions(+), 175 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a838afe8f..3b8ff4d3c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5785,13 +5785,13 @@
       "dev": true
     },
     "node_modules/accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
       "dependencies": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       },
       "engines": {
         "node": ">= 0.6"
@@ -6857,24 +6857,27 @@
       "dev": true
     },
     "node_modules/body-parser": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz",
-      "integrity": "sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dev": true,
       "dependencies": {
-        "bytes": "3.1.1",
+        "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.6",
-        "raw-body": "2.4.2",
-        "type-is": "~1.6.18"
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
     "node_modules/body-parser/node_modules/debug": {
@@ -6886,17 +6889,29 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/body-parser/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/body-parser/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
     "node_modules/body-parser/node_modules/qs": {
-      "version": "6.9.6",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz",
-      "integrity": "sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">=0.6"
       },
@@ -7196,9 +7211,9 @@
       "dev": true
     },
     "node_modules/bytes": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz",
-      "integrity": "sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
       "engines": {
         "node": ">= 0.8"
@@ -8074,9 +8089,9 @@
       }
     },
     "node_modules/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -9113,10 +9128,14 @@
       }
     },
     "node_modules/destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
     },
     "node_modules/detect-newline": {
       "version": "2.1.0",
@@ -9404,7 +9423,7 @@
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
     "node_modules/ejs": {
@@ -9462,7 +9481,7 @@
     "node_modules/encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "dev": true,
       "engines": {
         "node": ">= 0.8"
@@ -9993,7 +10012,7 @@
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -10230,38 +10249,39 @@
       }
     },
     "node_modules/express": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.2.tgz",
-      "integrity": "sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dev": true,
       "dependencies": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.1",
+        "body-parser": "1.20.1",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.1",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.9.6",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.17.2",
-        "serve-static": "1.14.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
         "setprototypeof": "1.2.0",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -10279,6 +10299,15 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/express/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -10286,10 +10315,13 @@
       "dev": true
     },
     "node_modules/express/node_modules/qs": {
-      "version": "6.9.6",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz",
-      "integrity": "sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==",
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
       "engines": {
         "node": ">=0.6"
       },
@@ -10317,6 +10349,15 @@
         }
       ]
     },
+    "node_modules/express/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -10672,17 +10713,17 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dev": true,
       "dependencies": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "engines": {
@@ -10701,9 +10742,18 @@
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
+    "node_modules/finalhandler/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/find-babel-config": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.2.0.tgz",
@@ -10882,7 +10932,7 @@
     "node_modules/fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -11612,19 +11662,37 @@
       "dev": true
     },
     "node_modules/http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
       "dependencies": {
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
+        "statuses": "2.0.1",
         "toidentifier": "1.0.1"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-errors/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
       }
     },
     "node_modules/http-parser-js": {
@@ -16707,7 +16775,7 @@
     "node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -17125,9 +17193,9 @@
       "dev": true
     },
     "node_modules/negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -17593,9 +17661,9 @@
       "dev": true
     },
     "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
       "dependencies": {
         "ee-first": "1.1.1"
@@ -19225,13 +19293,13 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz",
-      "integrity": "sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dev": true,
       "dependencies": {
-        "bytes": "3.1.1",
-        "http-errors": "1.8.1",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       },
@@ -20173,24 +20241,24 @@
       }
     },
     "node_modules/send": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
-      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
       "dependencies": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
         "ms": "2.1.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -20208,9 +20276,18 @@
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
+    "node_modules/send/node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/send/node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -20229,6 +20306,15 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
+    "node_modules/send/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/serialize-javascript": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
@@ -20299,15 +20385,15 @@
       "dev": true
     },
     "node_modules/serve-static": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
-      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
       "dependencies": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.2"
+        "send": "0.18.0"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -22178,7 +22264,7 @@
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "dev": true,
       "engines": {
         "node": ">= 0.8"
@@ -28975,13 +29061,13 @@
       "dev": true
     },
     "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
       "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       }
     },
     "acorn": {
@@ -29828,21 +29914,23 @@
       "dev": true
     },
     "body-parser": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz",
-      "integrity": "sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.1",
+        "bytes": "3.1.2",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.8.1",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.9.6",
-        "raw-body": "2.4.2",
-        "type-is": "~1.6.18"
+        "on-finished": "2.4.1",
+        "qs": "6.11.0",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "dependencies": {
         "debug": {
@@ -29854,17 +29942,26 @@
             "ms": "2.0.0"
           }
         },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         },
         "qs": {
-          "version": "6.9.6",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz",
-          "integrity": "sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==",
-          "dev": true
+          "version": "6.11.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
         }
       }
     },
@@ -30123,9 +30220,9 @@
       "dev": true
     },
     "bytes": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz",
-      "integrity": "sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true
     },
     "cacache": {
@@ -30822,9 +30919,9 @@
       }
     },
     "cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "dev": true
     },
     "cookie-signature": {
@@ -31651,9 +31748,9 @@
       }
     },
     "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true
     },
     "detect-newline": {
@@ -31897,7 +31994,7 @@
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
     "ejs": {
@@ -31950,7 +32047,7 @@
     "encodeurl": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "dev": true
     },
     "end-of-stream": {
@@ -32343,7 +32440,7 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true
     },
     "event-pubsub": {
@@ -32541,38 +32638,39 @@
       }
     },
     "express": {
-      "version": "4.17.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.2.tgz",
-      "integrity": "sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg==",
+      "version": "4.18.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.1",
+        "body-parser": "1.20.1",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.1",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
         "proxy-addr": "~2.0.7",
-        "qs": "6.9.6",
+        "qs": "6.11.0",
         "range-parser": "~1.2.1",
         "safe-buffer": "5.2.1",
-        "send": "0.17.2",
-        "serve-static": "1.14.2",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
         "setprototypeof": "1.2.0",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
@@ -32587,6 +32685,12 @@
             "ms": "2.0.0"
           }
         },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -32594,16 +32698,25 @@
           "dev": true
         },
         "qs": {
-          "version": "6.9.6",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz",
-          "integrity": "sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==",
-          "dev": true
+          "version": "6.11.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
         },
         "safe-buffer": {
           "version": "5.2.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
           "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
           "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
         }
       }
     },
@@ -32897,17 +33010,17 @@
       }
     },
     "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "dependencies": {
@@ -32923,7 +33036,13 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
           "dev": true
         }
       }
@@ -33057,7 +33176,7 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true
     },
     "from2": {
@@ -33627,16 +33746,30 @@
       "dev": true
     },
     "http-errors": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
-      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
       "requires": {
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "inherits": "2.0.4",
         "setprototypeof": "1.2.0",
-        "statuses": ">= 1.5.0 < 2",
+        "statuses": "2.0.1",
         "toidentifier": "1.0.1"
+      },
+      "dependencies": {
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
+        }
       }
     },
     "http-parser-js": {
@@ -37747,7 +37880,7 @@
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "dev": true
     },
     "memory-fs": {
@@ -38096,9 +38229,9 @@
       "dev": true
     },
     "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true
     },
     "neo-async": {
@@ -38471,9 +38604,9 @@
       "dev": true
     },
     "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
       "requires": {
         "ee-first": "1.1.1"
@@ -39843,13 +39976,13 @@
       "dev": true
     },
     "raw-body": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz",
-      "integrity": "sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.1",
-        "http-errors": "1.8.1",
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
@@ -40586,24 +40719,24 @@
       "dev": true
     },
     "send": {
-      "version": "0.17.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz",
-      "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.8.1",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
         "ms": "2.1.3",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "dependencies": {
         "debug": {
@@ -40618,11 +40751,17 @@
             "ms": {
               "version": "2.0.0",
               "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
               "dev": true
             }
           }
         },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
         "mime": {
           "version": "1.6.0",
           "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -40634,6 +40773,12 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
           "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
         }
       }
     },
@@ -40703,15 +40848,15 @@
       }
     },
     "serve-static": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz",
-      "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.2"
+        "send": "0.18.0"
       }
     },
     "set-blocking": {
@@ -42250,7 +42395,7 @@
     "unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "dev": true
     },
     "unquote": {

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 003/261] 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 004/261] 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 ad71e03985e0e274d53b0c2ad38e844c59e808c5 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 16 Jan 2023 16:58:32 -0500
Subject: [PATCH 005/261] CSR-1051: update funnel-sub-header class logic / fix
 modal ul spacing

---
 .../funnel-sub-header/funnel-sub-header.vue                | 7 ++++---
 .../service-package-radio/service-package-radio.vue        | 6 ++++++
 src/layouts/vehicle-make/vehicle-make.vue                  | 3 ++-
 src/layouts/vehicle-model/vehicle-model.vue                | 3 ++-
 src/layouts/vehicle-style/vehicle-style.vue                | 3 ++-
 src/layouts/vehicle-year/vehicle-year.vue                  | 2 +-
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/common-components/funnel-sub-header/funnel-sub-header.vue
index 356e6fb0e..356dc50c1 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/common-components/funnel-sub-header/funnel-sub-header.vue
@@ -32,6 +32,10 @@ export default {
     props: {
         hasBackButton: Boolean,
         cmsWidgetName: String,
+        headerColor: {
+            type: String,
+            default: "dark-header",
+        },
     },
     components: {
         buttonBack,
@@ -46,9 +50,6 @@ export default {
         backButtonAccessibleText() {
             return this.getCmsContent(this.cmsWidgetName, "BackButtonAccessibleText");
         },
-        headerColor() {
-            return this.subText ? "dark-header" : "light-header";
-        },
     },
     methods: {
         clickEvent() {
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 856b5a940..74bed2c5e 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
@@ -229,6 +229,12 @@ export default {
                 li {
                     margin-bottom: 0.5rem;
                     font-size: 0.875rem;
+                    line-height: 1.714;
+                    a {
+                        line-height: 1.714;
+                        padding: 0;
+                        text-underline-offset: 0.1em;
+                    }
                 }
             }
 
diff --git a/src/layouts/vehicle-make/vehicle-make.vue b/src/layouts/vehicle-make/vehicle-make.vue
index 1034b0959..6babfa443 100644
--- a/src/layouts/vehicle-make/vehicle-make.vue
+++ b/src/layouts/vehicle-make/vehicle-make.vue
@@ -7,7 +7,8 @@
                 <funnelSubHeader
                     cmsWidgetName="FunnelSubHeaderWidget"
                     :hasBackButton="true"
-                    @click-event="backButtonAction" />
+                    @click-event="backButtonAction"
+                    headerColor="light-header" />
                 <div class="fade-on-route-transition">
                     <makeQuestion
                         v-model="selectedMake"
diff --git a/src/layouts/vehicle-model/vehicle-model.vue b/src/layouts/vehicle-model/vehicle-model.vue
index c53ed19d5..2ef0fc573 100644
--- a/src/layouts/vehicle-model/vehicle-model.vue
+++ b/src/layouts/vehicle-model/vehicle-model.vue
@@ -7,7 +7,8 @@
                 <funnelSubHeader
                     cmsWidgetName="FunnelSubHeaderWidget"
                     :hasBackButton="true"
-                    @click-event="backButtonAction" />
+                    @click-event="backButtonAction"
+                    headerColor="light-header" />
                 <div class="fade-on-route-transition">
                     <modelQuestion
                         v-model="selectedModel"
diff --git a/src/layouts/vehicle-style/vehicle-style.vue b/src/layouts/vehicle-style/vehicle-style.vue
index 7b9949234..23766f3e2 100644
--- a/src/layouts/vehicle-style/vehicle-style.vue
+++ b/src/layouts/vehicle-style/vehicle-style.vue
@@ -7,7 +7,8 @@
                 <funnelSubHeader
                     cmsWidgetName="FunnelSubHeaderWidget"
                     :hasBackButton="true"
-                    @click-event="backButtonAction" />
+                    @click-event="backButtonAction"
+                    headerColor="light-header" />
                 <div class="fade-on-route-transition">
                     <styleQuestion
                         v-model="selectedStyle"
diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index 256a38d64..f8a53ed5c 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -4,7 +4,7 @@
         <div class="select-car">
             <div class="select-car-form rounded text-center">
                 <vehicleBanner cmsWidgetName="VehicleBannerWidget" displayGenericVehicleImage />
-                <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
+                <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" headerColor="light-header" />
                 <div class="fade-on-route-transition">
                     <yearQuestion
                         class="fade-on-route-transition"

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 006/261] 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 58de89028176406b21bbdd6e181049f2732c1fff Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 17 Jan 2023 14:05:02 -0500
Subject: [PATCH 007/261] CSR-1021 Move shared components into unique folders.

---
 .../base-input-button/base-input-button.spec.js      |  0
 .../base-input-button/base-input-button.vue          |  2 +-
 .../base-input-button/button-functionality-props.js  |  0
 .../button-question/button-question.spec.js          |  0
 .../button-question/button-question.vue              |  8 ++++----
 .../date-picker/date-picker-spec.js1                 |  0
 .../date-picker/date-picker.vue                      |  0
 .../dropdown-question/dropdown-question.spec.js      |  0
 .../dropdown-question/dropdown-question.vue          |  0
 .../modal/modal.spec.js                              |  0
 .../modal/modal.vue                                  |  2 +-
 .../question-chain/question-chain.spec.js            |  0
 .../question-chain/question-chain.vue                |  4 ++--
 .../text-block/text-block.spec.js                    |  0
 .../text-block/text-block.vue                        |  0
 .../textbox-question/textbox-question.spec.js        |  0
 .../textbox-question/textbox-question.vue            |  0
 .../funnel-footer/funnel-footer.spec.js              |  0
 .../funnel-footer/funnel-footer.vue                  |  0
 .../funnel-header/funnel-header.spec.js              |  0
 .../funnel-header/funnel-header.vue                  |  2 +-
 .../funnel-header/menu-modal/menu-modal.spec.js      |  0
 .../funnel-header/menu-modal/menu-modal.vue          |  0
 .../button-back/button-back.spec.js                  |  0
 .../funnel-sub-header/button-back/button-back.vue    |  0
 .../funnel-sub-header/funnel-sub-header.spec.js      |  0
 .../funnel-sub-header/funnel-sub-header.vue          |  2 +-
 .../questions-page-layout.spec.js                    |  0
 .../questions-page-layout/questions-page-layout.vue  | 12 ++++++------
 .../loading-modal/loading-modal.spec.js              |  0
 .../loading-modal/loading-modal.vue                  |  0
 .../ux-components/alert/alert.spec.js                |  0
 .../ux-components/alert/alert.vue                    |  0
 .../ux-components/button-main/button-main.spec.js    |  0
 .../ux-components/button-main/button-main.vue        |  0
 .../ux-components/checkbox/checkbox.spec.js          |  0
 .../ux-components/checkbox/checkbox.vue              |  0
 .../list-button-horizontal.spec.js                   |  0
 .../list-button-horizontal.vue                       |  2 +-
 .../ux-components/list-button/list-button.spec.js    |  0
 .../ux-components/list-button/list-button.vue        |  2 +-
 .../ux-components/list-card/list-card.spec.js        |  0
 .../ux-components/list-card/list-card.vue            |  2 +-
 .../ux-components/loader/loader.spec.js              |  0
 .../ux-components/loader/loader.vue                  |  0
 .../ux-components/radio/radio.spec.js                |  0
 .../ux-components/radio/radio.vue                    |  2 +-
 .../ux-components/text-link/text-link.spec.js        |  0
 .../ux-components/text-link/text-link.vue            |  0
 .../vehicle-banner/vehicle-banner.spec.js            |  0
 .../vehicle-banner/vehicle-banner.vue                |  0
 51 files changed, 20 insertions(+), 20 deletions(-)
 rename src/{common-components => digital-components}/base-input-button/base-input-button.spec.js (100%)
 rename src/{common-components => digital-components}/base-input-button/base-input-button.vue (98%)
 rename src/{common-components => digital-components}/base-input-button/button-functionality-props.js (100%)
 rename src/{common-components => digital-components}/button-question/button-question.spec.js (100%)
 rename src/{common-components => digital-components}/button-question/button-question.vue (96%)
 rename src/{common-components => digital-components}/date-picker/date-picker-spec.js1 (100%)
 rename src/{common-components => digital-components}/date-picker/date-picker.vue (100%)
 rename src/{common-components => digital-components}/dropdown-question/dropdown-question.spec.js (100%)
 rename src/{common-components => digital-components}/dropdown-question/dropdown-question.vue (100%)
 rename src/{common-components => digital-components}/modal/modal.spec.js (100%)
 rename src/{common-components => digital-components}/modal/modal.vue (98%)
 rename src/{common-components => digital-components}/question-chain/question-chain.spec.js (100%)
 rename src/{common-components => digital-components}/question-chain/question-chain.vue (98%)
 rename src/{common-components => digital-components}/text-block/text-block.spec.js (100%)
 rename src/{common-components => digital-components}/text-block/text-block.vue (100%)
 rename src/{common-components => digital-components}/textbox-question/textbox-question.spec.js (100%)
 rename src/{common-components => digital-components}/textbox-question/textbox-question.vue (100%)
 rename src/{common-components => fmg-components}/funnel-footer/funnel-footer.spec.js (100%)
 rename src/{common-components => fmg-components}/funnel-footer/funnel-footer.vue (100%)
 rename src/{common-components => fmg-components}/funnel-header/funnel-header.spec.js (100%)
 rename src/{common-components => fmg-components}/funnel-header/funnel-header.vue (96%)
 rename src/{common-components => fmg-components}/funnel-header/menu-modal/menu-modal.spec.js (100%)
 rename src/{common-components => fmg-components}/funnel-header/menu-modal/menu-modal.vue (100%)
 rename src/{common-components => fmg-components}/funnel-sub-header/button-back/button-back.spec.js (100%)
 rename src/{common-components => fmg-components}/funnel-sub-header/button-back/button-back.vue (100%)
 rename src/{common-components => fmg-components}/funnel-sub-header/funnel-sub-header.spec.js (100%)
 rename src/{common-components => fmg-components}/funnel-sub-header/funnel-sub-header.vue (95%)
 rename src/{common-components => fmg-components}/layouts/questions-page-layout/questions-page-layout.spec.js (100%)
 rename src/{common-components => fmg-components}/layouts/questions-page-layout/questions-page-layout.vue (87%)
 rename src/{common-components => fmg-components}/loading-modal/loading-modal.spec.js (100%)
 rename src/{common-components => fmg-components}/loading-modal/loading-modal.vue (100%)
 rename src/{ => fmg-components}/ux-components/alert/alert.spec.js (100%)
 rename src/{ => fmg-components}/ux-components/alert/alert.vue (100%)
 rename src/{ => fmg-components}/ux-components/button-main/button-main.spec.js (100%)
 rename src/{ => fmg-components}/ux-components/button-main/button-main.vue (100%)
 rename src/{ => fmg-components}/ux-components/checkbox/checkbox.spec.js (100%)
 rename src/{ => fmg-components}/ux-components/checkbox/checkbox.vue (100%)
 rename src/{ => fmg-components}/ux-components/list-button-horizontal/list-button-horizontal.spec.js (100%)
 rename src/{ => fmg-components}/ux-components/list-button-horizontal/list-button-horizontal.vue (98%)
 rename src/{ => fmg-components}/ux-components/list-button/list-button.spec.js (100%)
 rename src/{ => fmg-components}/ux-components/list-button/list-button.vue (97%)
 rename src/{ => fmg-components}/ux-components/list-card/list-card.spec.js (100%)
 rename src/{ => fmg-components}/ux-components/list-card/list-card.vue (98%)
 rename src/{ => fmg-components}/ux-components/loader/loader.spec.js (100%)
 rename src/{ => fmg-components}/ux-components/loader/loader.vue (100%)
 rename src/{ => fmg-components}/ux-components/radio/radio.spec.js (100%)
 rename src/{ => fmg-components}/ux-components/radio/radio.vue (95%)
 rename src/{ => fmg-components}/ux-components/text-link/text-link.spec.js (100%)
 rename src/{ => fmg-components}/ux-components/text-link/text-link.vue (100%)
 rename src/{common-components => fmg-components}/vehicle-banner/vehicle-banner.spec.js (100%)
 rename src/{common-components => fmg-components}/vehicle-banner/vehicle-banner.vue (100%)

diff --git a/src/common-components/base-input-button/base-input-button.spec.js b/src/digital-components/base-input-button/base-input-button.spec.js
similarity index 100%
rename from src/common-components/base-input-button/base-input-button.spec.js
rename to src/digital-components/base-input-button/base-input-button.spec.js
diff --git a/src/common-components/base-input-button/base-input-button.vue b/src/digital-components/base-input-button/base-input-button.vue
similarity index 98%
rename from src/common-components/base-input-button/base-input-button.vue
rename to src/digital-components/base-input-button/base-input-button.vue
index 5cc7d3836..e9b5e6411 100644
--- a/src/common-components/base-input-button/base-input-button.vue
+++ b/src/digital-components/base-input-button/base-input-button.vue
@@ -33,7 +33,7 @@ import {
     handleButtonComponentFocus,
     handleInputComponentBlur,
 } from "@/helpers/button-question-focus-helper";
-import { inputButtonProps } from "@/common-components/base-input-button/button-functionality-props";
+import { inputButtonProps } from "@/digital-components/base-input-button/button-functionality-props";
 
 export default {
     name: "base-input-button",
diff --git a/src/common-components/base-input-button/button-functionality-props.js b/src/digital-components/base-input-button/button-functionality-props.js
similarity index 100%
rename from src/common-components/base-input-button/button-functionality-props.js
rename to src/digital-components/base-input-button/button-functionality-props.js
diff --git a/src/common-components/button-question/button-question.spec.js b/src/digital-components/button-question/button-question.spec.js
similarity index 100%
rename from src/common-components/button-question/button-question.spec.js
rename to src/digital-components/button-question/button-question.spec.js
diff --git a/src/common-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
similarity index 96%
rename from src/common-components/button-question/button-question.vue
rename to src/digital-components/button-question/button-question.vue
index 646b244be..661e3ace1 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -74,10 +74,10 @@
 </template>
 
 <script>
-import listButton from "@/ux-components/list-button/list-button";
-import listButtonHorizontal from "@/ux-components/list-button-horizontal/list-button-horizontal";
-import listCard from "@/ux-components/list-card/list-card";
-import radio from "@/ux-components/radio/radio";
+import listButton from "@/fmg-components/ux-components/list-button/list-button";
+import listButtonHorizontal from "@/fmg-components/ux-components/list-button-horizontal/list-button-horizontal";
+import listCard from "@/fmg-components/ux-components/list-card/list-card";
+import radio from "@/fmg-components/ux-components/radio/radio";
 import { ErrorMessage } from "vee-validate";
 
 export default {
diff --git a/src/common-components/date-picker/date-picker-spec.js1 b/src/digital-components/date-picker/date-picker-spec.js1
similarity index 100%
rename from src/common-components/date-picker/date-picker-spec.js1
rename to src/digital-components/date-picker/date-picker-spec.js1
diff --git a/src/common-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
similarity index 100%
rename from src/common-components/date-picker/date-picker.vue
rename to src/digital-components/date-picker/date-picker.vue
diff --git a/src/common-components/dropdown-question/dropdown-question.spec.js b/src/digital-components/dropdown-question/dropdown-question.spec.js
similarity index 100%
rename from src/common-components/dropdown-question/dropdown-question.spec.js
rename to src/digital-components/dropdown-question/dropdown-question.spec.js
diff --git a/src/common-components/dropdown-question/dropdown-question.vue b/src/digital-components/dropdown-question/dropdown-question.vue
similarity index 100%
rename from src/common-components/dropdown-question/dropdown-question.vue
rename to src/digital-components/dropdown-question/dropdown-question.vue
diff --git a/src/common-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
similarity index 100%
rename from src/common-components/modal/modal.spec.js
rename to src/digital-components/modal/modal.spec.js
diff --git a/src/common-components/modal/modal.vue b/src/digital-components/modal/modal.vue
similarity index 98%
rename from src/common-components/modal/modal.vue
rename to src/digital-components/modal/modal.vue
index 7de269644..71f026020 100644
--- a/src/common-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import buttonMain from "@/ux-components/button-main/button-main";
+import buttonMain from "@/fmg-components/ux-components/button-main/button-main";
 
 export default {
     name: "modal",
diff --git a/src/common-components/question-chain/question-chain.spec.js b/src/digital-components/question-chain/question-chain.spec.js
similarity index 100%
rename from src/common-components/question-chain/question-chain.spec.js
rename to src/digital-components/question-chain/question-chain.spec.js
diff --git a/src/common-components/question-chain/question-chain.vue b/src/digital-components/question-chain/question-chain.vue
similarity index 98%
rename from src/common-components/question-chain/question-chain.vue
rename to src/digital-components/question-chain/question-chain.vue
index bf68a4363..d72cec9c8 100644
--- a/src/common-components/question-chain/question-chain.vue
+++ b/src/digital-components/question-chain/question-chain.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 import { useValidateForm } from "vee-validate";
 
 export default {
@@ -82,7 +82,7 @@ export default {
     },
     methods: {
         handleAnswer(question, returnedAnswer) {
-            /* 
+            /*
                 returnedAnswer example format:
                 "1|answer|DD11132|Yes"
             */
diff --git a/src/common-components/text-block/text-block.spec.js b/src/digital-components/text-block/text-block.spec.js
similarity index 100%
rename from src/common-components/text-block/text-block.spec.js
rename to src/digital-components/text-block/text-block.spec.js
diff --git a/src/common-components/text-block/text-block.vue b/src/digital-components/text-block/text-block.vue
similarity index 100%
rename from src/common-components/text-block/text-block.vue
rename to src/digital-components/text-block/text-block.vue
diff --git a/src/common-components/textbox-question/textbox-question.spec.js b/src/digital-components/textbox-question/textbox-question.spec.js
similarity index 100%
rename from src/common-components/textbox-question/textbox-question.spec.js
rename to src/digital-components/textbox-question/textbox-question.spec.js
diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
similarity index 100%
rename from src/common-components/textbox-question/textbox-question.vue
rename to src/digital-components/textbox-question/textbox-question.vue
diff --git a/src/common-components/funnel-footer/funnel-footer.spec.js b/src/fmg-components/funnel-footer/funnel-footer.spec.js
similarity index 100%
rename from src/common-components/funnel-footer/funnel-footer.spec.js
rename to src/fmg-components/funnel-footer/funnel-footer.spec.js
diff --git a/src/common-components/funnel-footer/funnel-footer.vue b/src/fmg-components/funnel-footer/funnel-footer.vue
similarity index 100%
rename from src/common-components/funnel-footer/funnel-footer.vue
rename to src/fmg-components/funnel-footer/funnel-footer.vue
diff --git a/src/common-components/funnel-header/funnel-header.spec.js b/src/fmg-components/funnel-header/funnel-header.spec.js
similarity index 100%
rename from src/common-components/funnel-header/funnel-header.spec.js
rename to src/fmg-components/funnel-header/funnel-header.spec.js
diff --git a/src/common-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
similarity index 96%
rename from src/common-components/funnel-header/funnel-header.vue
rename to src/fmg-components/funnel-header/funnel-header.vue
index f952b94a8..acfacd709 100644
--- a/src/common-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -19,7 +19,7 @@
 import alert from "@/ux-components/alert/alert";
 import eventBus from "@/helpers/event-bus/event-bus";
 import { globalEvents } from "@/constants/events";
-import menuModal from "@/common-components/funnel-header/menu-modal/menu-modal";
+import menuModal from "@/fmg-components/funnel-header/menu-modal/menu-modal";
 
 export default {
     name: "funnel-header",
diff --git a/src/common-components/funnel-header/menu-modal/menu-modal.spec.js b/src/fmg-components/funnel-header/menu-modal/menu-modal.spec.js
similarity index 100%
rename from src/common-components/funnel-header/menu-modal/menu-modal.spec.js
rename to src/fmg-components/funnel-header/menu-modal/menu-modal.spec.js
diff --git a/src/common-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
similarity index 100%
rename from src/common-components/funnel-header/menu-modal/menu-modal.vue
rename to src/fmg-components/funnel-header/menu-modal/menu-modal.vue
diff --git a/src/common-components/funnel-sub-header/button-back/button-back.spec.js b/src/fmg-components/funnel-sub-header/button-back/button-back.spec.js
similarity index 100%
rename from src/common-components/funnel-sub-header/button-back/button-back.spec.js
rename to src/fmg-components/funnel-sub-header/button-back/button-back.spec.js
diff --git a/src/common-components/funnel-sub-header/button-back/button-back.vue b/src/fmg-components/funnel-sub-header/button-back/button-back.vue
similarity index 100%
rename from src/common-components/funnel-sub-header/button-back/button-back.vue
rename to src/fmg-components/funnel-sub-header/button-back/button-back.vue
diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.spec.js b/src/fmg-components/funnel-sub-header/funnel-sub-header.spec.js
similarity index 100%
rename from src/common-components/funnel-sub-header/funnel-sub-header.spec.js
rename to src/fmg-components/funnel-sub-header/funnel-sub-header.spec.js
diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue
similarity index 95%
rename from src/common-components/funnel-sub-header/funnel-sub-header.vue
rename to src/fmg-components/funnel-sub-header/funnel-sub-header.vue
index 356dc50c1..a5cdf5c0b 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import buttonBack from "@/common-components/funnel-sub-header/button-back/button-back";
+import buttonBack from "@/fmg-components/funnel-sub-header/button-back/button-back";
 
 export default {
     name: "FunnelSubHeader",
diff --git a/src/common-components/layouts/questions-page-layout/questions-page-layout.spec.js b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
similarity index 100%
rename from src/common-components/layouts/questions-page-layout/questions-page-layout.spec.js
rename to src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
diff --git a/src/common-components/layouts/questions-page-layout/questions-page-layout.vue b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
similarity index 87%
rename from src/common-components/layouts/questions-page-layout/questions-page-layout.vue
rename to src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
index 1ab40a7b0..f6bb2a656 100644
--- a/src/common-components/layouts/questions-page-layout/questions-page-layout.vue
+++ b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
@@ -35,13 +35,13 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import alert from "@/ux-components/alert/alert";
-import questionChain from "@/common-components/question-chain/question-chain";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
+import questionChain from "@/digital-components/question-chain/question-chain";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 
 export default {
     name: "questions-page",
diff --git a/src/common-components/loading-modal/loading-modal.spec.js b/src/fmg-components/loading-modal/loading-modal.spec.js
similarity index 100%
rename from src/common-components/loading-modal/loading-modal.spec.js
rename to src/fmg-components/loading-modal/loading-modal.spec.js
diff --git a/src/common-components/loading-modal/loading-modal.vue b/src/fmg-components/loading-modal/loading-modal.vue
similarity index 100%
rename from src/common-components/loading-modal/loading-modal.vue
rename to src/fmg-components/loading-modal/loading-modal.vue
diff --git a/src/ux-components/alert/alert.spec.js b/src/fmg-components/ux-components/alert/alert.spec.js
similarity index 100%
rename from src/ux-components/alert/alert.spec.js
rename to src/fmg-components/ux-components/alert/alert.spec.js
diff --git a/src/ux-components/alert/alert.vue b/src/fmg-components/ux-components/alert/alert.vue
similarity index 100%
rename from src/ux-components/alert/alert.vue
rename to src/fmg-components/ux-components/alert/alert.vue
diff --git a/src/ux-components/button-main/button-main.spec.js b/src/fmg-components/ux-components/button-main/button-main.spec.js
similarity index 100%
rename from src/ux-components/button-main/button-main.spec.js
rename to src/fmg-components/ux-components/button-main/button-main.spec.js
diff --git a/src/ux-components/button-main/button-main.vue b/src/fmg-components/ux-components/button-main/button-main.vue
similarity index 100%
rename from src/ux-components/button-main/button-main.vue
rename to src/fmg-components/ux-components/button-main/button-main.vue
diff --git a/src/ux-components/checkbox/checkbox.spec.js b/src/fmg-components/ux-components/checkbox/checkbox.spec.js
similarity index 100%
rename from src/ux-components/checkbox/checkbox.spec.js
rename to src/fmg-components/ux-components/checkbox/checkbox.spec.js
diff --git a/src/ux-components/checkbox/checkbox.vue b/src/fmg-components/ux-components/checkbox/checkbox.vue
similarity index 100%
rename from src/ux-components/checkbox/checkbox.vue
rename to src/fmg-components/ux-components/checkbox/checkbox.vue
diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js b/src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.spec.js
similarity index 100%
rename from src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
rename to src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.spec.js
diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.vue b/src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.vue
similarity index 98%
rename from src/ux-components/list-button-horizontal/list-button-horizontal.vue
rename to src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.vue
index e2c8a73c8..0776ffcac 100644
--- a/src/ux-components/list-button-horizontal/list-button-horizontal.vue
+++ b/src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import baseInputButton from "@/common-components/base-input-button/base-input-button";
+import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 
 export default {
diff --git a/src/ux-components/list-button/list-button.spec.js b/src/fmg-components/ux-components/list-button/list-button.spec.js
similarity index 100%
rename from src/ux-components/list-button/list-button.spec.js
rename to src/fmg-components/ux-components/list-button/list-button.spec.js
diff --git a/src/ux-components/list-button/list-button.vue b/src/fmg-components/ux-components/list-button/list-button.vue
similarity index 97%
rename from src/ux-components/list-button/list-button.vue
rename to src/fmg-components/ux-components/list-button/list-button.vue
index 33df5568a..1ebc46cc7 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/fmg-components/ux-components/list-button/list-button.vue
@@ -24,7 +24,7 @@
 
 <script>
 import loader from "@/ux-components/loader/loader";
-import baseInputButton from "@/common-components/base-input-button/base-input-button";
+import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 
 export default {
diff --git a/src/ux-components/list-card/list-card.spec.js b/src/fmg-components/ux-components/list-card/list-card.spec.js
similarity index 100%
rename from src/ux-components/list-card/list-card.spec.js
rename to src/fmg-components/ux-components/list-card/list-card.spec.js
diff --git a/src/ux-components/list-card/list-card.vue b/src/fmg-components/ux-components/list-card/list-card.vue
similarity index 98%
rename from src/ux-components/list-card/list-card.vue
rename to src/fmg-components/ux-components/list-card/list-card.vue
index ed70705c9..7755249ab 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/fmg-components/ux-components/list-card/list-card.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import baseInputButton from "@/common-components/base-input-button/base-input-button";
+import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 
 export default {
diff --git a/src/ux-components/loader/loader.spec.js b/src/fmg-components/ux-components/loader/loader.spec.js
similarity index 100%
rename from src/ux-components/loader/loader.spec.js
rename to src/fmg-components/ux-components/loader/loader.spec.js
diff --git a/src/ux-components/loader/loader.vue b/src/fmg-components/ux-components/loader/loader.vue
similarity index 100%
rename from src/ux-components/loader/loader.vue
rename to src/fmg-components/ux-components/loader/loader.vue
diff --git a/src/ux-components/radio/radio.spec.js b/src/fmg-components/ux-components/radio/radio.spec.js
similarity index 100%
rename from src/ux-components/radio/radio.spec.js
rename to src/fmg-components/ux-components/radio/radio.spec.js
diff --git a/src/ux-components/radio/radio.vue b/src/fmg-components/ux-components/radio/radio.vue
similarity index 95%
rename from src/ux-components/radio/radio.vue
rename to src/fmg-components/ux-components/radio/radio.vue
index 73c919a44..6a63ee3d5 100644
--- a/src/ux-components/radio/radio.vue
+++ b/src/fmg-components/ux-components/radio/radio.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import baseInputButton from "@/common-components/base-input-button/base-input-button";
+import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 
 export default {
diff --git a/src/ux-components/text-link/text-link.spec.js b/src/fmg-components/ux-components/text-link/text-link.spec.js
similarity index 100%
rename from src/ux-components/text-link/text-link.spec.js
rename to src/fmg-components/ux-components/text-link/text-link.spec.js
diff --git a/src/ux-components/text-link/text-link.vue b/src/fmg-components/ux-components/text-link/text-link.vue
similarity index 100%
rename from src/ux-components/text-link/text-link.vue
rename to src/fmg-components/ux-components/text-link/text-link.vue
diff --git a/src/common-components/vehicle-banner/vehicle-banner.spec.js b/src/fmg-components/vehicle-banner/vehicle-banner.spec.js
similarity index 100%
rename from src/common-components/vehicle-banner/vehicle-banner.spec.js
rename to src/fmg-components/vehicle-banner/vehicle-banner.spec.js
diff --git a/src/common-components/vehicle-banner/vehicle-banner.vue b/src/fmg-components/vehicle-banner/vehicle-banner.vue
similarity index 100%
rename from src/common-components/vehicle-banner/vehicle-banner.vue
rename to src/fmg-components/vehicle-banner/vehicle-banner.vue

From 15319196db036c7d96fffd5c878cf9cd9ad60d4c Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 17 Jan 2023 16:58:09 -0500
Subject: [PATCH 008/261] WIP Update file paths.

---
 .../funnel-footer/funnel-footer.vue            |  4 ++--
 .../funnel-header/funnel-header.vue            |  2 +-
 .../funnel-header/menu-modal/menu-modal.vue    |  2 +-
 .../questions-page-layout.vue                  |  2 +-
 .../ux-components/button-main/button-main.vue  |  2 +-
 .../ux-components/list-button/list-button.vue  |  2 +-
 .../ux-components/loader/loader.vue            |  2 +-
 src/layouts/address-lookup/address-lookup.vue  | 12 ++++++------
 .../address-questions/address-questions.vue    |  6 +++---
 .../customer-questions/customer-questions.vue  |  4 ++--
 .../address-vehicles-question.vue              |  4 ++--
 .../address-vehicles/address-vehicles.vue      | 10 +++++-----
 .../capability-questions.vue                   |  2 +-
 src/layouts/estimate/estimate.vue              | 18 +++++++++---------
 .../license-plate-lookup.vue                   | 14 +++++++-------
 .../molding-questions/molding-questions.vue    |  2 +-
 src/layouts/part-questions/part-questions.vue  |  2 +-
 .../cash-or-insurance-question.vue             |  2 +-
 src/layouts/quote/quote.vue                    | 15 ++++++++-------
 .../service-package-question.vue               |  2 +-
 .../service-package-radio.vue                  |  4 ++--
 src/layouts/reveal/reveal.vue                  |  4 ++--
 .../service-location/service-location.vue      |  7 ++++---
 .../damage-location-question.vue               |  2 +-
 .../replace-options-question.vue               |  2 +-
 .../side-door-options/side-door-options.vue    |  4 ++--
 src/layouts/vehicle-damage/vehicle-damage.vue  | 11 ++++++-----
 .../windshield-chip-count-question.vue         |  2 +-
 .../windshield-damage-type-question.vue        |  2 +-
 .../windshield-options/windshield-options.vue  |  2 +-
 .../make-question/make-question.vue            |  2 +-
 src/layouts/vehicle-make/vehicle-make.vue      |  6 +++---
 .../model-question/model-question.vue          |  2 +-
 src/layouts/vehicle-model/vehicle-model.vue    |  6 +++---
 .../glass-part-question.vue                    |  2 +-
 src/layouts/vehicle-parts/vehicle-parts.vue    | 12 ++++++------
 .../style-question/style-question.vue          |  2 +-
 src/layouts/vehicle-style/vehicle-style.vue    |  6 +++---
 src/layouts/vehicle-year/vehicle-year.vue      |  6 +++---
 .../year-question/year-question.vue            |  2 +-
 .../vin-information/vin-information.vue        |  2 +-
 src/layouts/vin-lookup/vin-lookup.vue          | 17 +++++++++--------
 src/mixins/input-button-wrapper-mixin.js       |  2 +-
 src/router/index.js                            |  2 +-
 44 files changed, 111 insertions(+), 107 deletions(-)

diff --git a/src/fmg-components/funnel-footer/funnel-footer.vue b/src/fmg-components/funnel-footer/funnel-footer.vue
index 2a6119681..b5cf16002 100644
--- a/src/fmg-components/funnel-footer/funnel-footer.vue
+++ b/src/fmg-components/funnel-footer/funnel-footer.vue
@@ -29,8 +29,8 @@
 </template>
 
 <script>
-import textLink from "@/ux-components/text-link/text-link";
-import buttonMain from "@/ux-components/button-main/button-main";
+import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import buttonMain from "@/fmg-components/ux-components/button-main/button-main";
 
 export default {
     name: "funnelFooter",
diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
index acfacd709..593989e6e 100644
--- a/src/fmg-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import alert from "@/ux-components/alert/alert";
+import alert from "@/fmg-components/ux-components/alert/alert";
 import eventBus from "@/helpers/event-bus/event-bus";
 import { globalEvents } from "@/constants/events";
 import menuModal from "@/fmg-components/funnel-header/menu-modal/menu-modal";
diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
index fd0c96cb8..3b9bbf26c 100644
--- a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
@@ -78,7 +78,7 @@
 </template>
 
 <script>
-import textLink from "@/ux-components/text-link/text-link";
+import textLink from "@/fmg-components/ux-components/text-link/text-link";
 export default {
     name: "menuModal",
     data() {
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..8d78fee3f 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
@@ -37,7 +37,7 @@
 // Components
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
-import alert from "@/ux-components/alert/alert";
+import alert from "@/fmg-components/ux-components/alert/alert";
 import questionChain from "@/digital-components/question-chain/question-chain";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
diff --git a/src/fmg-components/ux-components/button-main/button-main.vue b/src/fmg-components/ux-components/button-main/button-main.vue
index 18d7427c2..26be0f184 100644
--- a/src/fmg-components/ux-components/button-main/button-main.vue
+++ b/src/fmg-components/ux-components/button-main/button-main.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import loader from "@/ux-components/loader/loader";
+import loader from "@/fmg-components/ux-components/loader/loader";
 
 export default {
     name: "buttonMain",
diff --git a/src/fmg-components/ux-components/list-button/list-button.vue b/src/fmg-components/ux-components/list-button/list-button.vue
index 1ebc46cc7..0e2383c07 100644
--- a/src/fmg-components/ux-components/list-button/list-button.vue
+++ b/src/fmg-components/ux-components/list-button/list-button.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import loader from "@/ux-components/loader/loader";
+import loader from "@/fmg-components/ux-components/loader/loader";
 import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 
diff --git a/src/fmg-components/ux-components/loader/loader.vue b/src/fmg-components/ux-components/loader/loader.vue
index daea9c511..8698c27fc 100644
--- a/src/fmg-components/ux-components/loader/loader.vue
+++ b/src/fmg-components/ux-components/loader/loader.vue
@@ -42,7 +42,7 @@ export default {
     //Spinner basics
     &:after {
         content: "";
-        mask: url(../../assets/img/icons/spinner.svg);
+        mask: url(../../../assets/img/icons/spinner.svg);
         mask-size: cover;
         position: relative;
         width: 1rem;
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 0eb130eba..4599a017b 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -81,13 +81,13 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import customerQuestions from "@/layouts/address-lookup/customer-questions/customer-questions";
-import alert from "@/ux-components/alert/alert";
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
+import alert from "@/fmg-components/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 
 import { Form, defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 4ad515fbb..60d6512cf 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -71,9 +71,9 @@
 </template>
 
 <script>
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
-import dropdownQuestion from "@/common-components/dropdown-question/dropdown-question";
-import alert from "@/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
+import dropdownQuestion from "@/digital-components/dropdown-question/dropdown-question";
+import alert from "@/fmg-components/ux-components/alert/alert";
 import { applicationConfig } from "@/constants/application-config.js";
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index d10812df2..5c8ee6b4e 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -42,12 +42,12 @@
 
 <script>
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import textBlock from "@/common-components/text-block/text-block";
+import textBlock from "@/digital-components/text-block/text-block";
 
 // DEFINE VALIDATION RULES
 defineRule("first-name-required", required(errorMessages.FIRST_NAME_REQUIRED));
diff --git a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
index 9611965d8..4afb07c52 100644
--- a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
+++ b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
@@ -21,8 +21,8 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
-import alert from "@/ux-components/alert/alert";
+import buttonQuestion from "@/digital-components/button-question/button-question";
+import alert from "@/fmg-components/ux-components/alert/alert";
 
 // Supporting files
 import { getDamageString } from "@/helpers/damage-helper";
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index 4babd7a33..da59d2e5b 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -46,11 +46,11 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import alert from "@/ux-components/alert/alert";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import alert from "@/fmg-components/ux-components/alert/alert";
 import addressVehiclesQuestion from "@/layouts/address-vehicles/address-vehicles-question/address-vehicles-question";
 
 // Supporting files
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index d67f73838..5456b816c 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -16,7 +16,7 @@
 
 <script>
 // Components
-import questionsPageLayout from "@/common-components/layouts/questions-page-layout/questions-page-layout";
+import questionsPageLayout from "@/fmg-components/layouts/questions-page-layout/questions-page-layout";
 
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 9d7dedd04..df9adcf17 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -84,15 +84,15 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import buttonQuestion from "@/common-components/button-question/button-question";
-import alert from "@/ux-components/alert/alert";
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
-import textBlock from "@/common-components/text-block/text-block";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import buttonQuestion from "@/digital-components/button-question/button-question";
+import alert from "@/fmg-components/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
+import textBlock from "@/digital-components/text-block/text-block";
+import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 
 //Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 159d89260..ee2573fa3 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -91,13 +91,13 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import alert from "@/ux-components/alert/alert";
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
-import textBlock from "@/common-components/text-block/text-block";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import alert from "@/fmg-components/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
+import textBlock from "@/digital-components/text-block/text-block";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index b89feb5a9..ee1b33a9f 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -16,7 +16,7 @@
 
 <script>
 // Components
-import questionsPageLayout from "@/common-components/layouts/questions-page-layout/questions-page-layout";
+import questionsPageLayout from "@/fmg-components/layouts/questions-page-layout/questions-page-layout";
 
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 76ea36869..b94c92e1d 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -16,7 +16,7 @@
 
 <script>
 // Components
-import questionsPageLayout from "@/common-components/layouts/questions-page-layout/questions-page-layout";
+import questionsPageLayout from "@/fmg-components/layouts/questions-page-layout/questions-page-layout";
 
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue b/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue
index 3b420f6a8..6f6fd5c55 100644
--- a/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue
+++ b/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 
 const cashAnswer = "CashAnswer";
 const insuranceAnswer = "InsuranceAnswer";
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 6ce61a7b0..b02714ffa 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -1,3 +1,4 @@
+digital
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles quote">
@@ -46,15 +47,15 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import cashOrInsuranceQuestion from "./cash-or-insurance-question/cash-or-insurance-question";
 import servicePackageQuestion from "./service-package-question/service-package-question";
-import textBlock from "@/common-components/text-block/text-block";
-import modal from "@/common-components/modal/modal";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
+import textBlock from "@/digital-components/text-block/text-block";
+import modal from "@/digital-components/modal/modal";
+import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import baseMixin from "@/mixins/base-mixin.js";
 import vehicleQuestionsMixin from "../../mixins/vehicle-questions-mixin";
 import { settleAllPromises } from "@/helpers/layout-helper";
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 1d9235374..4f543064c 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 import baseMixin from "@/mixins/base-mixin.js";
 import { processIfStatements } from "@/helpers/cms-content-helper";
 import { damageLocationsSelected as glassLocations } from "@/constants/damage-locations-selected";
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 74bed2c5e..3828801cc 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
@@ -51,8 +51,8 @@
 </template>
 
 <script>
-import baseInputButton from "@/common-components/base-input-button/base-input-button";
-import textLink from "@/ux-components/text-link/text-link";
+import baseInputButton from "@/digital-components/base-input-button/base-input-button";
+import textLink from "@/fmg-components/ux-components/text-link/text-link";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 import {
     getLinkDisplayTextFromCopy,
diff --git a/src/layouts/reveal/reveal.vue b/src/layouts/reveal/reveal.vue
index 03ddf382d..b416b5318 100644
--- a/src/layouts/reveal/reveal.vue
+++ b/src/layouts/reveal/reveal.vue
@@ -11,8 +11,8 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
+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";
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index f853727a5..e29ebdb5e 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -1,3 +1,4 @@
+fmg
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
@@ -14,9 +15,9 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+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 { Form } from "vee-validate";
 
 // Supporting files
diff --git a/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue b/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue
index d1743ac00..67881b382 100644
--- a/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue
+++ b/src/layouts/vehicle-damage/damage-location-question/damage-location-question.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 import store from "@/store";
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
diff --git a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
index 12347cdf6..850ef568b 100644
--- a/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
+++ b/src/layouts/vehicle-damage/replace-options-question/replace-options-question.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 import store from "@/store";
 
 export default {
diff --git a/src/layouts/vehicle-damage/side-door-options/side-door-options.vue b/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
index b645c1ecd..a89711f05 100644
--- a/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
+++ b/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
@@ -40,8 +40,8 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
-import replaceOptionsQuestion from "@/layouts/vehicle-damage/replace-options-question/replace-options-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
+import replaceOptionsQuestion from "@layouts/vehicle-damage/replace-options-question/replace-options-question";
 import store from "@/store";
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 7446d4cd0..39c6845c2 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -1,3 +1,4 @@
+fmg
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
@@ -58,15 +59,15 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import sideDoorOptions from "@/layouts/vehicle-damage/side-door-options/side-door-options";
 import damageLocationQuestion from "@/layouts/vehicle-damage/damage-location-question/damage-location-question";
 import windshieldOptions from "@/layouts/vehicle-damage/windshield-options/windshield-options";
 import replaceOptionsQuestion from "@/layouts/vehicle-damage/replace-options-question/replace-options-question";
-import alert from "@/ux-components/alert/alert";
+import alert from "@/fmg-components/ux-components/alert/alert";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
index 48b813f2d..1f5602111 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 
 export default {
     name: "windshieldOptions",
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
index 01e146080..e6775b241 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 
 export default {
     name: "windshieldDamageTypeQuestion",
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index b878e5380..44250f860 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -42,7 +42,7 @@
 import windshieldDamageTypeQuestion from "@/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question";
 import windshieldChipCountQuestion from "@/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question";
 import replaceOptionsQuestion from "@/layouts/vehicle-damage/replace-options-question/replace-options-question";
-import alert from "@/ux-components/alert/alert";
+import alert from "@/fmg-components/ux-components/alert/alert";
 
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
diff --git a/src/layouts/vehicle-make/make-question/make-question.vue b/src/layouts/vehicle-make/make-question/make-question.vue
index 55edc05ce..2d3551c53 100644
--- a/src/layouts/vehicle-make/make-question/make-question.vue
+++ b/src/layouts/vehicle-make/make-question/make-question.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 // Supporting files
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
diff --git a/src/layouts/vehicle-make/vehicle-make.vue b/src/layouts/vehicle-make/vehicle-make.vue
index 6babfa443..a50440e35 100644
--- a/src/layouts/vehicle-make/vehicle-make.vue
+++ b/src/layouts/vehicle-make/vehicle-make.vue
@@ -23,9 +23,9 @@
 <script>
 // Components
 import makeQuestion from "@/layouts/vehicle-make/make-question/make-question";
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
diff --git a/src/layouts/vehicle-model/model-question/model-question.vue b/src/layouts/vehicle-model/model-question/model-question.vue
index a236e50ef..5ca926abc 100644
--- a/src/layouts/vehicle-model/model-question/model-question.vue
+++ b/src/layouts/vehicle-model/model-question/model-question.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 // Supporting files
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
diff --git a/src/layouts/vehicle-model/vehicle-model.vue b/src/layouts/vehicle-model/vehicle-model.vue
index 2ef0fc573..d15c170c6 100644
--- a/src/layouts/vehicle-model/vehicle-model.vue
+++ b/src/layouts/vehicle-model/vehicle-model.vue
@@ -23,9 +23,9 @@
 <script>
 // Components
 import modelQuestion from "@/layouts/vehicle-model/model-question/model-question";
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { storeMutations } from "@/constants/store-mutations";
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 65730f695..a6f5e3f0a 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
@@ -37,7 +37,7 @@
 
 <script>
 // Components
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 
 // Supporting files
 import { getTintImage } from "@/constants/tint-mapper";
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 1c35f96fa..b4036ffa1 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -45,12 +45,12 @@
 <script>
 // Components
 import glassPartQuestion from "@/layouts/vehicle-parts/glass-part-question/glass-part-question";
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import alert from "@/ux-components/alert/alert";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import alert from "@/fmg-components/ux-components/alert/alert";
+import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
diff --git a/src/layouts/vehicle-style/style-question/style-question.vue b/src/layouts/vehicle-style/style-question/style-question.vue
index 934360323..0bfd00f7c 100644
--- a/src/layouts/vehicle-style/style-question/style-question.vue
+++ b/src/layouts/vehicle-style/style-question/style-question.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 // Supporting files
 import store from "@/store";
 import { storeActions } from "@/constants/store-actions.js";
diff --git a/src/layouts/vehicle-style/vehicle-style.vue b/src/layouts/vehicle-style/vehicle-style.vue
index 23766f3e2..2d2a4a534 100644
--- a/src/layouts/vehicle-style/vehicle-style.vue
+++ b/src/layouts/vehicle-style/vehicle-style.vue
@@ -24,9 +24,9 @@
 // Components
 import baseMixin from "@/mixins/base-mixin.js";
 import styleQuestion from "@/layouts/vehicle-style/style-question/style-question";
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index f8a53ed5c..5b166151a 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -20,9 +20,9 @@
 <script>
 // Components
 import yearQuestion from "@/layouts/vehicle-year/year-question/year-question";
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/vehicle-year/year-question/year-question.vue b/src/layouts/vehicle-year/year-question/year-question.vue
index e4a36b401..6d8110216 100644
--- a/src/layouts/vehicle-year/year-question/year-question.vue
+++ b/src/layouts/vehicle-year/year-question/year-question.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 // Supporting files
 import { storeActions } from "@/constants/store-actions.js";
 import baseMixin from "@/mixins/base-mixin.js";
diff --git a/src/layouts/vin-lookup/vin-information/vin-information.vue b/src/layouts/vin-lookup/vin-information/vin-information.vue
index 9571cb5eb..dd1d068e0 100644
--- a/src/layouts/vin-lookup/vin-information/vin-information.vue
+++ b/src/layouts/vin-lookup/vin-information/vin-information.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import textLink from "@/ux-components/text-link/text-link";
+import textLink from "@/fmg-components/ux-components/text-link/text-link";
 //Supporting files
 import { settleAllPromises } from "@/helpers/layout-helper";
 export default {
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 990fd0658..849f19b74 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -1,3 +1,4 @@
+fmg
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
@@ -109,15 +110,15 @@
 
 <script>
 // Components
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/common-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
-import alert from "@/ux-components/alert/alert";
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
+import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
+import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
+import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
+import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
+import alert from "@/fmg-components/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import vinInformation from "@/layouts/vin-lookup/vin-information/vin-information";
-import textBlock from "@/common-components/text-block/text-block";
-import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
+import textBlock from "@/digital-components/text-block/text-block";
+import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/mixins/input-button-wrapper-mixin.js b/src/mixins/input-button-wrapper-mixin.js
index 1d34d6520..286c3f21c 100644
--- a/src/mixins/input-button-wrapper-mixin.js
+++ b/src/mixins/input-button-wrapper-mixin.js
@@ -1,4 +1,4 @@
-import { inputButtonProps } from "@/common-components/base-input-button/button-functionality-props";
+import { inputButtonProps } from "@/digital-components/base-input-button/button-functionality-props";
 
 export default {
     model: {
diff --git a/src/router/index.js b/src/router/index.js
index 30fc8583b..a183e5895 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -30,7 +30,7 @@ import { applicationConfig } from "../constants/application-config";
 
 // Components
 import quote from "@/layouts/quote/quote.vue";
-import datePicker from "@/common-components/date-picker/date-picker.vue";
+import datePicker from "@/digital-components/date-picker/date-picker.vue";
 
 const routes = [
     {

From b7884be72171ac7b56a65d524bf10abb0d90c87e Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 17 Jan 2023 17:16:30 -0500
Subject: [PATCH 009/261] WIP update file paths.

---
 .../vehicle-damage/side-door-options/side-door-options.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/vehicle-damage/side-door-options/side-door-options.vue b/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
index a89711f05..bc4b5fdd9 100644
--- a/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
+++ b/src/layouts/vehicle-damage/side-door-options/side-door-options.vue
@@ -41,7 +41,7 @@
 
 <script>
 import buttonQuestion from "@/digital-components/button-question/button-question";
-import replaceOptionsQuestion from "@layouts/vehicle-damage/replace-options-question/replace-options-question";
+import replaceOptionsQuestion from "../replace-options-question/replace-options-question";
 import store from "@/store";
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";

From 1e75254e2b1979f9876ff9b39129d088bd54e873 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 18 Jan 2023 08:21:19 -0500
Subject: [PATCH 010/261] Test to trigger build

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

diff --git a/src/digital-components/text-block/text-block.vue b/src/digital-components/text-block/text-block.vue
index 33854e143..e0087ecad 100644
--- a/src/digital-components/text-block/text-block.vue
+++ b/src/digital-components/text-block/text-block.vue
@@ -12,7 +12,7 @@ export default {
         justifyText: String, // left, right, center
         typeStyle: String, // h1-h6, body, small, label, caption (see Figma or Confluence documentation)
         fontWeight: String, // bold=500, default is 400
-        cmsWidgetName: String,
+        cmsWidgetName: String, //Test
     },
     computed: {
         TextBlockCopy() {

From 49b9ddd0f3794d9ce8896d25302e20a5cd3ac75d Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 18 Jan 2023 08:28:24 -0500
Subject: [PATCH 011/261] Remove test code.

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

diff --git a/src/digital-components/text-block/text-block.vue b/src/digital-components/text-block/text-block.vue
index e0087ecad..33854e143 100644
--- a/src/digital-components/text-block/text-block.vue
+++ b/src/digital-components/text-block/text-block.vue
@@ -12,7 +12,7 @@ export default {
         justifyText: String, // left, right, center
         typeStyle: String, // h1-h6, body, small, label, caption (see Figma or Confluence documentation)
         fontWeight: String, // bold=500, default is 400
-        cmsWidgetName: String, //Test
+        cmsWidgetName: String,
     },
     computed: {
         TextBlockCopy() {

From e3eb55803692d48ecad1688dead41df416484951 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 18 Jan 2023 09:07:44 -0500
Subject: [PATCH 012/261] Update paths for unit tests.

---
 .../button-question/button-question.spec.js            |  2 +-
 .../question-chain/question-chain.spec.js              |  2 +-
 .../questions-page-layout.spec.js                      |  2 +-
 .../address-questions/address-questions.spec.js        |  2 +-
 src/mixins/input-button-wrapper-mixin.spec.js          | 10 +++++-----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/digital-components/button-question/button-question.spec.js b/src/digital-components/button-question/button-question.spec.js
index eb2308ca0..e9e1d70a4 100644
--- a/src/digital-components/button-question/button-question.spec.js
+++ b/src/digital-components/button-question/button-question.spec.js
@@ -1,5 +1,5 @@
 import { shallowMount, mount } from "@vue/test-utils";
-import buttonQuestion from "@/common-components/button-question/button-question";
+import buttonQuestion from "./button-question";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 
 describe("buttonQuestion.vue", () => {
diff --git a/src/digital-components/question-chain/question-chain.spec.js b/src/digital-components/question-chain/question-chain.spec.js
index 8288f351c..2444fd22d 100644
--- a/src/digital-components/question-chain/question-chain.spec.js
+++ b/src/digital-components/question-chain/question-chain.spec.js
@@ -1,5 +1,5 @@
 import { shallowMount } from "@vue/test-utils";
-import questionChain from "@/common-components/question-chain/question-chain.vue";
+import questionChain from "./question-chain.vue";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 import { nextTick } from "vue";
 
diff --git a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
index 72da3c9df..38b0f3d16 100644
--- a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
+++ b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.spec.js
@@ -1,5 +1,5 @@
 // Components
-import questionsPageLayout from "@/common-components/layouts/questions-page-layout/questions-page-layout";
+import questionsPageLayout from "./questions-page-layout";
 
 // Supporting Files
 import { shallowMount } from "@vue/test-utils";
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
index c8d24c57e..0ab14d352 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
@@ -1,6 +1,6 @@
 // Components
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
-import alert from "@/ux-components/alert/alert";
+import alert from "@/fmg-components/ux-components/alert/alert";
 
 // Supporting Files
 import { mount, shallowMount } from "@vue/test-utils";
diff --git a/src/mixins/input-button-wrapper-mixin.spec.js b/src/mixins/input-button-wrapper-mixin.spec.js
index c0028ddab..63595fb62 100644
--- a/src/mixins/input-button-wrapper-mixin.spec.js
+++ b/src/mixins/input-button-wrapper-mixin.spec.js
@@ -1,10 +1,10 @@
 import { mount } from "@vue/test-utils";
-import baseInputButton from "@/common-components/base-input-button/base-input-button";
+import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
-import listButtonHorizontal from "@/ux-components/list-button-horizontal/list-button-horizontal";
-import listButton from "@/ux-components/list-button/list-button";
-import listCard from "@/ux-components/list-card/list-card";
-import radio from "@/ux-components/radio/radio";
+import listButtonHorizontal from "@/fmg-components/ux-components/list-button-horizontal/list-button-horizontal";
+import listButton from "@/fmg-components/ux-components/list-button/list-button";
+import listCard from "@/fmg-components/ux-components/list-card/list-card";
+import radio from "@/fmg-components/ux-components/radio/radio";
 
 describe("input-button-wrapper-mixin", () => {
     describe("mouse clicks", () => {

From 00c5b46b5f16a4e49879411910cb647aa08d35bd Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 18 Jan 2023 09:15:04 -0500
Subject: [PATCH 013/261] Revamping to prevent JAWS Error, an additional
 changes to resolve issues caused by the fix

---
 .../address-questions/address-questions.vue   | 104 +++++++++---------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 4ad515fbb..6f09ecf6c 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -78,6 +78,7 @@ import { applicationConfig } from "@/constants/application-config.js";
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
+import { fill } from "lodash";
 
 // DEFINE VALIDATION RULES
 defineRule("street-address-required", required(errorMessages.STREET_ADDRESS_REQUIRED));
@@ -113,7 +114,6 @@ export default {
             matchingIndirectly: false,
             matchFound: null, // null = no attempted match, true = match was found, false = match was not found
             enterPressed: false,
-            isAddressWatchActive: false, // Only deep watch the address model when a match was not found
         };
     },
     computed: {
@@ -235,27 +235,23 @@ export default {
                     });
 
                     addressField1.addEventListener("keydown", (e) => {
-                        if (e.code === "Enter" || e.code === "NumpadEnter" || e.code === "Tab") {
-                            if (e.code === "Tab") {
-                                self.matchingIndirectly = true;
+                        if (e.code === "Enter" || e.code === "NumpadEnter") {                           
+                            const selectedItem = document.querySelector(".pac-container .pac-item-selected");
+                            if (selectedItem !== null) {
+                                // Fill-in the address using selected item in the list.
+                                fillInAddress(selectedItem); 
                             } else {
-                                self.enterPressed = true;
-                            }
-
-                            addressField1.blur();
+                                // Fill-in the address using first item in the list.
+                                fillInAddressUsingFirstItem();
+                            }            
                         } else {
                             return;
                         }
                     });
 
                     addressField1.addEventListener("change", () => {
-                        // NOTE: The "place_changed" event of the autocomplete fires after this and will use either the address the user had chosen
-                        // using either the down / up arrows or the address the user was hovering over when they pressed "Enter."
-
-                        // If a match has been previously found then do nothing
-                        // OR
-                        // If the user pressed "Enter" then do nothing
-                        if (self.matchFound || self.enterPressed) {
+                        // If a match has been previously attempted then do nothing
+                        if (self.matchFound !== null) {
                             return;
                         }
 
@@ -267,29 +263,33 @@ export default {
                         // If the Street Address field changed without clicking (i.e. by pressing Tab, or clicking outside the field)
                         if (clickedAddress === null) {
                             // Fill-in the address using first item in the list.
-                            const item = document.querySelector(".pac-container .pac-item");
-                            if (item != null) {
-                                self.matchingIndirectly = true;
-
-                                const firstResult = item.textContent;
-                                const geocoder = new window.google.maps.Geocoder();
-                                geocoder.geocode(
-                                    {
-                                        address: firstResult,
-                                    },
-                                    function (results, status) {
-                                        if (status === window.google.maps.GeocoderStatus.OK) {
-                                            fillInAddress(results[0]);
-                                        }
-                                    }
-                                );
-                            } else {
-                                // No addresses found for the input
-                                self.matchFound = false;
-                            }
+                            fillInAddressUsingFirstItem();
                         }
+
                     });
 
+                    function fillInAddressUsingFirstItem() {
+                        // Fill-in the address using first item in the list.
+                        const item = document.querySelector(".pac-container .pac-item");
+                        if (item != null) {
+                            const firstResult = item.textContent;
+                            const geocoder = new window.google.maps.Geocoder();
+                            geocoder.geocode(
+                                {
+                                    address: firstResult,
+                                },
+                                function (results, status) {
+                                    if (status === window.google.maps.GeocoderStatus.OK) {
+                                        fillInAddress(results[0]);
+                                        self.displayVerificationWarning = true;
+                                    }
+                                }
+                            );
+                        } else {
+                            self.matchFound = false;
+                        }
+                    }
+
                     function fillInAddress(place) {
                         if (!place) {
                             place = autocomplete.getPlace();
@@ -297,6 +297,7 @@ export default {
 
                         if (place && place.address_components) {
                             self.matchFound = true;
+
                             self.addressModel.streetAddress = "";
                             self.$nextTick(function () {
                                 self.showAddressFields = true;
@@ -329,8 +330,6 @@ export default {
                                     }
                                 }
 
-                                self.displayVerificationWarning = self.matchingIndirectly;
-
                                 // after showing the address fields, disable the address autocomplete
                                 window.google.maps.event.removeListener(autocompleteListener);
                                 window.google.maps.event.clearInstanceListeners(autocomplete);
@@ -340,8 +339,6 @@ export default {
                                     pacContainer.remove();
                                 }
                             });
-                        } else {
-                            self.displayVerificationWarning = true;
                         }
                     }
                 })
@@ -357,6 +354,13 @@ export default {
     watch: {
         matchFound: {
             handler(newValue) {
+                if (newValue === null) {
+                    this.displayNoMatchWarning = false;
+                    this.displayVerificationWarning = false;
+                    this.unwatchAddress();
+                    return;
+                }
+
                 if (!newValue) {
                     this.displayNoMatchWarning = true;
 
@@ -366,22 +370,18 @@ export default {
                     this.showAddressFields = true;
                     this.displayVerificationWarning = false;
 
-                    this.$nextTick(function () {
-                        // Only deep watch the Address Model after a failed match
-                        this.isAddressWatchActive = true;
-                    });
+                    // Only deep watch the Address Model after a failed match
+                    this.unwatchAddress = this.$watch(
+                        "addressModel",
+                        () => {
+                            // When the address model changes reset to "no attempted match"
+                            this.matchFound = null;
+                        },
+                        { deep: true }
+                    );
                 }
             },
         },
-        addressModel: {
-            handler() {
-                if (this.isAddressWatchActive) {
-                    this.displayNoMatchWarning = false;
-                    this.isAddressWatchActive = false;
-                }
-            },
-            deep: true,
-        },
     },
     components: {
         textboxQuestion,

From e5c0689eeab4cfbee02e7e9f95e0764a3daa18f9 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 18 Jan 2023 10:47:59 -0500
Subject: [PATCH 014/261] CSR-1023 update Concept code with code from ISS.

Tested site flow locally without issues.
---
 .../base-input-button/button-functionality-props.js      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/digital-components/base-input-button/button-functionality-props.js b/src/digital-components/base-input-button/button-functionality-props.js
index 9a4aef5c9..748abaeb7 100644
--- a/src/digital-components/base-input-button/button-functionality-props.js
+++ b/src/digital-components/base-input-button/button-functionality-props.js
@@ -4,8 +4,15 @@ export const inputButtonProps = {
         required: true,
     },
     modelValue: {
-        type: [Array, String, Number],
         required: true,
+        validator: function(prop) {
+            return (
+                prop === null
+                || Array.isArray(prop)
+                || typeof prop === 'string'
+                || (typeof prop === 'number' && !Number.isNaN(prop))
+            )
+        }
     },
     isMultiSelect: Boolean,
     groupName: {

From ac3b30a2a47a293c6649c7acc0623668ecf7a95a Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 18 Jan 2023 10:50:40 -0500
Subject: [PATCH 015/261] Code format.

---
 .../button-functionality-props.js                  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/digital-components/base-input-button/button-functionality-props.js b/src/digital-components/base-input-button/button-functionality-props.js
index 748abaeb7..fe2104457 100644
--- a/src/digital-components/base-input-button/button-functionality-props.js
+++ b/src/digital-components/base-input-button/button-functionality-props.js
@@ -5,14 +5,14 @@ export const inputButtonProps = {
     },
     modelValue: {
         required: true,
-        validator: function(prop) {
+        validator: function (prop) {
             return (
-                prop === null
-                || Array.isArray(prop)
-                || typeof prop === 'string'
-                || (typeof prop === 'number' && !Number.isNaN(prop))
-            )
-        }
+                prop === null ||
+                Array.isArray(prop) ||
+                typeof prop === "string" ||
+                (typeof prop === "number" && !Number.isNaN(prop))
+            );
+        },
     },
     isMultiSelect: Boolean,
     groupName: {

From 2545b655d37faffa0b68735f698679e43c4cd0da Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 18 Jan 2023 13:11:48 -0500
Subject: [PATCH 016/261] Removing unused state variables

---
 .../address-questions/address-questions.vue         | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 6f09ecf6c..060ee806b 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -111,9 +111,7 @@ export default {
             alertCopyVerificationWarning: "",
             alertHeadlineNoMatchWarning: "",
             alertCopyNoMatchWarning: "",
-            matchingIndirectly: false,
             matchFound: null, // null = no attempted match, true = match was found, false = match was not found
-            enterPressed: false,
         };
     },
     computed: {
@@ -235,15 +233,17 @@ export default {
                     });
 
                     addressField1.addEventListener("keydown", (e) => {
-                        if (e.code === "Enter" || e.code === "NumpadEnter") {                           
-                            const selectedItem = document.querySelector(".pac-container .pac-item-selected");
+                        if (e.code === "Enter" || e.code === "NumpadEnter") {
+                            const selectedItem = document.querySelector(
+                                ".pac-container .pac-item-selected"
+                            );
                             if (selectedItem !== null) {
                                 // Fill-in the address using selected item in the list.
-                                fillInAddress(selectedItem); 
+                                fillInAddress(selectedItem);
                             } else {
                                 // Fill-in the address using first item in the list.
                                 fillInAddressUsingFirstItem();
-                            }            
+                            }
                         } else {
                             return;
                         }
@@ -265,7 +265,6 @@ export default {
                             // Fill-in the address using first item in the list.
                             fillInAddressUsingFirstItem();
                         }
-
                     });
 
                     function fillInAddressUsingFirstItem() {

From b24f1fb95d6548bf3d56cc57cde82dfe37cf5bf5 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 18 Jan 2023 15:26:20 -0500
Subject: [PATCH 017/261] CSR-1021 Move ux-components folder to src

---
 .../button-question/button-question.vue                   | 8 ++++----
 src/digital-components/modal/modal.vue                    | 2 +-
 src/fmg-components/funnel-footer/funnel-footer.vue        | 4 ++--
 src/fmg-components/funnel-header/funnel-header.vue        | 2 +-
 .../funnel-header/menu-modal/menu-modal.vue               | 2 +-
 .../questions-page-layout/questions-page-layout.vue       | 2 +-
 src/layouts/address-lookup/address-lookup.vue             | 2 +-
 .../address-questions/address-questions.spec.js           | 2 +-
 .../address-questions/address-questions.vue               | 2 +-
 .../address-vehicles-question.vue                         | 2 +-
 src/layouts/address-vehicles/address-vehicles.vue         | 2 +-
 src/layouts/estimate/estimate.vue                         | 2 +-
 src/layouts/license-plate-lookup/license-plate-lookup.vue | 2 +-
 .../service-package-radio/service-package-radio.vue       | 2 +-
 src/layouts/vehicle-damage/vehicle-damage.vue             | 2 +-
 .../windshield-options/windshield-options.vue             | 2 +-
 src/layouts/vehicle-parts/vehicle-parts.vue               | 2 +-
 .../vin-lookup/vin-information/vin-information.vue        | 2 +-
 src/layouts/vin-lookup/vin-lookup.vue                     | 2 +-
 src/mixins/input-button-wrapper-mixin.spec.js             | 8 ++++----
 .../ux-components/alert/alert.spec.js                     | 0
 src/{fmg-components => }/ux-components/alert/alert.vue    | 0
 .../ux-components/button-main/button-main.spec.js         | 0
 .../ux-components/button-main/button-main.vue             | 2 +-
 .../ux-components/checkbox/checkbox.spec.js               | 0
 .../ux-components/checkbox/checkbox.vue                   | 0
 .../list-button-horizontal/list-button-horizontal.spec.js | 0
 .../list-button-horizontal/list-button-horizontal.vue     | 0
 .../ux-components/list-button/list-button.spec.js         | 0
 .../ux-components/list-button/list-button.vue             | 2 +-
 .../ux-components/list-card/list-card.spec.js             | 0
 .../ux-components/list-card/list-card.vue                 | 0
 .../ux-components/loader/loader.spec.js                   | 0
 src/{fmg-components => }/ux-components/loader/loader.vue  | 0
 .../ux-components/radio/radio.spec.js                     | 0
 src/{fmg-components => }/ux-components/radio/radio.vue    | 0
 .../ux-components/text-link/text-link.spec.js             | 0
 .../ux-components/text-link/text-link.vue                 | 0
 38 files changed, 29 insertions(+), 29 deletions(-)
 rename src/{fmg-components => }/ux-components/alert/alert.spec.js (100%)
 rename src/{fmg-components => }/ux-components/alert/alert.vue (100%)
 rename src/{fmg-components => }/ux-components/button-main/button-main.spec.js (100%)
 rename src/{fmg-components => }/ux-components/button-main/button-main.vue (98%)
 rename src/{fmg-components => }/ux-components/checkbox/checkbox.spec.js (100%)
 rename src/{fmg-components => }/ux-components/checkbox/checkbox.vue (100%)
 rename src/{fmg-components => }/ux-components/list-button-horizontal/list-button-horizontal.spec.js (100%)
 rename src/{fmg-components => }/ux-components/list-button-horizontal/list-button-horizontal.vue (100%)
 rename src/{fmg-components => }/ux-components/list-button/list-button.spec.js (100%)
 rename src/{fmg-components => }/ux-components/list-button/list-button.vue (97%)
 rename src/{fmg-components => }/ux-components/list-card/list-card.spec.js (100%)
 rename src/{fmg-components => }/ux-components/list-card/list-card.vue (100%)
 rename src/{fmg-components => }/ux-components/loader/loader.spec.js (100%)
 rename src/{fmg-components => }/ux-components/loader/loader.vue (100%)
 rename src/{fmg-components => }/ux-components/radio/radio.spec.js (100%)
 rename src/{fmg-components => }/ux-components/radio/radio.vue (100%)
 rename src/{fmg-components => }/ux-components/text-link/text-link.spec.js (100%)
 rename src/{fmg-components => }/ux-components/text-link/text-link.vue (100%)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 661e3ace1..646b244be 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -74,10 +74,10 @@
 </template>
 
 <script>
-import listButton from "@/fmg-components/ux-components/list-button/list-button";
-import listButtonHorizontal from "@/fmg-components/ux-components/list-button-horizontal/list-button-horizontal";
-import listCard from "@/fmg-components/ux-components/list-card/list-card";
-import radio from "@/fmg-components/ux-components/radio/radio";
+import listButton from "@/ux-components/list-button/list-button";
+import listButtonHorizontal from "@/ux-components/list-button-horizontal/list-button-horizontal";
+import listCard from "@/ux-components/list-card/list-card";
+import radio from "@/ux-components/radio/radio";
 import { ErrorMessage } from "vee-validate";
 
 export default {
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 71f026020..7de269644 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import buttonMain from "@/fmg-components/ux-components/button-main/button-main";
+import buttonMain from "@/ux-components/button-main/button-main";
 
 export default {
     name: "modal",
diff --git a/src/fmg-components/funnel-footer/funnel-footer.vue b/src/fmg-components/funnel-footer/funnel-footer.vue
index b5cf16002..2a6119681 100644
--- a/src/fmg-components/funnel-footer/funnel-footer.vue
+++ b/src/fmg-components/funnel-footer/funnel-footer.vue
@@ -29,8 +29,8 @@
 </template>
 
 <script>
-import textLink from "@/fmg-components/ux-components/text-link/text-link";
-import buttonMain from "@/fmg-components/ux-components/button-main/button-main";
+import textLink from "@/ux-components/text-link/text-link";
+import buttonMain from "@/ux-components/button-main/button-main";
 
 export default {
     name: "funnelFooter",
diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue
index 593989e6e..acfacd709 100644
--- a/src/fmg-components/funnel-header/funnel-header.vue
+++ b/src/fmg-components/funnel-header/funnel-header.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import eventBus from "@/helpers/event-bus/event-bus";
 import { globalEvents } from "@/constants/events";
 import menuModal from "@/fmg-components/funnel-header/menu-modal/menu-modal";
diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
index 3b9bbf26c..fd0c96cb8 100644
--- a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
@@ -78,7 +78,7 @@
 </template>
 
 <script>
-import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import textLink from "@/ux-components/text-link/text-link";
 export default {
     name: "menuModal",
     data() {
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 8d78fee3f..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
@@ -37,7 +37,7 @@
 // Components
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import questionChain from "@/digital-components/question-chain/question-chain";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 4599a017b..9e27bbac7 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -86,7 +86,7 @@ import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import customerQuestions from "@/layouts/address-lookup/customer-questions/customer-questions";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 
 import { Form, defineRule } from "vee-validate";
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
index 0ab14d352..c8d24c57e 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
@@ -1,6 +1,6 @@
 // Components
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 
 // Supporting Files
 import { mount, shallowMount } from "@vue/test-utils";
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 60d6512cf..ba45ea133 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -73,7 +73,7 @@
 <script>
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import dropdownQuestion from "@/digital-components/dropdown-question/dropdown-question";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import { applicationConfig } from "@/constants/application-config.js";
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
diff --git a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
index 4afb07c52..0eb7db6ba 100644
--- a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
+++ b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
@@ -22,7 +22,7 @@
 
 <script>
 import buttonQuestion from "@/digital-components/button-question/button-question";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 
 // Supporting files
 import { getDamageString } from "@/helpers/damage-helper";
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index da59d2e5b..92b775b3b 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -50,7 +50,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import addressVehiclesQuestion from "@/layouts/address-vehicles/address-vehicles-question/address-vehicles-question";
 
 // Supporting files
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index df9adcf17..f09896838 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -89,7 +89,7 @@ import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import buttonQuestion from "@/digital-components/button-question/button-question";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import textBlock from "@/digital-components/text-block/text-block";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index ee2573fa3..5b7c0b568 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -95,7 +95,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import textBlock from "@/digital-components/text-block/text-block";
 
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 3828801cc..e50f18820 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
@@ -52,7 +52,7 @@
 
 <script>
 import baseInputButton from "@/digital-components/base-input-button/base-input-button";
-import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import textLink from "@/ux-components/text-link/text-link";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 import {
     getLinkDisplayTextFromCopy,
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 39c6845c2..f2fc72b38 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -67,7 +67,7 @@ import sideDoorOptions from "@/layouts/vehicle-damage/side-door-options/side-doo
 import damageLocationQuestion from "@/layouts/vehicle-damage/damage-location-question/damage-location-question";
 import windshieldOptions from "@/layouts/vehicle-damage/windshield-options/windshield-options";
 import replaceOptionsQuestion from "@/layouts/vehicle-damage/replace-options-question/replace-options-question";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
index 44250f860..b878e5380 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue
@@ -42,7 +42,7 @@
 import windshieldDamageTypeQuestion from "@/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question";
 import windshieldChipCountQuestion from "@/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question";
 import replaceOptionsQuestion from "@/layouts/vehicle-damage/replace-options-question/replace-options-question";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index b4036ffa1..5723cd0a8 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -49,7 +49,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 // Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
diff --git a/src/layouts/vin-lookup/vin-information/vin-information.vue b/src/layouts/vin-lookup/vin-information/vin-information.vue
index dd1d068e0..9571cb5eb 100644
--- a/src/layouts/vin-lookup/vin-information/vin-information.vue
+++ b/src/layouts/vin-lookup/vin-information/vin-information.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import textLink from "@/ux-components/text-link/text-link";
 //Supporting files
 import { settleAllPromises } from "@/helpers/layout-helper";
 export default {
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 849f19b74..6db8736c3 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -114,7 +114,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
 import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
 import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import vinInformation from "@/layouts/vin-lookup/vin-information/vin-information";
 import textBlock from "@/digital-components/text-block/text-block";
diff --git a/src/mixins/input-button-wrapper-mixin.spec.js b/src/mixins/input-button-wrapper-mixin.spec.js
index 63595fb62..1a3c1bb03 100644
--- a/src/mixins/input-button-wrapper-mixin.spec.js
+++ b/src/mixins/input-button-wrapper-mixin.spec.js
@@ -1,10 +1,10 @@
 import { mount } from "@vue/test-utils";
 import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
-import listButtonHorizontal from "@/fmg-components/ux-components/list-button-horizontal/list-button-horizontal";
-import listButton from "@/fmg-components/ux-components/list-button/list-button";
-import listCard from "@/fmg-components/ux-components/list-card/list-card";
-import radio from "@/fmg-components/ux-components/radio/radio";
+import listButtonHorizontal from "@/ux-components/list-button-horizontal/list-button-horizontal";
+import listButton from "@/ux-components/list-button/list-button";
+import listCard from "@/ux-components/list-card/list-card";
+import radio from "@/ux-components/radio/radio";
 
 describe("input-button-wrapper-mixin", () => {
     describe("mouse clicks", () => {
diff --git a/src/fmg-components/ux-components/alert/alert.spec.js b/src/ux-components/alert/alert.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/alert/alert.spec.js
rename to src/ux-components/alert/alert.spec.js
diff --git a/src/fmg-components/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
similarity index 100%
rename from src/fmg-components/ux-components/alert/alert.vue
rename to src/ux-components/alert/alert.vue
diff --git a/src/fmg-components/ux-components/button-main/button-main.spec.js b/src/ux-components/button-main/button-main.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/button-main/button-main.spec.js
rename to src/ux-components/button-main/button-main.spec.js
diff --git a/src/fmg-components/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue
similarity index 98%
rename from src/fmg-components/ux-components/button-main/button-main.vue
rename to src/ux-components/button-main/button-main.vue
index 26be0f184..18d7427c2 100644
--- a/src/fmg-components/ux-components/button-main/button-main.vue
+++ b/src/ux-components/button-main/button-main.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import loader from "@/fmg-components/ux-components/loader/loader";
+import loader from "@/ux-components/loader/loader";
 
 export default {
     name: "buttonMain",
diff --git a/src/fmg-components/ux-components/checkbox/checkbox.spec.js b/src/ux-components/checkbox/checkbox.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/checkbox/checkbox.spec.js
rename to src/ux-components/checkbox/checkbox.spec.js
diff --git a/src/fmg-components/ux-components/checkbox/checkbox.vue b/src/ux-components/checkbox/checkbox.vue
similarity index 100%
rename from src/fmg-components/ux-components/checkbox/checkbox.vue
rename to src/ux-components/checkbox/checkbox.vue
diff --git a/src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.spec.js b/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.spec.js
rename to src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
diff --git a/src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.vue b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
similarity index 100%
rename from src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.vue
rename to src/ux-components/list-button-horizontal/list-button-horizontal.vue
diff --git a/src/fmg-components/ux-components/list-button/list-button.spec.js b/src/ux-components/list-button/list-button.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/list-button/list-button.spec.js
rename to src/ux-components/list-button/list-button.spec.js
diff --git a/src/fmg-components/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
similarity index 97%
rename from src/fmg-components/ux-components/list-button/list-button.vue
rename to src/ux-components/list-button/list-button.vue
index 0e2383c07..1ebc46cc7 100644
--- a/src/fmg-components/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import loader from "@/fmg-components/ux-components/loader/loader";
+import loader from "@/ux-components/loader/loader";
 import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 
diff --git a/src/fmg-components/ux-components/list-card/list-card.spec.js b/src/ux-components/list-card/list-card.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/list-card/list-card.spec.js
rename to src/ux-components/list-card/list-card.spec.js
diff --git a/src/fmg-components/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
similarity index 100%
rename from src/fmg-components/ux-components/list-card/list-card.vue
rename to src/ux-components/list-card/list-card.vue
diff --git a/src/fmg-components/ux-components/loader/loader.spec.js b/src/ux-components/loader/loader.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/loader/loader.spec.js
rename to src/ux-components/loader/loader.spec.js
diff --git a/src/fmg-components/ux-components/loader/loader.vue b/src/ux-components/loader/loader.vue
similarity index 100%
rename from src/fmg-components/ux-components/loader/loader.vue
rename to src/ux-components/loader/loader.vue
diff --git a/src/fmg-components/ux-components/radio/radio.spec.js b/src/ux-components/radio/radio.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/radio/radio.spec.js
rename to src/ux-components/radio/radio.spec.js
diff --git a/src/fmg-components/ux-components/radio/radio.vue b/src/ux-components/radio/radio.vue
similarity index 100%
rename from src/fmg-components/ux-components/radio/radio.vue
rename to src/ux-components/radio/radio.vue
diff --git a/src/fmg-components/ux-components/text-link/text-link.spec.js b/src/ux-components/text-link/text-link.spec.js
similarity index 100%
rename from src/fmg-components/ux-components/text-link/text-link.spec.js
rename to src/ux-components/text-link/text-link.spec.js
diff --git a/src/fmg-components/ux-components/text-link/text-link.vue b/src/ux-components/text-link/text-link.vue
similarity index 100%
rename from src/fmg-components/ux-components/text-link/text-link.vue
rename to src/ux-components/text-link/text-link.vue

From 28527e2653ff5dca25e9d4796c5632f5d5c9af98 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 18 Jan 2023 15:27:16 -0500
Subject: [PATCH 018/261] Update path to loader.

---
 src/ux-components/loader/loader.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ux-components/loader/loader.vue b/src/ux-components/loader/loader.vue
index 8698c27fc..daea9c511 100644
--- a/src/ux-components/loader/loader.vue
+++ b/src/ux-components/loader/loader.vue
@@ -42,7 +42,7 @@ export default {
     //Spinner basics
     &:after {
         content: "";
-        mask: url(../../../assets/img/icons/spinner.svg);
+        mask: url(../../assets/img/icons/spinner.svg);
         mask-size: cover;
         position: relative;
         width: 1rem;

From 4ae65542c1f9f20fb3ba2135fa7eab814833fec5 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 19 Jan 2023 10:23:42 -0500
Subject: [PATCH 019/261] CSR-1097 fix error spacing and line height.

---
 src/digital-components/button-question/button-question.vue   | 2 +-
 src/digital-components/textbox-question/textbox-question.vue | 4 ++--
 src/styles/common-typography-styles.scss                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 646b244be..a7b37ef5e 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -68,7 +68,7 @@
             </fieldset>
         </div>
         <div class="row form-test-error mt-1">
-            <error-message :name="formatString(groupName)" v-if="!suppressError"></error-message>
+            <error-message class="small" :name="formatString(groupName)" v-if="!suppressError"></error-message>
         </div>
     </div>
 </template>
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index 957f59f36..a19823b0d 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -32,8 +32,8 @@
                 @focus="$emit('focus', $event.target.value)" />
             <button v-if="includeSearchIcon" type="submit" aria-label="Search button" />
         </div>
-        <div v-show="errorMessage" class="row my-2 form-test-error">
-            <span class="d-inline-flex mt-0" role="alert">{{ errorMessage }}</span>
+        <div v-show="errorMessage" class="row my-1 form-test-error">
+            <span class="d-inline-flex small mt-0" role="alert">{{ errorMessage }}</span>
         </div>
     </div>
 </template>
diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss
index 72b2e5875..a1b2a5e2b 100644
--- a/src/styles/common-typography-styles.scss
+++ b/src/styles/common-typography-styles.scss
@@ -42,7 +42,7 @@ h6,
 
 .small {
     font-size: 0.875rem;
-    line-height: 1.7;
+    line-height: 1.7142857143;
     font-weight: 400;
 }
 

From bbfe4f190de064b608c89cf90d41d7303c5f3808 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 19 Jan 2023 10:59:58 -0500
Subject: [PATCH 020/261] Format code.

---
 src/digital-components/button-question/button-question.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index a7b37ef5e..bf167b5ef 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -68,7 +68,10 @@
             </fieldset>
         </div>
         <div class="row form-test-error mt-1">
-            <error-message class="small" :name="formatString(groupName)" v-if="!suppressError"></error-message>
+            <error-message
+                class="small"
+                :name="formatString(groupName)"
+                v-if="!suppressError"></error-message>
         </div>
     </div>
 </template>

From 807b0a6bcc99723bfbca4f0147d4b8e518f24460 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 19 Jan 2023 13:39:12 -0500
Subject: [PATCH 021/261] Minor change to force build.

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

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index bf167b5ef..4c60b0708 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -1,4 +1,5 @@
-<!-- Documented in confluence https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Component -->
+<!-- Documented in confluence
+https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Component -->
 <template>
     <div
         :class="

From 7548603b165135e7cf9c47bfe0209fb30da7645c Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 19 Jan 2023 14:40:53 -0500
Subject: [PATCH 022/261] CSR-1097 add comment for REM calculation.

---
 src/styles/common-typography-styles.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss
index a1b2a5e2b..1344c53fb 100644
--- a/src/styles/common-typography-styles.scss
+++ b/src/styles/common-typography-styles.scss
@@ -42,7 +42,7 @@ h6,
 
 .small {
     font-size: 0.875rem;
-    line-height: 1.7142857143;
+    line-height: 1.7142857143; // 24px specified in Figma. REM value calculation 24px/14px=1.7142857143
     font-weight: 400;
 }
 

From 14a06b32832baf35e814a79121ceb687c13553bc Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 20 Jan 2023 08:44:21 -0500
Subject: [PATCH 023/261] Remove space to trigger build.

---
 src/styles/common-typography-styles.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss
index 1344c53fb..6ce9bf6f2 100644
--- a/src/styles/common-typography-styles.scss
+++ b/src/styles/common-typography-styles.scss
@@ -42,7 +42,7 @@ h6,
 
 .small {
     font-size: 0.875rem;
-    line-height: 1.7142857143; // 24px specified in Figma. REM value calculation 24px/14px=1.7142857143
+    line-height: 1.7142857143;// 24px specified in Figma. REM value calculation 24px/14px=1.7142857143
     font-weight: 400;
 }
 

From f708551c883d99d70679ded51f4b466798e198e1 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 20 Jan 2023 09:21:34 -0500
Subject: [PATCH 024/261] Updated unit tests for most recent changes

---
 .../address-questions.spec.js                 | 164 ++++++++----------
 .../address-questions/address-questions.vue   |   3 +-
 2 files changed, 70 insertions(+), 97 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
index 0ab14d352..0c149413e 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
@@ -7,6 +7,7 @@ import { mount, shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 import { storeMutations } from "@/constants/store-mutations";
 import store from "@/store";
+import { createImportSpecifier } from "typescript";
 
 let autocompleteElement;
 describe("address-questions.vue", () => {
@@ -18,7 +19,7 @@ describe("address-questions.vue", () => {
     });
 
     describe("initial state", () => {
-        test("only street address field is shown", () => {
+        test("Should only show the street address field", () => {
             // Arrange
             const { wrapper } = setupMocks({});
 
@@ -58,7 +59,7 @@ describe("address-questions.vue", () => {
             expect(zipCode.exists()).toBe(true);
         });
 
-        test("Should it set this.showAddressFields to true when the model is prepopulated", async () => {
+        test("Should set this.showAddressFields to true when the model is prepopulated", async () => {
             // Arrange
             // Act
             const newAddressModel = {
@@ -305,38 +306,6 @@ describe("address-questions.vue", () => {
     });
 
     describe("alerts", () => {
-        const places = [null, { address_components: null }, undefined, {}];
-        test.each(places)(
-            "selected place/place properties is null => display verification alert",
-            async (place) => {
-                // Arrange
-                const { wrapper } = setupMocks({});
-                await wrapper.setData({
-                    addressModel: {
-                        streetAddress: "123 Test Street",
-                    },
-                });
-
-                const selectedPlace = place;
-
-                // Act
-                autocompleteElement.dispatchEvent(
-                    new CustomEvent("place_changed", { detail: selectedPlace })
-                );
-                await wrapper.vm.$nextTick();
-
-                // Assert
-                const verificationAlert = wrapper.findComponent({
-                    ref: "alertVerificationWarning",
-                });
-                expect(verificationAlert.exists()).toBe(true);
-                expect(verificationAlert.isVisible()).toBe(true);
-
-                const noMatchAlert = wrapper.findComponent({ ref: "alertNoMatchWarning" });
-                expect(noMatchAlert.exists()).toBe(false);
-            }
-        );
-
         test("user enters address that yields no autocomplete results => show noMatch alert", async () => {
             // Arrange
             let changeEventCallbackFunction;
@@ -413,110 +382,112 @@ describe("address-questions.vue", () => {
         describe("noMatch alert is cleared on address change", () => {
             test("user sees noMatch warning and modifies street address => noMatch warning is removed", async () => {
                 // Arrange
-                const { wrapper } = setupMocks({});
+                const { wrapper } = setupMocks({
+                    props: {
+                        modelValue: {
+                            streetAddress: "LS",
+                            city: "",
+                            state: "",
+                            zipCode: "",
+                        },
+                    }                    
+                });
 
+                // Initial condition to display noMatch warning
                 await wrapper.setData({
                     matchFound: false,
                 });
+
+                // Act
+                wrapper.vm.addressModel.streetAddress = "LJS";
                 await wrapper.vm.$nextTick();
 
-                let noMatchAlert = wrapper.findComponent({ ref: "alertNoMatchWarning" });
-                expect(noMatchAlert.exists()).toBeTruthy();
-                expect(noMatchAlert.isVisible()).toBeTruthy();
-
-                // // Act
-                wrapper.vm.$options.watch.addressModel.handler.call(wrapper.vm, {
-                    streetAddress: "LS",
-                });
-
                 // Assert
-                wrapper.vm.$nextTick(function () {
-                    expect(wrapper.vm.displayNoMatchWarning).toBeFalsy();
+                let noMatchAlert = wrapper.findComponent({ ref: "alertNoMatchWarning" });
+                expect(noMatchAlert.exists()).toBeFalsy();
 
-                    noMatchAlert = wrapper.findComponent({ ref: "alertNoMatchWarning" });
-                    expect(noMatchAlert.exists()).toBeFalsy();
-                });
             });
 
             test("user sees noMatch warning and enters city => noMatch warning is removed", async () => {
                 // Arrange
-                const { wrapper } = setupMocks({});
+                const { wrapper } = setupMocks({
+                    props: {
+                        modelValue: {
+                            streetAddress: "",
+                            city: "LS",
+                            state: "",
+                            zipCode: "",
+                        },
+                    }                    
+                });
 
+                // Initial condition to display noMatch warning
                 await wrapper.setData({
                     matchFound: false,
                 });
+
+                // Act
+                wrapper.vm.addressModel.city = "LJS";
                 await wrapper.vm.$nextTick();
 
-                let noMatchAlert = wrapper.findComponent({ ref: "alertNoMatchWarning" });
-                expect(noMatchAlert.exists()).toBeTruthy();
-                expect(noMatchAlert.isVisible()).toBeTruthy();
-
-                // // Act
-                wrapper.vm.$options.watch.addressModel.handler.call(wrapper.vm, {
-                    city: "LS",
-                });
-
                 // Assert
-                wrapper.vm.$nextTick(function () {
-                    expect(wrapper.vm.displayNoMatchWarning).toBeFalsy();
+                let noMatchAlert = wrapper.findComponent({ ref: "alertNoMatchWarning" });
+                expect(noMatchAlert.exists()).toBeFalsy();
 
-                    noMatchAlert = wrapper.findComponent({ ref: "alertNoMatchWarning" });
-                    expect(noMatchAlert.exists()).toBeFalsy();
-                });
             });
 
             test("user sees noMatch warning and enters state => noMatch warning is removed", async () => {
                 // Arrange
-                const { wrapper } = setupMocks({});
+                const { wrapper } = setupMocks({
+                    props: {
+                        modelValue: {
+                            streetAddress: "",
+                            city: "",
+                            state: "LS",
+                            zipCode: "",
+                        },
+                    }                    
+                });
 
+                // Initial condition to display noMatch warning
                 await wrapper.setData({
                     matchFound: false,
                 });
+
+                // Act
+                wrapper.vm.addressModel.state = "LJS";
                 await wrapper.vm.$nextTick();
 
-                let noMatchAlert = wrapper.findComponent({ ref: "alertNoMatchWarning" });
-                expect(noMatchAlert.exists()).toBeTruthy();
-                expect(noMatchAlert.isVisible()).toBeTruthy();
-
-                // // Act
-                wrapper.vm.$options.watch.addressModel.handler.call(wrapper.vm, {
-                    state: "KO",
-                });
-
                 // Assert
-                wrapper.vm.$nextTick(function () {
-                    expect(wrapper.vm.displayNoMatchWarning).toBeFalsy();
-
-                    noMatchAlert = wrapper.findComponent({ ref: "alertNoMatchWarning" });
-                    expect(noMatchAlert.exists()).toBeFalsy();
-                });
+                let noMatchAlert = wrapper.findComponent({ ref: "alertNoMatchWarning" });
+                expect(noMatchAlert.exists()).toBeFalsy();
             });
 
             test("user sees noMatch warning and enters zip code => noMatch warning is removed", async () => {
                 // Arrange
-                const { wrapper } = setupMocks({});
+                const { wrapper } = setupMocks({
+                    props: {
+                        modelValue: {
+                            streetAddress: "",
+                            city: "",
+                            state: "",
+                            zipCode: "LS",
+                        },
+                    }                    
+                });
 
+                // Initial condition to display noMatch warning
                 await wrapper.setData({
                     matchFound: false,
                 });
+
+                // Act
+                wrapper.vm.addressModel.zipCode = "LJS";
                 await wrapper.vm.$nextTick();
 
-                let noMatchAlert = wrapper.findComponent({ ref: "alertNoMatchWarning" });
-                expect(noMatchAlert.exists()).toBeTruthy();
-                expect(noMatchAlert.isVisible()).toBeTruthy();
-
-                // // Act
-                wrapper.vm.$options.watch.addressModel.handler.call(wrapper.vm, {
-                    zipCode: "12345",
-                });
-
                 // Assert
-                wrapper.vm.$nextTick(function () {
-                    expect(wrapper.vm.displayNoMatchWarning).toBeFalsy();
-
-                    noMatchAlert = wrapper.findComponent({ ref: "alertNoMatchWarning" });
-                    expect(noMatchAlert.exists()).toBeFalsy();
-                });
+                let noMatchAlert = wrapper.findComponent({ ref: "alertNoMatchWarning" });
+                expect(noMatchAlert.exists()).toBeFalsy();
             });
         });
     });
@@ -576,6 +547,7 @@ function setupMocks({
     const wrapper = isShallowMount
         ? shallowMount(addressQuestions, resultingMountOptions)
         : mount(addressQuestions, resultingMountOptions);
+
     document.querySelector = jest.fn().mockImplementation((query) => {
         let result = null;
         if (query == ".pac-container") result = document.createElement("div");
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index f93112eed..1f2227cc3 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -375,8 +375,9 @@ export default {
                         () => {
                             // When the address model changes reset to "no attempted match"
                             this.matchFound = null;
+                            this.$nextTick();
                         },
-                        { deep: true }
+                        { deep: true, flush: "post" }
                     );
                 }
             },

From 316efeda3c2a34ff6795c30d640863d128b6e471 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 20 Jan 2023 09:26:46 -0500
Subject: [PATCH 025/261] Prettified

---
 .../address-questions/address-questions.spec.js        | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
index a7a06b597..cf620b15f 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
@@ -390,7 +390,7 @@ describe("address-questions.vue", () => {
                             state: "",
                             zipCode: "",
                         },
-                    }                    
+                    },
                 });
 
                 // Initial condition to display noMatch warning
@@ -405,7 +405,6 @@ describe("address-questions.vue", () => {
                 // Assert
                 let noMatchAlert = wrapper.findComponent({ ref: "alertNoMatchWarning" });
                 expect(noMatchAlert.exists()).toBeFalsy();
-
             });
 
             test("user sees noMatch warning and enters city => noMatch warning is removed", async () => {
@@ -418,7 +417,7 @@ describe("address-questions.vue", () => {
                             state: "",
                             zipCode: "",
                         },
-                    }                    
+                    },
                 });
 
                 // Initial condition to display noMatch warning
@@ -433,7 +432,6 @@ describe("address-questions.vue", () => {
                 // Assert
                 let noMatchAlert = wrapper.findComponent({ ref: "alertNoMatchWarning" });
                 expect(noMatchAlert.exists()).toBeFalsy();
-
             });
 
             test("user sees noMatch warning and enters state => noMatch warning is removed", async () => {
@@ -446,7 +444,7 @@ describe("address-questions.vue", () => {
                             state: "LS",
                             zipCode: "",
                         },
-                    }                    
+                    },
                 });
 
                 // Initial condition to display noMatch warning
@@ -473,7 +471,7 @@ describe("address-questions.vue", () => {
                             state: "",
                             zipCode: "LS",
                         },
-                    }                    
+                    },
                 });
 
                 // Initial condition to display noMatch warning

From edc5a8c3c6ac43015e9f6af8c60b7ab340f9ac5f Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 20 Jan 2023 10:06:55 -0500
Subject: [PATCH 026/261] Revert line height to standardized number.

---
 src/styles/common-typography-styles.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss
index 6ce9bf6f2..0286bd046 100644
--- a/src/styles/common-typography-styles.scss
+++ b/src/styles/common-typography-styles.scss
@@ -42,7 +42,7 @@ h6,
 
 .small {
     font-size: 0.875rem;
-    line-height: 1.7142857143;// 24px specified in Figma. REM value calculation 24px/14px=1.7142857143
+    line-height: 1.7
     font-weight: 400;
 }
 

From 5a37eec9ffd29e3501ae4096f2b2dad83117f472 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 20 Jan 2023 10:38:53 -0500
Subject: [PATCH 027/261] Fix missing semicolon.

---
 src/styles/common-typography-styles.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss
index 0286bd046..72b2e5875 100644
--- a/src/styles/common-typography-styles.scss
+++ b/src/styles/common-typography-styles.scss
@@ -42,7 +42,7 @@ h6,
 
 .small {
     font-size: 0.875rem;
-    line-height: 1.7
+    line-height: 1.7;
     font-weight: 400;
 }
 

From 8c79581df013961cce80966420e28fc5ea0eae35 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 12 Jan 2023 11:20:43 -0500
Subject: [PATCH 028/261] CSR-1012 | service zip modal question

new component service-zip-modal-question added to the service-location page
---
 src/digital-components/modal/modal.vue        |  28 +++-
 .../service-location/service-location.vue     |  13 +-
 .../service-zip-modal-question.spec.js        |   3 +
 .../service-zip-modal-question.vue            | 157 ++++++++++++++++++
 4 files changed, 193 insertions(+), 8 deletions(-)
 create mode 100644 src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
 create mode 100644 src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 7de269644..f8c5e01e5 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -11,12 +11,13 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <button
+                        ref="modalXButton"
                         type="button"
                         class="btn-close"
                         data-bs-dismiss="modal"
                         aria-label="Close"></button>
                 </div>
-                <div class="modal-body ps-4 pe-4 pt-5 pb-4">
+                <div class="modal-body ps-4 pe-4 pt-5 pb-4" v-if="showModalBody">
                     <img :src="ModalImage" class="mw-100 d-flex mx-auto mb-4" alt="" />
                     <h5 class="mb-4" v-html="ModalHeadline"></h5>
                     <p class="fw-bold mb-2 subheader-text" v-html="ModalSubheadertext"></p>
@@ -26,6 +27,7 @@
                         v-if="ModalSubBodyText"
                         v-html="ModalSubBodyText"></p>
                 </div>
+                <slot></slot>
                 <div class="modal-footer px-5 py-4">
                     <buttonMain
                         isPrimary
@@ -33,8 +35,7 @@
                         ref="buttonMain"
                         suppressLoader
                         :buttonText="ModalCloseButtonText"
-                        @click-event="buttonClick"
-                        data-bs-dismiss="modal" />
+                        @click-event="buttonMainClick" />
                 </div>
             </div>
         </div>
@@ -48,6 +49,9 @@ export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
+        buttonClick: {
+            type: Function,
+        },
     },
     computed: {
         ModalHeadline() {
@@ -68,11 +72,29 @@ export default {
         ModalCloseButtonText() {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
+        showModalBody() {
+            return (
+                this.ModalImage ||
+                this.ModalHeadline ||
+                this.ModalSubheadertext ||
+                this.ModalBodyText
+            );
+        },
     },
     methods: {
         resetButtonStyle() {
             this.$refs.buttonMain.resetButtonStyle();
         },
+        closeModal() {
+            this.$refs.modalXButton.click();
+        },
+        buttonMainClick() {
+            if (this.buttonClick) {
+                this.buttonClick();
+            } else {
+                this.closeModal();
+            }
+        },
     },
     components: {
         buttonMain,
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index e29ebdb5e..aa32c1921 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -4,6 +4,7 @@ fmg
         <div class="page-container-grouped-styles">
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
+            <serviceZipModalQuestion />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 :isForwardActionDisabled="!meta.valid"
@@ -15,12 +16,13 @@ fmg
 
 <script>
 // Components
-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 { Form } from "vee-validate";
+import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question";
+import funnelHeader from "@/common-components/funnel-header/funnel-header";
+import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
+import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
 
-// Supporting files
+//Supporting Files
+import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 
@@ -57,6 +59,7 @@ export default {
         forwardButtonAction() {},
     },
     components: {
+        serviceZipModalQuestion,
         funnelHeader,
         funnelFooter,
         funnelSubHeader,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
new file mode 100644
index 000000000..a81727c73
--- /dev/null
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -0,0 +1,3 @@
+describe("service-zip-modal-question.vue", () => {
+    test.todo("test this");
+});
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
new file mode 100644
index 000000000..0397609aa
--- /dev/null
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -0,0 +1,157 @@
+<template>
+    <div class="text-center">
+        <label
+            :for="serviceZipCodeInput"
+            :aria-label="questionText"
+            class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
+            :class="[questionAlignment === 'center' ? 'text-center w-100 mb-5' : '']"
+            v-html="questionText"></label>
+        <div class="update-zip-text-link">
+            <textLink
+                linkType="text"
+                :text="this.serviceZipDisplayText"
+                href="#!"
+                data-bs-toggle="modal"
+                data-bs-target="#ZipModal"
+                aria-label="Modal window" />
+        </div>
+    </div>
+    <modal ref="zipCodeInputModal" cmsWidgetName="ZipModal" :buttonClick="setZip">
+        <div class="ps-4 pe-4 pb-4">
+            <textboxQuestion
+                cmsWidgetName="ServiceZipQuestionWidget"
+                v-model="serviceZipCodeInput"
+                inputId="serviceZipCodeInput"
+                questionAlignment="center"
+                mask="#####"
+                isRequired
+                disableAutoFill
+                validationRules="zip-required|zip-format" />
+            <alert
+                ref="alertInvalidZip"
+                v-if="displayInvalidZipAlert"
+                class="my-4"
+                cmsWidgetName="AlertInvalidZipWidget"
+                alertClass="alert-danger"
+                v-bind:isDismissible="false" />
+            <alert
+                ref="alertNonServiceableZip"
+                v-if="displayNonServiceableZipAlert"
+                class="my-4"
+                cmsWidgetName="AlertNonServiceableZipWidget"
+                :manualHeadline="AlertNonServiceableZipHeader"
+                alertClass="alert-danger"
+                v-bind:isDismissible="false" />
+        </div>
+    </modal>
+</template>
+
+<script>
+// Components
+import textLink from "@/ux-components/text-link/text-link";
+import modal from "@/common-components/modal/modal";
+import alert from "@/ux-components/alert/alert";
+import textboxQuestion from "@/common-components/textbox-question/textbox-question";
+
+//Supporting Files
+import { defineRule } from "vee-validate";
+import { required, regex } from "@/helpers/validation-rules";
+import { errorMessages } from "@/constants/error-messages";
+import store from "@/store";
+import baseMixin from "@/mixins/base-mixin";
+
+// Define Validation Rules
+defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
+defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
+
+export default {
+    name: "service-zip-modal-question",
+    data() {
+        return {
+            serviceZip: this.getZipFromStore(),
+            serviceZipState: this.getZipStateFromStore(),
+            serviceZipCodeInput: this.getZipFromStore(),
+            displayInvalidZipAlert: false,
+            displayNonServiceableZipAlert: false,
+        };
+    },
+    props: {
+        cmsWidgetName: String,
+    },
+    methods: {
+        getZipFromStore() {
+            return store.getters.order.serviceLocation.zipCode;
+        },
+
+        getZipStateFromStore() {
+            return store.getters.order.serviceLocation.state;
+        },
+
+        resetAlerts() {
+            this.displayInvalidZipAlert = false;
+            this.displayNonServiceableZipAlert = false;
+        },
+
+        async setZip() {
+            this.resetAlerts();
+
+            const zipLength = 5;
+            if (this.serviceZipCodeInput.length < zipLength) {
+                // prevent reading 1111 as 01111
+                return;
+            }
+
+            const zipCodeData = await baseMixin.methods.getZipCodeData(this.serviceZipCodeInput);
+
+            if (!zipCodeData.isValid) {
+                this.displayInvalidZipAlert = true;
+            } else if (!zipCodeData.isServiceable) {
+                this.displayNonServiceableZipAlert = true;
+            } else {
+                this.serviceZip = this.serviceZipCodeInput;
+                this.serviceZipState = zipCodeData.state;
+
+                this.$refs.zipCodeInputModal.closeModal();
+            }
+        },
+    },
+    computed: {
+        questionText() {
+            return this.getCmsContent("LocationQuestionWidget", "QuestionText");
+        },
+        serviceZipDisplayText() {
+            if (this.serviceZip && this.serviceZip != 0) {
+                return this.serviceZipState + ", " + this.serviceZip;
+            }
+            return this.getCmsContent("ZipPlaceholderText", "QuestionText");
+        },
+        AlertNonServiceableZipHeader() {
+            const zipCode = this.serviceZipCodeInput;
+            const text = this.getCmsContent(
+                "AlertNonServiceableZipWidget",
+                "HeadlineText"
+            ).replaceAll("{custom:serviceZipCodeInput}", zipCode);
+            return text;
+        },
+    },
+    components: {
+        textLink,
+        modal,
+        alert,
+        textboxQuestion,
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.update-zip-text-link::before {
+    content: "";
+    display: inline-block;
+    width: 13px;
+    height: 16px;
+    background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 13 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.49635 1.00142e-07C5.64734 -0.000153295 4.80722 0.175918 4.0274 0.517444C3.24757 0.858969 2.54443 1.35877 1.96099 1.98626C0.765713 3.27588 0.0999756 4.98141 0.0999756 6.75394C0.0999756 8.52646 0.765713 10.232 1.96099 11.5216L5.98324 15.777C6.04954 15.8475 6.12918 15.9036 6.21736 15.9419C6.30555 15.9802 6.40045 16 6.49635 16C6.59225 16 6.68716 15.9802 6.77534 15.9419C6.86353 15.9036 6.94317 15.8475 7.00946 15.777L11.0317 11.52C12.2391 10.2383 12.909 8.52914 12.8999 6.75394C12.9094 4.97818 12.2394 3.26832 11.0317 1.98626C10.4481 1.35899 9.74493 0.859347 8.96514 0.517839C8.18535 0.176331 7.34532 0.000130509 6.49635 1.00142e-07V1.00142e-07ZM6.49635 9.13131C6.02507 9.13131 5.56437 8.98913 5.17251 8.72275C4.78065 8.45637 4.47524 8.07776 4.29488 7.63479C4.11453 7.19181 4.06734 6.70438 4.15928 6.23412C4.25123 5.76387 4.47817 5.33191 4.81142 4.99287C5.14467 4.65384 5.56925 4.42295 6.03148 4.32941C6.49371 4.23587 6.97282 4.28388 7.40823 4.46736C7.84364 4.65085 8.21579 4.96157 8.47762 5.36023C8.73945 5.7589 8.87921 6.2276 8.87921 6.70707C8.87921 7.34974 8.62837 7.96611 8.18185 8.4207C7.73532 8.87528 7.12964 9.13088 6.49794 9.13131H6.49635Z' fill='%231574A1'/%3E%3C/svg%3E%0A");
+    background-size: contain;
+    vertical-align: middle;
+    margin-right: 0.5em;
+}
+</style>

From 4fd467af59f580cc8ab3b0bca8936bfe0bb4d400 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Wed, 18 Jan 2023 12:27:33 -0500
Subject: [PATCH 029/261] CSR-1012 | file path updates

---
 src/layouts/service-location/service-location.vue         | 6 +++---
 .../service-zip-modal-question.vue                        | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index aa32c1921..4f8230456 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -17,9 +17,9 @@ fmg
 <script>
 // Components
 import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question";
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+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";
 
 //Supporting Files
 import { Form } from "vee-validate";
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 0397609aa..fa49f50d0 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -48,10 +48,10 @@
 
 <script>
 // Components
-import textLink from "@/ux-components/text-link/text-link";
-import modal from "@/common-components/modal/modal";
-import alert from "@/ux-components/alert/alert";
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
+import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import modal from "@/digital-components/modal/modal";
+import alert from "@/fmg-components/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 
 //Supporting Files
 import { defineRule } from "vee-validate";

From 5f3f52983a6939685bc20555ad903dbacdef9e14 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 19 Jan 2023 13:08:56 -0500
Subject: [PATCH 030/261] CSR-1012 | service zip cms refactor

---
 .../service-location/service-location.vue     |  7 ++-
 .../service-zip-modal-question.vue            | 50 ++++++++++---------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 4f8230456..418a1ec2e 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -4,7 +4,12 @@ fmg
         <div class="page-container-grouped-styles">
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
-            <serviceZipModalQuestion />
+            <serviceZipModalQuestion
+                cmsWidgetName="ServiceZipModalWidget"
+                modalWidgetName="ZipModalWidget"
+                textboxQuestionWidgetName="ServiceZipQuestionWidget"
+                alertNonServiceableZipWidgetName="AlertNonServiceableZipWidget"
+                alertInvalidZipWidgetName="AlertInvalidZipWidget" />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 :isForwardActionDisabled="!meta.valid"
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index fa49f50d0..9713c8156 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -12,14 +12,14 @@
                 :text="this.serviceZipDisplayText"
                 href="#!"
                 data-bs-toggle="modal"
-                data-bs-target="#ZipModal"
+                :data-bs-target="getModalId"
                 aria-label="Modal window" />
         </div>
     </div>
-    <modal ref="zipCodeInputModal" cmsWidgetName="ZipModal" :buttonClick="setZip">
+    <modal ref="zipCodeInputModal" :cmsWidgetName="this.modalWidgetName" :buttonClick="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
-                cmsWidgetName="ServiceZipQuestionWidget"
+                :cmsWidgetName="this.textboxQuestionWidgetName"
                 v-model="serviceZipCodeInput"
                 inputId="serviceZipCodeInput"
                 questionAlignment="center"
@@ -31,15 +31,15 @@
                 ref="alertInvalidZip"
                 v-if="displayInvalidZipAlert"
                 class="my-4"
-                cmsWidgetName="AlertInvalidZipWidget"
+                :cmsWidgetName="this.alertInvalidZipWidgetName"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
             <alert
                 ref="alertNonServiceableZip"
                 v-if="displayNonServiceableZipAlert"
                 class="my-4"
-                cmsWidgetName="AlertNonServiceableZipWidget"
-                :manualHeadline="AlertNonServiceableZipHeader"
+                :cmsWidgetName="this.alertNonServiceableZipWidgetName"
+                :manualHeadline="this.invalidAlertHeader"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
         </div>
@@ -48,17 +48,15 @@
 
 <script>
 // Components
-import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import textLink from "@/ux-components/text-link/text-link";
 import modal from "@/digital-components/modal/modal";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 
 //Supporting Files
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import store from "@/store";
-import baseMixin from "@/mixins/base-mixin";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -73,18 +71,23 @@ export default {
             serviceZipCodeInput: this.getZipFromStore(),
             displayInvalidZipAlert: false,
             displayNonServiceableZipAlert: false,
+            invalidAlertHeader: null,
         };
     },
     props: {
         cmsWidgetName: String,
+        modalWidgetName: String,
+        textboxQuestionWidgetName: String,
+        alertNonServiceableZipWidgetName: String,
+        alertInvalidZipWidgetName: String,
     },
     methods: {
         getZipFromStore() {
-            return store.getters.order.serviceLocation.zipCode;
+            return this.$store.getters.order.serviceLocation.zipCode;
         },
 
         getZipStateFromStore() {
-            return store.getters.order.serviceLocation.state;
+            return this.$store.getters.order.serviceLocation.state;
         },
 
         resetAlerts() {
@@ -96,16 +99,20 @@ export default {
             this.resetAlerts();
 
             const zipLength = 5;
-            if (this.serviceZipCodeInput.length < zipLength) {
+            if (!this.serviceZipCodeInput || this.serviceZipCodeInput.length < zipLength) {
                 // prevent reading 1111 as 01111
                 return;
             }
 
-            const zipCodeData = await baseMixin.methods.getZipCodeData(this.serviceZipCodeInput);
+            const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
             } else if (!zipCodeData.isServiceable) {
+                this.invalidAlertHeader = this.getCmsContent(
+                    this.alertNonServiceableZipWidgetName,
+                    "HeadlineText"
+                ).replaceAll("{custom:serviceZipCodeInput}", this.serviceZipCodeInput);
                 this.displayNonServiceableZipAlert = true;
             } else {
                 this.serviceZip = this.serviceZipCodeInput;
@@ -116,22 +123,17 @@ export default {
         },
     },
     computed: {
+        getModalId() {
+            return "#" + this.modalWidgetName;
+        },
         questionText() {
-            return this.getCmsContent("LocationQuestionWidget", "QuestionText");
+            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
         },
         serviceZipDisplayText() {
             if (this.serviceZip && this.serviceZip != 0) {
                 return this.serviceZipState + ", " + this.serviceZip;
             }
-            return this.getCmsContent("ZipPlaceholderText", "QuestionText");
-        },
-        AlertNonServiceableZipHeader() {
-            const zipCode = this.serviceZipCodeInput;
-            const text = this.getCmsContent(
-                "AlertNonServiceableZipWidget",
-                "HeadlineText"
-            ).replaceAll("{custom:serviceZipCodeInput}", zipCode);
-            return text;
+            return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
     },
     components: {

From 4276f2b5168f6dfa8f87e71d90809c31067612d0 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 19 Jan 2023 13:35:38 -0500
Subject: [PATCH 031/261] CSR-1012 | reset modal on text input

added prop to textbox-question to fire custom function on text updates
---
 .../textbox-question/textbox-question.vue     |  2 ++
 .../service-zip-modal-question.vue            | 23 +++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index a19823b0d..e97402bb3 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -70,6 +70,7 @@ export default {
         questionAlignment: String, // Left or center. Left is default.
         cornerStyle: String, // Rounded or square. Square is default.
         includeSearchIcon: Boolean,
+        customOnChange: Function,
     },
     setup(props) {
         const propsClone = Object.assign({}, props);
@@ -145,6 +146,7 @@ export default {
     },
     watch: {
         async value(newValue) {
+            this.customOnChange();
             const result = await validate(newValue, this.validationRules); // do a test validation check, without triggering full validation
             if (result.valid) {
                 this.handleChange(newValue); // trigger full validation on this field only
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 9713c8156..710514966 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -26,7 +26,8 @@
                 mask="#####"
                 isRequired
                 disableAutoFill
-                validationRules="zip-required|zip-format" />
+                validationRules="zip-required|zip-format" 
+                :customOnChange="this.resetsOnZipInput" />
             <alert
                 ref="alertInvalidZip"
                 v-if="displayInvalidZipAlert"
@@ -39,7 +40,7 @@
                 v-if="displayNonServiceableZipAlert"
                 class="my-4"
                 :cmsWidgetName="this.alertNonServiceableZipWidgetName"
-                :manualHeadline="this.invalidAlertHeader"
+                :manualHeadline="AlertNonServiceableZipHeader"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
         </div>
@@ -71,7 +72,6 @@ export default {
             serviceZipCodeInput: this.getZipFromStore(),
             displayInvalidZipAlert: false,
             displayNonServiceableZipAlert: false,
-            invalidAlertHeader: null,
         };
     },
     props: {
@@ -95,6 +95,11 @@ export default {
             this.displayNonServiceableZipAlert = false;
         },
 
+        resetsOnZipInput() {
+            this.resetAlerts();
+            this.$refs.zipCodeInputModal.resetButtonStyle();
+        },
+
         async setZip() {
             this.resetAlerts();
 
@@ -109,10 +114,6 @@ export default {
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
             } else if (!zipCodeData.isServiceable) {
-                this.invalidAlertHeader = this.getCmsContent(
-                    this.alertNonServiceableZipWidgetName,
-                    "HeadlineText"
-                ).replaceAll("{custom:serviceZipCodeInput}", this.serviceZipCodeInput);
                 this.displayNonServiceableZipAlert = true;
             } else {
                 this.serviceZip = this.serviceZipCodeInput;
@@ -135,6 +136,14 @@ export default {
             }
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
+        AlertNonServiceableZipHeader() {
+            const zipCode = this.serviceZipCodeInput;
+            const text = this.getCmsContent(
+                "AlertNonServiceableZipWidget",
+                "HeadlineText"
+            ).replaceAll("{custom:serviceZipCodeInput}", zipCode);
+            return text;
+        },
     },
     components: {
         textLink,

From 95f2c4f8ce2f8e7a95fcc86a0a48e86792c4290a Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Mon, 23 Jan 2023 13:23:30 -0500
Subject: [PATCH 032/261] CSR-1012 refactor hide alerts on text input

---
 .../textbox-question/textbox-question.vue          |  2 --
 .../service-zip-modal-question.vue                 | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index e97402bb3..a19823b0d 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -70,7 +70,6 @@ export default {
         questionAlignment: String, // Left or center. Left is default.
         cornerStyle: String, // Rounded or square. Square is default.
         includeSearchIcon: Boolean,
-        customOnChange: Function,
     },
     setup(props) {
         const propsClone = Object.assign({}, props);
@@ -146,7 +145,6 @@ export default {
     },
     watch: {
         async value(newValue) {
-            this.customOnChange();
             const result = await validate(newValue, this.validationRules); // do a test validation check, without triggering full validation
             if (result.valid) {
                 this.handleChange(newValue); // trigger full validation on this field only
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 710514966..68f30abff 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -19,6 +19,7 @@
     <modal ref="zipCodeInputModal" :cmsWidgetName="this.modalWidgetName" :buttonClick="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
+                ref="zipInputTextQuestion"
                 :cmsWidgetName="this.textboxQuestionWidgetName"
                 v-model="serviceZipCodeInput"
                 inputId="serviceZipCodeInput"
@@ -26,8 +27,7 @@
                 mask="#####"
                 isRequired
                 disableAutoFill
-                validationRules="zip-required|zip-format" 
-                :customOnChange="this.resetsOnZipInput" />
+                validationRules="zip-required|zip-format" />
             <alert
                 ref="alertInvalidZip"
                 v-if="displayInvalidZipAlert"
@@ -145,6 +145,16 @@ export default {
             return text;
         },
     },
+    mounted() {
+        this.$watch(
+            () => {
+                return this.$refs.zipInputTextQuestion.value;
+            },
+            (val) => {
+                this.resetsOnZipInput();
+            }
+        );
+    },
     components: {
         textLink,
         modal,

From 7b64ede4b24ff88063ad2cf51a011a0a4aad471a Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Mon, 23 Jan 2023 14:59:31 -0500
Subject: [PATCH 033/261] CSR-1012 | modal footer button updates

---
 src/digital-components/modal/modal.vue        | 22 +++++++++----------
 .../service-zip-modal-question.vue            | 12 +++++++---
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index f8c5e01e5..da1fc8c26 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -35,7 +35,7 @@
                         ref="buttonMain"
                         suppressLoader
                         :buttonText="ModalCloseButtonText"
-                        @click-event="buttonMainClick" />
+                        @click-event="footerButtonClick" />
                 </div>
             </div>
         </div>
@@ -49,8 +49,11 @@ export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
-        buttonClick: {
+
+        footerButtonCallback: {
             type: Function,
+            // return true to close modal
+            // if undefined, footer button closes modal
         },
     },
     computed: {
@@ -73,12 +76,7 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
         showModalBody() {
-            return (
-                this.ModalImage ||
-                this.ModalHeadline ||
-                this.ModalSubheadertext ||
-                this.ModalBodyText
-            );
+            return this.ModalBodyText;
         },
     },
     methods: {
@@ -88,9 +86,11 @@ export default {
         closeModal() {
             this.$refs.modalXButton.click();
         },
-        buttonMainClick() {
-            if (this.buttonClick) {
-                this.buttonClick();
+        async footerButtonClick() {
+            if (this.footerButtonCallback) {
+                if (await this.footerButtonCallback()) {
+                    this.closeModal();
+                }
             } else {
                 this.closeModal();
             }
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 68f30abff..1c9edd563 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -16,7 +16,10 @@
                 aria-label="Modal window" />
         </div>
     </div>
-    <modal ref="zipCodeInputModal" :cmsWidgetName="this.modalWidgetName" :buttonClick="setZip">
+    <modal
+        ref="zipCodeInputModal"
+        :cmsWidgetName="this.modalWidgetName"
+        :footerButtonCallback="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
                 ref="zipInputTextQuestion"
@@ -106,7 +109,7 @@ export default {
             const zipLength = 5;
             if (!this.serviceZipCodeInput || this.serviceZipCodeInput.length < zipLength) {
                 // prevent reading 1111 as 01111
-                return;
+                return false;
             }
 
             const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
@@ -119,8 +122,11 @@ export default {
                 this.serviceZip = this.serviceZipCodeInput;
                 this.serviceZipState = zipCodeData.state;
 
-                this.$refs.zipCodeInputModal.closeModal();
+                // close modal
+                return true;
             }
+
+            return false;
         },
     },
     computed: {

From 01deb7bd0d8af76ff98164ef8bd0aee06dd53785 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 24 Jan 2023 08:51:40 -0500
Subject: [PATCH 034/261] CSR-1050 remove unneeded css and refactor with helper
 classes.

---
 src/layouts/estimate/estimate.vue |  9 +++------
 src/layouts/quote/quote.vue       | 14 ++------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index f09896838..0f8508921 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -1,10 +1,10 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <div class="page-container-grouped-styles estimate">
+        <div class="page-container-grouped-styles">
             <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner cmsWidgetName="VehicleBannerWidget" />
-            <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
+            <funnelSubHeader class="pb-4" cmsWidgetName="FunnelSubHeaderWidget" />
             <div class="fade-on-route-transition sub-container make-tall">
                 <div v-if="!skipVin">
                     <alert
@@ -300,12 +300,9 @@ export default {
 </script>
 
 <style lang="scss">
-.estimate .vinLookupMethodHeading p {
+.vinLookupMethodHeading p {
     font-size: 1rem;
     font-weight: 500;
     color: $black;
 }
-.estimate .funnel-sub-header {
-    padding-bottom: 16px;
-}
 </style>
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index b02714ffa..5a65933b0 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -1,13 +1,13 @@
 digital
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <div class="page-container-grouped-styles quote">
+        <div class="page-container-grouped-styles">
             <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner
                 cmsWidgetName="VehicleBannerWidget"
                 :displayGenericVehicleImage="false" />
-            <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
+            <funnelSubHeader class="mb-5" cmsWidgetName="FunnelSubHeaderWidget" />
             <div class="fade-on-route-transition sub-container make-tall">
                 <cashOrInsuranceQuestion
                     ref="cashOrInsurance"
@@ -207,13 +207,3 @@ export default {
     },
 };
 </script>
-
-<style lang="scss">
-.quote {
-    .funnel-sub-header {
-        .sub-text {
-            margin-bottom: 24px;
-        }
-    }
-}
-</style>

From 0fd8a16548fd18bb40eb621ef586974f34aac516 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 24 Jan 2023 10:42:58 -0500
Subject: [PATCH 035/261] Added additional field for apartment number or
 business name

---
 .../address-questions.spec.js                 | 72 +++++++++++++++++++
 .../address-questions/address-questions.vue   | 23 +++++-
 2 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
index cf620b15f..2015997d4 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
@@ -58,6 +58,78 @@ describe("address-questions.vue", () => {
             expect(state.exists()).toBe(true);
             expect(zipCode.exists()).toBe(true);
         });
+         
+        test("Should render apartmentNumberOrBusinessName textbox-question when captureApartmentNumberOrBusinessName = true", async () => {
+            // Arrange
+            const { wrapper } = setupMocks({
+                props: {
+                    modelValue: {
+                        streetAddress: "",
+                        apartmentNumberOrBusinessName: "",
+                        city: "",
+                        state: "",
+                        zipCode: "",                       
+                    },
+                    captureApartmentNumberOrBusinessName: true
+                },
+            });
+
+            await wrapper.setData({
+                showAddressFields: true
+            });
+
+            // Act
+            const streetAddress = wrapper.findComponent({ ref: "autocomplete" });
+            const apartmentNumberOrBusinessName = wrapper.findComponent({ ref: "apartmentNumberOrBusinessName" });
+            const city = wrapper.findComponent({ ref: "city" });
+            const state = wrapper.findComponent({ ref: "state" });
+            const zipCode = wrapper.findComponent({ ref: "zipCode" });
+
+            // Assert
+            expect(streetAddress.exists()).toBe(true);
+            expect(apartmentNumberOrBusinessName.exists()).toBe(true);
+            expect(apartmentNumberOrBusinessName.isVisible()).toBe(true);
+            expect(city.exists()).toBe(true);
+            expect(state.exists()).toBe(true);
+            expect(zipCode.exists()).toBe(true);
+
+        });  
+           
+        test("Should *not* render apartmentNumberOrBusinessName textbox-question when captureApartmentNumberOrBusinessName = false", async () => {
+            // Arrange
+            const { wrapper } = setupMocks({
+                props: {
+                    modelValue: {
+                        streetAddress: "",
+                        apartmentNumberOrBusinessName: "",
+                        city: "",
+                        state: "",
+                        zipCode: "",                       
+                    },
+                    captureApartmentNumberOrBusinessName: false
+                },
+            });
+
+            await wrapper.setData({
+                showAddressFields: true
+            });
+
+            // Act
+            const streetAddress = wrapper.findComponent({ ref: "autocomplete" });
+            const apartmentNumberOrBusinessName = wrapper.findComponent({ ref: "apartmentNumberOrBusinessName" });
+            const city = wrapper.findComponent({ ref: "city" });
+            const state = wrapper.findComponent({ ref: "state" });
+            const zipCode = wrapper.findComponent({ ref: "zipCode" });
+
+            // Assert
+            expect(streetAddress.exists()).toBe(true);
+            expect(apartmentNumberOrBusinessName.exists()).toBe(true);
+            expect(apartmentNumberOrBusinessName.isVisible()).toBe(false);
+            expect(city.exists()).toBe(true);
+            expect(state.exists()).toBe(true);
+            expect(zipCode.exists()).toBe(true);
+
+        }); 
 
         test("Should set this.showAddressFields to true when the model is prepopulated", async () => {
             // Arrange
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 23bc9280c..daae3ad2c 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -16,6 +16,18 @@
                     @keydown.enter.prevent />
             </div>
         </div>
+        <transition name="fade" mode="out-in">
+            <div class="row mb-4" v-show="showAddressFields && showApartmentNumberOrBusinessNameField" aria-live="polite">
+                <div class="col">
+                    <textboxQuestion
+                        cmsWidgetName="ApartmentNumberOrBusinessNameQuestionWidget"
+                        v-model="addressModel.apartmentNumberOrBusinessName"
+                        ref="apartmentNumberOrBusinessName"
+                        inputId="639b0aaa35f64609ad6995f86a74322b"
+                        disableAutoFill />
+                </div>
+            </div>
+        </transition>
         <transition name="fade" mode="out-in">
             <div class="row mb-4" v-show="showAddressFields" aria-live="polite">
                 <div class="col">
@@ -95,12 +107,14 @@ export default {
             type: Object,
             default: () => ({
                 streetAddress: "",
+                apartmentNumberOrBusinessName: "",
                 city: "",
                 state: "",
-                zipCode: "",
+                zipCode: "",         
             }),
-        },
+        },       
         validationRules: String,
+        captureApartmentNumberOrBusinessName: false,
     },
     data() {
         return {
@@ -180,6 +194,11 @@ export default {
                 this.$emit("update:modelValue", newValue);
             },
         },
+        showApartmentNumberOrBusinessNameField: {
+            get: function () {
+                return this.captureApartmentNumberOrBusinessName;
+            },
+        }
     },
     methods: {
         setupAddressLookup() {

From e2d17369bbbba0c8f2859f1306c56d745f68fbde Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 24 Jan 2023 12:07:55 -0500
Subject: [PATCH 036/261] Merge code from ISS to FMG.

---
 src/constants/application-config.js | 1 +
 src/ux-components/alert/alert.vue   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/constants/application-config.js b/src/constants/application-config.js
index 8f12760fc..16b9d85fc 100644
--- a/src/constants/application-config.js
+++ b/src/constants/application-config.js
@@ -7,6 +7,7 @@ const applicationConfig = {
     CURRENT_ENVIRONMENT: process.env.VUE_APP_CURRENT_ENVIRONMENT, // "Localhost", "Dev", "QA", and "Prod"
     APPLICATION_NAME: "FixMyGlass",
     APPLICATION_ABBREVIATION: "fmg",
+    APPLICATION_QUERYSTRING: 'fmgPage',
     SITE_ENTRY_TRIGGER_VALUE: "FixMyGlass",
     CASH_ACCOUNT_NUMBER: 167132,
 };
diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
index ca5ea7f45..6d06c0334 100644
--- a/src/ux-components/alert/alert.vue
+++ b/src/ux-components/alert/alert.vue
@@ -19,7 +19,7 @@
                     <span v-else>
                         <router-link
                             :to="{
-                                query: { fmgPage: `${getLinkTargetFromCopy(copy)}` },
+                                query: { [applicationQueryString]: `${getRouterLinkRouteFromCopy(copy)}` },
                                 name: 'root',
                             }"
                             >{{ getLinkDisplayTextFromCopy(copy) }}</router-link
@@ -45,6 +45,7 @@ import {
     getLinkDisplayTextFromCopy,
     splitCMSCopyOnParagraphTag,
 } from "@/helpers/cms-content-helper";
+import { applicationConfig } from '@/constants/application-config';
 
 export default {
     name: "alert",
@@ -75,6 +76,9 @@ export default {
         },
     },
     computed: {
+        applicationQueryString() {
+            return applicationConfig.APPLICATION_QUERYSTRING;
+        },
         alertHeadline() {
             return this.manualHeadline
                 ? this.manualHeadline

From 0afe945eaf4240d159ddb69f90870bc894329fed Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 24 Jan 2023 12:12:56 -0500
Subject: [PATCH 037/261] Code format.

---
 src/constants/application-config.js | 2 +-
 src/ux-components/alert/alert.vue   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/constants/application-config.js b/src/constants/application-config.js
index 16b9d85fc..96b4a9e78 100644
--- a/src/constants/application-config.js
+++ b/src/constants/application-config.js
@@ -7,7 +7,7 @@ const applicationConfig = {
     CURRENT_ENVIRONMENT: process.env.VUE_APP_CURRENT_ENVIRONMENT, // "Localhost", "Dev", "QA", and "Prod"
     APPLICATION_NAME: "FixMyGlass",
     APPLICATION_ABBREVIATION: "fmg",
-    APPLICATION_QUERYSTRING: 'fmgPage',
+    APPLICATION_QUERYSTRING: "fmgPage",
     SITE_ENTRY_TRIGGER_VALUE: "FixMyGlass",
     CASH_ACCOUNT_NUMBER: 167132,
 };
diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
index 6d06c0334..0c3ac4b99 100644
--- a/src/ux-components/alert/alert.vue
+++ b/src/ux-components/alert/alert.vue
@@ -19,7 +19,9 @@
                     <span v-else>
                         <router-link
                             :to="{
-                                query: { [applicationQueryString]: `${getRouterLinkRouteFromCopy(copy)}` },
+                                query: {
+                                    [applicationQueryString]: `${getRouterLinkRouteFromCopy(copy)}`,
+                                },
                                 name: 'root',
                             }"
                             >{{ getLinkDisplayTextFromCopy(copy) }}</router-link
@@ -45,7 +47,7 @@ import {
     getLinkDisplayTextFromCopy,
     splitCMSCopyOnParagraphTag,
 } from "@/helpers/cms-content-helper";
-import { applicationConfig } from '@/constants/application-config';
+import { applicationConfig } from "@/constants/application-config";
 
 export default {
     name: "alert",

From 11990da132ea70ee3d1b7388ab0d55cafaa96854 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Tue, 24 Jan 2023 14:25:20 -0500
Subject: [PATCH 038/261] CSR-1012 | call function on textLink click

---
 .../service-zip-modal-question.vue                     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 1c9edd563..dc13de094 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -13,7 +13,8 @@
                 href="#!"
                 data-bs-toggle="modal"
                 :data-bs-target="getModalId"
-                aria-label="Modal window" />
+                aria-label="Modal window" 
+                @click-event="focusOnZipInput" />
         </div>
     </div>
     <modal
@@ -103,6 +104,13 @@ export default {
             this.$refs.zipCodeInputModal.resetButtonStyle();
         },
 
+        focusOnZipInput() {
+            console.log("focusOnZipInput");
+            var input = document.getElementById("serviceZipCodeInput");
+            input.focus();
+            // this.$refs.zipInputTextQuestion.focus();
+        },
+
         async setZip() {
             this.resetAlerts();
 

From 61e7c981419726ec44838c28eb596dffa1239dd5 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Tue, 24 Jan 2023 15:34:45 -0500
Subject: [PATCH 039/261] CSR-1012 | reset modal on open

---
 .../service-zip-modal-question.vue                | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index dc13de094..47577a2ec 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -13,8 +13,8 @@
                 href="#!"
                 data-bs-toggle="modal"
                 :data-bs-target="getModalId"
-                aria-label="Modal window" 
-                @click-event="focusOnZipInput" />
+                aria-label="Modal window"
+                @click-event="onModalOpen" />
         </div>
     </div>
     <modal
@@ -104,11 +104,12 @@ export default {
             this.$refs.zipCodeInputModal.resetButtonStyle();
         },
 
-        focusOnZipInput() {
-            console.log("focusOnZipInput");
-            var input = document.getElementById("serviceZipCodeInput");
-            input.focus();
-            // this.$refs.zipInputTextQuestion.focus();
+        focusOnZipInput() {},
+
+        onModalOpen() {
+            this.serviceZipCodeInput = this.serviceZip;
+            this.resetsOnZipInput();
+            this.focusOnZipInput();
         },
 
         async setZip() {

From 77d9c27971d684bd4d2c332a5d38cf847326736d Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 24 Jan 2023 15:55:13 -0500
Subject: [PATCH 040/261] Added onShownCallback property and handler

---
 src/digital-components/modal/modal.vue               |  5 ++++-
 .../service-zip-modal-question.vue                   | 12 +++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index da1fc8c26..013a42168 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -2,7 +2,7 @@
     <!-- Modal -->
     <div
         class="modal fade modal-component"
-        v-on="{ 'hidden.bs.modal': resetButtonStyle }"
+        v-on="{ 'hidden.bs.modal': resetButtonStyle, 'shown.bs.modal': onShownCallback }"
         :id="cmsWidgetName"
         tabindex="-1"
         aria-labelledby="ModalComponentLabel"
@@ -49,6 +49,9 @@ export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
+        onShownCallback: {
+            type: Function,
+        },
 
         footerButtonCallback: {
             type: Function,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 47577a2ec..1ab55f165 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -13,13 +13,13 @@
                 href="#!"
                 data-bs-toggle="modal"
                 :data-bs-target="getModalId"
-                aria-label="Modal window"
-                @click-event="onModalOpen" />
+                aria-label="Modal window" />
         </div>
     </div>
     <modal
         ref="zipCodeInputModal"
         :cmsWidgetName="this.modalWidgetName"
+        :onShownCallback="onModalOpen"
         :footerButtonCallback="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
@@ -62,6 +62,7 @@ import textboxQuestion from "@/digital-components/textbox-question/textbox-quest
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
+import { isNoUnitNumericStyleProp } from "@vue/shared";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -104,7 +105,12 @@ export default {
             this.$refs.zipCodeInputModal.resetButtonStyle();
         },
 
-        focusOnZipInput() {},
+        focusOnZipInput() {
+            this.$nextTick(() => {
+                const input = this.$refs.zipInputTextQuestion.$refs.serviceZipCodeInput;
+                input.focus();
+            });
+        },
 
         onModalOpen() {
             this.serviceZipCodeInput = this.serviceZip;

From 66db63829fd341fc52bab868e6ea1aee1b8e5234 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 24 Jan 2023 16:03:49 -0500
Subject: [PATCH 041/261] Merged from CSR-1012

---
 .../address-questions.spec.js                 | 28 ++++++++++---------
 .../address-questions/address-questions.vue   | 11 +++++---
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
index 2015997d4..5cade9ddb 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
@@ -58,7 +58,7 @@ describe("address-questions.vue", () => {
             expect(state.exists()).toBe(true);
             expect(zipCode.exists()).toBe(true);
         });
-         
+
         test("Should render apartmentNumberOrBusinessName textbox-question when captureApartmentNumberOrBusinessName = true", async () => {
             // Arrange
             const { wrapper } = setupMocks({
@@ -68,19 +68,21 @@ describe("address-questions.vue", () => {
                         apartmentNumberOrBusinessName: "",
                         city: "",
                         state: "",
-                        zipCode: "",                       
+                        zipCode: "",
                     },
-                    captureApartmentNumberOrBusinessName: true
+                    captureApartmentNumberOrBusinessName: true,
                 },
             });
 
             await wrapper.setData({
-                showAddressFields: true
+                showAddressFields: true,
             });
 
             // Act
             const streetAddress = wrapper.findComponent({ ref: "autocomplete" });
-            const apartmentNumberOrBusinessName = wrapper.findComponent({ ref: "apartmentNumberOrBusinessName" });
+            const apartmentNumberOrBusinessName = wrapper.findComponent({
+                ref: "apartmentNumberOrBusinessName",
+            });
             const city = wrapper.findComponent({ ref: "city" });
             const state = wrapper.findComponent({ ref: "state" });
             const zipCode = wrapper.findComponent({ ref: "zipCode" });
@@ -92,9 +94,8 @@ describe("address-questions.vue", () => {
             expect(city.exists()).toBe(true);
             expect(state.exists()).toBe(true);
             expect(zipCode.exists()).toBe(true);
+        });
 
-        });  
-           
         test("Should *not* render apartmentNumberOrBusinessName textbox-question when captureApartmentNumberOrBusinessName = false", async () => {
             // Arrange
             const { wrapper } = setupMocks({
@@ -104,19 +105,21 @@ describe("address-questions.vue", () => {
                         apartmentNumberOrBusinessName: "",
                         city: "",
                         state: "",
-                        zipCode: "",                       
+                        zipCode: "",
                     },
-                    captureApartmentNumberOrBusinessName: false
+                    captureApartmentNumberOrBusinessName: false,
                 },
             });
 
             await wrapper.setData({
-                showAddressFields: true
+                showAddressFields: true,
             });
 
             // Act
             const streetAddress = wrapper.findComponent({ ref: "autocomplete" });
-            const apartmentNumberOrBusinessName = wrapper.findComponent({ ref: "apartmentNumberOrBusinessName" });
+            const apartmentNumberOrBusinessName = wrapper.findComponent({
+                ref: "apartmentNumberOrBusinessName",
+            });
             const city = wrapper.findComponent({ ref: "city" });
             const state = wrapper.findComponent({ ref: "state" });
             const zipCode = wrapper.findComponent({ ref: "zipCode" });
@@ -128,8 +131,7 @@ describe("address-questions.vue", () => {
             expect(city.exists()).toBe(true);
             expect(state.exists()).toBe(true);
             expect(zipCode.exists()).toBe(true);
-
-        }); 
+        });
 
         test("Should set this.showAddressFields to true when the model is prepopulated", async () => {
             // Arrange
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index daae3ad2c..2f21e49f6 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -17,7 +17,10 @@
             </div>
         </div>
         <transition name="fade" mode="out-in">
-            <div class="row mb-4" v-show="showAddressFields && showApartmentNumberOrBusinessNameField" aria-live="polite">
+            <div
+                class="row mb-4"
+                v-show="showAddressFields && showApartmentNumberOrBusinessNameField"
+                aria-live="polite">
                 <div class="col">
                     <textboxQuestion
                         cmsWidgetName="ApartmentNumberOrBusinessNameQuestionWidget"
@@ -110,9 +113,9 @@ export default {
                 apartmentNumberOrBusinessName: "",
                 city: "",
                 state: "",
-                zipCode: "",         
+                zipCode: "",
             }),
-        },       
+        },
         validationRules: String,
         captureApartmentNumberOrBusinessName: false,
     },
@@ -198,7 +201,7 @@ export default {
             get: function () {
                 return this.captureApartmentNumberOrBusinessName;
             },
-        }
+        },
     },
     methods: {
         setupAddressLookup() {

From ff65f31036346f4e0042267de701cb92b067f935 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 24 Jan 2023 16:06:29 -0500
Subject: [PATCH 042/261] CSR-1024 match/merge code from ISS.

---
 src/constants/application-config.js            |  2 +-
 src/helpers/cms-content-helper.js              |  4 ++--
 .../address-vehicles/address-vehicles.vue      | 12 ++++++------
 .../service-package-radio.vue                  | 12 ++++++------
 src/ux-components/alert/alert.spec.js          |  2 +-
 src/ux-components/alert/alert.vue              | 18 ++++++++----------
 6 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/constants/application-config.js b/src/constants/application-config.js
index 96b4a9e78..550112bcc 100644
--- a/src/constants/application-config.js
+++ b/src/constants/application-config.js
@@ -7,7 +7,7 @@ const applicationConfig = {
     CURRENT_ENVIRONMENT: process.env.VUE_APP_CURRENT_ENVIRONMENT, // "Localhost", "Dev", "QA", and "Prod"
     APPLICATION_NAME: "FixMyGlass",
     APPLICATION_ABBREVIATION: "fmg",
-    APPLICATION_QUERYSTRING: "fmgPage",
+    PAGE_QUERYSTRING: "fmgPage",
     SITE_ENTRY_TRIGGER_VALUE: "FixMyGlass",
     CASH_ACCOUNT_NUMBER: 167132,
 };
diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js
index 6ff18a53e..b4927894f 100644
--- a/src/helpers/cms-content-helper.js
+++ b/src/helpers/cms-content-helper.js
@@ -303,7 +303,7 @@ export function splitCopyOnCMSPlaceHolder(copy) {
  * Returns string2 of input following this pattern: {string1:string2,string3}
  * @returns string
  */
-export function getLinkTargetFromCopy(copy) {
+export function getRouterLinkRouteFromCopy(copy) {
     // sample input:      {routerLink:estimate,provide your VIN}
     // first split would return      'estimate,provide your VIN'
     // second split would return     'estimate'
@@ -314,7 +314,7 @@ export function getLinkTargetFromCopy(copy) {
  * Returns string3 of input following this pattern: {string1:string2,string3}
  * @returns string
  */
-export function getLinkDisplayTextFromCopy(copy) {
+export function getRouterLinkDisplayTextFromCopy(copy) {
     // sample input:     {routerLink:estimate,provide your VIN}
     // first split would return     'estimate,provide your VIN'
     // second split would return             'provide your VIN'
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index 92b775b3b..35f441da7 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -25,10 +25,10 @@
                     <span v-if="doesCopyContainRouterLink(copy)" class="text-body">
                         <router-link
                             :to="{
-                                query: { fmgPage: `${getLinkTargetFromCopy(copy)}` },
+                                query: { fmgPage: `${getRouterLinkRouteFromCopy(copy)}` },
                                 name: 'root',
                             }"
-                            >{{ getLinkDisplayTextFromCopy(copy) }}</router-link
+                            >{{ getRouterLinkDisplayTextFromCopy(copy) }}</router-link
                         >
                     </span>
                     <span v-else class="m-0 text-body" v-html="copy"></span>
@@ -66,8 +66,8 @@ import { isGlassAvailableForCarId } from "@/helpers/damage-helper";
 import {
     doesCopyContainRouterLink,
     splitCopyOnCMSPlaceHolder,
-    getLinkTargetFromCopy,
-    getLinkDisplayTextFromCopy,
+    getRouterLinkRouteFromCopy,
+    getRouterLinkDisplayTextFromCopy,
 } from "@/helpers/cms-content-helper";
 import { routerParams } from "@/router/router-constants/router-params";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
@@ -151,8 +151,8 @@ export default {
     methods: {
         doesCopyContainRouterLink,
         splitCopyOnCMSPlaceHolder,
-        getLinkTargetFromCopy,
-        getLinkDisplayTextFromCopy,
+        getRouterLinkRouteFromCopy,
+        getRouterLinkDisplayTextFromCopy,
         arePagePrerequisitesValid() {
             if (
                 store.getters.order.vehicle.carId &&
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 e50f18820..9738d3dde 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
@@ -30,10 +30,10 @@
                                 <span v-else>
                                     <textLink
                                         linkType="text"
-                                        :text="getLinkDisplayTextFromCopy(copy)"
+                                        :text="getRouterLinkDisplayTextFromCopy(copy)"
                                         href="#!"
                                         data-bs-toggle="modal"
-                                        :data-bs-target="'#' + getLinkTargetFromCopy(copy)"
+                                        :data-bs-target="'#' + getRouterLinkRouteFromCopy(copy)"
                                         aria-label="Modal window" />
                                 </span>
                             </template>
@@ -55,8 +55,8 @@ import baseInputButton from "@/digital-components/base-input-button/base-input-b
 import textLink from "@/ux-components/text-link/text-link";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 import {
-    getLinkDisplayTextFromCopy,
-    getLinkTargetFromCopy,
+    getRouterLinkDisplayTextFromCopy,
+    getRouterLinkRouteFromCopy,
     splitCopyOnCMSPlaceHolder,
     doesCopyContainTextLink,
 } from "@/helpers/cms-content-helper";
@@ -74,8 +74,8 @@ export default {
         },
     },
     methods: {
-        getLinkDisplayTextFromCopy,
-        getLinkTargetFromCopy,
+        getRouterLinkDisplayTextFromCopy,
+        getRouterLinkRouteFromCopy,
         splitCopyOnCMSPlaceHolder,
         doesCopyContainTextLink,
         stripUlTagFromCopy(copy) {
diff --git a/src/ux-components/alert/alert.spec.js b/src/ux-components/alert/alert.spec.js
index 343323b9e..978777116 100644
--- a/src/ux-components/alert/alert.spec.js
+++ b/src/ux-components/alert/alert.spec.js
@@ -49,7 +49,7 @@ describe("alert.vue", () => {
         expect(wrapper.vm.alertCopy).toBe("testCopy");
     });
 
-    it("Should container a <router-link> tag if the manualCopy contains a {routerLink: testName, testLink} placeholder", () => {
+    it.only("Should container a <router-link> tag if the manualCopy contains a {routerLink: testName, testLink} placeholder", () => {
         // Arrange & Act
         const wrapper = shallowMount(
             alert,
diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
index 0c3ac4b99..cecbad90c 100644
--- a/src/ux-components/alert/alert.vue
+++ b/src/ux-components/alert/alert.vue
@@ -19,12 +19,10 @@
                     <span v-else>
                         <router-link
                             :to="{
-                                query: {
-                                    [applicationQueryString]: `${getRouterLinkRouteFromCopy(copy)}`,
-                                },
+                                query: { [pageQueryString]: `${getRouterLinkRouteFromCopy(copy)}` },
                                 name: 'root',
                             }"
-                            >{{ getLinkDisplayTextFromCopy(copy) }}</router-link
+                            >{{ getRouterLinkDisplayTextFromCopy(copy) }}</router-link
                         >
                     </span>
                 </template>
@@ -43,8 +41,8 @@
 import {
     doesCopyContainRouterLink,
     splitCopyOnCMSPlaceHolder,
-    getLinkTargetFromCopy,
-    getLinkDisplayTextFromCopy,
+    getRouterLinkRouteFromCopy,
+    getRouterLinkDisplayTextFromCopy,
     splitCMSCopyOnParagraphTag,
 } from "@/helpers/cms-content-helper";
 import { applicationConfig } from "@/constants/application-config";
@@ -78,8 +76,8 @@ export default {
         },
     },
     computed: {
-        applicationQueryString() {
-            return applicationConfig.APPLICATION_QUERYSTRING;
+        pageQueryString() {
+            return applicationConfig.PAGE_QUERYSTRING;
         },
         alertHeadline() {
             return this.manualHeadline
@@ -98,8 +96,8 @@ export default {
     methods: {
         doesCopyContainRouterLink,
         splitCopyOnCMSPlaceHolder,
-        getLinkTargetFromCopy,
-        getLinkDisplayTextFromCopy,
+        getRouterLinkRouteFromCopy,
+        getRouterLinkDisplayTextFromCopy,
         ensureAlertIsInViewPort() {
             if (this.shouldScrollToOnMount && this.$el.style.display != "none") {
                 var footerHeight = this.getFooterInfoBoxHeight();

From a45ad5a11e954a04c3268d189843298f31fde245 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 25 Jan 2023 09:27:31 -0500
Subject: [PATCH 043/261] Remove .only from unit test.

---
 src/ux-components/alert/alert.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ux-components/alert/alert.spec.js b/src/ux-components/alert/alert.spec.js
index 978777116..343323b9e 100644
--- a/src/ux-components/alert/alert.spec.js
+++ b/src/ux-components/alert/alert.spec.js
@@ -49,7 +49,7 @@ describe("alert.vue", () => {
         expect(wrapper.vm.alertCopy).toBe("testCopy");
     });
 
-    it.only("Should container a <router-link> tag if the manualCopy contains a {routerLink: testName, testLink} placeholder", () => {
+    it("Should container a <router-link> tag if the manualCopy contains a {routerLink: testName, testLink} placeholder", () => {
         // Arrange & Act
         const wrapper = shallowMount(
             alert,

From 01ad8942e8159d50e23a34f39aa7a579fb72496a Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 25 Jan 2023 09:44:52 -0500
Subject: [PATCH 044/261] Add minor change to force update.

---
 src/ux-components/alert/alert.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ux-components/alert/alert.spec.js b/src/ux-components/alert/alert.spec.js
index 343323b9e..1f5d0fcc8 100644
--- a/src/ux-components/alert/alert.spec.js
+++ b/src/ux-components/alert/alert.spec.js
@@ -41,7 +41,7 @@ describe("alert.vue", () => {
         expect(wrapperDiv.classes()).toContain("warning");
     });
 
-    it("Should update alert Headline to manualHeadline datam entered and alert copy to manualCopy datam entered when no cmsWidgetName entered", async () => {
+    it("Should update alert Headline to manualHeadline datam entered and alert copy to manualCopy datam entered when no cmsWidgetName entered.", async () => {
         // Arrange
         const wrapper = shallowMount(alert, setupMocks({}));
         // Assert

From 91df4b31656ab3fe129ff87ba89155e9439c143d Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 25 Jan 2023 09:45:15 -0500
Subject: [PATCH 045/261] Changed name of model opened callback

---
 .../service-zip-modal-question/service-zip-modal-question.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 1ab55f165..78068a835 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -19,7 +19,7 @@
     <modal
         ref="zipCodeInputModal"
         :cmsWidgetName="this.modalWidgetName"
-        :onShownCallback="onModalOpen"
+        :onModalOpenedCallback="onModalOpen"
         :footerButtonCallback="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion

From b7d0f65e6b305bed34a9ea786753e47ff071c328 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 25 Jan 2023 10:46:22 -0500
Subject: [PATCH 046/261] CSR-1050 fix spacing in header.

---
 src/fmg-components/funnel-sub-header/funnel-sub-header.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fmg-components/funnel-sub-header/funnel-sub-header.vue b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue
index a5cdf5c0b..6beeaf321 100644
--- a/src/fmg-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue
@@ -2,7 +2,7 @@
     <div class="funnel-sub-header">
         <div
             class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
-            <h5 class="text-center fw-normal mb-0" :class="headerColor">
+            <h5 class="text-center fw-normal mb-2" :class="headerColor">
                 <span>
                     {{ text }}
                 </span>

From b8a87c343ba866863e3134bd7d7ff16f08b09949 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 12 Jan 2023 11:20:43 -0500
Subject: [PATCH 047/261] CSR-1012 | service zip modal question

new component service-zip-modal-question added to the service-location page
---
 src/digital-components/modal/modal.vue        |  28 +++-
 .../service-location/service-location.vue     |  13 +-
 .../service-zip-modal-question.spec.js        |   3 +
 .../service-zip-modal-question.vue            | 157 ++++++++++++++++++
 4 files changed, 193 insertions(+), 8 deletions(-)
 create mode 100644 src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
 create mode 100644 src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 7de269644..f8c5e01e5 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -11,12 +11,13 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <button
+                        ref="modalXButton"
                         type="button"
                         class="btn-close"
                         data-bs-dismiss="modal"
                         aria-label="Close"></button>
                 </div>
-                <div class="modal-body ps-4 pe-4 pt-5 pb-4">
+                <div class="modal-body ps-4 pe-4 pt-5 pb-4" v-if="showModalBody">
                     <img :src="ModalImage" class="mw-100 d-flex mx-auto mb-4" alt="" />
                     <h5 class="mb-4" v-html="ModalHeadline"></h5>
                     <p class="fw-bold mb-2 subheader-text" v-html="ModalSubheadertext"></p>
@@ -26,6 +27,7 @@
                         v-if="ModalSubBodyText"
                         v-html="ModalSubBodyText"></p>
                 </div>
+                <slot></slot>
                 <div class="modal-footer px-5 py-4">
                     <buttonMain
                         isPrimary
@@ -33,8 +35,7 @@
                         ref="buttonMain"
                         suppressLoader
                         :buttonText="ModalCloseButtonText"
-                        @click-event="buttonClick"
-                        data-bs-dismiss="modal" />
+                        @click-event="buttonMainClick" />
                 </div>
             </div>
         </div>
@@ -48,6 +49,9 @@ export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
+        buttonClick: {
+            type: Function,
+        },
     },
     computed: {
         ModalHeadline() {
@@ -68,11 +72,29 @@ export default {
         ModalCloseButtonText() {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
+        showModalBody() {
+            return (
+                this.ModalImage ||
+                this.ModalHeadline ||
+                this.ModalSubheadertext ||
+                this.ModalBodyText
+            );
+        },
     },
     methods: {
         resetButtonStyle() {
             this.$refs.buttonMain.resetButtonStyle();
         },
+        closeModal() {
+            this.$refs.modalXButton.click();
+        },
+        buttonMainClick() {
+            if (this.buttonClick) {
+                this.buttonClick();
+            } else {
+                this.closeModal();
+            }
+        },
     },
     components: {
         buttonMain,
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index e29ebdb5e..aa32c1921 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -4,6 +4,7 @@ fmg
         <div class="page-container-grouped-styles">
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
+            <serviceZipModalQuestion />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 :isForwardActionDisabled="!meta.valid"
@@ -15,12 +16,13 @@ fmg
 
 <script>
 // Components
-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 { Form } from "vee-validate";
+import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question";
+import funnelHeader from "@/common-components/funnel-header/funnel-header";
+import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
+import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
 
-// Supporting files
+//Supporting Files
+import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 
@@ -57,6 +59,7 @@ export default {
         forwardButtonAction() {},
     },
     components: {
+        serviceZipModalQuestion,
         funnelHeader,
         funnelFooter,
         funnelSubHeader,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
new file mode 100644
index 000000000..a81727c73
--- /dev/null
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -0,0 +1,3 @@
+describe("service-zip-modal-question.vue", () => {
+    test.todo("test this");
+});
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
new file mode 100644
index 000000000..0397609aa
--- /dev/null
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -0,0 +1,157 @@
+<template>
+    <div class="text-center">
+        <label
+            :for="serviceZipCodeInput"
+            :aria-label="questionText"
+            class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
+            :class="[questionAlignment === 'center' ? 'text-center w-100 mb-5' : '']"
+            v-html="questionText"></label>
+        <div class="update-zip-text-link">
+            <textLink
+                linkType="text"
+                :text="this.serviceZipDisplayText"
+                href="#!"
+                data-bs-toggle="modal"
+                data-bs-target="#ZipModal"
+                aria-label="Modal window" />
+        </div>
+    </div>
+    <modal ref="zipCodeInputModal" cmsWidgetName="ZipModal" :buttonClick="setZip">
+        <div class="ps-4 pe-4 pb-4">
+            <textboxQuestion
+                cmsWidgetName="ServiceZipQuestionWidget"
+                v-model="serviceZipCodeInput"
+                inputId="serviceZipCodeInput"
+                questionAlignment="center"
+                mask="#####"
+                isRequired
+                disableAutoFill
+                validationRules="zip-required|zip-format" />
+            <alert
+                ref="alertInvalidZip"
+                v-if="displayInvalidZipAlert"
+                class="my-4"
+                cmsWidgetName="AlertInvalidZipWidget"
+                alertClass="alert-danger"
+                v-bind:isDismissible="false" />
+            <alert
+                ref="alertNonServiceableZip"
+                v-if="displayNonServiceableZipAlert"
+                class="my-4"
+                cmsWidgetName="AlertNonServiceableZipWidget"
+                :manualHeadline="AlertNonServiceableZipHeader"
+                alertClass="alert-danger"
+                v-bind:isDismissible="false" />
+        </div>
+    </modal>
+</template>
+
+<script>
+// Components
+import textLink from "@/ux-components/text-link/text-link";
+import modal from "@/common-components/modal/modal";
+import alert from "@/ux-components/alert/alert";
+import textboxQuestion from "@/common-components/textbox-question/textbox-question";
+
+//Supporting Files
+import { defineRule } from "vee-validate";
+import { required, regex } from "@/helpers/validation-rules";
+import { errorMessages } from "@/constants/error-messages";
+import store from "@/store";
+import baseMixin from "@/mixins/base-mixin";
+
+// Define Validation Rules
+defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
+defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
+
+export default {
+    name: "service-zip-modal-question",
+    data() {
+        return {
+            serviceZip: this.getZipFromStore(),
+            serviceZipState: this.getZipStateFromStore(),
+            serviceZipCodeInput: this.getZipFromStore(),
+            displayInvalidZipAlert: false,
+            displayNonServiceableZipAlert: false,
+        };
+    },
+    props: {
+        cmsWidgetName: String,
+    },
+    methods: {
+        getZipFromStore() {
+            return store.getters.order.serviceLocation.zipCode;
+        },
+
+        getZipStateFromStore() {
+            return store.getters.order.serviceLocation.state;
+        },
+
+        resetAlerts() {
+            this.displayInvalidZipAlert = false;
+            this.displayNonServiceableZipAlert = false;
+        },
+
+        async setZip() {
+            this.resetAlerts();
+
+            const zipLength = 5;
+            if (this.serviceZipCodeInput.length < zipLength) {
+                // prevent reading 1111 as 01111
+                return;
+            }
+
+            const zipCodeData = await baseMixin.methods.getZipCodeData(this.serviceZipCodeInput);
+
+            if (!zipCodeData.isValid) {
+                this.displayInvalidZipAlert = true;
+            } else if (!zipCodeData.isServiceable) {
+                this.displayNonServiceableZipAlert = true;
+            } else {
+                this.serviceZip = this.serviceZipCodeInput;
+                this.serviceZipState = zipCodeData.state;
+
+                this.$refs.zipCodeInputModal.closeModal();
+            }
+        },
+    },
+    computed: {
+        questionText() {
+            return this.getCmsContent("LocationQuestionWidget", "QuestionText");
+        },
+        serviceZipDisplayText() {
+            if (this.serviceZip && this.serviceZip != 0) {
+                return this.serviceZipState + ", " + this.serviceZip;
+            }
+            return this.getCmsContent("ZipPlaceholderText", "QuestionText");
+        },
+        AlertNonServiceableZipHeader() {
+            const zipCode = this.serviceZipCodeInput;
+            const text = this.getCmsContent(
+                "AlertNonServiceableZipWidget",
+                "HeadlineText"
+            ).replaceAll("{custom:serviceZipCodeInput}", zipCode);
+            return text;
+        },
+    },
+    components: {
+        textLink,
+        modal,
+        alert,
+        textboxQuestion,
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.update-zip-text-link::before {
+    content: "";
+    display: inline-block;
+    width: 13px;
+    height: 16px;
+    background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 13 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.49635 1.00142e-07C5.64734 -0.000153295 4.80722 0.175918 4.0274 0.517444C3.24757 0.858969 2.54443 1.35877 1.96099 1.98626C0.765713 3.27588 0.0999756 4.98141 0.0999756 6.75394C0.0999756 8.52646 0.765713 10.232 1.96099 11.5216L5.98324 15.777C6.04954 15.8475 6.12918 15.9036 6.21736 15.9419C6.30555 15.9802 6.40045 16 6.49635 16C6.59225 16 6.68716 15.9802 6.77534 15.9419C6.86353 15.9036 6.94317 15.8475 7.00946 15.777L11.0317 11.52C12.2391 10.2383 12.909 8.52914 12.8999 6.75394C12.9094 4.97818 12.2394 3.26832 11.0317 1.98626C10.4481 1.35899 9.74493 0.859347 8.96514 0.517839C8.18535 0.176331 7.34532 0.000130509 6.49635 1.00142e-07V1.00142e-07ZM6.49635 9.13131C6.02507 9.13131 5.56437 8.98913 5.17251 8.72275C4.78065 8.45637 4.47524 8.07776 4.29488 7.63479C4.11453 7.19181 4.06734 6.70438 4.15928 6.23412C4.25123 5.76387 4.47817 5.33191 4.81142 4.99287C5.14467 4.65384 5.56925 4.42295 6.03148 4.32941C6.49371 4.23587 6.97282 4.28388 7.40823 4.46736C7.84364 4.65085 8.21579 4.96157 8.47762 5.36023C8.73945 5.7589 8.87921 6.2276 8.87921 6.70707C8.87921 7.34974 8.62837 7.96611 8.18185 8.4207C7.73532 8.87528 7.12964 9.13088 6.49794 9.13131H6.49635Z' fill='%231574A1'/%3E%3C/svg%3E%0A");
+    background-size: contain;
+    vertical-align: middle;
+    margin-right: 0.5em;
+}
+</style>

From 314fe42c189cfa92dd3b4d5207d2e7f2382cfe1d Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Wed, 18 Jan 2023 12:27:33 -0500
Subject: [PATCH 048/261] CSR-1012 | file path updates

---
 src/layouts/service-location/service-location.vue         | 6 +++---
 .../service-zip-modal-question.vue                        | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index aa32c1921..4f8230456 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -17,9 +17,9 @@ fmg
 <script>
 // Components
 import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question";
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+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";
 
 //Supporting Files
 import { Form } from "vee-validate";
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 0397609aa..fa49f50d0 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -48,10 +48,10 @@
 
 <script>
 // Components
-import textLink from "@/ux-components/text-link/text-link";
-import modal from "@/common-components/modal/modal";
-import alert from "@/ux-components/alert/alert";
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
+import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import modal from "@/digital-components/modal/modal";
+import alert from "@/fmg-components/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 
 //Supporting Files
 import { defineRule } from "vee-validate";

From 651a4fa0c36613b3174613242fc6efe74569d1a7 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 19 Jan 2023 13:08:56 -0500
Subject: [PATCH 049/261] CSR-1012 | service zip cms refactor

---
 .../service-location/service-location.vue     |  7 ++-
 .../service-zip-modal-question.vue            | 50 ++++++++++---------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 4f8230456..418a1ec2e 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -4,7 +4,12 @@ fmg
         <div class="page-container-grouped-styles">
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
-            <serviceZipModalQuestion />
+            <serviceZipModalQuestion
+                cmsWidgetName="ServiceZipModalWidget"
+                modalWidgetName="ZipModalWidget"
+                textboxQuestionWidgetName="ServiceZipQuestionWidget"
+                alertNonServiceableZipWidgetName="AlertNonServiceableZipWidget"
+                alertInvalidZipWidgetName="AlertInvalidZipWidget" />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 :isForwardActionDisabled="!meta.valid"
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index fa49f50d0..9713c8156 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -12,14 +12,14 @@
                 :text="this.serviceZipDisplayText"
                 href="#!"
                 data-bs-toggle="modal"
-                data-bs-target="#ZipModal"
+                :data-bs-target="getModalId"
                 aria-label="Modal window" />
         </div>
     </div>
-    <modal ref="zipCodeInputModal" cmsWidgetName="ZipModal" :buttonClick="setZip">
+    <modal ref="zipCodeInputModal" :cmsWidgetName="this.modalWidgetName" :buttonClick="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
-                cmsWidgetName="ServiceZipQuestionWidget"
+                :cmsWidgetName="this.textboxQuestionWidgetName"
                 v-model="serviceZipCodeInput"
                 inputId="serviceZipCodeInput"
                 questionAlignment="center"
@@ -31,15 +31,15 @@
                 ref="alertInvalidZip"
                 v-if="displayInvalidZipAlert"
                 class="my-4"
-                cmsWidgetName="AlertInvalidZipWidget"
+                :cmsWidgetName="this.alertInvalidZipWidgetName"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
             <alert
                 ref="alertNonServiceableZip"
                 v-if="displayNonServiceableZipAlert"
                 class="my-4"
-                cmsWidgetName="AlertNonServiceableZipWidget"
-                :manualHeadline="AlertNonServiceableZipHeader"
+                :cmsWidgetName="this.alertNonServiceableZipWidgetName"
+                :manualHeadline="this.invalidAlertHeader"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
         </div>
@@ -48,17 +48,15 @@
 
 <script>
 // Components
-import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import textLink from "@/ux-components/text-link/text-link";
 import modal from "@/digital-components/modal/modal";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 
 //Supporting Files
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import store from "@/store";
-import baseMixin from "@/mixins/base-mixin";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -73,18 +71,23 @@ export default {
             serviceZipCodeInput: this.getZipFromStore(),
             displayInvalidZipAlert: false,
             displayNonServiceableZipAlert: false,
+            invalidAlertHeader: null,
         };
     },
     props: {
         cmsWidgetName: String,
+        modalWidgetName: String,
+        textboxQuestionWidgetName: String,
+        alertNonServiceableZipWidgetName: String,
+        alertInvalidZipWidgetName: String,
     },
     methods: {
         getZipFromStore() {
-            return store.getters.order.serviceLocation.zipCode;
+            return this.$store.getters.order.serviceLocation.zipCode;
         },
 
         getZipStateFromStore() {
-            return store.getters.order.serviceLocation.state;
+            return this.$store.getters.order.serviceLocation.state;
         },
 
         resetAlerts() {
@@ -96,16 +99,20 @@ export default {
             this.resetAlerts();
 
             const zipLength = 5;
-            if (this.serviceZipCodeInput.length < zipLength) {
+            if (!this.serviceZipCodeInput || this.serviceZipCodeInput.length < zipLength) {
                 // prevent reading 1111 as 01111
                 return;
             }
 
-            const zipCodeData = await baseMixin.methods.getZipCodeData(this.serviceZipCodeInput);
+            const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
             } else if (!zipCodeData.isServiceable) {
+                this.invalidAlertHeader = this.getCmsContent(
+                    this.alertNonServiceableZipWidgetName,
+                    "HeadlineText"
+                ).replaceAll("{custom:serviceZipCodeInput}", this.serviceZipCodeInput);
                 this.displayNonServiceableZipAlert = true;
             } else {
                 this.serviceZip = this.serviceZipCodeInput;
@@ -116,22 +123,17 @@ export default {
         },
     },
     computed: {
+        getModalId() {
+            return "#" + this.modalWidgetName;
+        },
         questionText() {
-            return this.getCmsContent("LocationQuestionWidget", "QuestionText");
+            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
         },
         serviceZipDisplayText() {
             if (this.serviceZip && this.serviceZip != 0) {
                 return this.serviceZipState + ", " + this.serviceZip;
             }
-            return this.getCmsContent("ZipPlaceholderText", "QuestionText");
-        },
-        AlertNonServiceableZipHeader() {
-            const zipCode = this.serviceZipCodeInput;
-            const text = this.getCmsContent(
-                "AlertNonServiceableZipWidget",
-                "HeadlineText"
-            ).replaceAll("{custom:serviceZipCodeInput}", zipCode);
-            return text;
+            return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
     },
     components: {

From a6e3c47aa9ce0fe19deda9f736b01f1f87f795fd Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 19 Jan 2023 13:35:38 -0500
Subject: [PATCH 050/261] CSR-1012 | reset modal on text input

added prop to textbox-question to fire custom function on text updates
---
 .../textbox-question/textbox-question.vue     |  2 ++
 .../service-zip-modal-question.vue            | 23 +++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index a19823b0d..e97402bb3 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -70,6 +70,7 @@ export default {
         questionAlignment: String, // Left or center. Left is default.
         cornerStyle: String, // Rounded or square. Square is default.
         includeSearchIcon: Boolean,
+        customOnChange: Function,
     },
     setup(props) {
         const propsClone = Object.assign({}, props);
@@ -145,6 +146,7 @@ export default {
     },
     watch: {
         async value(newValue) {
+            this.customOnChange();
             const result = await validate(newValue, this.validationRules); // do a test validation check, without triggering full validation
             if (result.valid) {
                 this.handleChange(newValue); // trigger full validation on this field only
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 9713c8156..710514966 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -26,7 +26,8 @@
                 mask="#####"
                 isRequired
                 disableAutoFill
-                validationRules="zip-required|zip-format" />
+                validationRules="zip-required|zip-format" 
+                :customOnChange="this.resetsOnZipInput" />
             <alert
                 ref="alertInvalidZip"
                 v-if="displayInvalidZipAlert"
@@ -39,7 +40,7 @@
                 v-if="displayNonServiceableZipAlert"
                 class="my-4"
                 :cmsWidgetName="this.alertNonServiceableZipWidgetName"
-                :manualHeadline="this.invalidAlertHeader"
+                :manualHeadline="AlertNonServiceableZipHeader"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
         </div>
@@ -71,7 +72,6 @@ export default {
             serviceZipCodeInput: this.getZipFromStore(),
             displayInvalidZipAlert: false,
             displayNonServiceableZipAlert: false,
-            invalidAlertHeader: null,
         };
     },
     props: {
@@ -95,6 +95,11 @@ export default {
             this.displayNonServiceableZipAlert = false;
         },
 
+        resetsOnZipInput() {
+            this.resetAlerts();
+            this.$refs.zipCodeInputModal.resetButtonStyle();
+        },
+
         async setZip() {
             this.resetAlerts();
 
@@ -109,10 +114,6 @@ export default {
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
             } else if (!zipCodeData.isServiceable) {
-                this.invalidAlertHeader = this.getCmsContent(
-                    this.alertNonServiceableZipWidgetName,
-                    "HeadlineText"
-                ).replaceAll("{custom:serviceZipCodeInput}", this.serviceZipCodeInput);
                 this.displayNonServiceableZipAlert = true;
             } else {
                 this.serviceZip = this.serviceZipCodeInput;
@@ -135,6 +136,14 @@ export default {
             }
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
+        AlertNonServiceableZipHeader() {
+            const zipCode = this.serviceZipCodeInput;
+            const text = this.getCmsContent(
+                "AlertNonServiceableZipWidget",
+                "HeadlineText"
+            ).replaceAll("{custom:serviceZipCodeInput}", zipCode);
+            return text;
+        },
     },
     components: {
         textLink,

From a24be0cc1d1df0d603b33aad396205a918afa296 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Mon, 23 Jan 2023 13:23:30 -0500
Subject: [PATCH 051/261] CSR-1012 refactor hide alerts on text input

---
 .../textbox-question/textbox-question.vue          |  2 --
 .../service-zip-modal-question.vue                 | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index e97402bb3..a19823b0d 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -70,7 +70,6 @@ export default {
         questionAlignment: String, // Left or center. Left is default.
         cornerStyle: String, // Rounded or square. Square is default.
         includeSearchIcon: Boolean,
-        customOnChange: Function,
     },
     setup(props) {
         const propsClone = Object.assign({}, props);
@@ -146,7 +145,6 @@ export default {
     },
     watch: {
         async value(newValue) {
-            this.customOnChange();
             const result = await validate(newValue, this.validationRules); // do a test validation check, without triggering full validation
             if (result.valid) {
                 this.handleChange(newValue); // trigger full validation on this field only
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 710514966..68f30abff 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -19,6 +19,7 @@
     <modal ref="zipCodeInputModal" :cmsWidgetName="this.modalWidgetName" :buttonClick="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
+                ref="zipInputTextQuestion"
                 :cmsWidgetName="this.textboxQuestionWidgetName"
                 v-model="serviceZipCodeInput"
                 inputId="serviceZipCodeInput"
@@ -26,8 +27,7 @@
                 mask="#####"
                 isRequired
                 disableAutoFill
-                validationRules="zip-required|zip-format" 
-                :customOnChange="this.resetsOnZipInput" />
+                validationRules="zip-required|zip-format" />
             <alert
                 ref="alertInvalidZip"
                 v-if="displayInvalidZipAlert"
@@ -145,6 +145,16 @@ export default {
             return text;
         },
     },
+    mounted() {
+        this.$watch(
+            () => {
+                return this.$refs.zipInputTextQuestion.value;
+            },
+            (val) => {
+                this.resetsOnZipInput();
+            }
+        );
+    },
     components: {
         textLink,
         modal,

From f7464013111f306a50a9aaaae6e1802c9c9cb894 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Mon, 23 Jan 2023 14:59:31 -0500
Subject: [PATCH 052/261] CSR-1012 | modal footer button updates

---
 src/digital-components/modal/modal.vue        | 22 +++++++++----------
 .../service-zip-modal-question.vue            | 12 +++++++---
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index f8c5e01e5..da1fc8c26 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -35,7 +35,7 @@
                         ref="buttonMain"
                         suppressLoader
                         :buttonText="ModalCloseButtonText"
-                        @click-event="buttonMainClick" />
+                        @click-event="footerButtonClick" />
                 </div>
             </div>
         </div>
@@ -49,8 +49,11 @@ export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
-        buttonClick: {
+
+        footerButtonCallback: {
             type: Function,
+            // return true to close modal
+            // if undefined, footer button closes modal
         },
     },
     computed: {
@@ -73,12 +76,7 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
         showModalBody() {
-            return (
-                this.ModalImage ||
-                this.ModalHeadline ||
-                this.ModalSubheadertext ||
-                this.ModalBodyText
-            );
+            return this.ModalBodyText;
         },
     },
     methods: {
@@ -88,9 +86,11 @@ export default {
         closeModal() {
             this.$refs.modalXButton.click();
         },
-        buttonMainClick() {
-            if (this.buttonClick) {
-                this.buttonClick();
+        async footerButtonClick() {
+            if (this.footerButtonCallback) {
+                if (await this.footerButtonCallback()) {
+                    this.closeModal();
+                }
             } else {
                 this.closeModal();
             }
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 68f30abff..1c9edd563 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -16,7 +16,10 @@
                 aria-label="Modal window" />
         </div>
     </div>
-    <modal ref="zipCodeInputModal" :cmsWidgetName="this.modalWidgetName" :buttonClick="setZip">
+    <modal
+        ref="zipCodeInputModal"
+        :cmsWidgetName="this.modalWidgetName"
+        :footerButtonCallback="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
                 ref="zipInputTextQuestion"
@@ -106,7 +109,7 @@ export default {
             const zipLength = 5;
             if (!this.serviceZipCodeInput || this.serviceZipCodeInput.length < zipLength) {
                 // prevent reading 1111 as 01111
-                return;
+                return false;
             }
 
             const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
@@ -119,8 +122,11 @@ export default {
                 this.serviceZip = this.serviceZipCodeInput;
                 this.serviceZipState = zipCodeData.state;
 
-                this.$refs.zipCodeInputModal.closeModal();
+                // close modal
+                return true;
             }
+
+            return false;
         },
     },
     computed: {

From cfdb97c1d8118e8dd848ee9d7ab72409593e0cf7 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Tue, 24 Jan 2023 14:25:20 -0500
Subject: [PATCH 053/261] CSR-1012 | call function on textLink click

---
 .../service-zip-modal-question.vue                     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 1c9edd563..dc13de094 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -13,7 +13,8 @@
                 href="#!"
                 data-bs-toggle="modal"
                 :data-bs-target="getModalId"
-                aria-label="Modal window" />
+                aria-label="Modal window" 
+                @click-event="focusOnZipInput" />
         </div>
     </div>
     <modal
@@ -103,6 +104,13 @@ export default {
             this.$refs.zipCodeInputModal.resetButtonStyle();
         },
 
+        focusOnZipInput() {
+            console.log("focusOnZipInput");
+            var input = document.getElementById("serviceZipCodeInput");
+            input.focus();
+            // this.$refs.zipInputTextQuestion.focus();
+        },
+
         async setZip() {
             this.resetAlerts();
 

From f0c655cdd6114190fbea757905385a2cbef85062 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Tue, 24 Jan 2023 15:34:45 -0500
Subject: [PATCH 054/261] CSR-1012 | reset modal on open

---
 .../service-zip-modal-question.vue                | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index dc13de094..47577a2ec 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -13,8 +13,8 @@
                 href="#!"
                 data-bs-toggle="modal"
                 :data-bs-target="getModalId"
-                aria-label="Modal window" 
-                @click-event="focusOnZipInput" />
+                aria-label="Modal window"
+                @click-event="onModalOpen" />
         </div>
     </div>
     <modal
@@ -104,11 +104,12 @@ export default {
             this.$refs.zipCodeInputModal.resetButtonStyle();
         },
 
-        focusOnZipInput() {
-            console.log("focusOnZipInput");
-            var input = document.getElementById("serviceZipCodeInput");
-            input.focus();
-            // this.$refs.zipInputTextQuestion.focus();
+        focusOnZipInput() {},
+
+        onModalOpen() {
+            this.serviceZipCodeInput = this.serviceZip;
+            this.resetsOnZipInput();
+            this.focusOnZipInput();
         },
 
         async setZip() {

From 338d9b79356b2cc0e66ca7b4591e5b47da25362d Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 24 Jan 2023 15:55:13 -0500
Subject: [PATCH 055/261] Added onShownCallback property and handler

---
 src/digital-components/modal/modal.vue               |  5 ++++-
 .../service-zip-modal-question.vue                   | 12 +++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index da1fc8c26..013a42168 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -2,7 +2,7 @@
     <!-- Modal -->
     <div
         class="modal fade modal-component"
-        v-on="{ 'hidden.bs.modal': resetButtonStyle }"
+        v-on="{ 'hidden.bs.modal': resetButtonStyle, 'shown.bs.modal': onShownCallback }"
         :id="cmsWidgetName"
         tabindex="-1"
         aria-labelledby="ModalComponentLabel"
@@ -49,6 +49,9 @@ export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
+        onShownCallback: {
+            type: Function,
+        },
 
         footerButtonCallback: {
             type: Function,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 47577a2ec..1ab55f165 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -13,13 +13,13 @@
                 href="#!"
                 data-bs-toggle="modal"
                 :data-bs-target="getModalId"
-                aria-label="Modal window"
-                @click-event="onModalOpen" />
+                aria-label="Modal window" />
         </div>
     </div>
     <modal
         ref="zipCodeInputModal"
         :cmsWidgetName="this.modalWidgetName"
+        :onShownCallback="onModalOpen"
         :footerButtonCallback="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
@@ -62,6 +62,7 @@ import textboxQuestion from "@/digital-components/textbox-question/textbox-quest
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
+import { isNoUnitNumericStyleProp } from "@vue/shared";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -104,7 +105,12 @@ export default {
             this.$refs.zipCodeInputModal.resetButtonStyle();
         },
 
-        focusOnZipInput() {},
+        focusOnZipInput() {
+            this.$nextTick(() => {
+                const input = this.$refs.zipInputTextQuestion.$refs.serviceZipCodeInput;
+                input.focus();
+            });
+        },
 
         onModalOpen() {
             this.serviceZipCodeInput = this.serviceZip;

From 23d30d60370461d4cf24d2173382253e203577c6 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 25 Jan 2023 16:18:56 -0500
Subject: [PATCH 056/261] Manual open of modal

---
 src/digital-components/modal/modal.vue        |  19 +++-
 .../address-questions/address-questions.vue   |   5 +-
 .../mobile-location-modal-question.vue        | 100 ++++++++++++++++++
 .../service-location/service-location.vue     |   6 ++
 .../service-zip-modal-question.vue            |   8 +-
 5 files changed, 132 insertions(+), 6 deletions(-)
 create mode 100644 src/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question.vue

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 013a42168..ff02fb67c 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -2,7 +2,7 @@
     <!-- Modal -->
     <div
         class="modal fade modal-component"
-        v-on="{ 'hidden.bs.modal': resetButtonStyle, 'shown.bs.modal': onShownCallback }"
+        v-on="{ 'hidden.bs.modal': resetButtonStyle, 'shown.bs.modal': onModalOpenedCallback }"
         :id="cmsWidgetName"
         tabindex="-1"
         aria-labelledby="ModalComponentLabel"
@@ -44,12 +44,13 @@
 
 <script>
 import buttonMain from "@/ux-components/button-main/button-main";
+import { Modal } from "bootstrap";
 
 export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
-        onShownCallback: {
+        onModalOpenedCallback: {
             type: Function,
         },
 
@@ -59,6 +60,15 @@ export default {
             // if undefined, footer button closes modal
         },
     },
+    data() {
+        return {
+            myModal: null,
+        }        
+    },
+    mounted() {
+        this.myModal = new Modal(document.getElementById(this.cmsWidgetName));
+        
+    },
     computed: {
         ModalHeadline() {
             return this.getCmsContent(this.cmsWidgetName, "HeaderText");
@@ -86,8 +96,11 @@ export default {
         resetButtonStyle() {
             this.$refs.buttonMain.resetButtonStyle();
         },
+        openModal() {
+            this.myModal.show();
+        },
         closeModal() {
-            this.$refs.modalXButton.click();
+            this.myModal.hide();
         },
         async footerButtonClick() {
             if (this.footerButtonCallback) {
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 2f21e49f6..33d17b1e5 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -117,7 +117,10 @@ export default {
             }),
         },
         validationRules: String,
-        captureApartmentNumberOrBusinessName: false,
+        captureApartmentNumberOrBusinessName: {
+            type: Boolean,
+            default: false,
+        },
     },
     data() {
         return {
diff --git a/src/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question.vue b/src/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question.vue
new file mode 100644
index 000000000..f3d83fe3b
--- /dev/null
+++ b/src/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question.vue
@@ -0,0 +1,100 @@
+<template>
+    <div class="text-center">
+        <label
+            :for="displayModalLink"
+            :aria-label="questionText"
+            class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
+            :class="[questionAlignment === 'center' ? 'text-center w-100 mb-5' : '']"
+            v-html="questionText"></label>
+        <div class="update-mobile-location-text-link">
+            <textLink
+                id="displayModalLink"
+                linkType="text"
+                :text="this.mobileLocationDisplayText"
+                href="#!"
+                data-bs-toggle="modal"
+                :data-bs-target="getModalId"
+                aria-label="Modal window" />
+        </div>
+    </div>
+    <modal
+        ref="mobileServiceModal"
+        :cmsWidgetName="this.modalWidgetName"
+        :onModalOpenedCallback="onModalOpened"
+        :footerButtonCallback="saveMobileLocationData">
+        <div class="ps-4 pe-4 pb-4">
+            <addressQuestions ref="addressQuestions" captureApartmentNumberOrBusinessName ="true" />
+        </div>
+    </modal>
+</template>
+
+<script>
+// Components
+import textLink from "@/ux-components/text-link/text-link";
+import modal from "@/digital-components/modal/modal";
+import alert from "@/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
+import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
+
+//Supporting Files
+import { defineRule } from "vee-validate";
+import { required, regex } from "@/helpers/validation-rules";
+import { errorMessages } from "@/constants/error-messages";
+import { isNoUnitNumericStyleProp } from "@vue/shared";
+
+// Define Validation Rules
+defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
+defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
+
+export default {
+    name: "mobile-location-modal-question",
+    data() {
+        return {
+
+        };
+    },
+    props: {
+        cmsWidgetName: String,
+        modalWidgetName: String,
+        textboxQuestionWidgetName: String,
+        alertNonServiceableZipWidgetName: String,
+        alertInvalidZipWidgetName: String,
+    },
+    methods: {
+ 
+    },
+    computed: {
+        getModalId() {
+            return "#" + this.modalWidgetName;
+        },
+        questionText() {
+            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
+        },
+        mobileLocationDisplayText() {
+
+            return this.getCmsContent(this.cmsWidgetName, "FooterText");
+        },
+    },
+    mounted() {
+
+    },
+    components: {
+        textLink,
+        modal,
+        addressQuestions
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.update-zip-text-link::before {
+    content: "";
+    display: inline-block;
+    width: 13px;
+    height: 16px;
+    background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 13 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.49635 1.00142e-07C5.64734 -0.000153295 4.80722 0.175918 4.0274 0.517444C3.24757 0.858969 2.54443 1.35877 1.96099 1.98626C0.765713 3.27588 0.0999756 4.98141 0.0999756 6.75394C0.0999756 8.52646 0.765713 10.232 1.96099 11.5216L5.98324 15.777C6.04954 15.8475 6.12918 15.9036 6.21736 15.9419C6.30555 15.9802 6.40045 16 6.49635 16C6.59225 16 6.68716 15.9802 6.77534 15.9419C6.86353 15.9036 6.94317 15.8475 7.00946 15.777L11.0317 11.52C12.2391 10.2383 12.909 8.52914 12.8999 6.75394C12.9094 4.97818 12.2394 3.26832 11.0317 1.98626C10.4481 1.35899 9.74493 0.859347 8.96514 0.517839C8.18535 0.176331 7.34532 0.000130509 6.49635 1.00142e-07V1.00142e-07ZM6.49635 9.13131C6.02507 9.13131 5.56437 8.98913 5.17251 8.72275C4.78065 8.45637 4.47524 8.07776 4.29488 7.63479C4.11453 7.19181 4.06734 6.70438 4.15928 6.23412C4.25123 5.76387 4.47817 5.33191 4.81142 4.99287C5.14467 4.65384 5.56925 4.42295 6.03148 4.32941C6.49371 4.23587 6.97282 4.28388 7.40823 4.46736C7.84364 4.65085 8.21579 4.96157 8.47762 5.36023C8.73945 5.7589 8.87921 6.2276 8.87921 6.70707C8.87921 7.34974 8.62837 7.96611 8.18185 8.4207C7.73532 8.87528 7.12964 9.13088 6.49794 9.13131H6.49635Z' fill='%231574A1'/%3E%3C/svg%3E%0A");
+    background-size: contain;
+    vertical-align: middle;
+    margin-right: 0.5em;
+}
+</style>
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 418a1ec2e..4d0a527c6 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -10,6 +10,10 @@ fmg
                 textboxQuestionWidgetName="ServiceZipQuestionWidget"
                 alertNonServiceableZipWidgetName="AlertNonServiceableZipWidget"
                 alertInvalidZipWidgetName="AlertInvalidZipWidget" />
+            <mobileLocationModalQuestion
+                cmsWidgetName="MobileLocationModalWidget"
+                modalWidgetName="LocationModalWidget"
+                textboxQuestionWidgetName="MobileLocationQuestionWidget" />    
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 :isForwardActionDisabled="!meta.valid"
@@ -22,6 +26,7 @@ fmg
 <script>
 // Components
 import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question";
+import mobileLocationModalQuestion from "@/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question";
 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";
@@ -65,6 +70,7 @@ export default {
     },
     components: {
         serviceZipModalQuestion,
+        mobileLocationModalQuestion,
         funnelHeader,
         funnelFooter,
         funnelSubHeader,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 78068a835..d05cca807 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -1,17 +1,18 @@
 <template>
     <div class="text-center">
         <label
-            :for="serviceZipCodeInput"
+            :for="displayModalLink"
             :aria-label="questionText"
             class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
             :class="[questionAlignment === 'center' ? 'text-center w-100 mb-5' : '']"
             v-html="questionText"></label>
         <div class="update-zip-text-link">
             <textLink
+                id="displayModalLink"
                 linkType="text"
                 :text="this.serviceZipDisplayText"
                 href="#!"
-                data-bs-toggle="modal"
+                @click-event="openZipCodeModal"
                 :data-bs-target="getModalId"
                 aria-label="Modal window" />
         </div>
@@ -87,6 +88,9 @@ export default {
         alertInvalidZipWidgetName: String,
     },
     methods: {
+        openZipCodeModal() {
+            this.$refs.zipCodeInputModal.myModal.show();
+        },
         getZipFromStore() {
             return this.$store.getters.order.serviceLocation.zipCode;
         },

From ced1c18c0471a280da62f1ed806505a22ee6d6ca Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Wed, 25 Jan 2023 16:37:34 -0500
Subject: [PATCH 057/261] CSR-1012 | modal open and close functions

---
 src/digital-components/modal/modal.vue         | 18 +++++++++++++++---
 .../service-zip-modal-question.vue             | 15 +++++++--------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 013a42168..6e8e7de07 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -2,7 +2,7 @@
     <!-- Modal -->
     <div
         class="modal fade modal-component"
-        v-on="{ 'hidden.bs.modal': resetButtonStyle, 'shown.bs.modal': onShownCallback }"
+        v-on="{ 'hidden.bs.modal': resetButtonStyle, 'shown.bs.modal': onModalOpenedCallback }"
         :id="cmsWidgetName"
         tabindex="-1"
         aria-labelledby="ModalComponentLabel"
@@ -44,12 +44,13 @@
 
 <script>
 import buttonMain from "@/ux-components/button-main/button-main";
+import { Modal } from "bootstrap";
 
 export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
-        onShownCallback: {
+        onModalOpenedCallback: {
             type: Function,
         },
 
@@ -59,6 +60,14 @@ export default {
             // if undefined, footer button closes modal
         },
     },
+    data() {
+        return {
+            myModal: null,
+        };
+    },
+    mounted() {
+        this.myModal = new Modal(document.getElementById(this.cmsWidgetName));
+    },
     computed: {
         ModalHeadline() {
             return this.getCmsContent(this.cmsWidgetName, "HeaderText");
@@ -86,8 +95,11 @@ export default {
         resetButtonStyle() {
             this.$refs.buttonMain.resetButtonStyle();
         },
+        openModal() {
+            this.myModal.show();
+        },
         closeModal() {
-            this.$refs.modalXButton.click();
+            this.myModal.hide();
         },
         async footerButtonClick() {
             if (this.footerButtonCallback) {
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 1ab55f165..169281b71 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -1,25 +1,25 @@
 <template>
     <div class="text-center">
         <label
-            :for="serviceZipCodeInput"
+            :for="displayModalLink"
             :aria-label="questionText"
             class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
             :class="[questionAlignment === 'center' ? 'text-center w-100 mb-5' : '']"
             v-html="questionText"></label>
         <div class="update-zip-text-link">
             <textLink
+                id="displayModalLink"
                 linkType="text"
                 :text="this.serviceZipDisplayText"
                 href="#!"
-                data-bs-toggle="modal"
-                :data-bs-target="getModalId"
+                @click-event="openZipCodeModal"
                 aria-label="Modal window" />
         </div>
     </div>
     <modal
         ref="zipCodeInputModal"
         :cmsWidgetName="this.modalWidgetName"
-        :onShownCallback="onModalOpen"
+        :onModalOpenedCallback="onModalOpen"
         :footerButtonCallback="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
@@ -62,7 +62,6 @@ import textboxQuestion from "@/digital-components/textbox-question/textbox-quest
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import { isNoUnitNumericStyleProp } from "@vue/shared";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -87,6 +86,9 @@ export default {
         alertInvalidZipWidgetName: String,
     },
     methods: {
+        openZipCodeModal() {
+            this.$refs.zipCodeInputModal.openModal();
+        },
         getZipFromStore() {
             return this.$store.getters.order.serviceLocation.zipCode;
         },
@@ -145,9 +147,6 @@ export default {
         },
     },
     computed: {
-        getModalId() {
-            return "#" + this.modalWidgetName;
-        },
         questionText() {
             return this.getCmsContent(this.cmsWidgetName, "HeaderText");
         },

From 3b397b924d324afde9669077b4f543359c16bffb Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 25 Jan 2023 16:42:19 -0500
Subject: [PATCH 058/261] CSR-1051 remove unnecessary code for underline
 spacing

(inherits from text-link)
---
 .../service-package-radio/service-package-radio.vue              | 1 -
 1 file changed, 1 deletion(-)

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 9738d3dde..3a2e19080 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
@@ -233,7 +233,6 @@ export default {
                     a {
                         line-height: 1.714;
                         padding: 0;
-                        text-underline-offset: 0.1em;
                     }
                 }
             }

From e9c6e35505393002dab578e0c5f07a8c08af7fe0 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Thu, 26 Jan 2023 13:54:13 -0500
Subject: [PATCH 059/261] CSR-1050 fix margin top spacing.

---
 src/layouts/quote/quote.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 5a65933b0..21f5753bb 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -29,7 +29,7 @@ digital
                     cmsWidgetName="quoteDisclaimer"
                     justifyText="left"
                     typeStyle="caption"
-                    class="mt-4" />
+                    class="mt-7" />
                 <modal cmsWidgetName="RainDefenseModal" />
                 <modal cmsWidgetName="FrontWiperModal" />
                 <modal cmsWidgetName="RearWiperModal" />

From 386ac66c927cdf398360c134da65e4fe8c7e4731 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 27 Jan 2023 08:59:22 -0500
Subject: [PATCH 060/261] Set text underline spacing to 4px;

---
 src/layouts/address-vehicles/address-vehicles.vue | 2 +-
 src/ux-components/text-link/text-link.vue         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index 35f441da7..b83bc6876 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -247,7 +247,7 @@ export default {
     line-height: 1.4;
 
     a {
-        text-underline-offset: 0.2em;
+        text-underline-offset: 4px;//Per Devyn. This can't be documented in Figma so there is a comment with the Prototype mocks on the Quote page in Figma
         line-height: inherit;
     }
 }
diff --git a/src/ux-components/text-link/text-link.vue b/src/ux-components/text-link/text-link.vue
index f28669a45..ff3e4cdb9 100644
--- a/src/ux-components/text-link/text-link.vue
+++ b/src/ux-components/text-link/text-link.vue
@@ -45,7 +45,7 @@ export default {
 <style lang="scss">
 a {
     color: $blue;
-    text-underline-offset: 5px;
+    text-underline-offset: 4px;//Per Devyn. This can't be documented in Figma so there is a comment with the Prototype mocks on the Quote page in Figma
     line-height: 2;
     padding: 0 0 4px 0;
     font-weight: 500;

From 04de4c6301361f276483341a17efb32a906bcf72 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 27 Jan 2023 09:04:12 -0500
Subject: [PATCH 061/261] Format code.

---
 src/layouts/address-vehicles/address-vehicles.vue | 2 +-
 src/ux-components/text-link/text-link.vue         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index b83bc6876..d45732217 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -247,7 +247,7 @@ export default {
     line-height: 1.4;
 
     a {
-        text-underline-offset: 4px;//Per Devyn. This can't be documented in Figma so there is a comment with the Prototype mocks on the Quote page in Figma
+        text-underline-offset: 4px; //Per Devyn. This can't be documented in Figma so there is a comment with the Prototype mocks on the Quote page in Figma
         line-height: inherit;
     }
 }
diff --git a/src/ux-components/text-link/text-link.vue b/src/ux-components/text-link/text-link.vue
index ff3e4cdb9..464143b65 100644
--- a/src/ux-components/text-link/text-link.vue
+++ b/src/ux-components/text-link/text-link.vue
@@ -45,7 +45,7 @@ export default {
 <style lang="scss">
 a {
     color: $blue;
-    text-underline-offset: 4px;//Per Devyn. This can't be documented in Figma so there is a comment with the Prototype mocks on the Quote page in Figma
+    text-underline-offset: 4px; //Per Devyn. This can't be documented in Figma so there is a comment with the Prototype mocks on the Quote page in Figma
     line-height: 2;
     padding: 0 0 4px 0;
     font-weight: 500;

From e684260e24f2e4fc0066561a03adfcf0c2be0dd4 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 27 Jan 2023 10:01:15 -0500
Subject: [PATCH 062/261] Fixed error issues with Address component, fixed
 spacing in modals

---
 src/digital-components/modal/modal.vue        | 13 ++--
 .../address-questions/address-questions.vue   | 52 ++++++++-----
 .../mobile-location-modal-questions.vue}      | 76 ++++++++++++++++---
 .../vehicle-protected-question.vue            | 53 +++++++++++++
 .../service-location/service-location.vue     | 21 +++--
 5 files changed, 172 insertions(+), 43 deletions(-)
 rename src/layouts/service-location/{mobile-location-modal-question/mobile-location-modal-question.vue => mobile-location-modal-questions/mobile-location-modal-questions.vue} (60%)
 create mode 100644 src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index ff02fb67c..acb545e52 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -17,7 +17,7 @@
                         data-bs-dismiss="modal"
                         aria-label="Close"></button>
                 </div>
-                <div class="modal-body ps-4 pe-4 pt-5 pb-4" v-if="showModalBody">
+                <div class="modal-body ps-5 pe-5 pt-5 pb-4" v-if="showModalBody">
                     <img :src="ModalImage" class="mw-100 d-flex mx-auto mb-4" alt="" />
                     <h5 class="mb-4" v-html="ModalHeadline"></h5>
                     <p class="fw-bold mb-2 subheader-text" v-html="ModalSubheadertext"></p>
@@ -62,12 +62,11 @@ export default {
     },
     data() {
         return {
-            myModal: null,
-        }        
+            modal: null,
+        };
     },
     mounted() {
-        this.myModal = new Modal(document.getElementById(this.cmsWidgetName));
-        
+        this.modal = new Modal(document.getElementById(this.cmsWidgetName));
     },
     computed: {
         ModalHeadline() {
@@ -97,10 +96,10 @@ export default {
             this.$refs.buttonMain.resetButtonStyle();
         },
         openModal() {
-            this.myModal.show();
+            this.modal.show();
         },
         closeModal() {
-            this.myModal.hide();
+            this.modal.hide();
         },
         async footerButtonClick() {
             if (this.footerButtonCallback) {
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 33d17b1e5..ff7fb0d9a 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -93,7 +93,6 @@ import { applicationConfig } from "@/constants/application-config.js";
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import { fill } from "lodash";
 
 // DEFINE VALIDATION RULES
 defineRule("street-address-required", required(errorMessages.STREET_ADDRESS_REQUIRED));
@@ -258,13 +257,17 @@ export default {
                     });
 
                     addressField1.addEventListener("keydown", (e) => {
-                        if (e.code === "Enter" || e.code === "NumpadEnter") {
+                        const autocomplete = document.getElementById("autocomplete");
+                        const event = new Event("place_changed");
+
+                        if (e.code === "Enter" || e.code === "NumpadEnter" || e.code === "Tab") {
                             const selectedItem = document.querySelector(
                                 ".pac-container .pac-item-selected"
                             );
                             if (selectedItem !== null) {
                                 // Fill-in the address using selected item in the list.
-                                fillInAddress(selectedItem);
+                                autocomplete.dispatchEvent(event);
+                                //fillInAddress(selectedItem.textContent);
                             } else {
                                 // Fill-in the address using first item in the list.
                                 fillInAddressUsingFirstItem();
@@ -274,23 +277,25 @@ export default {
                         }
                     });
 
-                    addressField1.addEventListener("change", () => {
-                        // If a match has been previously attempted then do nothing
-                        if (self.matchFound !== null) {
-                            return;
-                        }
+                    // addressField1.addEventListener("change", () => {
+                    //     // If a match has been previously attempted then do nothing
+                    //     if (self.matchFound !== null) {
+                    //         return;
+                    //     }
 
-                        // Get the address that the user clicked on (if any)
-                        const clickedAddress = document.querySelector(
-                            ".pac-container .pac-item:hover"
-                        );
+                    //     // Get the address that the user clicked on (if any)
+                    //     const clickedAddress = document.querySelector(
+                    //         ".pac-container .pac-item:hover"
+                    //     );
 
-                        // If the Street Address field changed without clicking (i.e. by pressing Tab, or clicking outside the field)
-                        if (clickedAddress === null) {
-                            // Fill-in the address using first item in the list.
-                            fillInAddressUsingFirstItem();
-                        }
-                    });
+                    //     // If the Street Address field changed without clicking (i.e. by pressing Tab, or clicking outside the field)
+                    //     if (clickedAddress === null) {
+                    //         // Fill-in the address using first item in the list.
+                    //         fillInAddressUsingFirstItem();
+                    //     }
+
+                    //     console.log("change");
+                    // });
 
                     function fillInAddressUsingFirstItem() {
                         // Fill-in the address using first item in the list.
@@ -315,6 +320,7 @@ export default {
                     }
 
                     function fillInAddress(place) {
+                        console.log("fillInAddress");
                         if (!place) {
                             place = autocomplete.getPlace();
                         }
@@ -322,8 +328,11 @@ export default {
                         if (place && place.address_components) {
                             self.matchFound = true;
 
-                            self.addressModel.streetAddress = "";
                             self.$nextTick(function () {
+                                //self.addressModel.streetAddress = "";
+
+                                //self.$nextTick();
+
                                 self.showAddressFields = true;
 
                                 for (const component of place.address_components) {
@@ -407,6 +416,11 @@ export default {
                 }
             },
         },
+        "addressModel.streetAddress": {
+            handler(newValue, oldValue) {
+                console.log(`I got changed from ${oldValue} to ${newValue}`);
+            },
+        },
     },
     components: {
         textboxQuestion,
diff --git a/src/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
similarity index 60%
rename from src/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question.vue
rename to src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index f3d83fe3b..7aea041e9 100644
--- a/src/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -12,7 +12,7 @@
                 linkType="text"
                 :text="this.mobileLocationDisplayText"
                 href="#!"
-                data-bs-toggle="modal"
+                @click-event="openModal"
                 :data-bs-target="getModalId"
                 aria-label="Modal window" />
         </div>
@@ -22,8 +22,13 @@
         :cmsWidgetName="this.modalWidgetName"
         :onModalOpenedCallback="onModalOpened"
         :footerButtonCallback="saveMobileLocationData">
-        <div class="ps-4 pe-4 pb-4">
-            <addressQuestions ref="addressQuestions" captureApartmentNumberOrBusinessName ="true" />
+        <div class="modal-body ps-5 pe-5 pt-5 pb-4">
+            <addressQuestions
+                ref="addressQuestions"
+                v-model="mobileQuestionModel.addressQuestions"
+                captureApartmentNumberOrBusinessName="true" />
+            <vehicleProtectedQuestion v-model="mobileQuestionModel.selectedValue"/>
+            <textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
         </div>
     </modal>
 </template>
@@ -32,28 +37,49 @@
 // Components
 import textLink from "@/ux-components/text-link/text-link";
 import modal from "@/digital-components/modal/modal";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
+import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
+import textBlock from "@/digital-components/text-block/text-block";
 
-//Supporting Files
+// Supporting Files
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import { isNoUnitNumericStyleProp } from "@vue/shared";
+import { storeActions } from "@/constants/store-actions.js";
+import baseMixin from "@/mixins/base-mixin.js";
+import TextBlock from '../../../digital-components/text-block/text-block.vue';
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
 defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
 
 export default {
-    name: "mobile-location-modal-question",
+    name: "mobile-location-modal-questions",
+    emits: ["update:modelValue"], // The component emits an event
     data() {
         return {
-
+            isVehicleProtectedAnswers: [],
         };
     },
     props: {
+        modelValue: {
+            type: Object,
+            default: () => ({
+                addressQuestions: {
+                    streetAddress: "",
+                    apartmentNumberOrBusinessName: "",
+                    city: "",
+                    state: "",
+                    zipCode: "",
+                },
+                isZipServiceableMobile: Boolean,
+                isZipServiceableInShop: Boolean,
+                isVehicleProtected: Boolean,
+            }),
+        },
         cmsWidgetName: String,
         modalWidgetName: String,
         textboxQuestionWidgetName: String,
@@ -61,7 +87,25 @@ export default {
         alertInvalidZipWidgetName: String,
     },
     methods: {
- 
+        loadInitialData() {
+            return baseMixin.methods.dispatchStoreAction(storeActions.GET_VEHICLE_YEARS, {});
+        },
+        initializeComponent(initialData) {
+            this.isVehicleProtectedAnswers = initialData;
+        },
+        openModal() {
+            this.$refs.mobileServiceModal.openModal();
+        },
+        closeModal() {
+            this.$refs.mobileServiceModal.closeModal();
+        },
+        focusOnZipInput() {
+            this.$nextTick(() => {
+                console.log(this.$refs);
+                const input = this.$refs.streetAddressField;
+                input.focus();
+            });
+        },
     },
     computed: {
         getModalId() {
@@ -71,17 +115,25 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "HeaderText");
         },
         mobileLocationDisplayText() {
-
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
-    },
-    mounted() {
+        mobileQuestionModel: {
+            get: function () {
+                return this.modelValue;
+            },
+            set: function (newValue) {
+                this.$emit("update:modelValue", newValue);
+            },
+        },
 
     },
+    mounted() {},
     components: {
         textLink,
         modal,
-        addressQuestions
+        addressQuestions,
+        vehicleProtectedQuestion,
+        textBlock
     },
 };
 </script>
diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
new file mode 100644
index 000000000..b8c795d5f
--- /dev/null
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
@@ -0,0 +1,53 @@
+<template>
+    <buttonQuestion
+        class="radioQuestion"
+        :questionText="questionText"
+        :answers="answers"
+        groupName="isVehicleProtected"
+        textPosition="text-center"
+        v-model="selectedValue"
+        isRequired />
+</template>
+
+<script>
+import buttonQuestion from "@/digital-components/button-question/button-question";
+// Supporting files
+import { storeActions } from "@/constants/store-actions.js";
+import baseMixin from "@/mixins/base-mixin.js";
+export default {
+    name: "vehicle-protected-question",
+    data() {
+        return {
+            answers: [ "Yes", "No" ],
+        };
+    },
+    props: {
+        modelValue: String,
+        cmsWidgetName: String,
+    },
+    components: {
+        buttonQuestion,
+    },
+    computed: {
+        questionText() {
+            return this.getCmsContent(this.cmsWidgetName, "QuestionText");
+        },
+        selectedValue: {
+            get: function () {
+                return this.modelValue;
+            },
+            set: function (newValue) {
+                this.$emit("update:modelValue", newValue);
+            },
+        },
+    },
+    methods: {
+        loadInitialData() {
+            return baseMixin.methods.dispatchStoreAction(storeActions.GET_VEHICLE_YEARS, {});
+        },
+        initializeComponent(initialData) {
+            this.years = initialData;
+        },
+    },
+};
+</script>
\ No newline at end of file
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 4d0a527c6..cece16fdd 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -10,10 +10,11 @@ fmg
                 textboxQuestionWidgetName="ServiceZipQuestionWidget"
                 alertNonServiceableZipWidgetName="AlertNonServiceableZipWidget"
                 alertInvalidZipWidgetName="AlertInvalidZipWidget" />
-            <mobileLocationModalQuestion
+            <mobileLocationModalQuestions
+                v-model="mobileLocationQuestion"
                 cmsWidgetName="MobileLocationModalWidget"
                 modalWidgetName="LocationModalWidget"
-                textboxQuestionWidgetName="MobileLocationQuestionWidget" />    
+                textboxQuestionWidgetName="MobileLocationQuestionWidget" />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 :isForwardActionDisabled="!meta.valid"
@@ -26,7 +27,7 @@ fmg
 <script>
 // Components
 import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question";
-import mobileLocationModalQuestion from "@/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question";
+import mobileLocationModalQuestions from "@/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions";
 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";
@@ -39,7 +40,17 @@ import { settleAllPromises } from "@/helpers/layout-helper";
 export default {
     name: "service-location",
     data() {
-        return {};
+        return {
+            mobileLocationQuestion: {
+                addressQuestions: {
+                    streetAddress: "",
+                    apartmentNumberOrBusinessName: "",
+                    city: "",
+                    state: "",
+                    zipCode: "",
+                },
+            },
+        };
     },
     async beforeRouteEnter(to, from, next) {
         // Call APIs
@@ -70,7 +81,7 @@ export default {
     },
     components: {
         serviceZipModalQuestion,
-        mobileLocationModalQuestion,
+        mobileLocationModalQuestions,
         funnelHeader,
         funnelFooter,
         funnelSubHeader,

From c54cf6e4a6a7196eaa3682780207c841829cf491 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 27 Jan 2023 10:10:43 -0500
Subject: [PATCH 063/261] CSR-1102 Match code to ISS and test flow.

---
 .../dropdown-question/dropdown-question.vue       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/digital-components/dropdown-question/dropdown-question.vue b/src/digital-components/dropdown-question/dropdown-question.vue
index e7c183e49..a94eb40c1 100644
--- a/src/digital-components/dropdown-question/dropdown-question.vue
+++ b/src/digital-components/dropdown-question/dropdown-question.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="dropdown-question" :class="errorMessage || hasError ? 'has-error' : ''">
+    <div class="dropdown-question" :class="(errors && errors.length) || hasError ? 'has-error' : ''">
         <label
             :for="inputId"
             :aria-label="questionText"
@@ -13,7 +13,9 @@
             :aria-disabled="isDisabled"
             :disabled="isDisabled"
             :aria-required="isRequired"
-            :validationRules="validationRules">
+            :validationRules="validationRules"
+            :placeHolderText="placeHolderText">
+            <option v-if="placeHolderText" value="" selected>{{ placeHolderText }}</option>
             <option v-for="(value, name, index) in options" :value="name" :key="index">
                 {{ value }}
             </option>
@@ -38,9 +40,11 @@ export default {
         },
         isDisabled: Boolean,
         isRequired: Boolean,
+        disableAutoFill: Boolean,
         validationRules: String,
         cmsWidgetName: String,
         hasError: Boolean,
+        placeHolderText: String
     },
     setup(props) {
         const propsClone = Object.assign({}, props);
@@ -52,7 +56,7 @@ export default {
                 initialValue = modelValue;
                 break;
             default:
-                initialValue = modelValue && modelValue.length > 0 ? modelValue : "";
+                initialValue = (modelValue && modelValue.length > 0) ? modelValue : "";
                 break;
         }
 
@@ -62,7 +66,7 @@ export default {
             initialValue: initialValue,
         };
 
-        const { errorMessage, handleBlur, handleChange, meta } = useField(
+        const {errorMessage, handleBlur, handleChange, meta, errors } = useField(
             props.inputId,
             props.validationRules,
             fieldOptions
@@ -73,6 +77,7 @@ export default {
             handleBlur,
             handleChange,
             meta,
+            errors
         };
     },
     computed: {
@@ -81,7 +86,7 @@ export default {
         },
         selectedOption: {
             get: function () {
-                return this.modelValue;
+                return !this.modelValue ? "" : this.modelValue;
             },
             set: function (newValue) {
                 this.$emit("update:modelValue", newValue);

From 2ebef867277fcc830614d34fdbc0a0fce8389090 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 27 Jan 2023 10:11:29 -0500
Subject: [PATCH 064/261] Format code.

---
 .../dropdown-question/dropdown-question.vue          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/digital-components/dropdown-question/dropdown-question.vue b/src/digital-components/dropdown-question/dropdown-question.vue
index a94eb40c1..bdc36a0d8 100644
--- a/src/digital-components/dropdown-question/dropdown-question.vue
+++ b/src/digital-components/dropdown-question/dropdown-question.vue
@@ -1,5 +1,7 @@
 <template>
-    <div class="dropdown-question" :class="(errors && errors.length) || hasError ? 'has-error' : ''">
+    <div
+        class="dropdown-question"
+        :class="(errors && errors.length) || hasError ? 'has-error' : ''">
         <label
             :for="inputId"
             :aria-label="questionText"
@@ -44,7 +46,7 @@ export default {
         validationRules: String,
         cmsWidgetName: String,
         hasError: Boolean,
-        placeHolderText: String
+        placeHolderText: String,
     },
     setup(props) {
         const propsClone = Object.assign({}, props);
@@ -56,7 +58,7 @@ export default {
                 initialValue = modelValue;
                 break;
             default:
-                initialValue = (modelValue && modelValue.length > 0) ? modelValue : "";
+                initialValue = modelValue && modelValue.length > 0 ? modelValue : "";
                 break;
         }
 
@@ -66,7 +68,7 @@ export default {
             initialValue: initialValue,
         };
 
-        const {errorMessage, handleBlur, handleChange, meta, errors } = useField(
+        const { errorMessage, handleBlur, handleChange, meta, errors } = useField(
             props.inputId,
             props.validationRules,
             fieldOptions
@@ -77,7 +79,7 @@ export default {
             handleBlur,
             handleChange,
             meta,
-            errors
+            errors,
         };
     },
     computed: {

From 2da19b8b47a9ee95727a78544dc69bb1dc6f122e Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Fri, 27 Jan 2023 10:28:46 -0500
Subject: [PATCH 065/261] CSR-1012 | created content-group-modal

---
 src/digital-components/modal/modal.vue        | 67 +++-----------
 .../content-group-modal.spec.js               |  3 +
 .../content-group-modal.vue                   | 88 +++++++++++++++++++
 .../service-location/service-location.vue     |  1 -
 .../service-zip-modal-question.vue            | 31 ++++---
 5 files changed, 119 insertions(+), 71 deletions(-)
 create mode 100644 src/fmg-components/content-group-modal/content-group-modal.spec.js
 create mode 100644 src/fmg-components/content-group-modal/content-group-modal.vue

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 6e8e7de07..a4efbba3e 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -3,7 +3,7 @@
     <div
         class="modal fade modal-component"
         v-on="{ 'hidden.bs.modal': resetButtonStyle, 'shown.bs.modal': onModalOpenedCallback }"
-        :id="cmsWidgetName"
+        :id="modalId"
         tabindex="-1"
         aria-labelledby="ModalComponentLabel"
         aria-hidden="true">
@@ -11,22 +11,12 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <button
-                        ref="modalXButton"
+                        ref="closeButton"
                         type="button"
                         class="btn-close"
                         data-bs-dismiss="modal"
                         aria-label="Close"></button>
                 </div>
-                <div class="modal-body ps-4 pe-4 pt-5 pb-4" v-if="showModalBody">
-                    <img :src="ModalImage" class="mw-100 d-flex mx-auto mb-4" alt="" />
-                    <h5 class="mb-4" v-html="ModalHeadline"></h5>
-                    <p class="fw-bold mb-2 subheader-text" v-html="ModalSubheadertext"></p>
-                    <p class="mb-0" v-html="ModalBodyText"></p>
-                    <p
-                        class="my-4 caption modal-sub-body"
-                        v-if="ModalSubBodyText"
-                        v-html="ModalSubBodyText"></p>
-                </div>
                 <slot></slot>
                 <div class="modal-footer px-5 py-4">
                     <buttonMain
@@ -34,8 +24,8 @@
                         class="w-100"
                         ref="buttonMain"
                         suppressLoader
-                        :buttonText="ModalCloseButtonText"
-                        @click-event="footerButtonClick" />
+                        :buttonText="footerButtonText"
+                        @click="$emit('footerButtonEvent')" />
                 </div>
             </div>
         </div>
@@ -49,66 +39,29 @@ import { Modal } from "bootstrap";
 export default {
     name: "modal",
     props: {
-        cmsWidgetName: String,
+        modalId: String,
+        footerButtonText: String,
         onModalOpenedCallback: {
             type: Function,
         },
-
-        footerButtonCallback: {
-            type: Function,
-            // return true to close modal
-            // if undefined, footer button closes modal
-        },
     },
     data() {
         return {
-            myModal: null,
+            modal: null,
         };
     },
     mounted() {
-        this.myModal = new Modal(document.getElementById(this.cmsWidgetName));
-    },
-    computed: {
-        ModalHeadline() {
-            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
-        },
-        ModalSubheadertext() {
-            return this.getCmsContent(this.cmsWidgetName, "SubheaderText");
-        },
-        ModalBodyText() {
-            return this.getCmsContent(this.cmsWidgetName, "BodyText");
-        },
-        ModalSubBodyText() {
-            return this.getCmsContent(this.cmsWidgetName, "BodyText2");
-        },
-        ModalImage() {
-            return this.getCmsContent(this.cmsWidgetName, "Image");
-        },
-        ModalCloseButtonText() {
-            return this.getCmsContent(this.cmsWidgetName, "FooterText");
-        },
-        showModalBody() {
-            return this.ModalBodyText;
-        },
+        this.modal = new Modal(document.getElementById(this.modalId));
     },
     methods: {
         resetButtonStyle() {
             this.$refs.buttonMain.resetButtonStyle();
         },
         openModal() {
-            this.myModal.show();
+            this.modal.show();
         },
         closeModal() {
-            this.myModal.hide();
-        },
-        async footerButtonClick() {
-            if (this.footerButtonCallback) {
-                if (await this.footerButtonCallback()) {
-                    this.closeModal();
-                }
-            } else {
-                this.closeModal();
-            }
+            this.modal.hide();
         },
     },
     components: {
diff --git a/src/fmg-components/content-group-modal/content-group-modal.spec.js b/src/fmg-components/content-group-modal/content-group-modal.spec.js
new file mode 100644
index 000000000..81946c2d0
--- /dev/null
+++ b/src/fmg-components/content-group-modal/content-group-modal.spec.js
@@ -0,0 +1,3 @@
+describe("content-group-modal.vue", () => {
+    test.todo("test this");
+});
diff --git a/src/fmg-components/content-group-modal/content-group-modal.vue b/src/fmg-components/content-group-modal/content-group-modal.vue
new file mode 100644
index 000000000..a446a01d0
--- /dev/null
+++ b/src/fmg-components/content-group-modal/content-group-modal.vue
@@ -0,0 +1,88 @@
+<template>
+    <modal
+        :ref="ModalName"
+        :modalId="ModalName"
+        :footerButtonText="ModalCloseButtonText"
+        @footer-button-event="footerButtonClick">
+        <div class="modal-body ps-4 pe-4 pt-5 pb-4">
+            <img :src="ModalImage" class="mw-100 d-flex mx-auto mb-4" alt="" />
+            <h5 class="mb-4" v-html="ModalHeadline"></h5>
+            <p class="fw-bold mb-2 subheader-text" v-html="ModalSubheadertext"></p>
+            <p class="mb-0" v-html="ModalBodyText"></p>
+            <p
+                class="my-4 caption modal-sub-body"
+                v-if="ModalSubBodyText"
+                v-html="ModalSubBodyText"></p>
+        </div>
+    </modal>
+</template>
+
+<script>
+import modal from "@/digital-components/modal/modal";
+
+export default {
+    name: "content-group-modal",
+    props: {
+        cmsWidgetName: String,
+    },
+    computed: {
+        ModalName() {
+            return this.cmsWidgetName;
+        },
+        ModalHeadline() {
+            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
+        },
+        ModalSubheadertext() {
+            return this.getCmsContent(this.cmsWidgetName, "SubheaderText");
+        },
+        ModalBodyText() {
+            return this.getCmsContent(this.cmsWidgetName, "BodyText");
+        },
+        ModalSubBodyText() {
+            return this.getCmsContent(this.cmsWidgetName, "BodyText2");
+        },
+        ModalImage() {
+            return this.getCmsContent(this.cmsWidgetName, "Image");
+        },
+        ModalCloseButtonText() {
+            return this.getCmsContent(this.cmsWidgetName, "FooterText");
+        },
+    },
+    methods: {
+        openModal() {
+            this.$refs[this.ModalName()].openModal();
+        },
+
+        footerButtonClick() {
+            this.$refs[this.ModalName()].closeModal();
+        },
+    },
+    components: {
+        modal,
+    },
+};
+</script>
+
+<style lang="scss">
+.modal {
+    &.modal-component {
+        .modal-dialog {
+            .modal-content {
+                .modal-body {
+                    .modal-sub-body {
+                        color: $gray-600;
+                    }
+                    ul {
+                        margin-bottom: 0;
+                    }
+                    p {
+                        &:last-child {
+                            margin-bottom: 0;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+</style>
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 418a1ec2e..872c8f4c0 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -6,7 +6,6 @@ fmg
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <serviceZipModalQuestion
                 cmsWidgetName="ServiceZipModalWidget"
-                modalWidgetName="ZipModalWidget"
                 textboxQuestionWidgetName="ServiceZipQuestionWidget"
                 alertNonServiceableZipWidgetName="AlertNonServiceableZipWidget"
                 alertInvalidZipWidgetName="AlertInvalidZipWidget" />
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 169281b71..e3b9a767a 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -17,10 +17,11 @@
         </div>
     </div>
     <modal
-        ref="zipCodeInputModal"
-        :cmsWidgetName="this.modalWidgetName"
-        :onModalOpenedCallback="onModalOpen"
-        :footerButtonCallback="setZip">
+        :ref="modalName"
+        :modalId="modalName"
+        :onModalOpenedCallback="onModalOpened"
+        :footerButtonText="footerButtonText"
+        @footer-button-event="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
                 ref="zipInputTextQuestion"
@@ -80,14 +81,13 @@ export default {
     },
     props: {
         cmsWidgetName: String,
-        modalWidgetName: String,
         textboxQuestionWidgetName: String,
         alertNonServiceableZipWidgetName: String,
         alertInvalidZipWidgetName: String,
     },
     methods: {
         openZipCodeModal() {
-            this.$refs.zipCodeInputModal.openModal();
+            this.$refs[this.modalName].openModal();
         },
         getZipFromStore() {
             return this.$store.getters.order.serviceLocation.zipCode;
@@ -104,7 +104,7 @@ export default {
 
         resetsOnZipInput() {
             this.resetAlerts();
-            this.$refs.zipCodeInputModal.resetButtonStyle();
+            this.$refs[this.modalName].resetButtonStyle();
         },
 
         focusOnZipInput() {
@@ -114,7 +114,7 @@ export default {
             });
         },
 
-        onModalOpen() {
+        onModalOpened() {
             this.serviceZipCodeInput = this.serviceZip;
             this.resetsOnZipInput();
             this.focusOnZipInput();
@@ -126,7 +126,7 @@ export default {
             const zipLength = 5;
             if (!this.serviceZipCodeInput || this.serviceZipCodeInput.length < zipLength) {
                 // prevent reading 1111 as 01111
-                return false;
+                return;
             }
 
             const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
@@ -139,14 +139,14 @@ export default {
                 this.serviceZip = this.serviceZipCodeInput;
                 this.serviceZipState = zipCodeData.state;
 
-                // close modal
-                return true;
+                this.$refs[this.modalName].closeModal();
             }
-
-            return false;
         },
     },
     computed: {
+        modalName() {
+            return this.cmsWidgetName;
+        },
         questionText() {
             return this.getCmsContent(this.cmsWidgetName, "HeaderText");
         },
@@ -154,6 +154,11 @@ export default {
             if (this.serviceZip && this.serviceZip != 0) {
                 return this.serviceZipState + ", " + this.serviceZip;
             }
+            return (
+                this.getCmsContent(this.cmsWidgetName, "SubheaderText") || "Enter your service ZIP"
+            );
+        },
+        footerButtonText() {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
         AlertNonServiceableZipHeader() {

From f31574e35657cd14dfb60ad2243f7a618a3f8eb9 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Fri, 27 Jan 2023 10:46:04 -0500
Subject: [PATCH 066/261] CSR-1012 | moved body padding into modal component

---
 src/digital-components/modal/modal.vue        |  4 +++-
 .../content-group-modal.vue                   | 18 +++++++--------
 .../mobile-location-modal-questions.vue       | 22 ++++++++++---------
 .../service-zip-modal-question.vue            |  2 --
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index a4efbba3e..a2151215a 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -17,7 +17,9 @@
                         data-bs-dismiss="modal"
                         aria-label="Close"></button>
                 </div>
-                <slot></slot>
+                <div class="modal-body ps-5 pe-5 pt-5 pb-4">
+                    <slot></slot>
+                </div>
                 <div class="modal-footer px-5 py-4">
                     <buttonMain
                         isPrimary
diff --git a/src/fmg-components/content-group-modal/content-group-modal.vue b/src/fmg-components/content-group-modal/content-group-modal.vue
index a446a01d0..ab0bdee86 100644
--- a/src/fmg-components/content-group-modal/content-group-modal.vue
+++ b/src/fmg-components/content-group-modal/content-group-modal.vue
@@ -4,16 +4,14 @@
         :modalId="ModalName"
         :footerButtonText="ModalCloseButtonText"
         @footer-button-event="footerButtonClick">
-        <div class="modal-body ps-4 pe-4 pt-5 pb-4">
-            <img :src="ModalImage" class="mw-100 d-flex mx-auto mb-4" alt="" />
-            <h5 class="mb-4" v-html="ModalHeadline"></h5>
-            <p class="fw-bold mb-2 subheader-text" v-html="ModalSubheadertext"></p>
-            <p class="mb-0" v-html="ModalBodyText"></p>
-            <p
-                class="my-4 caption modal-sub-body"
-                v-if="ModalSubBodyText"
-                v-html="ModalSubBodyText"></p>
-        </div>
+        <img :src="ModalImage" class="mw-100 d-flex mx-auto mb-4" alt="" />
+        <h5 class="mb-4" v-html="ModalHeadline"></h5>
+        <p class="fw-bold mb-2 subheader-text" v-html="ModalSubheadertext"></p>
+        <p class="mb-0" v-html="ModalBodyText"></p>
+        <p
+            class="my-4 caption modal-sub-body"
+            v-if="ModalSubBodyText"
+            v-html="ModalSubBodyText"></p>
     </modal>
 </template>
 
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 7aea041e9..3a82b0362 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -19,17 +19,16 @@
     </div>
     <modal
         ref="mobileServiceModal"
-        :cmsWidgetName="this.modalWidgetName"
+        :modalId="this.modalWidgetName"
         :onModalOpenedCallback="onModalOpened"
-        :footerButtonCallback="saveMobileLocationData">
-        <div class="modal-body ps-5 pe-5 pt-5 pb-4">
-            <addressQuestions
-                ref="addressQuestions"
-                v-model="mobileQuestionModel.addressQuestions"
-                captureApartmentNumberOrBusinessName="true" />
-            <vehicleProtectedQuestion v-model="mobileQuestionModel.selectedValue"/>
-            <textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
-        </div>
+        :footerButtonText="mobileLocationDisplayText"
+        @footer-button-event="saveMobileLocationData">
+        <addressQuestions
+            ref="addressQuestions"
+            v-model="mobileQuestionModel.addressQuestions"
+            captureApartmentNumberOrBusinessName="true" />
+        <vehicleProtectedQuestion v-model="mobileQuestionModel.selectedValue"/>
+        <textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
     </modal>
 </template>
 
@@ -106,6 +105,9 @@ export default {
                 input.focus();
             });
         },
+        saveMobileLocationData() {
+
+        },
     },
     computed: {
         getModalId() {
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index e3b9a767a..478ac8766 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -22,7 +22,6 @@
         :onModalOpenedCallback="onModalOpened"
         :footerButtonText="footerButtonText"
         @footer-button-event="setZip">
-        <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
                 ref="zipInputTextQuestion"
                 :cmsWidgetName="this.textboxQuestionWidgetName"
@@ -48,7 +47,6 @@
                 :manualHeadline="AlertNonServiceableZipHeader"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
-        </div>
     </modal>
 </template>
 

From 734f3d6643e548055359d4f93ec0f4873d7c30fa Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 12 Jan 2023 11:20:43 -0500
Subject: [PATCH 067/261] CSR-1012 | service zip modal question

new component service-zip-modal-question added to the service-location page
---
 src/digital-components/modal/modal.vue        |  28 +++-
 .../service-location/service-location.vue     |  13 +-
 .../service-zip-modal-question.spec.js        |   3 +
 .../service-zip-modal-question.vue            | 157 ++++++++++++++++++
 4 files changed, 193 insertions(+), 8 deletions(-)
 create mode 100644 src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
 create mode 100644 src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 7de269644..f8c5e01e5 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -11,12 +11,13 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <button
+                        ref="modalXButton"
                         type="button"
                         class="btn-close"
                         data-bs-dismiss="modal"
                         aria-label="Close"></button>
                 </div>
-                <div class="modal-body ps-4 pe-4 pt-5 pb-4">
+                <div class="modal-body ps-4 pe-4 pt-5 pb-4" v-if="showModalBody">
                     <img :src="ModalImage" class="mw-100 d-flex mx-auto mb-4" alt="" />
                     <h5 class="mb-4" v-html="ModalHeadline"></h5>
                     <p class="fw-bold mb-2 subheader-text" v-html="ModalSubheadertext"></p>
@@ -26,6 +27,7 @@
                         v-if="ModalSubBodyText"
                         v-html="ModalSubBodyText"></p>
                 </div>
+                <slot></slot>
                 <div class="modal-footer px-5 py-4">
                     <buttonMain
                         isPrimary
@@ -33,8 +35,7 @@
                         ref="buttonMain"
                         suppressLoader
                         :buttonText="ModalCloseButtonText"
-                        @click-event="buttonClick"
-                        data-bs-dismiss="modal" />
+                        @click-event="buttonMainClick" />
                 </div>
             </div>
         </div>
@@ -48,6 +49,9 @@ export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
+        buttonClick: {
+            type: Function,
+        },
     },
     computed: {
         ModalHeadline() {
@@ -68,11 +72,29 @@ export default {
         ModalCloseButtonText() {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
+        showModalBody() {
+            return (
+                this.ModalImage ||
+                this.ModalHeadline ||
+                this.ModalSubheadertext ||
+                this.ModalBodyText
+            );
+        },
     },
     methods: {
         resetButtonStyle() {
             this.$refs.buttonMain.resetButtonStyle();
         },
+        closeModal() {
+            this.$refs.modalXButton.click();
+        },
+        buttonMainClick() {
+            if (this.buttonClick) {
+                this.buttonClick();
+            } else {
+                this.closeModal();
+            }
+        },
     },
     components: {
         buttonMain,
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index e29ebdb5e..aa32c1921 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -4,6 +4,7 @@ fmg
         <div class="page-container-grouped-styles">
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
+            <serviceZipModalQuestion />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 :isForwardActionDisabled="!meta.valid"
@@ -15,12 +16,13 @@ fmg
 
 <script>
 // Components
-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 { Form } from "vee-validate";
+import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question";
+import funnelHeader from "@/common-components/funnel-header/funnel-header";
+import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
+import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
 
-// Supporting files
+//Supporting Files
+import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 
@@ -57,6 +59,7 @@ export default {
         forwardButtonAction() {},
     },
     components: {
+        serviceZipModalQuestion,
         funnelHeader,
         funnelFooter,
         funnelSubHeader,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
new file mode 100644
index 000000000..a81727c73
--- /dev/null
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -0,0 +1,3 @@
+describe("service-zip-modal-question.vue", () => {
+    test.todo("test this");
+});
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
new file mode 100644
index 000000000..0397609aa
--- /dev/null
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -0,0 +1,157 @@
+<template>
+    <div class="text-center">
+        <label
+            :for="serviceZipCodeInput"
+            :aria-label="questionText"
+            class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
+            :class="[questionAlignment === 'center' ? 'text-center w-100 mb-5' : '']"
+            v-html="questionText"></label>
+        <div class="update-zip-text-link">
+            <textLink
+                linkType="text"
+                :text="this.serviceZipDisplayText"
+                href="#!"
+                data-bs-toggle="modal"
+                data-bs-target="#ZipModal"
+                aria-label="Modal window" />
+        </div>
+    </div>
+    <modal ref="zipCodeInputModal" cmsWidgetName="ZipModal" :buttonClick="setZip">
+        <div class="ps-4 pe-4 pb-4">
+            <textboxQuestion
+                cmsWidgetName="ServiceZipQuestionWidget"
+                v-model="serviceZipCodeInput"
+                inputId="serviceZipCodeInput"
+                questionAlignment="center"
+                mask="#####"
+                isRequired
+                disableAutoFill
+                validationRules="zip-required|zip-format" />
+            <alert
+                ref="alertInvalidZip"
+                v-if="displayInvalidZipAlert"
+                class="my-4"
+                cmsWidgetName="AlertInvalidZipWidget"
+                alertClass="alert-danger"
+                v-bind:isDismissible="false" />
+            <alert
+                ref="alertNonServiceableZip"
+                v-if="displayNonServiceableZipAlert"
+                class="my-4"
+                cmsWidgetName="AlertNonServiceableZipWidget"
+                :manualHeadline="AlertNonServiceableZipHeader"
+                alertClass="alert-danger"
+                v-bind:isDismissible="false" />
+        </div>
+    </modal>
+</template>
+
+<script>
+// Components
+import textLink from "@/ux-components/text-link/text-link";
+import modal from "@/common-components/modal/modal";
+import alert from "@/ux-components/alert/alert";
+import textboxQuestion from "@/common-components/textbox-question/textbox-question";
+
+//Supporting Files
+import { defineRule } from "vee-validate";
+import { required, regex } from "@/helpers/validation-rules";
+import { errorMessages } from "@/constants/error-messages";
+import store from "@/store";
+import baseMixin from "@/mixins/base-mixin";
+
+// Define Validation Rules
+defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
+defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
+
+export default {
+    name: "service-zip-modal-question",
+    data() {
+        return {
+            serviceZip: this.getZipFromStore(),
+            serviceZipState: this.getZipStateFromStore(),
+            serviceZipCodeInput: this.getZipFromStore(),
+            displayInvalidZipAlert: false,
+            displayNonServiceableZipAlert: false,
+        };
+    },
+    props: {
+        cmsWidgetName: String,
+    },
+    methods: {
+        getZipFromStore() {
+            return store.getters.order.serviceLocation.zipCode;
+        },
+
+        getZipStateFromStore() {
+            return store.getters.order.serviceLocation.state;
+        },
+
+        resetAlerts() {
+            this.displayInvalidZipAlert = false;
+            this.displayNonServiceableZipAlert = false;
+        },
+
+        async setZip() {
+            this.resetAlerts();
+
+            const zipLength = 5;
+            if (this.serviceZipCodeInput.length < zipLength) {
+                // prevent reading 1111 as 01111
+                return;
+            }
+
+            const zipCodeData = await baseMixin.methods.getZipCodeData(this.serviceZipCodeInput);
+
+            if (!zipCodeData.isValid) {
+                this.displayInvalidZipAlert = true;
+            } else if (!zipCodeData.isServiceable) {
+                this.displayNonServiceableZipAlert = true;
+            } else {
+                this.serviceZip = this.serviceZipCodeInput;
+                this.serviceZipState = zipCodeData.state;
+
+                this.$refs.zipCodeInputModal.closeModal();
+            }
+        },
+    },
+    computed: {
+        questionText() {
+            return this.getCmsContent("LocationQuestionWidget", "QuestionText");
+        },
+        serviceZipDisplayText() {
+            if (this.serviceZip && this.serviceZip != 0) {
+                return this.serviceZipState + ", " + this.serviceZip;
+            }
+            return this.getCmsContent("ZipPlaceholderText", "QuestionText");
+        },
+        AlertNonServiceableZipHeader() {
+            const zipCode = this.serviceZipCodeInput;
+            const text = this.getCmsContent(
+                "AlertNonServiceableZipWidget",
+                "HeadlineText"
+            ).replaceAll("{custom:serviceZipCodeInput}", zipCode);
+            return text;
+        },
+    },
+    components: {
+        textLink,
+        modal,
+        alert,
+        textboxQuestion,
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.update-zip-text-link::before {
+    content: "";
+    display: inline-block;
+    width: 13px;
+    height: 16px;
+    background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 13 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.49635 1.00142e-07C5.64734 -0.000153295 4.80722 0.175918 4.0274 0.517444C3.24757 0.858969 2.54443 1.35877 1.96099 1.98626C0.765713 3.27588 0.0999756 4.98141 0.0999756 6.75394C0.0999756 8.52646 0.765713 10.232 1.96099 11.5216L5.98324 15.777C6.04954 15.8475 6.12918 15.9036 6.21736 15.9419C6.30555 15.9802 6.40045 16 6.49635 16C6.59225 16 6.68716 15.9802 6.77534 15.9419C6.86353 15.9036 6.94317 15.8475 7.00946 15.777L11.0317 11.52C12.2391 10.2383 12.909 8.52914 12.8999 6.75394C12.9094 4.97818 12.2394 3.26832 11.0317 1.98626C10.4481 1.35899 9.74493 0.859347 8.96514 0.517839C8.18535 0.176331 7.34532 0.000130509 6.49635 1.00142e-07V1.00142e-07ZM6.49635 9.13131C6.02507 9.13131 5.56437 8.98913 5.17251 8.72275C4.78065 8.45637 4.47524 8.07776 4.29488 7.63479C4.11453 7.19181 4.06734 6.70438 4.15928 6.23412C4.25123 5.76387 4.47817 5.33191 4.81142 4.99287C5.14467 4.65384 5.56925 4.42295 6.03148 4.32941C6.49371 4.23587 6.97282 4.28388 7.40823 4.46736C7.84364 4.65085 8.21579 4.96157 8.47762 5.36023C8.73945 5.7589 8.87921 6.2276 8.87921 6.70707C8.87921 7.34974 8.62837 7.96611 8.18185 8.4207C7.73532 8.87528 7.12964 9.13088 6.49794 9.13131H6.49635Z' fill='%231574A1'/%3E%3C/svg%3E%0A");
+    background-size: contain;
+    vertical-align: middle;
+    margin-right: 0.5em;
+}
+</style>

From 48f71c5a7d0d9e4366f5d29e12ecbf2e138f1f9e Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Wed, 18 Jan 2023 12:27:33 -0500
Subject: [PATCH 068/261] CSR-1012 | file path updates

---
 src/layouts/service-location/service-location.vue         | 6 +++---
 .../service-zip-modal-question.vue                        | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index aa32c1921..4f8230456 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -17,9 +17,9 @@ fmg
 <script>
 // Components
 import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question";
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+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";
 
 //Supporting Files
 import { Form } from "vee-validate";
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 0397609aa..fa49f50d0 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -48,10 +48,10 @@
 
 <script>
 // Components
-import textLink from "@/ux-components/text-link/text-link";
-import modal from "@/common-components/modal/modal";
-import alert from "@/ux-components/alert/alert";
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
+import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import modal from "@/digital-components/modal/modal";
+import alert from "@/fmg-components/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 
 //Supporting Files
 import { defineRule } from "vee-validate";

From 2118117c1223f944f281d02b91917ce9d896c18c Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 19 Jan 2023 13:08:56 -0500
Subject: [PATCH 069/261] CSR-1012 | service zip cms refactor

---
 .../service-location/service-location.vue     |  7 ++-
 .../service-zip-modal-question.vue            | 50 ++++++++++---------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 4f8230456..418a1ec2e 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -4,7 +4,12 @@ fmg
         <div class="page-container-grouped-styles">
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
-            <serviceZipModalQuestion />
+            <serviceZipModalQuestion
+                cmsWidgetName="ServiceZipModalWidget"
+                modalWidgetName="ZipModalWidget"
+                textboxQuestionWidgetName="ServiceZipQuestionWidget"
+                alertNonServiceableZipWidgetName="AlertNonServiceableZipWidget"
+                alertInvalidZipWidgetName="AlertInvalidZipWidget" />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 :isForwardActionDisabled="!meta.valid"
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index fa49f50d0..9713c8156 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -12,14 +12,14 @@
                 :text="this.serviceZipDisplayText"
                 href="#!"
                 data-bs-toggle="modal"
-                data-bs-target="#ZipModal"
+                :data-bs-target="getModalId"
                 aria-label="Modal window" />
         </div>
     </div>
-    <modal ref="zipCodeInputModal" cmsWidgetName="ZipModal" :buttonClick="setZip">
+    <modal ref="zipCodeInputModal" :cmsWidgetName="this.modalWidgetName" :buttonClick="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
-                cmsWidgetName="ServiceZipQuestionWidget"
+                :cmsWidgetName="this.textboxQuestionWidgetName"
                 v-model="serviceZipCodeInput"
                 inputId="serviceZipCodeInput"
                 questionAlignment="center"
@@ -31,15 +31,15 @@
                 ref="alertInvalidZip"
                 v-if="displayInvalidZipAlert"
                 class="my-4"
-                cmsWidgetName="AlertInvalidZipWidget"
+                :cmsWidgetName="this.alertInvalidZipWidgetName"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
             <alert
                 ref="alertNonServiceableZip"
                 v-if="displayNonServiceableZipAlert"
                 class="my-4"
-                cmsWidgetName="AlertNonServiceableZipWidget"
-                :manualHeadline="AlertNonServiceableZipHeader"
+                :cmsWidgetName="this.alertNonServiceableZipWidgetName"
+                :manualHeadline="this.invalidAlertHeader"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
         </div>
@@ -48,17 +48,15 @@
 
 <script>
 // Components
-import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import textLink from "@/ux-components/text-link/text-link";
 import modal from "@/digital-components/modal/modal";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 
 //Supporting Files
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import store from "@/store";
-import baseMixin from "@/mixins/base-mixin";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -73,18 +71,23 @@ export default {
             serviceZipCodeInput: this.getZipFromStore(),
             displayInvalidZipAlert: false,
             displayNonServiceableZipAlert: false,
+            invalidAlertHeader: null,
         };
     },
     props: {
         cmsWidgetName: String,
+        modalWidgetName: String,
+        textboxQuestionWidgetName: String,
+        alertNonServiceableZipWidgetName: String,
+        alertInvalidZipWidgetName: String,
     },
     methods: {
         getZipFromStore() {
-            return store.getters.order.serviceLocation.zipCode;
+            return this.$store.getters.order.serviceLocation.zipCode;
         },
 
         getZipStateFromStore() {
-            return store.getters.order.serviceLocation.state;
+            return this.$store.getters.order.serviceLocation.state;
         },
 
         resetAlerts() {
@@ -96,16 +99,20 @@ export default {
             this.resetAlerts();
 
             const zipLength = 5;
-            if (this.serviceZipCodeInput.length < zipLength) {
+            if (!this.serviceZipCodeInput || this.serviceZipCodeInput.length < zipLength) {
                 // prevent reading 1111 as 01111
                 return;
             }
 
-            const zipCodeData = await baseMixin.methods.getZipCodeData(this.serviceZipCodeInput);
+            const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
             } else if (!zipCodeData.isServiceable) {
+                this.invalidAlertHeader = this.getCmsContent(
+                    this.alertNonServiceableZipWidgetName,
+                    "HeadlineText"
+                ).replaceAll("{custom:serviceZipCodeInput}", this.serviceZipCodeInput);
                 this.displayNonServiceableZipAlert = true;
             } else {
                 this.serviceZip = this.serviceZipCodeInput;
@@ -116,22 +123,17 @@ export default {
         },
     },
     computed: {
+        getModalId() {
+            return "#" + this.modalWidgetName;
+        },
         questionText() {
-            return this.getCmsContent("LocationQuestionWidget", "QuestionText");
+            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
         },
         serviceZipDisplayText() {
             if (this.serviceZip && this.serviceZip != 0) {
                 return this.serviceZipState + ", " + this.serviceZip;
             }
-            return this.getCmsContent("ZipPlaceholderText", "QuestionText");
-        },
-        AlertNonServiceableZipHeader() {
-            const zipCode = this.serviceZipCodeInput;
-            const text = this.getCmsContent(
-                "AlertNonServiceableZipWidget",
-                "HeadlineText"
-            ).replaceAll("{custom:serviceZipCodeInput}", zipCode);
-            return text;
+            return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
     },
     components: {

From acf46987984409d683093409e3ee4d97fdc5b8f2 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 19 Jan 2023 13:35:38 -0500
Subject: [PATCH 070/261] CSR-1012 | reset modal on text input

added prop to textbox-question to fire custom function on text updates
---
 .../textbox-question/textbox-question.vue     |  2 ++
 .../service-zip-modal-question.vue            | 23 +++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index a19823b0d..e97402bb3 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -70,6 +70,7 @@ export default {
         questionAlignment: String, // Left or center. Left is default.
         cornerStyle: String, // Rounded or square. Square is default.
         includeSearchIcon: Boolean,
+        customOnChange: Function,
     },
     setup(props) {
         const propsClone = Object.assign({}, props);
@@ -145,6 +146,7 @@ export default {
     },
     watch: {
         async value(newValue) {
+            this.customOnChange();
             const result = await validate(newValue, this.validationRules); // do a test validation check, without triggering full validation
             if (result.valid) {
                 this.handleChange(newValue); // trigger full validation on this field only
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 9713c8156..710514966 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -26,7 +26,8 @@
                 mask="#####"
                 isRequired
                 disableAutoFill
-                validationRules="zip-required|zip-format" />
+                validationRules="zip-required|zip-format" 
+                :customOnChange="this.resetsOnZipInput" />
             <alert
                 ref="alertInvalidZip"
                 v-if="displayInvalidZipAlert"
@@ -39,7 +40,7 @@
                 v-if="displayNonServiceableZipAlert"
                 class="my-4"
                 :cmsWidgetName="this.alertNonServiceableZipWidgetName"
-                :manualHeadline="this.invalidAlertHeader"
+                :manualHeadline="AlertNonServiceableZipHeader"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
         </div>
@@ -71,7 +72,6 @@ export default {
             serviceZipCodeInput: this.getZipFromStore(),
             displayInvalidZipAlert: false,
             displayNonServiceableZipAlert: false,
-            invalidAlertHeader: null,
         };
     },
     props: {
@@ -95,6 +95,11 @@ export default {
             this.displayNonServiceableZipAlert = false;
         },
 
+        resetsOnZipInput() {
+            this.resetAlerts();
+            this.$refs.zipCodeInputModal.resetButtonStyle();
+        },
+
         async setZip() {
             this.resetAlerts();
 
@@ -109,10 +114,6 @@ export default {
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
             } else if (!zipCodeData.isServiceable) {
-                this.invalidAlertHeader = this.getCmsContent(
-                    this.alertNonServiceableZipWidgetName,
-                    "HeadlineText"
-                ).replaceAll("{custom:serviceZipCodeInput}", this.serviceZipCodeInput);
                 this.displayNonServiceableZipAlert = true;
             } else {
                 this.serviceZip = this.serviceZipCodeInput;
@@ -135,6 +136,14 @@ export default {
             }
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
+        AlertNonServiceableZipHeader() {
+            const zipCode = this.serviceZipCodeInput;
+            const text = this.getCmsContent(
+                "AlertNonServiceableZipWidget",
+                "HeadlineText"
+            ).replaceAll("{custom:serviceZipCodeInput}", zipCode);
+            return text;
+        },
     },
     components: {
         textLink,

From 57065eed87c2d0893e0e96910690d1e80b6e4f2c Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Mon, 23 Jan 2023 13:23:30 -0500
Subject: [PATCH 071/261] CSR-1012 refactor hide alerts on text input

---
 .../textbox-question/textbox-question.vue          |  2 --
 .../service-zip-modal-question.vue                 | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index e97402bb3..a19823b0d 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -70,7 +70,6 @@ export default {
         questionAlignment: String, // Left or center. Left is default.
         cornerStyle: String, // Rounded or square. Square is default.
         includeSearchIcon: Boolean,
-        customOnChange: Function,
     },
     setup(props) {
         const propsClone = Object.assign({}, props);
@@ -146,7 +145,6 @@ export default {
     },
     watch: {
         async value(newValue) {
-            this.customOnChange();
             const result = await validate(newValue, this.validationRules); // do a test validation check, without triggering full validation
             if (result.valid) {
                 this.handleChange(newValue); // trigger full validation on this field only
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 710514966..68f30abff 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -19,6 +19,7 @@
     <modal ref="zipCodeInputModal" :cmsWidgetName="this.modalWidgetName" :buttonClick="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
+                ref="zipInputTextQuestion"
                 :cmsWidgetName="this.textboxQuestionWidgetName"
                 v-model="serviceZipCodeInput"
                 inputId="serviceZipCodeInput"
@@ -26,8 +27,7 @@
                 mask="#####"
                 isRequired
                 disableAutoFill
-                validationRules="zip-required|zip-format" 
-                :customOnChange="this.resetsOnZipInput" />
+                validationRules="zip-required|zip-format" />
             <alert
                 ref="alertInvalidZip"
                 v-if="displayInvalidZipAlert"
@@ -145,6 +145,16 @@ export default {
             return text;
         },
     },
+    mounted() {
+        this.$watch(
+            () => {
+                return this.$refs.zipInputTextQuestion.value;
+            },
+            (val) => {
+                this.resetsOnZipInput();
+            }
+        );
+    },
     components: {
         textLink,
         modal,

From 8f35e631c4c085b61894474277575b3981504859 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Mon, 23 Jan 2023 14:59:31 -0500
Subject: [PATCH 072/261] CSR-1012 | modal footer button updates

---
 src/digital-components/modal/modal.vue        | 22 +++++++++----------
 .../service-zip-modal-question.vue            | 12 +++++++---
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index f8c5e01e5..da1fc8c26 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -35,7 +35,7 @@
                         ref="buttonMain"
                         suppressLoader
                         :buttonText="ModalCloseButtonText"
-                        @click-event="buttonMainClick" />
+                        @click-event="footerButtonClick" />
                 </div>
             </div>
         </div>
@@ -49,8 +49,11 @@ export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
-        buttonClick: {
+
+        footerButtonCallback: {
             type: Function,
+            // return true to close modal
+            // if undefined, footer button closes modal
         },
     },
     computed: {
@@ -73,12 +76,7 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
         showModalBody() {
-            return (
-                this.ModalImage ||
-                this.ModalHeadline ||
-                this.ModalSubheadertext ||
-                this.ModalBodyText
-            );
+            return this.ModalBodyText;
         },
     },
     methods: {
@@ -88,9 +86,11 @@ export default {
         closeModal() {
             this.$refs.modalXButton.click();
         },
-        buttonMainClick() {
-            if (this.buttonClick) {
-                this.buttonClick();
+        async footerButtonClick() {
+            if (this.footerButtonCallback) {
+                if (await this.footerButtonCallback()) {
+                    this.closeModal();
+                }
             } else {
                 this.closeModal();
             }
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 68f30abff..1c9edd563 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -16,7 +16,10 @@
                 aria-label="Modal window" />
         </div>
     </div>
-    <modal ref="zipCodeInputModal" :cmsWidgetName="this.modalWidgetName" :buttonClick="setZip">
+    <modal
+        ref="zipCodeInputModal"
+        :cmsWidgetName="this.modalWidgetName"
+        :footerButtonCallback="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
                 ref="zipInputTextQuestion"
@@ -106,7 +109,7 @@ export default {
             const zipLength = 5;
             if (!this.serviceZipCodeInput || this.serviceZipCodeInput.length < zipLength) {
                 // prevent reading 1111 as 01111
-                return;
+                return false;
             }
 
             const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
@@ -119,8 +122,11 @@ export default {
                 this.serviceZip = this.serviceZipCodeInput;
                 this.serviceZipState = zipCodeData.state;
 
-                this.$refs.zipCodeInputModal.closeModal();
+                // close modal
+                return true;
             }
+
+            return false;
         },
     },
     computed: {

From 205b63556ecb10d121f46e8c04eecaa1dc5c88d1 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 24 Jan 2023 10:42:58 -0500
Subject: [PATCH 073/261] Added additional field for apartment number or
 business name

---
 .../address-questions.spec.js                 | 72 +++++++++++++++++++
 .../address-questions/address-questions.vue   | 23 +++++-
 2 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
index cf620b15f..2015997d4 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
@@ -58,6 +58,78 @@ describe("address-questions.vue", () => {
             expect(state.exists()).toBe(true);
             expect(zipCode.exists()).toBe(true);
         });
+         
+        test("Should render apartmentNumberOrBusinessName textbox-question when captureApartmentNumberOrBusinessName = true", async () => {
+            // Arrange
+            const { wrapper } = setupMocks({
+                props: {
+                    modelValue: {
+                        streetAddress: "",
+                        apartmentNumberOrBusinessName: "",
+                        city: "",
+                        state: "",
+                        zipCode: "",                       
+                    },
+                    captureApartmentNumberOrBusinessName: true
+                },
+            });
+
+            await wrapper.setData({
+                showAddressFields: true
+            });
+
+            // Act
+            const streetAddress = wrapper.findComponent({ ref: "autocomplete" });
+            const apartmentNumberOrBusinessName = wrapper.findComponent({ ref: "apartmentNumberOrBusinessName" });
+            const city = wrapper.findComponent({ ref: "city" });
+            const state = wrapper.findComponent({ ref: "state" });
+            const zipCode = wrapper.findComponent({ ref: "zipCode" });
+
+            // Assert
+            expect(streetAddress.exists()).toBe(true);
+            expect(apartmentNumberOrBusinessName.exists()).toBe(true);
+            expect(apartmentNumberOrBusinessName.isVisible()).toBe(true);
+            expect(city.exists()).toBe(true);
+            expect(state.exists()).toBe(true);
+            expect(zipCode.exists()).toBe(true);
+
+        });  
+           
+        test("Should *not* render apartmentNumberOrBusinessName textbox-question when captureApartmentNumberOrBusinessName = false", async () => {
+            // Arrange
+            const { wrapper } = setupMocks({
+                props: {
+                    modelValue: {
+                        streetAddress: "",
+                        apartmentNumberOrBusinessName: "",
+                        city: "",
+                        state: "",
+                        zipCode: "",                       
+                    },
+                    captureApartmentNumberOrBusinessName: false
+                },
+            });
+
+            await wrapper.setData({
+                showAddressFields: true
+            });
+
+            // Act
+            const streetAddress = wrapper.findComponent({ ref: "autocomplete" });
+            const apartmentNumberOrBusinessName = wrapper.findComponent({ ref: "apartmentNumberOrBusinessName" });
+            const city = wrapper.findComponent({ ref: "city" });
+            const state = wrapper.findComponent({ ref: "state" });
+            const zipCode = wrapper.findComponent({ ref: "zipCode" });
+
+            // Assert
+            expect(streetAddress.exists()).toBe(true);
+            expect(apartmentNumberOrBusinessName.exists()).toBe(true);
+            expect(apartmentNumberOrBusinessName.isVisible()).toBe(false);
+            expect(city.exists()).toBe(true);
+            expect(state.exists()).toBe(true);
+            expect(zipCode.exists()).toBe(true);
+
+        }); 
 
         test("Should set this.showAddressFields to true when the model is prepopulated", async () => {
             // Arrange
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 23bc9280c..daae3ad2c 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -16,6 +16,18 @@
                     @keydown.enter.prevent />
             </div>
         </div>
+        <transition name="fade" mode="out-in">
+            <div class="row mb-4" v-show="showAddressFields && showApartmentNumberOrBusinessNameField" aria-live="polite">
+                <div class="col">
+                    <textboxQuestion
+                        cmsWidgetName="ApartmentNumberOrBusinessNameQuestionWidget"
+                        v-model="addressModel.apartmentNumberOrBusinessName"
+                        ref="apartmentNumberOrBusinessName"
+                        inputId="639b0aaa35f64609ad6995f86a74322b"
+                        disableAutoFill />
+                </div>
+            </div>
+        </transition>
         <transition name="fade" mode="out-in">
             <div class="row mb-4" v-show="showAddressFields" aria-live="polite">
                 <div class="col">
@@ -95,12 +107,14 @@ export default {
             type: Object,
             default: () => ({
                 streetAddress: "",
+                apartmentNumberOrBusinessName: "",
                 city: "",
                 state: "",
-                zipCode: "",
+                zipCode: "",         
             }),
-        },
+        },       
         validationRules: String,
+        captureApartmentNumberOrBusinessName: false,
     },
     data() {
         return {
@@ -180,6 +194,11 @@ export default {
                 this.$emit("update:modelValue", newValue);
             },
         },
+        showApartmentNumberOrBusinessNameField: {
+            get: function () {
+                return this.captureApartmentNumberOrBusinessName;
+            },
+        }
     },
     methods: {
         setupAddressLookup() {

From 9c89b89cd163b2afe6b65208130c8fab0c339202 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Tue, 24 Jan 2023 14:25:20 -0500
Subject: [PATCH 074/261] CSR-1012 | call function on textLink click

---
 .../service-zip-modal-question.vue                     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 1c9edd563..dc13de094 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -13,7 +13,8 @@
                 href="#!"
                 data-bs-toggle="modal"
                 :data-bs-target="getModalId"
-                aria-label="Modal window" />
+                aria-label="Modal window" 
+                @click-event="focusOnZipInput" />
         </div>
     </div>
     <modal
@@ -103,6 +104,13 @@ export default {
             this.$refs.zipCodeInputModal.resetButtonStyle();
         },
 
+        focusOnZipInput() {
+            console.log("focusOnZipInput");
+            var input = document.getElementById("serviceZipCodeInput");
+            input.focus();
+            // this.$refs.zipInputTextQuestion.focus();
+        },
+
         async setZip() {
             this.resetAlerts();
 

From 7fedd83699f85d54818a44119097ea24d43a23be Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Tue, 24 Jan 2023 15:34:45 -0500
Subject: [PATCH 075/261] CSR-1012 | reset modal on open

---
 .../service-zip-modal-question.vue                | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index dc13de094..47577a2ec 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -13,8 +13,8 @@
                 href="#!"
                 data-bs-toggle="modal"
                 :data-bs-target="getModalId"
-                aria-label="Modal window" 
-                @click-event="focusOnZipInput" />
+                aria-label="Modal window"
+                @click-event="onModalOpen" />
         </div>
     </div>
     <modal
@@ -104,11 +104,12 @@ export default {
             this.$refs.zipCodeInputModal.resetButtonStyle();
         },
 
-        focusOnZipInput() {
-            console.log("focusOnZipInput");
-            var input = document.getElementById("serviceZipCodeInput");
-            input.focus();
-            // this.$refs.zipInputTextQuestion.focus();
+        focusOnZipInput() {},
+
+        onModalOpen() {
+            this.serviceZipCodeInput = this.serviceZip;
+            this.resetsOnZipInput();
+            this.focusOnZipInput();
         },
 
         async setZip() {

From 9b6909067091caae307558d6f51d72a50df15c41 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 24 Jan 2023 15:55:13 -0500
Subject: [PATCH 076/261] Added onShownCallback property and handler

---
 src/digital-components/modal/modal.vue               |  5 ++++-
 .../service-zip-modal-question.vue                   | 12 +++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index da1fc8c26..013a42168 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -2,7 +2,7 @@
     <!-- Modal -->
     <div
         class="modal fade modal-component"
-        v-on="{ 'hidden.bs.modal': resetButtonStyle }"
+        v-on="{ 'hidden.bs.modal': resetButtonStyle, 'shown.bs.modal': onShownCallback }"
         :id="cmsWidgetName"
         tabindex="-1"
         aria-labelledby="ModalComponentLabel"
@@ -49,6 +49,9 @@ export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
+        onShownCallback: {
+            type: Function,
+        },
 
         footerButtonCallback: {
             type: Function,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 47577a2ec..1ab55f165 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -13,13 +13,13 @@
                 href="#!"
                 data-bs-toggle="modal"
                 :data-bs-target="getModalId"
-                aria-label="Modal window"
-                @click-event="onModalOpen" />
+                aria-label="Modal window" />
         </div>
     </div>
     <modal
         ref="zipCodeInputModal"
         :cmsWidgetName="this.modalWidgetName"
+        :onShownCallback="onModalOpen"
         :footerButtonCallback="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
@@ -62,6 +62,7 @@ import textboxQuestion from "@/digital-components/textbox-question/textbox-quest
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
+import { isNoUnitNumericStyleProp } from "@vue/shared";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -104,7 +105,12 @@ export default {
             this.$refs.zipCodeInputModal.resetButtonStyle();
         },
 
-        focusOnZipInput() {},
+        focusOnZipInput() {
+            this.$nextTick(() => {
+                const input = this.$refs.zipInputTextQuestion.$refs.serviceZipCodeInput;
+                input.focus();
+            });
+        },
 
         onModalOpen() {
             this.serviceZipCodeInput = this.serviceZip;

From a69fe6932004e426cb7d185a1fc219653401b0ae Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 24 Jan 2023 16:03:49 -0500
Subject: [PATCH 077/261] Merged from CSR-1012

---
 .../address-questions.spec.js                 | 28 ++++++++++---------
 .../address-questions/address-questions.vue   | 11 +++++---
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
index 2015997d4..5cade9ddb 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
@@ -58,7 +58,7 @@ describe("address-questions.vue", () => {
             expect(state.exists()).toBe(true);
             expect(zipCode.exists()).toBe(true);
         });
-         
+
         test("Should render apartmentNumberOrBusinessName textbox-question when captureApartmentNumberOrBusinessName = true", async () => {
             // Arrange
             const { wrapper } = setupMocks({
@@ -68,19 +68,21 @@ describe("address-questions.vue", () => {
                         apartmentNumberOrBusinessName: "",
                         city: "",
                         state: "",
-                        zipCode: "",                       
+                        zipCode: "",
                     },
-                    captureApartmentNumberOrBusinessName: true
+                    captureApartmentNumberOrBusinessName: true,
                 },
             });
 
             await wrapper.setData({
-                showAddressFields: true
+                showAddressFields: true,
             });
 
             // Act
             const streetAddress = wrapper.findComponent({ ref: "autocomplete" });
-            const apartmentNumberOrBusinessName = wrapper.findComponent({ ref: "apartmentNumberOrBusinessName" });
+            const apartmentNumberOrBusinessName = wrapper.findComponent({
+                ref: "apartmentNumberOrBusinessName",
+            });
             const city = wrapper.findComponent({ ref: "city" });
             const state = wrapper.findComponent({ ref: "state" });
             const zipCode = wrapper.findComponent({ ref: "zipCode" });
@@ -92,9 +94,8 @@ describe("address-questions.vue", () => {
             expect(city.exists()).toBe(true);
             expect(state.exists()).toBe(true);
             expect(zipCode.exists()).toBe(true);
+        });
 
-        });  
-           
         test("Should *not* render apartmentNumberOrBusinessName textbox-question when captureApartmentNumberOrBusinessName = false", async () => {
             // Arrange
             const { wrapper } = setupMocks({
@@ -104,19 +105,21 @@ describe("address-questions.vue", () => {
                         apartmentNumberOrBusinessName: "",
                         city: "",
                         state: "",
-                        zipCode: "",                       
+                        zipCode: "",
                     },
-                    captureApartmentNumberOrBusinessName: false
+                    captureApartmentNumberOrBusinessName: false,
                 },
             });
 
             await wrapper.setData({
-                showAddressFields: true
+                showAddressFields: true,
             });
 
             // Act
             const streetAddress = wrapper.findComponent({ ref: "autocomplete" });
-            const apartmentNumberOrBusinessName = wrapper.findComponent({ ref: "apartmentNumberOrBusinessName" });
+            const apartmentNumberOrBusinessName = wrapper.findComponent({
+                ref: "apartmentNumberOrBusinessName",
+            });
             const city = wrapper.findComponent({ ref: "city" });
             const state = wrapper.findComponent({ ref: "state" });
             const zipCode = wrapper.findComponent({ ref: "zipCode" });
@@ -128,8 +131,7 @@ describe("address-questions.vue", () => {
             expect(city.exists()).toBe(true);
             expect(state.exists()).toBe(true);
             expect(zipCode.exists()).toBe(true);
-
-        }); 
+        });
 
         test("Should set this.showAddressFields to true when the model is prepopulated", async () => {
             // Arrange
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index daae3ad2c..2f21e49f6 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -17,7 +17,10 @@
             </div>
         </div>
         <transition name="fade" mode="out-in">
-            <div class="row mb-4" v-show="showAddressFields && showApartmentNumberOrBusinessNameField" aria-live="polite">
+            <div
+                class="row mb-4"
+                v-show="showAddressFields && showApartmentNumberOrBusinessNameField"
+                aria-live="polite">
                 <div class="col">
                     <textboxQuestion
                         cmsWidgetName="ApartmentNumberOrBusinessNameQuestionWidget"
@@ -110,9 +113,9 @@ export default {
                 apartmentNumberOrBusinessName: "",
                 city: "",
                 state: "",
-                zipCode: "",         
+                zipCode: "",
             }),
-        },       
+        },
         validationRules: String,
         captureApartmentNumberOrBusinessName: false,
     },
@@ -198,7 +201,7 @@ export default {
             get: function () {
                 return this.captureApartmentNumberOrBusinessName;
             },
-        }
+        },
     },
     methods: {
         setupAddressLookup() {

From 941a92dde4563bd5463c67bd3aec865b730cd0d1 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 25 Jan 2023 09:45:15 -0500
Subject: [PATCH 078/261] Changed name of model opened callback

---
 .../service-zip-modal-question/service-zip-modal-question.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 1ab55f165..78068a835 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -19,7 +19,7 @@
     <modal
         ref="zipCodeInputModal"
         :cmsWidgetName="this.modalWidgetName"
-        :onShownCallback="onModalOpen"
+        :onModalOpenedCallback="onModalOpen"
         :footerButtonCallback="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion

From 7d75a1d9c6cebf57dc4115809085d8da66aae793 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 12 Jan 2023 11:20:43 -0500
Subject: [PATCH 079/261] CSR-1012 | service zip modal question

new component service-zip-modal-question added to the service-location page
---
 src/digital-components/modal/modal.vue        | 25 +++---
 .../service-location/service-location.vue     | 13 +---
 .../service-zip-modal-question.vue            | 76 +++++--------------
 3 files changed, 32 insertions(+), 82 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 013a42168..ee6b03498 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -35,7 +35,7 @@
                         ref="buttonMain"
                         suppressLoader
                         :buttonText="ModalCloseButtonText"
-                        @click-event="footerButtonClick" />
+                        @click-event="buttonMainClick" />
                 </div>
             </div>
         </div>
@@ -49,15 +49,9 @@ export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
-        onShownCallback: {
+        buttonClick: {
             type: Function,
         },
-
-        footerButtonCallback: {
-            type: Function,
-            // return true to close modal
-            // if undefined, footer button closes modal
-        },
     },
     computed: {
         ModalHeadline() {
@@ -79,7 +73,12 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
         showModalBody() {
-            return this.ModalBodyText;
+            return (
+                this.ModalImage ||
+                this.ModalHeadline ||
+                this.ModalSubheadertext ||
+                this.ModalBodyText
+            );
         },
     },
     methods: {
@@ -89,11 +88,9 @@ export default {
         closeModal() {
             this.$refs.modalXButton.click();
         },
-        async footerButtonClick() {
-            if (this.footerButtonCallback) {
-                if (await this.footerButtonCallback()) {
-                    this.closeModal();
-                }
+        buttonMainClick() {
+            if (this.buttonClick) {
+                this.buttonClick();
             } else {
                 this.closeModal();
             }
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 418a1ec2e..aa32c1921 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -4,12 +4,7 @@ fmg
         <div class="page-container-grouped-styles">
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
-            <serviceZipModalQuestion
-                cmsWidgetName="ServiceZipModalWidget"
-                modalWidgetName="ZipModalWidget"
-                textboxQuestionWidgetName="ServiceZipQuestionWidget"
-                alertNonServiceableZipWidgetName="AlertNonServiceableZipWidget"
-                alertInvalidZipWidgetName="AlertInvalidZipWidget" />
+            <serviceZipModalQuestion />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 :isForwardActionDisabled="!meta.valid"
@@ -22,9 +17,9 @@ fmg
 <script>
 // Components
 import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question";
-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 funnelHeader from "@/common-components/funnel-header/funnel-header";
+import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
+import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
 
 //Supporting Files
 import { Form } from "vee-validate";
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 78068a835..0397609aa 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -12,19 +12,14 @@
                 :text="this.serviceZipDisplayText"
                 href="#!"
                 data-bs-toggle="modal"
-                :data-bs-target="getModalId"
+                data-bs-target="#ZipModal"
                 aria-label="Modal window" />
         </div>
     </div>
-    <modal
-        ref="zipCodeInputModal"
-        :cmsWidgetName="this.modalWidgetName"
-        :onModalOpenedCallback="onModalOpen"
-        :footerButtonCallback="setZip">
+    <modal ref="zipCodeInputModal" cmsWidgetName="ZipModal" :buttonClick="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
-                ref="zipInputTextQuestion"
-                :cmsWidgetName="this.textboxQuestionWidgetName"
+                cmsWidgetName="ServiceZipQuestionWidget"
                 v-model="serviceZipCodeInput"
                 inputId="serviceZipCodeInput"
                 questionAlignment="center"
@@ -36,14 +31,14 @@
                 ref="alertInvalidZip"
                 v-if="displayInvalidZipAlert"
                 class="my-4"
-                :cmsWidgetName="this.alertInvalidZipWidgetName"
+                cmsWidgetName="AlertInvalidZipWidget"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
             <alert
                 ref="alertNonServiceableZip"
                 v-if="displayNonServiceableZipAlert"
                 class="my-4"
-                :cmsWidgetName="this.alertNonServiceableZipWidgetName"
+                cmsWidgetName="AlertNonServiceableZipWidget"
                 :manualHeadline="AlertNonServiceableZipHeader"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
@@ -54,15 +49,16 @@
 <script>
 // Components
 import textLink from "@/ux-components/text-link/text-link";
-import modal from "@/digital-components/modal/modal";
+import modal from "@/common-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
-import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
+import textboxQuestion from "@/common-components/textbox-question/textbox-question";
 
 //Supporting Files
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import { isNoUnitNumericStyleProp } from "@vue/shared";
+import store from "@/store";
+import baseMixin from "@/mixins/base-mixin";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -81,18 +77,14 @@ export default {
     },
     props: {
         cmsWidgetName: String,
-        modalWidgetName: String,
-        textboxQuestionWidgetName: String,
-        alertNonServiceableZipWidgetName: String,
-        alertInvalidZipWidgetName: String,
     },
     methods: {
         getZipFromStore() {
-            return this.$store.getters.order.serviceLocation.zipCode;
+            return store.getters.order.serviceLocation.zipCode;
         },
 
         getZipStateFromStore() {
-            return this.$store.getters.order.serviceLocation.state;
+            return store.getters.order.serviceLocation.state;
         },
 
         resetAlerts() {
@@ -100,34 +92,16 @@ export default {
             this.displayNonServiceableZipAlert = false;
         },
 
-        resetsOnZipInput() {
-            this.resetAlerts();
-            this.$refs.zipCodeInputModal.resetButtonStyle();
-        },
-
-        focusOnZipInput() {
-            this.$nextTick(() => {
-                const input = this.$refs.zipInputTextQuestion.$refs.serviceZipCodeInput;
-                input.focus();
-            });
-        },
-
-        onModalOpen() {
-            this.serviceZipCodeInput = this.serviceZip;
-            this.resetsOnZipInput();
-            this.focusOnZipInput();
-        },
-
         async setZip() {
             this.resetAlerts();
 
             const zipLength = 5;
-            if (!this.serviceZipCodeInput || this.serviceZipCodeInput.length < zipLength) {
+            if (this.serviceZipCodeInput.length < zipLength) {
                 // prevent reading 1111 as 01111
-                return false;
+                return;
             }
 
-            const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
+            const zipCodeData = await baseMixin.methods.getZipCodeData(this.serviceZipCodeInput);
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
@@ -137,25 +111,19 @@ export default {
                 this.serviceZip = this.serviceZipCodeInput;
                 this.serviceZipState = zipCodeData.state;
 
-                // close modal
-                return true;
+                this.$refs.zipCodeInputModal.closeModal();
             }
-
-            return false;
         },
     },
     computed: {
-        getModalId() {
-            return "#" + this.modalWidgetName;
-        },
         questionText() {
-            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
+            return this.getCmsContent("LocationQuestionWidget", "QuestionText");
         },
         serviceZipDisplayText() {
             if (this.serviceZip && this.serviceZip != 0) {
                 return this.serviceZipState + ", " + this.serviceZip;
             }
-            return this.getCmsContent(this.cmsWidgetName, "FooterText");
+            return this.getCmsContent("ZipPlaceholderText", "QuestionText");
         },
         AlertNonServiceableZipHeader() {
             const zipCode = this.serviceZipCodeInput;
@@ -166,16 +134,6 @@ export default {
             return text;
         },
     },
-    mounted() {
-        this.$watch(
-            () => {
-                return this.$refs.zipInputTextQuestion.value;
-            },
-            (val) => {
-                this.resetsOnZipInput();
-            }
-        );
-    },
     components: {
         textLink,
         modal,

From 8a7e0b0523ef1bbe0e4b65afe198a6a9e8dfc565 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Wed, 18 Jan 2023 12:27:33 -0500
Subject: [PATCH 080/261] CSR-1012 | file path updates

---
 src/layouts/service-location/service-location.vue         | 6 +++---
 .../service-zip-modal-question.vue                        | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index aa32c1921..4f8230456 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -17,9 +17,9 @@ fmg
 <script>
 // Components
 import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question";
-import funnelHeader from "@/common-components/funnel-header/funnel-header";
-import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
-import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-header";
+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";
 
 //Supporting Files
 import { Form } from "vee-validate";
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 0397609aa..fa49f50d0 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -48,10 +48,10 @@
 
 <script>
 // Components
-import textLink from "@/ux-components/text-link/text-link";
-import modal from "@/common-components/modal/modal";
-import alert from "@/ux-components/alert/alert";
-import textboxQuestion from "@/common-components/textbox-question/textbox-question";
+import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import modal from "@/digital-components/modal/modal";
+import alert from "@/fmg-components/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 
 //Supporting Files
 import { defineRule } from "vee-validate";

From 863c5999f38fa8fe04c2d51758129586ce0ac81a Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 19 Jan 2023 13:08:56 -0500
Subject: [PATCH 081/261] CSR-1012 | service zip cms refactor

---
 .../service-location/service-location.vue     |  7 ++-
 .../service-zip-modal-question.vue            | 50 ++++++++++---------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 4f8230456..418a1ec2e 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -4,7 +4,12 @@ fmg
         <div class="page-container-grouped-styles">
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
-            <serviceZipModalQuestion />
+            <serviceZipModalQuestion
+                cmsWidgetName="ServiceZipModalWidget"
+                modalWidgetName="ZipModalWidget"
+                textboxQuestionWidgetName="ServiceZipQuestionWidget"
+                alertNonServiceableZipWidgetName="AlertNonServiceableZipWidget"
+                alertInvalidZipWidgetName="AlertInvalidZipWidget" />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 :isForwardActionDisabled="!meta.valid"
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index fa49f50d0..9713c8156 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -12,14 +12,14 @@
                 :text="this.serviceZipDisplayText"
                 href="#!"
                 data-bs-toggle="modal"
-                data-bs-target="#ZipModal"
+                :data-bs-target="getModalId"
                 aria-label="Modal window" />
         </div>
     </div>
-    <modal ref="zipCodeInputModal" cmsWidgetName="ZipModal" :buttonClick="setZip">
+    <modal ref="zipCodeInputModal" :cmsWidgetName="this.modalWidgetName" :buttonClick="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
-                cmsWidgetName="ServiceZipQuestionWidget"
+                :cmsWidgetName="this.textboxQuestionWidgetName"
                 v-model="serviceZipCodeInput"
                 inputId="serviceZipCodeInput"
                 questionAlignment="center"
@@ -31,15 +31,15 @@
                 ref="alertInvalidZip"
                 v-if="displayInvalidZipAlert"
                 class="my-4"
-                cmsWidgetName="AlertInvalidZipWidget"
+                :cmsWidgetName="this.alertInvalidZipWidgetName"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
             <alert
                 ref="alertNonServiceableZip"
                 v-if="displayNonServiceableZipAlert"
                 class="my-4"
-                cmsWidgetName="AlertNonServiceableZipWidget"
-                :manualHeadline="AlertNonServiceableZipHeader"
+                :cmsWidgetName="this.alertNonServiceableZipWidgetName"
+                :manualHeadline="this.invalidAlertHeader"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
         </div>
@@ -48,17 +48,15 @@
 
 <script>
 // Components
-import textLink from "@/fmg-components/ux-components/text-link/text-link";
+import textLink from "@/ux-components/text-link/text-link";
 import modal from "@/digital-components/modal/modal";
-import alert from "@/fmg-components/ux-components/alert/alert";
+import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 
 //Supporting Files
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import store from "@/store";
-import baseMixin from "@/mixins/base-mixin";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -73,18 +71,23 @@ export default {
             serviceZipCodeInput: this.getZipFromStore(),
             displayInvalidZipAlert: false,
             displayNonServiceableZipAlert: false,
+            invalidAlertHeader: null,
         };
     },
     props: {
         cmsWidgetName: String,
+        modalWidgetName: String,
+        textboxQuestionWidgetName: String,
+        alertNonServiceableZipWidgetName: String,
+        alertInvalidZipWidgetName: String,
     },
     methods: {
         getZipFromStore() {
-            return store.getters.order.serviceLocation.zipCode;
+            return this.$store.getters.order.serviceLocation.zipCode;
         },
 
         getZipStateFromStore() {
-            return store.getters.order.serviceLocation.state;
+            return this.$store.getters.order.serviceLocation.state;
         },
 
         resetAlerts() {
@@ -96,16 +99,20 @@ export default {
             this.resetAlerts();
 
             const zipLength = 5;
-            if (this.serviceZipCodeInput.length < zipLength) {
+            if (!this.serviceZipCodeInput || this.serviceZipCodeInput.length < zipLength) {
                 // prevent reading 1111 as 01111
                 return;
             }
 
-            const zipCodeData = await baseMixin.methods.getZipCodeData(this.serviceZipCodeInput);
+            const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
             } else if (!zipCodeData.isServiceable) {
+                this.invalidAlertHeader = this.getCmsContent(
+                    this.alertNonServiceableZipWidgetName,
+                    "HeadlineText"
+                ).replaceAll("{custom:serviceZipCodeInput}", this.serviceZipCodeInput);
                 this.displayNonServiceableZipAlert = true;
             } else {
                 this.serviceZip = this.serviceZipCodeInput;
@@ -116,22 +123,17 @@ export default {
         },
     },
     computed: {
+        getModalId() {
+            return "#" + this.modalWidgetName;
+        },
         questionText() {
-            return this.getCmsContent("LocationQuestionWidget", "QuestionText");
+            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
         },
         serviceZipDisplayText() {
             if (this.serviceZip && this.serviceZip != 0) {
                 return this.serviceZipState + ", " + this.serviceZip;
             }
-            return this.getCmsContent("ZipPlaceholderText", "QuestionText");
-        },
-        AlertNonServiceableZipHeader() {
-            const zipCode = this.serviceZipCodeInput;
-            const text = this.getCmsContent(
-                "AlertNonServiceableZipWidget",
-                "HeadlineText"
-            ).replaceAll("{custom:serviceZipCodeInput}", zipCode);
-            return text;
+            return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
     },
     components: {

From d67ed4ddb7dded9a67d95934e6340fb852feadf2 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 19 Jan 2023 13:35:38 -0500
Subject: [PATCH 082/261] CSR-1012 | reset modal on text input

added prop to textbox-question to fire custom function on text updates
---
 .../textbox-question/textbox-question.vue     |  2 ++
 .../service-zip-modal-question.vue            | 23 +++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index a19823b0d..e97402bb3 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -70,6 +70,7 @@ export default {
         questionAlignment: String, // Left or center. Left is default.
         cornerStyle: String, // Rounded or square. Square is default.
         includeSearchIcon: Boolean,
+        customOnChange: Function,
     },
     setup(props) {
         const propsClone = Object.assign({}, props);
@@ -145,6 +146,7 @@ export default {
     },
     watch: {
         async value(newValue) {
+            this.customOnChange();
             const result = await validate(newValue, this.validationRules); // do a test validation check, without triggering full validation
             if (result.valid) {
                 this.handleChange(newValue); // trigger full validation on this field only
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 9713c8156..710514966 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -26,7 +26,8 @@
                 mask="#####"
                 isRequired
                 disableAutoFill
-                validationRules="zip-required|zip-format" />
+                validationRules="zip-required|zip-format" 
+                :customOnChange="this.resetsOnZipInput" />
             <alert
                 ref="alertInvalidZip"
                 v-if="displayInvalidZipAlert"
@@ -39,7 +40,7 @@
                 v-if="displayNonServiceableZipAlert"
                 class="my-4"
                 :cmsWidgetName="this.alertNonServiceableZipWidgetName"
-                :manualHeadline="this.invalidAlertHeader"
+                :manualHeadline="AlertNonServiceableZipHeader"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
         </div>
@@ -71,7 +72,6 @@ export default {
             serviceZipCodeInput: this.getZipFromStore(),
             displayInvalidZipAlert: false,
             displayNonServiceableZipAlert: false,
-            invalidAlertHeader: null,
         };
     },
     props: {
@@ -95,6 +95,11 @@ export default {
             this.displayNonServiceableZipAlert = false;
         },
 
+        resetsOnZipInput() {
+            this.resetAlerts();
+            this.$refs.zipCodeInputModal.resetButtonStyle();
+        },
+
         async setZip() {
             this.resetAlerts();
 
@@ -109,10 +114,6 @@ export default {
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
             } else if (!zipCodeData.isServiceable) {
-                this.invalidAlertHeader = this.getCmsContent(
-                    this.alertNonServiceableZipWidgetName,
-                    "HeadlineText"
-                ).replaceAll("{custom:serviceZipCodeInput}", this.serviceZipCodeInput);
                 this.displayNonServiceableZipAlert = true;
             } else {
                 this.serviceZip = this.serviceZipCodeInput;
@@ -135,6 +136,14 @@ export default {
             }
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
+        AlertNonServiceableZipHeader() {
+            const zipCode = this.serviceZipCodeInput;
+            const text = this.getCmsContent(
+                "AlertNonServiceableZipWidget",
+                "HeadlineText"
+            ).replaceAll("{custom:serviceZipCodeInput}", zipCode);
+            return text;
+        },
     },
     components: {
         textLink,

From 839092571efb982878cc3c36d5b986bddacbcaee Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Mon, 23 Jan 2023 13:23:30 -0500
Subject: [PATCH 083/261] CSR-1012 refactor hide alerts on text input

---
 .../textbox-question/textbox-question.vue          |  2 --
 .../service-zip-modal-question.vue                 | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index e97402bb3..a19823b0d 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -70,7 +70,6 @@ export default {
         questionAlignment: String, // Left or center. Left is default.
         cornerStyle: String, // Rounded or square. Square is default.
         includeSearchIcon: Boolean,
-        customOnChange: Function,
     },
     setup(props) {
         const propsClone = Object.assign({}, props);
@@ -146,7 +145,6 @@ export default {
     },
     watch: {
         async value(newValue) {
-            this.customOnChange();
             const result = await validate(newValue, this.validationRules); // do a test validation check, without triggering full validation
             if (result.valid) {
                 this.handleChange(newValue); // trigger full validation on this field only
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 710514966..68f30abff 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -19,6 +19,7 @@
     <modal ref="zipCodeInputModal" :cmsWidgetName="this.modalWidgetName" :buttonClick="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
+                ref="zipInputTextQuestion"
                 :cmsWidgetName="this.textboxQuestionWidgetName"
                 v-model="serviceZipCodeInput"
                 inputId="serviceZipCodeInput"
@@ -26,8 +27,7 @@
                 mask="#####"
                 isRequired
                 disableAutoFill
-                validationRules="zip-required|zip-format" 
-                :customOnChange="this.resetsOnZipInput" />
+                validationRules="zip-required|zip-format" />
             <alert
                 ref="alertInvalidZip"
                 v-if="displayInvalidZipAlert"
@@ -145,6 +145,16 @@ export default {
             return text;
         },
     },
+    mounted() {
+        this.$watch(
+            () => {
+                return this.$refs.zipInputTextQuestion.value;
+            },
+            (val) => {
+                this.resetsOnZipInput();
+            }
+        );
+    },
     components: {
         textLink,
         modal,

From 8614942b892ddf277e926b8e564d729bd29316aa Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Mon, 23 Jan 2023 14:59:31 -0500
Subject: [PATCH 084/261] CSR-1012 | modal footer button updates

---
 src/digital-components/modal/modal.vue        | 22 +++++++++----------
 .../service-zip-modal-question.vue            | 12 +++++++---
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index ee6b03498..7ec090aab 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -35,7 +35,7 @@
                         ref="buttonMain"
                         suppressLoader
                         :buttonText="ModalCloseButtonText"
-                        @click-event="buttonMainClick" />
+                        @click-event="footerButtonClick" />
                 </div>
             </div>
         </div>
@@ -49,8 +49,11 @@ export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
-        buttonClick: {
+
+        footerButtonCallback: {
             type: Function,
+            // return true to close modal
+            // if undefined, footer button closes modal
         },
     },
     computed: {
@@ -73,12 +76,7 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
         showModalBody() {
-            return (
-                this.ModalImage ||
-                this.ModalHeadline ||
-                this.ModalSubheadertext ||
-                this.ModalBodyText
-            );
+            return this.ModalBodyText;
         },
     },
     methods: {
@@ -88,9 +86,11 @@ export default {
         closeModal() {
             this.$refs.modalXButton.click();
         },
-        buttonMainClick() {
-            if (this.buttonClick) {
-                this.buttonClick();
+        async footerButtonClick() {
+            if (this.footerButtonCallback) {
+                if (await this.footerButtonCallback()) {
+                    this.closeModal();
+                }
             } else {
                 this.closeModal();
             }
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 68f30abff..1c9edd563 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -16,7 +16,10 @@
                 aria-label="Modal window" />
         </div>
     </div>
-    <modal ref="zipCodeInputModal" :cmsWidgetName="this.modalWidgetName" :buttonClick="setZip">
+    <modal
+        ref="zipCodeInputModal"
+        :cmsWidgetName="this.modalWidgetName"
+        :footerButtonCallback="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
                 ref="zipInputTextQuestion"
@@ -106,7 +109,7 @@ export default {
             const zipLength = 5;
             if (!this.serviceZipCodeInput || this.serviceZipCodeInput.length < zipLength) {
                 // prevent reading 1111 as 01111
-                return;
+                return false;
             }
 
             const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
@@ -119,8 +122,11 @@ export default {
                 this.serviceZip = this.serviceZipCodeInput;
                 this.serviceZipState = zipCodeData.state;
 
-                this.$refs.zipCodeInputModal.closeModal();
+                // close modal
+                return true;
             }
+
+            return false;
         },
     },
     computed: {

From e0298b4fbf3a5c095d1eb679fa74f58eb4ae7028 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Tue, 24 Jan 2023 14:25:20 -0500
Subject: [PATCH 085/261] CSR-1012 | call function on textLink click

---
 .../service-zip-modal-question.vue                     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 1c9edd563..dc13de094 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -13,7 +13,8 @@
                 href="#!"
                 data-bs-toggle="modal"
                 :data-bs-target="getModalId"
-                aria-label="Modal window" />
+                aria-label="Modal window" 
+                @click-event="focusOnZipInput" />
         </div>
     </div>
     <modal
@@ -103,6 +104,13 @@ export default {
             this.$refs.zipCodeInputModal.resetButtonStyle();
         },
 
+        focusOnZipInput() {
+            console.log("focusOnZipInput");
+            var input = document.getElementById("serviceZipCodeInput");
+            input.focus();
+            // this.$refs.zipInputTextQuestion.focus();
+        },
+
         async setZip() {
             this.resetAlerts();
 

From b405245ca9a54e54b02746c259c74dbd75983e23 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Tue, 24 Jan 2023 15:34:45 -0500
Subject: [PATCH 086/261] CSR-1012 | reset modal on open

---
 .../service-zip-modal-question.vue                | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index dc13de094..47577a2ec 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -13,8 +13,8 @@
                 href="#!"
                 data-bs-toggle="modal"
                 :data-bs-target="getModalId"
-                aria-label="Modal window" 
-                @click-event="focusOnZipInput" />
+                aria-label="Modal window"
+                @click-event="onModalOpen" />
         </div>
     </div>
     <modal
@@ -104,11 +104,12 @@ export default {
             this.$refs.zipCodeInputModal.resetButtonStyle();
         },
 
-        focusOnZipInput() {
-            console.log("focusOnZipInput");
-            var input = document.getElementById("serviceZipCodeInput");
-            input.focus();
-            // this.$refs.zipInputTextQuestion.focus();
+        focusOnZipInput() {},
+
+        onModalOpen() {
+            this.serviceZipCodeInput = this.serviceZip;
+            this.resetsOnZipInput();
+            this.focusOnZipInput();
         },
 
         async setZip() {

From d3d8d9bfa8c191b5a4c19a72326f046c03b2f422 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 24 Jan 2023 15:55:13 -0500
Subject: [PATCH 087/261] Added onShownCallback property and handler

---
 src/digital-components/modal/modal.vue               |  3 +++
 .../service-zip-modal-question.vue                   | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 7ec090aab..013a42168 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -49,6 +49,9 @@ export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
+        onShownCallback: {
+            type: Function,
+        },
 
         footerButtonCallback: {
             type: Function,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 47577a2ec..1ab55f165 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -13,13 +13,13 @@
                 href="#!"
                 data-bs-toggle="modal"
                 :data-bs-target="getModalId"
-                aria-label="Modal window"
-                @click-event="onModalOpen" />
+                aria-label="Modal window" />
         </div>
     </div>
     <modal
         ref="zipCodeInputModal"
         :cmsWidgetName="this.modalWidgetName"
+        :onShownCallback="onModalOpen"
         :footerButtonCallback="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
@@ -62,6 +62,7 @@ import textboxQuestion from "@/digital-components/textbox-question/textbox-quest
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
+import { isNoUnitNumericStyleProp } from "@vue/shared";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -104,7 +105,12 @@ export default {
             this.$refs.zipCodeInputModal.resetButtonStyle();
         },
 
-        focusOnZipInput() {},
+        focusOnZipInput() {
+            this.$nextTick(() => {
+                const input = this.$refs.zipInputTextQuestion.$refs.serviceZipCodeInput;
+                input.focus();
+            });
+        },
 
         onModalOpen() {
             this.serviceZipCodeInput = this.serviceZip;

From 069d31aa3004523de07c51c752236e8e78b38d31 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 25 Jan 2023 16:18:56 -0500
Subject: [PATCH 088/261] Manual open of modal

---
 src/digital-components/modal/modal.vue        |  19 +++-
 .../address-questions/address-questions.vue   |   5 +-
 .../mobile-location-modal-question.vue        | 100 ++++++++++++++++++
 .../service-location/service-location.vue     |   6 ++
 .../service-zip-modal-question.vue            |   8 +-
 5 files changed, 132 insertions(+), 6 deletions(-)
 create mode 100644 src/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question.vue

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 013a42168..ff02fb67c 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -2,7 +2,7 @@
     <!-- Modal -->
     <div
         class="modal fade modal-component"
-        v-on="{ 'hidden.bs.modal': resetButtonStyle, 'shown.bs.modal': onShownCallback }"
+        v-on="{ 'hidden.bs.modal': resetButtonStyle, 'shown.bs.modal': onModalOpenedCallback }"
         :id="cmsWidgetName"
         tabindex="-1"
         aria-labelledby="ModalComponentLabel"
@@ -44,12 +44,13 @@
 
 <script>
 import buttonMain from "@/ux-components/button-main/button-main";
+import { Modal } from "bootstrap";
 
 export default {
     name: "modal",
     props: {
         cmsWidgetName: String,
-        onShownCallback: {
+        onModalOpenedCallback: {
             type: Function,
         },
 
@@ -59,6 +60,15 @@ export default {
             // if undefined, footer button closes modal
         },
     },
+    data() {
+        return {
+            myModal: null,
+        }        
+    },
+    mounted() {
+        this.myModal = new Modal(document.getElementById(this.cmsWidgetName));
+        
+    },
     computed: {
         ModalHeadline() {
             return this.getCmsContent(this.cmsWidgetName, "HeaderText");
@@ -86,8 +96,11 @@ export default {
         resetButtonStyle() {
             this.$refs.buttonMain.resetButtonStyle();
         },
+        openModal() {
+            this.myModal.show();
+        },
         closeModal() {
-            this.$refs.modalXButton.click();
+            this.myModal.hide();
         },
         async footerButtonClick() {
             if (this.footerButtonCallback) {
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 2f21e49f6..33d17b1e5 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -117,7 +117,10 @@ export default {
             }),
         },
         validationRules: String,
-        captureApartmentNumberOrBusinessName: false,
+        captureApartmentNumberOrBusinessName: {
+            type: Boolean,
+            default: false,
+        },
     },
     data() {
         return {
diff --git a/src/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question.vue b/src/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question.vue
new file mode 100644
index 000000000..f3d83fe3b
--- /dev/null
+++ b/src/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question.vue
@@ -0,0 +1,100 @@
+<template>
+    <div class="text-center">
+        <label
+            :for="displayModalLink"
+            :aria-label="questionText"
+            class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
+            :class="[questionAlignment === 'center' ? 'text-center w-100 mb-5' : '']"
+            v-html="questionText"></label>
+        <div class="update-mobile-location-text-link">
+            <textLink
+                id="displayModalLink"
+                linkType="text"
+                :text="this.mobileLocationDisplayText"
+                href="#!"
+                data-bs-toggle="modal"
+                :data-bs-target="getModalId"
+                aria-label="Modal window" />
+        </div>
+    </div>
+    <modal
+        ref="mobileServiceModal"
+        :cmsWidgetName="this.modalWidgetName"
+        :onModalOpenedCallback="onModalOpened"
+        :footerButtonCallback="saveMobileLocationData">
+        <div class="ps-4 pe-4 pb-4">
+            <addressQuestions ref="addressQuestions" captureApartmentNumberOrBusinessName ="true" />
+        </div>
+    </modal>
+</template>
+
+<script>
+// Components
+import textLink from "@/ux-components/text-link/text-link";
+import modal from "@/digital-components/modal/modal";
+import alert from "@/ux-components/alert/alert";
+import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
+import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
+
+//Supporting Files
+import { defineRule } from "vee-validate";
+import { required, regex } from "@/helpers/validation-rules";
+import { errorMessages } from "@/constants/error-messages";
+import { isNoUnitNumericStyleProp } from "@vue/shared";
+
+// Define Validation Rules
+defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
+defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
+
+export default {
+    name: "mobile-location-modal-question",
+    data() {
+        return {
+
+        };
+    },
+    props: {
+        cmsWidgetName: String,
+        modalWidgetName: String,
+        textboxQuestionWidgetName: String,
+        alertNonServiceableZipWidgetName: String,
+        alertInvalidZipWidgetName: String,
+    },
+    methods: {
+ 
+    },
+    computed: {
+        getModalId() {
+            return "#" + this.modalWidgetName;
+        },
+        questionText() {
+            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
+        },
+        mobileLocationDisplayText() {
+
+            return this.getCmsContent(this.cmsWidgetName, "FooterText");
+        },
+    },
+    mounted() {
+
+    },
+    components: {
+        textLink,
+        modal,
+        addressQuestions
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.update-zip-text-link::before {
+    content: "";
+    display: inline-block;
+    width: 13px;
+    height: 16px;
+    background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 13 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.49635 1.00142e-07C5.64734 -0.000153295 4.80722 0.175918 4.0274 0.517444C3.24757 0.858969 2.54443 1.35877 1.96099 1.98626C0.765713 3.27588 0.0999756 4.98141 0.0999756 6.75394C0.0999756 8.52646 0.765713 10.232 1.96099 11.5216L5.98324 15.777C6.04954 15.8475 6.12918 15.9036 6.21736 15.9419C6.30555 15.9802 6.40045 16 6.49635 16C6.59225 16 6.68716 15.9802 6.77534 15.9419C6.86353 15.9036 6.94317 15.8475 7.00946 15.777L11.0317 11.52C12.2391 10.2383 12.909 8.52914 12.8999 6.75394C12.9094 4.97818 12.2394 3.26832 11.0317 1.98626C10.4481 1.35899 9.74493 0.859347 8.96514 0.517839C8.18535 0.176331 7.34532 0.000130509 6.49635 1.00142e-07V1.00142e-07ZM6.49635 9.13131C6.02507 9.13131 5.56437 8.98913 5.17251 8.72275C4.78065 8.45637 4.47524 8.07776 4.29488 7.63479C4.11453 7.19181 4.06734 6.70438 4.15928 6.23412C4.25123 5.76387 4.47817 5.33191 4.81142 4.99287C5.14467 4.65384 5.56925 4.42295 6.03148 4.32941C6.49371 4.23587 6.97282 4.28388 7.40823 4.46736C7.84364 4.65085 8.21579 4.96157 8.47762 5.36023C8.73945 5.7589 8.87921 6.2276 8.87921 6.70707C8.87921 7.34974 8.62837 7.96611 8.18185 8.4207C7.73532 8.87528 7.12964 9.13088 6.49794 9.13131H6.49635Z' fill='%231574A1'/%3E%3C/svg%3E%0A");
+    background-size: contain;
+    vertical-align: middle;
+    margin-right: 0.5em;
+}
+</style>
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 418a1ec2e..4d0a527c6 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -10,6 +10,10 @@ fmg
                 textboxQuestionWidgetName="ServiceZipQuestionWidget"
                 alertNonServiceableZipWidgetName="AlertNonServiceableZipWidget"
                 alertInvalidZipWidgetName="AlertInvalidZipWidget" />
+            <mobileLocationModalQuestion
+                cmsWidgetName="MobileLocationModalWidget"
+                modalWidgetName="LocationModalWidget"
+                textboxQuestionWidgetName="MobileLocationQuestionWidget" />    
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 :isForwardActionDisabled="!meta.valid"
@@ -22,6 +26,7 @@ fmg
 <script>
 // Components
 import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question";
+import mobileLocationModalQuestion from "@/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question";
 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";
@@ -65,6 +70,7 @@ export default {
     },
     components: {
         serviceZipModalQuestion,
+        mobileLocationModalQuestion,
         funnelHeader,
         funnelFooter,
         funnelSubHeader,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 1ab55f165..c26b7743b 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -1,17 +1,18 @@
 <template>
     <div class="text-center">
         <label
-            :for="serviceZipCodeInput"
+            :for="displayModalLink"
             :aria-label="questionText"
             class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
             :class="[questionAlignment === 'center' ? 'text-center w-100 mb-5' : '']"
             v-html="questionText"></label>
         <div class="update-zip-text-link">
             <textLink
+                id="displayModalLink"
                 linkType="text"
                 :text="this.serviceZipDisplayText"
                 href="#!"
-                data-bs-toggle="modal"
+                @click-event="openZipCodeModal"
                 :data-bs-target="getModalId"
                 aria-label="Modal window" />
         </div>
@@ -87,6 +88,9 @@ export default {
         alertInvalidZipWidgetName: String,
     },
     methods: {
+        openZipCodeModal() {
+            this.$refs.zipCodeInputModal.myModal.show();
+        },
         getZipFromStore() {
             return this.$store.getters.order.serviceLocation.zipCode;
         },

From 4bec48f624b84f2f8ba8d1d884f52ae8455b04a7 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Wed, 25 Jan 2023 16:37:34 -0500
Subject: [PATCH 089/261] CSR-1012 | modal open and close functions

---
 src/digital-components/modal/modal.vue                   | 3 +--
 .../service-zip-modal-question.vue                       | 9 ++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index ff02fb67c..6e8e7de07 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -63,11 +63,10 @@ export default {
     data() {
         return {
             myModal: null,
-        }        
+        };
     },
     mounted() {
         this.myModal = new Modal(document.getElementById(this.cmsWidgetName));
-        
     },
     computed: {
         ModalHeadline() {
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index c26b7743b..169281b71 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -13,14 +13,13 @@
                 :text="this.serviceZipDisplayText"
                 href="#!"
                 @click-event="openZipCodeModal"
-                :data-bs-target="getModalId"
                 aria-label="Modal window" />
         </div>
     </div>
     <modal
         ref="zipCodeInputModal"
         :cmsWidgetName="this.modalWidgetName"
-        :onShownCallback="onModalOpen"
+        :onModalOpenedCallback="onModalOpen"
         :footerButtonCallback="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
@@ -63,7 +62,6 @@ import textboxQuestion from "@/digital-components/textbox-question/textbox-quest
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import { isNoUnitNumericStyleProp } from "@vue/shared";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -89,7 +87,7 @@ export default {
     },
     methods: {
         openZipCodeModal() {
-            this.$refs.zipCodeInputModal.myModal.show();
+            this.$refs.zipCodeInputModal.openModal();
         },
         getZipFromStore() {
             return this.$store.getters.order.serviceLocation.zipCode;
@@ -149,9 +147,6 @@ export default {
         },
     },
     computed: {
-        getModalId() {
-            return "#" + this.modalWidgetName;
-        },
         questionText() {
             return this.getCmsContent(this.cmsWidgetName, "HeaderText");
         },

From c18af0e897fe02554e938762da6fefea82d5e39e Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 27 Jan 2023 10:01:15 -0500
Subject: [PATCH 090/261] Fixed error issues with Address component, fixed
 spacing in modals

---
 src/digital-components/modal/modal.vue        | 10 +--
 .../address-questions/address-questions.vue   | 52 ++++++++-----
 .../mobile-location-modal-questions.vue}      | 76 ++++++++++++++++---
 .../vehicle-protected-question.vue            | 53 +++++++++++++
 .../service-location/service-location.vue     | 21 +++--
 5 files changed, 171 insertions(+), 41 deletions(-)
 rename src/layouts/service-location/{mobile-location-modal-question/mobile-location-modal-question.vue => mobile-location-modal-questions/mobile-location-modal-questions.vue} (60%)
 create mode 100644 src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 6e8e7de07..acb545e52 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -17,7 +17,7 @@
                         data-bs-dismiss="modal"
                         aria-label="Close"></button>
                 </div>
-                <div class="modal-body ps-4 pe-4 pt-5 pb-4" v-if="showModalBody">
+                <div class="modal-body ps-5 pe-5 pt-5 pb-4" v-if="showModalBody">
                     <img :src="ModalImage" class="mw-100 d-flex mx-auto mb-4" alt="" />
                     <h5 class="mb-4" v-html="ModalHeadline"></h5>
                     <p class="fw-bold mb-2 subheader-text" v-html="ModalSubheadertext"></p>
@@ -62,11 +62,11 @@ export default {
     },
     data() {
         return {
-            myModal: null,
+            modal: null,
         };
     },
     mounted() {
-        this.myModal = new Modal(document.getElementById(this.cmsWidgetName));
+        this.modal = new Modal(document.getElementById(this.cmsWidgetName));
     },
     computed: {
         ModalHeadline() {
@@ -96,10 +96,10 @@ export default {
             this.$refs.buttonMain.resetButtonStyle();
         },
         openModal() {
-            this.myModal.show();
+            this.modal.show();
         },
         closeModal() {
-            this.myModal.hide();
+            this.modal.hide();
         },
         async footerButtonClick() {
             if (this.footerButtonCallback) {
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 33d17b1e5..ff7fb0d9a 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -93,7 +93,6 @@ import { applicationConfig } from "@/constants/application-config.js";
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import { fill } from "lodash";
 
 // DEFINE VALIDATION RULES
 defineRule("street-address-required", required(errorMessages.STREET_ADDRESS_REQUIRED));
@@ -258,13 +257,17 @@ export default {
                     });
 
                     addressField1.addEventListener("keydown", (e) => {
-                        if (e.code === "Enter" || e.code === "NumpadEnter") {
+                        const autocomplete = document.getElementById("autocomplete");
+                        const event = new Event("place_changed");
+
+                        if (e.code === "Enter" || e.code === "NumpadEnter" || e.code === "Tab") {
                             const selectedItem = document.querySelector(
                                 ".pac-container .pac-item-selected"
                             );
                             if (selectedItem !== null) {
                                 // Fill-in the address using selected item in the list.
-                                fillInAddress(selectedItem);
+                                autocomplete.dispatchEvent(event);
+                                //fillInAddress(selectedItem.textContent);
                             } else {
                                 // Fill-in the address using first item in the list.
                                 fillInAddressUsingFirstItem();
@@ -274,23 +277,25 @@ export default {
                         }
                     });
 
-                    addressField1.addEventListener("change", () => {
-                        // If a match has been previously attempted then do nothing
-                        if (self.matchFound !== null) {
-                            return;
-                        }
+                    // addressField1.addEventListener("change", () => {
+                    //     // If a match has been previously attempted then do nothing
+                    //     if (self.matchFound !== null) {
+                    //         return;
+                    //     }
 
-                        // Get the address that the user clicked on (if any)
-                        const clickedAddress = document.querySelector(
-                            ".pac-container .pac-item:hover"
-                        );
+                    //     // Get the address that the user clicked on (if any)
+                    //     const clickedAddress = document.querySelector(
+                    //         ".pac-container .pac-item:hover"
+                    //     );
 
-                        // If the Street Address field changed without clicking (i.e. by pressing Tab, or clicking outside the field)
-                        if (clickedAddress === null) {
-                            // Fill-in the address using first item in the list.
-                            fillInAddressUsingFirstItem();
-                        }
-                    });
+                    //     // If the Street Address field changed without clicking (i.e. by pressing Tab, or clicking outside the field)
+                    //     if (clickedAddress === null) {
+                    //         // Fill-in the address using first item in the list.
+                    //         fillInAddressUsingFirstItem();
+                    //     }
+
+                    //     console.log("change");
+                    // });
 
                     function fillInAddressUsingFirstItem() {
                         // Fill-in the address using first item in the list.
@@ -315,6 +320,7 @@ export default {
                     }
 
                     function fillInAddress(place) {
+                        console.log("fillInAddress");
                         if (!place) {
                             place = autocomplete.getPlace();
                         }
@@ -322,8 +328,11 @@ export default {
                         if (place && place.address_components) {
                             self.matchFound = true;
 
-                            self.addressModel.streetAddress = "";
                             self.$nextTick(function () {
+                                //self.addressModel.streetAddress = "";
+
+                                //self.$nextTick();
+
                                 self.showAddressFields = true;
 
                                 for (const component of place.address_components) {
@@ -407,6 +416,11 @@ export default {
                 }
             },
         },
+        "addressModel.streetAddress": {
+            handler(newValue, oldValue) {
+                console.log(`I got changed from ${oldValue} to ${newValue}`);
+            },
+        },
     },
     components: {
         textboxQuestion,
diff --git a/src/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
similarity index 60%
rename from src/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question.vue
rename to src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index f3d83fe3b..7aea041e9 100644
--- a/src/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -12,7 +12,7 @@
                 linkType="text"
                 :text="this.mobileLocationDisplayText"
                 href="#!"
-                data-bs-toggle="modal"
+                @click-event="openModal"
                 :data-bs-target="getModalId"
                 aria-label="Modal window" />
         </div>
@@ -22,8 +22,13 @@
         :cmsWidgetName="this.modalWidgetName"
         :onModalOpenedCallback="onModalOpened"
         :footerButtonCallback="saveMobileLocationData">
-        <div class="ps-4 pe-4 pb-4">
-            <addressQuestions ref="addressQuestions" captureApartmentNumberOrBusinessName ="true" />
+        <div class="modal-body ps-5 pe-5 pt-5 pb-4">
+            <addressQuestions
+                ref="addressQuestions"
+                v-model="mobileQuestionModel.addressQuestions"
+                captureApartmentNumberOrBusinessName="true" />
+            <vehicleProtectedQuestion v-model="mobileQuestionModel.selectedValue"/>
+            <textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
         </div>
     </modal>
 </template>
@@ -32,28 +37,49 @@
 // Components
 import textLink from "@/ux-components/text-link/text-link";
 import modal from "@/digital-components/modal/modal";
+import buttonQuestion from "@/digital-components/button-question/button-question";
 import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
+import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
+import textBlock from "@/digital-components/text-block/text-block";
 
-//Supporting Files
+// Supporting Files
 import { defineRule } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
-import { isNoUnitNumericStyleProp } from "@vue/shared";
+import { storeActions } from "@/constants/store-actions.js";
+import baseMixin from "@/mixins/base-mixin.js";
+import TextBlock from '../../../digital-components/text-block/text-block.vue';
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
 defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
 
 export default {
-    name: "mobile-location-modal-question",
+    name: "mobile-location-modal-questions",
+    emits: ["update:modelValue"], // The component emits an event
     data() {
         return {
-
+            isVehicleProtectedAnswers: [],
         };
     },
     props: {
+        modelValue: {
+            type: Object,
+            default: () => ({
+                addressQuestions: {
+                    streetAddress: "",
+                    apartmentNumberOrBusinessName: "",
+                    city: "",
+                    state: "",
+                    zipCode: "",
+                },
+                isZipServiceableMobile: Boolean,
+                isZipServiceableInShop: Boolean,
+                isVehicleProtected: Boolean,
+            }),
+        },
         cmsWidgetName: String,
         modalWidgetName: String,
         textboxQuestionWidgetName: String,
@@ -61,7 +87,25 @@ export default {
         alertInvalidZipWidgetName: String,
     },
     methods: {
- 
+        loadInitialData() {
+            return baseMixin.methods.dispatchStoreAction(storeActions.GET_VEHICLE_YEARS, {});
+        },
+        initializeComponent(initialData) {
+            this.isVehicleProtectedAnswers = initialData;
+        },
+        openModal() {
+            this.$refs.mobileServiceModal.openModal();
+        },
+        closeModal() {
+            this.$refs.mobileServiceModal.closeModal();
+        },
+        focusOnZipInput() {
+            this.$nextTick(() => {
+                console.log(this.$refs);
+                const input = this.$refs.streetAddressField;
+                input.focus();
+            });
+        },
     },
     computed: {
         getModalId() {
@@ -71,17 +115,25 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "HeaderText");
         },
         mobileLocationDisplayText() {
-
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
-    },
-    mounted() {
+        mobileQuestionModel: {
+            get: function () {
+                return this.modelValue;
+            },
+            set: function (newValue) {
+                this.$emit("update:modelValue", newValue);
+            },
+        },
 
     },
+    mounted() {},
     components: {
         textLink,
         modal,
-        addressQuestions
+        addressQuestions,
+        vehicleProtectedQuestion,
+        textBlock
     },
 };
 </script>
diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
new file mode 100644
index 000000000..b8c795d5f
--- /dev/null
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
@@ -0,0 +1,53 @@
+<template>
+    <buttonQuestion
+        class="radioQuestion"
+        :questionText="questionText"
+        :answers="answers"
+        groupName="isVehicleProtected"
+        textPosition="text-center"
+        v-model="selectedValue"
+        isRequired />
+</template>
+
+<script>
+import buttonQuestion from "@/digital-components/button-question/button-question";
+// Supporting files
+import { storeActions } from "@/constants/store-actions.js";
+import baseMixin from "@/mixins/base-mixin.js";
+export default {
+    name: "vehicle-protected-question",
+    data() {
+        return {
+            answers: [ "Yes", "No" ],
+        };
+    },
+    props: {
+        modelValue: String,
+        cmsWidgetName: String,
+    },
+    components: {
+        buttonQuestion,
+    },
+    computed: {
+        questionText() {
+            return this.getCmsContent(this.cmsWidgetName, "QuestionText");
+        },
+        selectedValue: {
+            get: function () {
+                return this.modelValue;
+            },
+            set: function (newValue) {
+                this.$emit("update:modelValue", newValue);
+            },
+        },
+    },
+    methods: {
+        loadInitialData() {
+            return baseMixin.methods.dispatchStoreAction(storeActions.GET_VEHICLE_YEARS, {});
+        },
+        initializeComponent(initialData) {
+            this.years = initialData;
+        },
+    },
+};
+</script>
\ No newline at end of file
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 4d0a527c6..cece16fdd 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -10,10 +10,11 @@ fmg
                 textboxQuestionWidgetName="ServiceZipQuestionWidget"
                 alertNonServiceableZipWidgetName="AlertNonServiceableZipWidget"
                 alertInvalidZipWidgetName="AlertInvalidZipWidget" />
-            <mobileLocationModalQuestion
+            <mobileLocationModalQuestions
+                v-model="mobileLocationQuestion"
                 cmsWidgetName="MobileLocationModalWidget"
                 modalWidgetName="LocationModalWidget"
-                textboxQuestionWidgetName="MobileLocationQuestionWidget" />    
+                textboxQuestionWidgetName="MobileLocationQuestionWidget" />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 :isForwardActionDisabled="!meta.valid"
@@ -26,7 +27,7 @@ fmg
 <script>
 // Components
 import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question";
-import mobileLocationModalQuestion from "@/layouts/service-location/mobile-location-modal-question/mobile-location-modal-question";
+import mobileLocationModalQuestions from "@/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions";
 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";
@@ -39,7 +40,17 @@ import { settleAllPromises } from "@/helpers/layout-helper";
 export default {
     name: "service-location",
     data() {
-        return {};
+        return {
+            mobileLocationQuestion: {
+                addressQuestions: {
+                    streetAddress: "",
+                    apartmentNumberOrBusinessName: "",
+                    city: "",
+                    state: "",
+                    zipCode: "",
+                },
+            },
+        };
     },
     async beforeRouteEnter(to, from, next) {
         // Call APIs
@@ -70,7 +81,7 @@ export default {
     },
     components: {
         serviceZipModalQuestion,
-        mobileLocationModalQuestion,
+        mobileLocationModalQuestions,
         funnelHeader,
         funnelFooter,
         funnelSubHeader,

From c782dd7e9f3b5e26256a92ddeea37f145ea3c49b Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Fri, 27 Jan 2023 10:28:46 -0500
Subject: [PATCH 091/261] CSR-1012 | created content-group-modal

---
 src/digital-components/modal/modal.vue        | 61 ++-----------
 .../content-group-modal.spec.js               |  3 +
 .../content-group-modal.vue                   | 88 +++++++++++++++++++
 .../service-location/service-location.vue     |  1 -
 .../service-zip-modal-question.vue            | 31 ++++---
 5 files changed, 116 insertions(+), 68 deletions(-)
 create mode 100644 src/fmg-components/content-group-modal/content-group-modal.spec.js
 create mode 100644 src/fmg-components/content-group-modal/content-group-modal.vue

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index acb545e52..a4efbba3e 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -3,7 +3,7 @@
     <div
         class="modal fade modal-component"
         v-on="{ 'hidden.bs.modal': resetButtonStyle, 'shown.bs.modal': onModalOpenedCallback }"
-        :id="cmsWidgetName"
+        :id="modalId"
         tabindex="-1"
         aria-labelledby="ModalComponentLabel"
         aria-hidden="true">
@@ -11,22 +11,12 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <button
-                        ref="modalXButton"
+                        ref="closeButton"
                         type="button"
                         class="btn-close"
                         data-bs-dismiss="modal"
                         aria-label="Close"></button>
                 </div>
-                <div class="modal-body ps-5 pe-5 pt-5 pb-4" v-if="showModalBody">
-                    <img :src="ModalImage" class="mw-100 d-flex mx-auto mb-4" alt="" />
-                    <h5 class="mb-4" v-html="ModalHeadline"></h5>
-                    <p class="fw-bold mb-2 subheader-text" v-html="ModalSubheadertext"></p>
-                    <p class="mb-0" v-html="ModalBodyText"></p>
-                    <p
-                        class="my-4 caption modal-sub-body"
-                        v-if="ModalSubBodyText"
-                        v-html="ModalSubBodyText"></p>
-                </div>
                 <slot></slot>
                 <div class="modal-footer px-5 py-4">
                     <buttonMain
@@ -34,8 +24,8 @@
                         class="w-100"
                         ref="buttonMain"
                         suppressLoader
-                        :buttonText="ModalCloseButtonText"
-                        @click-event="footerButtonClick" />
+                        :buttonText="footerButtonText"
+                        @click="$emit('footerButtonEvent')" />
                 </div>
             </div>
         </div>
@@ -49,16 +39,11 @@ import { Modal } from "bootstrap";
 export default {
     name: "modal",
     props: {
-        cmsWidgetName: String,
+        modalId: String,
+        footerButtonText: String,
         onModalOpenedCallback: {
             type: Function,
         },
-
-        footerButtonCallback: {
-            type: Function,
-            // return true to close modal
-            // if undefined, footer button closes modal
-        },
     },
     data() {
         return {
@@ -66,30 +51,7 @@ export default {
         };
     },
     mounted() {
-        this.modal = new Modal(document.getElementById(this.cmsWidgetName));
-    },
-    computed: {
-        ModalHeadline() {
-            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
-        },
-        ModalSubheadertext() {
-            return this.getCmsContent(this.cmsWidgetName, "SubheaderText");
-        },
-        ModalBodyText() {
-            return this.getCmsContent(this.cmsWidgetName, "BodyText");
-        },
-        ModalSubBodyText() {
-            return this.getCmsContent(this.cmsWidgetName, "BodyText2");
-        },
-        ModalImage() {
-            return this.getCmsContent(this.cmsWidgetName, "Image");
-        },
-        ModalCloseButtonText() {
-            return this.getCmsContent(this.cmsWidgetName, "FooterText");
-        },
-        showModalBody() {
-            return this.ModalBodyText;
-        },
+        this.modal = new Modal(document.getElementById(this.modalId));
     },
     methods: {
         resetButtonStyle() {
@@ -101,15 +63,6 @@ export default {
         closeModal() {
             this.modal.hide();
         },
-        async footerButtonClick() {
-            if (this.footerButtonCallback) {
-                if (await this.footerButtonCallback()) {
-                    this.closeModal();
-                }
-            } else {
-                this.closeModal();
-            }
-        },
     },
     components: {
         buttonMain,
diff --git a/src/fmg-components/content-group-modal/content-group-modal.spec.js b/src/fmg-components/content-group-modal/content-group-modal.spec.js
new file mode 100644
index 000000000..81946c2d0
--- /dev/null
+++ b/src/fmg-components/content-group-modal/content-group-modal.spec.js
@@ -0,0 +1,3 @@
+describe("content-group-modal.vue", () => {
+    test.todo("test this");
+});
diff --git a/src/fmg-components/content-group-modal/content-group-modal.vue b/src/fmg-components/content-group-modal/content-group-modal.vue
new file mode 100644
index 000000000..a446a01d0
--- /dev/null
+++ b/src/fmg-components/content-group-modal/content-group-modal.vue
@@ -0,0 +1,88 @@
+<template>
+    <modal
+        :ref="ModalName"
+        :modalId="ModalName"
+        :footerButtonText="ModalCloseButtonText"
+        @footer-button-event="footerButtonClick">
+        <div class="modal-body ps-4 pe-4 pt-5 pb-4">
+            <img :src="ModalImage" class="mw-100 d-flex mx-auto mb-4" alt="" />
+            <h5 class="mb-4" v-html="ModalHeadline"></h5>
+            <p class="fw-bold mb-2 subheader-text" v-html="ModalSubheadertext"></p>
+            <p class="mb-0" v-html="ModalBodyText"></p>
+            <p
+                class="my-4 caption modal-sub-body"
+                v-if="ModalSubBodyText"
+                v-html="ModalSubBodyText"></p>
+        </div>
+    </modal>
+</template>
+
+<script>
+import modal from "@/digital-components/modal/modal";
+
+export default {
+    name: "content-group-modal",
+    props: {
+        cmsWidgetName: String,
+    },
+    computed: {
+        ModalName() {
+            return this.cmsWidgetName;
+        },
+        ModalHeadline() {
+            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
+        },
+        ModalSubheadertext() {
+            return this.getCmsContent(this.cmsWidgetName, "SubheaderText");
+        },
+        ModalBodyText() {
+            return this.getCmsContent(this.cmsWidgetName, "BodyText");
+        },
+        ModalSubBodyText() {
+            return this.getCmsContent(this.cmsWidgetName, "BodyText2");
+        },
+        ModalImage() {
+            return this.getCmsContent(this.cmsWidgetName, "Image");
+        },
+        ModalCloseButtonText() {
+            return this.getCmsContent(this.cmsWidgetName, "FooterText");
+        },
+    },
+    methods: {
+        openModal() {
+            this.$refs[this.ModalName()].openModal();
+        },
+
+        footerButtonClick() {
+            this.$refs[this.ModalName()].closeModal();
+        },
+    },
+    components: {
+        modal,
+    },
+};
+</script>
+
+<style lang="scss">
+.modal {
+    &.modal-component {
+        .modal-dialog {
+            .modal-content {
+                .modal-body {
+                    .modal-sub-body {
+                        color: $gray-600;
+                    }
+                    ul {
+                        margin-bottom: 0;
+                    }
+                    p {
+                        &:last-child {
+                            margin-bottom: 0;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+</style>
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index cece16fdd..a34875dbb 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -6,7 +6,6 @@ fmg
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <serviceZipModalQuestion
                 cmsWidgetName="ServiceZipModalWidget"
-                modalWidgetName="ZipModalWidget"
                 textboxQuestionWidgetName="ServiceZipQuestionWidget"
                 alertNonServiceableZipWidgetName="AlertNonServiceableZipWidget"
                 alertInvalidZipWidgetName="AlertInvalidZipWidget" />
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 169281b71..e3b9a767a 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -17,10 +17,11 @@
         </div>
     </div>
     <modal
-        ref="zipCodeInputModal"
-        :cmsWidgetName="this.modalWidgetName"
-        :onModalOpenedCallback="onModalOpen"
-        :footerButtonCallback="setZip">
+        :ref="modalName"
+        :modalId="modalName"
+        :onModalOpenedCallback="onModalOpened"
+        :footerButtonText="footerButtonText"
+        @footer-button-event="setZip">
         <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
                 ref="zipInputTextQuestion"
@@ -80,14 +81,13 @@ export default {
     },
     props: {
         cmsWidgetName: String,
-        modalWidgetName: String,
         textboxQuestionWidgetName: String,
         alertNonServiceableZipWidgetName: String,
         alertInvalidZipWidgetName: String,
     },
     methods: {
         openZipCodeModal() {
-            this.$refs.zipCodeInputModal.openModal();
+            this.$refs[this.modalName].openModal();
         },
         getZipFromStore() {
             return this.$store.getters.order.serviceLocation.zipCode;
@@ -104,7 +104,7 @@ export default {
 
         resetsOnZipInput() {
             this.resetAlerts();
-            this.$refs.zipCodeInputModal.resetButtonStyle();
+            this.$refs[this.modalName].resetButtonStyle();
         },
 
         focusOnZipInput() {
@@ -114,7 +114,7 @@ export default {
             });
         },
 
-        onModalOpen() {
+        onModalOpened() {
             this.serviceZipCodeInput = this.serviceZip;
             this.resetsOnZipInput();
             this.focusOnZipInput();
@@ -126,7 +126,7 @@ export default {
             const zipLength = 5;
             if (!this.serviceZipCodeInput || this.serviceZipCodeInput.length < zipLength) {
                 // prevent reading 1111 as 01111
-                return false;
+                return;
             }
 
             const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
@@ -139,14 +139,14 @@ export default {
                 this.serviceZip = this.serviceZipCodeInput;
                 this.serviceZipState = zipCodeData.state;
 
-                // close modal
-                return true;
+                this.$refs[this.modalName].closeModal();
             }
-
-            return false;
         },
     },
     computed: {
+        modalName() {
+            return this.cmsWidgetName;
+        },
         questionText() {
             return this.getCmsContent(this.cmsWidgetName, "HeaderText");
         },
@@ -154,6 +154,11 @@ export default {
             if (this.serviceZip && this.serviceZip != 0) {
                 return this.serviceZipState + ", " + this.serviceZip;
             }
+            return (
+                this.getCmsContent(this.cmsWidgetName, "SubheaderText") || "Enter your service ZIP"
+            );
+        },
+        footerButtonText() {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
         AlertNonServiceableZipHeader() {

From dfa889b4a6084d3d6e66babd797efe525c4badb4 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Fri, 27 Jan 2023 10:46:04 -0500
Subject: [PATCH 092/261] CSR-1012 | moved body padding into modal component

---
 src/digital-components/modal/modal.vue        |  4 +++-
 .../content-group-modal.vue                   | 18 +++++++--------
 .../mobile-location-modal-questions.vue       | 22 ++++++++++---------
 .../service-zip-modal-question.vue            |  2 --
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index a4efbba3e..a2151215a 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -17,7 +17,9 @@
                         data-bs-dismiss="modal"
                         aria-label="Close"></button>
                 </div>
-                <slot></slot>
+                <div class="modal-body ps-5 pe-5 pt-5 pb-4">
+                    <slot></slot>
+                </div>
                 <div class="modal-footer px-5 py-4">
                     <buttonMain
                         isPrimary
diff --git a/src/fmg-components/content-group-modal/content-group-modal.vue b/src/fmg-components/content-group-modal/content-group-modal.vue
index a446a01d0..ab0bdee86 100644
--- a/src/fmg-components/content-group-modal/content-group-modal.vue
+++ b/src/fmg-components/content-group-modal/content-group-modal.vue
@@ -4,16 +4,14 @@
         :modalId="ModalName"
         :footerButtonText="ModalCloseButtonText"
         @footer-button-event="footerButtonClick">
-        <div class="modal-body ps-4 pe-4 pt-5 pb-4">
-            <img :src="ModalImage" class="mw-100 d-flex mx-auto mb-4" alt="" />
-            <h5 class="mb-4" v-html="ModalHeadline"></h5>
-            <p class="fw-bold mb-2 subheader-text" v-html="ModalSubheadertext"></p>
-            <p class="mb-0" v-html="ModalBodyText"></p>
-            <p
-                class="my-4 caption modal-sub-body"
-                v-if="ModalSubBodyText"
-                v-html="ModalSubBodyText"></p>
-        </div>
+        <img :src="ModalImage" class="mw-100 d-flex mx-auto mb-4" alt="" />
+        <h5 class="mb-4" v-html="ModalHeadline"></h5>
+        <p class="fw-bold mb-2 subheader-text" v-html="ModalSubheadertext"></p>
+        <p class="mb-0" v-html="ModalBodyText"></p>
+        <p
+            class="my-4 caption modal-sub-body"
+            v-if="ModalSubBodyText"
+            v-html="ModalSubBodyText"></p>
     </modal>
 </template>
 
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 7aea041e9..3a82b0362 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -19,17 +19,16 @@
     </div>
     <modal
         ref="mobileServiceModal"
-        :cmsWidgetName="this.modalWidgetName"
+        :modalId="this.modalWidgetName"
         :onModalOpenedCallback="onModalOpened"
-        :footerButtonCallback="saveMobileLocationData">
-        <div class="modal-body ps-5 pe-5 pt-5 pb-4">
-            <addressQuestions
-                ref="addressQuestions"
-                v-model="mobileQuestionModel.addressQuestions"
-                captureApartmentNumberOrBusinessName="true" />
-            <vehicleProtectedQuestion v-model="mobileQuestionModel.selectedValue"/>
-            <textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
-        </div>
+        :footerButtonText="mobileLocationDisplayText"
+        @footer-button-event="saveMobileLocationData">
+        <addressQuestions
+            ref="addressQuestions"
+            v-model="mobileQuestionModel.addressQuestions"
+            captureApartmentNumberOrBusinessName="true" />
+        <vehicleProtectedQuestion v-model="mobileQuestionModel.selectedValue"/>
+        <textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
     </modal>
 </template>
 
@@ -106,6 +105,9 @@ export default {
                 input.focus();
             });
         },
+        saveMobileLocationData() {
+
+        },
     },
     computed: {
         getModalId() {
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index e3b9a767a..478ac8766 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -22,7 +22,6 @@
         :onModalOpenedCallback="onModalOpened"
         :footerButtonText="footerButtonText"
         @footer-button-event="setZip">
-        <div class="ps-4 pe-4 pb-4">
             <textboxQuestion
                 ref="zipInputTextQuestion"
                 :cmsWidgetName="this.textboxQuestionWidgetName"
@@ -48,7 +47,6 @@
                 :manualHeadline="AlertNonServiceableZipHeader"
                 alertClass="alert-danger"
                 v-bind:isDismissible="false" />
-        </div>
     </modal>
 </template>
 

From c9736f6d4ba921c86c9bbceed9ddb07fce73eeb8 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Fri, 27 Jan 2023 14:08:49 -0500
Subject: [PATCH 093/261] CSR-1012 | content group modals on quote page

---
 .../content-group-modal.vue                   | 24 ---------
 src/layouts/quote/quote.vue                   | 14 ++---
 .../mobile-location-modal-questions.vue       | 11 ++--
 .../vehicle-protected-question.vue            |  4 +-
 .../service-zip-modal-question.vue            | 54 +++++++++----------
 5 files changed, 39 insertions(+), 68 deletions(-)

diff --git a/src/fmg-components/content-group-modal/content-group-modal.vue b/src/fmg-components/content-group-modal/content-group-modal.vue
index ab0bdee86..f0d2ba75a 100644
--- a/src/fmg-components/content-group-modal/content-group-modal.vue
+++ b/src/fmg-components/content-group-modal/content-group-modal.vue
@@ -60,27 +60,3 @@ export default {
     },
 };
 </script>
-
-<style lang="scss">
-.modal {
-    &.modal-component {
-        .modal-dialog {
-            .modal-content {
-                .modal-body {
-                    .modal-sub-body {
-                        color: $gray-600;
-                    }
-                    ul {
-                        margin-bottom: 0;
-                    }
-                    p {
-                        &:last-child {
-                            margin-bottom: 0;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-</style>
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 21f5753bb..620310d5e 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -29,11 +29,11 @@ digital
                     cmsWidgetName="quoteDisclaimer"
                     justifyText="left"
                     typeStyle="caption"
-                    class="mt-7" />
-                <modal cmsWidgetName="RainDefenseModal" />
-                <modal cmsWidgetName="FrontWiperModal" />
-                <modal cmsWidgetName="RearWiperModal" />
-                <modal cmsWidgetName="RecalModal" />
+                    class="mt-4" />
+                <contentGroupModal cmsWidgetName="RainDefenseModal" />
+                <contentGroupModal cmsWidgetName="FrontWiperModal" />
+                <contentGroupModal cmsWidgetName="RearWiperModal" />
+                <contentGroupModal cmsWidgetName="RecalModal" />
                 <funnel-footer
                     cmsWidgetName="FunnelFooterWidget"
                     :isForwardActionDisabled="!meta.valid"
@@ -54,7 +54,7 @@ import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-heade
 import cashOrInsuranceQuestion from "./cash-or-insurance-question/cash-or-insurance-question";
 import servicePackageQuestion from "./service-package-question/service-package-question";
 import textBlock from "@/digital-components/text-block/text-block";
-import modal from "@/digital-components/modal/modal";
+import contentGroupModal from "@/fmg-components/content-group-modal/content-group-modal";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import baseMixin from "@/mixins/base-mixin.js";
 import vehicleQuestionsMixin from "../../mixins/vehicle-questions-mixin";
@@ -202,7 +202,7 @@ export default {
         textBlock,
         cashOrInsuranceQuestion,
         servicePackageQuestion,
-        modal,
+        contentGroupModal,
         loadingModal,
     },
 };
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 3a82b0362..6fa8728ba 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -27,7 +27,7 @@
             ref="addressQuestions"
             v-model="mobileQuestionModel.addressQuestions"
             captureApartmentNumberOrBusinessName="true" />
-        <vehicleProtectedQuestion v-model="mobileQuestionModel.selectedValue"/>
+        <vehicleProtectedQuestion v-model="mobileQuestionModel.selectedValue" />
         <textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
     </modal>
 </template>
@@ -49,7 +49,7 @@ import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 import { storeActions } from "@/constants/store-actions.js";
 import baseMixin from "@/mixins/base-mixin.js";
-import TextBlock from '../../../digital-components/text-block/text-block.vue';
+import TextBlock from "../../../digital-components/text-block/text-block.vue";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -105,9 +105,7 @@ export default {
                 input.focus();
             });
         },
-        saveMobileLocationData() {
-
-        },
+        saveMobileLocationData() {},
     },
     computed: {
         getModalId() {
@@ -127,7 +125,6 @@ export default {
                 this.$emit("update:modelValue", newValue);
             },
         },
-
     },
     mounted() {},
     components: {
@@ -135,7 +132,7 @@ export default {
         modal,
         addressQuestions,
         vehicleProtectedQuestion,
-        textBlock
+        textBlock,
     },
 };
 </script>
diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
index b8c795d5f..68dc5e7b4 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
@@ -18,7 +18,7 @@ export default {
     name: "vehicle-protected-question",
     data() {
         return {
-            answers: [ "Yes", "No" ],
+            answers: ["Yes", "No"],
         };
     },
     props: {
@@ -50,4 +50,4 @@ export default {
         },
     },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 478ac8766..be33ddb86 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -22,31 +22,31 @@
         :onModalOpenedCallback="onModalOpened"
         :footerButtonText="footerButtonText"
         @footer-button-event="setZip">
-            <textboxQuestion
-                ref="zipInputTextQuestion"
-                :cmsWidgetName="this.textboxQuestionWidgetName"
-                v-model="serviceZipCodeInput"
-                inputId="serviceZipCodeInput"
-                questionAlignment="center"
-                mask="#####"
-                isRequired
-                disableAutoFill
-                validationRules="zip-required|zip-format" />
-            <alert
-                ref="alertInvalidZip"
-                v-if="displayInvalidZipAlert"
-                class="my-4"
-                :cmsWidgetName="this.alertInvalidZipWidgetName"
-                alertClass="alert-danger"
-                v-bind:isDismissible="false" />
-            <alert
-                ref="alertNonServiceableZip"
-                v-if="displayNonServiceableZipAlert"
-                class="my-4"
-                :cmsWidgetName="this.alertNonServiceableZipWidgetName"
-                :manualHeadline="AlertNonServiceableZipHeader"
-                alertClass="alert-danger"
-                v-bind:isDismissible="false" />
+        <textboxQuestion
+            ref="zipInputTextQuestion"
+            :cmsWidgetName="this.textboxQuestionWidgetName"
+            v-model="serviceZipCodeInput"
+            inputId="serviceZipCodeInput"
+            questionAlignment="center"
+            mask="#####"
+            isRequired
+            disableAutoFill
+            validationRules="zip-required|zip-format" />
+        <alert
+            ref="alertInvalidZip"
+            v-if="displayInvalidZipAlert"
+            class="my-4"
+            :cmsWidgetName="this.alertInvalidZipWidgetName"
+            alertClass="alert-danger"
+            v-bind:isDismissible="false" />
+        <alert
+            ref="alertNonServiceableZip"
+            v-if="displayNonServiceableZipAlert"
+            class="my-4"
+            :cmsWidgetName="this.alertNonServiceableZipWidgetName"
+            :manualHeadline="AlertNonServiceableZipHeader"
+            alertClass="alert-danger"
+            v-bind:isDismissible="false" />
     </modal>
 </template>
 
@@ -152,9 +152,7 @@ export default {
             if (this.serviceZip && this.serviceZip != 0) {
                 return this.serviceZipState + ", " + this.serviceZip;
             }
-            return (
-                this.getCmsContent(this.cmsWidgetName, "SubheaderText") || "Enter your service ZIP"
-            );
+            return this.getCmsContent(this.cmsWidgetName, "SubheaderText");
         },
         footerButtonText() {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");

From 3abb66cf8edeff5cacd364afd960d58beb2a83d1 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 27 Jan 2023 16:15:35 -0500
Subject: [PATCH 094/261] Got the programmatic opening of modals working on
 quote page, still need to handle the buttonQuestion issue

---
 .../button-question/button-question.vue       |  4 ++
 .../content-group-modal.vue                   |  4 +-
 src/layouts/quote/quote.vue                   | 18 ++++---
 .../service-package-question.vue              |  4 +-
 .../service-package-radio.vue                 | 12 ++++-
 .../mobile-location-modal-questions.vue       | 11 ++--
 .../vehicle-protected-question.vue            |  4 +-
 .../service-zip-modal-question.vue            | 50 +++++++++----------
 8 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 4c60b0708..7defb5b5d 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -53,6 +53,7 @@ https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Com
                             :lastValuePushedToGa="lastValuePushedToGa"
                             :setLastValuePushedToGa="setLastValuePushedToGa"
                             :suppressError="suppressError"
+                            @openModal="openModal"
                             v-model="selectedValues" />
                         <!-- For nested questions -->
                         <transition name="fade" mode="out-in">
@@ -214,6 +215,9 @@ export default {
         setLastValuePushedToGa(lastValuePushedToGa) {
             this.lastValuePushedToGa = lastValuePushedToGa;
         },
+        openModal(modalName) {
+            this.$emit("openModal", modalName);
+        }
     },
     components: {
         listButton,
diff --git a/src/fmg-components/content-group-modal/content-group-modal.vue b/src/fmg-components/content-group-modal/content-group-modal.vue
index ab0bdee86..d9d9da937 100644
--- a/src/fmg-components/content-group-modal/content-group-modal.vue
+++ b/src/fmg-components/content-group-modal/content-group-modal.vue
@@ -48,11 +48,11 @@ export default {
     },
     methods: {
         openModal() {
-            this.$refs[this.ModalName()].openModal();
+            this.$refs[this.ModalName].openModal();
         },
 
         footerButtonClick() {
-            this.$refs[this.ModalName()].closeModal();
+            this.$refs[this.ModalName].closeModal();
         },
     },
     components: {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 5a65933b0..b5eb3ff6e 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">
@@ -22,6 +21,7 @@ digital
                     :availableLineItems="availableLineItems"
                     :isInsuranceSelected="isInsuranceSelected"
                     @vapsItemsSelected="vapsItemsSelectedAction"
+                    @openModal="openModalAction"
                     validationRules="option-required"
                     isRequired />
 
@@ -30,10 +30,10 @@ digital
                     justifyText="left"
                     typeStyle="caption"
                     class="mt-4" />
-                <modal cmsWidgetName="RainDefenseModal" />
-                <modal cmsWidgetName="FrontWiperModal" />
-                <modal cmsWidgetName="RearWiperModal" />
-                <modal cmsWidgetName="RecalModal" />
+                <contentGroupModal ref="RainDefenseModal" cmsWidgetName="RainDefenseModal" />
+                <contentGroupModal ref="FrontWiperModal" cmsWidgetName="FrontWiperModal" />
+                <contentGroupModal ref="RearWiperModal" cmsWidgetName="RearWiperModal" />
+                <contentGroupModal ref="RecalModal" cmsWidgetName="RecalModal" />
                 <funnel-footer
                     cmsWidgetName="FunnelFooterWidget"
                     :isForwardActionDisabled="!meta.valid"
@@ -54,7 +54,8 @@ import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-heade
 import cashOrInsuranceQuestion from "./cash-or-insurance-question/cash-or-insurance-question";
 import servicePackageQuestion from "./service-package-question/service-package-question";
 import textBlock from "@/digital-components/text-block/text-block";
-import modal from "@/digital-components/modal/modal";
+import contentGroupModal from "@/fmg-components/content-group-modal/content-group-modal";
+//import modal from "@/digital-components/modal/modal";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import baseMixin from "@/mixins/base-mixin.js";
 import vehicleQuestionsMixin from "../../mixins/vehicle-questions-mixin";
@@ -134,6 +135,9 @@ export default {
         };
     },
     methods: {
+        openModalAction(modalName) {
+            this.$refs[modalName].openModal();
+        },
         arePagePrerequisitesValid() {
             return (
                 store.getters.order.serviceLocation.zipCode &&
@@ -202,7 +206,7 @@ export default {
         textBlock,
         cashOrInsuranceQuestion,
         servicePackageQuestion,
-        modal,
+        contentGroupModal,
         loadingModal,
     },
 };
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..25a0dfb2f 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -1,10 +1,11 @@
 <template>
-    <buttonQuestion
+    <buttonQuestion ref="buttonQuestion"
         :answers="servicePackageAnswers"
         :groupName="groupName"
         buttonTypeString="servicePackageRadio"
         :buttonTypeObject="servicePackageRadio"
         v-model="selectedPackageName"
+        @openModal="openModal"
         :validationRules="validationRules"
         :isRequired="isRequired" />
 </template>
@@ -141,6 +142,7 @@ export default {
         shouldDisplayTierTwoPackage() {
             return this.frontWipersApplicableForTierTwo || this.rearWiperApplicableForTierTwo;
         },
+
     },
     methods: {
         processIfStatements,
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 9738d3dde..8286efde7 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
@@ -29,12 +29,19 @@
                                 <span v-if="!doesCopyContainTextLink(copy)" v-html="copy"></span>
                                 <span v-else>
                                     <textLink
+                                        linkType="text"
+                                        :text="getRouterLinkDisplayTextFromCopy(copy)"
+                                        href="#!"
+                                        @click-event="$emit('openModal', getRouterLinkRouteFromCopy(copy))"
+                                        :data-bs-target="'#' + getRouterLinkRouteFromCopy(copy)"
+                                        aria-label="Modal window" />    
+                                    <!-- <textLink
                                         linkType="text"
                                         :text="getRouterLinkDisplayTextFromCopy(copy)"
                                         href="#!"
                                         data-bs-toggle="modal"
                                         :data-bs-target="'#' + getRouterLinkRouteFromCopy(copy)"
-                                        aria-label="Modal window" />
+                                        aria-label="Modal window" /> -->
                                 </span>
                             </template>
                         </li>
@@ -88,6 +95,9 @@ export default {
                 .split(/(?:<li(?:.*?)>)|(?:<\/li>)/g)
                 .filter((lineItem) => lineItem);
         },
+        openModal(modalName) {
+            this.$emit("openModal", modalName);
+        }
     },
 };
 </script>
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 3a82b0362..6fa8728ba 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -27,7 +27,7 @@
             ref="addressQuestions"
             v-model="mobileQuestionModel.addressQuestions"
             captureApartmentNumberOrBusinessName="true" />
-        <vehicleProtectedQuestion v-model="mobileQuestionModel.selectedValue"/>
+        <vehicleProtectedQuestion v-model="mobileQuestionModel.selectedValue" />
         <textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
     </modal>
 </template>
@@ -49,7 +49,7 @@ import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 import { storeActions } from "@/constants/store-actions.js";
 import baseMixin from "@/mixins/base-mixin.js";
-import TextBlock from '../../../digital-components/text-block/text-block.vue';
+import TextBlock from "../../../digital-components/text-block/text-block.vue";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -105,9 +105,7 @@ export default {
                 input.focus();
             });
         },
-        saveMobileLocationData() {
-
-        },
+        saveMobileLocationData() {},
     },
     computed: {
         getModalId() {
@@ -127,7 +125,6 @@ export default {
                 this.$emit("update:modelValue", newValue);
             },
         },
-
     },
     mounted() {},
     components: {
@@ -135,7 +132,7 @@ export default {
         modal,
         addressQuestions,
         vehicleProtectedQuestion,
-        textBlock
+        textBlock,
     },
 };
 </script>
diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
index b8c795d5f..68dc5e7b4 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
@@ -18,7 +18,7 @@ export default {
     name: "vehicle-protected-question",
     data() {
         return {
-            answers: [ "Yes", "No" ],
+            answers: ["Yes", "No"],
         };
     },
     props: {
@@ -50,4 +50,4 @@ export default {
         },
     },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 478ac8766..687afa6a6 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -22,31 +22,31 @@
         :onModalOpenedCallback="onModalOpened"
         :footerButtonText="footerButtonText"
         @footer-button-event="setZip">
-            <textboxQuestion
-                ref="zipInputTextQuestion"
-                :cmsWidgetName="this.textboxQuestionWidgetName"
-                v-model="serviceZipCodeInput"
-                inputId="serviceZipCodeInput"
-                questionAlignment="center"
-                mask="#####"
-                isRequired
-                disableAutoFill
-                validationRules="zip-required|zip-format" />
-            <alert
-                ref="alertInvalidZip"
-                v-if="displayInvalidZipAlert"
-                class="my-4"
-                :cmsWidgetName="this.alertInvalidZipWidgetName"
-                alertClass="alert-danger"
-                v-bind:isDismissible="false" />
-            <alert
-                ref="alertNonServiceableZip"
-                v-if="displayNonServiceableZipAlert"
-                class="my-4"
-                :cmsWidgetName="this.alertNonServiceableZipWidgetName"
-                :manualHeadline="AlertNonServiceableZipHeader"
-                alertClass="alert-danger"
-                v-bind:isDismissible="false" />
+        <textboxQuestion
+            ref="zipInputTextQuestion"
+            :cmsWidgetName="this.textboxQuestionWidgetName"
+            v-model="serviceZipCodeInput"
+            inputId="serviceZipCodeInput"
+            questionAlignment="center"
+            mask="#####"
+            isRequired
+            disableAutoFill
+            validationRules="zip-required|zip-format" />
+        <alert
+            ref="alertInvalidZip"
+            v-if="displayInvalidZipAlert"
+            class="my-4"
+            :cmsWidgetName="this.alertInvalidZipWidgetName"
+            alertClass="alert-danger"
+            v-bind:isDismissible="false" />
+        <alert
+            ref="alertNonServiceableZip"
+            v-if="displayNonServiceableZipAlert"
+            class="my-4"
+            :cmsWidgetName="this.alertNonServiceableZipWidgetName"
+            :manualHeadline="AlertNonServiceableZipHeader"
+            alertClass="alert-danger"
+            v-bind:isDismissible="false" />
     </modal>
 </template>
 

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 095/261] 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 096/261] 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 097/261] 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 9f363c5ed9007a5b2121916a08a82cab9866060a Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 31 Jan 2023 08:37:14 -0500
Subject: [PATCH 098/261] Checkpoint - Quote page models now opening
 programatically

---
 .../button-question/button-question.vue              |  9 +++++----
 .../address-questions/address-questions.vue          |  6 ------
 .../service-package-question.vue                     |  4 ++--
 .../service-package-radio/service-package-radio.vue  | 12 +++++++-----
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 7defb5b5d..7472c95f5 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -53,7 +53,7 @@ https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Com
                             :lastValuePushedToGa="lastValuePushedToGa"
                             :setLastValuePushedToGa="setLastValuePushedToGa"
                             :suppressError="suppressError"
-                            @openModal="openModal"
+                            @nestedComponentEvent="handleNestedComponentEvent"
                             v-model="selectedValues" />
                         <!-- For nested questions -->
                         <transition name="fade" mode="out-in">
@@ -215,9 +215,10 @@ export default {
         setLastValuePushedToGa(lastValuePushedToGa) {
             this.lastValuePushedToGa = lastValuePushedToGa;
         },
-        openModal(modalName) {
-            this.$emit("openModal", modalName);
-        }
+        handleNestedComponentEvent(event) {
+            const eventName = event.eventName;
+            this.$emit(`${eventName}`, event.args);
+        },
     },
     components: {
         listButton,
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index ff7fb0d9a..ff8e7d7a7 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -320,7 +320,6 @@ export default {
                     }
 
                     function fillInAddress(place) {
-                        console.log("fillInAddress");
                         if (!place) {
                             place = autocomplete.getPlace();
                         }
@@ -416,11 +415,6 @@ export default {
                 }
             },
         },
-        "addressModel.streetAddress": {
-            handler(newValue, oldValue) {
-                console.log(`I got changed from ${oldValue} to ${newValue}`);
-            },
-        },
     },
     components: {
         textboxQuestion,
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 25a0dfb2f..b0f3c1023 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -1,5 +1,6 @@
 <template>
-    <buttonQuestion ref="buttonQuestion"
+    <buttonQuestion
+        ref="buttonQuestion"
         :answers="servicePackageAnswers"
         :groupName="groupName"
         buttonTypeString="servicePackageRadio"
@@ -142,7 +143,6 @@ export default {
         shouldDisplayTierTwoPackage() {
             return this.frontWipersApplicableForTierTwo || this.rearWiperApplicableForTierTwo;
         },
-
     },
     methods: {
         processIfStatements,
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 8286efde7..83f430792 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
@@ -32,9 +32,14 @@
                                         linkType="text"
                                         :text="getRouterLinkDisplayTextFromCopy(copy)"
                                         href="#!"
-                                        @click-event="$emit('openModal', getRouterLinkRouteFromCopy(copy))"
+                                        @click-event="
+                                            $emit('nestedComponentEvent', {
+                                                eventName: 'openModal',
+                                                args: getRouterLinkRouteFromCopy(copy),
+                                            })
+                                        "
                                         :data-bs-target="'#' + getRouterLinkRouteFromCopy(copy)"
-                                        aria-label="Modal window" />    
+                                        aria-label="Modal window" />
                                     <!-- <textLink
                                         linkType="text"
                                         :text="getRouterLinkDisplayTextFromCopy(copy)"
@@ -95,9 +100,6 @@ export default {
                 .split(/(?:<li(?:.*?)>)|(?:<\/li>)/g)
                 .filter((lineItem) => lineItem);
         },
-        openModal(modalName) {
-            this.$emit("openModal", modalName);
-        }
     },
 };
 </script>

From d62e6666180fe0918355c71ae2fbecf8a2c38006 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 31 Jan 2023 08:53:31 -0500
Subject: [PATCH 099/261] Added vehicle protected question component

---
 .../vehicle-protected-question.vue            | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
index 68dc5e7b4..4fb06a201 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
@@ -16,11 +16,6 @@ import { storeActions } from "@/constants/store-actions.js";
 import baseMixin from "@/mixins/base-mixin.js";
 export default {
     name: "vehicle-protected-question",
-    data() {
-        return {
-            answers: ["Yes", "No"],
-        };
-    },
     props: {
         modelValue: String,
         cmsWidgetName: String,
@@ -40,6 +35,9 @@ export default {
                 this.$emit("update:modelValue", newValue);
             },
         },
+        answers() {
+            return this.getCmsContent(this.cmsWidgetName, "Answers");
+        },
     },
     methods: {
         loadInitialData() {
@@ -51,3 +49,16 @@ export default {
     },
 };
 </script>
+
+<style lang="scss">
+.question-text {
+    margin-top: 1.5rem;
+    margin-bottom: 1rem;
+    font-size: 1rem;
+    line-height: 1.625rem;
+
+    & > span {
+        text-align: left;
+    }
+}
+</style>

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 100/261] 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 101/261] 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 aa2f50199e849b37fef3662e8c6f02b414f695be Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 1 Feb 2023 10:57:29 -0500
Subject: [PATCH 102/261] Changes to button-question component

---
 src/digital-components/button-question/button-question.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 7472c95f5..50e4b478c 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -53,7 +53,7 @@ https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Com
                             :lastValuePushedToGa="lastValuePushedToGa"
                             :setLastValuePushedToGa="setLastValuePushedToGa"
                             :suppressError="suppressError"
-                            @nestedComponentEvent="handleNestedComponentEvent"
+                            @buttonEvent="handleButtonEvent"
                             v-model="selectedValues" />
                         <!-- For nested questions -->
                         <transition name="fade" mode="out-in">
@@ -215,9 +215,9 @@ export default {
         setLastValuePushedToGa(lastValuePushedToGa) {
             this.lastValuePushedToGa = lastValuePushedToGa;
         },
-        handleNestedComponentEvent(event) {
+        handleButtonEvent(event) {
             const eventName = event.eventName;
-            this.$emit(`${eventName}`, event.args);
+            this.$emit(`buttonEvent-${eventName}`, event.args);
         },
     },
     components: {

From 8c63e1bea2343560c7abda40ef4f8ccac969c903 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 1 Feb 2023 11:08:17 -0500
Subject: [PATCH 103/261] changed '-' to '.' in handler for consistency

---
 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 50e4b478c..0ea02ce05 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -217,7 +217,7 @@ export default {
         },
         handleButtonEvent(event) {
             const eventName = event.eventName;
-            this.$emit(`buttonEvent-${eventName}`, event.args);
+            this.$emit(`buttonEvent.${eventName}`, event.args);
         },
     },
     components: {

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 104/261] 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 9e762ac770e4113be5a7f6d6f807a72e5fe532fe Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 1 Feb 2023 13:42:13 -0500
Subject: [PATCH 105/261] Updated changes to modal code for Quote page

---
 src/layouts/quote/quote.vue                                     | 2 +-
 .../quote/service-package-question/service-package-question.vue | 1 -
 .../service-package-radio/service-package-radio.vue             | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index b5eb3ff6e..695628db1 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -21,7 +21,7 @@
                     :availableLineItems="availableLineItems"
                     :isInsuranceSelected="isInsuranceSelected"
                     @vapsItemsSelected="vapsItemsSelectedAction"
-                    @openModal="openModalAction"
+                    v-on="{ 'buttonEvent.openModal': openModalAction }"
                     validationRules="option-required"
                     isRequired />
 
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 b0f3c1023..e1b8ce716 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -6,7 +6,6 @@
         buttonTypeString="servicePackageRadio"
         :buttonTypeObject="servicePackageRadio"
         v-model="selectedPackageName"
-        @openModal="openModal"
         :validationRules="validationRules"
         :isRequired="isRequired" />
 </template>
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 83f430792..e806ac261 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
@@ -33,7 +33,7 @@
                                         :text="getRouterLinkDisplayTextFromCopy(copy)"
                                         href="#!"
                                         @click-event="
-                                            $emit('nestedComponentEvent', {
+                                            $emit('buttonEvent', {
                                                 eventName: 'openModal',
                                                 args: getRouterLinkRouteFromCopy(copy),
                                             })

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 106/261] 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 107/261] 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 108/261] 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 109/261] 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 110/261] 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 111/261] 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 112/261] 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 113/261] 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 55f49606f7bb10dae2a6831871f25fb3e2a7c9e4 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 3 Feb 2023 16:01:43 -0500
Subject: [PATCH 114/261] Modal stuff, including validation for localized
 fields, modal header, etc

---
 src/digital-components/modal/modal.vue        |  23 +++-
 .../textbox-question/textbox-question.vue     |   6 +-
 .../address-questions/address-questions.vue   |  11 +-
 .../mobile-location-modal-questions.vue       | 112 +++++++++++-------
 .../vehicle-protected-question.vue            |  10 ++
 .../service-location/service-location.vue     |  13 +-
 .../service-zip-modal-question.vue            |   8 +-
 7 files changed, 124 insertions(+), 59 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index a2151215a..238f63aa6 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -9,15 +9,18 @@
         aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered">
             <div class="modal-content">
-                <div class="modal-header">
+                <div class="modal-header mb-2 mt-2">
+                    <label v-if="headerText" class="modal-title d-flex justify-content-center pb-0 w-100">
+                        {{ headerText }}
+                    </label>
                     <button
                         ref="closeButton"
                         type="button"
                         class="btn-close"
                         data-bs-dismiss="modal"
-                        aria-label="Close"></button>
+                        aria-label="Close"></button>                        
                 </div>
-                <div class="modal-body ps-5 pe-5 pt-5 pb-4">
+                <div class="modal-body ps-5 pe-5 pb-4 pt-0">
                     <slot></slot>
                 </div>
                 <div class="modal-footer px-5 py-4">
@@ -27,7 +30,7 @@
                         ref="buttonMain"
                         suppressLoader
                         :buttonText="footerButtonText"
-                        @click="$emit('footerButtonEvent')" />
+                        @click-event="$emit('footer-button-event')" />
                 </div>
             </div>
         </div>
@@ -42,6 +45,7 @@ export default {
     name: "modal",
     props: {
         modalId: String,
+        headerText: String,
         footerButtonText: String,
         onModalOpenedCallback: {
             type: Function,
@@ -82,10 +86,19 @@ export default {
         color: $black;
     }
     .modal-header {
-        border-bottom: none;
+        border-bottom: none;      
         .btn-close {
+            position: absolute;
+            right: 1rem;
+            top: 1rem;
             background-image: url("data:image/svg+xml,%3Csvg width='16' height='16' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M15.6874 1.82179L9.50889 8L15.6874 14.1782C16.1042 14.595 16.1042 15.2707 15.6874 15.6875C15.4843 15.8907 15.2146 16 14.9328 16C14.6514 16 14.3818 15.8906 14.1787 15.6875L8.00017 9.50934L1.82171 15.6875C1.6182 15.8907 1.34876 16 1.06708 16C0.785733 16 0.516056 15.8906 0.312965 15.6875C-0.10429 15.2706 -0.10429 14.5952 0.312797 14.1784L6.03276 8.45867L6.49146 8L0.312945 1.82177C-0.10429 1.40483 -0.10429 0.729418 0.312797 0.31262C0.728936 -0.104145 1.40489 -0.104051 1.82185 0.31262L7.54152 6.03202L8.00017 6.49065L14.1786 0.312472C14.5955 -0.104107 15.2707 -0.104201 15.6874 0.312452C16.1042 0.729289 16.1042 1.40496 15.6874 1.82179Z' fill='%231574A1'/%3E%3C/svg%3E%0A");
             opacity: 1;
+
+        };
+
+        .modal-title {
+            font-weight: 500;
+            color: rgb(0, 0, 0);
         }
     }
     &.modal-component {
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index a19823b0d..ac963ca0f 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="textbox-question" :class="(errors && errors.length) || hasError ? 'has-error' : ''">
-        <label
+        <label v-if="displayQuestionText"
             :for="inputId"
             :aria-label="questionText"
             class="form-label"
@@ -53,6 +53,10 @@ export default {
             type: String,
             default: "",
         },
+        displayQuestionText: {
+            type: Boolean,
+            default: true
+        },
         modelValue: String,
         inputId: String,
         isDisabled: Boolean,
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index ff8e7d7a7..971dbd9d9 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -1,6 +1,6 @@
 <template>
-    <div role="application">
-        <div class="row mt-2 mb-4">
+    <div class="address-questions" role="application">
+        <div class="row mb-4">
             <div class="col">
                 <textboxQuestion
                     id="streetAddressField"
@@ -83,6 +83,7 @@
             alertClass="alert-warning"
             v-bind:isDismissible="false" />
     </div>
+
 </template>
 
 <script>
@@ -425,6 +426,11 @@ export default {
 </script>
 
 <style lang="scss">
+
+.address-questions {
+    margin-top: 0.5rem;
+}
+
 #streetAddressField {
     position: relative;
 
@@ -433,4 +439,5 @@ export default {
         left: 0 !important;
     }
 }
+
 </style>
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 6fa8728ba..6102373aa 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -1,34 +1,39 @@
 <template>
     <div class="text-center">
         <label
-            :for="displayModalLink"
-            :aria-label="questionText"
+            for="mobileLocationLinkPromptId"
+            :aria-label="mobileLocationLinkPromptText"
             class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
             :class="[questionAlignment === 'center' ? 'text-center w-100 mb-5' : '']"
-            v-html="questionText"></label>
+            v-html="mobileLocationLinkPromptText"></label>
         <div class="update-mobile-location-text-link">
             <textLink
-                id="displayModalLink"
+                id="mobileLocationLinkPromptId"
                 linkType="text"
-                :text="this.mobileLocationDisplayText"
+                :text="this.mobileLocationLinkText"
                 href="#!"
                 @click-event="openModal"
                 :data-bs-target="getModalId"
                 aria-label="Modal window" />
         </div>
+        <textBlock cmsWidgetName="MobileFeeDisclaimerWidget" typeStyle="caption" />
     </div>
     <modal
-        ref="mobileServiceModal"
+        ref="mobileLocationModal"
+        :headerText="modalHeaderText"
         :modalId="this.modalWidgetName"
         :onModalOpenedCallback="onModalOpened"
-        :footerButtonText="mobileLocationDisplayText"
+        :footerButtonText="modalFooterText"
         @footer-button-event="saveMobileLocationData">
         <addressQuestions
             ref="addressQuestions"
-            v-model="mobileQuestionModel.addressQuestions"
+            v-model="mobileLocationQuestionModel.addressQuestions"
             captureApartmentNumberOrBusinessName="true" />
-        <vehicleProtectedQuestion v-model="mobileQuestionModel.selectedValue" />
-        <textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
+        <vehicleProtectedQuestion
+            ref="vehicleProtectedQuestion" 
+            v-model="mobileLocationQuestionModel.isVehicleProtected"
+            cmsWidgetName="VehicleProtectedQuestionWidget"  />
+        <textBlock cmsWidgetName="WorkspaceRequirementsWidget" typeStyle="caption" />
     </modal>
 </template>
 
@@ -36,33 +41,36 @@
 // Components
 import textLink from "@/ux-components/text-link/text-link";
 import modal from "@/digital-components/modal/modal";
-import buttonQuestion from "@/digital-components/button-question/button-question";
 import alert from "@/ux-components/alert/alert";
-import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 import textBlock from "@/digital-components/text-block/text-block";
 
 // Supporting Files
-import { defineRule } from "vee-validate";
+import { defineRule, useForm } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 import { storeActions } from "@/constants/store-actions.js";
 import baseMixin from "@/mixins/base-mixin.js";
-import TextBlock from "../../../digital-components/text-block/text-block.vue";
 
 // Define Validation Rules
-defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
-defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
+
 
 export default {
     name: "mobile-location-modal-questions",
     emits: ["update:modelValue"], // The component emits an event
     data() {
         return {
-            isVehicleProtectedAnswers: [],
+            answers: [],
         };
     },
+    setup() {
+        const modalForm = useForm();
+
+        return {
+            modalForm, 
+        }
+    },    
     props: {
         modelValue: {
             type: Object,
@@ -81,43 +89,28 @@ export default {
         },
         cmsWidgetName: String,
         modalWidgetName: String,
-        textboxQuestionWidgetName: String,
+        mobileFeeDisclaimerWidgetName: String,
+        workspaceRequirementsWidgetName: String,
         alertNonServiceableZipWidgetName: String,
         alertInvalidZipWidgetName: String,
     },
-    methods: {
-        loadInitialData() {
-            return baseMixin.methods.dispatchStoreAction(storeActions.GET_VEHICLE_YEARS, {});
-        },
-        initializeComponent(initialData) {
-            this.isVehicleProtectedAnswers = initialData;
-        },
-        openModal() {
-            this.$refs.mobileServiceModal.openModal();
-        },
-        closeModal() {
-            this.$refs.mobileServiceModal.closeModal();
-        },
-        focusOnZipInput() {
-            this.$nextTick(() => {
-                console.log(this.$refs);
-                const input = this.$refs.streetAddressField;
-                input.focus();
-            });
-        },
-        saveMobileLocationData() {},
-    },
     computed: {
+        mobileLocationLinkPromptText() {
+            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
+        },
+        mobileLocationLinkText() {
+            return this.getCmsContent(this.cmsWidgetName, "BodyText");
+        },        
         getModalId() {
             return "#" + this.modalWidgetName;
         },
-        questionText() {
-            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
+        modalHeaderText() {
+            return this.getCmsContent(this.modalWidgetName, "HeaderText");
         },
-        mobileLocationDisplayText() {
-            return this.getCmsContent(this.cmsWidgetName, "FooterText");
+        modalFooterText() {
+            return this.getCmsContent(this.modalWidgetName, "FooterText");
         },
-        mobileQuestionModel: {
+        mobileLocationQuestionModel: {
             get: function () {
                 return this.modelValue;
             },
@@ -126,6 +119,30 @@ export default {
             },
         },
     },
+    methods: {
+        loadInitialData() {
+            return baseMixin.methods.dispatchStoreAction(storeActions.GET_VEHICLE_YEARS, {});
+        },
+        initializeComponent(initialData) {
+            this.answers = initialData;
+        },
+        openModal() {
+            this.$refs.mobileLocationModal.openModal();
+        },
+        closeModal() {
+            this.$refs.mobileLocationModal.closeModal();
+        },
+        async saveMobileLocationData() {
+            const componentValidation = await this.modalForm.validate();
+            if (componentValidation.valid) {
+                this.closeModal();
+            } else {
+                this.$refs.mobileLocationModal.resetButtonStyle();
+            }
+                   
+        },
+    },
+
     mounted() {},
     components: {
         textLink,
@@ -148,4 +165,9 @@ export default {
     vertical-align: middle;
     margin-right: 0.5em;
 }
+
+.address-questions {
+    margin-top: 0em;
+}
+
 </style>
diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
index 4fb06a201..45b80caa6 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
@@ -6,14 +6,24 @@
         groupName="isVehicleProtected"
         textPosition="text-center"
         v-model="selectedValue"
+        validationRules="option-required"
         isRequired />
 </template>
 
+
+
 <script>
 import buttonQuestion from "@/digital-components/button-question/button-question";
 // Supporting files
 import { storeActions } from "@/constants/store-actions.js";
 import baseMixin from "@/mixins/base-mixin.js";
+
+import { defineRule } from "vee-validate";
+import { required } from "@/helpers/validation-rules";
+import { errorMessages } from "@/constants/error-messages";
+
+defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
+
 export default {
     name: "vehicle-protected-question",
     props: {
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index a34875dbb..6206ddb14 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -10,10 +10,11 @@ fmg
                 alertNonServiceableZipWidgetName="AlertNonServiceableZipWidget"
                 alertInvalidZipWidgetName="AlertInvalidZipWidget" />
             <mobileLocationModalQuestions
-                v-model="mobileLocationQuestion"
-                cmsWidgetName="MobileLocationModalWidget"
-                modalWidgetName="LocationModalWidget"
-                textboxQuestionWidgetName="MobileLocationQuestionWidget" />
+                v-model="mobileLocationQuestions"
+                cmsWidgetName="MobileLocationLinkWidget"
+                modalWidgetName="MobileLocationModalWidget"
+                mobileFeeDisclaimerWidgetName="MobileFeeDisclaimerWidget"
+                workspaceRequirementsWidgetName="WorkspaceRequirementsWidget" />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 :isForwardActionDisabled="!meta.valid"
@@ -35,12 +36,14 @@ import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-heade
 import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
+import { validator } from "vee-validate"
+import { provide } from 'vue';
 
 export default {
     name: "service-location",
     data() {
         return {
-            mobileLocationQuestion: {
+            mobileLocationQuestions: {
                 addressQuestions: {
                     streetAddress: "",
                     apartmentNumberOrBusinessName: "",
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 687afa6a6..00a892405 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -21,6 +21,7 @@
         :modalId="modalName"
         :onModalOpenedCallback="onModalOpened"
         :footerButtonText="footerButtonText"
+        :headerText="textboxQuestionPrompt"
         @footer-button-event="setZip">
         <textboxQuestion
             ref="zipInputTextQuestion"
@@ -29,6 +30,7 @@
             inputId="serviceZipCodeInput"
             questionAlignment="center"
             mask="#####"
+            :displayQuestionText="false"
             isRequired
             disableAutoFill
             validationRules="zip-required|zip-format" />
@@ -58,7 +60,7 @@ import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
 
 //Supporting Files
-import { defineRule } from "vee-validate";
+import { defineRule, useForm } from "vee-validate";
 import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 
@@ -142,6 +144,9 @@ export default {
         },
     },
     computed: {
+        textboxQuestionPrompt() {
+            return this.getCmsContent(this.textboxQuestionWidgetName, "QuestionText");
+        },
         modalName() {
             return this.cmsWidgetName;
         },
@@ -198,4 +203,5 @@ export default {
     vertical-align: middle;
     margin-right: 0.5em;
 }
+
 </style>

From c5a1ea14653940bca8dbca0b38a91b335158e4d5 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 6 Feb 2023 10:30:42 -0500
Subject: [PATCH 115/261] Modal: single instance (getOrCreateInstance) addl
 changes for card.

---
 src/digital-components/modal/modal.vue        | 14 ++-----
 .../textbox-question/textbox-question.vue     |  5 ++-
 .../address-questions/address-questions.vue   |  3 --
 .../mobile-location-modal-questions.vue       | 15 +++-----
 .../vehicle-protected-question.vue            |  2 -
 .../service-location/service-location.vue     |  2 -
 .../service-zip-modal-question.vue            | 38 ++++++++++---------
 7 files changed, 33 insertions(+), 46 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 238f63aa6..30c47e578 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -51,23 +51,17 @@ export default {
             type: Function,
         },
     },
-    data() {
-        return {
-            modal: null,
-        };
-    },
-    mounted() {
-        this.modal = new Modal(document.getElementById(this.modalId));
-    },
     methods: {
         resetButtonStyle() {
             this.$refs.buttonMain.resetButtonStyle();
         },
         openModal() {
-            this.modal.show();
+            const modal = Modal.getOrCreateInstance(document.getElementById(this.modalId));
+            modal.show();
         },
         closeModal() {
-            this.modal.hide();
+            const modal = Modal.getInstance(document.getElementById(this.modalId));
+            modal.hide();
         },
     },
     components: {
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index ac963ca0f..bbbbb0bd7 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="textbox-question" :class="(errors && errors.length) || hasError ? 'has-error' : ''">
-        <label v-if="displayQuestionText"
+        <label
+            v-if="displayQuestionText"
             :for="inputId"
             :aria-label="questionText"
             class="form-label"
@@ -55,7 +56,7 @@ export default {
         },
         displayQuestionText: {
             type: Boolean,
-            default: true
+            default: true,
         },
         modelValue: String,
         inputId: String,
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 971dbd9d9..d4d2838a8 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -83,7 +83,6 @@
             alertClass="alert-warning"
             v-bind:isDismissible="false" />
     </div>
-
 </template>
 
 <script>
@@ -426,7 +425,6 @@ export default {
 </script>
 
 <style lang="scss">
-
 .address-questions {
     margin-top: 0.5rem;
 }
@@ -439,5 +437,4 @@ export default {
         left: 0 !important;
     }
 }
-
 </style>
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 6102373aa..dbce77065 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -30,9 +30,9 @@
             v-model="mobileLocationQuestionModel.addressQuestions"
             captureApartmentNumberOrBusinessName="true" />
         <vehicleProtectedQuestion
-            ref="vehicleProtectedQuestion" 
+            ref="vehicleProtectedQuestion"
             v-model="mobileLocationQuestionModel.isVehicleProtected"
-            cmsWidgetName="VehicleProtectedQuestionWidget"  />
+            cmsWidgetName="VehicleProtectedQuestionWidget" />
         <textBlock cmsWidgetName="WorkspaceRequirementsWidget" typeStyle="caption" />
     </modal>
 </template>
@@ -55,7 +55,6 @@ import baseMixin from "@/mixins/base-mixin.js";
 
 // Define Validation Rules
 
-
 export default {
     name: "mobile-location-modal-questions",
     emits: ["update:modelValue"], // The component emits an event
@@ -68,9 +67,9 @@ export default {
         const modalForm = useForm();
 
         return {
-            modalForm, 
-        }
-    },    
+            modalForm,
+        };
+    },
     props: {
         modelValue: {
             type: Object,
@@ -100,7 +99,7 @@ export default {
         },
         mobileLocationLinkText() {
             return this.getCmsContent(this.cmsWidgetName, "BodyText");
-        },        
+        },
         getModalId() {
             return "#" + this.modalWidgetName;
         },
@@ -139,7 +138,6 @@ export default {
             } else {
                 this.$refs.mobileLocationModal.resetButtonStyle();
             }
-                   
         },
     },
 
@@ -169,5 +167,4 @@ export default {
 .address-questions {
     margin-top: 0em;
 }
-
 </style>
diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
index 45b80caa6..3f7636fd1 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
@@ -10,8 +10,6 @@
         isRequired />
 </template>
 
-
-
 <script>
 import buttonQuestion from "@/digital-components/button-question/button-question";
 // Supporting files
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 6206ddb14..f3627d362 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -36,8 +36,6 @@ import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-heade
 import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
-import { validator } from "vee-validate"
-import { provide } from 'vue';
 
 export default {
     name: "service-location",
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 00a892405..262d6e769 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -85,6 +85,13 @@ export default {
         alertNonServiceableZipWidgetName: String,
         alertInvalidZipWidgetName: String,
     },
+    setup() {
+        const modalForm = useForm();
+
+        return {
+            modalForm,
+        };
+    },
     methods: {
         openZipCodeModal() {
             this.$refs[this.modalName].openModal();
@@ -122,25 +129,21 @@ export default {
 
         async setZip() {
             this.resetAlerts();
+            const componentValidation = await this.modalForm.validate();
+            if (componentValidation.valid) {
+                const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
+                if (!zipCodeData.isValid) {
+                    this.displayInvalidZipAlert = true;
+                } else if (!zipCodeData.isServiceable) {
+                    this.displayNonServiceableZipAlert = true;
+                } else {
+                    this.serviceZip = this.serviceZipCodeInput;
+                    this.serviceZipState = zipCodeData.state;
 
-            const zipLength = 5;
-            if (!this.serviceZipCodeInput || this.serviceZipCodeInput.length < zipLength) {
-                // prevent reading 1111 as 01111
-                return;
-            }
+                    this.$refs[this.modalName].closeModal();
+                }
+            } 
 
-            const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
-
-            if (!zipCodeData.isValid) {
-                this.displayInvalidZipAlert = true;
-            } else if (!zipCodeData.isServiceable) {
-                this.displayNonServiceableZipAlert = true;
-            } else {
-                this.serviceZip = this.serviceZipCodeInput;
-                this.serviceZipState = zipCodeData.state;
-
-                this.$refs[this.modalName].closeModal();
-            }
         },
     },
     computed: {
@@ -203,5 +206,4 @@ export default {
     vertical-align: middle;
     margin-right: 0.5em;
 }
-
 </style>

From f3f17490ee6d6acdcc1524e526d650c48e5a31ea Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 6 Feb 2023 13:46:02 -0500
Subject: [PATCH 116/261] Modal validates itself now by passing in the
 modalForm object

---
 src/digital-components/modal/modal.vue        | 24 ++++++++++++-----
 .../mobile-location-modal-questions.vue       | 26 ++++--------------
 .../vehicle-protected-question.vue            | 12 +--------
 .../service-zip-modal-question.vue            | 27 +++++++++----------
 4 files changed, 37 insertions(+), 52 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 30c47e578..b90449ffb 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -10,7 +10,9 @@
         <div class="modal-dialog modal-dialog-centered">
             <div class="modal-content">
                 <div class="modal-header mb-2 mt-2">
-                    <label v-if="headerText" class="modal-title d-flex justify-content-center pb-0 w-100">
+                    <label
+                        v-if="headerText"
+                        class="modal-title d-flex justify-content-center pb-0 w-100">
                         {{ headerText }}
                     </label>
                     <button
@@ -18,7 +20,7 @@
                         type="button"
                         class="btn-close"
                         data-bs-dismiss="modal"
-                        aria-label="Close"></button>                        
+                        aria-label="Close"></button>
                 </div>
                 <div class="modal-body ps-5 pe-5 pb-4 pt-0">
                     <slot></slot>
@@ -30,7 +32,7 @@
                         ref="buttonMain"
                         suppressLoader
                         :buttonText="footerButtonText"
-                        @click-event="$emit('footer-button-event')" />
+                        @click-event="validateAndEmit" />
                 </div>
             </div>
         </div>
@@ -47,11 +49,22 @@ export default {
         modalId: String,
         headerText: String,
         footerButtonText: String,
+        modalForm: {
+            type: Object,
+        },
         onModalOpenedCallback: {
             type: Function,
         },
     },
     methods: {
+        async validateAndEmit() {
+            const validationResult = await this.modalForm.validate();
+            if (validationResult.valid) {
+                this.$emit('footer-button-event');            
+            } 
+            
+            this.resetButtonStyle();
+        },
         resetButtonStyle() {
             this.$refs.buttonMain.resetButtonStyle();
         },
@@ -80,15 +93,14 @@ export default {
         color: $black;
     }
     .modal-header {
-        border-bottom: none;      
+        border-bottom: none;
         .btn-close {
             position: absolute;
             right: 1rem;
             top: 1rem;
             background-image: url("data:image/svg+xml,%3Csvg width='16' height='16' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M15.6874 1.82179L9.50889 8L15.6874 14.1782C16.1042 14.595 16.1042 15.2707 15.6874 15.6875C15.4843 15.8907 15.2146 16 14.9328 16C14.6514 16 14.3818 15.8906 14.1787 15.6875L8.00017 9.50934L1.82171 15.6875C1.6182 15.8907 1.34876 16 1.06708 16C0.785733 16 0.516056 15.8906 0.312965 15.6875C-0.10429 15.2706 -0.10429 14.5952 0.312797 14.1784L6.03276 8.45867L6.49146 8L0.312945 1.82177C-0.10429 1.40483 -0.10429 0.729418 0.312797 0.31262C0.728936 -0.104145 1.40489 -0.104051 1.82185 0.31262L7.54152 6.03202L8.00017 6.49065L14.1786 0.312472C14.5955 -0.104107 15.2707 -0.104201 15.6874 0.312452C16.1042 0.729289 16.1042 1.40496 15.6874 1.82179Z' fill='%231574A1'/%3E%3C/svg%3E%0A");
             opacity: 1;
-
-        };
+        }
 
         .modal-title {
             font-weight: 500;
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index dbce77065..fc898fdfb 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -24,7 +24,8 @@
         :modalId="this.modalWidgetName"
         :onModalOpenedCallback="onModalOpened"
         :footerButtonText="modalFooterText"
-        @footer-button-event="saveMobileLocationData">
+        @footer-button-event="setMobileLocation"
+        :modalForm="modalForm">
         <addressQuestions
             ref="addressQuestions"
             v-model="mobileLocationQuestionModel.addressQuestions"
@@ -47,11 +48,7 @@ import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location
 import textBlock from "@/digital-components/text-block/text-block";
 
 // Supporting Files
-import { defineRule, useForm } from "vee-validate";
-import { required, regex } from "@/helpers/validation-rules";
-import { errorMessages } from "@/constants/error-messages";
-import { storeActions } from "@/constants/store-actions.js";
-import baseMixin from "@/mixins/base-mixin.js";
+import { useForm } from "vee-validate";
 
 // Define Validation Rules
 
@@ -119,29 +116,16 @@ export default {
         },
     },
     methods: {
-        loadInitialData() {
-            return baseMixin.methods.dispatchStoreAction(storeActions.GET_VEHICLE_YEARS, {});
-        },
-        initializeComponent(initialData) {
-            this.answers = initialData;
-        },
         openModal() {
             this.$refs.mobileLocationModal.openModal();
         },
         closeModal() {
             this.$refs.mobileLocationModal.closeModal();
         },
-        async saveMobileLocationData() {
-            const componentValidation = await this.modalForm.validate();
-            if (componentValidation.valid) {
-                this.closeModal();
-            } else {
-                this.$refs.mobileLocationModal.resetButtonStyle();
-            }
+        async setMobileLocation() {
+            this.closeModal(); 
         },
     },
-
-    mounted() {},
     components: {
         textLink,
         modal,
diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
index 3f7636fd1..6b00df0d1 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
@@ -12,10 +12,8 @@
 
 <script>
 import buttonQuestion from "@/digital-components/button-question/button-question";
-// Supporting files
-import { storeActions } from "@/constants/store-actions.js";
-import baseMixin from "@/mixins/base-mixin.js";
 
+// Supporting files
 import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
@@ -47,14 +45,6 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "Answers");
         },
     },
-    methods: {
-        loadInitialData() {
-            return baseMixin.methods.dispatchStoreAction(storeActions.GET_VEHICLE_YEARS, {});
-        },
-        initializeComponent(initialData) {
-            this.years = initialData;
-        },
-    },
 };
 </script>
 
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 262d6e769..50090769a 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -22,7 +22,8 @@
         :onModalOpenedCallback="onModalOpened"
         :footerButtonText="footerButtonText"
         :headerText="textboxQuestionPrompt"
-        @footer-button-event="setZip">
+        @footer-button-event="setZip"
+        :modalForm="modalForm">
         <textboxQuestion
             ref="zipInputTextQuestion"
             :cmsWidgetName="this.textboxQuestionWidgetName"
@@ -129,21 +130,19 @@ export default {
 
         async setZip() {
             this.resetAlerts();
-            const componentValidation = await this.modalForm.validate();
-            if (componentValidation.valid) {
-                const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
-                if (!zipCodeData.isValid) {
-                    this.displayInvalidZipAlert = true;
-                } else if (!zipCodeData.isServiceable) {
-                    this.displayNonServiceableZipAlert = true;
-                } else {
-                    this.serviceZip = this.serviceZipCodeInput;
-                    this.serviceZipState = zipCodeData.state;
 
-                    this.$refs[this.modalName].closeModal();
-                }
-            } 
+            const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
+            
+            if (!zipCodeData.isValid) {
+                this.displayInvalidZipAlert = true;
+            } else if (!zipCodeData.isServiceable) {
+                this.displayNonServiceableZipAlert = true;
+            } else {
+                this.serviceZip = this.serviceZipCodeInput;
+                this.serviceZipState = zipCodeData.state;
 
+                this.$refs[this.modalName].closeModal();
+            }
         },
     },
     computed: {

From 040f3490e499a15cb8b4a362869e0f7b7d7ee787 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 6 Feb 2023 13:48:05 -0500
Subject: [PATCH 117/261] Prettified

---
 src/digital-components/modal/modal.vue                      | 6 +++---
 .../mobile-location-modal-questions.vue                     | 2 +-
 .../service-zip-modal-question.vue                          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index b90449ffb..89ff1f8ed 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -60,9 +60,9 @@ export default {
         async validateAndEmit() {
             const validationResult = await this.modalForm.validate();
             if (validationResult.valid) {
-                this.$emit('footer-button-event');            
-            } 
-            
+                this.$emit("footer-button-event");
+            }
+
             this.resetButtonStyle();
         },
         resetButtonStyle() {
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index fc898fdfb..5dab5edf0 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -123,7 +123,7 @@ export default {
             this.$refs.mobileLocationModal.closeModal();
         },
         async setMobileLocation() {
-            this.closeModal(); 
+            this.closeModal();
         },
     },
     components: {
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 50090769a..d06c4dfda 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -132,7 +132,7 @@ export default {
             this.resetAlerts();
 
             const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
-            
+
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
             } else if (!zipCodeData.isServiceable) {

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 118/261] 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 119/261] 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 66f1a0039fafe24aac3bede89c12639bfdefb94b Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Tue, 7 Feb 2023 14:36:07 -0500
Subject: [PATCH 120/261] CSR-1012 | modal loader and improved validation

---
 src/digital-components/modal/modal.spec.js    | 65 ++++---------------
 src/digital-components/modal/modal.vue        | 10 ++-
 .../content-group-modal.spec.js               | 63 +++++++++++++++++-
 .../service-zip-modal-question.vue            | 10 ++-
 4 files changed, 90 insertions(+), 58 deletions(-)

diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index 2664accfa..40c1fd44a 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -1,68 +1,31 @@
 import { shallowMount } from "@vue/test-utils";
 import Modal from "./modal";
 
+const modalId = "modal-one";
+const footerButtonText = "Sample footer text here.";
+const headerText = "Sample header text here.";
+
 describe("modal.vue", () => {
-    it("Should display header text when HeaderText is defined in the CMS", async () => {
-        // Act
+    it("Should display footer button text when footerButtonText is defined", async () => {
         const wrapper = shallowMount(Modal, {
-            mixins: [mockMixin],
             props: {
-                cmsWidgetName: "test",
+                modalId: modalId,
+                footerButtonText: footerButtonText,
             },
             attachTo: document.body,
         });
-        expect(wrapper.html()).toEqual(expect.stringContaining(mockCmsContent["HeaderText"]));
+        expect(wrapper.html()).toEqual(expect.stringContaining(footerButtonText));
     });
 
-    it("Should display subheader text when SubheaderText is defined in the CMS", async () => {
-        // Act
+    it("Should display modal header text when headerText is defined", async () => {
         const wrapper = shallowMount(Modal, {
-            mixins: [mockMixin],
             props: {
-                cmsWidgetName: "test",
+                modalId: modalId,
+                footerButtonText: footerButtonText,
+                headerText: headerText,
             },
             attachTo: document.body,
         });
-        expect(wrapper.html()).toEqual(expect.stringContaining(mockCmsContent["SubheaderText"]));
-    });
-
-    it("Should insert image url when Image is defined in the CMS", async () => {
-        // Act
-        const wrapper = shallowMount(Modal, {
-            mixins: [mockMixin],
-            props: {
-                cmsWidgetName: "test",
-            },
-            attachTo: document.body,
-        });
-        expect(wrapper.html()).toEqual(expect.stringContaining(mockCmsContent["Image"]));
-    });
-
-    it("Should display body text when BodyText is defined in the CMS", async () => {
-        // Act
-        const wrapper = shallowMount(Modal, {
-            mixins: [mockMixin],
-            props: {
-                cmsWidgetName: "test",
-            },
-            attachTo: document.body,
-        });
-        expect(wrapper.html()).toEqual(expect.stringContaining(mockCmsContent["BodyText"]));
-    });
+        expect(wrapper.html()).toEqual(expect.stringContaining(headerText));
+    });   
 });
-
-const mockMixin = {
-    methods: {
-        getCmsContent: jest.fn((widgetName, cmsFieldName) => {
-            return mockCmsContent[cmsFieldName];
-        }),
-    },
-};
-
-const mockCmsContent = {
-    HeaderText: "Sample header text here.",
-    SubheaderText: "Sample subheader text here.",
-    Image: "https://www.sampleImage.sample",
-    BodyText: "Sample body text here.",
-    FooterText: "Sample footer text here.",
-};
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 89ff1f8ed..0a87d1633 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -30,7 +30,7 @@
                         isPrimary
                         class="w-100"
                         ref="buttonMain"
-                        suppressLoader
+                        loaderColor="white"
                         :buttonText="footerButtonText"
                         @click-event="validateAndEmit" />
                 </div>
@@ -58,8 +58,12 @@ export default {
     },
     methods: {
         async validateAndEmit() {
-            const validationResult = await this.modalForm.validate();
-            if (validationResult.valid) {
+            if (this.modalForm) {
+                const validationResult = await this.modalForm.validate();
+                if (validationResult.valid) {
+                    this.$emit("footer-button-event");
+                }
+            } else {
                 this.$emit("footer-button-event");
             }
 
diff --git a/src/fmg-components/content-group-modal/content-group-modal.spec.js b/src/fmg-components/content-group-modal/content-group-modal.spec.js
index 81946c2d0..a8058b2d5 100644
--- a/src/fmg-components/content-group-modal/content-group-modal.spec.js
+++ b/src/fmg-components/content-group-modal/content-group-modal.spec.js
@@ -1,3 +1,64 @@
+import { mount } from "@vue/test-utils";
+import contentGroupModal from "./content-group-modal";
+
 describe("content-group-modal.vue", () => {
-    test.todo("test this");
+    it("Should display header text when HeaderText is defined in the CMS", async () => {
+        const wrapper = mount(contentGroupModal, {
+            mixins: [mockMixin],
+            props: {
+                cmsWidgetName: "test",
+            },
+            attachTo: document.body,
+        });
+        expect(wrapper.html()).toEqual(expect.stringContaining(mockCmsContent["HeaderText"]));
+    });
+
+    it("Should display subheader text when SubheaderText is defined in the CMS", async () => {
+        const wrapper = mount(contentGroupModal, {
+            mixins: [mockMixin],
+            props: {
+                cmsWidgetName: "test",
+            },
+            attachTo: document.body,
+        });
+        expect(wrapper.html()).toEqual(expect.stringContaining(mockCmsContent["SubheaderText"]));
+    });
+
+    it("Should insert image url when Image is defined in the CMS", async () => {
+        const wrapper = mount(contentGroupModal, {
+            mixins: [mockMixin],
+            props: {
+                cmsWidgetName: "test",
+            },
+            attachTo: document.body,
+        });
+        expect(wrapper.html()).toEqual(expect.stringContaining(mockCmsContent["Image"]));
+    });
+
+    it("Should display body text when BodyText is defined in the CMS", async () => {
+        const wrapper = mount(contentGroupModal, {
+            mixins: [mockMixin],
+            props: {
+                cmsWidgetName: "test",
+            },
+            attachTo: document.body,
+        });
+        expect(wrapper.html()).toEqual(expect.stringContaining(mockCmsContent["BodyText"]));
+    });
 });
+
+const mockMixin = {
+    methods: {
+        getCmsContent: jest.fn((widgetName, cmsFieldName) => {
+            return mockCmsContent[cmsFieldName];
+        }),
+    },
+};
+
+const mockCmsContent = {
+    HeaderText: "Sample header text here.",
+    SubheaderText: "Sample subheader text here.",
+    Image: "https://www.sampleImage.sample",
+    BodyText: "Sample body text here.",
+    FooterText: "Sample footer text here.",
+};
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index d06c4dfda..8f0cbd049 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -22,7 +22,7 @@
         :onModalOpenedCallback="onModalOpened"
         :footerButtonText="footerButtonText"
         :headerText="textboxQuestionPrompt"
-        @footer-button-event="setZip"
+        @footer-button-event="setZipCode"
         :modalForm="modalForm">
         <textboxQuestion
             ref="zipInputTextQuestion"
@@ -128,7 +128,11 @@ export default {
             this.focusOnZipInput();
         },
 
-        async setZip() {
+        closeModal() {
+            this.$refs[this.modalName].closeModal();
+        },
+
+        async setZipCode() {
             this.resetAlerts();
 
             const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
@@ -141,7 +145,7 @@ export default {
                 this.serviceZip = this.serviceZipCodeInput;
                 this.serviceZipState = zipCodeData.state;
 
-                this.$refs[this.modalName].closeModal();
+                this.closeModal();
             }
         },
     },

From 31334370bbf6bacdcd8038b603ba9540c6d74822 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 8 Feb 2023 08:22:03 -0500
Subject: [PATCH 121/261] Added code to enable / disable the Footer Button

---
 src/digital-components/modal/modal.vue | 30 ++++++++++++++++++++------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 89ff1f8ed..e206dd3e3 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -32,7 +32,8 @@
                         ref="buttonMain"
                         suppressLoader
                         :buttonText="footerButtonText"
-                        @click-event="validateAndEmit" />
+                        @click-event="validateAndEmit"
+                        :class="isFooterButtonDisabled && 'form-test-invalid'" />
                 </div>
             </div>
         </div>
@@ -42,6 +43,7 @@
 <script>
 import buttonMain from "@/ux-components/button-main/button-main";
 import { Modal } from "bootstrap";
+import { useIsFormTouched, useIsFormDirty, useIsFormValid } from "vee-validate";
 
 export default {
     name: "modal",
@@ -49,20 +51,26 @@ export default {
         modalId: String,
         headerText: String,
         footerButtonText: String,
-        modalForm: {
-            type: Object,
-        },
         onModalOpenedCallback: {
             type: Function,
         },
     },
+    setup() {        
+        const isTouched = useIsFormTouched();
+        const isDirty = useIsFormDirty();
+        const isValid = useIsFormValid();
+
+        return {
+            isTouched,
+            isDirty,
+            isValid,
+        };
+    },
     methods: {
         async validateAndEmit() {
-            const validationResult = await this.modalForm.validate();
-            if (validationResult.valid) {
+            if (!this.isModalSubmitDisabled) {
                 this.$emit("footer-button-event");
             }
-
             this.resetButtonStyle();
         },
         resetButtonStyle() {
@@ -77,6 +85,14 @@ export default {
             modal.hide();
         },
     },
+    computed: {
+        isFooterButtonDisabled() {
+            if (!this.isTouched) {
+                return !this.isValid;
+            }
+            return !this.isDirty || !this.isValid;
+        },
+    },
     components: {
         buttonMain,
     },

From 0f1a4d96411ece37adcb901aeb62108d2ccb6076 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 8 Feb 2023 08:22:43 -0500
Subject: [PATCH 122/261] Added @input handler which is necessary for modal
 validation

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

diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index bbbbb0bd7..2800e260a 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -27,6 +27,7 @@
                     cornerStyle === 'rounded' ? 'rounded-pill' : '',
                 ]"
                 :validationRules="validationRules"
+                @input="handleChange"
                 @change="handleChange"
                 @blur="handleChange"
                 :maxlength="maxLength ? maxLength : '999'"

From 4e63afb5da1d6b3998a1d962ba4ad95cea1b35da Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 8 Feb 2023 08:23:28 -0500
Subject: [PATCH 123/261] Removed modal form validation from question level,
 now at Modal level.

---
 .../mobile-location-modal-questions.vue       | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 5dab5edf0..8469985fe 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -48,7 +48,6 @@ import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location
 import textBlock from "@/digital-components/text-block/text-block";
 
 // Supporting Files
-import { useForm } from "vee-validate";
 
 // Define Validation Rules
 
@@ -60,13 +59,6 @@ export default {
             answers: [],
         };
     },
-    setup() {
-        const modalForm = useForm();
-
-        return {
-            modalForm,
-        };
-    },
     props: {
         modelValue: {
             type: Object,
@@ -91,15 +83,24 @@ export default {
         alertInvalidZipWidgetName: String,
     },
     computed: {
+        getModalId() {
+            return "#" + this.modalWidgetName;
+        },
         mobileLocationLinkPromptText() {
             return this.getCmsContent(this.cmsWidgetName, "HeaderText");
         },
         mobileLocationLinkText() {
+            if (
+                this.addressModel.streetAddress != "" &&
+                this.addressModel.city != "" &&
+                this.addressModel.state != "" &&
+                this.addressModel.zipCode != ""
+            ) {
+                return `${this.addressModel.streetAddress}\n${this.addressModel.city}, ${this.addressModel.state} ${this.addressModel.zipCode}`;
+            }
             return this.getCmsContent(this.cmsWidgetName, "BodyText");
         },
-        getModalId() {
-            return "#" + this.modalWidgetName;
-        },
+
         modalHeaderText() {
             return this.getCmsContent(this.modalWidgetName, "HeaderText");
         },
@@ -114,6 +115,11 @@ export default {
                 this.$emit("update:modelValue", newValue);
             },
         },
+        addressModel: {
+            get: function () {
+                return this.mobileLocationQuestionModel.addressQuestions;
+            },
+        },
     },
     methods: {
         openModal() {
@@ -151,4 +157,8 @@ export default {
 .address-questions {
     margin-top: 0em;
 }
+
+#mobileLocationLinkPromptId {
+    white-space: pre-line;
+}
 </style>

From 12477ca649483536950b9183ff7e7ead8dbf5534 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 8 Feb 2023 08:39:57 -0500
Subject: [PATCH 124/261] Removed comments on address-questions

---
 .../address-questions/address-questions.vue   | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 7afae044e..a3e49369c 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -277,26 +277,6 @@ export default {
                         }
                     });
 
-                    // addressField1.addEventListener("change", () => {
-                    //     // If a match has been previously attempted then do nothing
-                    //     if (self.matchFound !== null) {
-                    //         return;
-                    //     }
-
-                    //     // Get the address that the user clicked on (if any)
-                    //     const clickedAddress = document.querySelector(
-                    //         ".pac-container .pac-item:hover"
-                    //     );
-
-                    //     // If the Street Address field changed without clicking (i.e. by pressing Tab, or clicking outside the field)
-                    //     if (clickedAddress === null) {
-                    //         // Fill-in the address using first item in the list.
-                    //         fillInAddressUsingFirstItem();
-                    //     }
-
-                    //     console.log("change");
-                    // });
-
                     function fillInAddressUsingFirstItem() {
                         // Fill-in the address using first item in the list.
                         const item = document.querySelector(".pac-container .pac-item");
@@ -320,7 +300,6 @@ export default {
                     }
 
                     function fillInAddress(place) {
-                        console.log("fillInAddress");
                         if (!place) {
                             place = autocomplete.getPlace();
                         }
@@ -329,10 +308,6 @@ export default {
                             self.matchFound = true;
 
                             self.$nextTick(function () {
-                                //self.addressModel.streetAddress = "";
-
-                                //self.$nextTick();
-
                                 self.showAddressFields = true;
 
                                 for (const component of place.address_components) {

From d065181758cd000fcccc8f058eb8dc1faea57edd Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 8 Feb 2023 08:44:05 -0500
Subject: [PATCH 125/261] CSR-1012 - Prettified

---
 src/digital-components/modal/modal.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index 40c1fd44a..5feaf0216 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -27,5 +27,5 @@ describe("modal.vue", () => {
             attachTo: document.body,
         });
         expect(wrapper.html()).toEqual(expect.stringContaining(headerText));
-    });   
+    });
 });

From c2a3859dddd970ee5f81a789d56d2abcd5410a7d Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 8 Feb 2023 09:13:47 -0500
Subject: [PATCH 126/261] Renamed footer button for consistency

---
 src/digital-components/modal/modal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index e206dd3e3..5bc1b1af8 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -55,7 +55,7 @@ export default {
             type: Function,
         },
     },
-    setup() {        
+    setup() {
         const isTouched = useIsFormTouched();
         const isDirty = useIsFormDirty();
         const isValid = useIsFormValid();
@@ -68,7 +68,7 @@ export default {
     },
     methods: {
         async validateAndEmit() {
-            if (!this.isModalSubmitDisabled) {
+            if (!this.isFooterButtonDisabled) {
                 this.$emit("footer-button-event");
             }
             this.resetButtonStyle();

From 5100e5ec5b9d5586aa842ea5d178c6ffda4f18a5 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 8 Feb 2023 09:19:20 -0500
Subject: [PATCH 127/261] CSR-1012 - Uncommented code that is for selecting the
 first item when clicking outside of box

---
 .../address-questions/address-questions.vue    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index a3e49369c..9ed26f29d 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -277,6 +277,24 @@ export default {
                         }
                     });
 
+                    addressField1.addEventListener("change", () => {
+                        // If a match has been previously attempted then do nothing
+                        if (self.matchFound !== null) {
+                            return;
+                        }
+
+                        // Get the address that the user clicked on (if any)
+                        const clickedAddress = document.querySelector(
+                            ".pac-container .pac-item:hover"
+                        );
+
+                        // If the Street Address field changed without clicking (i.e. by pressing Tab, or clicking outside the field)
+                        if (clickedAddress === null) {
+                            // Fill-in the address using first item in the list.
+                            fillInAddressUsingFirstItem();
+                        }
+                    });
+
                     function fillInAddressUsingFirstItem() {
                         // Fill-in the address using first item in the list.
                         const item = document.querySelector(".pac-container .pac-item");

From 7db466fc60262327ccfdd77cd9d5197814c5b111 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 8 Feb 2023 13:33:10 -0500
Subject: [PATCH 128/261] Additional consistency changes between the two modals

---
 .../address-questions/address-questions.vue   |  5 --
 .../service-location/service-location.vue     |  5 ++
 .../service-zip-modal-question.vue            | 61 ++++++++++++++++---
 3 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 9ed26f29d..aed1b5147 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -409,11 +409,6 @@ export default {
                 }
             },
         },
-        "addressModel.streetAddress": {
-            handler(newValue, oldValue) {
-                console.log(`I got changed from ${oldValue} to ${newValue}`);
-            },
-        },
     },
     components: {
         textboxQuestion,
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index f3627d362..2ed5f676b 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -5,6 +5,7 @@ fmg
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <serviceZipModalQuestion
+                v-model="serviceZipQuestion"
                 cmsWidgetName="ServiceZipModalWidget"
                 textboxQuestionWidgetName="ServiceZipQuestionWidget"
                 alertNonServiceableZipWidgetName="AlertNonServiceableZipWidget"
@@ -41,6 +42,10 @@ export default {
     name: "service-location",
     data() {
         return {
+            serviceZipQuestion: {
+                serviceState: "",
+                serviceZipCode: "",
+            },
             mobileLocationQuestions: {
                 addressQuestions: {
                     streetAddress: "",
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 8f0cbd049..c6d293590 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -1,16 +1,16 @@
 <template>
     <div class="text-center">
         <label
-            :for="displayModalLink"
-            :aria-label="questionText"
+            :for="serviceLocationLinkPromptId"
+            :aria-label="serviceLocationLinkPromptText"
             class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
             :class="[questionAlignment === 'center' ? 'text-center w-100 mb-5' : '']"
-            v-html="questionText"></label>
+            v-html="serviceLocationLinkPromptText"></label>
         <div class="update-zip-text-link">
             <textLink
-                id="displayModalLink"
+                id="serviceLocationLinkPromptId"
                 linkType="text"
-                :text="this.serviceZipDisplayText"
+                :text="this.serviceZipLinkText"
                 href="#!"
                 @click-event="openZipCodeModal"
                 aria-label="Modal window" />
@@ -27,8 +27,8 @@
         <textboxQuestion
             ref="zipInputTextQuestion"
             :cmsWidgetName="this.textboxQuestionWidgetName"
-            v-model="serviceZipCodeInput"
-            inputId="serviceZipCodeInput"
+            v-model="serviceZipCode"
+            inputId="serviceZipCode"
             questionAlignment="center"
             mask="#####"
             :displayQuestionText="false"
@@ -81,6 +81,15 @@ export default {
         };
     },
     props: {
+        modelValue: {
+            type: Object,
+            default: () => ({
+                serviceZipQuestion: {
+                    serviceState: "",
+                    serviceZipCode: "",
+                },
+            }),
+        },
         cmsWidgetName: String,
         textboxQuestionWidgetName: String,
         alertNonServiceableZipWidgetName: String,
@@ -94,6 +103,10 @@ export default {
         };
     },
     methods: {
+        mobileLocationLinkPromptText() {
+            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
+        },
+
         openZipCodeModal() {
             this.$refs[this.modalName].openModal();
         },
@@ -150,6 +163,25 @@ export default {
         },
     },
     computed: {
+        serviceZipLinkPromptText() {
+            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
+        },
+        serviceZipLinkText() {
+            return this.getCmsContent(this.cmsWidgetName, "BodyText");
+        },
+        modalHeaderText() {
+            return this.getCmsContent(this.textboxQuestionWidgetName, "QuestionText");
+        },
+        modalFooterText() {
+            return this.getCmsContent(this.modalWidgetName, "FooterText");
+        },
+
+
+
+
+
+
+
         textboxQuestionPrompt() {
             return this.getCmsContent(this.textboxQuestionWidgetName, "QuestionText");
         },
@@ -178,6 +210,21 @@ export default {
             ).replaceAll("{custom:serviceZipCodeInput}", zipCode);
             return text;
         },
+        serviceZipModel: {
+            get: function () {
+                return this.modelValue;
+            },
+            set: function (newValue) {
+                this.$emit("update:modelValue", newValue);
+            },
+        },
+    },
+    watch: {
+        serviceZipModel: {
+            handler() {
+                this.displayNonServiceableZipAlert = false;
+            },
+        },
     },
     mounted() {
         this.$watch(

From d0842d6713be0fd8ed484e9bf40a4bfb058df743 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 8 Feb 2023 13:34:14 -0500
Subject: [PATCH 129/261] Forgot to save file

---
 src/digital-components/modal/modal.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 0a87d1633..39833ab4d 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -42,11 +42,11 @@
 <script>
 import buttonMain from "@/ux-components/button-main/button-main";
 import { Modal } from "bootstrap";
+import { checkPropertyChange } from "json-schema";
 
 export default {
     name: "modal",
     props: {
-        modalId: String,
         headerText: String,
         footerButtonText: String,
         modalForm: {
@@ -56,6 +56,11 @@ export default {
             type: Function,
         },
     },
+    setup() {
+        const modalId = `modal-${crypto.randomUUID()}`;
+
+        return modalId; 
+    },
     methods: {
         async validateAndEmit() {
             if (this.modalForm) {

From a8b20d48e6f6745f20141c2ae4104b402545bbdb Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 9 Feb 2023 10:24:22 -0500
Subject: [PATCH 130/261] CSR-1012 | service zip and state now stored in parent

---
 src/digital-components/modal/modal.vue        |   4 +-
 .../mobile-location-modal-questions.vue       |   6 +-
 .../service-location/service-location.vue     |   7 +-
 .../service-zip-modal-question.vue            | 118 +++++-------------
 4 files changed, 44 insertions(+), 91 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 39833ab4d..834fc4fa4 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -59,7 +59,9 @@ export default {
     setup() {
         const modalId = `modal-${crypto.randomUUID()}`;
 
-        return modalId; 
+        return {
+            modalId,
+        };
     },
     methods: {
         async validateAndEmit() {
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 5dab5edf0..db39cf55a 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -83,7 +83,7 @@ export default {
                 isVehicleProtected: Boolean,
             }),
         },
-        cmsWidgetName: String,
+        linkWidgetName: String,
         modalWidgetName: String,
         mobileFeeDisclaimerWidgetName: String,
         workspaceRequirementsWidgetName: String,
@@ -92,10 +92,10 @@ export default {
     },
     computed: {
         mobileLocationLinkPromptText() {
-            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
+            return this.getCmsContent(this.linkWidgetName, "HeaderText");
         },
         mobileLocationLinkText() {
-            return this.getCmsContent(this.cmsWidgetName, "BodyText");
+            return this.getCmsContent(this.linkWidgetName, "BodyText");
         },
         getModalId() {
             return "#" + this.modalWidgetName;
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 2ed5f676b..66ad2954e 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -6,13 +6,13 @@ fmg
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <serviceZipModalQuestion
                 v-model="serviceZipQuestion"
-                cmsWidgetName="ServiceZipModalWidget"
+                linkWidgetName="ServiceZipLinkWidget"
+                modalWidgetName="ServiceZipModalWidget"
                 textboxQuestionWidgetName="ServiceZipQuestionWidget"
-                alertNonServiceableZipWidgetName="AlertNonServiceableZipWidget"
                 alertInvalidZipWidgetName="AlertInvalidZipWidget" />
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
-                cmsWidgetName="MobileLocationLinkWidget"
+                linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget"
                 mobileFeeDisclaimerWidgetName="MobileFeeDisclaimerWidget"
                 workspaceRequirementsWidgetName="WorkspaceRequirementsWidget" />
@@ -45,6 +45,7 @@ export default {
             serviceZipQuestion: {
                 serviceState: "",
                 serviceZipCode: "",
+                isServiceable: null,
             },
             mobileLocationQuestions: {
                 addressQuestions: {
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index c6d293590..43589d1da 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -5,30 +5,29 @@
             :aria-label="serviceLocationLinkPromptText"
             class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
             :class="[questionAlignment === 'center' ? 'text-center w-100 mb-5' : '']"
-            v-html="serviceLocationLinkPromptText"></label>
+            v-html="serviceZipLinkText"></label>
         <div class="update-zip-text-link">
             <textLink
                 id="serviceLocationLinkPromptId"
                 linkType="text"
-                :text="this.serviceZipLinkText"
+                :text="serviceZipDisplayText"
                 href="#!"
-                @click-event="openZipCodeModal"
+                @click-event="openModal"
                 aria-label="Modal window" />
         </div>
     </div>
     <modal
         :ref="modalName"
-        :modalId="modalName"
         :onModalOpenedCallback="onModalOpened"
-        :footerButtonText="footerButtonText"
+        :footerButtonText="modalFooterText"
         :headerText="textboxQuestionPrompt"
         @footer-button-event="setZipCode"
         :modalForm="modalForm">
         <textboxQuestion
             ref="zipInputTextQuestion"
-            :cmsWidgetName="this.textboxQuestionWidgetName"
-            v-model="serviceZipCode"
-            inputId="serviceZipCode"
+            :cmsWidgetName="textboxQuestionWidgetName"
+            v-model="serviceZipCodeInput"
+            inputId="zipInputTextQuestionTextbox"
             questionAlignment="center"
             mask="#####"
             :displayQuestionText="false"
@@ -39,15 +38,7 @@
             ref="alertInvalidZip"
             v-if="displayInvalidZipAlert"
             class="my-4"
-            :cmsWidgetName="this.alertInvalidZipWidgetName"
-            alertClass="alert-danger"
-            v-bind:isDismissible="false" />
-        <alert
-            ref="alertNonServiceableZip"
-            v-if="displayNonServiceableZipAlert"
-            class="my-4"
-            :cmsWidgetName="this.alertNonServiceableZipWidgetName"
-            :manualHeadline="AlertNonServiceableZipHeader"
+            :cmsWidgetName="alertInvalidZipWidgetName"
             alertClass="alert-danger"
             v-bind:isDismissible="false" />
     </modal>
@@ -73,11 +64,8 @@ export default {
     name: "service-zip-modal-question",
     data() {
         return {
-            serviceZip: this.getZipFromStore(),
-            serviceZipState: this.getZipStateFromStore(),
-            serviceZipCodeInput: this.getZipFromStore(),
+            serviceZipCodeInput: null,
             displayInvalidZipAlert: false,
-            displayNonServiceableZipAlert: false,
         };
     },
     props: {
@@ -87,12 +75,13 @@ export default {
                 serviceZipQuestion: {
                     serviceState: "",
                     serviceZipCode: "",
+                    isServiceable: null,
                 },
             }),
         },
-        cmsWidgetName: String,
+        linkWidgetName: String,
+        modalWidgetName: String,
         textboxQuestionWidgetName: String,
-        alertNonServiceableZipWidgetName: String,
         alertInvalidZipWidgetName: String,
     },
     setup() {
@@ -104,23 +93,11 @@ export default {
     },
     methods: {
         mobileLocationLinkPromptText() {
-            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
-        },
-
-        openZipCodeModal() {
-            this.$refs[this.modalName].openModal();
-        },
-        getZipFromStore() {
-            return this.$store.getters.order.serviceLocation.zipCode;
-        },
-
-        getZipStateFromStore() {
-            return this.$store.getters.order.serviceLocation.state;
+            return this.getCmsContent(this.linkWidgetName, "HeaderText");
         },
 
         resetAlerts() {
             this.displayInvalidZipAlert = false;
-            this.displayNonServiceableZipAlert = false;
         },
 
         resetsOnZipInput() {
@@ -130,21 +107,25 @@ export default {
 
         focusOnZipInput() {
             this.$nextTick(() => {
-                const input = this.$refs.zipInputTextQuestion.$refs.serviceZipCodeInput;
+                const input = this.$refs.zipInputTextQuestion.$refs.zipInputTextQuestionTextbox;
                 input.focus();
             });
         },
 
-        onModalOpened() {
-            this.serviceZipCodeInput = this.serviceZip;
-            this.resetsOnZipInput();
-            this.focusOnZipInput();
+        openModal() {
+            this.$refs[this.modalName].openModal();
         },
 
         closeModal() {
             this.$refs[this.modalName].closeModal();
         },
 
+        onModalOpened() {
+            this.serviceZipCodeInput = this.serviceZipModel.serviceZipCode;
+            this.resetsOnZipInput();
+            this.focusOnZipInput();
+        },
+
         async setZipCode() {
             this.resetAlerts();
 
@@ -152,11 +133,12 @@ export default {
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
-            } else if (!zipCodeData.isServiceable) {
-                this.displayNonServiceableZipAlert = true;
             } else {
-                this.serviceZip = this.serviceZipCodeInput;
-                this.serviceZipState = zipCodeData.state;
+                this.serviceZipModel = {
+                    serviceState: zipCodeData.state,
+                    serviceZipCode: this.serviceZipCodeInput,
+                    isServiceable: zipCodeData.isServiceable,
+                };
 
                 this.closeModal();
             }
@@ -164,52 +146,27 @@ export default {
     },
     computed: {
         serviceZipLinkPromptText() {
-            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
+            return this.getCmsContent(this.linkWidgetName, "BodyText");
         },
         serviceZipLinkText() {
-            return this.getCmsContent(this.cmsWidgetName, "BodyText");
-        },
-        modalHeaderText() {
-            return this.getCmsContent(this.textboxQuestionWidgetName, "QuestionText");
+            return this.getCmsContent(this.linkWidgetName, "HeaderText");
         },
         modalFooterText() {
             return this.getCmsContent(this.modalWidgetName, "FooterText");
         },
-
-
-
-
-
-
-
         textboxQuestionPrompt() {
             return this.getCmsContent(this.textboxQuestionWidgetName, "QuestionText");
         },
         modalName() {
-            return this.cmsWidgetName;
-        },
-        questionText() {
-            return this.getCmsContent(this.cmsWidgetName, "HeaderText");
+            return this.modalWidgetName;
         },
         serviceZipDisplayText() {
-            if (this.serviceZip && this.serviceZip != 0) {
-                return this.serviceZipState + ", " + this.serviceZip;
+            if (this.modelValue.serviceZipCode.length > 0) {
+                return this.modelValue.serviceState + ", " + this.modelValue.serviceZipCode;
             }
-            return (
-                this.getCmsContent(this.cmsWidgetName, "SubheaderText") || "Enter your service ZIP"
-            );
-        },
-        footerButtonText() {
-            return this.getCmsContent(this.cmsWidgetName, "FooterText");
-        },
-        AlertNonServiceableZipHeader() {
-            const zipCode = this.serviceZipCodeInput;
-            const text = this.getCmsContent(
-                "AlertNonServiceableZipWidget",
-                "HeadlineText"
-            ).replaceAll("{custom:serviceZipCodeInput}", zipCode);
-            return text;
+            return this.serviceZipLinkPromptText || "Enter your service ZIP";
         },
+
         serviceZipModel: {
             get: function () {
                 return this.modelValue;
@@ -219,13 +176,6 @@ export default {
             },
         },
     },
-    watch: {
-        serviceZipModel: {
-            handler() {
-                this.displayNonServiceableZipAlert = false;
-            },
-        },
-    },
     mounted() {
         this.$watch(
             () => {

From d5ab28c5987fed5e0701798c00ce785140509cff Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 9 Feb 2023 10:38:21 -0500
Subject: [PATCH 131/261] CSR-1012 | moved 'where would you like service?" into
 page subheader

---
 .../service-zip-modal-question.vue                       | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 43589d1da..9af9876e5 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -1,11 +1,5 @@
 <template>
     <div class="text-center">
-        <label
-            :for="serviceLocationLinkPromptId"
-            :aria-label="serviceLocationLinkPromptText"
-            class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
-            :class="[questionAlignment === 'center' ? 'text-center w-100 mb-5' : '']"
-            v-html="serviceZipLinkText"></label>
         <div class="update-zip-text-link">
             <textLink
                 id="serviceLocationLinkPromptId"
@@ -148,9 +142,6 @@ export default {
         serviceZipLinkPromptText() {
             return this.getCmsContent(this.linkWidgetName, "BodyText");
         },
-        serviceZipLinkText() {
-            return this.getCmsContent(this.linkWidgetName, "HeaderText");
-        },
         modalFooterText() {
             return this.getCmsContent(this.modalWidgetName, "FooterText");
         },

From 1aa470bf188967261b85c75ca41507184e46ff80 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 9 Feb 2023 10:45:29 -0500
Subject: [PATCH 132/261] CSR-1088 - Additional model / prop related changes

---
 src/digital-components/modal/modal.vue        |  1 -
 .../mobile-location-modal-questions.vue       | 38 +++++++++++++++----
 .../vehicle-protected-question.vue            |  4 +-
 .../service-location/service-location.vue     |  9 ++++-
 4 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 3d1be957a..96263ecf2 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -44,7 +44,6 @@
 import buttonMain from "@/ux-components/button-main/button-main";
 import { Modal } from "bootstrap";
 import { useIsFormTouched, useIsFormDirty, useIsFormValid } from "vee-validate";
-import { checkPropertyChange } from "json-schema";
 
 export default {
     name: "modal",
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 8469985fe..5face28b1 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -54,11 +54,6 @@ import textBlock from "@/digital-components/text-block/text-block";
 export default {
     name: "mobile-location-modal-questions",
     emits: ["update:modelValue"], // The component emits an event
-    data() {
-        return {
-            answers: [],
-        };
-    },
     props: {
         modelValue: {
             type: Object,
@@ -70,11 +65,12 @@ export default {
                     state: "",
                     zipCode: "",
                 },
-                isZipServiceableMobile: Boolean,
-                isZipServiceableInShop: Boolean,
                 isVehicleProtected: Boolean,
+                isZipServiceableMobile: Boolean,
+                isZipServiceableInShop: Boolean,            
             }),
         },
+        serviceZipCode: String,
         cmsWidgetName: String,
         modalWidgetName: String,
         mobileFeeDisclaimerWidgetName: String,
@@ -100,7 +96,6 @@ export default {
             }
             return this.getCmsContent(this.cmsWidgetName, "BodyText");
         },
-
         modalHeaderText() {
             return this.getCmsContent(this.modalWidgetName, "HeaderText");
         },
@@ -120,6 +115,14 @@ export default {
                 return this.mobileLocationQuestionModel.addressQuestions;
             },
         },
+        _isVehicleProtected: {
+            get: function () {
+                return this.modelValue.isVehicleProtected;
+            },
+            set: function (newValue) {
+                this.$emit("update:modelValue.isVehicleProtected", newValue);
+            },            
+        }
     },
     methods: {
         openModal() {
@@ -128,10 +131,29 @@ export default {
         closeModal() {
             this.$refs.mobileLocationModal.closeModal();
         },
+        resetModel() {
+            // Address
+            this.addressModel.streetAddress = "";
+            this.addressModel.apartmentNumberOrBusinessName = "";
+            this.addressModel.city = "";
+            this.addressModel.state = "";
+            this.addressModel.zipCode = "";
+
+            // Is Vehicle Protected
+            this._isVehicleProtected = null;
+        },
         async setMobileLocation() {
             this.closeModal();
         },
     },
+    watch: {
+        serviceZipCode: {
+            handler() {
+                // if they modify the Service Zip Code, clear the model
+                this.resetModel();
+            }
+        },
+    },
     components: {
         textLink,
         modal,
diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
index 6b00df0d1..f5754ea06 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
@@ -23,7 +23,9 @@ defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 export default {
     name: "vehicle-protected-question",
     props: {
-        modelValue: String,
+        modelValue: {
+            isVehicleProtected: Boolean,
+        },
         cmsWidgetName: String,
     },
     components: {
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 2ed5f676b..63e0d1c81 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">
@@ -12,6 +11,7 @@ fmg
                 alertInvalidZipWidgetName="AlertInvalidZipWidget" />
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
+                :serviceZipCode="serviceZipQuestion.serviceZipCode"
                 cmsWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget"
                 mobileFeeDisclaimerWidgetName="MobileFeeDisclaimerWidget"
@@ -54,6 +54,9 @@ export default {
                     state: "",
                     zipCode: "",
                 },
+                isVehicleProtected: null,
+                isZipServiceableMobile: null,
+                isZipServiceableInShop: null, 
             },
         };
     },
@@ -80,7 +83,9 @@ export default {
         arePagePrerequisitesValid() {
             return true;
         },
-
+        resetMobileLocationTest() {
+            this.serviceZipQuestion.serviceZipCode = "43054";
+        },
         backButtonAction() {},
         forwardButtonAction() {},
     },

From c274e16aac3f0096bedd9cc2eac770f32fb4ea6b Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 9 Feb 2023 10:54:07 -0500
Subject: [PATCH 133/261] CSR-1012 | updated zip input watch

---
 .../service-zip-modal-question.vue                 | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 9af9876e5..c97b1846d 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -127,6 +127,7 @@ export default {
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
+                this.focusOnZipInput();
             } else {
                 this.serviceZipModel = {
                     serviceState: zipCodeData.state,
@@ -167,15 +168,10 @@ export default {
             },
         },
     },
-    mounted() {
-        this.$watch(
-            () => {
-                return this.$refs.zipInputTextQuestion.value;
-            },
-            (val) => {
-                this.resetsOnZipInput();
-            }
-        );
+    watch: {
+        serviceZipCodeInput() {
+            this.resetsOnZipInput();
+        },
     },
     components: {
         textLink,

From a5509b88f56de4be406f628a1af472ec2a0b7650 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 9 Feb 2023 11:55:00 -0500
Subject: [PATCH 134/261] Changes for consistency

---
 .../mobile-location-modal-questions.vue       | 17 ++--
 .../service-zip-modal-question.vue            | 90 +++++++++----------
 2 files changed, 47 insertions(+), 60 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index db39cf55a..00be9117e 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -13,19 +13,16 @@
                 :text="this.mobileLocationLinkText"
                 href="#!"
                 @click-event="openModal"
-                :data-bs-target="getModalId"
                 aria-label="Modal window" />
         </div>
         <textBlock cmsWidgetName="MobileFeeDisclaimerWidget" typeStyle="caption" />
     </div>
     <modal
-        ref="mobileLocationModal"
+        :ref="modalName"
         :headerText="modalHeaderText"
-        :modalId="this.modalWidgetName"
         :onModalOpenedCallback="onModalOpened"
         :footerButtonText="modalFooterText"
-        @footer-button-event="setMobileLocation"
-        :modalForm="modalForm">
+        @footer-button-event="setMobileLocation">
         <addressQuestions
             ref="addressQuestions"
             v-model="mobileLocationQuestionModel.addressQuestions"
@@ -97,15 +94,15 @@ export default {
         mobileLocationLinkText() {
             return this.getCmsContent(this.linkWidgetName, "BodyText");
         },
-        getModalId() {
-            return "#" + this.modalWidgetName;
-        },
         modalHeaderText() {
             return this.getCmsContent(this.modalWidgetName, "HeaderText");
         },
         modalFooterText() {
             return this.getCmsContent(this.modalWidgetName, "FooterText");
         },
+        modalName() {
+            return this.modalWidgetName;
+        },
         mobileLocationQuestionModel: {
             get: function () {
                 return this.modelValue;
@@ -117,10 +114,10 @@ export default {
     },
     methods: {
         openModal() {
-            this.$refs.mobileLocationModal.openModal();
+            this.$refs[this.modalName].openModal();
         },
         closeModal() {
-            this.$refs.mobileLocationModal.closeModal();
+            this.$refs[this.modalName].closeModal();
         },
         async setMobileLocation() {
             this.closeModal();
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index c97b1846d..6a2610d4b 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -2,9 +2,9 @@
     <div class="text-center">
         <div class="update-zip-text-link">
             <textLink
-                id="serviceLocationLinkPromptId"
+                id="serviceZipLinkPromptId"
                 linkType="text"
-                :text="serviceZipDisplayText"
+                :text="serviceZipLinkText"
                 href="#!"
                 @click-event="openModal"
                 aria-label="Modal window" />
@@ -12,21 +12,19 @@
     </div>
     <modal
         :ref="modalName"
+        :headerText="modalHeaderText"
         :onModalOpenedCallback="onModalOpened"
         :footerButtonText="modalFooterText"
-        :headerText="textboxQuestionPrompt"
-        @footer-button-event="setZipCode"
-        :modalForm="modalForm">
+        @footer-button-event="setZipCode">
         <textboxQuestion
             ref="zipInputTextQuestion"
             :cmsWidgetName="textboxQuestionWidgetName"
-            v-model="serviceZipCodeInput"
-            inputId="zipInputTextQuestionTextbox"
+            v-model="serviceZipModel.serviceZipCode"
+            inputId="serviceZipCode"
             questionAlignment="center"
             mask="#####"
             :displayQuestionText="false"
             isRequired
-            disableAutoFill
             validationRules="zip-required|zip-format" />
         <alert
             ref="alertInvalidZip"
@@ -85,11 +83,33 @@ export default {
             modalForm,
         };
     },
-    methods: {
-        mobileLocationLinkPromptText() {
-            return this.getCmsContent(this.linkWidgetName, "HeaderText");
+    computed: {
+        serviceZipLinkText() {
+            const defaultText = this.getCmsContent(this.linkWidgetName, "BodyText");
+            if (this.modelValue.serviceZipCode.length > 0) {
+                return this.modelValue.serviceState + ", " + this.modelValue.serviceZipCode;
+            }
+            return this.serviceZipLinkPromptText || defaultText;
         },
-
+        modalHeaderText() {
+            return this.getCmsContent(this.textboxQuestionWidgetName, "QuestionText");
+        },
+        modalFooterText() {
+            return this.getCmsContent(this.modalWidgetName, "FooterText");
+        },
+        modalName() {
+            return this.modalWidgetName;
+        },
+        serviceZipModel: {
+            get: function () {
+                return this.modelValue;
+            },
+            set: function (newValue) {
+                this.$emit("update:modelValue", newValue);
+            },
+        },
+    },
+    methods: {
         resetAlerts() {
             this.displayInvalidZipAlert = false;
         },
@@ -100,10 +120,8 @@ export default {
         },
 
         focusOnZipInput() {
-            this.$nextTick(() => {
-                const input = this.$refs.zipInputTextQuestion.$refs.zipInputTextQuestionTextbox;
-                input.focus();
-            });
+            const input = document.getElementById("serviceZipCode");
+            input.focus();
         },
 
         openModal() {
@@ -115,7 +133,6 @@ export default {
         },
 
         onModalOpened() {
-            this.serviceZipCodeInput = this.serviceZipModel.serviceZipCode;
             this.resetsOnZipInput();
             this.focusOnZipInput();
         },
@@ -123,7 +140,7 @@ export default {
         async setZipCode() {
             this.resetAlerts();
 
-            const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
+            const zipCodeData = await this.getZipCodeData(this.serviceZipModel.serviceZipCode);
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
@@ -131,7 +148,7 @@ export default {
             } else {
                 this.serviceZipModel = {
                     serviceState: zipCodeData.state,
-                    serviceZipCode: this.serviceZipCodeInput,
+                    serviceZipCode: this.serviceZipModel.serviceZipCode,
                     isServiceable: zipCodeData.isServiceable,
                 };
 
@@ -139,38 +156,11 @@ export default {
             }
         },
     },
-    computed: {
-        serviceZipLinkPromptText() {
-            return this.getCmsContent(this.linkWidgetName, "BodyText");
-        },
-        modalFooterText() {
-            return this.getCmsContent(this.modalWidgetName, "FooterText");
-        },
-        textboxQuestionPrompt() {
-            return this.getCmsContent(this.textboxQuestionWidgetName, "QuestionText");
-        },
-        modalName() {
-            return this.modalWidgetName;
-        },
-        serviceZipDisplayText() {
-            if (this.modelValue.serviceZipCode.length > 0) {
-                return this.modelValue.serviceState + ", " + this.modelValue.serviceZipCode;
-            }
-            return this.serviceZipLinkPromptText || "Enter your service ZIP";
-        },
-
-        serviceZipModel: {
-            get: function () {
-                return this.modelValue;
-            },
-            set: function (newValue) {
-                this.$emit("update:modelValue", newValue);
-            },
-        },
-    },
     watch: {
-        serviceZipCodeInput() {
-            this.resetsOnZipInput();
+        serviceZipModel: {
+            handler() {
+                this.displayInvalidZipAlert = false;
+            },
         },
     },
     components: {

From ce243fc296cd2c1324446c26d72fbcad81164225 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 10 Feb 2023 10:01:28 -0500
Subject: [PATCH 135/261] Added handleOnInput to textbox question

---
 src/digital-components/textbox-question/textbox-question.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index 2800e260a..5ffc967e7 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -27,7 +27,7 @@
                     cornerStyle === 'rounded' ? 'rounded-pill' : '',
                 ]"
                 :validationRules="validationRules"
-                @input="handleChange"
+                @input="handleOnInput === true ? 'handleChange' : ''"
                 @change="handleChange"
                 @blur="handleChange"
                 :maxlength="maxLength ? maxLength : '999'"
@@ -70,6 +70,7 @@ export default {
             type: String,
             default: "",
         },
+        handleOnInput: Boolean,
         validationRules: String,
         cmsWidgetName: String,
         maxLength: String,

From 2be72ac348712abbb2ea2edb2333620a13d6342c Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Fri, 10 Feb 2023 13:50:17 -0500
Subject: [PATCH 136/261] CSR-1012 | reorganized service-location page data

---
 src/digital-components/modal/modal.vue        | 12 +++-
 .../service-location/service-location.vue     | 68 +++++++++++++------
 .../service-zip-modal-question.vue            | 32 +++++----
 3 files changed, 76 insertions(+), 36 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 96263ecf2..1bf7c3fce 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -2,7 +2,7 @@
     <!-- Modal -->
     <div
         class="modal fade modal-component"
-        v-on="{ 'hidden.bs.modal': resetButtonStyle, 'shown.bs.modal': onModalOpenedCallback }"
+        v-on="{ 'hidden.bs.modal': onModalClosed, 'shown.bs.modal': onModalOpened }"
         :id="modalId"
         tabindex="-1"
         aria-labelledby="ModalComponentLabel"
@@ -53,6 +53,9 @@ export default {
         onModalOpenedCallback: {
             type: Function,
         },
+        onModalClosedCallback: {
+            type: Function,
+        },
     },
     setup() {
         const modalId = `modal-${crypto.randomUUID()}`;
@@ -78,6 +81,13 @@ export default {
         resetButtonStyle() {
             this.$refs.buttonMain.resetButtonStyle();
         },
+        onModalOpened() {
+            this.onModalOpenedCallback?.();
+        },
+        onModalClosed() {
+            this.resetButtonStyle();
+            this.onModalClosedCallback?.();
+        },
         openModal() {
             const modal = Modal.getOrCreateInstance(document.getElementById(this.modalId));
             modal.show();
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index cf296fff3..a1023f9e9 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -4,14 +4,13 @@
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <serviceZipModalQuestion
-                v-model="serviceZipQuestion"
+                v-model="serviceZipQuestionModel"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget"
                 textboxQuestionWidgetName="ServiceZipQuestionWidget"
                 alertInvalidZipWidgetName="AlertInvalidZipWidget" />
             <mobileLocationModalQuestions
-                v-model="mobileLocationQuestions"
-                :serviceZipCode="serviceZipQuestion.serviceZipCode"
+                v-model="mobileLocationQuestionsModel"
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget"
                 mobileFeeDisclaimerWidgetName="MobileFeeDisclaimerWidget"
@@ -42,25 +41,18 @@ export default {
     name: "service-location",
     data() {
         return {
-            serviceZipQuestion: {
-                serviceState: "",
-                serviceZipCode: "",
-                isServiceable: null,
-            },
-            mobileLocationQuestions: {
-                addressQuestions: {
-                    streetAddress: "",
-                    apartmentNumberOrBusinessName: "",
-                    city: "",
-                    state: "",
-                    zipCode: "",
-                },
-                isVehicleProtected: null,
-                isZipServiceableMobile: null,
-                isZipServiceableInShop: null,
-            },
+            isServiceable: null,
+            streetAddress: "",
+            apartmentNumberOrBusinessName: "",
+            city: "",
+            state: "",
+            zipCode: "",
+            isVehicleProtected: null,
+            isZipServiceableMobile: null,
+            isZipServiceableInShop: null,
         };
     },
+
     async beforeRouteEnter(to, from, next) {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
@@ -80,6 +72,42 @@ export default {
             vm.setCmsContent(resultMap.cmsContent);
         });
     },
+    computed: {
+        serviceZipQuestionModel: {
+            get: function () {
+                return {
+                    state: this.state,
+                    zipCode: this.zipCode,
+                    isServiceable: this.isServiceable,
+                };
+            },
+            set: function (newValue) {
+                this.state = newValue.state;
+                this.zipCode = newValue.zipCode;
+                this.isServiceable = newValue.isServiceable;
+            },
+        },
+        mobileLocationQuestionsModel: {
+            get: function () {
+                return {
+                    addressQuestions: {
+                        streetAddress: this.streetAddress,
+                        apartmentNumberOrBusinessName: this.apartmentNumberOrBusinessName,
+                        city: this.city,
+                        state: this.state,
+                        zipCode: this.zipCode,
+                    },
+                };
+            },
+            set: function (newValue) {
+                this.streetAddress = newValue.streetAddress;
+                this.apartmentNumberOrBusinessName = newValue.apartmentNumberOrBusinessName;
+                this.city = newValue.city;
+                this.state = newValue.state;
+                this.zipCode = newValue.zipCode;
+            },
+        },
+    },
     methods: {
         arePagePrerequisitesValid() {
             return true;
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 520755587..8e8beb784 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -14,12 +14,13 @@
         :ref="modalName"
         :headerText="modalHeaderText"
         :onModalOpenedCallback="onModalOpened"
+        :onModalClosedCallback="onModalClosed"
         :footerButtonText="modalFooterText"
         @footer-button-event="setZipCode">
         <serviceZipQuestion
             ref="serviceZipQuestion"
             :cmsWidgetName="textboxQuestionWidgetName"
-            v-model="serviceZipModel.serviceZipCode" />
+            v-model="serviceZipCodeInput" />
         <alert
             ref="alertInvalidZip"
             v-if="displayInvalidZipAlert"
@@ -59,8 +60,8 @@ export default {
             type: Object,
             default: () => ({
                 serviceZipQuestion: {
-                    serviceState: "",
-                    serviceZipCode: "1234",
+                    state: "",
+                    zipCode: "",
                     isServiceable: null,
                 },
             }),
@@ -79,11 +80,10 @@ export default {
     },
     computed: {
         serviceZipLinkText() {
-            const defaultText = this.getCmsContent(this.linkWidgetName, "BodyText");
-            if (this.modelValue.serviceZipCode.length > 0) {
-                return this.modelValue.serviceState + ", " + this.modelValue.serviceZipCode;
+            if (this.modelValue.zipCode.length > 0) {
+                return this.modelValue.state + ", " + this.modelValue.zipCode;
             }
-            return this.serviceZipLinkPromptText || defaultText;
+            return this.getCmsContent(this.linkWidgetName, "BodyText");
         },
         modalHeaderText() {
             return this.getCmsContent(this.textboxQuestionWidgetName, "QuestionText");
@@ -127,22 +127,26 @@ export default {
         },
 
         onModalOpened() {
-            this.resetsOnZipInput();
             this.focusOnZipInput();
         },
 
+        onModalClosed() {
+            this.serviceZipCodeInput = this.serviceZipModel.zipCode;
+            this.resetsOnZipInput();
+        },
+
         async setZipCode() {
             this.resetAlerts();
 
-            const zipCodeData = await this.getZipCodeData(this.serviceZipModel.serviceZipCode);
+            const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
                 this.focusOnZipInput();
             } else {
                 this.serviceZipModel = {
-                    serviceState: zipCodeData.state,
-                    serviceZipCode: this.serviceZipModel.serviceZipCode,
+                    state: zipCodeData.state,
+                    zipCode: this.serviceZipCodeInput,
                     isServiceable: zipCodeData.isServiceable,
                 };
 
@@ -151,10 +155,8 @@ export default {
         },
     },
     watch: {
-        serviceZipModel: {
-            handler() {
-                this.displayInvalidZipAlert = false;
-            },
+        serviceZipCodeInput() {
+            this.resetsOnZipInput();
         },
     },
     components: {

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 137/261] 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 138/261] 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 140d54e3b8a8704f90c481a3d61c8a177bedf19e Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 13 Feb 2023 09:30:14 -0500
Subject: [PATCH 139/261] CSR-1088- Got Mobile location modal working and
 validating correctly

---
 .../textbox-question/textbox-question.vue     |  1 -
 .../mobile-location-modal-questions.vue       | 52 +++++++++++++++++--
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index 5ffc967e7..5fa93dc0c 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -27,7 +27,6 @@
                     cornerStyle === 'rounded' ? 'rounded-pill' : '',
                 ]"
                 :validationRules="validationRules"
-                @input="handleOnInput === true ? 'handleChange' : ''"
                 @change="handleChange"
                 @blur="handleChange"
                 :maxlength="maxLength ? maxLength : '999'"
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 9d0f818de..2a9ebaa00 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -25,11 +25,11 @@
         @footer-button-event="setMobileLocation">
         <addressQuestions
             ref="addressQuestions"
-            v-model="mobileLocationQuestionModel.addressQuestions"
+            v-model="mobileLocationQuestionsInput.addressQuestions"
             captureApartmentNumberOrBusinessName="true" />
         <vehicleProtectedQuestion
             ref="vehicleProtectedQuestion"
-            v-model="mobileLocationQuestionModel.isVehicleProtected"
+            v-model="mobileLocationQuestionsInput.isVehicleProtected"
             cmsWidgetName="VehicleProtectedQuestionWidget" />
         <textBlock cmsWidgetName="WorkspaceRequirementsWidget" typeStyle="caption" />
     </modal>
@@ -45,12 +45,36 @@ import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location
 import textBlock from "@/digital-components/text-block/text-block";
 
 // Supporting Files
+import { useForm } from "vee-validate";
 
 // Define Validation Rules
 
 export default {
     name: "mobile-location-modal-questions",
     emits: ["update:modelValue"], // The component emits an event
+    data() {
+        return {
+            mobileLocationQuestionsInput: {                
+                addressQuestions: {
+                    streetAddress: "",
+                    apartmentNumberOrBusinessName: "",
+                    city: "",
+                    state: "",
+                    zipCode: "",
+                },
+                isVehicleProtected: null,
+                isZipServiceableMobile: null,
+                isZipServiceableInShop: null
+            }
+        }
+    },
+    setup() {
+        const modalForm = useForm();
+
+        return {
+            modalForm,
+        };
+    },
     props: {
         modelValue: {
             type: Object,
@@ -102,7 +126,7 @@ export default {
         modalName() {
             return this.modalWidgetName;
         },
-        mobileLocationQuestionModel: {
+        mobileLocationQuestionsModel: {
             get: function () {
                 return this.modelValue;
             },
@@ -112,7 +136,7 @@ export default {
         },
         addressModel: {
             get: function () {
-                return this.mobileLocationQuestionModel.addressQuestions;
+                return this.mobileLocationQuestionsModel.addressQuestions;
             },
         },
         _isVehicleProtected: {
@@ -128,6 +152,9 @@ export default {
         openModal() {
             this.$refs[this.modalName].openModal();
         },
+        onModalClosed() {
+            this.mobileLocationQuestionsInput = this.mobileLocationQuestionsModel;
+        },
         closeModal() {
             this.$refs[this.modalName].closeModal();
         },
@@ -140,9 +167,24 @@ export default {
             this.addressModel.zipCode = "";
 
             // Is Vehicle Protected
-            this._isVehicleProtected = null;
+            this.mobileLocationQuestionsModel.isVehicleProtected = null;
         },
         async setMobileLocation() {
+
+            this.mobileLocationQuestionsModel = {
+                addressQuestions: {
+                    streetAddress: this.addressModel.streetAddress,
+                    apartmentNumberOrBusinessName: this.addressModel.apartmentNumberOrBusinessName,
+                    city: this.addressModel.city,
+                    state: this.addressModel.state,
+                    zipCode: this.addressModel.zipCode,
+                },
+                isVehicleProtected: this.mobileLocationQuestionsModel.isVehicleProtected,
+                isZipServiceableMobile: this.mobileLocationQuestionsModel.isZipServiceableMobile,
+                isZipServiceableInShop: this.mobileLocationQuestionsModel.isZipServiceableInShop,
+
+            }
+
             this.closeModal();
         },
     },

From dc866298692909d709069f3ccbc70089b69e219f Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Mon, 13 Feb 2023 09:51:41 -0500
Subject: [PATCH 140/261] CSR-1012 | updated service zip link text computed

---
 .../service-zip-modal-question/service-zip-modal-question.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 8e8beb784..371754477 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -80,7 +80,7 @@ export default {
     },
     computed: {
         serviceZipLinkText() {
-            if (this.modelValue.zipCode.length > 0) {
+            if (this.modelValue.zipCode && this.modelValue.zipCode.length > 0) {
                 return this.modelValue.state + ", " + this.modelValue.zipCode;
             }
             return this.getCmsContent(this.linkWidgetName, "BodyText");

From 68c90257332bb58a61dcc8fc00c3663882946c8c Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Mon, 13 Feb 2023 10:29:12 -0500
Subject: [PATCH 141/261] address model setter fixes

---
 .../mobile-location-modal-questions.vue                |  2 +-
 src/layouts/service-location/service-location.vue      | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 2a9ebaa00..36f80dd1c 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -136,7 +136,7 @@ export default {
         },
         addressModel: {
             get: function () {
-                return this.mobileLocationQuestionsModel.addressQuestions;
+                return this.mobileLocationQuestionsInput.addressQuestions;
             },
         },
         _isVehicleProtected: {
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index a1023f9e9..26fba5a20 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -100,11 +100,11 @@ export default {
                 };
             },
             set: function (newValue) {
-                this.streetAddress = newValue.streetAddress;
-                this.apartmentNumberOrBusinessName = newValue.apartmentNumberOrBusinessName;
-                this.city = newValue.city;
-                this.state = newValue.state;
-                this.zipCode = newValue.zipCode;
+                this.streetAddress = newValue.addressQuestions.streetAddress;
+                this.apartmentNumberOrBusinessName = newValue.addressQuestions.apartmentNumberOrBusinessName;
+                this.city = newValue.addressQuestions.city;
+                this.state = newValue.addressQuestions.state;
+                this.zipCode = newValue.addressQuestions.zipCode;
             },
         },
     },

From c97b440275da45114cef244f4449794a78402ae0 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 13 Feb 2023 10:29:13 -0500
Subject: [PATCH 142/261] Changes to work with top level page

---
 .../mobile-location-modal-questions.vue       | 30 +++++++------------
 .../service-location/service-location.vue     | 11 ++++---
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 2a9ebaa00..d119cf7e8 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -54,7 +54,7 @@ export default {
     emits: ["update:modelValue"], // The component emits an event
     data() {
         return {
-            mobileLocationQuestionsInput: {                
+            mobileLocationQuestionsInput: {
                 addressQuestions: {
                     streetAddress: "",
                     apartmentNumberOrBusinessName: "",
@@ -64,9 +64,9 @@ export default {
                 },
                 isVehicleProtected: null,
                 isZipServiceableMobile: null,
-                isZipServiceableInShop: null
-            }
-        }
+                isZipServiceableInShop: null,
+            },
+        };
     },
     setup() {
         const modalForm = useForm();
@@ -136,15 +136,7 @@ export default {
         },
         addressModel: {
             get: function () {
-                return this.mobileLocationQuestionsModel.addressQuestions;
-            },
-        },
-        _isVehicleProtected: {
-            get: function () {
-                return this.modelValue.isVehicleProtected;
-            },
-            set: function (newValue) {
-                this.$emit("update:modelValue.isVehicleProtected", newValue);
+                return this.mobileLocationQuestionsInput.addressQuestions;
             },
         },
     },
@@ -167,10 +159,9 @@ export default {
             this.addressModel.zipCode = "";
 
             // Is Vehicle Protected
-            this.mobileLocationQuestionsModel.isVehicleProtected = null;
+            this.mobileLocationQuestionsInput.isVehicleProtected = null;
         },
         async setMobileLocation() {
-
             this.mobileLocationQuestionsModel = {
                 addressQuestions: {
                     streetAddress: this.addressModel.streetAddress,
@@ -179,11 +170,10 @@ export default {
                     state: this.addressModel.state,
                     zipCode: this.addressModel.zipCode,
                 },
-                isVehicleProtected: this.mobileLocationQuestionsModel.isVehicleProtected,
-                isZipServiceableMobile: this.mobileLocationQuestionsModel.isZipServiceableMobile,
-                isZipServiceableInShop: this.mobileLocationQuestionsModel.isZipServiceableInShop,
-
-            }
+                isVehicleProtected: this.mobileLocationQuestionsInput.isVehicleProtected,
+                isZipServiceableMobile: this.mobileLocationQuestionsInput.isZipServiceableMobile,
+                isZipServiceableInShop: this.mobileLocationQuestionsInput.isZipServiceableInShop,
+            };
 
             this.closeModal();
         },
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index a1023f9e9..8ac0cfc34 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -97,7 +97,10 @@ export default {
                         state: this.state,
                         zipCode: this.zipCode,
                     },
-                };
+                    isVehicleProtected: this.isVehicleProtected,
+                    isZipServiceableMobile: this.isZipServiceableMobile,
+                    isZipServiceableInShop: this.isZipServiceableInShop,
+                }
             },
             set: function (newValue) {
                 this.streetAddress = newValue.streetAddress;
@@ -105,6 +108,9 @@ export default {
                 this.city = newValue.city;
                 this.state = newValue.state;
                 this.zipCode = newValue.zipCode;
+                this.isVehicleProtected = newValue.isVehicleProtected;
+                this.isZipServiceableMobile = newValue.isZipServiceableMobile;
+                this.isZipServiceableInShop = newValue.isZipServiceableInShop;                
             },
         },
     },
@@ -112,9 +118,6 @@ export default {
         arePagePrerequisitesValid() {
             return true;
         },
-        resetMobileLocationTest() {
-            this.serviceZipQuestion.serviceZipCode = "43054";
-        },
         backButtonAction() {},
         forwardButtonAction() {},
     },

From 33cc766c91514ad85cdb4476a9ce0edf366da731 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Mon, 13 Feb 2023 10:57:42 -0500
Subject: [PATCH 143/261] CSR-1012 formatting

---
 src/layouts/service-location/service-location.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 4489aac0c..3d430c720 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -100,17 +100,18 @@ export default {
                     isVehicleProtected: this.isVehicleProtected,
                     isZipServiceableMobile: this.isZipServiceableMobile,
                     isZipServiceableInShop: this.isZipServiceableInShop,
-                }
+                };
             },
             set: function (newValue) {
                 this.streetAddress = newValue.addressQuestions.streetAddress;
-                this.apartmentNumberOrBusinessName = newValue.addressQuestions.apartmentNumberOrBusinessName;
+                this.apartmentNumberOrBusinessName =
+                    newValue.addressQuestions.apartmentNumberOrBusinessName;
                 this.city = newValue.addressQuestions.city;
                 this.state = newValue.addressQuestions.state;
                 this.zipCode = newValue.addressQuestions.zipCode;
                 this.isVehicleProtected = newValue.isVehicleProtected;
                 this.isZipServiceableMobile = newValue.isZipServiceableMobile;
-                this.isZipServiceableInShop = newValue.isZipServiceableInShop;                
+                this.isZipServiceableInShop = newValue.isZipServiceableInShop;
             },
         },
     },

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 144/261] 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>

From 744939503b86a64dbd2c13eeedeba0ff08d97337 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Mon, 13 Feb 2023 14:41:51 -0500
Subject: [PATCH 145/261] CSR-1012 bug fixes for header text and zip on modal
 open

---
 src/digital-components/modal/modal.spec.js                     | 3 +++
 .../content-group-modal/content-group-modal.spec.js            | 3 +++
 .../service-zip-modal-question/service-zip-modal-question.vue  | 1 +
 3 files changed, 7 insertions(+)

diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index 5feaf0216..7ed8fff12 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -1,10 +1,13 @@
 import { shallowMount } from "@vue/test-utils";
 import Modal from "./modal";
+import crypto from "crypto";
 
 const modalId = "modal-one";
 const footerButtonText = "Sample footer text here.";
 const headerText = "Sample header text here.";
 
+global.crypto = crypto;
+
 describe("modal.vue", () => {
     it("Should display footer button text when footerButtonText is defined", async () => {
         const wrapper = shallowMount(Modal, {
diff --git a/src/fmg-components/content-group-modal/content-group-modal.spec.js b/src/fmg-components/content-group-modal/content-group-modal.spec.js
index a8058b2d5..cbdf6e182 100644
--- a/src/fmg-components/content-group-modal/content-group-modal.spec.js
+++ b/src/fmg-components/content-group-modal/content-group-modal.spec.js
@@ -1,5 +1,8 @@
 import { mount } from "@vue/test-utils";
 import contentGroupModal from "./content-group-modal";
+import crypto from "crypto";
+
+global.crypto = crypto;
 
 describe("content-group-modal.vue", () => {
     it("Should display header text when HeaderText is defined in the CMS", async () => {
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 371754477..c8352697c 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -127,6 +127,7 @@ export default {
         },
 
         onModalOpened() {
+            this.serviceZipCodeInput = this.serviceZipModel.zipCode;
             this.focusOnZipInput();
         },
 

From eb87accfb71dcb4151054e297d150903ceb9fa36 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 13 Feb 2023 15:06:18 -0500
Subject: [PATCH 146/261] Moved 'useForm' into modal component

---
 src/digital-components/modal/modal.spec.js                 | 4 ++++
 src/digital-components/modal/modal.vue                     | 4 +++-
 .../mobile-location-modal-questions.vue                    | 7 -------
 .../service-zip-modal-question.vue                         | 7 -------
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index 5feaf0216..963167829 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -1,10 +1,14 @@
 import { shallowMount } from "@vue/test-utils";
 import Modal from "./modal";
+import crypto from "crypto";
+import { useForm } from "vee-validate";
 
 const modalId = "modal-one";
 const footerButtonText = "Sample footer text here.";
 const headerText = "Sample header text here.";
 
+global.crypto = crypto;
+
 describe("modal.vue", () => {
     it("Should display footer button text when footerButtonText is defined", async () => {
         const wrapper = shallowMount(Modal, {
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 1bf7c3fce..e0be2e9c0 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -43,7 +43,7 @@
 <script>
 import buttonMain from "@/ux-components/button-main/button-main";
 import { Modal } from "bootstrap";
-import { useIsFormTouched, useIsFormDirty, useIsFormValid } from "vee-validate";
+import { useForm, useIsFormTouched, useIsFormDirty, useIsFormValid } from "vee-validate";
 
 export default {
     name: "modal",
@@ -60,12 +60,14 @@ export default {
     setup() {
         const modalId = `modal-${crypto.randomUUID()}`;
 
+        const modalForm = useForm();
         const isTouched = useIsFormTouched();
         const isDirty = useIsFormDirty();
         const isValid = useIsFormValid();
 
         return {
             modalId,
+            modalForm,
             isTouched,
             isDirty,
             isValid,
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index d119cf7e8..78310096a 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -68,13 +68,6 @@ export default {
             },
         };
     },
-    setup() {
-        const modalForm = useForm();
-
-        return {
-            modalForm,
-        };
-    },
     props: {
         modelValue: {
             type: Object,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 371754477..03c3f6759 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -71,13 +71,6 @@ export default {
         textboxQuestionWidgetName: String,
         alertInvalidZipWidgetName: String,
     },
-    setup() {
-        const modalForm = useForm();
-
-        return {
-            modalForm,
-        };
-    },
     computed: {
         serviceZipLinkText() {
             if (this.modelValue.zipCode && this.modelValue.zipCode.length > 0) {

From cf86fcae23cea37884ac9d14d0baef7991619c31 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Mon, 13 Feb 2023 15:30:36 -0500
Subject: [PATCH 147/261] CSR-1168 | Change how we determine if a package has
 been selected

---
 src/layouts/quote/quote.vue                   | 13 +++++++--
 .../service-package-question.vue              | 27 +++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 21f5753bb..ecc5d5d32 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -103,12 +103,12 @@ export default {
         ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
-        const glassParts = store.getters.order.lineItems.glassParts ?? [];
+        const clonedGlassParts = store.getters.order.lineItems.glassParts ? JSON.parse(JSON.stringify(store.getters.order.lineItems.glassParts)) : [];
         const availableLineItems = [
             resultMap.rainDefense,
             ...resultMap.supportingItems,
             ...resultMap.wipers,
-            ...glassParts,
+            ...clonedGlassParts,
         ];
 
         const pricingResults = await baseMixin.methods.dispatchStoreAction(
@@ -120,6 +120,7 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+            vm.pricedGlassParts = clonedGlassParts;
             vm.supportingItems = resultMap.supportingItems;
             vm.availableLineItems = pricingResults;
             vm.isInsuranceSelected = vm.getDefaultIsInsuranceSelectedValue(vm.availableLineItems);
@@ -131,6 +132,7 @@ export default {
             selectedVaps: null,
             availableLineItems: null,
             supportingItems: null,
+            pricedGlassParts: null
         };
     },
     methods: {
@@ -183,6 +185,13 @@ export default {
             if (this.$store.getters.order.accountNumber != applicationConfig.CASH_ACCOUNT_NUMBER) {
                 this.supportingItems = this.filterOutFees(this.supportingItems);
             }
+            if(this.pricedGlassParts.length > 0) {
+                this.dispatchStoreAction(
+                    this.storeActions.SAVE_GLASS_PARTS,
+                    this.pricedGlassParts,
+                    false
+                );
+            }
             this.dispatchStoreAction(
                 this.storeActions.SAVE_SUPPORTING_ITEMS,
                 this.supportingItems,
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 796da19e9..820c988ee 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -42,9 +42,10 @@ export default {
     },
     watch: {
         availableLineItems() {
-            if (this.$store.getters.lineItems.vaps) {
+            if (this.allGlassPartsAndSupportingItemsHavePrices(this.$store.getters.lineItems)) {
                 this.selectDefaultPackage();
             }
+
         },
         selectedPackageName(newValue) {
             const VapsProductsInSelectedPackage = this.getVapsLineItemsForSelectedPackage(newValue);
@@ -212,7 +213,7 @@ export default {
         selectDefaultPackage() {
             const vapsFromStore = this.$store.getters.lineItems.vaps;
             let lowestTierForPackage = packageNames.TIER_ONE;
-            if (vapsFromStore.length > 0) {
+            if (vapsFromStore?.length > 0) {
                 vapsFromStore.every((vapsItem) => {
                     let lowestTierForThisItem = this.getLowestTierForThisItem(vapsItem);
                     if (lowestTierForThisItem === packageNames.TIER_THREE) {
@@ -228,6 +229,28 @@ export default {
             }
             this.selectedPackageName = lowestTierForPackage;
         },
+        allGlassPartsAndSupportingItemsHavePrices(lineItems) {
+            if (lineItems?.glassParts) {
+                for (let i = 0; i < lineItems.glassParts.length; i++) {
+                    if (this.priceIsNullOrZero(lineItems.glassParts[i])) {
+                        return false;
+                    }
+                }
+            }
+            if (lineItems?.supportingItems) {
+                for (let i = 0; i < lineItems.supportingItems.length; i++) {
+                    if (this.priceIsNullOrZero(lineItems.supportingItems[i])) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        },
+        priceIsNullOrZero(lineItem) {
+            return (lineItem.kitPrice == null || lineItem.kitPrice == 0) &&
+            (lineItem.laborAmount == null || lineItem.laborAmount == 0) &&
+            (lineItem.sellingPrice == null || lineItem.sellingPrice == 0);
+        },
         getLowestTierForThisItem(vapsItem) {
             let lowestTierForThisItem = null;
             switch (vapsItem.partType) {

From b6f70b9b868386533f0bcd587c2500bda396e696 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 14 Feb 2023 07:46:29 -0500
Subject: [PATCH 148/261] Moved 'useForm' inside modal component

---
 src/digital-components/modal/modal.vue        | 22 +++++-----
 .../mobile-location-modal-questions.vue       | 43 +++++++------------
 .../service-location/service-location.vue     |  7 +--
 .../service-zip-modal-question.vue            |  7 ---
 4 files changed, 32 insertions(+), 47 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 1bf7c3fce..0586b9f1a 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -43,7 +43,7 @@
 <script>
 import buttonMain from "@/ux-components/button-main/button-main";
 import { Modal } from "bootstrap";
-import { useIsFormTouched, useIsFormDirty, useIsFormValid } from "vee-validate";
+import { useForm, useIsFormTouched, useIsFormDirty, useIsFormValid } from "vee-validate";
 
 export default {
     name: "modal",
@@ -60,15 +60,17 @@ export default {
     setup() {
         const modalId = `modal-${crypto.randomUUID()}`;
 
-        const isTouched = useIsFormTouched();
-        const isDirty = useIsFormDirty();
-        const isValid = useIsFormValid();
+        const form = useForm();
+        const isFormTouched = useIsFormTouched();
+        const isFormDirty = useIsFormDirty();
+        const isFormValid = useIsFormValid();
 
         return {
             modalId,
-            isTouched,
-            isDirty,
-            isValid,
+            form,
+            isFormTouched,
+            isFormDirty,
+            isFormValid,
         };
     },
     methods: {
@@ -99,10 +101,10 @@ export default {
     },
     computed: {
         isFooterButtonDisabled() {
-            if (!this.isTouched) {
-                return !this.isValid;
+            if (!this.isFormTouched) {
+                return !this.isFormValid;
             }
-            return !this.isDirty || !this.isValid;
+            return !this.isFormDirty || !this.isFormValid;
         },
     },
     components: {
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index d119cf7e8..09d18ecba 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -20,7 +20,7 @@
     <modal
         :ref="modalName"
         :headerText="modalHeaderText"
-        :onModalOpenedCallback="onModalOpened"
+        :onModalClosedCallback="onModalClosed"
         :footerButtonText="modalFooterText"
         @footer-button-event="setMobileLocation">
         <addressQuestions
@@ -44,11 +44,6 @@ import addressQuestions from "@/layouts/address-lookup/customer-questions/addres
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 import textBlock from "@/digital-components/text-block/text-block";
 
-// Supporting Files
-import { useForm } from "vee-validate";
-
-// Define Validation Rules
-
 export default {
     name: "mobile-location-modal-questions",
     emits: ["update:modelValue"], // The component emits an event
@@ -68,13 +63,6 @@ export default {
             },
         };
     },
-    setup() {
-        const modalForm = useForm();
-
-        return {
-            modalForm,
-        };
-    },
     props: {
         modelValue: {
             type: Object,
@@ -135,6 +123,11 @@ export default {
             },
         },
         addressModel: {
+            get: function () {
+                return this.mobileLocationQuestionsModel.addressQuestions;
+            },
+        },
+        addressModelInput: {
             get: function () {
                 return this.mobileLocationQuestionsInput.addressQuestions;
             },
@@ -144,12 +137,15 @@ export default {
         openModal() {
             this.$refs[this.modalName].openModal();
         },
-        onModalClosed() {
+        onModalOpened() {
             this.mobileLocationQuestionsInput = this.mobileLocationQuestionsModel;
         },
         closeModal() {
             this.$refs[this.modalName].closeModal();
         },
+        onModalClosed() {
+            this.mobileLocationQuestionsInput = this.mobileLocationQuestionsModel;
+        },
         resetModel() {
             // Address
             this.addressModel.streetAddress = "";
@@ -164,11 +160,12 @@ export default {
         async setMobileLocation() {
             this.mobileLocationQuestionsModel = {
                 addressQuestions: {
-                    streetAddress: this.addressModel.streetAddress,
-                    apartmentNumberOrBusinessName: this.addressModel.apartmentNumberOrBusinessName,
-                    city: this.addressModel.city,
-                    state: this.addressModel.state,
-                    zipCode: this.addressModel.zipCode,
+                    streetAddress: this.addressModelInput.streetAddress,
+                    apartmentNumberOrBusinessName:
+                        this.addressModelInput.apartmentNumberOrBusinessName,
+                    city: this.addressModelInput.city,
+                    state: this.addressModelInput.state,
+                    zipCode: this.addressModelInput.zipCode,
                 },
                 isVehicleProtected: this.mobileLocationQuestionsInput.isVehicleProtected,
                 isZipServiceableMobile: this.mobileLocationQuestionsInput.isZipServiceableMobile,
@@ -178,14 +175,6 @@ export default {
             this.closeModal();
         },
     },
-    watch: {
-        serviceZipCode: {
-            handler() {
-                // if they modify the Service Zip Code, clear the model
-                this.resetModel();
-            },
-        },
-    },
     components: {
         textLink,
         modal,
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 4489aac0c..3d430c720 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -100,17 +100,18 @@ export default {
                     isVehicleProtected: this.isVehicleProtected,
                     isZipServiceableMobile: this.isZipServiceableMobile,
                     isZipServiceableInShop: this.isZipServiceableInShop,
-                }
+                };
             },
             set: function (newValue) {
                 this.streetAddress = newValue.addressQuestions.streetAddress;
-                this.apartmentNumberOrBusinessName = newValue.addressQuestions.apartmentNumberOrBusinessName;
+                this.apartmentNumberOrBusinessName =
+                    newValue.addressQuestions.apartmentNumberOrBusinessName;
                 this.city = newValue.addressQuestions.city;
                 this.state = newValue.addressQuestions.state;
                 this.zipCode = newValue.addressQuestions.zipCode;
                 this.isVehicleProtected = newValue.isVehicleProtected;
                 this.isZipServiceableMobile = newValue.isZipServiceableMobile;
-                this.isZipServiceableInShop = newValue.isZipServiceableInShop;                
+                this.isZipServiceableInShop = newValue.isZipServiceableInShop;
             },
         },
     },
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 371754477..03c3f6759 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -71,13 +71,6 @@ export default {
         textboxQuestionWidgetName: String,
         alertInvalidZipWidgetName: String,
     },
-    setup() {
-        const modalForm = useForm();
-
-        return {
-            modalForm,
-        };
-    },
     computed: {
         serviceZipLinkText() {
             if (this.modelValue.zipCode && this.modelValue.zipCode.length > 0) {

From d7fa90ee5805ceee137c402b09e30106ca55e09a Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 14 Feb 2023 10:50:27 -0500
Subject: [PATCH 149/261] Model reset stuff

---
 .../address-questions/address-questions.vue   |  1 +
 .../mobile-location-modal-questions.vue       | 20 ++++++++++++-------
 .../service-location/service-location.vue     | 17 ++++++++++++++++
 .../service-zip-modal-question.vue            |  5 +++++
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index aed1b5147..cff2a8543 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -207,6 +207,7 @@ export default {
     },
     methods: {
         setupAddressLookup() {
+            this.showAddressFields = false;
             if (
                 this.addressModel.streetAddress &&
                 this.addressModel.city &&
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 09d18ecba..60f698ef4 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -146,18 +146,24 @@ export default {
         onModalClosed() {
             this.mobileLocationQuestionsInput = this.mobileLocationQuestionsModel;
         },
-        resetModel() {
+        resetComponent() {
             // Address
-            this.addressModel.streetAddress = "";
-            this.addressModel.apartmentNumberOrBusinessName = "";
-            this.addressModel.city = "";
-            this.addressModel.state = "";
-            this.addressModel.zipCode = "";
+            this.addressModelInput.streetAddress = "";
+            this.addressModelInput.apartmentNumberOrBusinessName = "";
+            this.addressModelInput.city = "";
+            this.addressModelInput.state = "";
+            this.addressModelInput.zipCode = "";
 
             // Is Vehicle Protected
-            this.mobileLocationQuestionsInput.isVehicleProtected = null;
+            this.mobileLocationQuestionsInput.isVehicleProtected = null; 
+            
+            this.$refs[this.modalName].form.resetForm();
+
+            this.$refs.addressQuestions.setupAddressLookup();
         },
         async setMobileLocation() {
+            // TODO: Any lookups or actions to be taken before assigning the Mobile Location
+
             this.mobileLocationQuestionsModel = {
                 addressQuestions: {
                     streetAddress: this.addressModelInput.streetAddress,
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 209a2f0fd..d8295edd5 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -6,11 +6,13 @@
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <serviceZipModalQuestion
                 v-model="serviceZipQuestionModel"
+                @service-zip-updated="resetMobileLocation"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget"
                 textboxQuestionWidgetName="ServiceZipQuestionWidget"
                 alertInvalidZipWidgetName="AlertInvalidZipWidget" />
             <mobileLocationModalQuestions
+                ref="mobileLocationModalQuestions"
                 v-model="mobileLocationQuestionsModel"
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget"
@@ -121,7 +123,22 @@ export default {
         arePagePrerequisitesValid() {
             return true;
         },
+        resetMobileLocation() {
+            this.mobileLocationQuestionsModel = {
+                addressQuestions: {
+                    streetAddress: "",
+                    apartmentNumberOrBusinessName: "",
+                    city: "",
+                    state: "",
+                    zipCode: "",
+                },
+                isVehicleProtected: null,
+                isZipServiceableMobile: null,
+                isZipServiceableInShop: null,
+            };
 
+            this.$refs.mobileLocationModalQuestions.resetComponent();
+        },
         backButtonAction() {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 75ee865ca..27321d111 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -138,6 +138,11 @@ export default {
                 this.displayInvalidZipAlert = true;
                 this.focusOnZipInput();
             } else {
+                // if the service zip code changes we need to clear the Mobile Location Model
+                if (this.serviceZipModel.zipCode !== "" && this.serviceZipCodeInput !== this.serviceZipModel.zipCode ) {
+                    this.$emit("service-zip-updated");
+                }
+
                 this.serviceZipModel = {
                     state: zipCodeData.state,
                     zipCode: this.serviceZipCodeInput,

From 85f19a8bcd9c46e8b0d63d28d5d173656693cd4d Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 14 Feb 2023 13:55:06 -0500
Subject: [PATCH 150/261] CSR-1178 fix incorrect zip code alert being
 displayed.

---
 src/layouts/vin-lookup/vin-lookup.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 75d7b019f..715f52213 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -364,7 +364,12 @@ export default {
             }
 
             // If the Service Zip is NOT serviceable then show an alert
-            this.displayNonServiceableZipAlert = true;
+            if (zipCodeData.isValid) {
+                this.displayNonServiceableZipAlert = true;
+            } else {
+                this.displayInvalidZipAlert = true;
+            }
+
 
             return this.$refs.funnelFooter.removeLoader();
         },

From 197c5e7bc639d9bf017965881215148f3ed062be Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 14 Feb 2023 13:57:36 -0500
Subject: [PATCH 151/261] Format code.

---
 src/layouts/vin-lookup/vin-lookup.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 715f52213..0c49dc262 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -370,7 +370,6 @@ export default {
                 this.displayInvalidZipAlert = true;
             }
 
-
             return this.$refs.funnelFooter.removeLoader();
         },
         async navigateForward() {

From 91df8c52c25d0b09229ea0691f3dde7918725385 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Tue, 14 Feb 2023 15:17:18 -0500
Subject: [PATCH 152/261] CSR-1168 | Added default service package unit tests

---
 src/layouts/quote/quote.spec.js               |   4 +
 src/layouts/quote/quote.vue                   |   8 +-
 .../service-package-question.spec.js          | 207 ++++++++++++++++++
 .../service-package-question.vue              |   9 +-
 4 files changed, 221 insertions(+), 7 deletions(-)

diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
index e5d4d54fb..dccc73346 100644
--- a/src/layouts/quote/quote.spec.js
+++ b/src/layouts/quote/quote.spec.js
@@ -78,6 +78,8 @@ describe("quote.vue", () => {
             };
         });
 
+        wrapper.vm.pricedGlassParts = [];
+
         //Act
         await wrapper.vm.forwardButtonAction();
 
@@ -107,6 +109,8 @@ describe("quote.vue", () => {
             };
         });
 
+        wrapper.vm.pricedGlassParts = [];
+
         //Act
         await wrapper.vm.forwardButtonAction();
 
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 2d5f95e05..786b046b9 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -102,7 +102,9 @@ export default {
         ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
-        const clonedGlassParts = store.getters.order.lineItems.glassParts ? JSON.parse(JSON.stringify(store.getters.order.lineItems.glassParts)) : [];
+        const clonedGlassParts = store.getters.order.lineItems.glassParts
+            ? JSON.parse(JSON.stringify(store.getters.order.lineItems.glassParts))
+            : [];
         const availableLineItems = [
             resultMap.rainDefense,
             ...resultMap.supportingItems,
@@ -131,7 +133,7 @@ export default {
             selectedVaps: null,
             availableLineItems: null,
             supportingItems: null,
-            pricedGlassParts: null
+            pricedGlassParts: null,
         };
     },
     methods: {
@@ -185,7 +187,7 @@ export default {
             if (this.$store.getters.order.accountNumber != applicationConfig.CASH_ACCOUNT_NUMBER) {
                 this.supportingItems = this.filterOutFees(this.supportingItems);
             }
-            if(this.pricedGlassParts.length > 0) {
+            if (this.pricedGlassParts.length > 0) {
                 this.dispatchStoreAction(
                     this.storeActions.SAVE_GLASS_PARTS,
                     this.pricedGlassParts,
diff --git a/src/layouts/quote/service-package-question/service-package-question.spec.js b/src/layouts/quote/service-package-question/service-package-question.spec.js
index cd10b893f..af04ff36a 100644
--- a/src/layouts/quote/service-package-question/service-package-question.spec.js
+++ b/src/layouts/quote/service-package-question/service-package-question.spec.js
@@ -135,6 +135,213 @@ describe("service-package-question.vue", () => {
             expectedModifiedAnswers[packageNameKey].tierThree
         );
     });
+    it("should not select a default package if ANY glass part or supporting item has no prices", async () => {
+        // Note, only the first WSREPAIR item has a 0 for laborAmount, this is enough to not try and select a default package
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        lineItems: {
+                            glassParts: [
+                                {
+                                    partNumber: "FW02627GBYNOEE",
+                                    description: "solar, 3rd visor band",
+                                    color: "Green Tint, Blue Shade",
+                                    partType: "WINDSHIELD",
+                                    canSafeliteRecalibrate: false,
+                                    requiresRecalibration: false,
+                                    requiresCapabilityQuestions: false,
+                                    recalibrationType: null,
+                                    childParts: null,
+                                    laborAmount: 5.0,
+                                },
+                            ],
+                            supportingItems: [
+                                {
+                                    partNumber: "SUPPLIES-REPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                            ],
+                        },
+                        order: {
+                            damage: {
+                                isRepair: false,
+                                glassToReplace: [{ glassLocation: "Windshield" }],
+                            },
+                        },
+                    },
+                },
+            },
+        });
+
+        // Act
+        wrapper.setProps({ availableLineItems: null });
+
+        await nextTick();
+
+        // Assert
+        expect(wrapper.vm.selectedPackageName).toBe(null);
+    });
+    it("should select a default package if ALL glass parts and supporting items have prices", async () => {
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        lineItems: {
+                            glassParts: [
+                                {
+                                    partNumber: "FW02627GBYNOEE",
+                                    description: "solar, 3rd visor band",
+                                    color: "Green Tint, Blue Shade",
+                                    partType: "WINDSHIELD",
+                                    canSafeliteRecalibrate: false,
+                                    requiresRecalibration: false,
+                                    requiresCapabilityQuestions: false,
+                                    recalibrationType: null,
+                                    childParts: null,
+                                    laborAmount: 5.0,
+                                },
+                            ],
+                            supportingItems: [
+                                {
+                                    partNumber: "SUPPLIES-REPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                            ],
+                        },
+                        order: {
+                            damage: {
+                                isRepair: false,
+                                glassToReplace: [{ glassLocation: "Windshield" }],
+                            },
+                        },
+                    },
+                },
+            },
+        });
+
+        // Act
+        wrapper.setProps({ availableLineItems: null });
+
+        await nextTick();
+
+        // Assert
+        expect(wrapper.vm.selectedPackageName).toBe("TierOne");
+    });
+    it("should select TierThree default package if Rain Defense is on order", async () => {
+        // This tests the business intent that when returning to the page, the selected package is the lowest package that contains all VAPs on the order.
+        // In this case Rain Defense is only in Premium so Tier Three should be defaulted to
+        const wrapper = setupMocks({
+            mountOptionsMockData: {
+                store: {
+                    getters: {
+                        lineItems: {
+                            glassParts: [
+                                {
+                                    partNumber: "FW02627GBYNOEE",
+                                    description: "solar, 3rd visor band",
+                                    color: "Green Tint, Blue Shade",
+                                    partType: "WINDSHIELD",
+                                    canSafeliteRecalibrate: false,
+                                    requiresRecalibration: false,
+                                    requiresCapabilityQuestions: false,
+                                    recalibrationType: null,
+                                    childParts: null,
+                                    laborAmount: 5.0,
+                                },
+                            ],
+                            vaps: [
+                                {
+                                    partNumber: "RAIN DEFENSE",
+                                    partType: "RAIN DEFENSE",
+                                },
+                            ],
+                            supportingItems: [
+                                {
+                                    partNumber: "SUPPLIES-REPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                                {
+                                    partNumber: "WSREPAIR",
+                                    description: null,
+                                    partType: "REPAIR FEE",
+                                    laborAmount: 5.0,
+                                },
+                            ],
+                        },
+                        order: {
+                            damage: {
+                                isRepair: false,
+                                glassToReplace: [{ glassLocation: "Windshield" }],
+                            },
+                        },
+                    },
+                },
+            },
+        });
+
+        // Act
+        wrapper.setProps({ availableLineItems: null });
+
+        await nextTick();
+
+        // Assert
+        expect(wrapper.vm.selectedPackageName).toBe("TierThree");
+    });
 });
 describe("service-package-question.vue, matching business rules for package display", () => {
     // mock scenarios in figma:
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 820c988ee..cca37bb45 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -45,7 +45,6 @@ export default {
             if (this.allGlassPartsAndSupportingItemsHavePrices(this.$store.getters.lineItems)) {
                 this.selectDefaultPackage();
             }
-
         },
         selectedPackageName(newValue) {
             const VapsProductsInSelectedPackage = this.getVapsLineItemsForSelectedPackage(newValue);
@@ -247,9 +246,11 @@ export default {
             return true;
         },
         priceIsNullOrZero(lineItem) {
-            return (lineItem.kitPrice == null || lineItem.kitPrice == 0) &&
-            (lineItem.laborAmount == null || lineItem.laborAmount == 0) &&
-            (lineItem.sellingPrice == null || lineItem.sellingPrice == 0);
+            return (
+                (lineItem.kitPrice == null || lineItem.kitPrice == 0) &&
+                (lineItem.laborAmount == null || lineItem.laborAmount == 0) &&
+                (lineItem.sellingPrice == null || lineItem.sellingPrice == 0)
+            );
         },
         getLowestTierForThisItem(vapsItem) {
             let lowestTierForThisItem = null;

From c6b59f1421774750ff63ee3de8b3ba28934d880c Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 15 Feb 2023 08:37:49 -0500
Subject: [PATCH 153/261] Model reset stuff, still need to change
 address-questions to use normal names

---
 src/digital-components/modal/modal.vue        |   3 +-
 .../mobile-location-modal-questions.vue       | 119 ++++++++----------
 .../service-zip-modal-question.vue            |  78 +++++++-----
 3 files changed, 101 insertions(+), 99 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 0586b9f1a..0034b5155 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -75,7 +75,8 @@ export default {
     },
     methods: {
         async validateAndEmit() {
-            if (!this.isFooterButtonDisabled) {
+            const validationResult = await this.form.validate();
+            if (validationResult.valid) {
                 this.$emit("footer-button-event");
             }
             this.resetButtonStyle();
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 60f698ef4..aeb7a9607 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -25,11 +25,11 @@
         @footer-button-event="setMobileLocation">
         <addressQuestions
             ref="addressQuestions"
-            v-model="mobileLocationQuestionsInput.addressQuestions"
+            v-model="internalModel.addressQuestions"
             captureApartmentNumberOrBusinessName="true" />
         <vehicleProtectedQuestion
             ref="vehicleProtectedQuestion"
-            v-model="mobileLocationQuestionsInput.isVehicleProtected"
+            v-model="internalModel.isVehicleProtected"
             cmsWidgetName="VehicleProtectedQuestionWidget" />
         <textBlock cmsWidgetName="WorkspaceRequirementsWidget" typeStyle="caption" />
     </modal>
@@ -43,25 +43,15 @@ import alert from "@/ux-components/alert/alert";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 import textBlock from "@/digital-components/text-block/text-block";
+import { useForm } from "vee-validate";
 
 export default {
     name: "mobile-location-modal-questions",
     emits: ["update:modelValue"], // The component emits an event
     data() {
         return {
-            mobileLocationQuestionsInput: {
-                addressQuestions: {
-                    streetAddress: "",
-                    apartmentNumberOrBusinessName: "",
-                    city: "",
-                    state: "",
-                    zipCode: "",
-                },
-                isVehicleProtected: null,
-                isZipServiceableMobile: null,
-                isZipServiceableInShop: null,
-            },
-        };
+            internalModel: this.copyModel(this.modelValue),
+        }
     },
     props: {
         modelValue: {
@@ -74,9 +64,9 @@ export default {
                     state: "",
                     zipCode: "",
                 },
-                isVehicleProtected: Boolean,
-                isZipServiceableMobile: Boolean,
-                isZipServiceableInShop: Boolean,
+                isVehicleProtected: null,
+                isZipServiceableMobile: null,
+                isZipServiceableInShop: null,
             }),
         },
         serviceZipCode: String,
@@ -88,9 +78,6 @@ export default {
         alertInvalidZipWidgetName: String,
     },
     computed: {
-        getModalId() {
-            return "#" + this.modalWidgetName;
-        },
         mobileLocationLinkPromptText() {
             return this.getCmsContent(this.linkWidgetName, "HeaderText");
         },
@@ -114,73 +101,77 @@ export default {
         modalName() {
             return this.modalWidgetName;
         },
-        mobileLocationQuestionsModel: {
-            get: function () {
-                return this.modelValue;
-            },
-            set: function (newValue) {
-                this.$emit("update:modelValue", newValue);
-            },
-        },
         addressModel: {
             get: function () {
-                return this.mobileLocationQuestionsModel.addressQuestions;
-            },
-        },
-        addressModelInput: {
-            get: function () {
-                return this.mobileLocationQuestionsInput.addressQuestions;
+                return this.modelValue.addressQuestions;
             },
         },
     },
     methods: {
+        copyModel(modelToCopy) {
+            return {
+                addressQuestions: {
+                    streetAddress: modelToCopy.addressQuestions.streetAddress,
+                    apartmentNumberOrBusinessName: modelToCopy.addressQuestions.apartmentNumberOrBusinessName,
+                    city: modelToCopy.addressQuestions.city,
+                    state: modelToCopy.addressQuestions.state,
+                    zipCode: modelToCopy.addressQuestions.zipCode,
+                },
+                isVehicleProtected: modelToCopy.isVehicleProtected,
+                isZipServiceableMobile: modelToCopy.isZipServiceableMobile,
+                isZipServiceableInShop: modelToCopy.isZipServiceableInShop,
+            }
+        },
+
         openModal() {
             this.$refs[this.modalName].openModal();
         },
-        onModalOpened() {
-            this.mobileLocationQuestionsInput = this.mobileLocationQuestionsModel;
-        },
+
         closeModal() {
             this.$refs[this.modalName].closeModal();
         },
-        onModalClosed() {
-            this.mobileLocationQuestionsInput = this.mobileLocationQuestionsModel;
-        },
+
         resetComponent() {
-            // Address
-            this.addressModelInput.streetAddress = "";
-            this.addressModelInput.apartmentNumberOrBusinessName = "";
-            this.addressModelInput.city = "";
-            this.addressModelInput.state = "";
-            this.addressModelInput.zipCode = "";
-
-            // Is Vehicle Protected
-            this.mobileLocationQuestionsInput.isVehicleProtected = null; 
+            this.resetModel();
             
-            this.$refs[this.modalName].form.resetForm();
+            // Reset the validation form
+            this.$refs[this.modalName].form.resetForm({
+                values: {
+                    "8fdf9dc2e13e430eb57529499dceb3eb": "OH"
+                }
+ 
+                
+            });
 
+            // Reinitialize the Address Auto Complete
             this.$refs.addressQuestions.setupAddressLookup();
         },
+
+        resetModel() {
+            // Address
+            this.internalModel.addressQuestions.streetAddress = "";
+            this.internalModel.addressQuestions.apartmentNumberOrBusinessName = "";
+            this.internalModel.addressQuestions.city = "";
+            this.internalModel.addressQuestions.state = "";
+            this.internalModel.addressQuestions.zipCode = "";
+
+            // Is Vehicle Protected
+            this.internalModel.isVehicleProtected = null; 
+        },
+
         async setMobileLocation() {
             // TODO: Any lookups or actions to be taken before assigning the Mobile Location
 
-            this.mobileLocationQuestionsModel = {
-                addressQuestions: {
-                    streetAddress: this.addressModelInput.streetAddress,
-                    apartmentNumberOrBusinessName:
-                        this.addressModelInput.apartmentNumberOrBusinessName,
-                    city: this.addressModelInput.city,
-                    state: this.addressModelInput.state,
-                    zipCode: this.addressModelInput.zipCode,
-                },
-                isVehicleProtected: this.mobileLocationQuestionsInput.isVehicleProtected,
-                isZipServiceableMobile: this.mobileLocationQuestionsInput.isZipServiceableMobile,
-                isZipServiceableInShop: this.mobileLocationQuestionsInput.isZipServiceableInShop,
-            };
+            this.$emit("update:modelValue", this.internalModel);
 
             this.closeModal();
         },
     },
+    watch: {
+        modelValue(newValue) {
+            this.internalModel = this.copyModel(newValue);
+        }
+    },
     components: {
         textLink,
         modal,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 27321d111..735dd6328 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -20,7 +20,7 @@
         <serviceZipQuestion
             ref="serviceZipQuestion"
             :cmsWidgetName="textboxQuestionWidgetName"
-            v-model="serviceZipCodeInput" />
+            v-model="internalModel.zipCode" />
         <alert
             ref="alertInvalidZip"
             v-if="displayInvalidZipAlert"
@@ -44,26 +44,24 @@ import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 
 // Define Validation Rules
-defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
-defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
+// defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
+// defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
 
 export default {
     name: "service-zip-modal-question",
     data() {
         return {
-            serviceZipCodeInput: null,
+            internalModel: this.copyModel(this.modelValue),
             displayInvalidZipAlert: false,
         };
-    },
+    },  
     props: {
         modelValue: {
             type: Object,
             default: () => ({
-                serviceZipQuestion: {
-                    state: "",
-                    zipCode: "",
-                    isServiceable: null,
-                },
+                state: "",
+                zipCode: "",
+                isServiceable: null,
             }),
         },
         linkWidgetName: String,
@@ -87,14 +85,14 @@ export default {
         modalName() {
             return this.modalWidgetName;
         },
-        serviceZipModel: {
-            get: function () {
-                return this.modelValue;
-            },
-            set: function (newValue) {
-                this.$emit("update:modelValue", newValue);
-            },
-        },
+        // serviceZipModel: {
+        //     get: function () {
+        //         return this.modelValue;
+        //     },
+        //     set: function (newValue) {
+        //         this.$emit("update:modelValue", newValue);
+        //     },
+        // },
     },
     methods: {
         resetAlerts() {
@@ -111,6 +109,14 @@ export default {
             input.focus();
         },
 
+        copyModel(modelToCopy) {
+            return {
+                state: modelToCopy.state,
+                zipCode: modelToCopy.zipCode,
+                isServiceable: modelToCopy.isServiceable,
+            }
+        },
+
         openModal() {
             this.$refs[this.modalName].openModal();
         },
@@ -119,35 +125,36 @@ export default {
             this.$refs[this.modalName].closeModal();
         },
 
-        onModalOpened() {
-            this.serviceZipCodeInput = this.serviceZipModel.zipCode;
-            this.focusOnZipInput();
-        },
+        // onModalOpened() {
+        //     this.serviceZipCodeInput = this.serviceZipModel.zipCode;
+        //     this.focusOnZipInput();
+        // },
 
-        onModalClosed() {
-            this.serviceZipCodeInput = this.serviceZipModel.zipCode;
-            this.resetsOnZipInput();
-        },
+        // onModalClosed() {
+        //     this.serviceZipCodeInput = this.serviceZipModel.zipCode;
+        //     this.resetsOnZipInput();
+        // },
 
         async setZipCode() {
             this.resetAlerts();
 
-            const zipCodeData = await this.getZipCodeData(this.serviceZipCodeInput);
+            const zipCodeData = await this.getZipCodeData(this.internalModel.zipCode);
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
                 this.focusOnZipInput();
             } else {
-                // if the service zip code changes we need to clear the Mobile Location Model
-                if (this.serviceZipModel.zipCode !== "" && this.serviceZipCodeInput !== this.serviceZipModel.zipCode ) {
+                this.internalModel.state = zipCodeData.state;
+                this.internalModel.isServiceable = zipCodeData.isServiceable;
+
+                // if the service zip code is changing we need to clear the Mobile Location Model
+                if (this.modelValue.zipCode !== "" && this.internalModel.zipCode !== this.modelValue.zipCode ) {
                     this.$emit("service-zip-updated");
                 }
 
-                this.serviceZipModel = {
-                    state: zipCodeData.state,
-                    zipCode: this.serviceZipCodeInput,
-                    isServiceable: zipCodeData.isServiceable,
-                };
+                this.$emit("update:modelValue", this.internalModel);
+
+
 
                 this.closeModal();
             }
@@ -157,6 +164,9 @@ export default {
         serviceZipCodeInput() {
             this.resetsOnZipInput();
         },
+        modelValue(newValue) {
+            this.internalModel = this.copyModel(newValue);
+        }
     },
     components: {
         textLink,

From e46570fb9ea37db4ffd85bb61787c8b6521b1d55 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 15 Feb 2023 08:45:40 -0500
Subject: [PATCH 154/261] We no longer need obfuscated names for the address
 fields as we are ok with auto-fill now, removing them for clarity in code
 that resets validation

---
 .../address-questions/address-questions.vue   |  8 ++++----
 .../mobile-location-modal-questions.vue       | 19 +++++++++----------
 .../service-zip-modal-question.vue            | 13 +++++++------
 .../service-zip-question.vue                  |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index cff2a8543..86f468076 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -26,7 +26,7 @@
                         cmsWidgetName="ApartmentNumberOrBusinessNameQuestionWidget"
                         v-model="addressModel.apartmentNumberOrBusinessName"
                         ref="apartmentNumberOrBusinessName"
-                        inputId="639b0aaa35f64609ad6995f86a74322b"
+                        inputId="apartmentNumberOrBusinessName"
                         disableAutoFill />
                 </div>
             </div>
@@ -38,7 +38,7 @@
                         cmsWidgetName="CityQuestionWidget"
                         v-model="addressModel.city"
                         ref="city"
-                        inputId="cbf28188fdf2436688fd735915f7ee56"
+                        inputId="city"
                         disableAutoFill
                         validationRules="city-required" />
                 </div>
@@ -51,7 +51,7 @@
                         cmsWidgetName="StateQuestionWidget"
                         v-model="addressModel.state"
                         ref="state"
-                        inputId="8fdf9dc2e13e430eb57529499dceb3eb"
+                        inputId="state"
                         :options="stateOptions"
                         disableAutoFill
                         validationRules="state-required" />
@@ -61,7 +61,7 @@
                         cmsWidgetName="ZipQuestionWidget"
                         v-model="addressModel.zipCode"
                         ref="zipCode"
-                        inputId="01a9a1c2de0b4c9da8e023c9ae3be498"
+                        inputId="zipCode"
                         mask="#####"
                         disableAutoFill
                         validationRules="zip-code-required|zip-code-format" />
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index aeb7a9607..201a28a08 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -51,7 +51,7 @@ export default {
     data() {
         return {
             internalModel: this.copyModel(this.modelValue),
-        }
+        };
     },
     props: {
         modelValue: {
@@ -112,7 +112,8 @@ export default {
             return {
                 addressQuestions: {
                     streetAddress: modelToCopy.addressQuestions.streetAddress,
-                    apartmentNumberOrBusinessName: modelToCopy.addressQuestions.apartmentNumberOrBusinessName,
+                    apartmentNumberOrBusinessName:
+                        modelToCopy.addressQuestions.apartmentNumberOrBusinessName,
                     city: modelToCopy.addressQuestions.city,
                     state: modelToCopy.addressQuestions.state,
                     zipCode: modelToCopy.addressQuestions.zipCode,
@@ -120,7 +121,7 @@ export default {
                 isVehicleProtected: modelToCopy.isVehicleProtected,
                 isZipServiceableMobile: modelToCopy.isZipServiceableMobile,
                 isZipServiceableInShop: modelToCopy.isZipServiceableInShop,
-            }
+            };
         },
 
         openModal() {
@@ -133,14 +134,12 @@ export default {
 
         resetComponent() {
             this.resetModel();
-            
+
             // Reset the validation form
             this.$refs[this.modalName].form.resetForm({
                 values: {
-                    "8fdf9dc2e13e430eb57529499dceb3eb": "OH"
-                }
- 
-                
+                    state: this.modelValue.addressQuestions.state,
+                },
             });
 
             // Reinitialize the Address Auto Complete
@@ -156,7 +155,7 @@ export default {
             this.internalModel.addressQuestions.zipCode = "";
 
             // Is Vehicle Protected
-            this.internalModel.isVehicleProtected = null; 
+            this.internalModel.isVehicleProtected = null;
         },
 
         async setMobileLocation() {
@@ -170,7 +169,7 @@ export default {
     watch: {
         modelValue(newValue) {
             this.internalModel = this.copyModel(newValue);
-        }
+        },
     },
     components: {
         textLink,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 735dd6328..ccb0c5111 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -54,7 +54,7 @@ export default {
             internalModel: this.copyModel(this.modelValue),
             displayInvalidZipAlert: false,
         };
-    },  
+    },
     props: {
         modelValue: {
             type: Object,
@@ -114,7 +114,7 @@ export default {
                 state: modelToCopy.state,
                 zipCode: modelToCopy.zipCode,
                 isServiceable: modelToCopy.isServiceable,
-            }
+            };
         },
 
         openModal() {
@@ -148,14 +148,15 @@ export default {
                 this.internalModel.isServiceable = zipCodeData.isServiceable;
 
                 // if the service zip code is changing we need to clear the Mobile Location Model
-                if (this.modelValue.zipCode !== "" && this.internalModel.zipCode !== this.modelValue.zipCode ) {
+                if (
+                    this.modelValue.zipCode !== "" &&
+                    this.internalModel.zipCode !== this.modelValue.zipCode
+                ) {
                     this.$emit("service-zip-updated");
                 }
 
                 this.$emit("update:modelValue", this.internalModel);
 
-
-
                 this.closeModal();
             }
         },
@@ -166,7 +167,7 @@ export default {
         },
         modelValue(newValue) {
             this.internalModel = this.copyModel(newValue);
-        }
+        },
     },
     components: {
         textLink,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
index 4ebe39ed1..979094523 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
@@ -3,7 +3,7 @@
         ref="zipInputTextQuestion"
         :cmsWidgetName="cmsWidgetName"
         v-model="value"
-        inputId="serviceZipCodeTextBoxQuestion"
+        inputId="serviceZipCode"
         questionAlignment="center"
         mask="#####"
         :displayQuestionText="false"

From 621b2c18a4c99322c204c83ee6de05272cf196fb Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 15 Feb 2023 09:11:58 -0500
Subject: [PATCH 155/261] getting ready to revert model structure on page level

---
 .../address-questions/address-questions.vue         |  2 +-
 .../mobile-location-modal-questions.vue             | 13 ++++++++-----
 src/layouts/service-location/service-location.vue   |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 86f468076..2b1ed8d03 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -111,7 +111,7 @@ export default {
                 streetAddress: "",
                 apartmentNumberOrBusinessName: "",
                 city: "",
-                state: "",
+                state: null,
                 zipCode: "",
             }),
         },
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 201a28a08..dbdfc9212 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -136,11 +136,14 @@ export default {
             this.resetModel();
 
             // Reset the validation form
-            this.$refs[this.modalName].form.resetForm({
-                values: {
-                    state: this.modelValue.addressQuestions.state,
-                },
-            });
+            this.$refs[this.modalName].form.resetForm();
+            // {
+            //     values: {
+            //         state: this.modelValue.addressQuestions.state,
+            //         zipCode: this.modelValue.addressQuestions.zipCode,
+            //     },
+            //     dirty: false,
+            // });
 
             // Reinitialize the Address Auto Complete
             this.$refs.addressQuestions.setupAddressLookup();
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index d8295edd5..ac4e7501b 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -129,7 +129,7 @@ export default {
                     streetAddress: "",
                     apartmentNumberOrBusinessName: "",
                     city: "",
-                    state: "",
+                    state: null,
                     zipCode: "",
                 },
                 isVehicleProtected: null,

From a4dd4340b06b35b7f49bb1d453be3f10649c327d Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 15 Feb 2023 11:13:31 -0500
Subject: [PATCH 156/261] WIP

---
 .../textbox-question/textbox-question.vue     |  2 +
 .../address-questions/address-questions.vue   |  2 +-
 .../mobile-location-modal-questions.vue       | 10 ++-
 .../service-location/service-location.vue     | 83 ++++++-------------
 .../service-zip-question.vue                  |  1 +
 5 files changed, 37 insertions(+), 61 deletions(-)

diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index 5fa93dc0c..9d9976d0e 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -26,6 +26,7 @@
                     iconRight ? 'icon-right' : '',
                     cornerStyle === 'rounded' ? 'rounded-pill' : '',
                 ]"
+                :autocomplete="preventAutoFill && 'do-not-autofill'"
                 :validationRules="validationRules"
                 @change="handleChange"
                 @blur="handleChange"
@@ -76,6 +77,7 @@ export default {
         questionAlignment: String, // Left or center. Left is default.
         cornerStyle: String, // Rounded or square. Square is default.
         includeSearchIcon: Boolean,
+        preventAutoFill: Boolean,
     },
     setup(props) {
         const propsClone = Object.assign({}, props);
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 2b1ed8d03..86f468076 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -111,7 +111,7 @@ export default {
                 streetAddress: "",
                 apartmentNumberOrBusinessName: "",
                 city: "",
-                state: null,
+                state: "",
                 zipCode: "",
             }),
         },
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index dbdfc9212..548a3da68 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -65,10 +65,10 @@ export default {
                     zipCode: "",
                 },
                 isVehicleProtected: null,
-                isZipServiceableMobile: null,
-                isZipServiceableInShop: null,
             }),
         },
+        isZipServiceableMobile: Boolean,
+        isZipServiceableInShop: Boolean,
         serviceZipCode: String,
         linkWidgetName: String,
         modalWidgetName: String,
@@ -173,6 +173,12 @@ export default {
         modelValue(newValue) {
             this.internalModel = this.copyModel(newValue);
         },
+        internalModel: {
+            handler(newValue) {
+                console.log(newValue);
+            },
+            deep: true     
+        }
     },
     components: {
         textLink,
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index ac4e7501b..f50359b53 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -5,15 +5,15 @@
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <serviceZipModalQuestion
-                v-model="serviceZipQuestionModel"
+                v-model="serviceZipCodeQuestion"
                 @service-zip-updated="resetMobileLocation"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget"
                 textboxQuestionWidgetName="ServiceZipQuestionWidget"
                 alertInvalidZipWidgetName="AlertInvalidZipWidget" />
             <mobileLocationModalQuestions
+                v-model="mobileLocationQuestions"
                 ref="mobileLocationModalQuestions"
-                v-model="mobileLocationQuestionsModel"
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget"
                 mobileFeeDisclaimerWidgetName="MobileFeeDisclaimerWidget"
@@ -45,15 +45,27 @@ export default {
     name: "service-location",
     data() {
         return {
-            isServiceable: null,
-            streetAddress: "",
-            apartmentNumberOrBusinessName: "",
-            city: "",
-            state: "",
-            zipCode: "",
-            isVehicleProtected: null,
-            isZipServiceableMobile: null,
-            isZipServiceableInShop: null,
+            // serviceState: "",
+            // serviceZipCode: "",
+            // isServiceable: null,
+            // isVehicleProtected: null,
+            // isZipServiceableMobile: null,
+            // isZipServiceableInShop: null,
+            serviceZipCodeQuestion: {
+                state: "",
+                zipCode: "",
+                isServiceable: null,
+            },
+            mobileLocationQuestions: {
+                addressQuestions: {
+                    streetAddress: "",
+                    apartmentNumberOrBusinessName: "",
+                    city: "",
+                    state: "",
+                    zipCode: "",
+                },
+                isVehicleProtected: null,
+            },
         };
     },
 
@@ -76,65 +88,20 @@ export default {
             vm.setCmsContent(resultMap.cmsContent);
         });
     },
-    computed: {
-        serviceZipQuestionModel: {
-            get: function () {
-                return {
-                    state: this.state,
-                    zipCode: this.zipCode,
-                    isServiceable: this.isServiceable,
-                };
-            },
-            set: function (newValue) {
-                this.state = newValue.state;
-                this.zipCode = newValue.zipCode;
-                this.isServiceable = newValue.isServiceable;
-            },
-        },
-        mobileLocationQuestionsModel: {
-            get: function () {
-                return {
-                    addressQuestions: {
-                        streetAddress: this.streetAddress,
-                        apartmentNumberOrBusinessName: this.apartmentNumberOrBusinessName,
-                        city: this.city,
-                        state: this.state,
-                        zipCode: this.zipCode,
-                    },
-                    isVehicleProtected: this.isVehicleProtected,
-                    isZipServiceableMobile: this.isZipServiceableMobile,
-                    isZipServiceableInShop: this.isZipServiceableInShop,
-                };
-            },
-            set: function (newValue) {
-                this.streetAddress = newValue.addressQuestions.streetAddress;
-                this.apartmentNumberOrBusinessName =
-                    newValue.addressQuestions.apartmentNumberOrBusinessName;
-                this.city = newValue.addressQuestions.city;
-                this.state = newValue.addressQuestions.state;
-                this.zipCode = newValue.addressQuestions.zipCode;
-                this.isVehicleProtected = newValue.isVehicleProtected;
-                this.isZipServiceableMobile = newValue.isZipServiceableMobile;
-                this.isZipServiceableInShop = newValue.isZipServiceableInShop;
-            },
-        },
-    },
     methods: {
         arePagePrerequisitesValid() {
             return true;
         },
         resetMobileLocation() {
-            this.mobileLocationQuestionsModel = {
+            this.mobileLocationQuestions = {
                 addressQuestions: {
                     streetAddress: "",
                     apartmentNumberOrBusinessName: "",
                     city: "",
-                    state: null,
+                    state: "",
                     zipCode: "",
                 },
                 isVehicleProtected: null,
-                isZipServiceableMobile: null,
-                isZipServiceableInShop: null,
             };
 
             this.$refs.mobileLocationModalQuestions.resetComponent();
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
index 979094523..99064425f 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
@@ -6,6 +6,7 @@
         inputId="serviceZipCode"
         questionAlignment="center"
         mask="#####"
+        :preventAutoFill="true"
         :displayQuestionText="false"
         isRequired
         validationRules="zip-required|zip-format" />

From 12bc2ec36fbb119d70c24f87a11c05abca2f5923 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 15 Feb 2023 14:13:42 -0500
Subject: [PATCH 157/261] WIP

---
 .../dropdown-question/dropdown-question.vue           |  7 +++++--
 .../textbox-question/textbox-question.vue             |  7 +++++--
 .../address-questions/address-questions.vue           | 11 ++---------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/digital-components/dropdown-question/dropdown-question.vue b/src/digital-components/dropdown-question/dropdown-question.vue
index bdc36a0d8..c2e17926a 100644
--- a/src/digital-components/dropdown-question/dropdown-question.vue
+++ b/src/digital-components/dropdown-question/dropdown-question.vue
@@ -35,7 +35,7 @@ export default {
     name: "dropdown-question",
     props: {
         modelValue: String,
-        inputId: String,
+        //inputId: String,
         options: {
             type: Object,
             required: true,
@@ -49,6 +49,8 @@ export default {
         placeHolderText: String,
     },
     setup(props) {
+        const inputId = !props.customInputId ? `dropdown-${crypto.randomUUID()}` : props.customInputId;
+
         const propsClone = Object.assign({}, props);
         const modelValue = propsClone.modelValue;
         let initialValue;
@@ -69,12 +71,13 @@ export default {
         };
 
         const { errorMessage, handleBlur, handleChange, meta, errors } = useField(
-            props.inputId,
+            inputId,
             props.validationRules,
             fieldOptions
         );
 
         return {
+            inputId,
             errorMessage,
             handleBlur,
             handleChange,
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index 5fa93dc0c..8bccb9711 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -59,7 +59,7 @@ export default {
             default: true,
         },
         modelValue: String,
-        inputId: String,
+        customInputId: String,
         isDisabled: Boolean,
         isRequired: Boolean,
         hasIcon: Boolean, // If input has an icon
@@ -78,6 +78,8 @@ export default {
         includeSearchIcon: Boolean,
     },
     setup(props) {
+        const inputId = !props.customInputId ? `input-${crypto.randomUUID()}` : props.customInputId;
+
         const propsClone = Object.assign({}, props);
         const modelValue = propsClone.modelValue;
         let initialValue;
@@ -98,12 +100,13 @@ export default {
         };
 
         const { errorMessage, handleBlur, handleChange, meta, validate, errors } = useField(
-            props.inputId,
+            inputId,
             props.validationRules,
             fieldOptions
         );
 
         return {
+            inputId,
             errorMessage,
             handleBlur,
             handleChange,
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index aed1b5147..62099f2d9 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -7,7 +7,7 @@
                     cmsWidgetName="StreetAddressQuestionWidget"
                     v-model="addressModel.streetAddress"
                     ref="autocomplete"
-                    inputId="autocomplete"
+                    customInputId="autocomplete"
                     placeholderText="Search"
                     aria-haspopup=""
                     hasIcon
@@ -25,9 +25,7 @@
                     <textboxQuestion
                         cmsWidgetName="ApartmentNumberOrBusinessNameQuestionWidget"
                         v-model="addressModel.apartmentNumberOrBusinessName"
-                        ref="apartmentNumberOrBusinessName"
-                        inputId="639b0aaa35f64609ad6995f86a74322b"
-                        disableAutoFill />
+                        ref="apartmentNumberOrBusinessName" />
                 </div>
             </div>
         </transition>
@@ -38,8 +36,6 @@
                         cmsWidgetName="CityQuestionWidget"
                         v-model="addressModel.city"
                         ref="city"
-                        inputId="cbf28188fdf2436688fd735915f7ee56"
-                        disableAutoFill
                         validationRules="city-required" />
                 </div>
             </div>
@@ -51,9 +47,7 @@
                         cmsWidgetName="StateQuestionWidget"
                         v-model="addressModel.state"
                         ref="state"
-                        inputId="8fdf9dc2e13e430eb57529499dceb3eb"
                         :options="stateOptions"
-                        disableAutoFill
                         validationRules="state-required" />
                 </div>
                 <div class="col">
@@ -61,7 +55,6 @@
                         cmsWidgetName="ZipQuestionWidget"
                         v-model="addressModel.zipCode"
                         ref="zipCode"
-                        inputId="01a9a1c2de0b4c9da8e023c9ae3be498"
                         mask="#####"
                         disableAutoFill
                         validationRules="zip-code-required|zip-code-format" />

From 38b346a05ec19189a762cd4d0eee5c7a60e44407 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 15 Feb 2023 15:49:21 -0500
Subject: [PATCH 158/261] Finally everything *seems* to be working

---
 .../mobile-location-modal-questions.vue       |  8 +---
 .../service-zip-modal-question.vue            | 44 ++++---------------
 .../service-zip-question.vue                  |  3 +-
 3 files changed, 11 insertions(+), 44 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index a041d5965..7353fe0b3 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -137,13 +137,6 @@ export default {
 
             // Reset the validation form
             this.$refs[this.modalName].form.resetForm();
-            // {
-            //     values: {
-            //         state: this.modelValue.addressQuestions.state,
-            //         zipCode: this.modelValue.addressQuestions.zipCode,
-            //     },
-            //     dirty: false,
-            // });
 
             // Reinitialize the Address Auto Complete
             this.$refs.addressQuestions.setupAddressLookup();
@@ -164,6 +157,7 @@ export default {
         async setMobileLocation() {
             // TODO: Any lookups or actions to be taken before assigning the Mobile Location
 
+            // Update the page level model
             this.$emit("update:modelValue", this.internalModel);
 
             this.closeModal();
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index ccb0c5111..b80f6107f 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -38,15 +38,6 @@ import serviceZipQuestion from "@/layouts/service-location/service-zip-modal-que
 import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
 
-//Supporting Files
-import { defineRule, useForm } from "vee-validate";
-import { required, regex } from "@/helpers/validation-rules";
-import { errorMessages } from "@/constants/error-messages";
-
-// Define Validation Rules
-// defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
-// defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
-
 export default {
     name: "service-zip-modal-question",
     data() {
@@ -85,14 +76,6 @@ export default {
         modalName() {
             return this.modalWidgetName;
         },
-        // serviceZipModel: {
-        //     get: function () {
-        //         return this.modelValue;
-        //     },
-        //     set: function (newValue) {
-        //         this.$emit("update:modelValue", newValue);
-        //     },
-        // },
     },
     methods: {
         resetAlerts() {
@@ -105,7 +88,8 @@ export default {
         },
 
         focusOnZipInput() {
-            const input = document.getElementById("serviceZipCodeTextBoxQuestion");
+            const inputId = this.$refs.serviceZipQuestion.$refs.zipInputTextQuestion.inputId;
+            const input = document.getElementById(inputId);
             input.focus();
         },
 
@@ -125,15 +109,9 @@ export default {
             this.$refs[this.modalName].closeModal();
         },
 
-        // onModalOpened() {
-        //     this.serviceZipCodeInput = this.serviceZipModel.zipCode;
-        //     this.focusOnZipInput();
-        // },
-
-        // onModalClosed() {
-        //     this.serviceZipCodeInput = this.serviceZipModel.zipCode;
-        //     this.resetsOnZipInput();
-        // },
+        onModalOpened() {
+            this.focusOnZipInput();
+        },
 
         async setZipCode() {
             this.resetAlerts();
@@ -147,14 +125,10 @@ export default {
                 this.internalModel.state = zipCodeData.state;
                 this.internalModel.isServiceable = zipCodeData.isServiceable;
 
-                // if the service zip code is changing we need to clear the Mobile Location Model
-                if (
-                    this.modelValue.zipCode !== "" &&
-                    this.internalModel.zipCode !== this.modelValue.zipCode
-                ) {
-                    this.$emit("service-zip-updated");
-                }
-
+                // Notify the page that the service zip has been updated to clear Mobile Location form
+                this.$emit("service-zip-updated");
+   
+                // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
 
                 this.closeModal();
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
index 99064425f..fb5b7be7e 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
@@ -5,8 +5,7 @@
         v-model="value"
         inputId="serviceZipCode"
         questionAlignment="center"
-        mask="#####"
-        :preventAutoFill="true"
+        mask="#####"       
         :displayQuestionText="false"
         isRequired
         validationRules="zip-required|zip-format" />

From 21517e45a74b3c2cee76a9a05ed111cfc338b267 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 16 Feb 2023 07:36:37 -0500
Subject: [PATCH 159/261] Removed all unused 'disableAutoFill' code

---
 .../dropdown-question/dropdown-question.vue   | 29 ++-----------------
 .../textbox-question/textbox-question.spec.js | 18 ------------
 .../textbox-question/textbox-question.vue     | 28 ------------------
 .../address-questions/address-questions.vue   |  2 --
 .../customer-questions/customer-questions.vue |  3 --
 src/layouts/estimate/estimate.vue             |  2 --
 .../mobile-location-modal-questions.vue       |  1 -
 .../service-location/service-location.vue     |  8 ++---
 .../service-zip-modal-question.vue            |  2 +-
 .../service-zip-question.vue                  |  2 +-
 src/layouts/vin-lookup/vin-lookup.vue         |  3 --
 11 files changed, 6 insertions(+), 92 deletions(-)

diff --git a/src/digital-components/dropdown-question/dropdown-question.vue b/src/digital-components/dropdown-question/dropdown-question.vue
index 9b999991a..3dfc82947 100644
--- a/src/digital-components/dropdown-question/dropdown-question.vue
+++ b/src/digital-components/dropdown-question/dropdown-question.vue
@@ -6,7 +6,7 @@
             :for="inputId"
             :aria-label="questionText"
             class="form-label"
-            v-html="labelText"></label>
+            v-html="questionText"></label>
         <select
             v-model="selectedOption"
             class="form-select"
@@ -35,14 +35,13 @@ export default {
     name: "dropdown-question",
     props: {
         modelValue: String,
-        //inputId: String,
+        customInputId: String,
         options: {
             type: Object,
             required: true,
         },
         isDisabled: Boolean,
         isRequired: Boolean,
-        disableAutoFill: Boolean,
         validationRules: String,
         cmsWidgetName: String,
         hasError: Boolean,
@@ -99,30 +98,6 @@ export default {
                 this.$emit("update:modelValue", newValue);
             },
         },
-        labelText: {
-            get: function () {
-                const noBreakChar = "&NoBreak;";
-                var questionText = "";
-                if (this.disableAutoFill) {
-                    var words = this.questionText.toString().split(/[ ]+/);
-                    words.forEach(function (word) {
-                        const position = 1;
-                        word = [
-                            word.toString().slice(0, position),
-                            noBreakChar,
-                            word.toString().slice(position),
-                        ].join("");
-                        questionText += `${word} `;
-                    });
-
-                    questionText = questionText.trimEnd();
-                } else {
-                    questionText = this.questionText.toString();
-                }
-
-                return questionText;
-            },
-        },
     },
     watch: {
         selectedOption(newValue) {
diff --git a/src/digital-components/textbox-question/textbox-question.spec.js b/src/digital-components/textbox-question/textbox-question.spec.js
index d5d1de4e6..694142fb9 100644
--- a/src/digital-components/textbox-question/textbox-question.spec.js
+++ b/src/digital-components/textbox-question/textbox-question.spec.js
@@ -73,24 +73,6 @@ describe("textboxQuestion.vue", () => {
         expect(paragraph.attributes("class")).toContain("form-control");
     });
 
-    it("Should render the 'questionText' data value as the label text when disableAutoFill is false.", async () => {
-        // Arrange
-        const wrapper = shallowMount(textboxQuestion, {
-            global: {
-                directives: {
-                    maska: maska,
-                },
-            },
-            mixins: [mockMixin],
-        });
-
-        // Act
-        const label = wrapper.find("label");
-
-        // Assert
-        expect(label.text()).toContain(questionText);
-    });
-
     it("Should return input id as the id of the input field", async () => {
         // Arrange
         const wrapper = shallowMount(textboxQuestion, {
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index 37ef5dac8..a294a8967 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -26,7 +26,6 @@
                     iconRight ? 'icon-right' : '',
                     cornerStyle === 'rounded' ? 'rounded-pill' : '',
                 ]"
-                :autocomplete="preventAutoFill && 'do-not-autofill'"
                 :validationRules="validationRules"
                 @change="handleChange"
                 @blur="handleChange"
@@ -42,7 +41,6 @@
 
 <script>
 import { useField, validate } from "vee-validate";
-import { storeActions } from "@/constants/store-actions";
 
 export default {
     name: "textbox-question",
@@ -70,14 +68,12 @@ export default {
             type: String,
             default: "",
         },
-        handleOnInput: Boolean,
         validationRules: String,
         cmsWidgetName: String,
         maxLength: String,
         questionAlignment: String, // Left or center. Left is default.
         cornerStyle: String, // Rounded or square. Square is default.
         includeSearchIcon: Boolean,
-        preventAutoFill: Boolean,
     },
     setup(props) {
         const inputId = !props.customInputId ? `input-${crypto.randomUUID()}` : props.customInputId;
@@ -129,30 +125,6 @@ export default {
                 this.$emit("update:modelValue", newValue);
             },
         },
-        labelText: {
-            get: function () {
-                const noBreakChar = "&NoBreak;";
-                var questionText = "";
-                if (this.disableAutoFill) {
-                    var words = this.questionText.toString().split(/[ ]+/);
-                    words.forEach(function (word) {
-                        const position = 1;
-                        word = [
-                            word.toString().slice(0, position),
-                            noBreakChar,
-                            word.toString().slice(position),
-                        ].join("");
-                        questionText += `${word} `;
-                    });
-
-                    questionText = questionText.trimEnd();
-                } else {
-                    questionText = this.questionText.toString();
-                }
-
-                return questionText;
-            },
-        },
     },
     watch: {
         async value(newValue) {
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index a841449d8..8a28ea669 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -11,7 +11,6 @@
                     placeholderText="Search"
                     aria-haspopup=""
                     hasIcon
-                    disableAutoFill
                     validationRules="street-address-required"
                     @keydown.enter.prevent />
             </div>
@@ -56,7 +55,6 @@
                         v-model="addressModel.zipCode"
                         ref="zipCode"
                         mask="#####"
-                        disableAutoFill
                         validationRules="zip-code-required|zip-code-format" />
                 </div>
             </div>
diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index cfc121731..325f8c380 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -7,7 +7,6 @@
                 v-model="customerModel.firstName"
                 ref="firstName"
                 inputId="08497a2efd9a4a73a70360ab47b4838d"
-                disableAutoFill
                 validationRules="first-name-required" />
         </div>
     </div>
@@ -18,7 +17,6 @@
                 v-model="customerModel.lastName"
                 ref="lastName"
                 inputId="0030e56a57e74a4ab92de7fb8e97fec5"
-                disableAutoFill
                 validationRules="last-name-required" />
         </div>
     </div>
@@ -29,7 +27,6 @@
                 v-model="customerModel.emailAddress"
                 ref="emailAddress"
                 inputId="00450a91b8964a768ce3992e6feb890f"
-                disableAutoFill
                 validationRules="email-address-required|email-address-format" />
         </div>
     </div>
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 36a52a2ff..e92fae541 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -34,7 +34,6 @@
                                 inputId="serviceZipCode"
                                 mask="#####"
                                 isRequired
-                                disableAutoFill
                                 validationRules="zip-required|zip-format" />
                         </div>
                     </div>
@@ -45,7 +44,6 @@
                                 v-model="emailAddress"
                                 inputId="emailAddress"
                                 isRequired
-                                disableAutoFill
                                 validationRules="email-address-required|email-address-format" />
                         </div>
                     </div>
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 7353fe0b3..8a46879c0 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -43,7 +43,6 @@ import alert from "@/ux-components/alert/alert";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 import textBlock from "@/digital-components/text-block/text-block";
-import { useForm } from "vee-validate";
 
 export default {
     name: "mobile-location-modal-questions",
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index f50359b53..a193f3dd5 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -45,12 +45,8 @@ export default {
     name: "service-location",
     data() {
         return {
-            // serviceState: "",
-            // serviceZipCode: "",
-            // isServiceable: null,
-            // isVehicleProtected: null,
-            // isZipServiceableMobile: null,
-            // isZipServiceableInShop: null,
+            isZipServiceableMobile: null,
+            isZipServiceableInShop: null,
             serviceZipCodeQuestion: {
                 state: "",
                 zipCode: "",
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index b80f6107f..27e3b91a6 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -127,7 +127,7 @@ export default {
 
                 // Notify the page that the service zip has been updated to clear Mobile Location form
                 this.$emit("service-zip-updated");
-   
+
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
 
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
index fb5b7be7e..979094523 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
@@ -5,7 +5,7 @@
         v-model="value"
         inputId="serviceZipCode"
         questionAlignment="center"
-        mask="#####"       
+        mask="#####"
         :displayQuestionText="false"
         isRequired
         validationRules="zip-required|zip-format" />
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 75d7b019f..0bb30fbfd 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -15,7 +15,6 @@
                             v-model="vin"
                             inputId="vin"
                             isRequired
-                            disableAutoFill
                             validationRules="vin-required|vin-format"
                             :isDisabled="vinPopulatedOnPageLoad"
                             maxLength="17"
@@ -35,7 +34,6 @@
                             inputId="serviceZipCode"
                             mask="#####"
                             isRequired
-                            disableAutoFill
                             validationRules="zip-required|zip-format" />
                     </div>
                 </div>
@@ -46,7 +44,6 @@
                             v-model="emailAddress"
                             inputId="emailAddress"
                             isRequired
-                            disableAutoFill
                             validationRules="email-address-required|email-address-format" />
                     </div>
                 </div>

From 5643b82d0685d552e4b6c690cccf84e5faac726b Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 16 Feb 2023 07:44:42 -0500
Subject: [PATCH 160/261] Fixed issue where the alert was not being removed
 when changing the service zip code

---
 .../service-zip-modal-question.vue                          | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 27e3b91a6..7abfb3c3b 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -136,8 +136,10 @@ export default {
         },
     },
     watch: {
-        serviceZipCodeInput() {
-            this.resetsOnZipInput();
+        "internalModel.zipCode": {
+            handler() {
+                this.resetsOnZipInput();
+            }   
         },
         modelValue(newValue) {
             this.internalModel = this.copyModel(newValue);

From 95318a38c5a4a3698e13145ee54dd12a1f8dab74 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 16 Feb 2023 07:56:13 -0500
Subject: [PATCH 161/261] Fixed textbox-question label

---
 src/digital-components/textbox-question/textbox-question.vue    | 2 +-
 .../service-zip-modal-question/service-zip-modal-question.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index a294a8967..90aa33ddf 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -6,7 +6,7 @@
             :aria-label="questionText"
             class="form-label"
             :class="[questionAlignment === 'center' ? 'text-center w-100 mb-5' : '']"
-            v-html="labelText"></label>
+            v-html="questionText"></label>
         <div class="input-wrapper" :class="[includeSearchIcon ? 'has-search-icon' : '']">
             <input
                 class="form-control"
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 7abfb3c3b..e538c473f 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -139,7 +139,7 @@ export default {
         "internalModel.zipCode": {
             handler() {
                 this.resetsOnZipInput();
-            }   
+            },
         },
         modelValue(newValue) {
             this.internalModel = this.copyModel(newValue);

From 30e3ddc541e9004d6d91a45312bfc188c4fa76ff Mon Sep 17 00:00:00 2001
From: Herd <Chloe.Herd@safelite.com>
Date: Thu, 16 Feb 2023 15:09:11 -0500
Subject: [PATCH 162/261] Initial implementation

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

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 37a4cda43..f8a6de292 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -26,6 +26,7 @@ import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import store from "@/store";
 
 export default {
     name: "service-location",
@@ -53,7 +54,11 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            return true;
+            return (
+                store.getters.lineItems.supportingItems !== null &&
+                store.getters.order.serviceLocation.zipCode !== null &&
+                store.getters.payment.isInsurance !== null
+            );
         },
 
         backButtonAction() {

From 8874519cb06cde810d2a97fd957e7df8c31fcbd9 Mon Sep 17 00:00:00 2001
From: Herd <Chloe.Herd@safelite.com>
Date: Thu, 16 Feb 2023 16:48:59 -0500
Subject: [PATCH 163/261] Added first basic test

---
 .../service-location/service-location.spec.js | 73 ++++++++++++++++++-
 1 file changed, 72 insertions(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 85555dd59..5b2f3474a 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -1,3 +1,74 @@
+// Components
+import serviceLocation from "@/layouts/service-location/service-location.vue";
+
+// Supporting files
+import { shallowMount } from "@vue/test-utils";
+import { getMountOptions } from "@/helpers/unit-test-helper";
+import baseMixin from "@/mixins/base-mixin";
+import { nextTick } from "vue";
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import { settleAllPromises } from "@/helpers/layout-helper.js";
+
+// Define Mocks
+jest.mock("@/helpers/layout-helper.js", () => ({
+    settleAllPromises: jest.fn()
+}));
+
+jest.mock("@/helpers/cms-content-helper", () => ({
+    fetchCmsContentForPage: jest.fn()
+}));
+
+jest.mock("@/store", () => ({
+    commit: jest.fn(),
+    dispatch: jest.fn(),
+    getters: {
+        lineItems: {
+            supportingItems: null
+        },
+        order: {
+            serviceLocation: {
+                zipCode: null
+            }
+        },
+        payment: {
+            isInsurance: null
+        }
+    },
+}));
+
 describe("service-location.vue", () => {
-    test.todo("test this");
+    describe("arePagePrerequisitesValid", () => {
+        test("No prerequisites set: Should return false.", async () => {
+            const { wrapper } = setupMocks({});
+
+            serviceLocation.beforeRouteEnter.call(
+                wrapper.vm,
+                { query: { fmgPage: "service-location" } },
+                undefined,
+                (c) => c(wrapper.vm)
+            );
+
+            let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid();
+            await nextTick();
+
+            expect(arePagePrerequisitesValid).toBe(false);
+        });
+    });
 });
+
+function setupMocks({
+    mountOptionsMockData = {}
+}) {
+    const apiResponses = {};
+
+    const apiPromise = Promise.resolve(apiResponses);
+
+    settleAllPromises.mockImplementation(() => apiPromise);
+    fetchCmsContentForPage.mockImplementation(() => Promise.resolve());
+
+    const mountOptions = getMountOptions(mountOptionsMockData);
+    const wrapper = shallowMount(serviceLocation, mountOptions);
+    wrapper.vm.setCmsContent = baseMixin.methods.setCmsContent;
+
+    return { wrapper, apiPromise };
+}
\ No newline at end of file

From 97eaf64232a45f6d9c0ed9d1668090685692c552 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Thu, 16 Feb 2023 17:18:44 -0500
Subject: [PATCH 164/261] Added additional tests

---
 .../service-location/service-location.spec.js | 85 ++++++++++++++++---
 1 file changed, 74 insertions(+), 11 deletions(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 5b2f3474a..1b6fcd57f 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -8,14 +8,15 @@ import baseMixin from "@/mixins/base-mixin";
 import { nextTick } from "vue";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper.js";
+import store from "@/store";
 
 // Define Mocks
 jest.mock("@/helpers/layout-helper.js", () => ({
-    settleAllPromises: jest.fn()
+    settleAllPromises: jest.fn(),
 }));
 
 jest.mock("@/helpers/cms-content-helper", () => ({
-    fetchCmsContentForPage: jest.fn()
+    fetchCmsContentForPage: jest.fn(),
 }));
 
 jest.mock("@/store", () => ({
@@ -23,24 +24,88 @@ jest.mock("@/store", () => ({
     dispatch: jest.fn(),
     getters: {
         lineItems: {
-            supportingItems: null
+            supportingItems: [],
         },
         order: {
             serviceLocation: {
-                zipCode: null
-            }
+                zipCode: "00000",
+            },
         },
         payment: {
-            isInsurance: null
-        }
+            isInsurance: false,
+        },
     },
 }));
 
+beforeEach(() => {
+    store.getters = {
+        lineItems: {
+            supportingItems: [],
+        },
+        order: {
+            serviceLocation: {
+                zipCode: "00000",
+            },
+        },
+        payment: {
+            isInsurance: false,
+        },
+    }
+})
+
 describe("service-location.vue", () => {
     describe("arePagePrerequisitesValid", () => {
         test("No prerequisites set: Should return false.", async () => {
             const { wrapper } = setupMocks({});
 
+            store.getters = {
+                lineItems: {
+                    supportingItems: null,
+                },
+                order: {
+                    serviceLocation: {
+                        zipCode: null,
+                    },
+                },
+                payment: {
+                    isInsurance: null,
+                },
+            }
+
+            serviceLocation.beforeRouteEnter.call(
+                wrapper.vm,
+                { query: { fmgPage: "service-location" } },
+                undefined,
+                (c) => c(wrapper.vm)
+            );
+
+            let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid();
+            await nextTick();
+
+            expect(arePagePrerequisitesValid).toBe(false);
+        });
+
+        test("All prerequisites set: Should return true.", async () => {
+            const { wrapper } = setupMocks({});
+
+            serviceLocation.beforeRouteEnter.call(
+                wrapper.vm,
+                { query: { fmgPage: "service-location" } },
+                undefined,
+                (c) => c(wrapper.vm)
+            );
+
+            let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid();
+            await nextTick();
+
+            expect(arePagePrerequisitesValid).toBe(true);
+        });
+
+        test("Some prerequisites set: Should return false.", async () => {
+            const { wrapper } = setupMocks({});
+
+            store.getters.order.serviceLocation.zipCode = null;
+
             serviceLocation.beforeRouteEnter.call(
                 wrapper.vm,
                 { query: { fmgPage: "service-location" } },
@@ -56,9 +121,7 @@ describe("service-location.vue", () => {
     });
 });
 
-function setupMocks({
-    mountOptionsMockData = {}
-}) {
+function setupMocks({ mountOptionsMockData = {} }) {
     const apiResponses = {};
 
     const apiPromise = Promise.resolve(apiResponses);
@@ -71,4 +134,4 @@ function setupMocks({
     wrapper.vm.setCmsContent = baseMixin.methods.setCmsContent;
 
     return { wrapper, apiPromise };
-}
\ No newline at end of file
+}

From ba80ae58d23cca6c2e6873336891518cb1c90cf7 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 17 Feb 2023 09:08:09 -0500
Subject: [PATCH 165/261] Added alert for invalid zip, still needs code

---
 .../mobile-location-modal-questions.vue                   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 8a46879c0..31378fc95 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -32,6 +32,13 @@
             v-model="internalModel.isVehicleProtected"
             cmsWidgetName="VehicleProtectedQuestionWidget" />
         <textBlock cmsWidgetName="WorkspaceRequirementsWidget" typeStyle="caption" />
+        <alert
+            ref="alertInvalidZip"
+            v-if="displayInvalidZipAlert"
+            class="my-4"
+            :cmsWidgetName="AlertInvalidZipWidget"
+            alertClass="alert-danger"
+            v-bind:isDismissible="false" />
     </modal>
 </template>
 
@@ -173,6 +180,7 @@ export default {
         addressQuestions,
         vehicleProtectedQuestion,
         textBlock,
+        alert,
     },
 };
 </script>

From 4562f7679eec2c10f28b4be97c7a06b954e809e4 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 17 Feb 2023 09:35:10 -0500
Subject: [PATCH 166/261] Added code to display invalid zip alert

---
 .../mobile-location-modal-questions.vue           | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 31378fc95..dc2df2e9a 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -36,7 +36,7 @@
             ref="alertInvalidZip"
             v-if="displayInvalidZipAlert"
             class="my-4"
-            :cmsWidgetName="AlertInvalidZipWidget"
+            cmsWidgetName="AlertInvalidZipWidget"
             alertClass="alert-danger"
             v-bind:isDismissible="false" />
     </modal>
@@ -57,6 +57,7 @@ export default {
     data() {
         return {
             internalModel: this.copyModel(this.modelValue),
+            displayInvalidZipAlert: false,
         };
     },
     props: {
@@ -162,11 +163,17 @@ export default {
 
         async setMobileLocation() {
             // TODO: Any lookups or actions to be taken before assigning the Mobile Location
+            const zipCodeData = await this.getZipCodeData(this.internalModel.addressQuestions.zipCode);
 
-            // Update the page level model
-            this.$emit("update:modelValue", this.internalModel);
+            if (!zipCodeData.isValid) {
+                this.displayInvalidZipAlert = true;
+            } else {
+                // Update the page level model
+                this.$emit("update:modelValue", this.internalModel);
+
+                this.closeModal();
+            }
 
-            this.closeModal();
         },
     },
     watch: {

From 487c83e3a0173b5ed2c9a94ff131ddd3bbcc0058 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 17 Feb 2023 09:39:40 -0500
Subject: [PATCH 167/261] Resolving this issue:
 https://stackoverflow.com/questions/75179573/how-to-fix-loading-the-google-maps-javascript-api-without-a-callback-is-not-supp

---
 .../address-questions/address-questions.vue                  | 2 +-
 .../mobile-location-modal-questions.vue                      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 8a28ea669..c37e596ef 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -215,7 +215,7 @@ export default {
             const apiKey = applicationConfig.GOOGLE_PLACES_API_KEY;
 
             this.$loadScript(
-                `https://maps.googleapis.com/maps/api/js?key=${apiKey}&libraries=places`
+                `https://maps.googleapis.com/maps/api/js?key=${apiKey}&libraries=places&callback=Function.prototype`
             )
                 .then(() => {
                     // Script is loaded, initialize the autocomplete textbox
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index dc2df2e9a..6a6e6cc56 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -163,7 +163,9 @@ export default {
 
         async setMobileLocation() {
             // TODO: Any lookups or actions to be taken before assigning the Mobile Location
-            const zipCodeData = await this.getZipCodeData(this.internalModel.addressQuestions.zipCode);
+            const zipCodeData = await this.getZipCodeData(
+                this.internalModel.addressQuestions.zipCode
+            );
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
@@ -173,7 +175,6 @@ export default {
 
                 this.closeModal();
             }
-
         },
     },
     watch: {

From 1fccadd678d929109944f21e57da878425bc3481 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Fri, 17 Feb 2023 10:22:56 -0500
Subject: [PATCH 168/261] CSR-1012 some unit tests for
 service-location-modal-question

---
 .../service-zip-modal-question.spec.js        | 80 ++++++++++++++++++-
 1 file changed, 79 insertions(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
index a81727c73..4f18fd52a 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -1,3 +1,81 @@
+import { mount } from "@vue/test-utils";
+import serviceZipModalQuestion from "./service-zip-modal-question";
+import crypto from "crypto";
+global.crypto = crypto;
+
+jest.mock('@/digital-components/textbox-question/textbox-question', () => ({
+    getCmsContent: jest.fn((widgetName, cmsFieldName) => {
+        return widgetName[cmsFieldName];
+    }),
+}));
+
+const linkWidgetName = "linkWidgetName";
+const modalWidgetName = "modalWidgetName";
+const textboxQuestionWidgetName = "textboxQuestionWidgetName";
+
+const mockLinkCmsContent = {
+    BodyText: "Sample link body text here.",
+};
+
+const mockModalCmsContent = {
+    FooterText: "Sample modal footer text here.",
+};
+
+const mockTextboxQuestionCmsContent = {
+    QuestionText: "Sample question text here."
+};
+
+const mockMixin = {
+    methods: {
+        getCmsContent: jest.fn((widgetName, cmsFieldName) => {
+            if (widgetName === linkWidgetName)
+                return mockLinkCmsContent[cmsFieldName];
+
+            if (widgetName === modalWidgetName)
+                return mockModalCmsContent[cmsFieldName];
+
+            if (widgetName === textboxQuestionWidgetName)
+                return mockTextboxQuestionCmsContent[cmsFieldName];
+
+            return null;
+        }),
+
+        getZipCodeData: jest.fn((zip) => {
+            return {
+                isValid: true,
+                state: "OH",
+                isServiceable: true,
+            };
+        }),
+    },
+};
+
 describe("service-zip-modal-question.vue", () => {
-    test.todo("test this");
+
+    it("Should display text from textboxQuestionWidget", async () => {
+        const wrapper = mount(serviceZipModalQuestion, {
+            mixins: [mockMixin],
+            props: {
+                linkWidgetName: linkWidgetName,
+                modalWidgetName: modalWidgetName,
+                textboxQuestionWidgetName: textboxQuestionWidgetName,
+            },
+            attachTo: document.body,
+        });
+        expect(wrapper.html()).toEqual(expect.stringContaining(mockTextboxQuestionCmsContent["QuestionText"]));
+    });
+
+    it("Should display footer text from modalWidget", async () => {
+        const wrapper = mount(serviceZipModalQuestion, {
+            mixins: [mockMixin],
+            props: {
+                linkWidgetName: linkWidgetName,
+                modalWidgetName: modalWidgetName,
+                textboxQuestionWidgetName: textboxQuestionWidgetName,
+            },
+            attachTo: document.body,
+        });
+        expect(wrapper.html()).toEqual(expect.stringContaining(mockModalCmsContent["FooterText"]));
+    });
+
 });

From 66104b1d9e44b1cf0772a5a075f13550dc3c1374 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Fri, 17 Feb 2023 10:28:21 -0500
Subject: [PATCH 169/261] CSR-1012 formatting

---
 .../service-zip-modal-question.spec.js        | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
index 4f18fd52a..f0c022ba8 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -3,7 +3,7 @@ import serviceZipModalQuestion from "./service-zip-modal-question";
 import crypto from "crypto";
 global.crypto = crypto;
 
-jest.mock('@/digital-components/textbox-question/textbox-question', () => ({
+jest.mock("@/digital-components/textbox-question/textbox-question", () => ({
     getCmsContent: jest.fn((widgetName, cmsFieldName) => {
         return widgetName[cmsFieldName];
     }),
@@ -22,20 +22,23 @@ const mockModalCmsContent = {
 };
 
 const mockTextboxQuestionCmsContent = {
-    QuestionText: "Sample question text here."
+    QuestionText: "Sample question text here.",
 };
 
 const mockMixin = {
     methods: {
         getCmsContent: jest.fn((widgetName, cmsFieldName) => {
-            if (widgetName === linkWidgetName)
+            if (widgetName === linkWidgetName) {
                 return mockLinkCmsContent[cmsFieldName];
+            }
 
-            if (widgetName === modalWidgetName)
+            if (widgetName === modalWidgetName) {
                 return mockModalCmsContent[cmsFieldName];
+            }
 
-            if (widgetName === textboxQuestionWidgetName)
+            if (widgetName === textboxQuestionWidgetName) {
                 return mockTextboxQuestionCmsContent[cmsFieldName];
+            }
 
             return null;
         }),
@@ -51,7 +54,6 @@ const mockMixin = {
 };
 
 describe("service-zip-modal-question.vue", () => {
-
     it("Should display text from textboxQuestionWidget", async () => {
         const wrapper = mount(serviceZipModalQuestion, {
             mixins: [mockMixin],
@@ -62,7 +64,9 @@ describe("service-zip-modal-question.vue", () => {
             },
             attachTo: document.body,
         });
-        expect(wrapper.html()).toEqual(expect.stringContaining(mockTextboxQuestionCmsContent["QuestionText"]));
+        expect(wrapper.html()).toEqual(
+            expect.stringContaining(mockTextboxQuestionCmsContent["QuestionText"])
+        );
     });
 
     it("Should display footer text from modalWidget", async () => {
@@ -77,5 +81,4 @@ describe("service-zip-modal-question.vue", () => {
         });
         expect(wrapper.html()).toEqual(expect.stringContaining(mockModalCmsContent["FooterText"]));
     });
-
 });

From 1fb34d29b1029c95c9e06d84ff3c63c170b4ad77 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Fri, 17 Feb 2023 15:53:06 -0500
Subject: [PATCH 170/261] Updated test case data

---
 .../service-location/service-location.spec.js | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 1b6fcd57f..904580d9d 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -24,11 +24,20 @@ jest.mock("@/store", () => ({
     dispatch: jest.fn(),
     getters: {
         lineItems: {
-            supportingItems: [],
+            supportingItems: [
+                {
+                    description: null,
+                    kitPrice: 0,
+                    laborAmount: 0,
+                    partNumber: "SUPPLIES-REPAIR",
+                    partType: "REPAIR FEE",
+                    sellingPrice: 7.99
+                }
+            ],
         },
         order: {
             serviceLocation: {
-                zipCode: "00000",
+                zipCode: "43235",
             },
         },
         payment: {
@@ -40,18 +49,27 @@ jest.mock("@/store", () => ({
 beforeEach(() => {
     store.getters = {
         lineItems: {
-            supportingItems: [],
+            supportingItems: [
+                {
+                    description: null,
+                    kitPrice: 0,
+                    laborAmount: 0,
+                    partNumber: "SUPPLIES-REPAIR",
+                    partType: "REPAIR FEE",
+                    sellingPrice: 7.99
+                }
+            ],
         },
         order: {
             serviceLocation: {
-                zipCode: "00000",
+                zipCode: "43235",
             },
         },
         payment: {
             isInsurance: false,
         },
-    }
-})
+    };
+});
 
 describe("service-location.vue", () => {
     describe("arePagePrerequisitesValid", () => {
@@ -70,7 +88,7 @@ describe("service-location.vue", () => {
                 payment: {
                     isInsurance: null,
                 },
-            }
+            };
 
             serviceLocation.beforeRouteEnter.call(
                 wrapper.vm,

From 4ddc9c41d0756161d51914771fc1f8365810255b Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 20 Feb 2023 09:22:22 -0500
Subject: [PATCH 171/261] Suggested changes from Mark regarding inputIDs for
 textboxQuestion and dropdownQuestion

---
 .../dropdown-question/dropdown-question.vue   |  3 ++
 .../text-block/text-block.vue                 |  4 ++
 .../textbox-question/textbox-question.vue     |  7 +++-
 .../mobile-location-modal-questions.vue       | 29 ++++++++++++---
 .../service-location/service-location.vue     | 37 +++++++++++++++----
 .../service-zip-modal-question.vue            | 20 +++++++---
 6 files changed, 81 insertions(+), 19 deletions(-)

diff --git a/src/digital-components/dropdown-question/dropdown-question.vue b/src/digital-components/dropdown-question/dropdown-question.vue
index 3dfc82947..e122837c4 100644
--- a/src/digital-components/dropdown-question/dropdown-question.vue
+++ b/src/digital-components/dropdown-question/dropdown-question.vue
@@ -86,6 +86,9 @@ export default {
             errors,
         };
     },
+    mounted() {
+        this.$emit("dropdownQuestionEvent.inputIdAssigned", this.inputId);
+    },
     computed: {
         questionText() {
             return this.getCmsContent(this.cmsWidgetName, "QuestionText");
diff --git a/src/digital-components/text-block/text-block.vue b/src/digital-components/text-block/text-block.vue
index 33854e143..9e7df6312 100644
--- a/src/digital-components/text-block/text-block.vue
+++ b/src/digital-components/text-block/text-block.vue
@@ -9,6 +9,7 @@
 export default {
     name: "textBlock",
     props: {
+        customText: String, // used to allow the insert of token values into textblock
         justifyText: String, // left, right, center
         typeStyle: String, // h1-h6, body, small, label, caption (see Figma or Confluence documentation)
         fontWeight: String, // bold=500, default is 400
@@ -16,6 +17,9 @@ export default {
     },
     computed: {
         TextBlockCopy() {
+            if (this.customText) {
+                return this.customText;
+            }
             return this.getCmsContent(this.cmsWidgetName, "Text");
         },
     },
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index 90aa33ddf..2b14aac6b 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -76,7 +76,9 @@ export default {
         includeSearchIcon: Boolean,
     },
     setup(props) {
-        const inputId = !props.customInputId ? `input-${crypto.randomUUID()}` : props.customInputId;
+        const inputId = !props.customInputId 
+            ? `input-${crypto.randomUUID()}` 
+            : props.customInputId;
 
         const propsClone = Object.assign({}, props);
         const modelValue = propsClone.modelValue;
@@ -126,6 +128,9 @@ export default {
             },
         },
     },
+    mounted() {
+        this.$emit("textboxQuestionEvent.inputIdAssigned", this.inputId);
+    },
     watch: {
         async value(newValue) {
             const result = await validate(newValue, this.validationRules); // do a test validation check, without triggering full validation
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 6a6e6cc56..bb768fa14 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -15,7 +15,10 @@
                 @click-event="openModal"
                 aria-label="Modal window" />
         </div>
-        <textBlock cmsWidgetName="MobileFeeDisclaimerWidget" typeStyle="caption" />
+        <textBlock
+            :customText="mobileFeeText"
+            cmsWidgetName="MobileFeeDisclaimerWidget"
+            typeStyle="caption" />
     </div>
     <modal
         :ref="modalName"
@@ -58,6 +61,7 @@ export default {
         return {
             internalModel: this.copyModel(this.modelValue),
             displayInvalidZipAlert: false,
+            mobileFee: this.getMobileFee(),
         };
     },
     props: {
@@ -85,15 +89,23 @@ export default {
         alertInvalidZipWidgetName: String,
     },
     computed: {
+        mobileFeeText() {
+            const cmsContentText = this.getCmsContent("MobileFeeDisclaimerWidget", "Text");
+            return cmsContentText.replaceAll("{custom:mobileFee}", this.mobileFee);
+        },
         mobileLocationLinkPromptText() {
             return this.getCmsContent(this.linkWidgetName, "HeaderText");
         },
         mobileLocationLinkText() {
             if (
-                this.addressModel.streetAddress != "" &&
-                this.addressModel.city != "" &&
-                this.addressModel.state != "" &&
-                this.addressModel.zipCode != ""
+                this.addressModel.streetAddress !== null &&
+                this.addressModel.streetAddress !== "" &&
+                this.addressModel.city !== null &&
+                this.addressModel.city !== "" &&
+                this.addressModel.state !== null &&
+                this.addressModel.state !== "" &&
+                this.addressModel.zipCode !== null &&
+                this.addressModel.zipCode !== ""
             ) {
                 return `${this.addressModel.streetAddress}\n${this.addressModel.city}, ${this.addressModel.state} ${this.addressModel.zipCode}`;
             }
@@ -131,6 +143,11 @@ export default {
             };
         },
 
+        getMobileFee() {
+            // TODO: Call new service endpoint to get the Mobile Fee price
+            return "34.99";
+        },
+
         openModal() {
             this.$refs[this.modalName].openModal();
         },
@@ -162,7 +179,7 @@ export default {
         },
 
         async setMobileLocation() {
-            // TODO: Any lookups or actions to be taken before assigning the Mobile Location
+            // Validate the Zip Code
             const zipCodeData = await this.getZipCodeData(
                 this.internalModel.addressQuestions.zipCode
             );
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index a193f3dd5..6406519dd 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -40,6 +40,7 @@ import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import store from "@/store";
 
 export default {
     name: "service-location",
@@ -48,17 +49,17 @@ export default {
             isZipServiceableMobile: null,
             isZipServiceableInShop: null,
             serviceZipCodeQuestion: {
-                state: "",
-                zipCode: "",
-                isServiceable: null,
+                state: this.getServiceStateFromStore(),
+                zipCode: this.getServiceZipCodeFromStore(),
+                isServiceable: this.getIsServiceableFromStore(),
             },
             mobileLocationQuestions: {
                 addressQuestions: {
-                    streetAddress: "",
+                    streetAddress: this.getRegistrationAddressFromStore(),
                     apartmentNumberOrBusinessName: "",
-                    city: "",
-                    state: "",
-                    zipCode: "",
+                    city: this.getRegistrationCityFromStore(),
+                    state: this.getRegistrationStateFromStore(),
+                    zipCode: this.getRegistrationZipFromStore(),
                 },
                 isVehicleProtected: null,
             },
@@ -84,10 +85,32 @@ export default {
             vm.setCmsContent(resultMap.cmsContent);
         });
     },
+
     methods: {
         arePagePrerequisitesValid() {
             return true;
         },
+        getRegistrationAddressFromStore() {
+            return this.$store.getters.vehicle.registration.address;
+        },
+        getRegistrationCityFromStore() {
+            return this.$store.getters.vehicle.registration.city;
+        },
+        getRegistrationStateFromStore() {
+            return this.$store.getters.vehicle.registration.state;
+        },
+        getRegistrationZipFromStore() {
+            return this.$store.getters.vehicle.registration.zipCode;
+        },
+        getServiceZipCodeFromStore() {
+            return this.$store.getters.order.serviceLocation.zipCode;
+        },
+        getServiceStateFromStore() {
+            return this.$store.getters.order.serviceLocation.state;
+        },
+        getIsServiceableFromStore() {
+            return this.$store.getters.order.serviceLocation.isServiceable;
+        },
         resetMobileLocation() {
             this.mobileLocationQuestions = {
                 addressQuestions: {
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index e538c473f..4ca6990b3 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -19,8 +19,9 @@
         @footer-button-event="setZipCode">
         <serviceZipQuestion
             ref="serviceZipQuestion"
-            :cmsWidgetName="textboxQuestionWidgetName"
-            v-model="internalModel.zipCode" />
+            v-model="internalModel.zipCode"
+            v-on="{ 'textboxQuestionEvent.inputIdAssigned': onInputIdAssigned }"
+            :cmsWidgetName="textboxQuestionWidgetName" />
         <alert
             ref="alertInvalidZip"
             v-if="displayInvalidZipAlert"
@@ -43,6 +44,7 @@ export default {
     data() {
         return {
             internalModel: this.copyModel(this.modelValue),
+            serviceZipCodeTextInputId: "",
             displayInvalidZipAlert: false,
         };
     },
@@ -88,8 +90,7 @@ export default {
         },
 
         focusOnZipInput() {
-            const inputId = this.$refs.serviceZipQuestion.$refs.zipInputTextQuestion.inputId;
-            const input = document.getElementById(inputId);
+            const input = document.getElementById(this.serviceZipCodeTextInputId);
             input.focus();
         },
 
@@ -109,6 +110,13 @@ export default {
             this.$refs[this.modalName].closeModal();
         },
 
+        onInputIdAssigned(inputId) {
+            this.serviceZipCodeTextInputId = inputId;
+
+            // bubble up the event to the parent
+            this.$emit("textboxQuestionEvent.inputIdAssigned", inputId);
+        },
+
         onModalOpened() {
             this.focusOnZipInput();
         },
@@ -126,7 +134,9 @@ export default {
                 this.internalModel.isServiceable = zipCodeData.isServiceable;
 
                 // Notify the page that the service zip has been updated to clear Mobile Location form
-                this.$emit("service-zip-updated");
+                if (this.internalModel.zipCode !== this.modelValue.zipCode) {
+                    this.$emit("service-zip-updated");
+                }
 
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);

From 52e5c7d5328d90caa47d4ca2735c26751b255fe5 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 20 Feb 2023 10:39:06 -0500
Subject: [PATCH 172/261] Checking in before writing some unit tests

---
 src/constants/endpoints.js                    |  4 +++
 src/constants/store-actions.js                |  1 +
 .../textbox-question/textbox-question.vue     |  4 +--
 .../mobile-location-modal-questions.vue       | 27 ++++++++++++++++---
 src/store/index.js                            |  7 +++++
 5 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 9f4c60d61..19019477b 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -70,6 +70,10 @@ const endpoints = {
         url: "/parts/api/v1/parts/rain-defense",
         method: "GET",
     },
+    GetMobileFeePart: {      
+        url: "/parts/api/v1/parts/mobile-fee",
+        method: "GET",
+    },
     GetSupportingItems: {
         url: "/parts/api/v1/parts/supporting-items",
         method: "POST",
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 428280d40..eb781b020 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -27,6 +27,7 @@ const storeActions = {
     GET_CAPABILITY_QUESTIONS: "getCapabilityQuestions",
     GET_PART_FROM_CAPABILITY_QUESTION_ANSWER: "getPartFromCapabilityQuestionAnswer",
     GET_MOLDING_QUESTIONS: "getMoldingQuestions",
+    GET_MOBILE_FEE_PART: "getMobileFeePart",
     SAVE_SESSION: "saveSession",
     LOAD_SESSION: "loadSession",
     UPDATE_STORE_WITH_SAVE_SESSION_RESPONSE: "updateStoreWithSaveSessionResponse",
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index 2b14aac6b..2766e2cd9 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -76,9 +76,7 @@ export default {
         includeSearchIcon: Boolean,
     },
     setup(props) {
-        const inputId = !props.customInputId 
-            ? `input-${crypto.randomUUID()}` 
-            : props.customInputId;
+        const inputId = !props.customInputId ? `input-${crypto.randomUUID()}` : props.customInputId;
 
         const propsClone = Object.assign({}, props);
         const modelValue = propsClone.modelValue;
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index bb768fa14..9aeda710c 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -53,6 +53,8 @@ import alert from "@/ux-components/alert/alert";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 import textBlock from "@/digital-components/text-block/text-block";
+import baseMixin from "@/mixins/base-mixin.js";
+import { storeActions } from "@/constants/store-actions";
 
 export default {
     name: "mobile-location-modal-questions",
@@ -61,7 +63,7 @@ export default {
         return {
             internalModel: this.copyModel(this.modelValue),
             displayInvalidZipAlert: false,
-            mobileFee: this.getMobileFee(),
+            mobileFee: ""
         };
     },
     props: {
@@ -88,6 +90,9 @@ export default {
         alertNonServiceableZipWidgetName: String,
         alertInvalidZipWidgetName: String,
     },
+    async mounted() {
+        this.mobileFee = await this.getMobileFee();
+    },
     computed: {
         mobileFeeText() {
             const cmsContentText = this.getCmsContent("MobileFeeDisclaimerWidget", "Text");
@@ -142,10 +147,24 @@ export default {
                 isZipServiceableInShop: modelToCopy.isZipServiceableInShop,
             };
         },
+        
+        async getMobileFee() {
+            // Get the Mobile Fee Part
+            const mobileFeePart = await baseMixin.methods.dispatchStoreAction(
+                storeActions.GET_MOBILE_FEE_PART,
+                null, 
+                false
+            );
+
+            // Get the Mobile Fee Part Price
+            const pricingResults = await baseMixin.methods.dispatchStoreAction(
+                storeActions.PRICE_ORDER_ITEMS,
+                [ mobileFeePart.data ],
+                false
+            );
+
+            return await baseMixin.methods.getTotalLineItemPrice(pricingResults[0]);
 
-        getMobileFee() {
-            // TODO: Call new service endpoint to get the Mobile Fee price
-            return "34.99";
         },
 
         openModal() {
diff --git a/src/store/index.js b/src/store/index.js
index 93a3e5a25..10cf7d797 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -907,6 +907,13 @@ export const actions = {
         });
     },
 
+    getMobileFeePart(context) {
+        return globalMethods.callMockHttpClient({
+            method: endpoints.GetMobileFeePart.method,
+            endpoint: "https://run.mocky.io/v3/795de4cb-d014-48b4-9338-dab33261adce", //TODO: Remove Mocky Endpoint
+        });
+    },    
+
     getSupportingItems(context) {
         const glassPartsArray = context.getters.lineItems.glassParts ?? [];
         const carId = context.getters.vehicle.carId;

From 023a521ec11c834f386151032916ad7c3389fed5 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 20 Feb 2023 13:14:51 -0500
Subject: [PATCH 173/261] Now retrieving the actual mobile fee but we're
 mocking the part call

---
 src/constants/endpoints.js                               | 2 +-
 .../mobile-location-modal-questions.vue                  | 9 ++++-----
 src/store/index.js                                       | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 19019477b..6b1e69609 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -70,7 +70,7 @@ const endpoints = {
         url: "/parts/api/v1/parts/rain-defense",
         method: "GET",
     },
-    GetMobileFeePart: {      
+    GetMobileFeePart: {
         url: "/parts/api/v1/parts/mobile-fee",
         method: "GET",
     },
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 9aeda710c..d1aa4dd4b 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -63,7 +63,7 @@ export default {
         return {
             internalModel: this.copyModel(this.modelValue),
             displayInvalidZipAlert: false,
-            mobileFee: ""
+            mobileFee: "",
         };
     },
     props: {
@@ -147,24 +147,23 @@ export default {
                 isZipServiceableInShop: modelToCopy.isZipServiceableInShop,
             };
         },
-        
+
         async getMobileFee() {
             // Get the Mobile Fee Part
             const mobileFeePart = await baseMixin.methods.dispatchStoreAction(
                 storeActions.GET_MOBILE_FEE_PART,
-                null, 
+                null,
                 false
             );
 
             // Get the Mobile Fee Part Price
             const pricingResults = await baseMixin.methods.dispatchStoreAction(
                 storeActions.PRICE_ORDER_ITEMS,
-                [ mobileFeePart.data ],
+                [mobileFeePart.data],
                 false
             );
 
             return await baseMixin.methods.getTotalLineItemPrice(pricingResults[0]);
-
         },
 
         openModal() {
diff --git a/src/store/index.js b/src/store/index.js
index 10cf7d797..5f4d7c1f5 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -912,7 +912,7 @@ export const actions = {
             method: endpoints.GetMobileFeePart.method,
             endpoint: "https://run.mocky.io/v3/795de4cb-d014-48b4-9338-dab33261adce", //TODO: Remove Mocky Endpoint
         });
-    },    
+    },
 
     getSupportingItems(context) {
         const glassPartsArray = context.getters.lineItems.glassParts ?? [];

From ea4820ec5e7af0c6d4a6c4e4dd4c6d2b7dfc52d4 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 174/261] 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 c148f56361871aa16221fd207b2ec4a237e5086a Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Mon, 20 Feb 2023 15:41:43 -0500
Subject: [PATCH 175/261] Removed unnecessary nextTick calls from tests

---
 src/layouts/service-location/service-location.spec.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 904580d9d..4dec285bd 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -73,7 +73,7 @@ beforeEach(() => {
 
 describe("service-location.vue", () => {
     describe("arePagePrerequisitesValid", () => {
-        test("No prerequisites set: Should return false.", async () => {
+        test("No prerequisites set: Should return false.", () => {
             const { wrapper } = setupMocks({});
 
             store.getters = {
@@ -98,12 +98,11 @@ describe("service-location.vue", () => {
             );
 
             let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid();
-            await nextTick();
 
             expect(arePagePrerequisitesValid).toBe(false);
         });
 
-        test("All prerequisites set: Should return true.", async () => {
+        test("All prerequisites set: Should return true.", () => {
             const { wrapper } = setupMocks({});
 
             serviceLocation.beforeRouteEnter.call(
@@ -114,12 +113,11 @@ describe("service-location.vue", () => {
             );
 
             let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid();
-            await nextTick();
 
             expect(arePagePrerequisitesValid).toBe(true);
         });
 
-        test("Some prerequisites set: Should return false.", async () => {
+        test("Some prerequisites set: Should return false.", () => {
             const { wrapper } = setupMocks({});
 
             store.getters.order.serviceLocation.zipCode = null;
@@ -132,7 +130,6 @@ describe("service-location.vue", () => {
             );
 
             let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid();
-            await nextTick();
 
             expect(arePagePrerequisitesValid).toBe(false);
         });

From ca215c3af53eece80d9e2924ec1ce0751c8619e5 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Mon, 20 Feb 2023 15:42:48 -0500
Subject: [PATCH 176/261] Fix formatting

---
 src/layouts/service-location/service-location.spec.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 4dec285bd..a1f44936b 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -31,8 +31,8 @@ jest.mock("@/store", () => ({
                     laborAmount: 0,
                     partNumber: "SUPPLIES-REPAIR",
                     partType: "REPAIR FEE",
-                    sellingPrice: 7.99
-                }
+                    sellingPrice: 7.99,
+                },
             ],
         },
         order: {
@@ -56,8 +56,8 @@ beforeEach(() => {
                     laborAmount: 0,
                     partNumber: "SUPPLIES-REPAIR",
                     partType: "REPAIR FEE",
-                    sellingPrice: 7.99
-                }
+                    sellingPrice: 7.99,
+                },
             ],
         },
         order: {

From c533cc4357eb751699d0c780df1c8ebbe6a20155 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 21 Feb 2023 14:18:41 -0500
Subject: [PATCH 177/261] Added tests to verify that the footer-button-event
 emit is only fired when the form is valid

---
 src/digital-components/modal/modal.spec.js | 87 +++++++++++++++++++---
 src/digital-components/modal/modal.vue     |  4 +-
 2 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index 7ed8fff12..0ce53b761 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -1,6 +1,21 @@
+const veeValidate = require("vee-validate");
+jest.mock("vee-validate", () => ({
+    useForm: jest.fn(),
+    useIsFormTouched: jest.fn(),
+    useIsFormDirty: jest.fn(),
+    useIsFormValid: jest.fn()
+}));
+
+
+
+
+
+const mockValidate = (returnValue) => jest.fn(async () => Promise.resolve({ valid: returnValue }));
+
 import { shallowMount } from "@vue/test-utils";
 import Modal from "./modal";
 import crypto from "crypto";
+import { useForm, useIsFormDirty, useIsFormTouched, useIsFormValid } from "vee-validate"
 
 const modalId = "modal-one";
 const footerButtonText = "Sample footer text here.";
@@ -8,18 +23,9 @@ const headerText = "Sample header text here.";
 
 global.crypto = crypto;
 
-describe("modal.vue", () => {
-    it("Should display footer button text when footerButtonText is defined", async () => {
-        const wrapper = shallowMount(Modal, {
-            props: {
-                modalId: modalId,
-                footerButtonText: footerButtonText,
-            },
-            attachTo: document.body,
-        });
-        expect(wrapper.html()).toEqual(expect.stringContaining(footerButtonText));
-    });
 
+
+describe("modal.vue", () => {
     it("Should display modal header text when headerText is defined", async () => {
         const wrapper = shallowMount(Modal, {
             props: {
@@ -31,4 +37,63 @@ describe("modal.vue", () => {
         });
         expect(wrapper.html()).toEqual(expect.stringContaining(headerText));
     });
+
+    it("Should display footer button text when footerButtonText is defined", async () => {
+        const wrapper = shallowMount(Modal, {
+            props: {
+                modalId: modalId,
+                footerButtonText: footerButtonText,
+            },
+            attachTo: document.body,
+        });
+        expect(wrapper.html()).toEqual(expect.stringContaining(footerButtonText));
+    });
+
+    it("Should emit 'footer-button-event' if the form is valid", async () => {
+        useForm.mockReturnValue({
+            validate: mockValidate(true)
+        })
+        
+        const resetButtonStyle = jest.fn();
+        const wrapper = shallowMount(Modal, {
+            props: {
+                modalId: modalId,
+                footerButtonText: footerButtonText,
+                headerText: headerText,
+            },
+            attachTo: document.body,
+        });       
+        wrapper.vm.resetButtonStyle = resetButtonStyle; 
+
+        const buttonMain = wrapper.findComponent({ ref: "buttonMain" });
+        await buttonMain.trigger("click-event");
+
+        expect(wrapper.emitted("footer-button-event")).toBeTruthy();
+
+    });
+
+    it("Should not emit 'footer-button-event' if the form is not valid", async () => {  
+        useForm.mockReturnValue({
+            validate: mockValidate(false)
+        })
+
+        const resetButtonStyle = jest.fn();
+        const wrapper = shallowMount(Modal, {
+            props: {
+                modalId: modalId,
+                footerButtonText: footerButtonText,
+                headerText: headerText,
+            },
+            attachTo: document.body,
+        });      
+        wrapper.vm.resetButtonStyle = resetButtonStyle;
+
+        const buttonMain = wrapper.findComponent({ ref: "buttonMain" });
+        await buttonMain.trigger("click-event");
+
+        expect(wrapper.emitted("footer-button-event")).toBeFalsy();
+
+    });
+
 });
+
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 0034b5155..75e6ae665 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -74,8 +74,8 @@ export default {
         };
     },
     methods: {
-        async validateAndEmit() {
-            const validationResult = await this.form.validate();
+        async validateAndEmit() {         
+            const validationResult = await this.form.validate();          
             if (validationResult.valid) {
                 this.$emit("footer-button-event");
             }

From 7af8d9d26edab200411007e3b85d87c7fef765c2 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 22 Feb 2023 09:20:58 -0500
Subject: [PATCH 178/261] CSR-1088 Added unit tests for modal component

---
 src/digital-components/modal/modal.spec.js | 42 +++++++---------------
 src/digital-components/modal/modal.vue     |  4 +--
 2 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index 0ce53b761..3d6375094 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -1,37 +1,28 @@
-const veeValidate = require("vee-validate");
 jest.mock("vee-validate", () => ({
     useForm: jest.fn(),
     useIsFormTouched: jest.fn(),
     useIsFormDirty: jest.fn(),
-    useIsFormValid: jest.fn()
+    useIsFormValid: jest.fn(),
 }));
 
-
-
-
-
 const mockValidate = (returnValue) => jest.fn(async () => Promise.resolve({ valid: returnValue }));
 
-import { shallowMount } from "@vue/test-utils";
+import { mount, shallowMount } from "@vue/test-utils";
 import Modal from "./modal";
 import crypto from "crypto";
-import { useForm, useIsFormDirty, useIsFormTouched, useIsFormValid } from "vee-validate"
+import { useForm, useIsFormDirty, useIsFormTouched, useIsFormValid } from "vee-validate";
 
-const modalId = "modal-one";
 const footerButtonText = "Sample footer text here.";
 const headerText = "Sample header text here.";
 
 global.crypto = crypto;
 
-
-
 describe("modal.vue", () => {
     it("Should display modal header text when headerText is defined", async () => {
         const wrapper = shallowMount(Modal, {
             props: {
-                modalId: modalId,
-                footerButtonText: footerButtonText,
                 headerText: headerText,
+                footerButtonText: footerButtonText,
             },
             attachTo: document.body,
         });
@@ -41,7 +32,6 @@ describe("modal.vue", () => {
     it("Should display footer button text when footerButtonText is defined", async () => {
         const wrapper = shallowMount(Modal, {
             props: {
-                modalId: modalId,
                 footerButtonText: footerButtonText,
             },
             attachTo: document.body,
@@ -51,49 +41,43 @@ describe("modal.vue", () => {
 
     it("Should emit 'footer-button-event' if the form is valid", async () => {
         useForm.mockReturnValue({
-            validate: mockValidate(true)
-        })
-        
+            validate: mockValidate(true),
+        });
+
         const resetButtonStyle = jest.fn();
         const wrapper = shallowMount(Modal, {
             props: {
-                modalId: modalId,
                 footerButtonText: footerButtonText,
                 headerText: headerText,
             },
             attachTo: document.body,
-        });       
-        wrapper.vm.resetButtonStyle = resetButtonStyle; 
+        });
+        wrapper.vm.resetButtonStyle = resetButtonStyle;
 
         const buttonMain = wrapper.findComponent({ ref: "buttonMain" });
         await buttonMain.trigger("click-event");
 
         expect(wrapper.emitted("footer-button-event")).toBeTruthy();
-
     });
 
-    it("Should not emit 'footer-button-event' if the form is not valid", async () => {  
+    it("Should not emit 'footer-button-event' if the form is not valid", async () => {
         useForm.mockReturnValue({
-            validate: mockValidate(false)
-        })
+            validate: mockValidate(false),
+        });
 
         const resetButtonStyle = jest.fn();
         const wrapper = shallowMount(Modal, {
             props: {
-                modalId: modalId,
                 footerButtonText: footerButtonText,
                 headerText: headerText,
             },
             attachTo: document.body,
-        });      
+        });
         wrapper.vm.resetButtonStyle = resetButtonStyle;
 
         const buttonMain = wrapper.findComponent({ ref: "buttonMain" });
         await buttonMain.trigger("click-event");
 
         expect(wrapper.emitted("footer-button-event")).toBeFalsy();
-
     });
-
 });
-
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 75e6ae665..0034b5155 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -74,8 +74,8 @@ export default {
         };
     },
     methods: {
-        async validateAndEmit() {         
-            const validationResult = await this.form.validate();          
+        async validateAndEmit() {
+            const validationResult = await this.form.validate();
             if (validationResult.valid) {
                 this.$emit("footer-button-event");
             }

From 96fec12f94517cd11771e5267031fb9899ce718d Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 22 Feb 2023 11:39:13 -0500
Subject: [PATCH 179/261] Updated Textbox Question and Dropdown Question unit
 tests

---
 .../dropdown-question.spec.js                 |  22 +--
 src/digital-components/modal/modal.spec.js    | 137 +++++++++++++++++-
 .../textbox-question/textbox-question.spec.js |  24 +--
 3 files changed, 137 insertions(+), 46 deletions(-)

diff --git a/src/digital-components/dropdown-question/dropdown-question.spec.js b/src/digital-components/dropdown-question/dropdown-question.spec.js
index a606e3d19..654709926 100644
--- a/src/digital-components/dropdown-question/dropdown-question.spec.js
+++ b/src/digital-components/dropdown-question/dropdown-question.spec.js
@@ -1,5 +1,6 @@
 import { shallowMount } from "@vue/test-utils";
 import dropdownQuestion from "./dropdown-question";
+import crypto from "crypto";
 
 // Mock CMS content
 const questionText = "Question Text";
@@ -11,6 +12,8 @@ const mockMixin = {
     },
 };
 
+global.crypto = crypto;
+
 // TODO: Remove the following from dropdown-question.vue -> :class="(errors && errors.length) || hasError ? 'has-error' : ''"
 // It is not being used.
 describe("dropdownQuestion.vue", () => {
@@ -46,23 +49,6 @@ describe("dropdownQuestion.vue", () => {
         expect(label.text()).toContain(questionText);
     });
 
-    it("Should return input id as the id of the select field", async () => {
-        // Arrange
-        const wrapper = shallowMount(dropdownQuestion, {
-            propsData: {
-                inputId: "input ID",
-                options: {},
-            },
-            mixins: [mockMixin],
-        });
-
-        // Act
-        const select = wrapper.find("select");
-
-        // Assert
-        expect(select.attributes().id).toEqual("input ID");
-    });
-
     it("Should render the 'questionText' data value as the aria-label attribute.", async () => {
         // Arrange
         const wrapper = shallowMount(dropdownQuestion, {
@@ -118,7 +104,7 @@ describe("dropdownQuestion.vue", () => {
         const wrapper = shallowMount(dropdownQuestion, {
             propsData: {
                 options: {},
-                modelValue: 0,
+                modelValue: "0",
             },
             mixins: [mockMixin],
         });
diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index 3d6375094..ace7d49a5 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -7,10 +7,11 @@ jest.mock("vee-validate", () => ({
 
 const mockValidate = (returnValue) => jest.fn(async () => Promise.resolve({ valid: returnValue }));
 
-import { mount, shallowMount } from "@vue/test-utils";
-import Modal from "./modal";
+import { shallowMount } from "@vue/test-utils";
+import modal from "./modal";
 import crypto from "crypto";
 import { useForm, useIsFormDirty, useIsFormTouched, useIsFormValid } from "vee-validate";
+import { Modal } from "bootstrap";
 
 const footerButtonText = "Sample footer text here.";
 const headerText = "Sample header text here.";
@@ -19,33 +20,40 @@ global.crypto = crypto;
 
 describe("modal.vue", () => {
     it("Should display modal header text when headerText is defined", async () => {
-        const wrapper = shallowMount(Modal, {
+        // Arrange / Act
+        const wrapper = shallowMount(modal, {
             props: {
                 headerText: headerText,
                 footerButtonText: footerButtonText,
             },
             attachTo: document.body,
         });
+
+        // Assert
         expect(wrapper.html()).toEqual(expect.stringContaining(headerText));
     });
 
     it("Should display footer button text when footerButtonText is defined", async () => {
-        const wrapper = shallowMount(Modal, {
+        // Arrange / Act
+        const wrapper = shallowMount(modal, {
             props: {
                 footerButtonText: footerButtonText,
             },
             attachTo: document.body,
         });
+
+        // Assert
         expect(wrapper.html()).toEqual(expect.stringContaining(footerButtonText));
     });
 
     it("Should emit 'footer-button-event' if the form is valid", async () => {
+        // Arrange
         useForm.mockReturnValue({
             validate: mockValidate(true),
         });
 
         const resetButtonStyle = jest.fn();
-        const wrapper = shallowMount(Modal, {
+        const wrapper = shallowMount(modal, {
             props: {
                 footerButtonText: footerButtonText,
                 headerText: headerText,
@@ -54,19 +62,22 @@ describe("modal.vue", () => {
         });
         wrapper.vm.resetButtonStyle = resetButtonStyle;
 
+        // Act
         const buttonMain = wrapper.findComponent({ ref: "buttonMain" });
         await buttonMain.trigger("click-event");
 
+        // Assert
         expect(wrapper.emitted("footer-button-event")).toBeTruthy();
     });
 
-    it("Should not emit 'footer-button-event' if the form is not valid", async () => {
+    it("Should not emit 'footer-button-event' if the form is invalid", async () => {
+        // Arrange
         useForm.mockReturnValue({
             validate: mockValidate(false),
         });
 
         const resetButtonStyle = jest.fn();
-        const wrapper = shallowMount(Modal, {
+        const wrapper = shallowMount(modal, {
             props: {
                 footerButtonText: footerButtonText,
                 headerText: headerText,
@@ -75,9 +86,121 @@ describe("modal.vue", () => {
         });
         wrapper.vm.resetButtonStyle = resetButtonStyle;
 
+        // Act
         const buttonMain = wrapper.findComponent({ ref: "buttonMain" });
         await buttonMain.trigger("click-event");
 
+        // Assert
         expect(wrapper.emitted("footer-button-event")).toBeFalsy();
     });
+
+    it("Should have a disabled footer button when the form has not been touched", async () => {
+        // Arrange / Act
+        useForm.mockReturnValue({
+            validate: mockValidate(false),
+        });
+
+        useIsFormTouched.mockReturnValue(false);
+
+        const resetButtonStyle = jest.fn();
+        const wrapper = shallowMount(modal, {
+            props: {
+                footerButtonText: footerButtonText,
+                headerText: headerText,
+            },
+            attachTo: document.body,
+        });
+        wrapper.vm.resetButtonStyle = resetButtonStyle;
+
+        // Assert
+        expect(wrapper.vm.isFooterButtonDisabled).toBe(true);
+
+    });
+
+    it("Should have a disabled footer button when the form is invalid", async () => {
+        // Arrange / Act
+        useForm.mockReturnValue({
+            validate: mockValidate(false),
+        });
+
+        useIsFormTouched.mockReturnValue(true);
+        useIsFormDirty.mockReturnValue(true);
+        useIsFormValid.mockReturnValue(false);
+
+        const resetButtonStyle = jest.fn();
+        const wrapper = shallowMount(modal, {
+            props: {
+                footerButtonText: footerButtonText,
+                headerText: headerText,
+            },
+            attachTo: document.body,
+        });
+        wrapper.vm.resetButtonStyle = resetButtonStyle;
+
+        // Assert
+        expect(wrapper.vm.isFooterButtonDisabled).toBe(true);
+
+    });
+
+    it("Should call bootstrap Modal method 'show' when calling 'openModal'", async () => {
+        // Arrange
+        useForm.mockReturnValue({
+            validate: mockValidate(false),
+        });
+
+        useIsFormDirty.mockReturnValue(true);
+        useIsFormValid.mockReturnValue(true);
+
+        const showMock = jest
+            .spyOn(Modal.prototype, "show");
+
+        const resetButtonStyle = jest.fn();
+        const wrapper = shallowMount(modal, {
+            props: {
+                footerButtonText: footerButtonText,
+                headerText: headerText,
+            },
+            attachTo: document.body,
+        });
+        wrapper.vm.resetButtonStyle = resetButtonStyle;
+
+        // Act
+        wrapper.vm.openModal();
+
+        // Assert
+        expect(showMock).toHaveBeenCalled();
+
+    });
+
+    it("Should call bootstrap Modal method 'hide' when calling 'closeModal'", async () => {
+        // Arrange
+        useForm.mockReturnValue({
+            validate: mockValidate(false),
+        });
+
+        useIsFormDirty.mockReturnValue(true);
+        useIsFormValid.mockReturnValue(true);
+
+        const hideMock = jest
+            .spyOn(Modal.prototype, "hide");
+
+        const resetButtonStyle = jest.fn();
+        const wrapper = shallowMount(modal, {
+            props: {
+                footerButtonText: footerButtonText,
+                headerText: headerText,
+            },
+            attachTo: document.body,
+        });
+        wrapper.vm.resetButtonStyle = resetButtonStyle;
+
+        // Act
+        wrapper.vm.openModal();
+        wrapper.vm.closeModal();
+
+        // Assert
+        expect(hideMock).toHaveBeenCalled();
+
+    });
+ 
 });
diff --git a/src/digital-components/textbox-question/textbox-question.spec.js b/src/digital-components/textbox-question/textbox-question.spec.js
index 694142fb9..dba54d544 100644
--- a/src/digital-components/textbox-question/textbox-question.spec.js
+++ b/src/digital-components/textbox-question/textbox-question.spec.js
@@ -1,5 +1,6 @@
 import { shallowMount } from "@vue/test-utils";
 import textboxQuestion from "./textbox-question";
+import crypto from "crypto";
 
 // Mock CMS content
 const questionText = "Question Text";
@@ -12,6 +13,8 @@ const mockMixin = {
 };
 const maska = jest.fn();
 
+global.crypto = crypto;
+
 describe("textboxQuestion.vue", () => {
     it("Should render a text input", async () => {
         // Arrange
@@ -73,27 +76,6 @@ describe("textboxQuestion.vue", () => {
         expect(paragraph.attributes("class")).toContain("form-control");
     });
 
-    it("Should return input id as the id of the input field", async () => {
-        // Arrange
-        const wrapper = shallowMount(textboxQuestion, {
-            global: {
-                directives: {
-                    maska: maska,
-                },
-            },
-            propsData: {
-                inputId: "input ID",
-            },
-            mixins: [mockMixin],
-        });
-
-        // Act
-        const input = wrapper.find("input");
-
-        // Assert
-        expect(input.attributes().id).toEqual("input ID");
-    });
-
     it("Should render the 'questionText' data value as the aria-label attribute.", async () => {
         // Arrange
         const wrapper = shallowMount(textboxQuestion, {

From 8af938177177fac54a5c9b21d24d5685b65f2553 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Wed, 22 Feb 2023 12:49:05 -0500
Subject: [PATCH 180/261] CSR-1012 unit testing for service-zip-modal-question

---
 .../service-zip-modal-question.spec.js        | 272 +++++++++++++++++-
 .../service-zip-modal-question.vue            |  11 +-
 .../service-zip-question.vue                  |   0
 3 files changed, 270 insertions(+), 13 deletions(-)
 rename src/layouts/service-location/service-zip-modal-question/{ => service-zip-question}/service-zip-question.vue (100%)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
index f0c022ba8..4a0dec045 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -1,4 +1,4 @@
-import { mount } from "@vue/test-utils";
+import { mount, shallowMount } from "@vue/test-utils";
 import serviceZipModalQuestion from "./service-zip-modal-question";
 import crypto from "crypto";
 global.crypto = crypto;
@@ -9,6 +9,12 @@ jest.mock("@/digital-components/textbox-question/textbox-question", () => ({
     }),
 }));
 
+jest.mock("@/digital-components/modal/modal", () => ({
+    methods: {
+        closeModal: jest.fn(),
+    },
+}));
+
 const linkWidgetName = "linkWidgetName";
 const modalWidgetName = "modalWidgetName";
 const textboxQuestionWidgetName = "textboxQuestionWidgetName";
@@ -44,41 +50,287 @@ const mockMixin = {
         }),
 
         getZipCodeData: jest.fn((zip) => {
+            if (zip === "43235") {
+                return {
+                    containsMilitaryBase: false,
+                    isServiceable: true,
+                    isValid: true,
+                    state: "OH",
+                    zipCodeCtu: "01820",
+                };
+            }
+
+            if (zip === "61606") {
+                return {
+                    containsMilitaryBase: false,
+                    isServiceable: true,
+                    isValid: true,
+                    state: "IL",
+                    zipCodeCtu: "01526",
+                };
+            }
+
             return {
-                isValid: true,
-                state: "OH",
-                isServiceable: true,
+                containsMilitaryBase: false,
+                isServiceable: false,
+                isValid: false,
+                state: null,
+                zipCodeCtu: null,
             };
         }),
     },
 };
 
 describe("service-zip-modal-question.vue", () => {
-    it("Should display text from textboxQuestionWidget", async () => {
+    it("Initial state on load with no existing location info", async () => {
+        let serviceZipCodeQuestion = {
+            state: "",
+            zipCode: "",
+            isServiceable: undefined,
+        };
+
+        // Arrange
         const wrapper = mount(serviceZipModalQuestion, {
             mixins: [mockMixin],
             props: {
+                modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
                 textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
-        expect(wrapper.html()).toEqual(
-            expect.stringContaining(mockTextboxQuestionCmsContent["QuestionText"])
-        );
+
+        // Assert
+        expect(wrapper.html()).toEqual(expect.stringContaining(mockLinkCmsContent["BodyText"]));
     });
 
-    it("Should display footer text from modalWidget", async () => {
+    it("Initial state on load with existing location info", async () => {
+        // Arrange
+        let serviceZipCodeQuestion = {
+            state: "OH",
+            zipCode: "43235",
+            isServiceable: true,
+        };
+
         const wrapper = mount(serviceZipModalQuestion, {
             mixins: [mockMixin],
             props: {
+                modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
                 textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
-        expect(wrapper.html()).toEqual(expect.stringContaining(mockModalCmsContent["FooterText"]));
+
+        // Assert
+        expect(wrapper.html()).not.toEqual(expect.stringContaining(mockLinkCmsContent["BodyText"]));
+    });
+
+    it("Should emit update:modelValue on setZipCode for a valid, serviceable zip", async () => {
+        // Arrange
+        let serviceZipCodeQuestion = {
+            state: "IL",
+            zipCode: "61606",
+            isServiceable: true,
+        };
+
+        const zip = "43235";
+
+        const wrapper = mount(serviceZipModalQuestion, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: serviceZipCodeQuestion,
+                linkWidgetName: linkWidgetName,
+                modalWidgetName: modalWidgetName,
+                textboxQuestionWidgetName: textboxQuestionWidgetName,
+            },
+            attachTo: document.body,
+        });
+
+        // Act
+        wrapper.vm.internalModel.zipCode = zip;
+        await wrapper.vm.setZipCode();
+
+        let expectedEmit = [[{ isServiceable: true, state: "OH", zipCode: "43235" }]];
+
+        // Assert
+        expect(wrapper.emitted("update:modelValue")).toEqual(expectedEmit);
+    });
+
+    it("Should not emit update:modelValue on setZipCode for an invalid zip", async () => {
+        // Arrange
+        let serviceZipCodeQuestion = {
+            state: "IL",
+            zipCode: "61606",
+            isServiceable: true,
+        };
+
+        const zip = "";
+
+        const wrapper = mount(serviceZipModalQuestion, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: serviceZipCodeQuestion,
+                linkWidgetName: linkWidgetName,
+                modalWidgetName: modalWidgetName,
+                textboxQuestionWidgetName: textboxQuestionWidgetName,
+            },
+            attachTo: document.body,
+        });
+
+        // Act
+        wrapper.vm.internalModel.zipCode = zip;
+        await wrapper.vm.setZipCode();
+
+        // Assert
+        expect(wrapper.emitted("update:modelValue")).not.toBeTruthy();
+    });
+
+    it("Should emit service-zip-updated on setZipCode for a valid, serviceable zip", async () => {
+        // Arrange
+        let serviceZipCodeQuestion = {
+            state: "IL",
+            zipCode: "61606",
+            isServiceable: true,
+        };
+
+        const zip = "43235";
+
+        const wrapper = mount(serviceZipModalQuestion, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: serviceZipCodeQuestion,
+                linkWidgetName: linkWidgetName,
+                modalWidgetName: modalWidgetName,
+                textboxQuestionWidgetName: textboxQuestionWidgetName,
+            },
+            attachTo: document.body,
+        });
+
+        // Act
+        wrapper.vm.internalModel.zipCode = zip;
+        await wrapper.vm.setZipCode();
+
+        // Assert
+        expect(wrapper.emitted("service-zip-updated")).toBeTruthy();
+    });
+
+    it("Should not emit service-zip-updated on setZipCode for an invalid zip", async () => {
+        // Arrange
+        let serviceZipCodeQuestion = {
+            state: "IL",
+            zipCode: "61606",
+            isServiceable: true,
+        };
+
+        const zip = "";
+
+        const wrapper = mount(serviceZipModalQuestion, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: serviceZipCodeQuestion,
+                linkWidgetName: linkWidgetName,
+                modalWidgetName: modalWidgetName,
+                textboxQuestionWidgetName: textboxQuestionWidgetName,
+            },
+            attachTo: document.body,
+        });
+
+        // Act
+        wrapper.vm.internalModel.zipCode = zip;
+        await wrapper.vm.setZipCode();
+
+        // Assert
+        expect(wrapper.emitted("service-zip-updated")).not.toBeTruthy();
+    });
+
+    it("Should display invalid zip alerts for invalid ip inputs", async () => {
+        // Arrange
+        let serviceZipCodeQuestion = {
+            state: "IL",
+            zipCode: "61606",
+            isServiceable: true,
+        };
+
+        const zip = "11111";
+
+        const wrapper = mount(serviceZipModalQuestion, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: serviceZipCodeQuestion,
+                linkWidgetName: linkWidgetName,
+                modalWidgetName: modalWidgetName,
+                textboxQuestionWidgetName: textboxQuestionWidgetName,
+            },
+            attachTo: document.body,
+        });
+
+        // Act
+        wrapper.vm.internalModel.zipCode = zip;
+        await wrapper.vm.setZipCode();
+
+        // Assert
+        expect(wrapper.vm.displayInvalidZipAlert).toBe(true);
+    });
+
+    it("Should reset all alerts on onModalClosed", async () => {
+        // Arrange
+        let serviceZipCodeQuestion = {
+            state: "IL",
+            zipCode: "61606",
+            isServiceable: true,
+        };
+
+        const zip = "";
+
+        const wrapper = mount(serviceZipModalQuestion, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: serviceZipCodeQuestion,
+                linkWidgetName: linkWidgetName,
+                modalWidgetName: modalWidgetName,
+                textboxQuestionWidgetName: textboxQuestionWidgetName,
+            },
+            attachTo: document.body,
+        });
+
+        // Act
+        wrapper.vm.internalModel.zipCode = zip;
+        await wrapper.vm.setZipCode();
+        wrapper.vm.onModalClosed();
+
+        // Assert
+        expect(wrapper.vm.displayInvalidZipAlert).toBe(false);
+    });
+
+    it("Should prepopulate the zip on onModalOpened", async () => {
+        // Arrange
+        let serviceZipCodeQuestion = {
+            state: "IL",
+            zipCode: "61606",
+            isServiceable: true,
+        };
+
+        const zip = "123";
+
+        const wrapper = mount(serviceZipModalQuestion, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: serviceZipCodeQuestion,
+                linkWidgetName: linkWidgetName,
+                modalWidgetName: modalWidgetName,
+                textboxQuestionWidgetName: textboxQuestionWidgetName,
+            },
+            attachTo: document.body,
+        });
+
+        // Act
+        wrapper.vm.internalModel.zipCode = zip;
+        wrapper.vm.onModalOpened();
+
+        // Assert
+        expect(wrapper.vm.internalModel.zipCode).toEqual("61606");
     });
 });
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 4ca6990b3..ef8e00c1d 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -35,7 +35,7 @@
 <script>
 // Components
 import textLink from "@/ux-components/text-link/text-link";
-import serviceZipQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-question";
+import serviceZipQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question";
 import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
 
@@ -86,12 +86,11 @@ export default {
 
         resetsOnZipInput() {
             this.resetAlerts();
-            this.$refs[this.modalName].resetButtonStyle();
         },
 
         focusOnZipInput() {
             const input = document.getElementById(this.serviceZipCodeTextInputId);
-            input.focus();
+            input?.focus();
         },
 
         copyModel(modelToCopy) {
@@ -118,9 +117,15 @@ export default {
         },
 
         onModalOpened() {
+            this.internalModel.zipCode = this.modelValue.zipCode;
             this.focusOnZipInput();
         },
 
+        onModalClosed() {
+            this.internalModel.zipCode = this.modelValue.zipCode;
+            this.resetsOnZipInput();
+        },
+
         async setZipCode() {
             this.resetAlerts();
 
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.vue
similarity index 100%
rename from src/layouts/service-location/service-zip-modal-question/service-zip-question.vue
rename to src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.vue

From 48e5652a699edd88759fcf31e5e570de1175dd52 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 22 Feb 2023 14:41:27 -0500
Subject: [PATCH 181/261] Prettified

---
 src/digital-components/modal/modal.spec.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index ace7d49a5..bcd6303bd 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -114,7 +114,6 @@ describe("modal.vue", () => {
 
         // Assert
         expect(wrapper.vm.isFooterButtonDisabled).toBe(true);
-
     });
 
     it("Should have a disabled footer button when the form is invalid", async () => {
@@ -139,7 +138,6 @@ describe("modal.vue", () => {
 
         // Assert
         expect(wrapper.vm.isFooterButtonDisabled).toBe(true);
-
     });
 
     it("Should call bootstrap Modal method 'show' when calling 'openModal'", async () => {
@@ -151,8 +149,7 @@ describe("modal.vue", () => {
         useIsFormDirty.mockReturnValue(true);
         useIsFormValid.mockReturnValue(true);
 
-        const showMock = jest
-            .spyOn(Modal.prototype, "show");
+        const showMock = jest.spyOn(Modal.prototype, "show");
 
         const resetButtonStyle = jest.fn();
         const wrapper = shallowMount(modal, {
@@ -169,7 +166,6 @@ describe("modal.vue", () => {
 
         // Assert
         expect(showMock).toHaveBeenCalled();
-
     });
 
     it("Should call bootstrap Modal method 'hide' when calling 'closeModal'", async () => {
@@ -181,8 +177,7 @@ describe("modal.vue", () => {
         useIsFormDirty.mockReturnValue(true);
         useIsFormValid.mockReturnValue(true);
 
-        const hideMock = jest
-            .spyOn(Modal.prototype, "hide");
+        const hideMock = jest.spyOn(Modal.prototype, "hide");
 
         const resetButtonStyle = jest.fn();
         const wrapper = shallowMount(modal, {
@@ -200,7 +195,6 @@ describe("modal.vue", () => {
 
         // Assert
         expect(hideMock).toHaveBeenCalled();
-
     });
- 
+
 });

From 293c94640723c1a5a3ea2ea8e4d862c8b506725a Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 22 Feb 2023 15:02:17 -0500
Subject: [PATCH 182/261] Added unit test for rext-block changes

---
 .../text-block/text-block.spec.js                 | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/digital-components/text-block/text-block.spec.js b/src/digital-components/text-block/text-block.spec.js
index 3cd229449..170a91876 100644
--- a/src/digital-components/text-block/text-block.spec.js
+++ b/src/digital-components/text-block/text-block.spec.js
@@ -10,6 +10,18 @@ describe("modal.vue", () => {
         expect(wrapper.html()).toEqual(expect.stringContaining(mockCmsContent["Text"]));
     });
 
+    it("Should display the custom text when it is passed in", async () => {
+        // Act
+        const wrapper = shallowMount(TextBlock, {
+            mixins: [mockMixin],
+            props: {
+                customText: "customText"
+            }
+        });
+
+        expect(wrapper.html()).toEqual(expect.stringContaining("customText"));
+    });
+
     it("Should contain the typeStyle class as defined by the prop", async () => {
         // Act
         const wrapper = shallowMount(TextBlock, {
@@ -18,6 +30,7 @@ describe("modal.vue", () => {
         });
         expect(wrapper.html()).toEqual(expect.stringContaining(mockProps["typeStyle"]));
     });
+
     it("Should contain the justifyText class as defined by the prop", async () => {
         // Act
         const wrapper = shallowMount(TextBlock, {
@@ -26,6 +39,7 @@ describe("modal.vue", () => {
         });
         expect(wrapper.html()).toEqual(expect.stringContaining(mockProps["justifyText"]));
     });
+
     it("Should contain the fontWeight class as defined by the prop", async () => {
         // Act
         const wrapper = shallowMount(TextBlock, {
@@ -34,6 +48,7 @@ describe("modal.vue", () => {
         });
         expect(wrapper.html()).toEqual(expect.stringContaining(mockProps["fontWeight"]));
     });
+    
 });
 
 ///////////////

From 9a0f97bd0d301f34ba946c2e2d9924ce74d2ff6d Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 22 Feb 2023 15:13:37 -0500
Subject: [PATCH 183/261] Added removeLoader test for button-main

---
 .../button-main/button-main.spec.js           | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/ux-components/button-main/button-main.spec.js b/src/ux-components/button-main/button-main.spec.js
index b7fe7df09..32686a70a 100644
--- a/src/ux-components/button-main/button-main.spec.js
+++ b/src/ux-components/button-main/button-main.spec.js
@@ -77,6 +77,31 @@ describe("buttonMain.vue", () => {
         const loader = wrapper.find("loader-stub");
         expect(loader.attributes("class")).toContain("right");
     });
+
+    it("Should set 'isLoaderDisplayed' to false when calling 'removeLoader'", async () => {
+        // Arrange
+        const wrapper = shallowMount(
+            buttonMain,
+            setupMocks({
+                props: {
+                    loaderPosition: "right",
+                    loaderEnabled: true,
+                },
+            })
+        );
+
+        wrapper.setData({
+            isLoaderDisplayed: true
+        });
+
+        // Act
+        wrapper.vm.removeLoader();
+        await nextTick();
+
+        // Assert
+        const loader = wrapper.find("loader-stub");
+        expect(wrapper.vm.isLoaderDisplayed).toBe(false);
+    });
 });
 
 function setupMocks(mountOptionsMockData = {}) {

From 0f9c76e8b7cf812e90cba9cc7c65b1e0a527ea50 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 22 Feb 2023 15:46:34 -0500
Subject: [PATCH 184/261] button-main tests to 100%

---
 .../button-main/button-main.spec.js           | 76 +++++++++++++++++++
 src/ux-components/button-main/button-main.vue |  1 +
 2 files changed, 77 insertions(+)

diff --git a/src/ux-components/button-main/button-main.spec.js b/src/ux-components/button-main/button-main.spec.js
index 32686a70a..c746bb24d 100644
--- a/src/ux-components/button-main/button-main.spec.js
+++ b/src/ux-components/button-main/button-main.spec.js
@@ -102,6 +102,82 @@ describe("buttonMain.vue", () => {
         const loader = wrapper.find("loader-stub");
         expect(wrapper.vm.isLoaderDisplayed).toBe(false);
     });
+
+    it("Should set 'isLoaderDisplayed' to false when calling 'resetButtonStyle'", async () => {
+        // Arrange
+        const wrapper = shallowMount(
+            buttonMain,
+            setupMocks({
+                props: {
+                    loaderPosition: "right",
+                    loaderEnabled: true,
+                },
+            })
+        );
+
+        wrapper.setData({
+            isLoaderDisplayed: true
+        });
+
+        // Act
+        wrapper.vm.resetButtonStyle();
+        await nextTick();
+
+        // Assert
+        expect(wrapper.vm.isLoaderDisplayed).toBe(false);
+
+    });
+
+    it("Should emit 'click-event' event when clicking if the button is enabled", async () => {
+        // Arrange
+        const wrapper = shallowMount(
+            buttonMain,
+            setupMocks({
+                props: {
+                    loaderPosition: "right",
+                    loaderEnabled: true,
+                    isDisabled: false
+                },
+            })
+        );
+
+
+        const buttonElement = wrapper.find("button");
+
+        // Act        
+        buttonElement.trigger("click");
+
+        await nextTick();
+
+        // Assert
+        expect(wrapper.emitted("click-event")).toBeTruthy();
+
+    });
+
+    it("Should not emit 'click-event' event when clicking if the button is disabled", async () => {
+        // Arrange
+        const wrapper = shallowMount(
+            buttonMain,
+            setupMocks({
+                props: {
+                    loaderPosition: "right",
+                    loaderEnabled: true,
+                    isDisabled: true
+                },
+            })
+        );
+
+        const buttonElement = wrapper.find("button");
+
+        // Act        
+        buttonElement.trigger("click");
+
+        await nextTick();
+
+        // Assert
+        expect(wrapper.emitted("click-event")).toBeFalsy();
+
+    });
 });
 
 function setupMocks(mountOptionsMockData = {}) {
diff --git a/src/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue
index 18d7427c2..41edc21cb 100644
--- a/src/ux-components/button-main/button-main.vue
+++ b/src/ux-components/button-main/button-main.vue
@@ -47,6 +47,7 @@ export default {
                 true
             );
             if (!this.isDisabled) {
+                console.log("I'm here");
                 this.isLoaderDisplayed = true;
                 this.$emit("click-event");
             }

From c344cf8658068ab469d6ba621b27cf0cde7cdc23 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 22 Feb 2023 15:58:55 -0500
Subject: [PATCH 185/261] Added service-zip-question tests

---
 .../service-zip-question.spec.js              | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js
new file mode 100644
index 000000000..d6b861a75
--- /dev/null
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js
@@ -0,0 +1,41 @@
+import { shallowMount } from "@vue/test-utils";
+import serviceZipQuestion from "./service-zip-question";
+
+describe("service-zip-question.vue", () => {
+    it("Should get the modelValue", async () => {
+        // Arrange
+        const text = "test";
+        const wrapper = shallowMount(serviceZipQuestion, {
+            props: {
+                modelValue: text,
+            },
+            attachTo: document.body,
+        });
+
+        // Act
+        const modelValueText = wrapper.vm.value;
+        wrapper.vm.value = "test also"
+
+        // Assert
+        expect(modelValueText).toEqual("test");
+    });
+
+    it("Should emit to set value", async () => {
+        // Arrange
+        const text = "test";
+        const wrapper = shallowMount(serviceZipQuestion, {
+            props: {
+                modelValue: text,
+            },
+            attachTo: document.body,
+        });
+
+        // Act
+        const modelValueText = wrapper.vm.value;
+        wrapper.vm.value = "test also"
+
+        // Assert
+        expect(wrapper.emitted("update:modelValue")).toEqual([["test also"]]);
+    })
+    
+});

From 07a54cbf291049cd43affe3d88708c08ffafe95a Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 23 Feb 2023 07:53:17 -0500
Subject: [PATCH 186/261] Added vehicle-protected-question unit tests

---
 src/digital-components/modal/modal.spec.js    |  1 -
 .../text-block/text-block.spec.js             |  5 +-
 .../vehicle-protected-question.spec.js        | 72 +++++++++++++++++++
 .../service-zip-question.spec.js              |  7 +-
 .../button-main/button-main.spec.js           | 16 ++---
 5 files changed, 83 insertions(+), 18 deletions(-)
 create mode 100644 src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.spec.js

diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index bcd6303bd..b738ac6ae 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -196,5 +196,4 @@ describe("modal.vue", () => {
         // Assert
         expect(hideMock).toHaveBeenCalled();
     });
-
 });
diff --git a/src/digital-components/text-block/text-block.spec.js b/src/digital-components/text-block/text-block.spec.js
index 170a91876..89b2fdf36 100644
--- a/src/digital-components/text-block/text-block.spec.js
+++ b/src/digital-components/text-block/text-block.spec.js
@@ -15,8 +15,8 @@ describe("modal.vue", () => {
         const wrapper = shallowMount(TextBlock, {
             mixins: [mockMixin],
             props: {
-                customText: "customText"
-            }
+                customText: "customText",
+            },
         });
 
         expect(wrapper.html()).toEqual(expect.stringContaining("customText"));
@@ -48,7 +48,6 @@ describe("modal.vue", () => {
         });
         expect(wrapper.html()).toEqual(expect.stringContaining(mockProps["fontWeight"]));
     });
-    
 });
 
 ///////////////
diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.spec.js b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.spec.js
new file mode 100644
index 000000000..c1e246707
--- /dev/null
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.spec.js
@@ -0,0 +1,72 @@
+import { shallowMount } from "@vue/test-utils";
+import vehicleProtectedQuestion from "./vehicle-protected-question";
+
+jest.mock("@/digital-components/textbox-question/textbox-question", () => ({
+    getCmsContent: jest.fn(),
+}));
+
+const mockMixin = {
+    methods: {
+        getCmsContent: jest.fn((widgetName, cmsFieldName) => {
+            if (cmsFieldName === "Answers") {
+                return [
+                    {
+                        "AnswerImageUrl": "",
+                        "Name": "YesAnswer",
+                        "SubText": "",
+                        "SubWidgetName": "",
+                        "Text": "Yes"
+                    },
+                    {
+                        "AnswerImageUrl": "",
+                        "Name": "NoAnswer",
+                        "SubText": "",
+                        "SubWidgetName": "",
+                        "Text": "No"
+                    }
+                ]
+            }
+            return "QuestionText";
+        }),
+    },
+};
+
+describe("service-zip-question.vue", () => {
+    it("Should get the modelValue", async () => {
+        // Arrange
+        const answer = "YesAnswer";
+        const wrapper = shallowMount(vehicleProtectedQuestion, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: answer,
+            },
+            attachTo: document.body,
+        });
+
+        // Act
+        const modelValueAnswer = wrapper.vm.selectedValue;
+
+        // Assert
+        expect(modelValueAnswer).toEqual(answer);
+
+    });
+
+    it("Should emit to set value", async () => {
+        // Arrange
+        const yesAnswer = "YesAnswer";
+        const noAnswer = "NoAnswer"
+        const wrapper = shallowMount(vehicleProtectedQuestion, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: yesAnswer,
+            },
+            attachTo: document.body,
+        });
+
+        // Act
+        wrapper.vm.selectedValue = noAnswer;
+
+        // Assert
+        expect(wrapper.emitted("update:modelValue")).toEqual([[noAnswer]]);
+    });
+});
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js
index d6b861a75..b51ecc9d3 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js
@@ -14,7 +14,7 @@ describe("service-zip-question.vue", () => {
 
         // Act
         const modelValueText = wrapper.vm.value;
-        wrapper.vm.value = "test also"
+        wrapper.vm.value = "test also";
 
         // Assert
         expect(modelValueText).toEqual("test");
@@ -32,10 +32,9 @@ describe("service-zip-question.vue", () => {
 
         // Act
         const modelValueText = wrapper.vm.value;
-        wrapper.vm.value = "test also"
+        wrapper.vm.value = "test also";
 
         // Assert
         expect(wrapper.emitted("update:modelValue")).toEqual([["test also"]]);
-    })
-    
+    });
 });
diff --git a/src/ux-components/button-main/button-main.spec.js b/src/ux-components/button-main/button-main.spec.js
index c746bb24d..41e244a72 100644
--- a/src/ux-components/button-main/button-main.spec.js
+++ b/src/ux-components/button-main/button-main.spec.js
@@ -91,7 +91,7 @@ describe("buttonMain.vue", () => {
         );
 
         wrapper.setData({
-            isLoaderDisplayed: true
+            isLoaderDisplayed: true,
         });
 
         // Act
@@ -116,7 +116,7 @@ describe("buttonMain.vue", () => {
         );
 
         wrapper.setData({
-            isLoaderDisplayed: true
+            isLoaderDisplayed: true,
         });
 
         // Act
@@ -125,7 +125,6 @@ describe("buttonMain.vue", () => {
 
         // Assert
         expect(wrapper.vm.isLoaderDisplayed).toBe(false);
-
     });
 
     it("Should emit 'click-event' event when clicking if the button is enabled", async () => {
@@ -136,22 +135,20 @@ describe("buttonMain.vue", () => {
                 props: {
                     loaderPosition: "right",
                     loaderEnabled: true,
-                    isDisabled: false
+                    isDisabled: false,
                 },
             })
         );
 
-
         const buttonElement = wrapper.find("button");
 
-        // Act        
+        // Act
         buttonElement.trigger("click");
 
         await nextTick();
 
         // Assert
         expect(wrapper.emitted("click-event")).toBeTruthy();
-
     });
 
     it("Should not emit 'click-event' event when clicking if the button is disabled", async () => {
@@ -162,21 +159,20 @@ describe("buttonMain.vue", () => {
                 props: {
                     loaderPosition: "right",
                     loaderEnabled: true,
-                    isDisabled: true
+                    isDisabled: true,
                 },
             })
         );
 
         const buttonElement = wrapper.find("button");
 
-        // Act        
+        // Act
         buttonElement.trigger("click");
 
         await nextTick();
 
         // Assert
         expect(wrapper.emitted("click-event")).toBeFalsy();
-
     });
 });
 

From 3399ef24a046cea060c3e18050d9905119bf9f85 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Thu, 23 Feb 2023 08:09:53 -0500
Subject: [PATCH 187/261] CSR-1212

reworked to be more specific so it doesn't pass prereq for an empty array
---
 src/layouts/vehicle-parts/vehicle-parts.vue | 6 ++++--
 vue.config.js                               | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 1c35f96fa..3c2978744 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -149,10 +149,12 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             // Check if isRepair is populated and if the pageData we need is here (Parts data)
+            const vehiclePartsFromPageData = store.getters.pageData(
+                fmgPageValues.VEHICLE_PARTS
+            );
             return (
                 store.getters.damage.isRepair != null &&
-                store.getters.pageData(fmgPageValues.VEHICLE_PARTS) &&
-                Object.keys(store.getters.pageData(fmgPageValues.VEHICLE_PARTS)).length !== 0
+                vehiclePartsFromPageData?.partsOrQuestions?.some((part) => part?.glassName)
             );
         },
         async forwardButtonAction() {
diff --git a/vue.config.js b/vue.config.js
index 64c83dd9e..e87582db2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,7 +1,7 @@
 process.env.VUE_APP_CONSUMER_CF_DISTRO =
   "https://digitalapi.dev.safelite.io";
 process.env.VUE_APP_HERITAGE_FUNNEL =
-  "http://localhost:38000/default.aspx";
+  "http://localhost/default.aspx";
 process.env.VUE_APP_GOOGLE_PLACES_API_KEY = 
   "AIzaSyDptGCkOPgN2uWJOy4ou4M33phRD4MAoJo";
 process.env.VUE_APP_CURRENT_ENVIRONMENT = "Localhost";

From 4fff8b9f6b82b2cf505b9e6f8a5b30cfb36a588e Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Thu, 23 Feb 2023 08:18:12 -0500
Subject: [PATCH 188/261] CSR-1212 add back port

---
 vue.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vue.config.js b/vue.config.js
index e87582db2..64c83dd9e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,7 +1,7 @@
 process.env.VUE_APP_CONSUMER_CF_DISTRO =
   "https://digitalapi.dev.safelite.io";
 process.env.VUE_APP_HERITAGE_FUNNEL =
-  "http://localhost/default.aspx";
+  "http://localhost:38000/default.aspx";
 process.env.VUE_APP_GOOGLE_PLACES_API_KEY = 
   "AIzaSyDptGCkOPgN2uWJOy4ou4M33phRD4MAoJo";
 process.env.VUE_APP_CURRENT_ENVIRONMENT = "Localhost";

From 36bebf1e0d7dc5a949095f29fec173ef410bbcf5 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Thu, 23 Feb 2023 08:25:34 -0500
Subject: [PATCH 189/261] CSR-1212 prettier

---
 src/layouts/vehicle-parts/vehicle-parts.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue
index 3c2978744..e06604a4a 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.vue
+++ b/src/layouts/vehicle-parts/vehicle-parts.vue
@@ -149,9 +149,7 @@ export default {
     methods: {
         arePagePrerequisitesValid() {
             // Check if isRepair is populated and if the pageData we need is here (Parts data)
-            const vehiclePartsFromPageData = store.getters.pageData(
-                fmgPageValues.VEHICLE_PARTS
-            );
+            const vehiclePartsFromPageData = store.getters.pageData(fmgPageValues.VEHICLE_PARTS);
             return (
                 store.getters.damage.isRepair != null &&
                 vehiclePartsFromPageData?.partsOrQuestions?.some((part) => part?.glassName)

From fbbb92c855da40777f1a53aebd67340957ce7423 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 23 Feb 2023 08:51:07 -0500
Subject: [PATCH 190/261] Added .spec file for mobile-location-question

---
 .../mobile-location-modal-questions.spec.js   | 98 +++++++++++++++++++
 .../vehicle-protected-question.spec.js        | 27 +++--
 2 files changed, 111 insertions(+), 14 deletions(-)
 create mode 100644 src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
new file mode 100644
index 000000000..9dde622fe
--- /dev/null
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
@@ -0,0 +1,98 @@
+import { mount, shallowMount } from "@vue/test-utils";
+import mobileLocationModalQuestions from "./mobile-location-modal-questions";
+import crypto from "crypto";
+global.crypto = crypto;
+
+// const linkWidgetName = "linkWidgetName";
+// const modalWidgetName = "modalWidgetName";
+// const mobileFeeDisclaimerWidgetName = "MobileFeeDisclaimerWidget";
+// const workspaceRequirementsWidgetName = "WorkspaceRequirementsWidget";
+
+// const mockLinkCmsContent = {
+//     BodyText: "Sample link body text here.",
+// };
+
+// const mockModalCmsContent = {
+//     FooterText: "Sample modal footer text here.",
+// };
+
+// const mockMobileFeeCmsContent = {
+//     Text: "This is the price {custom:mobileFee}",
+// };
+
+const mockMixin = {
+    methods: {
+        getCmsContent: jest.fn((widgetName, cmsFieldName) => {
+            if (widgetName === linkWidgetName) {
+                return mockLinkCmsContent[cmsFieldName];
+            }
+
+            if (widgetName === modalWidgetName) {
+                return mockModalCmsContent[cmsFieldName];
+            }
+
+            if (widgetName === mobileFeeDisclaimerWidgetName) {
+                return mockMobileFeeCmsContent[cmsFieldName];
+            }
+
+            return null;
+        }),
+
+        getZipCodeData: jest.fn((zip) => {
+            if (zip === "43235") {
+                return {
+                    containsMilitaryBase: false,
+                    isServiceable: true,
+                    isValid: true,
+                    state: "OH",
+                    zipCodeCtu: "01820",
+                };
+            }
+
+            if (zip === "61606") {
+                return {
+                    containsMilitaryBase: false,
+                    isServiceable: true,
+                    isValid: true,
+                    state: "IL",
+                    zipCodeCtu: "01526",
+                };
+            }
+
+            return {
+                containsMilitaryBase: false,
+                isServiceable: false,
+                isValid: false,
+                state: null,
+                zipCodeCtu: null,
+            };
+        }),
+    },
+};
+
+describe("mobile-location-modal-questions.vue", () => {
+    it("Initial state on load with no existing location info", async () => {
+        let mobileLocationQuestions = {
+            addressQuestions: {
+                streetAddress: "",
+                apartmentNumberOrBusinessName: "",
+                city: "",
+                state: "",
+                zipCode: "",
+            },
+            isVehicleProtected: null,
+        };
+
+        // Arrange
+        const wrapper = shallowMount(mobileLocationModalQuestions, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: mobileLocationQuestions,
+            },
+            attachTo: document.body,
+        });
+
+        // Assert
+        //expect(wrapper.html()).toEqual(expect.stringContaining(mockLinkCmsContent["BodyText"]));
+    });
+});
diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.spec.js b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.spec.js
index c1e246707..72d299198 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.spec.js
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.spec.js
@@ -11,20 +11,20 @@ const mockMixin = {
             if (cmsFieldName === "Answers") {
                 return [
                     {
-                        "AnswerImageUrl": "",
-                        "Name": "YesAnswer",
-                        "SubText": "",
-                        "SubWidgetName": "",
-                        "Text": "Yes"
+                        AnswerImageUrl: "",
+                        Name: "YesAnswer",
+                        SubText: "",
+                        SubWidgetName: "",
+                        Text: "Yes",
                     },
                     {
-                        "AnswerImageUrl": "",
-                        "Name": "NoAnswer",
-                        "SubText": "",
-                        "SubWidgetName": "",
-                        "Text": "No"
-                    }
-                ]
+                        AnswerImageUrl: "",
+                        Name: "NoAnswer",
+                        SubText: "",
+                        SubWidgetName: "",
+                        Text: "No",
+                    },
+                ];
             }
             return "QuestionText";
         }),
@@ -48,13 +48,12 @@ describe("service-zip-question.vue", () => {
 
         // Assert
         expect(modelValueAnswer).toEqual(answer);
-
     });
 
     it("Should emit to set value", async () => {
         // Arrange
         const yesAnswer = "YesAnswer";
-        const noAnswer = "NoAnswer"
+        const noAnswer = "NoAnswer";
         const wrapper = shallowMount(vehicleProtectedQuestion, {
             mixins: [mockMixin],
             props: {

From aac52bb52e5f6ace1693c13b6fa255cf0adfa930 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Feb 2023 14:59:03 +0000
Subject: [PATCH 191/261] Bump decode-uri-component from 0.2.0 to 0.2.2

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d7fc25822..6520695b5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8828,9 +8828,9 @@
       }
     },
     "node_modules/decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "dev": true,
       "engines": {
         "node": ">=0.10"
@@ -31432,9 +31432,9 @@
       "dev": true
     },
     "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
       "dev": true
     },
     "deep-equal": {

From 80719416a03b6f3166a28b03e5a92e08a161cd6e Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 23 Feb 2023 10:54:22 -0500
Subject: [PATCH 192/261] CSR-1012 unit test and cms prop updates

---
 src/digital-components/modal/modal.spec.js     |  1 -
 .../text-block/text-block.spec.js              |  5 ++---
 .../service-location/service-location.vue      |  4 +---
 .../service-zip-modal-question.spec.js         | 18 ------------------
 .../service-zip-modal-question.vue             | 11 ++++++-----
 .../service-zip-question.spec.js               |  7 +++----
 6 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/src/digital-components/modal/modal.spec.js b/src/digital-components/modal/modal.spec.js
index bcd6303bd..b738ac6ae 100644
--- a/src/digital-components/modal/modal.spec.js
+++ b/src/digital-components/modal/modal.spec.js
@@ -196,5 +196,4 @@ describe("modal.vue", () => {
         // Assert
         expect(hideMock).toHaveBeenCalled();
     });
-
 });
diff --git a/src/digital-components/text-block/text-block.spec.js b/src/digital-components/text-block/text-block.spec.js
index 170a91876..89b2fdf36 100644
--- a/src/digital-components/text-block/text-block.spec.js
+++ b/src/digital-components/text-block/text-block.spec.js
@@ -15,8 +15,8 @@ describe("modal.vue", () => {
         const wrapper = shallowMount(TextBlock, {
             mixins: [mockMixin],
             props: {
-                customText: "customText"
-            }
+                customText: "customText",
+            },
         });
 
         expect(wrapper.html()).toEqual(expect.stringContaining("customText"));
@@ -48,7 +48,6 @@ describe("modal.vue", () => {
         });
         expect(wrapper.html()).toEqual(expect.stringContaining(mockProps["fontWeight"]));
     });
-    
 });
 
 ///////////////
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 6406519dd..1e9dc6597 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -8,9 +8,7 @@
                 v-model="serviceZipCodeQuestion"
                 @service-zip-updated="resetMobileLocation"
                 linkWidgetName="ServiceZipLinkWidget"
-                modalWidgetName="ServiceZipModalWidget"
-                textboxQuestionWidgetName="ServiceZipQuestionWidget"
-                alertInvalidZipWidgetName="AlertInvalidZipWidget" />
+                modalWidgetName="ServiceZipModalWidget" />
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
                 ref="mobileLocationModalQuestions"
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
index 4a0dec045..3c2384944 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -17,7 +17,6 @@ jest.mock("@/digital-components/modal/modal", () => ({
 
 const linkWidgetName = "linkWidgetName";
 const modalWidgetName = "modalWidgetName";
-const textboxQuestionWidgetName = "textboxQuestionWidgetName";
 
 const mockLinkCmsContent = {
     BodyText: "Sample link body text here.",
@@ -27,10 +26,6 @@ const mockModalCmsContent = {
     FooterText: "Sample modal footer text here.",
 };
 
-const mockTextboxQuestionCmsContent = {
-    QuestionText: "Sample question text here.",
-};
-
 const mockMixin = {
     methods: {
         getCmsContent: jest.fn((widgetName, cmsFieldName) => {
@@ -42,10 +37,6 @@ const mockMixin = {
                 return mockModalCmsContent[cmsFieldName];
             }
 
-            if (widgetName === textboxQuestionWidgetName) {
-                return mockTextboxQuestionCmsContent[cmsFieldName];
-            }
-
             return null;
         }),
 
@@ -96,7 +87,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -119,7 +109,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -144,7 +133,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -175,7 +163,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -204,7 +191,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -233,7 +219,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -262,7 +247,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -291,7 +275,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
@@ -321,7 +304,6 @@ describe("service-zip-modal-question.vue", () => {
                 modelValue: serviceZipCodeQuestion,
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
-                textboxQuestionWidgetName: textboxQuestionWidgetName,
             },
             attachTo: document.body,
         });
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index ef8e00c1d..271c69930 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -59,10 +59,14 @@ export default {
         },
         linkWidgetName: String,
         modalWidgetName: String,
-        textboxQuestionWidgetName: String,
-        alertInvalidZipWidgetName: String,
     },
     computed: {
+        textboxQuestionWidgetName() {
+            return "ServiceZipQuestionWidget";
+        },
+        alertInvalidZipWidgetName() {
+            return "AlertInvalidZipWidget";
+        },
         serviceZipLinkText() {
             if (this.modelValue.zipCode && this.modelValue.zipCode.length > 0) {
                 return this.modelValue.state + ", " + this.modelValue.zipCode;
@@ -111,9 +115,6 @@ export default {
 
         onInputIdAssigned(inputId) {
             this.serviceZipCodeTextInputId = inputId;
-
-            // bubble up the event to the parent
-            this.$emit("textboxQuestionEvent.inputIdAssigned", inputId);
         },
 
         onModalOpened() {
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js
index d6b861a75..b51ecc9d3 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.spec.js
@@ -14,7 +14,7 @@ describe("service-zip-question.vue", () => {
 
         // Act
         const modelValueText = wrapper.vm.value;
-        wrapper.vm.value = "test also"
+        wrapper.vm.value = "test also";
 
         // Assert
         expect(modelValueText).toEqual("test");
@@ -32,10 +32,9 @@ describe("service-zip-question.vue", () => {
 
         // Act
         const modelValueText = wrapper.vm.value;
-        wrapper.vm.value = "test also"
+        wrapper.vm.value = "test also";
 
         // Assert
         expect(wrapper.emitted("update:modelValue")).toEqual([["test also"]]);
-    })
-    
+    });
 });

From 3f99650208cc9346d324cc434b87522a7cfd4b44 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Thu, 23 Feb 2023 15:37:55 -0500
Subject: [PATCH 193/261] Unit Tests (Quote Page)

Also refactored one store action name.
---
 src/constants/store-actions.js                |   2 +-
 src/layouts/quote/quote.spec.js               | 305 +++++++++++++++++-
 src/layouts/quote/quote.vue                   |   2 +-
 .../service-location/service-location.spec.js |  21 --
 src/store/index.js                            |   2 +-
 5 files changed, 302 insertions(+), 30 deletions(-)

diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 428280d40..d82f01232 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -31,7 +31,7 @@ const storeActions = {
     LOAD_SESSION: "loadSession",
     UPDATE_STORE_WITH_SAVE_SESSION_RESPONSE: "updateStoreWithSaveSessionResponse",
     VALIDATE_ZIP: "validateZip",
-    PRICE_ORDER_ITEMS: "priceOrderItems",
+    PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA: "priceOrderItemsAndSaveServerData",
     LOG_EXPERIMENT_EXPOSURE: "logExperimentExposure",
     LOG_PAGE_VIEW: "logPageView",
     LOG_CUSTOM_EVENT: "logCustomEvent",
diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
index dccc73346..edfdbc8b0 100644
--- a/src/layouts/quote/quote.spec.js
+++ b/src/layouts/quote/quote.spec.js
@@ -1,23 +1,20 @@
 import { shallowMount, flushPromises } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
 import { applicationConfig } from "@/constants/application-config";
+import { storeActions } from "@/constants/store-actions";
 import quote from "@/layouts/quote/quote.vue";
 import store from "@/store";
 import * as navigateToHeritage from "@/helpers/heritage-integration/navigation-helper";
+import { nextTick } from "vue";
 
 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(),
+    fetchCmsContentForPage: () => Promise.resolve("content"),
 }));
 
 jest.mock("@/helpers/heritage-integration/navigation-helper", () => ({
@@ -32,6 +29,38 @@ jest.mock(
     { virtual: true }
 );
 
+// START beforeRouteEnter mock arranging //
+jest.mock("@/mixins/base-mixin", () => ({
+    methods: {
+        dispatchStoreAction(action, items, encode) {
+            if (action === mockPriceOrderStoreAction) return items;
+            else return mockStoreActionResults[action];
+        },
+        getTierOnePackagePrice() {
+            return mockTierOnePrice;
+        },
+        filterOutFees() {
+            return null;
+        },
+    },
+}));
+let mockTierOnePrice = 501;
+
+const mockPriceOrderStoreAction = storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA;
+const mockStoreActionResults = {};
+
+mockStoreActionResults[storeActions.GET_WIPERS] = Promise.resolve([
+    { partNumber: "SBB24", partType: "FRONT WIPER" },
+]);
+mockStoreActionResults[storeActions.GET_RAIN_DEFENSE] = Promise.resolve({
+    partNumber: "RAIN DEFENSE",
+    partType: "RAIN DEFENSE",
+});
+mockStoreActionResults[storeActions.GET_SUPPORTING_ITEMS] = Promise.resolve([
+    { partNumber: "WSREPAIR", partType: "WSREPAIR" },
+]);
+// END beforeRouteEnter mock arranging
+
 store.getters = {
     order: {
         accountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
@@ -117,6 +146,269 @@ describe("quote.vue", () => {
         //Assert
         expect(navigateToHeritage.navigateToHeritageFunnel).toHaveBeenCalled();
     });
+    test("should pass arePagePrerequisitesValid with a repair order", () => {
+        //Arrange
+        const { wrapper } = setupMocks({});
+        store.getters = {
+            order: {
+                serviceLocation: {
+                    zipCode: "12345",
+                    zipCodeCtu: "value",
+                },
+                damage: {
+                    isRepair: true,
+                },
+                referralNumber: "1234567",
+            },
+        };
+
+        let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid();
+
+        expect(arePagePrerequisitesValid).toBe(true);
+    });
+    test("should pass arePagePrerequisitesValid with a replace order", () => {
+        //Arrange
+        const { wrapper } = setupMocks({});
+        store.getters = {
+            order: {
+                serviceLocation: {
+                    zipCode: "12345",
+                    zipCodeCtu: "value",
+                },
+                damage: {
+                    isRepair: false,
+                },
+                referralNumber: "1234567",
+                lineItems: {
+                    glassParts: ["item", "item2"],
+                },
+            },
+        };
+
+        let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid();
+
+        expect(arePagePrerequisitesValid).toBe(true);
+    });
+    test("should fail arePagePrerequisitesValid without glass parts or flagged as repair", () => {
+        //Arrange
+        const { wrapper } = setupMocks({});
+        store.getters = {
+            order: {
+                serviceLocation: {
+                    zipCode: "12345",
+                    zipCodeCtu: "value",
+                },
+                damage: {
+                    isRepair: false,
+                },
+                referralNumber: "1234567",
+            },
+        };
+
+        let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid();
+
+        expect(arePagePrerequisitesValid).toBe(false);
+    });
+    test("should have non-null values for necessary data members after 'beforeRouteEnter'", async () => {
+        //Arrange
+        const { wrapper } = setupMocks({});
+
+        store.getters = {
+            order: {
+                lineItems: {
+                    glassParts: ["item", "item2"],
+                },
+            },
+        };
+
+        //mock this to avoid needing to populate this.$route in an unrelated test
+        wrapper.vm.getDefaultIsInsuranceSelectedValue = jest.fn();
+
+        //Act
+        await quote.beforeRouteEnter.call(
+            wrapper.vm,
+            { query: { fmgPage: "quote" } },
+            undefined,
+            (c) => c(wrapper.vm)
+        );
+
+        //Assert
+        expect(wrapper.vm.pricedGlassParts !== null).toBe(true);
+        expect(wrapper.vm.supportingItems !== null).toBe(true);
+        expect(wrapper.vm.availableLineItems !== null).toBe(true);
+        // This should have its own test
+        //expect(vm.isInsuranceSelected !== null).toBe(true);
+    });
+    test("should default to insurance if query param 'isInsurance' is true", async () => {
+        //Arrange
+        const { wrapper } = setupMocks({});
+
+        store.getters = {
+            order: {
+                lineItems: {
+                    glassParts: ["item", "item2"],
+                },
+                payment: {
+                    isInsurance: null,
+                },
+            },
+        };
+        wrapper.vm.$route = { query: { isInsurance: "true" } };
+
+        //Act
+        await quote.beforeRouteEnter.call(
+            wrapper.vm,
+            { query: { fmgPage: "quote" } },
+            undefined,
+            (c) => c(wrapper.vm)
+        );
+
+        //Assert
+        expect(wrapper.vm.isInsuranceSelected).toBe(true);
+    });
+    test("should default to cash if query param 'isInsurance' is false", async () => {
+        //Arrange
+        const { wrapper } = setupMocks({});
+
+        store.getters = {
+            order: {
+                lineItems: {
+                    glassParts: ["item", "item2"],
+                },
+                payment: {
+                    isInsurance: null,
+                },
+            },
+        };
+        wrapper.vm.$route = { query: { isInsurance: "false" } };
+
+        //Act
+        await quote.beforeRouteEnter.call(
+            wrapper.vm,
+            { query: { fmgPage: "quote" } },
+            undefined,
+            (c) => c(wrapper.vm)
+        );
+
+        //Assert
+        expect(wrapper.vm.isInsuranceSelected).toBe(false);
+    });
+    test("should default to insurance if insurance selection is saved to store", async () => {
+        //Arrange
+        const { wrapper } = setupMocks({});
+
+        store.getters = {
+            order: {
+                lineItems: {
+                    glassParts: ["item", "item2"],
+                },
+                payment: {
+                    isInsurance: true,
+                },
+            },
+        };
+        // Ensure that query param isn't overriding selection
+        wrapper.vm.$route = { query: null };
+
+        //Act
+        await quote.beforeRouteEnter.call(
+            wrapper.vm,
+            { query: { fmgPage: "quote" } },
+            undefined,
+            (c) => c(wrapper.vm)
+        );
+
+        //Assert
+        expect(wrapper.vm.isInsuranceSelected).toBe(true);
+    });
+    test("should default to cash if cash selection is saved to store", async () => {
+        //Arrange
+        const { wrapper } = setupMocks({});
+
+        store.getters = {
+            order: {
+                lineItems: {
+                    glassParts: ["item", "item2"],
+                },
+                payment: {
+                    isInsurance: false,
+                },
+            },
+        };
+        // Ensure that query param isn't overriding selection
+        wrapper.vm.$route = { query: null };
+
+        //Act
+        await quote.beforeRouteEnter.call(
+            wrapper.vm,
+            { query: { fmgPage: "quote" } },
+            undefined,
+            (c) => c(wrapper.vm)
+        );
+
+        //Assert
+        expect(wrapper.vm.isInsuranceSelected).toBe(false);
+    });
+    test("should default to cash if total economy package price is under $500", async () => {
+        // Also needs no query parameter or previous selection in store to be present
+        //Arrange
+        const { wrapper } = setupMocks({});
+
+        store.getters = {
+            order: {
+                lineItems: {
+                    glassParts: ["item", "item2"],
+                },
+                payment: {
+                    isInsurance: null, // Ensure that previous selection isn't overriding selection
+                },
+            },
+        };
+        mockTierOnePrice = 200;
+        // Ensure that query param isn't overriding selection
+        wrapper.vm.$route = { query: null };
+
+        //Act
+        await quote.beforeRouteEnter.call(
+            wrapper.vm,
+            { query: { fmgPage: "quote" } },
+            undefined,
+            (c) => c(wrapper.vm)
+        );
+
+        //Assert
+        expect(wrapper.vm.isInsuranceSelected).toBe(false);
+    });
+    test("should default to insurance if total economy package price is over $500", async () => {
+        // Also needs no query parameter or previous selection in store to be present
+        //Arrange
+        const { wrapper } = setupMocks({});
+
+        store.getters = {
+            order: {
+                lineItems: {
+                    glassParts: ["item", "item2"],
+                },
+                payment: {
+                    isInsurance: null, // Ensure that previous selection isn't overriding selection
+                },
+            },
+        };
+        mockTierOnePrice = 505;
+        // Ensure that query param isn't overriding selection
+        wrapper.vm.$route = { query: null };
+
+        //Act
+        await quote.beforeRouteEnter.call(
+            wrapper.vm,
+            { query: { fmgPage: "quote" } },
+            undefined,
+            (c) => c(wrapper.vm)
+        );
+
+        //Assert
+        expect(wrapper.vm.isInsuranceSelected).toBe(true);
+    });
 });
 
 function setupMocks({ customMountOptions }) {
@@ -128,5 +420,6 @@ function setupMocks({ customMountOptions }) {
     mountOptions["attachTo"] = document.body;
 
     const wrapper = shallowMount(quote, mountOptions);
+    wrapper.vm.setCmsContent = jest.fn();
     return { wrapper };
 }
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 786b046b9..52b8f2687 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -113,7 +113,7 @@ export default {
         ];
 
         const pricingResults = await baseMixin.methods.dispatchStoreAction(
-            storeActions.PRICE_ORDER_ITEMS,
+            storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
             availableLineItems,
             false
         );
diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index a1f44936b..a7093cef0 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -90,13 +90,6 @@ describe("service-location.vue", () => {
                 },
             };
 
-            serviceLocation.beforeRouteEnter.call(
-                wrapper.vm,
-                { query: { fmgPage: "service-location" } },
-                undefined,
-                (c) => c(wrapper.vm)
-            );
-
             let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid();
 
             expect(arePagePrerequisitesValid).toBe(false);
@@ -105,13 +98,6 @@ describe("service-location.vue", () => {
         test("All prerequisites set: Should return true.", () => {
             const { wrapper } = setupMocks({});
 
-            serviceLocation.beforeRouteEnter.call(
-                wrapper.vm,
-                { query: { fmgPage: "service-location" } },
-                undefined,
-                (c) => c(wrapper.vm)
-            );
-
             let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid();
 
             expect(arePagePrerequisitesValid).toBe(true);
@@ -122,13 +108,6 @@ describe("service-location.vue", () => {
 
             store.getters.order.serviceLocation.zipCode = null;
 
-            serviceLocation.beforeRouteEnter.call(
-                wrapper.vm,
-                { query: { fmgPage: "service-location" } },
-                undefined,
-                (c) => c(wrapper.vm)
-            );
-
             let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid();
 
             expect(arePagePrerequisitesValid).toBe(false);
diff --git a/src/store/index.js b/src/store/index.js
index 93a3e5a25..cf5903bf9 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1416,7 +1416,7 @@ export const actions = {
         context.commit(storeMutations.UPDATE_VAPS, vaps);
     },
     // Price order actions
-    async priceOrderItems(context, availableLineItems) {
+    async priceOrderItemsAndSaveServerData(context, availableLineItems) {
         const availableLineItemsFormattedForRequest =
             getLineItemQueryStringForPricing(availableLineItems);
         const vehicle = context.getters.order.vehicle;

From 2d01671fef21a590fd20d2c0830a1bd9e2a7648b Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 24 Feb 2023 08:26:22 -0500
Subject: [PATCH 194/261] Removed console.log

---
 src/ux-components/button-main/button-main.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue
index 41edc21cb..18d7427c2 100644
--- a/src/ux-components/button-main/button-main.vue
+++ b/src/ux-components/button-main/button-main.vue
@@ -47,7 +47,6 @@ export default {
                 true
             );
             if (!this.isDisabled) {
-                console.log("I'm here");
                 this.isLoaderDisplayed = true;
                 this.$emit("click-event");
             }

From cb917807e78e54a76d1d8831fb17c4099cfbec94 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 24 Feb 2023 08:57:04 -0500
Subject: [PATCH 195/261] Mobile fee display and additional functional

---
 .../mobile-location-modal-questions.vue       | 65 +++++++++++++------
 .../service-location/service-location.vue     | 30 ++++++---
 .../service-zip-modal-question.vue            | 11 +---
 src/store/index.js                            | 16 ++++-
 4 files changed, 83 insertions(+), 39 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index d1aa4dd4b..b4f9a1d2e 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -4,7 +4,6 @@
             for="mobileLocationLinkPromptId"
             :aria-label="mobileLocationLinkPromptText"
             class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
-            :class="[questionAlignment === 'center' ? 'text-center w-100 mb-5' : '']"
             v-html="mobileLocationLinkPromptText"></label>
         <div class="update-mobile-location-text-link">
             <textLink
@@ -63,7 +62,8 @@ export default {
         return {
             internalModel: this.copyModel(this.modelValue),
             displayInvalidZipAlert: false,
-            mobileFee: "",
+            modalName: "MobileLocationModalWidget",
+            mobileFee: "",          
         };
     },
     props: {
@@ -78,26 +78,22 @@ export default {
                     zipCode: "",
                 },
                 isVehicleProtected: null,
-            }),
+                serviceZipCode: ""               
+            }),          
         },
         isZipServiceableMobile: Boolean,
-        isZipServiceableInShop: Boolean,
-        serviceZipCode: String,
+        isZipServiceableInShop: Boolean,      
         linkWidgetName: String,
         modalWidgetName: String,
-        mobileFeeDisclaimerWidgetName: String,
-        workspaceRequirementsWidgetName: String,
         alertNonServiceableZipWidgetName: String,
         alertInvalidZipWidgetName: String,
     },
-    async mounted() {
-        this.mobileFee = await this.getMobileFee();
+    mounted() {
+        this.getMobileFee().then((result) => {
+            this.mobileFee = result;
+        });       
     },
     computed: {
-        mobileFeeText() {
-            const cmsContentText = this.getCmsContent("MobileFeeDisclaimerWidget", "Text");
-            return cmsContentText.replaceAll("{custom:mobileFee}", this.mobileFee);
-        },
         mobileLocationLinkPromptText() {
             return this.getCmsContent(this.linkWidgetName, "HeaderText");
         },
@@ -119,12 +115,13 @@ export default {
         modalHeaderText() {
             return this.getCmsContent(this.modalWidgetName, "HeaderText");
         },
+        mobileFeeText() {
+            const cmsContentText = this.getCmsContent("MobileFeeDisclaimerWidget", "Text");
+            return cmsContentText.replaceAll("{custom:mobileFee}", this.mobileFee);
+        },
         modalFooterText() {
             return this.getCmsContent(this.modalWidgetName, "FooterText");
         },
-        modalName() {
-            return this.modalWidgetName;
-        },
         addressModel: {
             get: function () {
                 return this.modelValue.addressQuestions;
@@ -143,12 +140,25 @@ export default {
                     zipCode: modelToCopy.addressQuestions.zipCode,
                 },
                 isVehicleProtected: modelToCopy.isVehicleProtected,
-                isZipServiceableMobile: modelToCopy.isZipServiceableMobile,
-                isZipServiceableInShop: modelToCopy.isZipServiceableInShop,
+                serviceZipCode: modelToCopy.serviceZipCode
             };
         },
 
+        setServiceZipCode(serviceZipCode) {
+            this.internalModel.serviceZipCode = serviceZipCode;
+        },
+
+        getServiceZipCodeFromStore() {
+            return this.$store.getters.order.serviceLocation.zipCode;
+        },
+
         async getMobileFee() {
+            if (!this.internalModel.serviceZipCode) {
+                return "";
+            }
+            
+            const zipCodeData = await this.getZipCodeData(this.internalModel.serviceZipCode);
+            
             // Get the Mobile Fee Part
             const mobileFeePart = await baseMixin.methods.dispatchStoreAction(
                 storeActions.GET_MOBILE_FEE_PART,
@@ -159,7 +169,11 @@ export default {
             // Get the Mobile Fee Part Price
             const pricingResults = await baseMixin.methods.dispatchStoreAction(
                 storeActions.PRICE_ORDER_ITEMS,
-                [mobileFeePart.data],
+                { 
+                    availableLineItems: [mobileFeePart.data], 
+                    serviceZipCode: zipCodeData.zipCode,
+                    zipCodeCtu: zipCodeData.zipCodeCtu
+                }, 
                 false
             );
 
@@ -206,7 +220,15 @@ export default {
                 this.displayInvalidZipAlert = true;
             } else {
                 // Update the page level model
+                this.internalModel.serviceZipCode = this.internalModel.addressQuestions.zipCode; 
                 this.$emit("update:modelValue", this.internalModel);
+                
+                // Emit the update service zip code information to the parent to update the service zipcode details
+                this.$emit("updated-zip-code", {
+                    zipCode: this.internalModel.addressQuestions.zipCode,
+                    state: zipCodeData.state,
+                    isServiceable: zipCodeData.isServiceable
+                });
 
                 this.closeModal();
             }
@@ -216,6 +238,11 @@ export default {
         modelValue(newValue) {
             this.internalModel = this.copyModel(newValue);
         },
+        "modelValue.serviceZipCode": {
+            async handler(newValue) {
+                this.mobileFee = await this.getMobileFee(newValue);
+            },               
+        },
     },
     components: {
         textLink,
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 6406519dd..06ae0ed12 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -6,18 +6,15 @@
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <serviceZipModalQuestion
                 v-model="serviceZipCodeQuestion"
-                @service-zip-updated="resetMobileLocation"
+                ref="serviceZipCodeQuestion"
                 linkWidgetName="ServiceZipLinkWidget"
-                modalWidgetName="ServiceZipModalWidget"
-                textboxQuestionWidgetName="ServiceZipQuestionWidget"
-                alertInvalidZipWidgetName="AlertInvalidZipWidget" />
+                modalWidgetName="ServiceZipModalWidget" />
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
+                @updated-zip-code="resetServiceZipCode"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
-                modalWidgetName="MobileLocationModalWidget"
-                mobileFeeDisclaimerWidgetName="MobileFeeDisclaimerWidget"
-                workspaceRequirementsWidgetName="WorkspaceRequirementsWidget" />
+                modalWidgetName="MobileLocationModalWidget" />
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 ref="funnelFooter"
@@ -40,7 +37,6 @@ import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import store from "@/store";
 
 export default {
     name: "service-location",
@@ -62,6 +58,7 @@ export default {
                     zipCode: this.getRegistrationZipFromStore(),
                 },
                 isVehicleProtected: null,
+                serviceZipCode: this.getServiceZipCodeFromStore(),
             },
         };
     },
@@ -111,7 +108,7 @@ export default {
         getIsServiceableFromStore() {
             return this.$store.getters.order.serviceLocation.isServiceable;
         },
-        resetMobileLocation() {
+        resetMobileLocation(updatedServiceZipCode) {
             this.mobileLocationQuestions = {
                 addressQuestions: {
                     streetAddress: "",
@@ -121,10 +118,16 @@ export default {
                     zipCode: "",
                 },
                 isVehicleProtected: null,
+                serviceZipCode: updatedServiceZipCode,
             };
 
             this.$refs.mobileLocationModalQuestions.resetComponent();
         },
+        resetServiceZipCode(newValue) {
+            this.serviceZipCodeQuestion.state = newValue.state;
+            this.serviceZipCodeQuestion.zipCode = newValue.zipCode;
+            this.serviceZipCodeQuestion.isServiceable = newValue.isServiceable;
+        },
         backButtonAction() {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
@@ -132,6 +135,15 @@ export default {
             navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
         },
     },
+    watch: {
+        serviceZipCodeQuestion: {
+            handler(newValue, oldValue) {
+                if (newValue !== oldValue) {
+                    this.resetMobileLocation(newValue.zipCode);
+                }
+            },
+        },
+    },
     components: {
         serviceZipModalQuestion,
         mobileLocationModalQuestions,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index ef8e00c1d..61527b9d4 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -138,11 +138,6 @@ export default {
                 this.internalModel.state = zipCodeData.state;
                 this.internalModel.isServiceable = zipCodeData.isServiceable;
 
-                // Notify the page that the service zip has been updated to clear Mobile Location form
-                if (this.internalModel.zipCode !== this.modelValue.zipCode) {
-                    this.$emit("service-zip-updated");
-                }
-
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
 
@@ -151,14 +146,14 @@ export default {
         },
     },
     watch: {
+        modelValue(newValue) {
+            this.internalModel = this.copyModel(newValue);
+        },
         "internalModel.zipCode": {
             handler() {
                 this.resetsOnZipInput();
             },
         },
-        modelValue(newValue) {
-            this.internalModel = this.copyModel(newValue);
-        },
     },
     components: {
         textLink,
diff --git a/src/store/index.js b/src/store/index.js
index 5f4d7c1f5..f1bf86d23 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1423,24 +1423,34 @@ export const actions = {
         context.commit(storeMutations.UPDATE_VAPS, vaps);
     },
     // Price order actions
-    async priceOrderItems(context, availableLineItems) {
+    async priceOrderItems(context, { availableLineItems, serviceZipCode, ctu }) {
+        const zipCodeToUse = serviceZipCode
+            ? serviceZipCode
+            : context.getters.order.serviceLocation.zipCode;
+        const ctuToUse = ctu ? ctu : context.getters.order.serviceLocation.zipCodeCtu;
+
         const availableLineItemsFormattedForRequest =
             getLineItemQueryStringForPricing(availableLineItems);
+
         const vehicle = context.getters.order.vehicle;
+
         let queryString =
             `ParentAccountNumber=${applicationConfig.CASH_ACCOUNT_NUMBER}` +
-            `&CTU=${context.getters.order.serviceLocation.zipCodeCtu}` +
+            `&CTU=${ctuToUse}` +
             `&CarId=${vehicle.carId}` +
             `&Make=${vehicle.make}` +
             `&Model=${vehicle.model}` +
             `&Year=${vehicle.year}` +
             `&EON=${context.getters.order.eon}` +
-            `&ZipCode=${context.getters.order.serviceLocation.zipCode}` +
+            `&ZipCode=${zipCodeToUse}` +
             `${availableLineItemsFormattedForRequest}`;
+
         const lineItemServerData = context.getters.order.lineItems.serverData;
+
         if (lineItemServerData) {
             queryString += `&ServerData=${encodeURIComponent(lineItemServerData)}`;
         }
+
         const response = await globalMethods.callHttpClient({
             method: endpoints.PriceOrderItems.method,
             endpoint: `${endpoints.PriceOrderItems.url}?${queryString}`,

From 22cc5a7be5eb7561ed8df6c0da48ec20fa8d6b81 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Fri, 24 Feb 2023 09:23:13 -0500
Subject: [PATCH 196/261] formatting

---
 .../mobile-location-modal-questions.vue       | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index b4f9a1d2e..2d95f00a4 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -63,7 +63,7 @@ export default {
             internalModel: this.copyModel(this.modelValue),
             displayInvalidZipAlert: false,
             modalName: "MobileLocationModalWidget",
-            mobileFee: "",          
+            mobileFee: "",
         };
     },
     props: {
@@ -78,11 +78,11 @@ export default {
                     zipCode: "",
                 },
                 isVehicleProtected: null,
-                serviceZipCode: ""               
-            }),          
+                serviceZipCode: "",
+            }),
         },
         isZipServiceableMobile: Boolean,
-        isZipServiceableInShop: Boolean,      
+        isZipServiceableInShop: Boolean,
         linkWidgetName: String,
         modalWidgetName: String,
         alertNonServiceableZipWidgetName: String,
@@ -91,7 +91,7 @@ export default {
     mounted() {
         this.getMobileFee().then((result) => {
             this.mobileFee = result;
-        });       
+        });
     },
     computed: {
         mobileLocationLinkPromptText() {
@@ -140,7 +140,7 @@ export default {
                     zipCode: modelToCopy.addressQuestions.zipCode,
                 },
                 isVehicleProtected: modelToCopy.isVehicleProtected,
-                serviceZipCode: modelToCopy.serviceZipCode
+                serviceZipCode: modelToCopy.serviceZipCode,
             };
         },
 
@@ -156,9 +156,9 @@ export default {
             if (!this.internalModel.serviceZipCode) {
                 return "";
             }
-            
+
             const zipCodeData = await this.getZipCodeData(this.internalModel.serviceZipCode);
-            
+
             // Get the Mobile Fee Part
             const mobileFeePart = await baseMixin.methods.dispatchStoreAction(
                 storeActions.GET_MOBILE_FEE_PART,
@@ -169,11 +169,11 @@ export default {
             // Get the Mobile Fee Part Price
             const pricingResults = await baseMixin.methods.dispatchStoreAction(
                 storeActions.PRICE_ORDER_ITEMS,
-                { 
-                    availableLineItems: [mobileFeePart.data], 
+                {
+                    availableLineItems: [mobileFeePart.data],
                     serviceZipCode: zipCodeData.zipCode,
-                    zipCodeCtu: zipCodeData.zipCodeCtu
-                }, 
+                    zipCodeCtu: zipCodeData.zipCodeCtu,
+                },
                 false
             );
 
@@ -220,14 +220,14 @@ export default {
                 this.displayInvalidZipAlert = true;
             } else {
                 // Update the page level model
-                this.internalModel.serviceZipCode = this.internalModel.addressQuestions.zipCode; 
+                this.internalModel.serviceZipCode = this.internalModel.addressQuestions.zipCode;
                 this.$emit("update:modelValue", this.internalModel);
-                
+
                 // Emit the update service zip code information to the parent to update the service zipcode details
                 this.$emit("updated-zip-code", {
                     zipCode: this.internalModel.addressQuestions.zipCode,
                     state: zipCodeData.state,
-                    isServiceable: zipCodeData.isServiceable
+                    isServiceable: zipCodeData.isServiceable,
                 });
 
                 this.closeModal();
@@ -241,7 +241,7 @@ export default {
         "modelValue.serviceZipCode": {
             async handler(newValue) {
                 this.mobileFee = await this.getMobileFee(newValue);
-            },               
+            },
         },
     },
     components: {

From 57f3b80e6ff23240edba4801b8ec8f47e84804e0 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Fri, 24 Feb 2023 09:46:39 -0500
Subject: [PATCH 197/261] CSR-945

Allow zipCode querystring in concept funnel
---
 src/constants/query-strings.js                |  1 +
 src/layouts/estimate/estimate.spec.js         |  3 +++
 src/layouts/estimate/estimate.vue             |  2 +-
 .../license-plate-lookup.spec.js              |  3 +++
 .../license-plate-lookup.vue                  |  2 +-
 src/layouts/vin-lookup/vin-lookup.spec.js     |  1 +
 src/layouts/vin-lookup/vin-lookup.vue         |  2 +-
 src/router/index.js                           | 19 ++++++++++++++++---
 8 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/constants/query-strings.js b/src/constants/query-strings.js
index f75e526d6..d2dbcf976 100644
--- a/src/constants/query-strings.js
+++ b/src/constants/query-strings.js
@@ -1,6 +1,7 @@
 const queryStrings = {
     FMG_PAGE: "fmgPage",
     START_TYPE: "start_type",
+    ZIP_CODE: "zipCode",
 };
 
 export { queryStrings };
diff --git a/src/layouts/estimate/estimate.spec.js b/src/layouts/estimate/estimate.spec.js
index c4b92830a..4a0a3f434 100644
--- a/src/layouts/estimate/estimate.spec.js
+++ b/src/layouts/estimate/estimate.spec.js
@@ -258,6 +258,9 @@ function setupMocks({
             navigateWithSaving: jest.fn(),
             navigateWithoutSaving: jest.fn(),
         },
+        route: {
+            query: {},
+        },
     },
 }) {
     //Mock CMS Content
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index dd16a479f..4eafab25e 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -132,7 +132,7 @@ export default {
     data() {
         return {
             selectedVinLookupMethod: null,
-            serviceZipCode: this.getZipFromStore(),
+            serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipCode,
             emailAddress: this.getEmailFromStore(),
             displayInvalidZipAlert: false,
             displayNonServiceableZipAlert: false,
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.spec.js b/src/layouts/license-plate-lookup/license-plate-lookup.spec.js
index d83f49643..b23f5c101 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.spec.js
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.spec.js
@@ -660,6 +660,9 @@ function setupMocks({
             navigateWithoutSaving: jest.fn(),
             navigateWithSaving: jest.fn(),
         },
+        route: {
+            query: {},
+        },
         store: {
             getters: {
                 vehicle: {
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 159d89260..ec54fd4f7 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -152,7 +152,7 @@ export default {
     data() {
         return {
             licensePlate: this.getLicensePlateFromStore(),
-            registrationZipCode: this.getRegistrationZipFromStore(),
+            registrationZipCode: this.getRegistrationZipFromStore() ?? this.$route.query.zipCode,
             email: this.getEmailFromStore(),
             serviceZipCode: this.getServiceZipFromStore(),
             displayNonServiceableZipAlert: false,
diff --git a/src/layouts/vin-lookup/vin-lookup.spec.js b/src/layouts/vin-lookup/vin-lookup.spec.js
index aca1b99c2..fc15d3667 100644
--- a/src/layouts/vin-lookup/vin-lookup.spec.js
+++ b/src/layouts/vin-lookup/vin-lookup.spec.js
@@ -254,6 +254,7 @@ function setupMocks({ customMountOptions }) {
     mountOptions.global.mocks["$store"] = store;
     mountOptions.global.mixins = [mockMixin];
     mountOptions["attachTo"] = document.body; // append wrapper to document.body to test DOM methods
+    mountOptions.route = { query: {} };
 
     const wrapper = shallowMount(vinLookup, mountOptions);
     mockOutStubFunctions(wrapper);
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 990fd0658..17e981bc8 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -176,7 +176,7 @@ export default {
     data() {
         return {
             vin: this.getVinFromStore(),
-            serviceZipCode: this.getZipFromStore(),
+            serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipCode,
             emailAddress: this.getEmailFromStore(),
             isCarIdDifferent: false,
             customAlertData: {},
diff --git a/src/router/index.js b/src/router/index.js
index 30fc8583b..409ce0419 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -260,11 +260,24 @@ async function navigate(
 
         optionalParams.isSavingNavigation = isSavingNavigation;
 
+        // add querystring params to the route. if they are already in the store then no need to add them
+        var queryStringsObject = {
+            fmgPage: destinationFmgPageValue,
+        };
+
+        if (
+            Object.hasOwn(currentRoute.query, queryStrings.ZIP_CODE) &&
+            (store.getters.order.serviceLocation.zipCode === undefined ||
+                store.getters.order.serviceLocation.zipCode == null) &&
+            (store.getters.order.vehicle.registration.zipCode === undefined ||
+                store.getters.order.vehicle.registration.zipCode == null)
+        ) {
+            queryStringsObject[queryStrings.ZIP_CODE] = currentRoute.query.zipCode;
+        }
+
         router.push({
             name: "root",
-            query: Object.assign(optionalQuery, {
-                fmgPage: destinationFmgPageValue,
-            }),
+            query: Object.assign(optionalQuery, queryStringsObject),
             params: optionalParams,
         });
     } else if (matchingScenarioMap.destinationUrl !== undefined) {

From 50c745e18bd350334df529ec31147877d2fae4f6 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Fri, 24 Feb 2023 10:57:43 -0500
Subject: [PATCH 198/261] CSR-1012 service-location pageprereqs unit test
 updates

---
 .../service-location/service-location.spec.js | 32 ++++-------
 .../service-location/service-location.vue     | 14 ++---
 .../service-zip-modal-question.spec.js        | 56 -------------------
 3 files changed, 17 insertions(+), 85 deletions(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index a7093cef0..1e19c00f7 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -22,28 +22,6 @@ jest.mock("@/helpers/cms-content-helper", () => ({
 jest.mock("@/store", () => ({
     commit: jest.fn(),
     dispatch: jest.fn(),
-    getters: {
-        lineItems: {
-            supportingItems: [
-                {
-                    description: null,
-                    kitPrice: 0,
-                    laborAmount: 0,
-                    partNumber: "SUPPLIES-REPAIR",
-                    partType: "REPAIR FEE",
-                    sellingPrice: 7.99,
-                },
-            ],
-        },
-        order: {
-            serviceLocation: {
-                zipCode: "43235",
-            },
-        },
-        payment: {
-            isInsurance: false,
-        },
-    },
 }));
 
 beforeEach(() => {
@@ -63,11 +41,21 @@ beforeEach(() => {
         order: {
             serviceLocation: {
                 zipCode: "43235",
+                state: "OH",
+                isServiceable: true,
             },
         },
         payment: {
             isInsurance: false,
         },
+        vehicle: {
+            registration: {
+                address: undefined,
+                city: undefined,
+                state: undefined,
+                zipCode: undefined,
+            },
+        },
     };
 });
 
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index f6aeb833e..066405e82 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -93,25 +93,25 @@ export default {
             );
         },
         getRegistrationAddressFromStore() {
-            return this.$store.getters.vehicle.registration.address;
+            return store.getters.vehicle.registration.address;
         },
         getRegistrationCityFromStore() {
-            return this.$store.getters.vehicle.registration.city;
+            return store.getters.vehicle.registration.city;
         },
         getRegistrationStateFromStore() {
-            return this.$store.getters.vehicle.registration.state;
+            return store.getters.vehicle.registration.state;
         },
         getRegistrationZipFromStore() {
-            return this.$store.getters.vehicle.registration.zipCode;
+            return store.getters.vehicle.registration.zipCode;
         },
         getServiceZipCodeFromStore() {
-            return this.$store.getters.order.serviceLocation.zipCode;
+            return store.getters.order.serviceLocation.zipCode;
         },
         getServiceStateFromStore() {
-            return this.$store.getters.order.serviceLocation.state;
+            return store.getters.order.serviceLocation.state;
         },
         getIsServiceableFromStore() {
-            return this.$store.getters.order.serviceLocation.isServiceable;
+            return store.getters.order.serviceLocation.isServiceable;
         },
         resetMobileLocation(updatedServiceZipCode) {
             this.mobileLocationQuestions = {
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
index 3c2384944..a98b4f89d 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -175,62 +175,6 @@ describe("service-zip-modal-question.vue", () => {
         expect(wrapper.emitted("update:modelValue")).not.toBeTruthy();
     });
 
-    it("Should emit service-zip-updated on setZipCode for a valid, serviceable zip", async () => {
-        // Arrange
-        let serviceZipCodeQuestion = {
-            state: "IL",
-            zipCode: "61606",
-            isServiceable: true,
-        };
-
-        const zip = "43235";
-
-        const wrapper = mount(serviceZipModalQuestion, {
-            mixins: [mockMixin],
-            props: {
-                modelValue: serviceZipCodeQuestion,
-                linkWidgetName: linkWidgetName,
-                modalWidgetName: modalWidgetName,
-            },
-            attachTo: document.body,
-        });
-
-        // Act
-        wrapper.vm.internalModel.zipCode = zip;
-        await wrapper.vm.setZipCode();
-
-        // Assert
-        expect(wrapper.emitted("service-zip-updated")).toBeTruthy();
-    });
-
-    it("Should not emit service-zip-updated on setZipCode for an invalid zip", async () => {
-        // Arrange
-        let serviceZipCodeQuestion = {
-            state: "IL",
-            zipCode: "61606",
-            isServiceable: true,
-        };
-
-        const zip = "";
-
-        const wrapper = mount(serviceZipModalQuestion, {
-            mixins: [mockMixin],
-            props: {
-                modelValue: serviceZipCodeQuestion,
-                linkWidgetName: linkWidgetName,
-                modalWidgetName: modalWidgetName,
-            },
-            attachTo: document.body,
-        });
-
-        // Act
-        wrapper.vm.internalModel.zipCode = zip;
-        await wrapper.vm.setZipCode();
-
-        // Assert
-        expect(wrapper.emitted("service-zip-updated")).not.toBeTruthy();
-    });
-
     it("Should display invalid zip alerts for invalid ip inputs", async () => {
         // Arrange
         let serviceZipCodeQuestion = {

From fcc6ce7be7b5ed2f700a1c685c57e7ba078bea2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Feb 2023 16:25:40 +0000
Subject: [PATCH 199/261] Bump minimatch from 3.0.4 to 3.1.2

Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2.
- [Release notes](https://github.com/isaacs/minimatch/releases)
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c308b7429..611e0f226 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16958,9 +16958,9 @@
       "dev": true
     },
     "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
@@ -38027,9 +38027,9 @@
       "dev": true
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"

From 10e49b041f392f05477a5aea4b889c0bd23c8161 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 200/261] 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 cbd5cb44b0f5d39ae738aef52431e4e1221e8fda Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Feb 2023 16:59:47 +0000
Subject: [PATCH 201/261] Bump eventsource from 1.1.0 to 1.1.2

Bumps [eventsource](https://github.com/EventSource/eventsource) from 1.1.0 to 1.1.2.
- [Release notes](https://github.com/EventSource/eventsource/releases)
- [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md)
- [Commits](https://github.com/EventSource/eventsource/compare/v1.1.0...v1.1.2)

---
updated-dependencies:
- dependency-name: eventsource
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 38 +++++++-------------------------------
 1 file changed, 7 insertions(+), 31 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e106ab85a..1f93b7ac1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10043,13 +10043,10 @@
       }
     },
     "node_modules/eventsource": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz",
-      "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.2.tgz",
+      "integrity": "sha512-xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA==",
       "dev": true,
-      "dependencies": {
-        "original": "^1.0.0"
-      },
       "engines": {
         "node": ">=0.12.0"
       }
@@ -17848,15 +17845,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/original": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
-      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
-      "dev": true,
-      "dependencies": {
-        "url-parse": "^1.4.3"
-      }
-    },
     "node_modules/os-browserify": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
@@ -32462,13 +32450,10 @@
       "dev": true
     },
     "eventsource": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz",
-      "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==",
-      "dev": true,
-      "requires": {
-        "original": "^1.0.0"
-      }
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.2.tgz",
+      "integrity": "sha512-xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA==",
+      "dev": true
     },
     "evp_bytestokey": {
       "version": "1.0.3",
@@ -38749,15 +38734,6 @@
         }
       }
     },
-    "original": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
-      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
-      "dev": true,
-      "requires": {
-        "url-parse": "^1.4.3"
-      }
-    },
     "os-browserify": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",

From 5a8b1a9dffd32281566681146bae8d098f42f2ea Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Fri, 24 Feb 2023 14:46:08 -0500
Subject: [PATCH 202/261] CSR-1012 more unit tests for service-location

---
 .../service-location/service-location.spec.js | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 1e19c00f7..f83cdc624 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -101,6 +101,59 @@ describe("service-location.vue", () => {
             expect(arePagePrerequisitesValid).toBe(false);
         });
     });
+
+    describe("updating service zip", () => {
+        test("resets mobile location when service zip code is updated", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+            const newZip = "61606";
+
+            // Act
+            wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
+            wrapper.vm.resetMobileLocation(newZip);
+
+            // Assert
+            expect(wrapper.vm.mobileLocationQuestions.serviceZipCode).toBe(newZip);
+        });
+
+        test("updates service zip code serviceZipCodeQuestion when resetServiceZipCode is called", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+            const newServiceZipCodeQuestion = {
+                zipCode: "61606",
+                state: "IL",
+                isServiceable: true,
+            };
+
+            // Act
+            wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
+            wrapper.vm.resetServiceZipCode(newServiceZipCodeQuestion);
+
+            // Assert
+            expect(wrapper.vm.serviceZipCodeQuestion).toStrictEqual(newServiceZipCodeQuestion);
+        });
+
+        test("resets mobile location in watch for serviceZipCodeQuestion", async () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+            const newServiceZipCodeQuestion = {
+                zipCode: "61606",
+                state: "IL",
+                isServiceable: true,
+            };
+
+            // Act
+            wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
+            wrapper.vm.serviceZipCodeQuestion = newServiceZipCodeQuestion;
+
+            await wrapper.vm.$nextTick();
+
+            // Assert
+            expect(wrapper.vm.mobileLocationQuestions.serviceZipCode).toStrictEqual(
+                newServiceZipCodeQuestion.zipCode
+            );
+        });
+    });
 });
 
 function setupMocks({ mountOptionsMockData = {} }) {

From ca0ced5324d7726af9455de2f9e6b28193f7e6b2 Mon Sep 17 00:00:00 2001
From: Matt Sykes <matthew.sykes@safelite.com>
Date: Mon, 27 Feb 2023 13:58:38 -0500
Subject: [PATCH 203/261] cleaned up CF cache invalidation issue

---
 azure-pipelines.yml | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 777122777..a3ff58ac5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -101,11 +101,16 @@ stages:
                         indexDeployVariables:
                           __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__)
                           __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__)
-                        cfDistributionId: $(vueCfDistributionId)
                     - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
                       parameters:
                         awsCliContainer: awscli
                         distributionId: $(apiCfDistributionId)
+                        paths: /* 
+                        awsProfile: $(devDeploymentProfile)
+                    - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
+                      parameters: 
+                        awsCliContainer: awscli
+                        distributionId: $(cfDistributionId)
                         paths: /fmg/*
                         awsProfile: $(devDeploymentProfile)
 
@@ -153,11 +158,16 @@ stages:
                         indexDeployVariables:
                           __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__)
                           __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__)
-                        cfDistributionId: $(vueCfDistributionId)
                     - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
                       parameters:
                         awsCliContainer: awscli
                         distributionId: $(apiCfDistributionId)
+                        paths: /* 
+                        awsProfile: $(sysDeploymentProfile)
+                    - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
+                      parameters: 
+                        awsCliContainer: awscli
+                        distributionId: $(cfDistributionId)
                         paths: /fmg/*
                         awsProfile: $(sysDeploymentProfile)
                 
@@ -205,11 +215,16 @@ stages:
                         indexDeployVariables:
                           __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__)
                           __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__)
-                        cfDistributionId: $(vueCfDistributionId)
                     - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
                       parameters:
                         awsCliContainer: awscli
                         distributionId: $(apiCfDistributionId)
+                        paths: /* 
+                        awsProfile: $(qaDeploymentProfile)
+                    - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
+                      parameters: 
+                        awsCliContainer: awscli
+                        distributionId: $(cfDistributionId)
                         paths: /fmg/*
                         awsProfile: $(qaDeploymentProfile)
 
@@ -257,11 +272,16 @@ stages:
                         indexDeployVariables:
                           __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__)
                           __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__)
-                        cfDistributionId: $(apiCfDistributionId)
                     - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
                       parameters:
                         awsCliContainer: awscli
                         distributionId: $(apiCfDistributionId)
+                        paths: /* 
+                        awsProfile: $(prodDeploymentProfile)
+                    - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
+                      parameters: 
+                        awsCliContainer: awscli
+                        distributionId: $(cfDistributionId)
                         paths: /fmg/*
                         awsProfile: $(prodDeploymentProfile)
           - template: templates/digital/auto-tag.yml@AzureDevOps

From 896555b4778b97919edb7c26cf88fb86cbcd169e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Feb 2023 21:34:31 +0000
Subject: [PATCH 204/261] Bump terser from 4.8.0 to 4.8.1

Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/compare/v4.8.0...v4.8.1)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1f93b7ac1..b0db5724c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21517,9 +21517,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz",
+      "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==",
       "dev": true,
       "dependencies": {
         "commander": "^2.20.0",
@@ -41789,9 +41789,9 @@
       "dev": true
     },
     "terser": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-      "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz",
+      "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",

From 7cc3511940a224d50b3816a76f5d5590e047e95b Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 28 Feb 2023 07:27:38 -0500
Subject: [PATCH 205/261] WIP

---
 .../mobile-location-modal-questions.spec.js   | 203 ++++++++++++++----
 .../mobile-location-modal-questions.vue       |  74 ++++---
 .../service-location/service-location.vue     |  11 +-
 3 files changed, 209 insertions(+), 79 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
index 9dde622fe..7eb5c3f6f 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
@@ -1,24 +1,27 @@
-import { mount, shallowMount } from "@vue/test-utils";
 import mobileLocationModalQuestions from "./mobile-location-modal-questions";
+import { mount, shallowMount } from "@vue/test-utils";
+import { storeActions } from "@/constants/store-actions";
+import { getMountOptions } from "@/helpers/unit-test-helper.js";
+
 import crypto from "crypto";
+
 global.crypto = crypto;
 
-// const linkWidgetName = "linkWidgetName";
-// const modalWidgetName = "modalWidgetName";
-// const mobileFeeDisclaimerWidgetName = "MobileFeeDisclaimerWidget";
-// const workspaceRequirementsWidgetName = "WorkspaceRequirementsWidget";
+const linkWidgetName = "linkWidgetName";
+const modalWidgetName = "modalWidgetName";
+const mobileFeeDisclaimerWidgetName = "MobileFeeDisclaimerWidget";
 
-// const mockLinkCmsContent = {
-//     BodyText: "Sample link body text here.",
-// };
+const mockLinkCmsContent = {
+    BodyText: "Sample link body text here.",
+};
 
-// const mockModalCmsContent = {
-//     FooterText: "Sample modal footer text here.",
-// };
+const mockModalCmsContent = {
+    FooterText: "Sample modal footer text here.",
+};
 
-// const mockMobileFeeCmsContent = {
-//     Text: "This is the price {custom:mobileFee}",
-// };
+const mockMobileFeeDisclaimerContent = {
+    Text: "Sample mobile fee disclaimer text {custom:mobileFee}",
+};
 
 const mockMixin = {
     methods: {
@@ -32,7 +35,7 @@ const mockMixin = {
             }
 
             if (widgetName === mobileFeeDisclaimerWidgetName) {
-                return mockMobileFeeCmsContent[cmsFieldName];
+                return mockMobileFeeDisclaimerContent[cmsFieldName];
             }
 
             return null;
@@ -40,59 +43,177 @@ const mockMixin = {
 
         getZipCodeData: jest.fn((zip) => {
             if (zip === "43235") {
-                return {
+                return Promise.resolve({
                     containsMilitaryBase: false,
                     isServiceable: true,
                     isValid: true,
                     state: "OH",
                     zipCodeCtu: "01820",
-                };
+                });
             }
 
-            if (zip === "61606") {
-                return {
-                    containsMilitaryBase: false,
-                    isServiceable: true,
-                    isValid: true,
-                    state: "IL",
-                    zipCodeCtu: "01526",
-                };
-            }
-
-            return {
+            return Promise.resolve({
                 containsMilitaryBase: false,
                 isServiceable: false,
                 isValid: false,
                 state: null,
                 zipCodeCtu: null,
-            };
+            });
+        }),
+
+        dispatchStoreAction: jest.fn((actionName) => {
+            if (actionName === storeActions.GET_MOBILE_FEE_PART) {
+                return Promise.resolve({
+                    data: {
+                        partNumber: "MOBILE FEE",
+                        description: "MOBILE FEE",
+                        partType: "FEE",
+                    },
+                });
+            }
+
+            if (actionName === storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA) {
+                return Promise.resolve([
+                    {
+                        partNumber: "MOBILE FEE",
+                        description: "MOBILE FEE",
+                        partType: "FEE",
+                        laborAmount: 49.99,
+                        sellingPrice: 0,
+                        kitPrice: 0,
+                    },
+                ]);
+            }
+        }),
+
+        getTotalLineItemPrice: jest.fn((lineItem) => {
+            return 49.99;
         }),
     },
 };
 
 describe("mobile-location-modal-questions.vue", () => {
-    it("Initial state on load with no existing location info", async () => {
-        let mobileLocationQuestions = {
+    it("Should copy the modelValue to the internalModel when the component is mounted", async () => {
+        // Arrange
+        const mobileLocationQuestions = {
             addressQuestions: {
-                streetAddress: "",
-                apartmentNumberOrBusinessName: "",
-                city: "",
-                state: "",
-                zipCode: "",
+                streetAddress: "555 Some St",
+                apartmentNumberOrBusinessName: "Apt 1",
+                city: "Funkytown",
+                state: "OH",
+                zipCode: "55555",
             },
-            isVehicleProtected: null,
+            isVehicleProtected: true,
+            serviceZipCode: "55555",
         };
 
-        // Arrange
-        const wrapper = shallowMount(mobileLocationModalQuestions, {
+        const { wrapper } = setupMocks({
             mixins: [mockMixin],
             props: {
                 modelValue: mobileLocationQuestions,
             },
-            attachTo: document.body,
+            mountOptions: {
+                attachTo: document.body,
+            },
         });
 
         // Assert
-        //expect(wrapper.html()).toEqual(expect.stringContaining(mockLinkCmsContent["BodyText"]));
+        expect(wrapper.vm.internalModel.addressQuestions.streetAddress).toEqual("555 Some St");
+        expect(wrapper.vm.internalModel.addressQuestions.apartmentNumberOrBusinessName).toEqual(
+            "Apt 1"
+        );
+        expect(wrapper.vm.internalModel.addressQuestions.city).toEqual("Funkytown");
+        expect(wrapper.vm.internalModel.addressQuestions.state).toEqual("OH");
+        expect(wrapper.vm.internalModel.addressQuestions.zipCode).toEqual("55555");
+        expect(wrapper.vm.internalModel.isVehicleProtected).toEqual(true);
+        expect(wrapper.vm.internalModel.serviceZipCode).toEqual("55555");
+    });
+
+    it("Should set mobile fee price to 0.00 when loading the page and there is no existing service zip code", async () => {
+        // Arrange
+        const mobileLocationQuestions = {
+            addressQuestions: {
+                streetAddress: "555 Some St",
+                apartmentNumberOrBusinessName: "Apt 1",
+                city: "Funkytown",
+                state: "OH",
+                zipCode: "43235",
+            },
+            isVehicleProtected: true,
+            serviceZipCode: "",
+        };
+
+        // Act
+        const { wrapper } = setupMocks({
+            mixins: [mockMixin],
+
+            props: {
+                modelValue: mobileLocationQuestions,
+            },
+            mountOptions: {
+                attachTo: document.body,
+            },
+        });
+
+        await wrapper.vm.$nextTick();
+
+        expect(wrapper.props().modelValue.serviceZipCode).toBe("");
+
+        // Assert
+        expect(wrapper.vm.mobileFee).toEqual(0.0);
+    });
+
+    it.only("Should calculate the mobile fee price when loading the page and there is an existing service zip code", async () => {
+        // Arrange
+        const mobileLocationQuestions = {
+            addressQuestions: {
+                streetAddress: "555 Some St",
+                apartmentNumberOrBusinessName: "Apt 1",
+                city: "Funkytown",
+                state: "OH",
+                zipCode: "43235",
+            },
+            isVehicleProtected: true,
+            serviceZipCode: "43235",
+        };
+
+        // Act
+        const { wrapper } = setupMocks({
+            mixins: [mockMixin],
+
+            props: {
+                modelValue: mobileLocationQuestions,
+            },
+            mountOptions: {
+                attachTo: document.body,
+            },
+        });
+
+        await wrapper.vm.$nextTick();
+        await wrapper.vm.$nextTick();
+        await wrapper.vm.$nextTick();
+        await wrapper.vm.$nextTick();
+
+        console.log(wrapper.vm.mobileFee);
+
+        expect(wrapper.props().modelValue.serviceZipCode).toBe("43235");
+
+        // Assert
+        expect(wrapper.vm.mobileFee).toEqual(49.99);
     });
 });
+
+function setupMocks({ mountOptions, mixins, props, isShallowMount = true }) {
+    const resultingMountOptions = getMountOptions({
+        ...mountOptions,
+        mixins,
+    });
+
+    if (props) resultingMountOptions.propsData = props;
+
+    const wrapper = isShallowMount
+        ? shallowMount(mobileLocationModalQuestions, resultingMountOptions)
+        : mount(mobileLocationModalQuestions, resultingMountOptions);
+
+    return { wrapper };
+}
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 2d95f00a4..233e4046e 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -22,7 +22,6 @@
     <modal
         :ref="modalName"
         :headerText="modalHeaderText"
-        :onModalClosedCallback="onModalClosed"
         :footerButtonText="modalFooterText"
         @footer-button-event="setMobileLocation">
         <addressQuestions
@@ -52,7 +51,6 @@ import alert from "@/ux-components/alert/alert";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 import textBlock from "@/digital-components/text-block/text-block";
-import baseMixin from "@/mixins/base-mixin.js";
 import { storeActions } from "@/constants/store-actions";
 
 export default {
@@ -63,7 +61,7 @@ export default {
             internalModel: this.copyModel(this.modelValue),
             displayInvalidZipAlert: false,
             modalName: "MobileLocationModalWidget",
-            mobileFee: "",
+            mobileFee: 0.0,
         };
     },
     props: {
@@ -88,10 +86,34 @@ export default {
         alertNonServiceableZipWidgetName: String,
         alertInvalidZipWidgetName: String,
     },
-    mounted() {
-        this.getMobileFee().then((result) => {
-            this.mobileFee = result;
-        });
+    async mounted() {
+        this.mobileFee = await this.getMobileFee();
+
+        // this.getMobileFee().then((result) => {
+        //     console.log(result);
+        //     this.mobileFee = result;
+        //     console.log(this.mobileFee);
+        // });
+
+        // if (this.serviceZipCode !== "") {
+        //     console.log(`Calling this.getMobileFee() inside mounted()`);
+        //     this.mobileFee = await this.getMobileFee();
+        //     console.log(
+        //         `After calling this.getMobileFee() inside mounted(), result: ${this.mobileFee}`
+        //     );
+        // }
+
+        // // this.getMobileFee().then((result) => {
+        // //     console.log(`After calling this.getMobileFee() inside mounted()`);
+        // //     console.log(`Result of this.getMobileFee() ${result}`);
+        // //     //this.test = "this";
+        // //     //console.log(this.test);
+        // //     this.mobileFee = result;
+        // //     console.log(
+        // //         `Value of this.mobile fee after calling this.getMobileFee(): ${this.mobileFee}`
+        // //     );
+        // // });
+        // //console.log(`After calling this.getMobileFee() inside mounted() - NOT IN THE CALLBACK`);
     },
     computed: {
         mobileLocationLinkPromptText() {
@@ -130,54 +152,40 @@ export default {
     },
     methods: {
         copyModel(modelToCopy) {
-            return {
-                addressQuestions: {
-                    streetAddress: modelToCopy.addressQuestions.streetAddress,
-                    apartmentNumberOrBusinessName:
-                        modelToCopy.addressQuestions.apartmentNumberOrBusinessName,
-                    city: modelToCopy.addressQuestions.city,
-                    state: modelToCopy.addressQuestions.state,
-                    zipCode: modelToCopy.addressQuestions.zipCode,
-                },
-                isVehicleProtected: modelToCopy.isVehicleProtected,
-                serviceZipCode: modelToCopy.serviceZipCode,
-            };
+            return { ...modelToCopy };
         },
 
         setServiceZipCode(serviceZipCode) {
             this.internalModel.serviceZipCode = serviceZipCode;
         },
 
-        getServiceZipCodeFromStore() {
-            return this.$store.getters.order.serviceLocation.zipCode;
-        },
-
         async getMobileFee() {
             if (!this.internalModel.serviceZipCode) {
-                return "";
+                return 0.0;
             }
 
             const zipCodeData = await this.getZipCodeData(this.internalModel.serviceZipCode);
-
+            console.log(zipCodeData);
             // Get the Mobile Fee Part
-            const mobileFeePart = await baseMixin.methods.dispatchStoreAction(
+            const mobileFeePart = await this.dispatchStoreAction(
                 storeActions.GET_MOBILE_FEE_PART,
                 null,
                 false
             );
-
+            console.log(mobileFeePart);
             // Get the Mobile Fee Part Price
-            const pricingResults = await baseMixin.methods.dispatchStoreAction(
-                storeActions.PRICE_ORDER_ITEMS,
+            const pricingResults = await this.dispatchStoreAction(
+                storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
                 {
                     availableLineItems: [mobileFeePart.data],
-                    serviceZipCode: zipCodeData.zipCode,
-                    zipCodeCtu: zipCodeData.zipCodeCtu,
+                    serviceZipCode: this.internalModel.serviceZipCode,
+                    ctu: zipCodeData.zipCodeCtu,
                 },
                 false
             );
+            console.log(pricingResults);
 
-            return await baseMixin.methods.getTotalLineItemPrice(pricingResults[0]);
+            return this.getTotalLineItemPrice(pricingResults[0]);
         },
 
         openModal() {
@@ -240,7 +248,7 @@ export default {
         },
         "modelValue.serviceZipCode": {
             async handler(newValue) {
-                this.mobileFee = await this.getMobileFee(newValue);
+                this.mobileFee = await this.getMobileFee();
             },
         },
     },
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index f6aeb833e..64e5dafdf 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -86,11 +86,12 @@ export default {
 
     methods: {
         arePagePrerequisitesValid() {
-            return (
-                store.getters.lineItems.supportingItems !== null &&
-                store.getters.order.serviceLocation.zipCode !== null &&
-                store.getters.payment.isInsurance !== null
-            );
+            return true;
+            // (
+            //     store.getters.lineItems.supportingItems !== null &&
+            //     store.getters.order.serviceLocation.zipCode !== null &&
+            //     store.getters.payment.isInsurance !== null
+            // );
         },
         getRegistrationAddressFromStore() {
             return this.$store.getters.vehicle.registration.address;

From 81819b898e0ca874294bdd95f2ee14f90a0b72fa Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 28 Feb 2023 09:47:13 -0500
Subject: [PATCH 206/261] Moved calculation of mobile fee to the page level

---
 src/helpers/service-location-helper.js        | 30 ++++++++
 .../mobile-location-modal-questions.vue       | 71 ++-----------------
 .../service-location/service-location.vue     | 25 ++++++-
 .../service-zip-modal-question.vue            |  2 +
 4 files changed, 60 insertions(+), 68 deletions(-)
 create mode 100644 src/helpers/service-location-helper.js

diff --git a/src/helpers/service-location-helper.js b/src/helpers/service-location-helper.js
new file mode 100644
index 000000000..1f4a12f51
--- /dev/null
+++ b/src/helpers/service-location-helper.js
@@ -0,0 +1,30 @@
+import { storeActions } from "@/constants/store-actions";
+import baseMixin from "@/mixins/base-mixin.js";
+
+export async function getMobileFee(serviceZipCode) {
+    if (!serviceZipCode) {
+        return 0;
+    }
+
+    const zipCodeData = await baseMixin.methods.getZipCodeData(serviceZipCode);
+    
+    // Get the Mobile Fee Part
+    const mobileFeePart = await baseMixin.methods.dispatchStoreAction(
+        storeActions.GET_MOBILE_FEE_PART,
+        null,
+        false
+    );
+    
+    // Get the Mobile Fee Part Price
+    const pricingResults = await baseMixin.methods.dispatchStoreAction(
+        storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
+        {
+            availableLineItems: [mobileFeePart.data],
+            serviceZipCode: serviceZipCode,
+            ctu: zipCodeData.zipCodeCtu,
+        },
+        false
+    );
+
+    return Promise.resolve(baseMixin.methods.getTotalLineItemPrice(pricingResults[0]));
+}
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 233e4046e..a15709f67 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -51,7 +51,6 @@ import alert from "@/ux-components/alert/alert";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 import textBlock from "@/digital-components/text-block/text-block";
-import { storeActions } from "@/constants/store-actions";
 
 export default {
     name: "mobile-location-modal-questions",
@@ -61,7 +60,6 @@ export default {
             internalModel: this.copyModel(this.modelValue),
             displayInvalidZipAlert: false,
             modalName: "MobileLocationModalWidget",
-            mobileFee: 0.0,
         };
     },
     props: {
@@ -77,6 +75,7 @@ export default {
                 },
                 isVehicleProtected: null,
                 serviceZipCode: "",
+                mobileFee: 0,
             }),
         },
         isZipServiceableMobile: Boolean,
@@ -86,35 +85,6 @@ export default {
         alertNonServiceableZipWidgetName: String,
         alertInvalidZipWidgetName: String,
     },
-    async mounted() {
-        this.mobileFee = await this.getMobileFee();
-
-        // this.getMobileFee().then((result) => {
-        //     console.log(result);
-        //     this.mobileFee = result;
-        //     console.log(this.mobileFee);
-        // });
-
-        // if (this.serviceZipCode !== "") {
-        //     console.log(`Calling this.getMobileFee() inside mounted()`);
-        //     this.mobileFee = await this.getMobileFee();
-        //     console.log(
-        //         `After calling this.getMobileFee() inside mounted(), result: ${this.mobileFee}`
-        //     );
-        // }
-
-        // // this.getMobileFee().then((result) => {
-        // //     console.log(`After calling this.getMobileFee() inside mounted()`);
-        // //     console.log(`Result of this.getMobileFee() ${result}`);
-        // //     //this.test = "this";
-        // //     //console.log(this.test);
-        // //     this.mobileFee = result;
-        // //     console.log(
-        // //         `Value of this.mobile fee after calling this.getMobileFee(): ${this.mobileFee}`
-        // //     );
-        // // });
-        // //console.log(`After calling this.getMobileFee() inside mounted() - NOT IN THE CALLBACK`);
-    },
     computed: {
         mobileLocationLinkPromptText() {
             return this.getCmsContent(this.linkWidgetName, "HeaderText");
@@ -139,7 +109,10 @@ export default {
         },
         mobileFeeText() {
             const cmsContentText = this.getCmsContent("MobileFeeDisclaimerWidget", "Text");
-            return cmsContentText.replaceAll("{custom:mobileFee}", this.mobileFee);
+            if (this.modelValue.mobileFee === undefined) {
+                return cmsContentText.replaceAll("{custom:mobileFee}", 0);
+            }
+            return cmsContentText.replaceAll("{custom:mobileFee}", this.modelValue.mobileFee);
         },
         modalFooterText() {
             return this.getCmsContent(this.modalWidgetName, "FooterText");
@@ -159,35 +132,6 @@ export default {
             this.internalModel.serviceZipCode = serviceZipCode;
         },
 
-        async getMobileFee() {
-            if (!this.internalModel.serviceZipCode) {
-                return 0.0;
-            }
-
-            const zipCodeData = await this.getZipCodeData(this.internalModel.serviceZipCode);
-            console.log(zipCodeData);
-            // Get the Mobile Fee Part
-            const mobileFeePart = await this.dispatchStoreAction(
-                storeActions.GET_MOBILE_FEE_PART,
-                null,
-                false
-            );
-            console.log(mobileFeePart);
-            // Get the Mobile Fee Part Price
-            const pricingResults = await this.dispatchStoreAction(
-                storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
-                {
-                    availableLineItems: [mobileFeePart.data],
-                    serviceZipCode: this.internalModel.serviceZipCode,
-                    ctu: zipCodeData.zipCodeCtu,
-                },
-                false
-            );
-            console.log(pricingResults);
-
-            return this.getTotalLineItemPrice(pricingResults[0]);
-        },
-
         openModal() {
             this.$refs[this.modalName].openModal();
         },
@@ -246,11 +190,6 @@ export default {
         modelValue(newValue) {
             this.internalModel = this.copyModel(newValue);
         },
-        "modelValue.serviceZipCode": {
-            async handler(newValue) {
-                this.mobileFee = await this.getMobileFee();
-            },
-        },
     },
     components: {
         textLink,
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 64e5dafdf..8059308f0 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -6,6 +6,7 @@
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <serviceZipModalQuestion
                 v-model="serviceZipCodeQuestion"
+                @updated-service-zip-code="recalculateMobileFee"
                 ref="serviceZipCodeQuestion"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget" />
@@ -37,6 +38,7 @@ import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import { getMobileFee } from "@/helpers/service-location-helper";
 import store from "@/store";
 
 export default {
@@ -60,20 +62,27 @@ export default {
                 },
                 isVehicleProtected: null,
                 serviceZipCode: this.getServiceZipCodeFromStore(),
+                mobileFee: 0,
             },
         };
     },
-
     async beforeRouteEnter(to, from, next) {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
+        const serviceZipCode = store.getters.order.serviceLocation.zipCode;
+        const mobileFeePromise = getMobileFee(serviceZipCode);
+
         // Settle promises and get results
         const promiseResultMap = [
             {
                 resultKey: "cmsContent",
                 promise: cmsContentPromise,
             },
+            {
+                resultKey: "mobileFee",
+                promise: mobileFeePromise,
+            },
         ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
@@ -81,9 +90,9 @@ export default {
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
+            vm.setData(resultMap.mobileFee);
         });
     },
-
     methods: {
         arePagePrerequisitesValid() {
             return true;
@@ -93,6 +102,11 @@ export default {
             //     store.getters.payment.isInsurance !== null
             // );
         },
+        setData(mobileFee) {
+            if (mobileFee) {
+                this.mobileLocationQuestions.mobileFee = mobileFee
+            }
+        },
         getRegistrationAddressFromStore() {
             return this.$store.getters.vehicle.registration.address;
         },
@@ -114,6 +128,11 @@ export default {
         getIsServiceableFromStore() {
             return this.$store.getters.order.serviceLocation.isServiceable;
         },
+        recalculateMobileFee(serviceZipCode) {
+            getMobileFee(serviceZipCode).then((mobileFee) => {
+                this.mobileLocationQuestions.mobileFee = mobileFee;
+            });
+        },
         resetMobileLocation(updatedServiceZipCode) {
             this.mobileLocationQuestions = {
                 addressQuestions: {
@@ -133,6 +152,8 @@ export default {
             this.serviceZipCodeQuestion.state = newValue.state;
             this.serviceZipCodeQuestion.zipCode = newValue.zipCode;
             this.serviceZipCodeQuestion.isServiceable = newValue.isServiceable;
+
+            this.recalculateMobileFee(this.serviceZipCodeQuestion.zipCode);
         },
         backButtonAction() {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 2748e8879..aabab3be3 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -139,6 +139,8 @@ export default {
                 this.internalModel.state = zipCodeData.state;
                 this.internalModel.isServiceable = zipCodeData.isServiceable;
 
+                this.$emit("updated-service-zip-code", this.internalModel.zipCode);
+
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
 

From 2be5a55cacd727d910b427425b4358aee2d8a88f Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 28 Feb 2023 10:10:25 -0500
Subject: [PATCH 207/261] Removed tests that are no longer applicable for
 mobile-location-modal-questions

---
 src/helpers/service-location-helper.spec.js | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/helpers/service-location-helper.spec.js

diff --git a/src/helpers/service-location-helper.spec.js b/src/helpers/service-location-helper.spec.js
new file mode 100644
index 000000000..66012402c
--- /dev/null
+++ b/src/helpers/service-location-helper.spec.js
@@ -0,0 +1 @@
+test.todo("some test to be written in the future");
\ No newline at end of file

From cb3bf381b5c3b2dfe42b676edcb096f44fc0a5a0 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 28 Feb 2023 10:12:07 -0500
Subject: [PATCH 208/261] Removed tests that are no longer applicable for
 mobile-location-modal-questions

---
 .../mobile-location-modal-questions.spec.js   | 73 -------------------
 1 file changed, 73 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
index 7eb5c3f6f..7e5aaff8c 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
@@ -128,79 +128,6 @@ describe("mobile-location-modal-questions.vue", () => {
         expect(wrapper.vm.internalModel.isVehicleProtected).toEqual(true);
         expect(wrapper.vm.internalModel.serviceZipCode).toEqual("55555");
     });
-
-    it("Should set mobile fee price to 0.00 when loading the page and there is no existing service zip code", async () => {
-        // Arrange
-        const mobileLocationQuestions = {
-            addressQuestions: {
-                streetAddress: "555 Some St",
-                apartmentNumberOrBusinessName: "Apt 1",
-                city: "Funkytown",
-                state: "OH",
-                zipCode: "43235",
-            },
-            isVehicleProtected: true,
-            serviceZipCode: "",
-        };
-
-        // Act
-        const { wrapper } = setupMocks({
-            mixins: [mockMixin],
-
-            props: {
-                modelValue: mobileLocationQuestions,
-            },
-            mountOptions: {
-                attachTo: document.body,
-            },
-        });
-
-        await wrapper.vm.$nextTick();
-
-        expect(wrapper.props().modelValue.serviceZipCode).toBe("");
-
-        // Assert
-        expect(wrapper.vm.mobileFee).toEqual(0.0);
-    });
-
-    it.only("Should calculate the mobile fee price when loading the page and there is an existing service zip code", async () => {
-        // Arrange
-        const mobileLocationQuestions = {
-            addressQuestions: {
-                streetAddress: "555 Some St",
-                apartmentNumberOrBusinessName: "Apt 1",
-                city: "Funkytown",
-                state: "OH",
-                zipCode: "43235",
-            },
-            isVehicleProtected: true,
-            serviceZipCode: "43235",
-        };
-
-        // Act
-        const { wrapper } = setupMocks({
-            mixins: [mockMixin],
-
-            props: {
-                modelValue: mobileLocationQuestions,
-            },
-            mountOptions: {
-                attachTo: document.body,
-            },
-        });
-
-        await wrapper.vm.$nextTick();
-        await wrapper.vm.$nextTick();
-        await wrapper.vm.$nextTick();
-        await wrapper.vm.$nextTick();
-
-        console.log(wrapper.vm.mobileFee);
-
-        expect(wrapper.props().modelValue.serviceZipCode).toBe("43235");
-
-        // Assert
-        expect(wrapper.vm.mobileFee).toEqual(49.99);
-    });
 });
 
 function setupMocks({ mountOptions, mixins, props, isShallowMount = true }) {

From e05a1bf51babdf75e7e460f69da64d498c68624a Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 28 Feb 2023 10:32:03 -0500
Subject: [PATCH 209/261] Fixed service-location tests for new code

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

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index f83cdc624..8f3505cdc 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -8,6 +8,7 @@ import baseMixin from "@/mixins/base-mixin";
 import { nextTick } from "vue";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper.js";
+import { getMobileFee } from "@/helpers/service-location-helper";
 import store from "@/store";
 
 // Define Mocks
@@ -19,6 +20,10 @@ jest.mock("@/helpers/cms-content-helper", () => ({
     fetchCmsContentForPage: jest.fn(),
 }));
 
+jest.mock("@/helpers/service-location-helper", () => ({
+    getMobileFee: jest.fn(),
+}));
+
 jest.mock("@/store", () => ({
     commit: jest.fn(),
     dispatch: jest.fn(),
@@ -116,7 +121,7 @@ describe("service-location.vue", () => {
             expect(wrapper.vm.mobileLocationQuestions.serviceZipCode).toBe(newZip);
         });
 
-        test("updates service zip code serviceZipCodeQuestion when resetServiceZipCode is called", () => {
+        test.only("updates service zip code serviceZipCodeQuestion when resetServiceZipCode is called", () => {
             // Arrange
             const { wrapper } = setupMocks({});
             const newServiceZipCodeQuestion = {
@@ -163,6 +168,7 @@ function setupMocks({ mountOptionsMockData = {} }) {
 
     settleAllPromises.mockImplementation(() => apiPromise);
     fetchCmsContentForPage.mockImplementation(() => Promise.resolve());
+    getMobileFee.mockImplementation(() => Promise.resolve());
 
     const mountOptions = getMountOptions(mountOptionsMockData);
     const wrapper = shallowMount(serviceLocation, mountOptions);

From cdeed7226e33a1cb9823e3790e5607b927e6661f Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Tue, 28 Feb 2023 11:44:02 -0500
Subject: [PATCH 210/261] formatting

---
 src/helpers/service-location-helper.js            | 4 ++--
 src/helpers/service-location-helper.spec.js       | 2 +-
 src/layouts/service-location/service-location.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/helpers/service-location-helper.js b/src/helpers/service-location-helper.js
index 1f4a12f51..8f34de930 100644
--- a/src/helpers/service-location-helper.js
+++ b/src/helpers/service-location-helper.js
@@ -7,14 +7,14 @@ export async function getMobileFee(serviceZipCode) {
     }
 
     const zipCodeData = await baseMixin.methods.getZipCodeData(serviceZipCode);
-    
+
     // Get the Mobile Fee Part
     const mobileFeePart = await baseMixin.methods.dispatchStoreAction(
         storeActions.GET_MOBILE_FEE_PART,
         null,
         false
     );
-    
+
     // Get the Mobile Fee Part Price
     const pricingResults = await baseMixin.methods.dispatchStoreAction(
         storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
diff --git a/src/helpers/service-location-helper.spec.js b/src/helpers/service-location-helper.spec.js
index 66012402c..3d0843e10 100644
--- a/src/helpers/service-location-helper.spec.js
+++ b/src/helpers/service-location-helper.spec.js
@@ -1 +1 @@
-test.todo("some test to be written in the future");
\ No newline at end of file
+test.todo("some test to be written in the future");
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index f2339b218..6baac0029 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -104,7 +104,7 @@ export default {
         },
         setData(mobileFee) {
             if (mobileFee) {
-                this.mobileLocationQuestions.mobileFee = mobileFee
+                this.mobileLocationQuestions.mobileFee = mobileFee;
             }
         },
         getRegistrationAddressFromStore() {

From 4c4101a9df6f82a5b9a00bbef5c0025f58deeedc Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Tue, 28 Feb 2023 13:57:05 -0500
Subject: [PATCH 211/261] CSR-1012 | add back page prereqs for service-location
 and moved consts

---
 src/layouts/service-location/service-location.vue | 11 +++++------
 .../service-zip-modal-question.vue                | 15 +++++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 6baac0029..396906a25 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -95,12 +95,11 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            return true;
-            // (
-            //     store.getters.lineItems.supportingItems !== null &&
-            //     store.getters.order.serviceLocation.zipCode !== null &&
-            //     store.getters.payment.isInsurance !== null
-            // );
+            return (
+                store.getters.lineItems.supportingItems !== null &&
+                store.getters.order.serviceLocation.zipCode !== null &&
+                store.getters.payment.isInsurance !== null
+            );
         },
         setData(mobileFee) {
             if (mobileFee) {
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index aabab3be3..56af14db3 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -60,13 +60,16 @@ export default {
         linkWidgetName: String,
         modalWidgetName: String,
     },
+    setup() {
+        const textboxQuestionWidgetName = "ServiceZipQuestionWidget";
+        const alertInvalidZipWidgetName = "AlertInvalidZipWidget";
+
+        return {
+            textboxQuestionWidgetName,
+            alertInvalidZipWidgetName,
+        };
+    },
     computed: {
-        textboxQuestionWidgetName() {
-            return "ServiceZipQuestionWidget";
-        },
-        alertInvalidZipWidgetName() {
-            return "AlertInvalidZipWidget";
-        },
         serviceZipLinkText() {
             if (this.modelValue.zipCode && this.modelValue.zipCode.length > 0) {
                 return this.modelValue.state + ", " + this.modelValue.zipCode;

From 8d8d253bfcd1e9d782fe0f8609183e13f8925b58 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 1 Mar 2023 09:11:31 -0500
Subject: [PATCH 212/261] Preparing for additional unit tests of page and
 mobile location component

---
 src/helpers/service-location-helper.js        | 10 +--
 src/helpers/service-location-helper.spec.js   | 79 ++++++++++++++++++-
 .../mobile-location-modal-questions.vue       | 15 +++-
 .../service-location/service-location.vue     | 36 +++++----
 4 files changed, 113 insertions(+), 27 deletions(-)

diff --git a/src/helpers/service-location-helper.js b/src/helpers/service-location-helper.js
index 1f4a12f51..41f4be147 100644
--- a/src/helpers/service-location-helper.js
+++ b/src/helpers/service-location-helper.js
@@ -1,20 +1,20 @@
 import { storeActions } from "@/constants/store-actions";
 import baseMixin from "@/mixins/base-mixin.js";
 
-export async function getMobileFee(serviceZipCode) {
+export async function getPricedMobileFeePart(serviceZipCode) {
     if (!serviceZipCode) {
-        return 0;
+        return Promise.resolve(null);
     }
 
     const zipCodeData = await baseMixin.methods.getZipCodeData(serviceZipCode);
-    
+
     // Get the Mobile Fee Part
     const mobileFeePart = await baseMixin.methods.dispatchStoreAction(
         storeActions.GET_MOBILE_FEE_PART,
         null,
         false
     );
-    
+
     // Get the Mobile Fee Part Price
     const pricingResults = await baseMixin.methods.dispatchStoreAction(
         storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
@@ -26,5 +26,5 @@ export async function getMobileFee(serviceZipCode) {
         false
     );
 
-    return Promise.resolve(baseMixin.methods.getTotalLineItemPrice(pricingResults[0]));
+    return Promise.resolve(pricingResults[0]);
 }
diff --git a/src/helpers/service-location-helper.spec.js b/src/helpers/service-location-helper.spec.js
index 66012402c..9b1920fba 100644
--- a/src/helpers/service-location-helper.spec.js
+++ b/src/helpers/service-location-helper.spec.js
@@ -1 +1,78 @@
-test.todo("some test to be written in the future");
\ No newline at end of file
+import { getPricedMobileFeePart } from "./service-location-helper";
+import { storeActions } from "@/constants/store-actions";
+
+const mockStoreActionGetMobileFeePart = storeActions.GET_MOBILE_FEE_PART;
+const mockStoreActionPriceOrderItemsAndSaveServerData = storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA;
+
+jest.mock("@/mixins/base-mixin.js", () => ({
+    methods: {
+        getZipCodeData: jest.fn().mockImplementation(() => {
+            return Promise.resolve({
+                containsMilitaryBase: false,
+                isServiceable: true,
+                isValid: true,
+                state: "OH",
+                zipCodeCtu: "01820",
+            });
+        }),
+
+        dispatchStoreAction: jest.fn().mockImplementation((actionName) => {
+            if (actionName === mockStoreActionGetMobileFeePart) {
+                return Promise.resolve({
+                    data: {
+                        partNumber: "MOBILE FEE",
+                        description: "MOBILE FEE",
+                        partType: "FEE",
+                    },
+                });
+            }
+
+            if (actionName === mockStoreActionPriceOrderItemsAndSaveServerData) {
+                return Promise.resolve([
+                    {
+                        partNumber: "MOBILE FEE",
+                        description: "MOBILE FEE",
+                        partType: "FEE",
+                        laborAmount: 49.99,
+                        sellingPrice: 0,
+                        kitPrice: 0,
+                    },
+                ]);
+            }
+        }),
+
+    },
+}));
+
+describe("service-location-helper.js", () => {
+    it("Should return the null if no service zip code is passed in", async() => {
+        // Arrange / Act
+        const serviceZipCode = null;
+        const expected = null;
+
+        const result = await getPricedMobileFeePart(serviceZipCode);
+
+        // Assert
+        expect(result).toEqual(expected);
+    });    
+
+    it("Should return the priced mobile fee part", async() => {
+        // Arrange / Act
+        const serviceZipCode = "43235";
+        const expected = {
+            partNumber: "MOBILE FEE",
+            description: "MOBILE FEE",
+            partType: "FEE",
+            laborAmount: 49.99,
+            sellingPrice: 0,
+            kitPrice: 0,
+        }
+
+        const result = await getPricedMobileFeePart(serviceZipCode);
+
+        // Assert
+        expect(result).toEqual(expected);
+    });
+})
+
+//test.todo("some test to be written in the future");
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index a15709f67..ba7cc2fab 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -109,14 +109,21 @@ export default {
         },
         mobileFeeText() {
             const cmsContentText = this.getCmsContent("MobileFeeDisclaimerWidget", "Text");
-            if (this.modelValue.mobileFee === undefined) {
-                return cmsContentText.replaceAll("{custom:mobileFee}", 0);
-            }
-            return cmsContentText.replaceAll("{custom:mobileFee}", this.modelValue.mobileFee);
+            return cmsContentText.replaceAll("{custom:mobileFee}", this.mobileFee);
         },
         modalFooterText() {
             return this.getCmsContent(this.modalWidgetName, "FooterText");
         },
+        mobileFee() {
+            if (!this.modelValue.mobileFeePart) {
+                return 0;
+            }
+            return (
+                this.modelValue.mobileFeePart.laborAmount +
+                this.modelValue.mobileFeePart.sellingPrice +
+                this.modelValue.mobileFeePart.kitPrice
+            );
+        },
         addressModel: {
             get: function () {
                 return this.modelValue.addressQuestions;
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index f2339b218..6c7849216 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -6,7 +6,7 @@
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <serviceZipModalQuestion
                 v-model="serviceZipCodeQuestion"
-                @updated-service-zip-code="recalculateMobileFee"
+                @updated-service-zip-code="resetMobileFeePart"
                 ref="serviceZipCodeQuestion"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget" />
@@ -38,7 +38,7 @@ import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import { getMobileFee } from "@/helpers/service-location-helper";
+import { getPricedMobileFeePart } from "@/helpers/service-location-helper";
 import store from "@/store";
 
 export default {
@@ -66,13 +66,13 @@ export default {
             },
         };
     },
-    async beforeRouteEnter(to, from, next) {
+    async beforeRouteEnter(to, from, next) {   
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
-        const serviceZipCode = store.getters.order.serviceLocation.zipCode;
-        const mobileFeePromise = getMobileFee(serviceZipCode);
-
+        const serviceZipCode = store.getters.order.serviceLocation.zipCode;       
+        const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode);
+        
         // Settle promises and get results
         const promiseResultMap = [
             {
@@ -80,17 +80,19 @@ export default {
                 promise: cmsContentPromise,
             },
             {
-                resultKey: "mobileFee",
-                promise: mobileFeePromise,
+                resultKey: "mobileFeePart",
+                promise: mobileFeePartPromise,
             },
         ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
-
+        console.log(resultMap);
+        console.log(resultMap.cmsContent);
+        console.log(resultMap.mobileFeePart);
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
-            vm.setData(resultMap.mobileFee);
+            vm.setData(resultMap.mobileFeePart);
         });
     },
     methods: {
@@ -102,9 +104,9 @@ export default {
             //     store.getters.payment.isInsurance !== null
             // );
         },
-        setData(mobileFee) {
-            if (mobileFee) {
-                this.mobileLocationQuestions.mobileFee = mobileFee
+        setData(mobileFeePart) {
+            if (mobileFeePart) {
+                this.mobileLocationQuestions.mobileFeePart = mobileFeePart;
             }
         },
         getRegistrationAddressFromStore() {
@@ -128,9 +130,9 @@ export default {
         getIsServiceableFromStore() {
             return store.getters.order.serviceLocation.isServiceable;
         },
-        recalculateMobileFee(serviceZipCode) {
-            getMobileFee(serviceZipCode).then((mobileFee) => {
-                this.mobileLocationQuestions.mobileFee = mobileFee;
+        resetMobileFeePart(serviceZipCode) {
+            getPricedMobileFeePart(serviceZipCode).then((pricedMobileFeePart) => {
+                this.mobileLocationQuestions.mobileFeePart = pricedMobileFeePart;
             });
         },
         resetMobileLocation(updatedServiceZipCode) {
@@ -153,7 +155,7 @@ export default {
             this.serviceZipCodeQuestion.zipCode = newValue.zipCode;
             this.serviceZipCodeQuestion.isServiceable = newValue.isServiceable;
 
-            this.recalculateMobileFee(this.serviceZipCodeQuestion.zipCode);
+            this.resetMobileFeePart(this.serviceZipCodeQuestion.zipCode);
         },
         backButtonAction() {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);

From 50ae697faa9a4e07cabd6c15548ec9d2586681d9 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Wed, 1 Mar 2023 09:23:19 -0500
Subject: [PATCH 213/261] CSR-1012 removed only from test

---
 src/layouts/service-location/service-location.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 8f3505cdc..170de3d2f 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -121,7 +121,7 @@ describe("service-location.vue", () => {
             expect(wrapper.vm.mobileLocationQuestions.serviceZipCode).toBe(newZip);
         });
 
-        test.only("updates service zip code serviceZipCodeQuestion when resetServiceZipCode is called", () => {
+        test("updates service zip code serviceZipCodeQuestion when resetServiceZipCode is called", () => {
             // Arrange
             const { wrapper } = setupMocks({});
             const newServiceZipCodeQuestion = {

From 7304729717eea21de083d3614078205e631004c7 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Wed, 1 Mar 2023 10:09:45 -0500
Subject: [PATCH 214/261] CSR-969

Hide the home address lookup if a provided zip is in a state that prohibits it
---
 src/constants/endpoints.js        |  4 ++++
 src/constants/store-actions.js    |  1 +
 src/layouts/estimate/estimate.vue | 21 +++++++++++++++++++++
 src/store/index.js                |  7 +++++++
 4 files changed, 33 insertions(+)

diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 9f4c60d61..1fc6c2b8f 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -54,6 +54,10 @@ const endpoints = {
         url: "/vehicle/api/v1/vehicle/lookup-vin-by-address",
         method: "POST",
     },
+    IsVinByAddressPermissible: {
+        url: "/vehicle/api/v1/vehicle/is-vin-by-address-permissible",
+        method: "GET",
+    },
     GetPartsOrQuestions: {
         url: "/parts/api/v1/parts/parts-or-questions",
         method: "POST",
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 428280d40..c11356d69 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -13,6 +13,7 @@ const storeActions = {
     GET_DAMAGE_OPTIONS: "getDamageOptions",
     GET_EVOX_IMAGE: "getEvoxImage",
     IS_VIN_OPTIONAL_VEHICLE: "isVinOptionalVehicle",
+    IS_VIN_BY_ADDRESS_PERMISSIBLE: "isVinByAddressPermissible",
 
     // Lookup Actions
     LOOKUP_VEHICLE_BY_YMMS: "lookupVehicleByYmms",
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 4eafab25e..893f76cb8 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -112,6 +112,8 @@ import { experimentSettings } from "@/constants/experiments";
 import vinPagesMixin from "@/mixins/vin-pages-mixin";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
+import baseMixin from "@/mixins/base-mixin.js";
+import { queryStrings } from "@/constants/query-strings";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -145,12 +147,25 @@ export default {
         //Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
+        const zip = Object.hasOwn(to.query, queryStrings.ZIP_CODE) ? to.query.zipCode : null;
+        var vinByAddressPromise;
+        if (zip) {
+            vinByAddressPromise = baseMixin.methods.dispatchStoreAction(
+                storeActions.IS_VIN_BY_ADDRESS_PERMISSIBLE,
+                zip, false
+            );
+        }
+
         //Settle promises and get results
         const promiseResultMap = [
             {
                 resultKey: "cmsContent",
                 promise: cmsContentPromise,
             },
+            (zip != null && zip != undefined) && {
+                resultKey: "vinByAddress",
+                promise: vinByAddressPromise,
+            },
         ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
@@ -172,6 +187,12 @@ export default {
                 }
             }
 
+            if (zip){
+                var indexToRemove = resultMap.cmsContent.VinLookupMethod.Answers.findIndex(answer => answer.Name === 'HomeAddress')
+                if (indexToRemove){
+                    resultMap.cmsContent.VinLookupMethod.Answers.splice(indexToRemove, 1);
+                }
+            }
             vm.setCmsContent(resultMap.cmsContent);
         });
     },
diff --git a/src/store/index.js b/src/store/index.js
index 93a3e5a25..f42a950ea 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -530,6 +530,13 @@ export const actions = {
             },
         });
     },
+    isVinByAddressPermissible(context, zip) {
+        return globalMethods.callHttpClient({
+            method: endpoints.IsVinByAddressPermissible.method,
+            endpoint: `${endpoints.IsVinByAddressPermissible.url}?zipcode=${zip}`,
+            payload: {},
+        });
+    },
     getVehicleMakes(context, { year }) {
         return globalMethods.callHttpClient({
             method: endpoints.GetVehicleMakes.method,

From afcd713fdba5ef835c86245d8979d2dfb9ae2a56 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Wed, 1 Mar 2023 11:35:40 -0500
Subject: [PATCH 215/261] CSR-969 prettier

---
 src/layouts/estimate/estimate.vue | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 893f76cb8..722357e62 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -152,7 +152,8 @@ export default {
         if (zip) {
             vinByAddressPromise = baseMixin.methods.dispatchStoreAction(
                 storeActions.IS_VIN_BY_ADDRESS_PERMISSIBLE,
-                zip, false
+                zip,
+                false
             );
         }
 
@@ -162,10 +163,11 @@ export default {
                 resultKey: "cmsContent",
                 promise: cmsContentPromise,
             },
-            (zip != null && zip != undefined) && {
-                resultKey: "vinByAddress",
-                promise: vinByAddressPromise,
-            },
+            zip != null &&
+                zip != undefined && {
+                    resultKey: "vinByAddress",
+                    promise: vinByAddressPromise,
+                },
         ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
@@ -187,9 +189,11 @@ export default {
                 }
             }
 
-            if (zip){
-                var indexToRemove = resultMap.cmsContent.VinLookupMethod.Answers.findIndex(answer => answer.Name === 'HomeAddress')
-                if (indexToRemove){
+            if (zip) {
+                var indexToRemove = resultMap.cmsContent.VinLookupMethod.Answers.findIndex(
+                    (answer) => answer.Name === "HomeAddress"
+                );
+                if (indexToRemove) {
                     resultMap.cmsContent.VinLookupMethod.Answers.splice(indexToRemove, 1);
                 }
             }

From 9ec12c81bdc9e70005edb0d638f0a9003d5c5c80 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Thu, 2 Mar 2023 09:43:00 -0500
Subject: [PATCH 216/261] CSR-945 CSR-969

use lower case for querystring parms
---
 src/constants/query-strings.js                     |  2 +-
 src/layouts/estimate/estimate.vue                  | 12 ++++++++----
 .../license-plate-lookup/license-plate-lookup.vue  |  2 +-
 src/layouts/vin-lookup/vin-lookup.vue              |  2 +-
 src/router/index.js                                | 14 +++++++++++---
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/constants/query-strings.js b/src/constants/query-strings.js
index d2dbcf976..5ff1f636c 100644
--- a/src/constants/query-strings.js
+++ b/src/constants/query-strings.js
@@ -1,7 +1,7 @@
 const queryStrings = {
     FMG_PAGE: "fmgPage",
     START_TYPE: "start_type",
-    ZIP_CODE: "zipCode",
+    ZIP_CODE: "zipcode",
 };
 
 export { queryStrings };
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 722357e62..cfec5923d 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -134,7 +134,7 @@ export default {
     data() {
         return {
             selectedVinLookupMethod: null,
-            serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipCode,
+            serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
             emailAddress: this.getEmailFromStore(),
             displayInvalidZipAlert: false,
             displayNonServiceableZipAlert: false,
@@ -147,9 +147,13 @@ export default {
         //Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
-        const zip = Object.hasOwn(to.query, queryStrings.ZIP_CODE) ? to.query.zipCode : null;
+        const queryString = window.location.search;
+        const urlParams = new URLSearchParams(queryString);
+        const hasZip = urlParams.has(queryStrings.ZIP_CODE);
+        const zip = urlParams.get(queryStrings.ZIP_CODE);
+
         var vinByAddressPromise;
-        if (zip) {
+        if (hasZip) {
             vinByAddressPromise = baseMixin.methods.dispatchStoreAction(
                 storeActions.IS_VIN_BY_ADDRESS_PERMISSIBLE,
                 zip,
@@ -189,7 +193,7 @@ export default {
                 }
             }
 
-            if (zip) {
+            if (zip && resultMap.vinByAddress === false) {
                 var indexToRemove = resultMap.cmsContent.VinLookupMethod.Answers.findIndex(
                     (answer) => answer.Name === "HomeAddress"
                 );
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index ec54fd4f7..c97791937 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -152,7 +152,7 @@ export default {
     data() {
         return {
             licensePlate: this.getLicensePlateFromStore(),
-            registrationZipCode: this.getRegistrationZipFromStore() ?? this.$route.query.zipCode,
+            registrationZipCode: this.getRegistrationZipFromStore() ?? this.$route.query.zipcode,
             email: this.getEmailFromStore(),
             serviceZipCode: this.getServiceZipFromStore(),
             displayNonServiceableZipAlert: false,
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 17e981bc8..e42187b12 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -176,7 +176,7 @@ export default {
     data() {
         return {
             vin: this.getVinFromStore(),
-            serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipCode,
+            serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
             emailAddress: this.getEmailFromStore(),
             isCarIdDifferent: false,
             customAlertData: {},
diff --git a/src/router/index.js b/src/router/index.js
index 409ce0419..c94ef65e3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -265,14 +265,22 @@ async function navigate(
             fmgPage: destinationFmgPageValue,
         };
 
-        if (
-            Object.hasOwn(currentRoute.query, queryStrings.ZIP_CODE) &&
+        const queryString = window.location.search;
+        const urlParams = new URLSearchParams(queryString);
+        const lowerCaseParams = new URLSearchParams();
+        for (const [name, value] of urlParams) {
+            lowerCaseParams.append(name.toLowerCase(), value);
+        }
+        const hasZip = lowerCaseParams.has(queryStrings.ZIP_CODE);
+        const zip = lowerCaseParams.get(queryStrings.ZIP_CODE);
+
+        if (hasZip &&
             (store.getters.order.serviceLocation.zipCode === undefined ||
                 store.getters.order.serviceLocation.zipCode == null) &&
             (store.getters.order.vehicle.registration.zipCode === undefined ||
                 store.getters.order.vehicle.registration.zipCode == null)
         ) {
-            queryStringsObject[queryStrings.ZIP_CODE] = currentRoute.query.zipCode;
+            queryStringsObject[queryStrings.ZIP_CODE] = zip;
         }
 
         router.push({

From a29fb2b2a4b9ee3d05eea087d90784178d589d63 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Thu, 2 Mar 2023 09:46:53 -0500
Subject: [PATCH 217/261] CSR-945 CSR-946

prettier
---
 src/router/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/router/index.js b/src/router/index.js
index c94ef65e3..eb8e3947c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -274,7 +274,8 @@ async function navigate(
         const hasZip = lowerCaseParams.has(queryStrings.ZIP_CODE);
         const zip = lowerCaseParams.get(queryStrings.ZIP_CODE);
 
-        if (hasZip &&
+        if (
+            hasZip &&
             (store.getters.order.serviceLocation.zipCode === undefined ||
                 store.getters.order.serviceLocation.zipCode == null) &&
             (store.getters.order.vehicle.registration.zipCode === undefined ||

From e6625aeb341d657eaf4a9afbe86e7177d238620c Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 2 Mar 2023 14:04:55 -0500
Subject: [PATCH 218/261] Addl unit tests for service-location and tests for
 mobile-location-modal-question

---
 src/helpers/service-location-helper.spec.js   |  14 +-
 .../mobile-location-modal-questions.spec.js   | 210 ++++++++++++++++-
 .../mobile-location-modal-questions.vue       |   7 +-
 .../service-location/service-location.spec.js | 217 ++++++++++++++----
 .../service-location/service-location.vue     |  42 ++--
 5 files changed, 407 insertions(+), 83 deletions(-)

diff --git a/src/helpers/service-location-helper.spec.js b/src/helpers/service-location-helper.spec.js
index 9b1920fba..ac3eace06 100644
--- a/src/helpers/service-location-helper.spec.js
+++ b/src/helpers/service-location-helper.spec.js
@@ -2,7 +2,8 @@ import { getPricedMobileFeePart } from "./service-location-helper";
 import { storeActions } from "@/constants/store-actions";
 
 const mockStoreActionGetMobileFeePart = storeActions.GET_MOBILE_FEE_PART;
-const mockStoreActionPriceOrderItemsAndSaveServerData = storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA;
+const mockStoreActionPriceOrderItemsAndSaveServerData =
+    storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA;
 
 jest.mock("@/mixins/base-mixin.js", () => ({
     methods: {
@@ -40,12 +41,11 @@ jest.mock("@/mixins/base-mixin.js", () => ({
                 ]);
             }
         }),
-
     },
 }));
 
 describe("service-location-helper.js", () => {
-    it("Should return the null if no service zip code is passed in", async() => {
+    it("Should return the null if no service zip code is passed in", async () => {
         // Arrange / Act
         const serviceZipCode = null;
         const expected = null;
@@ -54,9 +54,9 @@ describe("service-location-helper.js", () => {
 
         // Assert
         expect(result).toEqual(expected);
-    });    
+    });
 
-    it("Should return the priced mobile fee part", async() => {
+    it("Should return the priced mobile fee part", async () => {
         // Arrange / Act
         const serviceZipCode = "43235";
         const expected = {
@@ -66,13 +66,13 @@ describe("service-location-helper.js", () => {
             laborAmount: 49.99,
             sellingPrice: 0,
             kitPrice: 0,
-        }
+        };
 
         const result = await getPricedMobileFeePart(serviceZipCode);
 
         // Assert
         expect(result).toEqual(expected);
     });
-})
+});
 
 //test.todo("some test to be written in the future");
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
index 7e5aaff8c..f7a2238c8 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
@@ -2,6 +2,7 @@ import mobileLocationModalQuestions from "./mobile-location-modal-questions";
 import { mount, shallowMount } from "@vue/test-utils";
 import { storeActions } from "@/constants/store-actions";
 import { getMountOptions } from "@/helpers/unit-test-helper.js";
+import modal from "@/digital-components/modal/modal";
 
 import crypto from "crypto";
 
@@ -42,7 +43,7 @@ const mockMixin = {
         }),
 
         getZipCodeData: jest.fn((zip) => {
-            if (zip === "43235") {
+            if (zip === "43235" || zip === "55555") {
                 return Promise.resolve({
                     containsMilitaryBase: false,
                     isServiceable: true,
@@ -128,6 +129,213 @@ describe("mobile-location-modal-questions.vue", () => {
         expect(wrapper.vm.internalModel.isVehicleProtected).toEqual(true);
         expect(wrapper.vm.internalModel.serviceZipCode).toEqual("55555");
     });
+
+    it("Should open the modal when the 'Enter your service address' link is clicked", async () => {
+        // Arrange
+        const mobileLocationQuestions = {
+            addressQuestions: {
+                streetAddress: "555 Some St",
+                apartmentNumberOrBusinessName: "Apt 1",
+                city: "Funkytown",
+                state: "OH",
+                zipCode: "55555",
+            },
+            isVehicleProtected: true,
+            serviceZipCode: "55555",
+        };
+
+        const { wrapper } = setupMocks({
+            mixins: [mockMixin],
+            props: {
+                modelValue: mobileLocationQuestions,
+            },
+            mountOptions: {
+                attachTo: document.body,
+            },
+        });
+
+        wrapper.vm.$refs.MobileLocationModalWidget.openModal = jest.fn();
+        const mobileLocationLink = wrapper.findComponent({ ref: "mobileLocationLink" });
+
+        // // Act
+        await mobileLocationLink.trigger("click-event");
+
+        // // Assert
+        expect(wrapper.vm.$refs.MobileLocationModalWidget.openModal).toHaveBeenCalled();
+    });
+
+    it("Should emit update:modelValue on setMobileLocation for a valid address and vehicle protection answer", async () => {
+        // Arrange
+        const mobileLocationQuestions = {
+            addressQuestions: {
+                streetAddress: "",
+                apartmentNumberOrBusinessName: "",
+                city: "",
+                state: "",
+                zipCode: "",
+            },
+            isVehicleProtected: true,
+            serviceZipCode: "",
+        };
+
+        const newMobileLocationQuestions = {
+            addressQuestions: {
+                streetAddress: "555 Some St",
+                apartmentNumberOrBusinessName: "Apt 1",
+                city: "Funkytown",
+                state: "OH",
+                zipCode: "55555",
+            },
+            isVehicleProtected: true,
+            serviceZipCode: "55555",
+        };
+
+        const wrapper = shallowMount(mobileLocationModalQuestions, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: mobileLocationQuestions,
+                linkWidgetName: linkWidgetName,
+                modalWidgetName: modalWidgetName,
+            },
+            attachTo: document.body,
+        });
+        wrapper.vm.$refs.MobileLocationModalWidget.closeModal = jest.fn();
+
+        // Act
+        wrapper.vm.internalModel = newMobileLocationQuestions;
+        await wrapper.vm.setMobileLocation();
+
+        let expectedEmit = [[newMobileLocationQuestions]];
+
+        // Assert
+        expect(wrapper.emitted("update:modelValue")).toEqual(expectedEmit);
+    });
+
+    it("Should not emit update:modelValue on setMobileLocation for an invalid address zip code", async () => {
+        // Arrange
+        const mobileLocationQuestions = {
+            addressQuestions: {
+                streetAddress: "",
+                apartmentNumberOrBusinessName: "",
+                city: "",
+                state: "",
+                zipCode: "",
+            },
+            isVehicleProtected: true,
+            serviceZipCode: "",
+        };
+
+        const newMobileLocationQuestions = {
+            addressQuestions: {
+                streetAddress: "555 Some St",
+                apartmentNumberOrBusinessName: "Apt 1",
+                city: "Funkytown",
+                state: "OH",
+                zipCode: "61000",
+            },
+            isVehicleProtected: true,
+            serviceZipCode: "61000",
+        };
+
+        const wrapper = shallowMount(mobileLocationModalQuestions, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: mobileLocationQuestions,
+                linkWidgetName: linkWidgetName,
+                modalWidgetName: modalWidgetName,
+            },
+            attachTo: document.body,
+        });
+        wrapper.vm.$refs.MobileLocationModalWidget.closeModal = jest.fn();
+
+        // Act
+        wrapper.vm.internalModel = newMobileLocationQuestions;
+        await wrapper.vm.setMobileLocation();
+
+        // Assert
+        expect(wrapper.emitted("update:modelValue")).not.toBeTruthy();
+    });
+
+    it("Should display invalid zip alert for invalid address zip inputs", async () => {
+        // Arrange
+        const mobileLocationQuestions = {
+            addressQuestions: {
+                streetAddress: "",
+                apartmentNumberOrBusinessName: "",
+                city: "",
+                state: "",
+                zipCode: "",
+            },
+            isVehicleProtected: true,
+            serviceZipCode: "",
+        };
+
+        const newMobileLocationQuestions = {
+            addressQuestions: {
+                streetAddress: "555 Some St",
+                apartmentNumberOrBusinessName: "Apt 1",
+                city: "Funkytown",
+                state: "OH",
+                zipCode: "11111",
+            },
+            isVehicleProtected: true,
+            serviceZipCode: "11111",
+        };
+
+        const wrapper = shallowMount(mobileLocationModalQuestions, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: mobileLocationQuestions,
+                linkWidgetName: linkWidgetName,
+                modalWidgetName: modalWidgetName,
+            },
+            attachTo: document.body,
+        });
+
+        wrapper.vm.internalModel = newMobileLocationQuestions;
+
+        // Act
+        await wrapper.vm.setMobileLocation();
+
+        // Assert
+        expect(wrapper.vm.displayInvalidZipAlert).toBe(true);
+    });
+
+    it("Should clear the internal model when resetModel is called", async () => {
+        // Arrange
+        const mobileLocationQuestions = {
+            addressQuestions: {
+                streetAddress: "555 Some St",
+                apartmentNumberOrBusinessName: "Apt 1",
+                city: "Funkytown",
+                state: "OH",
+                zipCode: "55555",
+            },
+            isVehicleProtected: true,
+            serviceZipCode: "55555",
+        };
+
+        const { wrapper } = setupMocks({
+            mixins: [mockMixin],
+            props: {
+                modelValue: mobileLocationQuestions,
+            },
+            mountOptions: {
+                attachTo: document.body,
+            },
+        });
+
+        // Act
+        wrapper.vm.resetModel();
+
+        // Assert
+        expect(wrapper.vm.internalModel.addressQuestions.streetAddress).toEqual("");
+        expect(wrapper.vm.internalModel.addressQuestions.apartmentNumberOrBusinessName).toEqual("");
+        expect(wrapper.vm.internalModel.addressQuestions.city).toEqual("");
+        expect(wrapper.vm.internalModel.addressQuestions.state).toEqual("");
+        expect(wrapper.vm.internalModel.addressQuestions.zipCode).toEqual("");
+        expect(wrapper.vm.internalModel.isVehicleProtected).toEqual(null);
+    });
 });
 
 function setupMocks({ mountOptions, mixins, props, isShallowMount = true }) {
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index ba7cc2fab..644a875d3 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -7,6 +7,7 @@
             v-html="mobileLocationLinkPromptText"></label>
         <div class="update-mobile-location-text-link">
             <textLink
+                ref="mobileLocationLink"
                 id="mobileLocationLinkPromptId"
                 linkType="text"
                 :text="this.mobileLocationLinkText"
@@ -54,7 +55,7 @@ import textBlock from "@/digital-components/text-block/text-block";
 
 export default {
     name: "mobile-location-modal-questions",
-    emits: ["update:modelValue"], // The component emits an event
+    emits: ["update:modelValue", "updated-zip-code"], // The component emits an event
     data() {
         return {
             internalModel: this.copyModel(this.modelValue),
@@ -135,10 +136,6 @@ export default {
             return { ...modelToCopy };
         },
 
-        setServiceZipCode(serviceZipCode) {
-            this.internalModel.serviceZipCode = serviceZipCode;
-        },
-
         openModal() {
             this.$refs[this.modalName].openModal();
         },
diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 8f3505cdc..6e09b6fa3 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -4,24 +4,38 @@ import serviceLocation from "@/layouts/service-location/service-location.vue";
 // Supporting files
 import { shallowMount } from "@vue/test-utils";
 import { getMountOptions } from "@/helpers/unit-test-helper";
-import baseMixin from "@/mixins/base-mixin";
-import { nextTick } from "vue";
-import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
-import { settleAllPromises } from "@/helpers/layout-helper.js";
-import { getMobileFee } from "@/helpers/service-location-helper";
+
 import store from "@/store";
+import baseMixin from "@/mixins/base-mixin";
 
 // Define Mocks
-jest.mock("@/helpers/layout-helper.js", () => ({
-    settleAllPromises: jest.fn(),
+jest.mock("@/helpers/cms-content-helper", () => ({
+    fetchCmsContentForPage: jest.fn(() => {
+        return Promise.resolve("content");
+    }),
 }));
 
-jest.mock("@/helpers/cms-content-helper", () => ({
-    fetchCmsContentForPage: jest.fn(),
-}));
+const mockGetPricedMobileFeePart = (mockServiceZipCode) => {
+    let mobileFeePart = {};
+
+    if (mockServiceZipCode === "43235") {
+        mobileFeePart = {
+            partNumber: "MOBILE FEE",
+            description: "MOBILE FEE",
+            partType: "FEE",
+            laborAmount: 49.99,
+            sellingPrice: 0,
+            kitPrice: 0,
+        };
+    }
+
+    return Promise.resolve(mobileFeePart);
+};
 
 jest.mock("@/helpers/service-location-helper", () => ({
-    getMobileFee: jest.fn(),
+    getPricedMobileFeePart: jest.fn((mockServiceZipCode) => {
+        return mockGetPricedMobileFeePart(mockServiceZipCode);
+    }),
 }));
 
 jest.mock("@/store", () => ({
@@ -55,16 +69,43 @@ beforeEach(() => {
         },
         vehicle: {
             registration: {
-                address: undefined,
-                city: undefined,
-                state: undefined,
-                zipCode: undefined,
+                address: "5555 Sulgrave Dr",
+                city: "New Albany",
+                state: "OH",
+                zipCode: "43054",
             },
         },
     };
 });
 
 describe("service-location.vue", () => {
+    describe("beforeRouteEnter", () => {
+        test("on load sets the mobile fee part when an service zip code has already been provided", async () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+
+            const mobileFeePart = {
+                partNumber: "MOBILE FEE",
+                description: "MOBILE FEE",
+                partType: "FEE",
+                laborAmount: 49.99,
+                sellingPrice: 0,
+                kitPrice: 0,
+            };
+
+            // Act
+            await serviceLocation.beforeRouteEnter.call(
+                wrapper.vm,
+                { query: { fmgPage: "serviceLocation" } },
+                undefined,
+                (c) => c(wrapper.vm)
+            );
+
+            // Assert
+            expect(wrapper.vm.mobileLocationQuestions.mobileFeePart).toStrictEqual(mobileFeePart);
+        });
+    });
+
     describe("arePagePrerequisitesValid", () => {
         test("No prerequisites set: Should return false.", () => {
             const { wrapper } = setupMocks({});
@@ -108,55 +149,147 @@ describe("service-location.vue", () => {
     });
 
     describe("updating service zip", () => {
-        test("resets mobile location when service zip code is updated", () => {
+        test("updates the page model after providing the service zip code", () => {
             // Arrange
             const { wrapper } = setupMocks({});
-            const newZip = "61606";
-
-            // Act
             wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
-            wrapper.vm.resetMobileLocation(newZip);
 
-            // Assert
-            expect(wrapper.vm.mobileLocationQuestions.serviceZipCode).toBe(newZip);
-        });
-
-        test.only("updates service zip code serviceZipCodeQuestion when resetServiceZipCode is called", () => {
-            // Arrange
-            const { wrapper } = setupMocks({});
             const newServiceZipCodeQuestion = {
                 zipCode: "61606",
                 state: "IL",
                 isServiceable: true,
             };
 
+            const serviceZipCodeComponent = wrapper.findComponent({
+                ref: "serviceZipCodeQuestion",
+            });
+
             // Act
-            wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
-            wrapper.vm.resetServiceZipCode(newServiceZipCodeQuestion);
+            serviceZipCodeComponent.vm.$emit("update:modelValue", newServiceZipCodeQuestion);
 
             // Assert
             expect(wrapper.vm.serviceZipCodeQuestion).toStrictEqual(newServiceZipCodeQuestion);
         });
 
-        test("resets mobile location in watch for serviceZipCodeQuestion", async () => {
+        test("resets mobile location when service zip code is updated", () => {
             // Arrange
             const { wrapper } = setupMocks({});
-            const newServiceZipCodeQuestion = {
-                zipCode: "61606",
-                state: "IL",
+            wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
+            wrapper.vm.$refs.serviceZipCodeQuestion.resetMobileFeePart = jest.fn();
+
+            const mobileLocationQuestions = {
+                addressQuestions: {
+                    streetAddress: "5555 Sulgrave Dr",
+                    apartmentNumberOrBusinessName: "Apt 1",
+                    city: "New Albany",
+                    state: "OH",
+                    zipCode: "43054",
+                },
+                isVehicleProtected: true,
+                serviceZipCode: "43054",
+                mobileFee: 0,
+            };
+            wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
+
+            const newMobileLocationQuestions = {
+                addressQuestions: {
+                    streetAddress: "",
+                    apartmentNumberOrBusinessName: "",
+                    city: "",
+                    state: "",
+                    zipCode: "",
+                },
+                isVehicleProtected: null,
+                serviceZipCode: "43081",
+            };
+
+            const serviceZipCodeComponent = wrapper.findComponent({
+                ref: "serviceZipCodeQuestion",
+            });
+
+            // Act
+            serviceZipCodeComponent.vm.$emit("updated-service-zip-code", "43081");
+
+            // Assert
+            expect(wrapper.vm.mobileLocationQuestions).toStrictEqual(newMobileLocationQuestions);
+        });
+    });
+
+    describe("updating mobile location", () => {
+        test("updates the page model after providing the mobile location", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+            wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
+
+            const mobileLocationQuestions = {
+                addressQuestions: {
+                    streetAddress: "",
+                    apartmentNumberOrBusinessName: "",
+                    city: "",
+                    state: "",
+                    zipCode: "",
+                },
+                isVehicleProtected: null,
+                serviceZipCode: "43081",
+            };
+            wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
+
+            const newMobileLocationQuestions = {
+                addressQuestions: {
+                    streetAddress: "5555 Sulgrave Dr",
+                    apartmentNumberOrBusinessName: "Apt 1",
+                    city: "New Albany",
+                    state: "OH",
+                    zipCode: "43054",
+                },
+                isVehicleProtected: true,
+                serviceZipCode: "43054",
+                mobileFee: 0,
+            };
+
+            const mobileLocationComponent = wrapper.findComponent({
+                ref: "mobileLocationModalQuestions",
+            });
+
+            // Act
+            mobileLocationComponent.vm.$emit("update:modelValue", newMobileLocationQuestions);
+
+            // Assert
+            expect(wrapper.vm.mobileLocationQuestions).toStrictEqual(newMobileLocationQuestions);
+        });
+
+        test("resets service zip code when mobile location is updated", async () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+            wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
+            wrapper.vm.$refs.serviceZipCodeQuestion.resetMobileFeePart = jest.fn();
+
+            const serviceZipCodeInfo = {
+                state: "OH",
+                zipCode: "43054",
                 isServiceable: true,
             };
 
-            // Act
-            wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
-            wrapper.vm.serviceZipCodeQuestion = newServiceZipCodeQuestion;
+            const newServiceZipCodeInfo = {
+                state: "OH",
+                zipCode: "43081",
+                isServiceable: true,
+            };
+            wrapper.vm.serviceZipCodeQuestion = serviceZipCodeInfo;
 
-            await wrapper.vm.$nextTick();
+            const mobileLocationComponent = wrapper.findComponent({
+                ref: "mobileLocationModalQuestions",
+            });
+
+            // Act
+            mobileLocationComponent.vm.$emit("updated-zip-code", {
+                state: "OH",
+                zipCode: "43081",
+                isServiceable: true,
+            });
 
             // Assert
-            expect(wrapper.vm.mobileLocationQuestions.serviceZipCode).toStrictEqual(
-                newServiceZipCodeQuestion.zipCode
-            );
+            expect(wrapper.vm.serviceZipCodeQuestion).toStrictEqual(newServiceZipCodeInfo);
         });
     });
 });
@@ -166,10 +299,6 @@ function setupMocks({ mountOptionsMockData = {} }) {
 
     const apiPromise = Promise.resolve(apiResponses);
 
-    settleAllPromises.mockImplementation(() => apiPromise);
-    fetchCmsContentForPage.mockImplementation(() => Promise.resolve());
-    getMobileFee.mockImplementation(() => Promise.resolve());
-
     const mountOptions = getMountOptions(mountOptionsMockData);
     const wrapper = shallowMount(serviceLocation, mountOptions);
     wrapper.vm.setCmsContent = baseMixin.methods.setCmsContent;
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 6c7849216..ca6065d45 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -6,7 +6,7 @@
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <serviceZipModalQuestion
                 v-model="serviceZipCodeQuestion"
-                @updated-service-zip-code="resetMobileFeePart"
+                @updated-service-zip-code="resetMobileLocation"
                 ref="serviceZipCodeQuestion"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget" />
@@ -66,13 +66,13 @@ export default {
             },
         };
     },
-    async beforeRouteEnter(to, from, next) {   
+    async beforeRouteEnter(to, from, next) {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
-        const serviceZipCode = store.getters.order.serviceLocation.zipCode;       
+        const serviceZipCode = store.getters.order.serviceLocation.zipCode;
         const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode);
-        
+
         // Settle promises and get results
         const promiseResultMap = [
             {
@@ -86,9 +86,7 @@ export default {
         ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
-        console.log(resultMap);
-        console.log(resultMap.cmsContent);
-        console.log(resultMap.mobileFeePart);
+
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
@@ -97,12 +95,11 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            return true;
-            // (
-            //     store.getters.lineItems.supportingItems !== null &&
-            //     store.getters.order.serviceLocation.zipCode !== null &&
-            //     store.getters.payment.isInsurance !== null
-            // );
+            return (
+                store.getters.lineItems.supportingItems !== null &&
+                store.getters.order.serviceLocation.zipCode !== null &&
+                store.getters.payment.isInsurance !== null
+            );
         },
         setData(mobileFeePart) {
             if (mobileFeePart) {
@@ -149,11 +146,13 @@ export default {
             };
 
             this.$refs.mobileLocationModalQuestions.resetComponent();
+
+            this.resetMobileFeePart(updatedServiceZipCode);
         },
-        resetServiceZipCode(newValue) {
-            this.serviceZipCodeQuestion.state = newValue.state;
-            this.serviceZipCodeQuestion.zipCode = newValue.zipCode;
-            this.serviceZipCodeQuestion.isServiceable = newValue.isServiceable;
+        resetServiceZipCode(updatedServiceZipInfo) {
+            this.serviceZipCodeQuestion.state = updatedServiceZipInfo.state;
+            this.serviceZipCodeQuestion.zipCode = updatedServiceZipInfo.zipCode;
+            this.serviceZipCodeQuestion.isServiceable = updatedServiceZipInfo.isServiceable;
 
             this.resetMobileFeePart(this.serviceZipCodeQuestion.zipCode);
         },
@@ -164,15 +163,6 @@ export default {
             navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
         },
     },
-    watch: {
-        serviceZipCodeQuestion: {
-            handler(newValue, oldValue) {
-                if (newValue !== oldValue) {
-                    this.resetMobileLocation(newValue.zipCode);
-                }
-            },
-        },
-    },
     components: {
         serviceZipModalQuestion,
         mobileLocationModalQuestions,

From 7f528ae029b443db9991bc96547a05933cbe004f Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Thu, 2 Mar 2023 14:56:55 -0500
Subject: [PATCH 219/261] CSR-1012 zip textbox in modal has rounded-pill
 corners

---
 .../service-zip-question/service-zip-question.vue                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.vue
index 979094523..9841c5b16 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question.vue
@@ -5,6 +5,7 @@
         v-model="value"
         inputId="serviceZipCode"
         questionAlignment="center"
+        cornerStyle="rounded"
         mask="#####"
         :displayQuestionText="false"
         isRequired

From b779b948d623783b08c1838cb76e03a74dd03790 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 3 Mar 2023 10:15:48 -0500
Subject: [PATCH 220/261] Completed unit tests

---
 src/helpers/object-cloning-helper.js          | 27 +++++++++++
 src/helpers/object-cloning-helper.spec.js     | 48 +++++++++++++++++++
 src/helpers/service-location-helper.spec.js   | 10 ++--
 .../mobile-location-modal-questions.vue       | 20 ++++----
 .../service-location/service-location.vue     | 11 +++--
 5 files changed, 97 insertions(+), 19 deletions(-)
 create mode 100644 src/helpers/object-cloning-helper.js
 create mode 100644 src/helpers/object-cloning-helper.spec.js

diff --git a/src/helpers/object-cloning-helper.js b/src/helpers/object-cloning-helper.js
new file mode 100644
index 000000000..45899973f
--- /dev/null
+++ b/src/helpers/object-cloning-helper.js
@@ -0,0 +1,27 @@
+// For nested objects, spread operator only creates new references to the top level fields,
+// the remaining nested fields actually reference the original object which can introduce problems.
+
+// The purpose of this method is to deep clone the data in an object recursively, this is useful
+// for cloning modelValues to internal models when regular two-way binding is not an option.
+// See: mobile-location-modal-questions.vue
+
+// Creates a deep clone of an object. Clones primitives, arrays and objects, excluding class instances.
+// https://www.30secondsofcode.org/js/s/deep-clone
+export function deepClone(object) {
+    if (object === null) {
+        return null;
+    }
+
+    let clone = Object.assign({}, object);
+    Object.keys(clone).forEach(
+        (key) =>
+            (clone[key] = typeof object[key] === "object" ? deepClone(object[key]) : object[key])
+    );
+
+    if (Array.isArray(object)) {
+        clone.length = object.length;
+        return Array.from(clone);
+    }
+
+    return clone;
+}
diff --git a/src/helpers/object-cloning-helper.spec.js b/src/helpers/object-cloning-helper.spec.js
new file mode 100644
index 000000000..6408992d8
--- /dev/null
+++ b/src/helpers/object-cloning-helper.spec.js
@@ -0,0 +1,48 @@
+import { deepClone } from "./object-cloning-helper";
+
+describe("object-cloning-helper.js", () => {
+    it("Should return null if no object is passed in", async () => {
+        // Arrange
+        const expected = null;
+
+        // Act
+        const result = deepClone(null);
+
+        // Assert
+        expect(result).toEqual(expected);
+    });
+
+    it("Should return a deep copy of the object", async () => {
+        // Arrange
+
+        const object = {
+            addressQuestions: {
+                streetAddress: "555 Some St",
+                apartmentNumberOrBusinessName: "Apt 1",
+                city: "Funkytown",
+                state: "OH",
+                zipCode: "55555",
+            },
+            isVehicleProtected: true,
+            serviceZipCode: "55555",
+        };
+
+        const expected = {
+            addressQuestions: {
+                streetAddress: "555 Some St",
+                apartmentNumberOrBusinessName: "Apt 1",
+                city: "Funkytown",
+                state: "OH",
+                zipCode: "55555",
+            },
+            isVehicleProtected: true,
+            serviceZipCode: "55555",
+        };
+
+        // Act
+        const result = deepClone(object);
+
+        // Assert
+        expect(result).toStrictEqual(expected);
+    });
+});
diff --git a/src/helpers/service-location-helper.spec.js b/src/helpers/service-location-helper.spec.js
index ac3eace06..345e4c807 100644
--- a/src/helpers/service-location-helper.spec.js
+++ b/src/helpers/service-location-helper.spec.js
@@ -45,11 +45,12 @@ jest.mock("@/mixins/base-mixin.js", () => ({
 }));
 
 describe("service-location-helper.js", () => {
-    it("Should return the null if no service zip code is passed in", async () => {
-        // Arrange / Act
+    it("Should return null if no service zip code is passed in", async () => {
+        // Arrange
         const serviceZipCode = null;
         const expected = null;
 
+        // Act
         const result = await getPricedMobileFeePart(serviceZipCode);
 
         // Assert
@@ -57,7 +58,7 @@ describe("service-location-helper.js", () => {
     });
 
     it("Should return the priced mobile fee part", async () => {
-        // Arrange / Act
+        // Arrange
         const serviceZipCode = "43235";
         const expected = {
             partNumber: "MOBILE FEE",
@@ -68,11 +69,10 @@ describe("service-location-helper.js", () => {
             kitPrice: 0,
         };
 
+        // Act
         const result = await getPricedMobileFeePart(serviceZipCode);
 
         // Assert
         expect(result).toEqual(expected);
     });
 });
-
-//test.todo("some test to be written in the future");
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 644a875d3..0632ef9ae 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -10,7 +10,7 @@
                 ref="mobileLocationLink"
                 id="mobileLocationLinkPromptId"
                 linkType="text"
-                :text="this.mobileLocationLinkText"
+                :text="mobileLocationLinkText"
                 href="#!"
                 @click-event="openModal"
                 aria-label="Modal window" />
@@ -47,18 +47,21 @@
 <script>
 // Components
 import textLink from "@/ux-components/text-link/text-link";
+import textBlock from "@/digital-components/text-block/text-block";
 import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
-import textBlock from "@/digital-components/text-block/text-block";
+
+// Helpers
+import { deepClone } from "@/helpers/object-cloning-helper";
 
 export default {
     name: "mobile-location-modal-questions",
     emits: ["update:modelValue", "updated-zip-code"], // The component emits an event
     data() {
         return {
-            internalModel: this.copyModel(this.modelValue),
+            internalModel: deepClone(this.modelValue),
             displayInvalidZipAlert: false,
             modalName: "MobileLocationModalWidget",
         };
@@ -132,10 +135,6 @@ export default {
         },
     },
     methods: {
-        copyModel(modelToCopy) {
-            return { ...modelToCopy };
-        },
-
         openModal() {
             this.$refs[this.modalName].openModal();
         },
@@ -191,8 +190,11 @@ export default {
         },
     },
     watch: {
-        modelValue(newValue) {
-            this.internalModel = this.copyModel(newValue);
+        modelValue: {
+            handler(newValue) {
+                this.internalModel = deepClone(newValue);
+            },
+            deep: true,
         },
     },
     components: {
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index ca6065d45..7210c2bfa 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -95,11 +95,12 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            return (
-                store.getters.lineItems.supportingItems !== null &&
-                store.getters.order.serviceLocation.zipCode !== null &&
-                store.getters.payment.isInsurance !== null
-            );
+            return true;
+            // return (
+            //     store.getters.lineItems.supportingItems !== null &&
+            //     store.getters.order.serviceLocation.zipCode !== null &&
+            //     store.getters.payment.isInsurance !== null
+            // );
         },
         setData(mobileFeePart) {
             if (mobileFeePart) {

From ebbc522c1c60fbf61df711458f5b068e36417ab6 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Fri, 3 Mar 2023 15:07:45 -0500
Subject: [PATCH 221/261] Flattened the data model at the page level

---
 .../mobile-location-modal-questions.vue       |  15 +--
 .../service-location/service-location.vue     | 113 ++++++++++--------
 .../service-zip-modal-question.vue            |   2 -
 3 files changed, 64 insertions(+), 66 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 0632ef9ae..ecd1345f0 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -79,7 +79,7 @@ export default {
                 },
                 isVehicleProtected: null,
                 serviceZipCode: "",
-                mobileFee: 0,
+                mobileFeePart: null,
             }),
         },
         isZipServiceableMobile: Boolean,
@@ -138,11 +138,9 @@ export default {
         openModal() {
             this.$refs[this.modalName].openModal();
         },
-
         closeModal() {
             this.$refs[this.modalName].closeModal();
         },
-
         resetComponent() {
             this.resetModel();
 
@@ -158,8 +156,6 @@ export default {
             this.internalModel.addressQuestions.streetAddress = "";
             this.internalModel.addressQuestions.apartmentNumberOrBusinessName = "";
             this.internalModel.addressQuestions.city = "";
-            this.internalModel.addressQuestions.state = "";
-            this.internalModel.addressQuestions.zipCode = "";
 
             // Is Vehicle Protected
             this.internalModel.isVehicleProtected = null;
@@ -175,16 +171,7 @@ export default {
                 this.displayInvalidZipAlert = true;
             } else {
                 // Update the page level model
-                this.internalModel.serviceZipCode = this.internalModel.addressQuestions.zipCode;
                 this.$emit("update:modelValue", this.internalModel);
-
-                // Emit the update service zip code information to the parent to update the service zipcode details
-                this.$emit("updated-zip-code", {
-                    zipCode: this.internalModel.addressQuestions.zipCode,
-                    state: zipCodeData.state,
-                    isServiceable: zipCodeData.isServiceable,
-                });
-
                 this.closeModal();
             }
         },
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 7210c2bfa..1be600ed8 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -12,7 +12,6 @@
                 modalWidgetName="ServiceZipModalWidget" />
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
-                @updated-zip-code="resetServiceZipCode"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />
@@ -45,25 +44,15 @@ export default {
     name: "service-location",
     data() {
         return {
+            streetAddress: this.getServiceAddressFromStore(),
+            apartmentNumberOrBusinessName: "",
+            city: this.getServiceCityFromStore(),
+            state: this.getServiceStateFromStore(),
+            zipCode: this.getServiceZipCodeFromStore(),
+            isServiceable: false,
             isZipServiceableMobile: null,
             isZipServiceableInShop: null,
-            serviceZipCodeQuestion: {
-                state: this.getServiceStateFromStore(),
-                zipCode: this.getServiceZipCodeFromStore(),
-                isServiceable: this.getIsServiceableFromStore(),
-            },
-            mobileLocationQuestions: {
-                addressQuestions: {
-                    streetAddress: this.getRegistrationAddressFromStore(),
-                    apartmentNumberOrBusinessName: "",
-                    city: this.getRegistrationCityFromStore(),
-                    state: this.getRegistrationStateFromStore(),
-                    zipCode: this.getRegistrationZipFromStore(),
-                },
-                isVehicleProtected: null,
-                serviceZipCode: this.getServiceZipCodeFromStore(),
-                mobileFee: 0,
-            },
+            mobileFeePart: null,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -93,6 +82,50 @@ export default {
             vm.setData(resultMap.mobileFeePart);
         });
     },
+    computed: {
+        serviceZipCodeQuestion: {
+            get: function () {
+                return {
+                    state: this.state,
+                    zipCode: this.zipCode,
+                    isServiceable: this.isServiceable,
+                };
+            },
+            set: function (newValue) {
+                if (newValue.zipCode !== this.zipCode) {
+                    this.resetMobileLocation(this.zipCode);
+                }
+
+                this.state = newValue.state;
+                this.zipCode = newValue.zipCode;
+                this.isServiceable = newValue.isServiceable;
+            },
+        },
+        mobileLocationQuestions: {
+            get: function () {
+                return {
+                    addressQuestions: {
+                        streetAddress: this.streetAddress,
+                        apartmentNumberOrBusinessName: this.apartmentNumberOrBusinessName,
+                        city: this.city,
+                        state: this.state,
+                        zipCode: this.zipCode,
+                    },
+                    isVehicleProtected: this.isVehicleProtected,
+                    mobileFeePart: this.mobileFeePart
+                };
+            },
+            set: function (newValue) {
+                this.streetAddress = newValue.addressQuestions.streetAddress;
+                this.apartmentNumberOrBusinessName = newValue.addressQuestions.apartmentNumberOrBusinessName,
+                this.city = newValue.addressQuestions.city;
+                this.state = newValue.addressQuestions.state;
+                this.zipCode = newValue.addressQuestions.zipCode;
+                this.isVehicleProtected = newValue.isVehicleProtected,
+                this.mobileFeePart = newValue.mobileFeePart;
+            },
+        },
+    },
     methods: {
         arePagePrerequisitesValid() {
             return true;
@@ -104,27 +137,21 @@ export default {
         },
         setData(mobileFeePart) {
             if (mobileFeePart) {
-                this.mobileLocationQuestions.mobileFeePart = mobileFeePart;
+                this.mobileFeePart = mobileFeePart;
             }
         },
-        getRegistrationAddressFromStore() {
-            return store.getters.vehicle.registration.address;
+        getServiceAddressFromStore() {
+            return store.getters.order.serviceLocation.address;
         },
-        getRegistrationCityFromStore() {
-            return store.getters.vehicle.registration.city;
-        },
-        getRegistrationStateFromStore() {
-            return store.getters.vehicle.registration.state;
-        },
-        getRegistrationZipFromStore() {
-            return store.getters.vehicle.registration.zipCode;
-        },
-        getServiceZipCodeFromStore() {
-            return store.getters.order.serviceLocation.zipCode;
+        getServiceCityFromStore() {
+            return store.getters.order.serviceLocation.city;
         },
         getServiceStateFromStore() {
             return store.getters.order.serviceLocation.state;
         },
+        getServiceZipCodeFromStore() {
+            return store.getters.order.serviceLocation.zipCode;
+        },
         getIsServiceableFromStore() {
             return store.getters.order.serviceLocation.isServiceable;
         },
@@ -134,29 +161,15 @@ export default {
             });
         },
         resetMobileLocation(updatedServiceZipCode) {
-            this.mobileLocationQuestions = {
-                addressQuestions: {
-                    streetAddress: "",
-                    apartmentNumberOrBusinessName: "",
-                    city: "",
-                    state: "",
-                    zipCode: "",
-                },
-                isVehicleProtected: null,
-                serviceZipCode: updatedServiceZipCode,
-            };
+            this.streetAddress = "";
+            this.apartmentNumberOrBusinessName = "",
+            this.city = "",
+            this.isVehicleProtected = null;
 
             this.$refs.mobileLocationModalQuestions.resetComponent();
 
             this.resetMobileFeePart(updatedServiceZipCode);
         },
-        resetServiceZipCode(updatedServiceZipInfo) {
-            this.serviceZipCodeQuestion.state = updatedServiceZipInfo.state;
-            this.serviceZipCodeQuestion.zipCode = updatedServiceZipInfo.zipCode;
-            this.serviceZipCodeQuestion.isServiceable = updatedServiceZipInfo.isServiceable;
-
-            this.resetMobileFeePart(this.serviceZipCodeQuestion.zipCode);
-        },
         backButtonAction() {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index aabab3be3..2748e8879 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -139,8 +139,6 @@ export default {
                 this.internalModel.state = zipCodeData.state;
                 this.internalModel.isServiceable = zipCodeData.isServiceable;
 
-                this.$emit("updated-service-zip-code", this.internalModel.zipCode);
-
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
 

From 586be19eb4d6e901d4b3e49528b546fef5d47d6e Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 6 Mar 2023 07:57:49 -0500
Subject: [PATCH 222/261] Relocated mobileLocationLinkPromptId to page level so
 that service-zip and mobile-location are the same

---
 .../mobile-location-modal-questions.vue       | 28 -------------
 .../service-location/service-location.vue     | 42 ++++++++++++++++---
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index ecd1345f0..7523e6c83 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -1,10 +1,5 @@
 <template>
     <div class="text-center">
-        <label
-            for="mobileLocationLinkPromptId"
-            :aria-label="mobileLocationLinkPromptText"
-            class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
-            v-html="mobileLocationLinkPromptText"></label>
         <div class="update-mobile-location-text-link">
             <textLink
                 ref="mobileLocationLink"
@@ -15,10 +10,6 @@
                 @click-event="openModal"
                 aria-label="Modal window" />
         </div>
-        <textBlock
-            :customText="mobileFeeText"
-            cmsWidgetName="MobileFeeDisclaimerWidget"
-            typeStyle="caption" />
     </div>
     <modal
         :ref="modalName"
@@ -90,9 +81,6 @@ export default {
         alertInvalidZipWidgetName: String,
     },
     computed: {
-        mobileLocationLinkPromptText() {
-            return this.getCmsContent(this.linkWidgetName, "HeaderText");
-        },
         mobileLocationLinkText() {
             if (
                 this.addressModel.streetAddress !== null &&
@@ -111,23 +99,9 @@ export default {
         modalHeaderText() {
             return this.getCmsContent(this.modalWidgetName, "HeaderText");
         },
-        mobileFeeText() {
-            const cmsContentText = this.getCmsContent("MobileFeeDisclaimerWidget", "Text");
-            return cmsContentText.replaceAll("{custom:mobileFee}", this.mobileFee);
-        },
         modalFooterText() {
             return this.getCmsContent(this.modalWidgetName, "FooterText");
         },
-        mobileFee() {
-            if (!this.modelValue.mobileFeePart) {
-                return 0;
-            }
-            return (
-                this.modelValue.mobileFeePart.laborAmount +
-                this.modelValue.mobileFeePart.sellingPrice +
-                this.modelValue.mobileFeePart.kitPrice
-            );
-        },
         addressModel: {
             get: function () {
                 return this.modelValue.addressQuestions;
@@ -150,7 +124,6 @@ export default {
             // Reinitialize the Address Auto Complete
             this.$refs.addressQuestions.setupAddressLookup();
         },
-
         resetModel() {
             // Address
             this.internalModel.addressQuestions.streetAddress = "";
@@ -160,7 +133,6 @@ export default {
             // Is Vehicle Protected
             this.internalModel.isVehicleProtected = null;
         },
-
         async setMobileLocation() {
             // Validate the Zip Code
             const zipCodeData = await this.getZipCodeData(
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 1be600ed8..9397dd180 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -10,11 +10,21 @@
                 ref="serviceZipCodeQuestion"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget" />
+            <div class="text-center">
+                <label
+                    for="mobileLocationLinkPromptId"
+                    :aria-label="mobileLocationLinkPromptText"
+                    class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
+                    v-html="mobileLocationLinkPromptText"></label>
+            </div>
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />
+            <div class="text-center">
+                <textBlock :customText="mobileFeeDisclaimerText" typeStyle="caption" />
+            </div>
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 ref="funnelFooter"
@@ -39,6 +49,7 @@ import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { getPricedMobileFeePart } from "@/helpers/service-location-helper";
 import store from "@/store";
+import textBlock from "@/digital-components/text-block/text-block";
 
 export default {
     name: "service-location",
@@ -112,19 +123,37 @@ export default {
                         zipCode: this.zipCode,
                     },
                     isVehicleProtected: this.isVehicleProtected,
-                    mobileFeePart: this.mobileFeePart
+                    mobileFeePart: this.mobileFeePart,
                 };
             },
             set: function (newValue) {
                 this.streetAddress = newValue.addressQuestions.streetAddress;
-                this.apartmentNumberOrBusinessName = newValue.addressQuestions.apartmentNumberOrBusinessName,
+                this.apartmentNumberOrBusinessName =
+                    newValue.addressQuestions.apartmentNumberOrBusinessName;
                 this.city = newValue.addressQuestions.city;
                 this.state = newValue.addressQuestions.state;
                 this.zipCode = newValue.addressQuestions.zipCode;
-                this.isVehicleProtected = newValue.isVehicleProtected,
+                this.isVehicleProtected = newValue.isVehicleProtected;
                 this.mobileFeePart = newValue.mobileFeePart;
             },
         },
+        mobileLocationLinkPromptText() {
+            return this.getCmsContent("MobileLocationLinkWidget", "HeaderText");
+        },
+        mobileFeeDisclaimerText() {
+            const cmsContentText = this.getCmsContent("MobileFeeDisclaimerWidget", "Text");
+            return cmsContentText.replaceAll("{custom:mobileFee}", this.mobileFee);
+        },
+        mobileFee() {
+            if (!this.mobileFeePart) {
+                return 0;
+            }
+            return (
+                this.mobileFeePart.laborAmount +
+                this.mobileFeePart.sellingPrice +
+                this.mobileFeePart.kitPrice
+            );
+        },
     },
     methods: {
         arePagePrerequisitesValid() {
@@ -157,13 +186,13 @@ export default {
         },
         resetMobileFeePart(serviceZipCode) {
             getPricedMobileFeePart(serviceZipCode).then((pricedMobileFeePart) => {
-                this.mobileLocationQuestions.mobileFeePart = pricedMobileFeePart;
+                this.mobileFeePart = pricedMobileFeePart;
             });
         },
         resetMobileLocation(updatedServiceZipCode) {
             this.streetAddress = "";
-            this.apartmentNumberOrBusinessName = "",
-            this.city = "",
+            this.apartmentNumberOrBusinessName = "";
+            this.city = "";
             this.isVehicleProtected = null;
 
             this.$refs.mobileLocationModalQuestions.resetComponent();
@@ -185,6 +214,7 @@ export default {
         funnelSubHeader,
         Form,
         loadingModal,
+        textBlock,
     },
 };
 </script>

From acc8e791af1b2dbeb36c55d101ddcf05d55db1b3 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 6 Mar 2023 10:10:58 -0500
Subject: [PATCH 223/261] fixed unit tests

---
 .../mobile-location-modal-questions.spec.js   |  2 -
 .../mobile-location-modal-questions.vue       | 11 +--
 .../service-location/service-location.spec.js | 67 +++++++++++++------
 .../service-location/service-location.vue     | 11 ++-
 4 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
index f7a2238c8..d90f68b1f 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
@@ -332,8 +332,6 @@ describe("mobile-location-modal-questions.vue", () => {
         expect(wrapper.vm.internalModel.addressQuestions.streetAddress).toEqual("");
         expect(wrapper.vm.internalModel.addressQuestions.apartmentNumberOrBusinessName).toEqual("");
         expect(wrapper.vm.internalModel.addressQuestions.city).toEqual("");
-        expect(wrapper.vm.internalModel.addressQuestions.state).toEqual("");
-        expect(wrapper.vm.internalModel.addressQuestions.zipCode).toEqual("");
         expect(wrapper.vm.internalModel.isVehicleProtected).toEqual(null);
     });
 });
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index ecd1345f0..6aceb6262 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -63,7 +63,6 @@ export default {
         return {
             internalModel: deepClone(this.modelValue),
             displayInvalidZipAlert: false,
-            modalName: "MobileLocationModalWidget",
         };
     },
     props: {
@@ -108,6 +107,9 @@ export default {
             }
             return this.getCmsContent(this.linkWidgetName, "BodyText");
         },
+        modalName() {
+            return "MobileLocationModalWidget";
+        },
         modalHeaderText() {
             return this.getCmsContent(this.modalWidgetName, "HeaderText");
         },
@@ -115,9 +117,6 @@ export default {
             const cmsContentText = this.getCmsContent("MobileFeeDisclaimerWidget", "Text");
             return cmsContentText.replaceAll("{custom:mobileFee}", this.mobileFee);
         },
-        modalFooterText() {
-            return this.getCmsContent(this.modalWidgetName, "FooterText");
-        },
         mobileFee() {
             if (!this.modelValue.mobileFeePart) {
                 return 0;
@@ -127,7 +126,11 @@ export default {
                 this.modelValue.mobileFeePart.sellingPrice +
                 this.modelValue.mobileFeePart.kitPrice
             );
+        },        
+        modalFooterText() {
+            return this.getCmsContent(this.modalWidgetName, "FooterText");
         },
+
         addressModel: {
             get: function () {
                 return this.modelValue.addressQuestions;
diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 6e09b6fa3..d60de2603 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -177,6 +177,12 @@ describe("service-location.vue", () => {
             wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
             wrapper.vm.$refs.serviceZipCodeQuestion.resetMobileFeePart = jest.fn();
 
+            const newServiceZipCodeQuestion = {
+                zipCode: "61606",
+                state: "IL",
+                isServiceable: true,
+            };
+
             const mobileLocationQuestions = {
                 addressQuestions: {
                     streetAddress: "5555 Sulgrave Dr",
@@ -186,8 +192,7 @@ describe("service-location.vue", () => {
                     zipCode: "43054",
                 },
                 isVehicleProtected: true,
-                serviceZipCode: "43054",
-                mobileFee: 0,
+                mobileFeePart: null,
             };
             wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
 
@@ -196,11 +201,11 @@ describe("service-location.vue", () => {
                     streetAddress: "",
                     apartmentNumberOrBusinessName: "",
                     city: "",
-                    state: "",
-                    zipCode: "",
+                    state: "IL",
+                    zipCode: "61606",
                 },
                 isVehicleProtected: null,
-                serviceZipCode: "43081",
+                mobileFeePart: null
             };
 
             const serviceZipCodeComponent = wrapper.findComponent({
@@ -208,7 +213,7 @@ describe("service-location.vue", () => {
             });
 
             // Act
-            serviceZipCodeComponent.vm.$emit("updated-service-zip-code", "43081");
+            serviceZipCodeComponent.vm.$emit("update:modelValue", newServiceZipCodeQuestion);
 
             // Assert
             expect(wrapper.vm.mobileLocationQuestions).toStrictEqual(newMobileLocationQuestions);
@@ -230,7 +235,7 @@ describe("service-location.vue", () => {
                     zipCode: "",
                 },
                 isVehicleProtected: null,
-                serviceZipCode: "43081",
+                mobileFeePart: null,
             };
             wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
 
@@ -243,8 +248,7 @@ describe("service-location.vue", () => {
                     zipCode: "43054",
                 },
                 isVehicleProtected: true,
-                serviceZipCode: "43054",
-                mobileFee: 0,
+                mobileFeePart: null,
             };
 
             const mobileLocationComponent = wrapper.findComponent({
@@ -264,29 +268,50 @@ describe("service-location.vue", () => {
             wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
             wrapper.vm.$refs.serviceZipCodeQuestion.resetMobileFeePart = jest.fn();
 
-            const serviceZipCodeInfo = {
-                state: "OH",
-                zipCode: "43054",
-                isServiceable: true,
+            const mobileLocationQuestions = {
+                addressQuestions: {
+                    streetAddress: "",
+                    apartmentNumberOrBusinessName: "",
+                    city: "",
+                    state: "",
+                    zipCode: "",
+                },
+                isVehicleProtected: null,
+                mobileFeePart: null,
             };
+            wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
 
-            const newServiceZipCodeInfo = {
-                state: "OH",
-                zipCode: "43081",
-                isServiceable: true,
+            const newMobileLocationQuestions = {
+                addressQuestions: {
+                    streetAddress: "5555 Rustic Dr",
+                    apartmentNumberOrBusinessName: "Apt 1",
+                    city: "Westerville",
+                    state: "OH",
+                    zipCode: "43081",
+                },
+                isVehicleProtected: true,
+                mobileFeePart: null,
             };
-            wrapper.vm.serviceZipCodeQuestion = serviceZipCodeInfo;
 
             const mobileLocationComponent = wrapper.findComponent({
                 ref: "mobileLocationModalQuestions",
             });
 
-            // Act
-            mobileLocationComponent.vm.$emit("updated-zip-code", {
+            wrapper.vm.serviceZipCodeQuestion = {
+                zipCode: "61606",
+                state: "IL",
+                isServiceable: true,
+            };
+      
+            const newServiceZipCodeInfo = {
                 state: "OH",
                 zipCode: "43081",
                 isServiceable: true,
-            });
+            };
+
+
+            // Act
+            mobileLocationComponent.vm.$emit("update:modelValue", newMobileLocationQuestions);
 
             // Assert
             expect(wrapper.vm.serviceZipCodeQuestion).toStrictEqual(newServiceZipCodeInfo);
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 1be600ed8..8e7e22833 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -128,12 +128,11 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            return true;
-            // return (
-            //     store.getters.lineItems.supportingItems !== null &&
-            //     store.getters.order.serviceLocation.zipCode !== null &&
-            //     store.getters.payment.isInsurance !== null
-            // );
+            return (
+                store.getters.lineItems.supportingItems !== null &&
+                store.getters.order.serviceLocation.zipCode !== null &&
+                store.getters.payment.isInsurance !== null
+            );
         },
         setData(mobileFeePart) {
             if (mobileFeePart) {

From 9023c7d215ed89099462582b0ac144a5c4b3fc42 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 6 Mar 2023 10:31:40 -0500
Subject: [PATCH 224/261] Fixed unit tests after merge

---
 jest.config.js                                |  1 +
 .../service-location/service-location.spec.js | 69 +++++++++++++++++++
 .../service-location/service-location.vue     | 17 -----
 3 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index bfb4bf71f..4d8fd76b1 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -27,4 +27,5 @@ module.exports = {
       // Got the go ahead from Mark to temporarily lower this. Taking out initialize component made the year,make,model and style coverage drop a bit. Once unit tests for license plate lookup, vin lookup and address lookup are in the coverage should go back up to 90
     },
   },
+  silent: true
 };
diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index d60de2603..0554f4952 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -43,6 +43,75 @@ jest.mock("@/store", () => ({
     dispatch: jest.fn(),
 }));
 
+const mockMixin = {
+    methods: {
+        getCmsContent: jest.fn((widgetName, cmsFieldName) => {
+            if (widgetName === linkWidgetName) {
+                return mockLinkCmsContent[cmsFieldName];
+            }
+
+            if (widgetName === modalWidgetName) {
+                return mockModalCmsContent[cmsFieldName];
+            }
+
+            if (widgetName === mobileFeeDisclaimerWidgetName) {
+                return mockMobileFeeDisclaimerContent[cmsFieldName];
+            }
+
+            return null;
+        }),
+
+        getZipCodeData: jest.fn((zip) => {
+            if (zip === "43235" || zip === "55555") {
+                return Promise.resolve({
+                    containsMilitaryBase: false,
+                    isServiceable: true,
+                    isValid: true,
+                    state: "OH",
+                    zipCodeCtu: "01820",
+                });
+            }
+
+            return Promise.resolve({
+                containsMilitaryBase: false,
+                isServiceable: false,
+                isValid: false,
+                state: null,
+                zipCodeCtu: null,
+            });
+        }),
+
+        dispatchStoreAction: jest.fn((actionName) => {
+            if (actionName === storeActions.GET_MOBILE_FEE_PART) {
+                return Promise.resolve({
+                    data: {
+                        partNumber: "MOBILE FEE",
+                        description: "MOBILE FEE",
+                        partType: "FEE",
+                    },
+                });
+            }
+
+            if (actionName === storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA) {
+                return Promise.resolve([
+                    {
+                        partNumber: "MOBILE FEE",
+                        description: "MOBILE FEE",
+                        partType: "FEE",
+                        laborAmount: 49.99,
+                        sellingPrice: 0,
+                        kitPrice: 0,
+                    },
+                ]);
+            }
+        }),
+
+        getTotalLineItemPrice: jest.fn((lineItem) => {
+            return 49.99;
+        }),
+    },
+};
+
 beforeEach(() => {
     store.getters = {
         lineItems: {
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index dafe9a3dd..11cf42daa 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -137,23 +137,6 @@ export default {
                 this.mobileFeePart = newValue.mobileFeePart;
             },
         },
-        mobileLocationLinkPromptText() {
-            return this.getCmsContent("MobileLocationLinkWidget", "HeaderText");
-        },
-        mobileFeeDisclaimerText() {
-            const cmsContentText = this.getCmsContent("MobileFeeDisclaimerWidget", "Text");
-            return cmsContentText.replaceAll("{custom:mobileFee}", this.mobileFee);
-        },
-        mobileFee() {
-            if (!this.mobileFeePart) {
-                return 0;
-            }
-            return (
-                this.mobileFeePart.laborAmount +
-                this.mobileFeePart.sellingPrice +
-                this.mobileFeePart.kitPrice
-            );
-        },
     },
     methods: {
         arePagePrerequisitesValid() {

From 81e71a007c89acb6a1eb183d32674eb524c273cc Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 6 Mar 2023 10:32:53 -0500
Subject: [PATCH 225/261] removed 'silent' from jest.config.js

---
 jest.config.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jest.config.js b/jest.config.js
index 4d8fd76b1..bfb4bf71f 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -27,5 +27,4 @@ module.exports = {
       // Got the go ahead from Mark to temporarily lower this. Taking out initialize component made the year,make,model and style coverage drop a bit. Once unit tests for license plate lookup, vin lookup and address lookup are in the coverage should go back up to 90
     },
   },
-  silent: true
 };

From 3c73f54c74a84a9839357b2f9bb62febafdfa8d0 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Mon, 6 Mar 2023 11:20:54 -0500
Subject: [PATCH 226/261] formatting

---
 .../mobile-location-modal-questions.vue                      | 2 +-
 src/layouts/service-location/service-location.spec.js        | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 9cc05c4c5..225d97e29 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -114,7 +114,7 @@ export default {
                 this.modelValue.mobileFeePart.sellingPrice +
                 this.modelValue.mobileFeePart.kitPrice
             );
-        },        
+        },
         modalFooterText() {
             return this.getCmsContent(this.modalWidgetName, "FooterText");
         },
diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 0554f4952..8f4572c95 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -274,7 +274,7 @@ describe("service-location.vue", () => {
                     zipCode: "61606",
                 },
                 isVehicleProtected: null,
-                mobileFeePart: null
+                mobileFeePart: null,
             };
 
             const serviceZipCodeComponent = wrapper.findComponent({
@@ -371,14 +371,13 @@ describe("service-location.vue", () => {
                 state: "IL",
                 isServiceable: true,
             };
-      
+
             const newServiceZipCodeInfo = {
                 state: "OH",
                 zipCode: "43081",
                 isServiceable: true,
             };
 
-
             // Act
             mobileLocationComponent.vm.$emit("update:modelValue", newMobileLocationQuestions);
 

From 101baa2c1a83b84011fe7126671f91839c68c2c6 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 6 Mar 2023 13:37:10 -0500
Subject: [PATCH 227/261] Fixed quote issue due to change in
 PriceOrderItemsAndSaveServerData

---
 src/layouts/quote/quote.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 9712a2a20..abd04b3dc 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -115,7 +115,9 @@ export default {
 
         const pricingResults = await baseMixin.methods.dispatchStoreAction(
             storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
-            availableLineItems,
+            {
+                availableLineItems: availableLineItems,
+            },
             false
         );
 

From 58f961abc0e7bc45a9643c173c0c4cf94fa72e08 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 6 Mar 2023 14:04:52 -0500
Subject: [PATCH 228/261] Fixed oversight or merge issue that missed moving
 components back into mobile-location-modal-questions

---
 .../mobile-location-modal-questions.vue              | 12 ++++++++++++
 src/layouts/service-location/service-location.vue    | 12 ------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 225d97e29..0aa64594d 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -1,5 +1,10 @@
 <template>
     <div class="text-center">
+        <label
+            for="mobileLocationLinkPromptId"
+            :aria-label="mobileLocationLinkPromptText"
+            class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
+            v-html="mobileLocationLinkPromptText"></label>
         <div class="update-mobile-location-text-link">
             <textLink
                 ref="mobileLocationLink"
@@ -10,6 +15,10 @@
                 @click-event="openModal"
                 aria-label="Modal window" />
         </div>
+        <textBlock
+            :customText="mobileFeeText"
+            cmsWidgetName="MobileFeeDisclaimerWidget"
+            typeStyle="caption" />
     </div>
     <modal
         :ref="modalName"
@@ -80,6 +89,9 @@ export default {
         alertInvalidZipWidgetName: String,
     },
     computed: {
+        mobileLocationLinkPromptText() {
+            return this.getCmsContent(this.linkWidgetName, "HeaderText");
+        },
         mobileLocationLinkText() {
             if (
                 this.addressModel.streetAddress !== null &&
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 11cf42daa..777cbde74 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -10,21 +10,11 @@
                 ref="serviceZipCodeQuestion"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget" />
-            <div class="text-center">
-                <label
-                    for="mobileLocationLinkPromptId"
-                    :aria-label="mobileLocationLinkPromptText"
-                    class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
-                    v-html="mobileLocationLinkPromptText"></label>
-            </div>
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />
-            <div class="text-center">
-                <textBlock :customText="mobileFeeDisclaimerText" typeStyle="caption" />
-            </div>
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 ref="funnelFooter"
@@ -49,7 +39,6 @@ import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { getPricedMobileFeePart } from "@/helpers/service-location-helper";
 import store from "@/store";
-import textBlock from "@/digital-components/text-block/text-block";
 
 export default {
     name: "service-location",
@@ -196,7 +185,6 @@ export default {
         funnelSubHeader,
         Form,
         loadingModal,
-        textBlock,
     },
 };
 </script>

From 59f2555facaa20df174a91982f75dd3dd2201632 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Mon, 6 Mar 2023 15:32:11 -0500
Subject: [PATCH 229/261] CSR-1012 loading spinner and removed
 updated-service-zip-code event

---
 src/digital-components/modal/modal.vue                    | 3 ++-
 .../mobile-location-modal-questions.vue                   | 8 ++++----
 src/layouts/service-location/service-location.vue         | 1 -
 .../service-zip-modal-question.spec.js                    | 1 +
 .../service-zip-modal-question.vue                        | 5 +++++
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 0034b5155..a18881796 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -78,8 +78,9 @@ export default {
             const validationResult = await this.form.validate();
             if (validationResult.valid) {
                 this.$emit("footer-button-event");
+            } else {
+                this.resetButtonStyle();
             }
-            this.resetButtonStyle();
         },
         resetButtonStyle() {
             this.$refs.buttonMain.resetButtonStyle();
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 0aa64594d..8383ba18d 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -94,13 +94,13 @@ export default {
         },
         mobileLocationLinkText() {
             if (
-                this.addressModel.streetAddress !== null &&
+                this.addressModel.streetAddress &&
                 this.addressModel.streetAddress !== "" &&
-                this.addressModel.city !== null &&
+                this.addressModel.city &&
                 this.addressModel.city !== "" &&
-                this.addressModel.state !== null &&
+                this.addressModel.state &&
                 this.addressModel.state !== "" &&
-                this.addressModel.zipCode !== null &&
+                this.addressModel.zipCode &&
                 this.addressModel.zipCode !== ""
             ) {
                 return `${this.addressModel.streetAddress}\n${this.addressModel.city}, ${this.addressModel.state} ${this.addressModel.zipCode}`;
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 777cbde74..e321df8af 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -6,7 +6,6 @@
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <serviceZipModalQuestion
                 v-model="serviceZipCodeQuestion"
-                @updated-service-zip-code="resetMobileLocation"
                 ref="serviceZipCodeQuestion"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget" />
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
index a98b4f89d..d8ccde1d9 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -12,6 +12,7 @@ jest.mock("@/digital-components/textbox-question/textbox-question", () => ({
 jest.mock("@/digital-components/modal/modal", () => ({
     methods: {
         closeModal: jest.fn(),
+        resetButtonStyle: jest.fn(),
     },
 }));
 
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index f19456171..6f73c8006 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -116,6 +116,10 @@ export default {
             this.$refs[this.modalName].closeModal();
         },
 
+        resetModalButtonStyle() {
+            this.$refs[this.modalName].resetButtonStyle();
+        },
+
         onInputIdAssigned(inputId) {
             this.serviceZipCodeTextInputId = inputId;
         },
@@ -134,6 +138,7 @@ export default {
             this.resetAlerts();
 
             const zipCodeData = await this.getZipCodeData(this.internalModel.zipCode);
+            this.resetModalButtonStyle();
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;

From 6a125d8d78ad7609fe786255c16dcb8449494c31 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Tue, 7 Mar 2023 09:57:24 -0500
Subject: [PATCH 230/261] CSR-785

Rename accountNumber to parentAccountNumber and relocate to Payment object
---
 src/constants/store-actions.js                |  2 +-
 .../navigation-helper.spec.js                 |  8 +++----
 .../heritage-integration/order-helper.js      |  6 ++---
 .../heritage-integration/order-helper.spec.js | 10 ++++----
 src/helpers/unit-test-helper.js               |  4 ++--
 src/layouts/quote/quote.spec.js               | 14 ++++++-----
 src/layouts/quote/quote.vue                   |  7 ++++--
 src/store/index.js                            | 23 ++++++++++---------
 src/store/store.spec.js                       |  4 ++--
 9 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 9792b6685..7e3259057 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -67,7 +67,7 @@ const storeActions = {
     SAVE_MOLDING_QUESTION_ANSWERS: "saveMoldingQuestionAnswers",
     SAVE_CAPABILITY_QUESTION_ANSWERS: "saveCapabilityQuestionAnswers",
     SAVE_PAYMENT_TYPE: "savePaymentType",
-    SAVE_ACCOUNT_NUMBER: "saveAccountNumber",
+    SAVE_PARENT_ACCOUNT_NUMBER: "saveParentAccountNumber",
     SAVE_SUPPORTING_ITEMS: "saveSupportingItems",
     SAVE_VAPS: "saveVaps",
 };
diff --git a/src/helpers/heritage-integration/navigation-helper.spec.js b/src/helpers/heritage-integration/navigation-helper.spec.js
index f9b3b1017..67a5055c8 100644
--- a/src/helpers/heritage-integration/navigation-helper.spec.js
+++ b/src/helpers/heritage-integration/navigation-helper.spec.js
@@ -350,7 +350,7 @@ describe("navigateToHeritageFunnel", () => {
         const mockReferralNumber = "2";
         const mockCorrelationId = "55";
         const mockReferralDate = "2022";
-        const mockAccountNumber = "167132";
+        const mockParentAccountNumber = "167132";
         const mockSavedSessionId = "xxx-xxx-xxx";
         const mockCrmCustomerId = "xxx-xxx-xxx";
 
@@ -358,7 +358,7 @@ describe("navigateToHeritageFunnel", () => {
             mockReferralNumber,
             mockCorrelationId,
             mockReferralDate,
-            mockAccountNumber,
+            mockParentAccountNumber,
             mockSavedSessionId,
             mockCrmCustomerId
         );
@@ -395,7 +395,7 @@ describe("navigateToHeritageFunnel", () => {
         const mockReferralNumber = "2";
         const mockCorrelationId = "55";
         const mockReferralDate = "2022";
-        const mockAccountNumber = "167132";
+        const mockParentAccountNumber = "167132";
         const mockSavedSessionId = "xxx-xxx-xxx";
         const mockCrmCustomerId = "xxx-xxx-xxx";
 
@@ -403,7 +403,7 @@ describe("navigateToHeritageFunnel", () => {
             mockReferralNumber,
             mockCorrelationId,
             mockReferralDate,
-            mockAccountNumber,
+            mockParentAccountNumber,
             mockSavedSessionId,
             mockCrmCustomerId
         );
diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js
index 7cf3cc12b..010c39ec9 100644
--- a/src/helpers/heritage-integration/order-helper.js
+++ b/src/helpers/heritage-integration/order-helper.js
@@ -81,7 +81,7 @@ async function loadSession(
     savedSessionId,
     referralNumber,
     referralDate,
-    accountNumber,
+    parentAccountNumber,
     referralCorrelationId,
     isConceptInsurance
 ) {
@@ -94,8 +94,8 @@ async function loadSession(
             savedSessionId: savedSessionId?.toString(),
             referralNumber,
             referralDate,
-            accountNumber,
             referralCorrelationId,
+            parentAccountNumber,
             isConceptInsurance,
         },
         false
@@ -116,7 +116,7 @@ async function saveSessionHelper() {
             referralNumber: savedSessionInfo.data.referralNumber?.toString(),
             referralCorrelationId: savedSessionInfo.data.referralCorrelationId,
             referralDate: savedSessionInfo.data.referralDate,
-            accountNumber: savedSessionInfo.data.accountNumber?.toString(),
+            parentAccountNumber: savedSessionInfo.data.parentAccountNumber?.toString(),
             savedSessionId: savedSessionInfo.data.savedSessionId,
             crmCustomerId: savedSessionInfo.data.crmCustomerId?.toString(),
             eon: savedSessionInfo.data.eon,
diff --git a/src/helpers/heritage-integration/order-helper.spec.js b/src/helpers/heritage-integration/order-helper.spec.js
index 97b162560..fab4a1532 100644
--- a/src/helpers/heritage-integration/order-helper.spec.js
+++ b/src/helpers/heritage-integration/order-helper.spec.js
@@ -142,7 +142,7 @@ describe("saveSession", () => {
         const mockReferralNumber = "2";
         const mockCorrelationId = "55";
         const mockReferralDate = "2022";
-        const mockAccountNumber = "167132";
+        const mockParentAccountNumber = "167132";
         const mockSavedSessionId = "xxx-xxx-xxx";
         const mockCrmCustomerId = "xxx-xxx-xxx";
 
@@ -150,7 +150,7 @@ describe("saveSession", () => {
             mockReferralNumber,
             mockCorrelationId,
             mockReferralDate,
-            mockAccountNumber,
+            mockParentAccountNumber,
             mockSavedSessionId,
             mockCrmCustomerId
         );
@@ -182,7 +182,7 @@ describe("saveSession", () => {
                 referralNumber: mockReferralNumber,
                 referralDate: mockReferralDate,
                 referralCorrelationId: mockCorrelationId,
-                accountNumber: mockAccountNumber,
+                parentAccountNumber: mockParentAccountNumber,
                 savedSessionId: mockSavedSessionId,
                 crmCustomerId: mockCrmCustomerId,
             },
@@ -195,7 +195,7 @@ describe("saveSession", () => {
         const mockReferralNumber = 1566818;
         const mockReferralDate = "2022-03-15T10:56:24.597";
         const mockReferralCorrelationId = "404d2b04-f86e-45c3-b373-127b6217b060";
-        const mockAccountNumber = "167132";
+        const mockParentAccountNumber = "167132";
         const mockSavedSessionId = "xxx-xxx-xxx";
         const mockCrmCustomerId = "xxx-xxx-xxx";
 
@@ -203,7 +203,7 @@ describe("saveSession", () => {
             mockReferralNumber,
             mockReferralCorrelationId,
             mockReferralDate,
-            mockAccountNumber,
+            mockParentAccountNumber,
             mockSavedSessionId,
             mockCrmCustomerId
         );
diff --git a/src/helpers/unit-test-helper.js b/src/helpers/unit-test-helper.js
index c54bbf01a..9de0cf5a6 100644
--- a/src/helpers/unit-test-helper.js
+++ b/src/helpers/unit-test-helper.js
@@ -104,7 +104,7 @@ export function getMockOrderInfo(
     mockReferralNumber,
     mockCorrelationId,
     mockReferralDate,
-    accountNumber = "0",
+    parentAccountNumber = "0",
     savedSessionId,
     crmCustomerId
 ) {
@@ -112,7 +112,7 @@ export function getMockOrderInfo(
         referralNumber: mockReferralNumber,
         referralCorrelationId: mockCorrelationId,
         referralDate: mockReferralDate,
-        accountNumber: accountNumber,
+        parentAccountNumber: parentAccountNumber,
         savedSessionId: savedSessionId,
         crmCustomerId: crmCustomerId,
     };
diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
index edfdbc8b0..3d0f5baba 100644
--- a/src/layouts/quote/quote.spec.js
+++ b/src/layouts/quote/quote.spec.js
@@ -63,11 +63,11 @@ mockStoreActionResults[storeActions.GET_SUPPORTING_ITEMS] = Promise.resolve([
 
 store.getters = {
     order: {
-        accountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
-    },
-    payment: {
-        insuranceCoverage: {},
-        isInsurance: false,
+        payment: {
+            insuranceCoverage: {},
+            isInsurance: false,
+            parentAccountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
+        },
     },
 };
 
@@ -75,7 +75,9 @@ afterEach(() => {
     // reset store after each test
     store.getters = {
         order: {
-            accountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
+            payment: {
+                parentAccountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
+            },
         },
         payment: {
             insuranceCoverage: {},
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 52b8f2687..ca773d56f 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -178,13 +178,16 @@ export default {
             );
             if (!this.isInsuranceSelected) {
                 this.dispatchStoreAction(
-                    this.storeActions.SAVE_ACCOUNT_NUMBER,
+                    this.storeActions.SAVE_PARENT_ACCOUNT_NUMBER,
                     applicationConfig.CASH_ACCOUNT_NUMBER,
                     false
                 );
             }
 
-            if (this.$store.getters.order.accountNumber != applicationConfig.CASH_ACCOUNT_NUMBER) {
+            if (
+                this.$store.getters.order.payment.parentAccountNumber !=
+                applicationConfig.CASH_ACCOUNT_NUMBER
+            ) {
                 this.supportingItems = this.filterOutFees(this.supportingItems);
             }
             if (this.pricedGlassParts.length > 0) {
diff --git a/src/store/index.js b/src/store/index.js
index 1fee4846f..551b921a4 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -67,11 +67,11 @@ const getDefaultState = () => {
                     isVerified: null,
                     coverageStatus: null,
                 },
+                parentAccountNumber: 0,
             },
             referralNumber: null,
             referralDate: null,
             referralCorrelationId: null,
-            accountNumber: 0,
             eon: null,
         },
         applicationUser: {
@@ -166,7 +166,7 @@ export const mutations = {
         state.order.referralDate = referralDate;
     },
     updateParentAcctNumber(state, parentAcctNumber) {
-        state.order.accountNumber = parentAcctNumber;
+        state.order.payment.parentAccountNumber = parentAcctNumber;
     },
     updateEON(state, eon) {
         state.order.eon = eon;
@@ -355,7 +355,8 @@ export const mutations = {
         state.order.lineItems.supportingItems = sessionInformation.order.lineItems.supportingItems;
         state.order.lineItems.vaps = sessionInformation.order.lineItems.vaps;
         state.order.lineItems.serverData = sessionInformation.order.lineItems.serverData;
-        state.order.accountNumber = sessionInformation.order.accountNumber;
+        state.order.payment.parentAccountNumber =
+            sessionInformation.order.payment.parentAccountNumber;
         state.order.providerNumber = sessionInformation.order.providerNumber;
         (state.order.serviceLocation.address =
             sessionInformation.order.serviceLocation.streetAddress),
@@ -425,7 +426,7 @@ export const getters = {
             funnelServiceCity: state.order.serviceLocation.city,
             funnelServiceState: state.order.serviceLocation.state,
             funnelServiceZipCode: state.order.serviceLocation.zipCode,
-            funnelParentAccountNumber: state.order.accountNumber,
+            funnelParentAccountNumber: state.order.payment.parentAccountNumber,
             funnelIsCoverageVerified: state.order.payment.insuranceCoverage.isVerified,
             funnelHasRecalibrationPart: getHasRecalibrationPart(state),
             funnelSelectedMultiGlass: state.order.damage.glassToReplace?.length > 1,
@@ -677,7 +678,7 @@ export const actions = {
             referralDate,
             referralCorrelationId,
             eon,
-            accountNumber,
+            parentAccountNumber,
             savedSessionId,
             crmCustomerId,
         }
@@ -686,7 +687,7 @@ export const actions = {
         context.commit(storeMutations.UPDATE_REFERRAL_DATE, referralDate);
         context.commit(storeMutations.UPDATE_REFERRAL_CORRELATION_ID, referralCorrelationId);
         context.commit(storeMutations.UPDATE_EON, eon);
-        context.commit(storeMutations.UPDATE_PARENT_ACCT_NUMBER, accountNumber);
+        context.commit(storeMutations.UPDATE_PARENT_ACCT_NUMBER, parentAccountNumber);
         context.commit(storeMutations.UPDATE_SAVED_SESSION_ID, savedSessionId);
         context.commit(storeMutations.UPDATE_CRM_CUSTOMER_ID, crmCustomerId);
     },
@@ -1022,8 +1023,8 @@ export const actions = {
                             isVerified: order.payment.insuranceCoverage.isVerified ?? false,
                         },
                         isInsurance: order.payment.isInsurance ?? false,
+                        parentAccountNumber: order.payment.parentAccountNumber,
                     },
-                    accountNumber: order.accountNumber,
                     providerNumber: "",
                     serviceLocation: {
                         streetAddress: order.serviceLocation.address,
@@ -1048,8 +1049,8 @@ export const actions = {
             savedSessionId,
             referralNumber,
             referralDate,
+            parentAccountNumber,
             referralCorrelationId,
-            accountNumber,
             isConceptInsurance,
         }
     ) {
@@ -1063,7 +1064,7 @@ export const actions = {
                     savedSessionId: savedSessionId?.toString(),
                     referralNumber: referralNumber?.toString(),
                     referralDate: referralDate?.toString(),
-                    accountNumber: accountNumber,
+                    parentAccountNumber: parentAccountNumber,
                     referralCorrelationId: referralCorrelationId,
                 },
             })
@@ -1413,8 +1414,8 @@ export const actions = {
     savePaymentType(context, isInsurance) {
         context.commit(storeMutations.UPDATE_IS_INSURANCE, isInsurance);
     },
-    saveAccountNumber(context, accountNumber) {
-        context.commit(storeMutations.UPDATE_PARENT_ACCT_NUMBER, accountNumber);
+    saveParentAccountNumber(context, parentAccountNumber) {
+        context.commit(storeMutations.UPDATE_PARENT_ACCT_NUMBER, parentAccountNumber);
     },
     saveSupportingItems(context, supportingItems) {
         context.commit(storeMutations.UPDATE_SUPPORTING_ITEMS, supportingItems);
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index 06f0cb746..8eb947e73 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -235,9 +235,9 @@ describe("Mutations", () => {
                         isVerified: false,
                     },
                     isInsurance: false,
+                    parentAccountNumber: "123456789",
                 },
                 parts: [],
-                accountNumber: "123456789",
                 insuranceInfo: {},
                 serviceLocation: {},
                 customer: {},
@@ -761,7 +761,7 @@ describe("Actions", () => {
             referralNumber: "123",
             referralDate: new Date().toUTCString(),
             referralCorrelationId: "xxx-xxx-xxx",
-            accountNumber: "167132",
+            parentAccountNumber: "167132",
             savedSessionId: "xxx-xxx-xxx",
             crmCustomerId: "xxx-xxx-xxx",
         });

From 1f9a7d1def42b3adc5c0bbb60f267293d367ce6b Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Tue, 7 Mar 2023 13:56:07 -0500
Subject: [PATCH 231/261] CSR-1012 remove isServiceable from service-location

---
 .../service-location/service-location.spec.js        |  7 -------
 src/layouts/service-location/service-location.vue    |  6 ------
 .../service-zip-modal-question.spec.js               | 12 +-----------
 .../service-zip-modal-question.vue                   |  3 ---
 4 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 8f4572c95..fb92fbf58 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -65,7 +65,6 @@ const mockMixin = {
             if (zip === "43235" || zip === "55555") {
                 return Promise.resolve({
                     containsMilitaryBase: false,
-                    isServiceable: true,
                     isValid: true,
                     state: "OH",
                     zipCodeCtu: "01820",
@@ -74,7 +73,6 @@ const mockMixin = {
 
             return Promise.resolve({
                 containsMilitaryBase: false,
-                isServiceable: false,
                 isValid: false,
                 state: null,
                 zipCodeCtu: null,
@@ -130,7 +128,6 @@ beforeEach(() => {
             serviceLocation: {
                 zipCode: "43235",
                 state: "OH",
-                isServiceable: true,
             },
         },
         payment: {
@@ -226,7 +223,6 @@ describe("service-location.vue", () => {
             const newServiceZipCodeQuestion = {
                 zipCode: "61606",
                 state: "IL",
-                isServiceable: true,
             };
 
             const serviceZipCodeComponent = wrapper.findComponent({
@@ -249,7 +245,6 @@ describe("service-location.vue", () => {
             const newServiceZipCodeQuestion = {
                 zipCode: "61606",
                 state: "IL",
-                isServiceable: true,
             };
 
             const mobileLocationQuestions = {
@@ -369,13 +364,11 @@ describe("service-location.vue", () => {
             wrapper.vm.serviceZipCodeQuestion = {
                 zipCode: "61606",
                 state: "IL",
-                isServiceable: true,
             };
 
             const newServiceZipCodeInfo = {
                 state: "OH",
                 zipCode: "43081",
-                isServiceable: true,
             };
 
             // Act
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index e321df8af..6950b23c1 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -48,7 +48,6 @@ export default {
             city: this.getServiceCityFromStore(),
             state: this.getServiceStateFromStore(),
             zipCode: this.getServiceZipCodeFromStore(),
-            isServiceable: false,
             isZipServiceableMobile: null,
             isZipServiceableInShop: null,
             mobileFeePart: null,
@@ -87,7 +86,6 @@ export default {
                 return {
                     state: this.state,
                     zipCode: this.zipCode,
-                    isServiceable: this.isServiceable,
                 };
             },
             set: function (newValue) {
@@ -97,7 +95,6 @@ export default {
 
                 this.state = newValue.state;
                 this.zipCode = newValue.zipCode;
-                this.isServiceable = newValue.isServiceable;
             },
         },
         mobileLocationQuestions: {
@@ -151,9 +148,6 @@ export default {
         getServiceZipCodeFromStore() {
             return store.getters.order.serviceLocation.zipCode;
         },
-        getIsServiceableFromStore() {
-            return store.getters.order.serviceLocation.isServiceable;
-        },
         resetMobileFeePart(serviceZipCode) {
             getPricedMobileFeePart(serviceZipCode).then((pricedMobileFeePart) => {
                 this.mobileFeePart = pricedMobileFeePart;
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
index d8ccde1d9..becbd9ebd 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -45,7 +45,6 @@ const mockMixin = {
             if (zip === "43235") {
                 return {
                     containsMilitaryBase: false,
-                    isServiceable: true,
                     isValid: true,
                     state: "OH",
                     zipCodeCtu: "01820",
@@ -55,7 +54,6 @@ const mockMixin = {
             if (zip === "61606") {
                 return {
                     containsMilitaryBase: false,
-                    isServiceable: true,
                     isValid: true,
                     state: "IL",
                     zipCodeCtu: "01526",
@@ -64,7 +62,6 @@ const mockMixin = {
 
             return {
                 containsMilitaryBase: false,
-                isServiceable: false,
                 isValid: false,
                 state: null,
                 zipCodeCtu: null,
@@ -78,7 +75,6 @@ describe("service-zip-modal-question.vue", () => {
         let serviceZipCodeQuestion = {
             state: "",
             zipCode: "",
-            isServiceable: undefined,
         };
 
         // Arrange
@@ -101,7 +97,6 @@ describe("service-zip-modal-question.vue", () => {
         let serviceZipCodeQuestion = {
             state: "OH",
             zipCode: "43235",
-            isServiceable: true,
         };
 
         const wrapper = mount(serviceZipModalQuestion, {
@@ -123,7 +118,6 @@ describe("service-zip-modal-question.vue", () => {
         let serviceZipCodeQuestion = {
             state: "IL",
             zipCode: "61606",
-            isServiceable: true,
         };
 
         const zip = "43235";
@@ -142,7 +136,7 @@ describe("service-zip-modal-question.vue", () => {
         wrapper.vm.internalModel.zipCode = zip;
         await wrapper.vm.setZipCode();
 
-        let expectedEmit = [[{ isServiceable: true, state: "OH", zipCode: "43235" }]];
+        let expectedEmit = [[{ state: "OH", zipCode: "43235" }]];
 
         // Assert
         expect(wrapper.emitted("update:modelValue")).toEqual(expectedEmit);
@@ -153,7 +147,6 @@ describe("service-zip-modal-question.vue", () => {
         let serviceZipCodeQuestion = {
             state: "IL",
             zipCode: "61606",
-            isServiceable: true,
         };
 
         const zip = "";
@@ -181,7 +174,6 @@ describe("service-zip-modal-question.vue", () => {
         let serviceZipCodeQuestion = {
             state: "IL",
             zipCode: "61606",
-            isServiceable: true,
         };
 
         const zip = "11111";
@@ -209,7 +201,6 @@ describe("service-zip-modal-question.vue", () => {
         let serviceZipCodeQuestion = {
             state: "IL",
             zipCode: "61606",
-            isServiceable: true,
         };
 
         const zip = "";
@@ -238,7 +229,6 @@ describe("service-zip-modal-question.vue", () => {
         let serviceZipCodeQuestion = {
             state: "IL",
             zipCode: "61606",
-            isServiceable: true,
         };
 
         const zip = "123";
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 6f73c8006..4f4c98035 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -54,7 +54,6 @@ export default {
             default: () => ({
                 state: "",
                 zipCode: "",
-                isServiceable: null,
             }),
         },
         linkWidgetName: String,
@@ -104,7 +103,6 @@ export default {
             return {
                 state: modelToCopy.state,
                 zipCode: modelToCopy.zipCode,
-                isServiceable: modelToCopy.isServiceable,
             };
         },
 
@@ -145,7 +143,6 @@ export default {
                 this.focusOnZipInput();
             } else {
                 this.internalModel.state = zipCodeData.state;
-                this.internalModel.isServiceable = zipCodeData.isServiceable;
 
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);

From f6625a6bec484faec3bd9f9717dd815a5b2ca664 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 7 Mar 2023 14:05:42 -0500
Subject: [PATCH 232/261] CSR-1227 fix missing error state on quote page.

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

diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss
index 8129702fc..97ee939b2 100644
--- a/src/styles/common-error-styles.scss
+++ b/src/styles/common-error-styles.scss
@@ -136,6 +136,18 @@ html {
             }
         }
     }
+    //Quote page radio button group
+    .package-main {
+        .package-wrapper {
+            .has-error {
+                input[type="radio"] {
+                    + .package-label {
+                        border: 1px solid $red;
+                    }
+                }
+            }
+        }
+    }
     //Restore to default style if alert box is present
     .alertError {
         .has-error {

From 54533921035ca7a1fe8c8a9d7917f8e8b698921f Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 7 Mar 2023 14:09:54 -0500
Subject: [PATCH 233/261] Added transition element to
 mobile-location-modal-questions component

---
 .../mobile-location-modal-questions.vue       | 88 ++++++++++---------
 1 file changed, 46 insertions(+), 42 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 0aa64594d..4308d2b04 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -1,47 +1,51 @@
 <template>
-    <div class="text-center">
-        <label
-            for="mobileLocationLinkPromptId"
-            :aria-label="mobileLocationLinkPromptText"
-            class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
-            v-html="mobileLocationLinkPromptText"></label>
-        <div class="update-mobile-location-text-link">
-            <textLink
-                ref="mobileLocationLink"
-                id="mobileLocationLinkPromptId"
-                linkType="text"
-                :text="mobileLocationLinkText"
-                href="#!"
-                @click-event="openModal"
-                aria-label="Modal window" />
+    <transition name="fade" mode="out-in">
+        <div class="mobile-location-questions">
+            <div class="text-center">
+                <label
+                    for="mobileLocationLinkPromptId"
+                    :aria-label="mobileLocationLinkPromptText"
+                    class="form-label fw-bold w-100 ps-4 pe-4 pt-4"
+                    v-html="mobileLocationLinkPromptText"></label>
+                <div class="update-mobile-location-text-link">
+                    <textLink
+                        ref="mobileLocationLink"
+                        id="mobileLocationLinkPromptId"
+                        linkType="text"
+                        :text="mobileLocationLinkText"
+                        href="#!"
+                        @click-event="openModal"
+                        aria-label="Modal window" />
+                </div>
+                <textBlock
+                    :customText="mobileFeeText"
+                    cmsWidgetName="MobileFeeDisclaimerWidget"
+                    typeStyle="caption" />
+            </div>
+            <modal
+                :ref="modalName"
+                :headerText="modalHeaderText"
+                :footerButtonText="modalFooterText"
+                @footer-button-event="setMobileLocation">
+                <addressQuestions
+                    ref="addressQuestions"
+                    v-model="internalModel.addressQuestions"
+                    captureApartmentNumberOrBusinessName="true" />
+                <vehicleProtectedQuestion
+                    ref="vehicleProtectedQuestion"
+                    v-model="internalModel.isVehicleProtected"
+                    cmsWidgetName="VehicleProtectedQuestionWidget" />
+                <textBlock cmsWidgetName="WorkspaceRequirementsWidget" typeStyle="caption" />
+                <alert
+                    ref="alertInvalidZip"
+                    v-if="displayInvalidZipAlert"
+                    class="my-4"
+                    cmsWidgetName="AlertInvalidZipWidget"
+                    alertClass="alert-danger"
+                    v-bind:isDismissible="false" />
+            </modal>
         </div>
-        <textBlock
-            :customText="mobileFeeText"
-            cmsWidgetName="MobileFeeDisclaimerWidget"
-            typeStyle="caption" />
-    </div>
-    <modal
-        :ref="modalName"
-        :headerText="modalHeaderText"
-        :footerButtonText="modalFooterText"
-        @footer-button-event="setMobileLocation">
-        <addressQuestions
-            ref="addressQuestions"
-            v-model="internalModel.addressQuestions"
-            captureApartmentNumberOrBusinessName="true" />
-        <vehicleProtectedQuestion
-            ref="vehicleProtectedQuestion"
-            v-model="internalModel.isVehicleProtected"
-            cmsWidgetName="VehicleProtectedQuestionWidget" />
-        <textBlock cmsWidgetName="WorkspaceRequirementsWidget" typeStyle="caption" />
-        <alert
-            ref="alertInvalidZip"
-            v-if="displayInvalidZipAlert"
-            class="my-4"
-            cmsWidgetName="AlertInvalidZipWidget"
-            alertClass="alert-danger"
-            v-bind:isDismissible="false" />
-    </modal>
+    </transition>
 </template>
 
 <script>

From f0acbb39a3cab600d2e89efb58dbe499ef4a2f8b Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 8 Mar 2023 10:38:32 -0500
Subject: [PATCH 234/261] CSR-972 fix missing color option item.

---
 src/constants/tint-mapper.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/constants/tint-mapper.js b/src/constants/tint-mapper.js
index fab6d508f..519de0855 100644
--- a/src/constants/tint-mapper.js
+++ b/src/constants/tint-mapper.js
@@ -32,6 +32,7 @@ const tintMap = {
         { name: "gray tint", src: "Glass-NoShade-GrayTint.svg" },
         { name: "green tint", src: "Glass-NoShade-GreenTint.svg" },
         { name: "gray tint privacy", src: "Glass-NoShade-GrayTint.svg" },
+        { name: "blue tint", src: "Glass-NoShade-BlueTint.svg" },
 
         // No shade or tint
         { name: "clear", src: "Glass-NoShade-NoTint.svg" },

From cff0f89e76f6670ed70cd3c9cf5184a676a2048f Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 8 Mar 2023 11:21:14 -0500
Subject: [PATCH 235/261] Removed commented code and renamed CTU variable in
 parameter list for priceOrderItemsAndSaveServerData

---
 .../service-package-radio/service-package-radio.vue        | 7 -------
 src/store/index.js                                         | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

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 59903d745..83bee2218 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
@@ -40,13 +40,6 @@
                                         "
                                         :data-bs-target="'#' + getRouterLinkRouteFromCopy(copy)"
                                         aria-label="Modal window" />
-                                    <!-- <textLink
-                                        linkType="text"
-                                        :text="getRouterLinkDisplayTextFromCopy(copy)"
-                                        href="#!"
-                                        data-bs-toggle="modal"
-                                        :data-bs-target="'#' + getRouterLinkRouteFromCopy(copy)"
-                                        aria-label="Modal window" /> -->
                                 </span>
                             </template>
                         </li>
diff --git a/src/store/index.js b/src/store/index.js
index 45f9d92fe..77eea9a5c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1431,11 +1431,11 @@ export const actions = {
         context.commit(storeMutations.UPDATE_VAPS, vaps);
     },
     // Price order actions
-    async priceOrderItemsAndSaveServerData(context, { availableLineItems, serviceZipCode, ctu }) {
+    async priceOrderItemsAndSaveServerData(context, { availableLineItems, serviceZipCode, serviceZipCodeCtu }) {
         const zipCodeToUse = serviceZipCode
             ? serviceZipCode
             : context.getters.order.serviceLocation.zipCode;
-        const ctuToUse = ctu ? ctu : context.getters.order.serviceLocation.zipCodeCtu;
+        const ctuToUse = serviceZipCodeCtu ? serviceZipCodeCtu : context.getters.order.serviceLocation.zipCodeCtu;
 
         const availableLineItemsFormattedForRequest =
             getLineItemQueryStringForPricing(availableLineItems);

From 475d2f21eda7a4e2673df4e0a281bb1e02ff68ab Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Wed, 8 Mar 2023 12:48:13 -0500
Subject: [PATCH 236/261] CSR-785

rename cash_account to cash_parent_account
---
 src/constants/application-config.js | 2 +-
 src/layouts/quote/quote.spec.js     | 4 ++--
 src/layouts/quote/quote.vue         | 4 ++--
 src/store/index.js                  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/constants/application-config.js b/src/constants/application-config.js
index 550112bcc..4c5305783 100644
--- a/src/constants/application-config.js
+++ b/src/constants/application-config.js
@@ -9,7 +9,7 @@ const applicationConfig = {
     APPLICATION_ABBREVIATION: "fmg",
     PAGE_QUERYSTRING: "fmgPage",
     SITE_ENTRY_TRIGGER_VALUE: "FixMyGlass",
-    CASH_ACCOUNT_NUMBER: 167132,
+    CASH_PARENT_ACCOUNT_NUMBER: 167132,
 };
 
 export { applicationConfig };
diff --git a/src/layouts/quote/quote.spec.js b/src/layouts/quote/quote.spec.js
index 3d0f5baba..099a3778e 100644
--- a/src/layouts/quote/quote.spec.js
+++ b/src/layouts/quote/quote.spec.js
@@ -66,7 +66,7 @@ store.getters = {
         payment: {
             insuranceCoverage: {},
             isInsurance: false,
-            parentAccountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
+            parentAccountNumber: applicationConfig.CASH_PARENT_ACCOUNT_NUMBER,
         },
     },
 };
@@ -76,7 +76,7 @@ afterEach(() => {
     store.getters = {
         order: {
             payment: {
-                parentAccountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
+                parentAccountNumber: applicationConfig.CASH_PARENT_ACCOUNT_NUMBER,
             },
         },
         payment: {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 8a27e26e0..06b8ecb9a 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -185,14 +185,14 @@ export default {
             if (!this.isInsuranceSelected) {
                 this.dispatchStoreAction(
                     this.storeActions.SAVE_PARENT_ACCOUNT_NUMBER,
-                    applicationConfig.CASH_ACCOUNT_NUMBER,
+                    applicationConfig.CASH_PARENT_ACCOUNT_NUMBER,
                     false
                 );
             }
 
             if (
                 this.$store.getters.order.payment.parentAccountNumber !=
-                applicationConfig.CASH_ACCOUNT_NUMBER
+                applicationConfig.CASH_PARENT_ACCOUNT_NUMBER
             ) {
                 this.supportingItems = this.filterOutFees(this.supportingItems);
             }
diff --git a/src/store/index.js b/src/store/index.js
index 45f9d92fe..3793111ae 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -934,7 +934,7 @@ export const actions = {
             payload: {
                 carId: carId,
                 serviceType: isRepair ? "Repair" : "Replace",
-                parentAccountNumber: applicationConfig.CASH_ACCOUNT_NUMBER,
+                parentAccountNumber: applicationConfig.CASH_PARENT_ACCOUNT_NUMBER,
                 parts: glassPartsArray,
                 numberOfRepairChips: isRepair ? numberOfChips : 0,
             },
@@ -1443,7 +1443,7 @@ export const actions = {
         const vehicle = context.getters.order.vehicle;
 
         let queryString =
-            `ParentAccountNumber=${applicationConfig.CASH_ACCOUNT_NUMBER}` +
+            `ParentAccountNumber=${applicationConfig.CASH_PARENT_ACCOUNT_NUMBER}` +
             `&CTU=${ctuToUse}` +
             `&CarId=${vehicle.carId}` +
             `&Make=${vehicle.make}` +

From 4b6be3fa5cf63cf8ff8cce3e946a631ce2a63dfb Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Wed, 8 Mar 2023 13:23:53 -0500
Subject: [PATCH 237/261] More changes from tech review

---
 src/helpers/service-location-helper.js           |  4 ++--
 .../mobile-location-modal-questions.vue          | 16 ++++++++++------
 .../service-location/service-location.vue        | 16 ++++++++--------
 src/store/index.js                               |  9 +++++++--
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/helpers/service-location-helper.js b/src/helpers/service-location-helper.js
index 41f4be147..5d3a1c603 100644
--- a/src/helpers/service-location-helper.js
+++ b/src/helpers/service-location-helper.js
@@ -7,7 +7,7 @@ export async function getPricedMobileFeePart(serviceZipCode) {
     }
 
     const zipCodeData = await baseMixin.methods.getZipCodeData(serviceZipCode);
-
+ 
     // Get the Mobile Fee Part
     const mobileFeePart = await baseMixin.methods.dispatchStoreAction(
         storeActions.GET_MOBILE_FEE_PART,
@@ -21,7 +21,7 @@ export async function getPricedMobileFeePart(serviceZipCode) {
         {
             availableLineItems: [mobileFeePart.data],
             serviceZipCode: serviceZipCode,
-            ctu: zipCodeData.zipCodeCtu,
+            serviceZipCodeCtu: zipCodeData.zipCodeCtu,
         },
         false
     );
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 4c6028ca5..f5fcf4574 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -59,6 +59,7 @@ import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location
 
 // Helpers
 import { deepClone } from "@/helpers/object-cloning-helper";
+import { object } from "yup/lib/locale";
 
 export default {
     name: "mobile-location-modal-questions",
@@ -81,10 +82,12 @@ export default {
                     zipCode: "",
                 },
                 isVehicleProtected: null,
-                serviceZipCode: "",
-                mobileFeePart: null,
             }),
         },
+        mobileFeePart: {
+            type: Object,
+            default: () => ({}),
+        },
         isZipServiceableMobile: Boolean,
         isZipServiceableInShop: Boolean,
         linkWidgetName: String,
@@ -122,13 +125,14 @@ export default {
             return cmsContentText.replaceAll("{custom:mobileFee}", this.mobileFee);
         },
         mobileFee() {
-            if (!this.modelValue.mobileFeePart) {
+            if (!this.mobileFeePart) {
                 return 0;
             }
+            
             return (
-                this.modelValue.mobileFeePart.laborAmount +
-                this.modelValue.mobileFeePart.sellingPrice +
-                this.modelValue.mobileFeePart.kitPrice
+                this.mobileFeePart.laborAmount +
+                this.mobileFeePart.sellingPrice +
+                this.mobileFeePart.kitPrice
             );
         },
         modalFooterText() {
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 6950b23c1..3d1ea1a61 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -11,6 +11,7 @@
                 modalWidgetName="ServiceZipModalWidget" />
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
+                :mobileFeePart="mobileFeePart"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />
@@ -90,7 +91,7 @@ export default {
             },
             set: function (newValue) {
                 if (newValue.zipCode !== this.zipCode) {
-                    this.resetMobileLocation(this.zipCode);
+                    this.resetMobileLocation(newValue.zipCode);
                 }
 
                 this.state = newValue.state;
@@ -108,7 +109,6 @@ export default {
                         zipCode: this.zipCode,
                     },
                     isVehicleProtected: this.isVehicleProtected,
-                    mobileFeePart: this.mobileFeePart,
                 };
             },
             set: function (newValue) {
@@ -119,17 +119,17 @@ export default {
                 this.state = newValue.addressQuestions.state;
                 this.zipCode = newValue.addressQuestions.zipCode;
                 this.isVehicleProtected = newValue.isVehicleProtected;
-                this.mobileFeePart = newValue.mobileFeePart;
             },
         },
     },
     methods: {
         arePagePrerequisitesValid() {
-            return (
-                store.getters.lineItems.supportingItems !== null &&
-                store.getters.order.serviceLocation.zipCode !== null &&
-                store.getters.payment.isInsurance !== null
-            );
+            return true;
+            // return (
+            //     store.getters.lineItems.supportingItems !== null &&
+            //     store.getters.order.serviceLocation.zipCode !== null &&
+            //     store.getters.payment.isInsurance !== null
+            // );
         },
         setData(mobileFeePart) {
             if (mobileFeePart) {
diff --git a/src/store/index.js b/src/store/index.js
index 77eea9a5c..f9ec56519 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1431,11 +1431,16 @@ export const actions = {
         context.commit(storeMutations.UPDATE_VAPS, vaps);
     },
     // Price order actions
-    async priceOrderItemsAndSaveServerData(context, { availableLineItems, serviceZipCode, serviceZipCodeCtu }) {
+    async priceOrderItemsAndSaveServerData(
+        context,
+        { availableLineItems, serviceZipCode, serviceZipCodeCtu }
+    ) {
         const zipCodeToUse = serviceZipCode
             ? serviceZipCode
             : context.getters.order.serviceLocation.zipCode;
-        const ctuToUse = serviceZipCodeCtu ? serviceZipCodeCtu : context.getters.order.serviceLocation.zipCodeCtu;
+        const ctuToUse = serviceZipCodeCtu
+            ? serviceZipCodeCtu
+            : context.getters.order.serviceLocation.zipCodeCtu;
 
         const availableLineItemsFormattedForRequest =
             getLineItemQueryStringForPricing(availableLineItems);

From 0c6d2cb6e87058095275a6eb605e028d9c342be7 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 9 Mar 2023 13:38:20 -0500
Subject: [PATCH 238/261] Got unit tests working again

---
 .../address-questions/address-questions.vue   |  5 +++
 .../object-cloning-helper.js                  |  0
 .../object-cloning-helper.spec.js             |  0
 .../service-location-helper.js                | 12 ++++--
 .../service-location-helper.spec.js           |  0
 .../mobile-location-modal-questions.vue       | 38 +++++++++----------
 .../service-location/service-location.spec.js | 18 +++++----
 .../service-location/service-location.vue     | 35 ++++++++++-------
 8 files changed, 64 insertions(+), 44 deletions(-)
 rename src/{helpers => layouts/service-location/helpers/object-cloning-helper}/object-cloning-helper.js (100%)
 rename src/{helpers => layouts/service-location/helpers/object-cloning-helper}/object-cloning-helper.spec.js (100%)
 rename src/{helpers => layouts/service-location/helpers/service-location-helper}/service-location-helper.js (69%)
 rename src/{helpers => layouts/service-location/helpers/service-location-helper}/service-location-helper.spec.js (100%)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index c37e596ef..1769961b7 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -22,6 +22,7 @@
                 aria-live="polite">
                 <div class="col">
                     <textboxQuestion
+                        customInputId="apartmentNumberOrBusinessName"
                         cmsWidgetName="ApartmentNumberOrBusinessNameQuestionWidget"
                         v-model="addressModel.apartmentNumberOrBusinessName"
                         ref="apartmentNumberOrBusinessName" />
@@ -32,6 +33,7 @@
             <div class="row mb-4" v-show="showAddressFields" aria-live="polite">
                 <div class="col">
                     <textboxQuestion
+                        customInputId="city"
                         cmsWidgetName="CityQuestionWidget"
                         v-model="addressModel.city"
                         ref="city"
@@ -43,14 +45,17 @@
             <div class="row mb-4" v-show="showAddressFields" aria-live="polite">
                 <div class="col">
                     <dropdownQuestion
+                        customInputId="state"
                         cmsWidgetName="StateQuestionWidget"
                         v-model="addressModel.state"
                         ref="state"
                         :options="stateOptions"
+                        initialValue="FL"
                         validationRules="state-required" />
                 </div>
                 <div class="col">
                     <textboxQuestion
+                        customInputId="zipCode"
                         cmsWidgetName="ZipQuestionWidget"
                         v-model="addressModel.zipCode"
                         ref="zipCode"
diff --git a/src/helpers/object-cloning-helper.js b/src/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper.js
similarity index 100%
rename from src/helpers/object-cloning-helper.js
rename to src/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper.js
diff --git a/src/helpers/object-cloning-helper.spec.js b/src/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper.spec.js
similarity index 100%
rename from src/helpers/object-cloning-helper.spec.js
rename to src/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper.spec.js
diff --git a/src/helpers/service-location-helper.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
similarity index 69%
rename from src/helpers/service-location-helper.js
rename to src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
index 5d3a1c603..a1aeb4b7b 100644
--- a/src/helpers/service-location-helper.js
+++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
@@ -1,17 +1,21 @@
 import { storeActions } from "@/constants/store-actions";
 import baseMixin from "@/mixins/base-mixin.js";
 
-export async function getPricedMobileFeePart(serviceZipCode) {
-    if (!serviceZipCode) {
+export async function getPricedMobileFeePart(serviceZipCode, serviceType, parentAccountNumber, billToAccountNumber) {
+    if (!serviceZipCode || !serviceType || !parentAccountNumber) {
         return Promise.resolve(null);
     }
 
     const zipCodeData = await baseMixin.methods.getZipCodeData(serviceZipCode);
- 
+
     // Get the Mobile Fee Part
     const mobileFeePart = await baseMixin.methods.dispatchStoreAction(
         storeActions.GET_MOBILE_FEE_PART,
-        null,
+        {
+            serviceType: serviceType,
+            parentAccountNumber: parentAccountNumber,
+            billToAccountNumber: billToAccountNumber
+        },
         false
     );
 
diff --git a/src/helpers/service-location-helper.spec.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
similarity index 100%
rename from src/helpers/service-location-helper.spec.js
rename to src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index f5fcf4574..5063dc432 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -58,8 +58,7 @@ import addressQuestions from "@/layouts/address-lookup/customer-questions/addres
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 
 // Helpers
-import { deepClone } from "@/helpers/object-cloning-helper";
-import { object } from "yup/lib/locale";
+import { deepClone } from "@/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper";
 
 export default {
     name: "mobile-location-modal-questions",
@@ -128,7 +127,7 @@ export default {
             if (!this.mobileFeePart) {
                 return 0;
             }
-            
+
             return (
                 this.mobileFeePart.laborAmount +
                 this.mobileFeePart.sellingPrice +
@@ -152,23 +151,19 @@ export default {
         closeModal() {
             this.$refs[this.modalName].closeModal();
         },
-        resetComponent() {
-            this.resetModel();
-
-            // Reset the validation form
-            this.$refs[this.modalName].form.resetForm();
-
-            // Reinitialize the Address Auto Complete
-            this.$refs.addressQuestions.setupAddressLookup();
+        resetComponent(updatedServiceZipCodeInfo) {
+            // Reset the validation form, setting the initial values
+            // for the state and zipCode to those that were entered
+            // on the service-zip-modal-question component
+            this.$refs[this.modalName].form.resetForm({
+                values: {
+                    state: updatedServiceZipCodeInfo.state,
+                    zipCode: updatedServiceZipCodeInfo.zipCode,
+                },
+            });
         },
-        resetModel() {
-            // Address
-            this.internalModel.addressQuestions.streetAddress = "";
-            this.internalModel.addressQuestions.apartmentNumberOrBusinessName = "";
-            this.internalModel.addressQuestions.city = "";
-
-            // Is Vehicle Protected
-            this.internalModel.isVehicleProtected = null;
+        onAddressUpdated(updatedServiceZipCodeInfo) {
+            this.resetComponent(updatedServiceZipCodeInfo);
         },
         async setMobileLocation() {
             // Validate the Zip Code
@@ -189,6 +184,11 @@ export default {
         modelValue: {
             handler(newValue) {
                 this.internalModel = deepClone(newValue);
+
+                this.resetComponent({
+                    state: newValue.state,
+                    zipCode: newValue.zipCode
+                })
             },
             deep: true,
         },
diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index fb92fbf58..b163f7592 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -32,7 +32,7 @@ const mockGetPricedMobileFeePart = (mockServiceZipCode) => {
     return Promise.resolve(mobileFeePart);
 };
 
-jest.mock("@/helpers/service-location-helper", () => ({
+jest.mock("@/layouts/service-location/helpers/service-location-helper/service-location-helper", () => ({
     getPricedMobileFeePart: jest.fn((mockServiceZipCode) => {
         return mockGetPricedMobileFeePart(mockServiceZipCode);
     }),
@@ -107,6 +107,9 @@ const mockMixin = {
         getTotalLineItemPrice: jest.fn((lineItem) => {
             return 49.99;
         }),
+
+        onSubmit: jest.fn(),
+        onInvalidSubmit: jest.fn(),
     },
 };
 
@@ -130,6 +133,9 @@ beforeEach(() => {
                 state: "OH",
             },
         },
+        damage: {
+            isRepair: false
+        },
         payment: {
             isInsurance: false,
         },
@@ -168,7 +174,7 @@ describe("service-location.vue", () => {
             );
 
             // Assert
-            expect(wrapper.vm.mobileLocationQuestions.mobileFeePart).toStrictEqual(mobileFeePart);
+            expect(wrapper.vm.mobileFeePart).toStrictEqual(mobileFeePart);
         });
     });
 
@@ -217,7 +223,9 @@ describe("service-location.vue", () => {
     describe("updating service zip", () => {
         test("updates the page model after providing the service zip code", () => {
             // Arrange
-            const { wrapper } = setupMocks({});
+            const { wrapper } = setupMocks({
+                mixins: [mockMixin]
+            });
             wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
 
             const newServiceZipCodeQuestion = {
@@ -256,7 +264,6 @@ describe("service-location.vue", () => {
                     zipCode: "43054",
                 },
                 isVehicleProtected: true,
-                mobileFeePart: null,
             };
             wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
 
@@ -269,7 +276,6 @@ describe("service-location.vue", () => {
                     zipCode: "61606",
                 },
                 isVehicleProtected: null,
-                mobileFeePart: null,
             };
 
             const serviceZipCodeComponent = wrapper.findComponent({
@@ -299,7 +305,6 @@ describe("service-location.vue", () => {
                     zipCode: "",
                 },
                 isVehicleProtected: null,
-                mobileFeePart: null,
             };
             wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
 
@@ -312,7 +317,6 @@ describe("service-location.vue", () => {
                     zipCode: "43054",
                 },
                 isVehicleProtected: true,
-                mobileFeePart: null,
             };
 
             const mobileLocationComponent = wrapper.findComponent({
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 3d1ea1a61..00017db80 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -37,7 +37,7 @@ import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import { getPricedMobileFeePart } from "@/helpers/service-location-helper";
+import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 import store from "@/store";
 
 export default {
@@ -49,6 +49,7 @@ export default {
             city: this.getServiceCityFromStore(),
             state: this.getServiceStateFromStore(),
             zipCode: this.getServiceZipCodeFromStore(),
+            isVehicleProtected: null,
             isZipServiceableMobile: null,
             isZipServiceableInShop: null,
             mobileFeePart: null,
@@ -59,7 +60,11 @@ export default {
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
 
         const serviceZipCode = store.getters.order.serviceLocation.zipCode;
-        const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode);
+        const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
+        const parentAccountNumber = store.getters.payment.parentAccountNumber;
+        const billToAccountNumber = 0;
+
+        const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode, serviceType, parentAccountNumber, billToAccountNumber);
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -91,7 +96,7 @@ export default {
             },
             set: function (newValue) {
                 if (newValue.zipCode !== this.zipCode) {
-                    this.resetMobileLocation(newValue.zipCode);
+                    this.resetMobileLocation(newValue);
                 }
 
                 this.state = newValue.state;
@@ -124,12 +129,11 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            return true;
-            // return (
-            //     store.getters.lineItems.supportingItems !== null &&
-            //     store.getters.order.serviceLocation.zipCode !== null &&
-            //     store.getters.payment.isInsurance !== null
-            // );
+            return (
+                store.getters.lineItems.supportingItems !== null &&
+                store.getters.order.serviceLocation.zipCode !== null &&
+                store.getters.payment.isInsurance !== null
+            );
         },
         setData(mobileFeePart) {
             if (mobileFeePart) {
@@ -149,19 +153,22 @@ export default {
             return store.getters.order.serviceLocation.zipCode;
         },
         resetMobileFeePart(serviceZipCode) {
-            getPricedMobileFeePart(serviceZipCode).then((pricedMobileFeePart) => {
+            const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
+            const parentAccountNumber = store.getters.payment.parentAccountNumber;
+            const billToAccountNumber = 0;
+
+            getPricedMobileFeePart(serviceZipCode, serviceType, parentAccountNumber, billToAccountNumber).then((pricedMobileFeePart) => {
                 this.mobileFeePart = pricedMobileFeePart;
             });
         },
-        resetMobileLocation(updatedServiceZipCode) {
+        resetMobileLocation(updatedServiceZipCodeInfo) {
             this.streetAddress = "";
             this.apartmentNumberOrBusinessName = "";
             this.city = "";
+
             this.isVehicleProtected = null;
 
-            this.$refs.mobileLocationModalQuestions.resetComponent();
-
-            this.resetMobileFeePart(updatedServiceZipCode);
+            this.resetMobileFeePart(updatedServiceZipCodeInfo.zipCode);
         },
         backButtonAction() {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);

From 8ee995253881352f7c0165714ed99e4442c65b33 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 9 Mar 2023 13:50:31 -0500
Subject: [PATCH 239/261] Fixed mobile-location-modal-questions tests

---
 .../service-location-helper.spec.js           | 11 ++++--
 .../mobile-location-modal-questions.spec.js   | 34 -------------------
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
index 345e4c807..bb841e327 100644
--- a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
+++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
@@ -48,10 +48,13 @@ describe("service-location-helper.js", () => {
     it("Should return null if no service zip code is passed in", async () => {
         // Arrange
         const serviceZipCode = null;
+        const serviceType = "Replace"; 
+        const parentAccountNumber = 167132 
+        const billToAccountNumber = 1234
         const expected = null;
 
         // Act
-        const result = await getPricedMobileFeePart(serviceZipCode);
+        const result = await getPricedMobileFeePart(serviceZipCode, serviceType, parentAccountNumber, billToAccountNumber);
 
         // Assert
         expect(result).toEqual(expected);
@@ -60,6 +63,10 @@ describe("service-location-helper.js", () => {
     it("Should return the priced mobile fee part", async () => {
         // Arrange
         const serviceZipCode = "43235";
+        const serviceType = "Replace"; 
+        const parentAccountNumber = 167132 
+        const billToAccountNumber = 1234
+
         const expected = {
             partNumber: "MOBILE FEE",
             description: "MOBILE FEE",
@@ -70,7 +77,7 @@ describe("service-location-helper.js", () => {
         };
 
         // Act
-        const result = await getPricedMobileFeePart(serviceZipCode);
+        const result = await getPricedMobileFeePart(serviceZipCode, serviceType, parentAccountNumber, billToAccountNumber);
 
         // Assert
         expect(result).toEqual(expected);
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
index d90f68b1f..eb9d507db 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
@@ -300,40 +300,6 @@ describe("mobile-location-modal-questions.vue", () => {
         // Assert
         expect(wrapper.vm.displayInvalidZipAlert).toBe(true);
     });
-
-    it("Should clear the internal model when resetModel is called", async () => {
-        // Arrange
-        const mobileLocationQuestions = {
-            addressQuestions: {
-                streetAddress: "555 Some St",
-                apartmentNumberOrBusinessName: "Apt 1",
-                city: "Funkytown",
-                state: "OH",
-                zipCode: "55555",
-            },
-            isVehicleProtected: true,
-            serviceZipCode: "55555",
-        };
-
-        const { wrapper } = setupMocks({
-            mixins: [mockMixin],
-            props: {
-                modelValue: mobileLocationQuestions,
-            },
-            mountOptions: {
-                attachTo: document.body,
-            },
-        });
-
-        // Act
-        wrapper.vm.resetModel();
-
-        // Assert
-        expect(wrapper.vm.internalModel.addressQuestions.streetAddress).toEqual("");
-        expect(wrapper.vm.internalModel.addressQuestions.apartmentNumberOrBusinessName).toEqual("");
-        expect(wrapper.vm.internalModel.addressQuestions.city).toEqual("");
-        expect(wrapper.vm.internalModel.isVehicleProtected).toEqual(null);
-    });
 });
 
 function setupMocks({ mountOptions, mixins, props, isShallowMount = true }) {

From 99faf4d0679ffef06f39b44e5c2eed121b04efe7 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 9 Mar 2023 13:55:42 -0500
Subject: [PATCH 240/261] Prettified

---
 .../service-location-helper.js                |  9 +++++--
 .../service-location-helper.spec.js           | 26 +++++++++++++------
 .../mobile-location-modal-questions.vue       |  4 +--
 .../service-location/service-location.spec.js | 17 +++++++-----
 .../service-location/service-location.vue     | 14 ++++++++--
 5 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
index a1aeb4b7b..f9529ccec 100644
--- a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
+++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
@@ -1,7 +1,12 @@
 import { storeActions } from "@/constants/store-actions";
 import baseMixin from "@/mixins/base-mixin.js";
 
-export async function getPricedMobileFeePart(serviceZipCode, serviceType, parentAccountNumber, billToAccountNumber) {
+export async function getPricedMobileFeePart(
+    serviceZipCode,
+    serviceType,
+    parentAccountNumber,
+    billToAccountNumber
+) {
     if (!serviceZipCode || !serviceType || !parentAccountNumber) {
         return Promise.resolve(null);
     }
@@ -14,7 +19,7 @@ export async function getPricedMobileFeePart(serviceZipCode, serviceType, parent
         {
             serviceType: serviceType,
             parentAccountNumber: parentAccountNumber,
-            billToAccountNumber: billToAccountNumber
+            billToAccountNumber: billToAccountNumber,
         },
         false
     );
diff --git a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
index bb841e327..061fd6bcd 100644
--- a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
+++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
@@ -48,13 +48,18 @@ describe("service-location-helper.js", () => {
     it("Should return null if no service zip code is passed in", async () => {
         // Arrange
         const serviceZipCode = null;
-        const serviceType = "Replace"; 
-        const parentAccountNumber = 167132 
-        const billToAccountNumber = 1234
+        const serviceType = "Replace";
+        const parentAccountNumber = 167132;
+        const billToAccountNumber = 1234;
         const expected = null;
 
         // Act
-        const result = await getPricedMobileFeePart(serviceZipCode, serviceType, parentAccountNumber, billToAccountNumber);
+        const result = await getPricedMobileFeePart(
+            serviceZipCode,
+            serviceType,
+            parentAccountNumber,
+            billToAccountNumber
+        );
 
         // Assert
         expect(result).toEqual(expected);
@@ -63,9 +68,9 @@ describe("service-location-helper.js", () => {
     it("Should return the priced mobile fee part", async () => {
         // Arrange
         const serviceZipCode = "43235";
-        const serviceType = "Replace"; 
-        const parentAccountNumber = 167132 
-        const billToAccountNumber = 1234
+        const serviceType = "Replace";
+        const parentAccountNumber = 167132;
+        const billToAccountNumber = 1234;
 
         const expected = {
             partNumber: "MOBILE FEE",
@@ -77,7 +82,12 @@ describe("service-location-helper.js", () => {
         };
 
         // Act
-        const result = await getPricedMobileFeePart(serviceZipCode, serviceType, parentAccountNumber, billToAccountNumber);
+        const result = await getPricedMobileFeePart(
+            serviceZipCode,
+            serviceType,
+            parentAccountNumber,
+            billToAccountNumber
+        );
 
         // Assert
         expect(result).toEqual(expected);
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 5063dc432..e2f3d3458 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -187,8 +187,8 @@ export default {
 
                 this.resetComponent({
                     state: newValue.state,
-                    zipCode: newValue.zipCode
-                })
+                    zipCode: newValue.zipCode,
+                });
             },
             deep: true,
         },
diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index b163f7592..fbe7aa448 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -32,11 +32,14 @@ const mockGetPricedMobileFeePart = (mockServiceZipCode) => {
     return Promise.resolve(mobileFeePart);
 };
 
-jest.mock("@/layouts/service-location/helpers/service-location-helper/service-location-helper", () => ({
-    getPricedMobileFeePart: jest.fn((mockServiceZipCode) => {
-        return mockGetPricedMobileFeePart(mockServiceZipCode);
-    }),
-}));
+jest.mock(
+    "@/layouts/service-location/helpers/service-location-helper/service-location-helper",
+    () => ({
+        getPricedMobileFeePart: jest.fn((mockServiceZipCode) => {
+            return mockGetPricedMobileFeePart(mockServiceZipCode);
+        }),
+    })
+);
 
 jest.mock("@/store", () => ({
     commit: jest.fn(),
@@ -134,7 +137,7 @@ beforeEach(() => {
             },
         },
         damage: {
-            isRepair: false
+            isRepair: false,
         },
         payment: {
             isInsurance: false,
@@ -224,7 +227,7 @@ describe("service-location.vue", () => {
         test("updates the page model after providing the service zip code", () => {
             // Arrange
             const { wrapper } = setupMocks({
-                mixins: [mockMixin]
+                mixins: [mockMixin],
             });
             wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
 
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 00017db80..c4944f3ee 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -64,7 +64,12 @@ export default {
         const parentAccountNumber = store.getters.payment.parentAccountNumber;
         const billToAccountNumber = 0;
 
-        const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode, serviceType, parentAccountNumber, billToAccountNumber);
+        const mobileFeePartPromise = getPricedMobileFeePart(
+            serviceZipCode,
+            serviceType,
+            parentAccountNumber,
+            billToAccountNumber
+        );
 
         // Settle promises and get results
         const promiseResultMap = [
@@ -157,7 +162,12 @@ export default {
             const parentAccountNumber = store.getters.payment.parentAccountNumber;
             const billToAccountNumber = 0;
 
-            getPricedMobileFeePart(serviceZipCode, serviceType, parentAccountNumber, billToAccountNumber).then((pricedMobileFeePart) => {
+            getPricedMobileFeePart(
+                serviceZipCode,
+                serviceType,
+                parentAccountNumber,
+                billToAccountNumber
+            ).then((pricedMobileFeePart) => {
                 this.mobileFeePart = pricedMobileFeePart;
             });
         },

From 697b6d7b210e554410176c5bb098f30cb0cdc9ad Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 9 Mar 2023 14:46:19 -0500
Subject: [PATCH 241/261] Added code to remove spinner if an invalid zip is
 entered

---
 .../mobile-location-modal-questions.vue               |  4 ++++
 src/layouts/service-location/service-location.vue     | 11 ++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index e2f3d3458..cdba0058f 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -162,6 +162,9 @@ export default {
                 },
             });
         },
+        resetModalButtonStyle() {
+            this.$refs[this.modalName].resetButtonStyle();
+        },
         onAddressUpdated(updatedServiceZipCodeInfo) {
             this.resetComponent(updatedServiceZipCodeInfo);
         },
@@ -173,6 +176,7 @@ export default {
 
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
+                this.resetModalButtonStyle();
             } else {
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index c4944f3ee..c58d57b65 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -134,11 +134,12 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            return (
-                store.getters.lineItems.supportingItems !== null &&
-                store.getters.order.serviceLocation.zipCode !== null &&
-                store.getters.payment.isInsurance !== null
-            );
+            return true;
+            // return (
+            //     store.getters.lineItems.supportingItems !== null &&
+            //     store.getters.order.serviceLocation.zipCode !== null &&
+            //     store.getters.payment.isInsurance !== null
+            // );
         },
         setData(mobileFeePart) {
             if (mobileFeePart) {

From a99ca76d7d2beee550187d8c743a1e3543fe5e3d Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 9 Mar 2023 15:38:34 -0500
Subject: [PATCH 242/261] Removed comments from arePagesPrequisitesValid

---
 src/layouts/service-location/service-location.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index c58d57b65..c4944f3ee 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -134,12 +134,11 @@ export default {
     },
     methods: {
         arePagePrerequisitesValid() {
-            return true;
-            // return (
-            //     store.getters.lineItems.supportingItems !== null &&
-            //     store.getters.order.serviceLocation.zipCode !== null &&
-            //     store.getters.payment.isInsurance !== null
-            // );
+            return (
+                store.getters.lineItems.supportingItems !== null &&
+                store.getters.order.serviceLocation.zipCode !== null &&
+                store.getters.payment.isInsurance !== null
+            );
         },
         setData(mobileFeePart) {
             if (mobileFeePart) {

From 5ba43cf9d443722ec4cca28eb3c8c71e49362e3e Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Thu, 9 Mar 2023 15:51:23 -0500
Subject: [PATCH 243/261] Fixed unit tests and ran formatter

---
 .../mobile-location-modal-questions.spec.js                     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
index eb9d507db..ab0ba6573 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
@@ -247,6 +247,7 @@ describe("mobile-location-modal-questions.vue", () => {
             attachTo: document.body,
         });
         wrapper.vm.$refs.MobileLocationModalWidget.closeModal = jest.fn();
+        wrapper.vm.resetModalButtonStyle = jest.fn();
 
         // Act
         wrapper.vm.internalModel = newMobileLocationQuestions;
@@ -293,6 +294,7 @@ describe("mobile-location-modal-questions.vue", () => {
         });
 
         wrapper.vm.internalModel = newMobileLocationQuestions;
+        wrapper.vm.resetModalButtonStyle = jest.fn();
 
         // Act
         await wrapper.vm.setMobileLocation();

From 2c8362be669bc5d2a41dedf3c7c153fd10672a8a Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 13 Mar 2023 09:52:12 -0400
Subject: [PATCH 244/261] Update notice at collection link to correct url.

---
 src/fmg-components/funnel-header/menu-modal/menu-modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
index fd0c96cb8..cc06b2710 100644
--- a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
@@ -66,7 +66,7 @@
                     <textLink
                         linkType="navigation"
                         text="Notice at collection"
-                        href="https://privacyportal-cdn.onetrust.com/dsarwebform/d3b95a93-e22e-4d4d-a806-482052406557/9e371601-eae3-4338-9430-b90b9036022b.html"
+                        href="https://www.safelite.com/ccpa-privacy-policy"
                         target="_blank" />
                 </div>
                 <div class="modal-footer d-flex justify-content-start">

From 672005fe5f1b470187a59b321bed71213ad14384 Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Mon, 27 Feb 2023 13:44:26 -0500
Subject: [PATCH 245/261] Military zip updates to front end

---
 .../funnel-footer/funnel-footer.vue           |  1 +
 .../service-location/service-location.vue     | 52 ++++++++++++++++++-
 src/mixins/base-mixin.js                      |  1 +
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/fmg-components/funnel-footer/funnel-footer.vue b/src/fmg-components/funnel-footer/funnel-footer.vue
index 2a6119681..f1900596b 100644
--- a/src/fmg-components/funnel-footer/funnel-footer.vue
+++ b/src/fmg-components/funnel-footer/funnel-footer.vue
@@ -34,6 +34,7 @@ import buttonMain from "@/ux-components/button-main/button-main";
 
 export default {
     name: "funnelFooter",
+    emits: ["BackClicked", "ForwardClicked"], // <--- should remove oodles of warnings in dev tools
     props: {
         isForwardActionDisabled: Boolean,
         isBackButtonHidden: { type: Boolean, default: false },
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index c4944f3ee..f4d4d6ea0 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -4,6 +4,17 @@
             <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
+            <div class="fade-on-route-transition sub-container make-tall">
+                <alert
+                    class="my-4"
+                    cmsWidgetName="AlertMilitaryBaseZipWidget"
+                    v-if="zipContainsMilitaryBase"
+                    alertClass="alert-warning" />
+                <div>shouldDisableForwardAction: {{ shouldDisableForwardAction }}</div>
+                <div>
+                    <button @click="toggleZip">Toggle Zip</button>
+                </div>
+            </div>
             <serviceZipModalQuestion
                 v-model="serviceZipCodeQuestion"
                 ref="serviceZipCodeQuestion"
@@ -18,7 +29,7 @@
             <funnel-footer
                 cmsWidgetName="FunnelFooterWidget"
                 ref="funnelFooter"
-                :isForwardActionDisabled="!meta.valid"
+                :isForwardActionDisabled="!meta.valid || shouldDisableForwardAction"
                 @back-clicked="backButtonAction"
                 @ForwardClicked="forwardButtonAction" />
         </div>
@@ -27,6 +38,7 @@
 
 <script>
 // Components
+import alert from "@/ux-components/alert/alert";
 import serviceZipModalQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-modal-question";
 import mobileLocationModalQuestions from "@/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions";
 import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
@@ -34,12 +46,17 @@ 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 baseMixin from "@/mixins/base-mixin.js";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
 import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 import store from "@/store";
 
+import store from "@/store";
+
 export default {
     name: "service-location",
     data() {
@@ -54,10 +71,15 @@ export default {
             isZipServiceableInShop: null,
             mobileFeePart: null,
         };
+        return {
+            serviceLocationZip: 0,
+            zipContainsMilitaryBase: false,
+        };
     },
     async beforeRouteEnter(to, from, next) {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
+        const zip = store.getters.order.serviceLocation.zipCode;
 
         const serviceZipCode = store.getters.order.serviceLocation.zipCode;
         const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
@@ -81,6 +103,10 @@ export default {
                 resultKey: "mobileFeePart",
                 promise: mobileFeePartPromise,
             },
+            {
+                resultKey: "zipCodeData",
+                promise: baseMixin.methods.getZipCodeData(zip),
+            },
         ];
 
         const resultMap = await settleAllPromises(promiseResultMap);
@@ -89,6 +115,8 @@ export default {
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
             vm.setData(resultMap.mobileFeePart);
+            vm.zipContainsMilitaryBase = resultMap.zipCodeData.containsMilitaryBase;
+            vm.serviceLocationZip = zip;
         });
     },
     computed: {
@@ -132,6 +160,11 @@ export default {
             },
         },
     },
+    computed: {
+        shouldDisableForwardAction() {
+            return this.zipContainsMilitaryBase;
+        },
+    },
     methods: {
         arePagePrerequisitesValid() {
             return (
@@ -186,8 +219,25 @@ export default {
         forwardButtonAction() {
             navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
         },
+        toggleZip() {
+            if (this.serviceLocationZip == 43228) {
+                this.serviceLocationZip = 45433;
+            } else {
+                this.serviceLocationZip = 43228;
+            }
+        },
+    },
+    watch: {
+        serviceLocationZip(current, previous) {
+            if (current !== previous) {
+                baseMixin.methods.getZipCodeData(current).then((r) => {
+                    this.zipContainsMilitaryBase = r.containsMilitaryBase;
+                });
+            }
+        },
     },
     components: {
+        alert,
         serviceZipModalQuestion,
         mobileLocationModalQuestions,
         funnelHeader,
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js
index 9018de79b..43ce4c132 100644
--- a/src/mixins/base-mixin.js
+++ b/src/mixins/base-mixin.js
@@ -57,6 +57,7 @@ export default {
             );
 
             return {
+                containsMilitaryBase: serviceZipValidationResponse.data.containsMilitaryBase,
                 isValid: serviceZipValidationResponse.data.isValid,
                 isServiceable: serviceZipValidationResponse.data.isServiceable,
                 state: serviceZipValidationResponse.data.state,

From 5d4785961897893495b81c294a03641d9a0cf6ed Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Thu, 2 Mar 2023 15:36:44 -0500
Subject: [PATCH 246/261] duplicate line after a merge

---
 src/layouts/service-location/service-location.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index f4d4d6ea0..9fe15c7ef 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -55,8 +55,6 @@ import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigat
 import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 import store from "@/store";
 
-import store from "@/store";
-
 export default {
     name: "service-location",
     data() {

From 532a017064bab7a60981d568d37f1e58375236a2 Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Thu, 9 Mar 2023 09:57:05 -0500
Subject: [PATCH 247/261] Updates for Military zip front end.

---
 .../service-location/service-location.vue     | 24 +++----------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 9fe15c7ef..9563fa0aa 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -10,10 +10,6 @@
                     cmsWidgetName="AlertMilitaryBaseZipWidget"
                     v-if="zipContainsMilitaryBase"
                     alertClass="alert-warning" />
-                <div>shouldDisableForwardAction: {{ shouldDisableForwardAction }}</div>
-                <div>
-                    <button @click="toggleZip">Toggle Zip</button>
-                </div>
             </div>
             <serviceZipModalQuestion
                 v-model="serviceZipCodeQuestion"
@@ -68,17 +64,12 @@ export default {
             isZipServiceableMobile: null,
             isZipServiceableInShop: null,
             mobileFeePart: null,
-        };
-        return {
-            serviceLocationZip: 0,
             zipContainsMilitaryBase: false,
         };
     },
     async beforeRouteEnter(to, from, next) {
         // Call APIs
         const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
-        const zip = store.getters.order.serviceLocation.zipCode;
-
         const serviceZipCode = store.getters.order.serviceLocation.zipCode;
         const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
         const parentAccountNumber = store.getters.payment.parentAccountNumber;
@@ -103,7 +94,7 @@ export default {
             },
             {
                 resultKey: "zipCodeData",
-                promise: baseMixin.methods.getZipCodeData(zip),
+                promise: baseMixin.methods.getZipCodeData(serviceZipCode),
             },
         ];
 
@@ -114,7 +105,7 @@ export default {
             vm.setCmsContent(resultMap.cmsContent);
             vm.setData(resultMap.mobileFeePart);
             vm.zipContainsMilitaryBase = resultMap.zipCodeData.containsMilitaryBase;
-            vm.serviceLocationZip = zip;
+            vm.zipCode = serviceZipCode;
         });
     },
     computed: {
@@ -157,8 +148,6 @@ export default {
                 this.isVehicleProtected = newValue.isVehicleProtected;
             },
         },
-    },
-    computed: {
         shouldDisableForwardAction() {
             return this.zipContainsMilitaryBase;
         },
@@ -217,16 +206,9 @@ export default {
         forwardButtonAction() {
             navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
         },
-        toggleZip() {
-            if (this.serviceLocationZip == 43228) {
-                this.serviceLocationZip = 45433;
-            } else {
-                this.serviceLocationZip = 43228;
-            }
-        },
     },
     watch: {
-        serviceLocationZip(current, previous) {
+        zipCode(current, previous) {
             if (current !== previous) {
                 baseMixin.methods.getZipCodeData(current).then((r) => {
                     this.zipContainsMilitaryBase = r.containsMilitaryBase;

From aa25092cc9a648b79969a9839a8708bd0c9f6916 Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Thu, 9 Mar 2023 13:43:02 -0500
Subject: [PATCH 248/261] fix tests page after merge

---
 src/layouts/service-location/service-location.spec.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index fbe7aa448..9870e1f0d 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -41,6 +41,16 @@ jest.mock(
     })
 );
 
+jest.spyOn(baseMixin.methods, "getZipCodeData").mockImplementation((serviceZipCode) => {
+    let moqContainsMilitaryBase = false;
+    if (serviceZipCode === 45433) {
+        moqContainsMilitaryBase = true;
+    }
+    return new Promise((resolve) => {
+        resolve({ containsMilitaryBase: moqContainsMilitaryBase, isValid: true, isServiceable: true, state: "OH", zipCodeCtu: "01820" });
+    });    
+});
+
 jest.mock("@/store", () => ({
     commit: jest.fn(),
     dispatch: jest.fn(),

From 757bb36cea8523e62adb08d9ededc31cdedea186 Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Mon, 13 Mar 2023 10:45:59 -0400
Subject: [PATCH 249/261] updated test

---
 .../service-location/service-location.spec.js | 28 +++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 9870e1f0d..05608f89f 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -42,12 +42,12 @@ jest.mock(
 );
 
 jest.spyOn(baseMixin.methods, "getZipCodeData").mockImplementation((serviceZipCode) => {
-    let moqContainsMilitaryBase = false;
-    if (serviceZipCode === 45433) {
-        moqContainsMilitaryBase = true;
-    }
     return new Promise((resolve) => {
-        resolve({ containsMilitaryBase: moqContainsMilitaryBase, isValid: true, isServiceable: true, state: "OH", zipCodeCtu: "01820" });
+        let mockContainsMilitaryBase = false;
+        if (serviceZipCode === 45433 || serviceZipCode === '45433') {
+            mockContainsMilitaryBase = true;
+        }
+        resolve({ containsMilitaryBase: mockContainsMilitaryBase, isValid: true, isServiceable: true, state: "OH", zipCodeCtu: "01820" });
     });    
 });
 
@@ -301,6 +301,24 @@ describe("service-location.vue", () => {
             // Assert
             expect(wrapper.vm.mobileLocationQuestions).toStrictEqual(newMobileLocationQuestions);
         });
+
+        test("displays military zip message when zip is updated", () => {
+            // Arrange
+            const { wrapper } = setupMocks({});
+            wrapper.vm.$refs.mobileLocationModalQuestions.resetComponent = jest.fn();
+            expect(wrapper.vm.zipContainsMilitaryBase).toBe(false);
+
+            const newServiceZipCodeQuestion = {
+                zipCode: "45433",
+                state: "OH",
+            };
+
+            // Assert
+            wrapper.setData({zipCode: newServiceZipCodeQuestion.zipCode});
+            wrapper.vm.$nextTick(() => {
+                expect(wrapper.vm.zipContainsMilitaryBase).toBe(true);
+            });
+        });
     });
 
     describe("updating mobile location", () => {

From ad5ced16d7ebdcb8f37d2d8d41654cecb5b5044f Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Tue, 14 Mar 2023 01:08:14 -0400
Subject: [PATCH 250/261] boo for double quotes

---
 .../service-location/service-location.spec.js      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/layouts/service-location/service-location.spec.js b/src/layouts/service-location/service-location.spec.js
index 05608f89f..0653e91f0 100644
--- a/src/layouts/service-location/service-location.spec.js
+++ b/src/layouts/service-location/service-location.spec.js
@@ -44,11 +44,17 @@ jest.mock(
 jest.spyOn(baseMixin.methods, "getZipCodeData").mockImplementation((serviceZipCode) => {
     return new Promise((resolve) => {
         let mockContainsMilitaryBase = false;
-        if (serviceZipCode === 45433 || serviceZipCode === '45433') {
+        if (serviceZipCode === 45433 || serviceZipCode === "45433") {
             mockContainsMilitaryBase = true;
         }
-        resolve({ containsMilitaryBase: mockContainsMilitaryBase, isValid: true, isServiceable: true, state: "OH", zipCodeCtu: "01820" });
-    });    
+        resolve({
+            containsMilitaryBase: mockContainsMilitaryBase,
+            isValid: true,
+            isServiceable: true,
+            state: "OH",
+            zipCodeCtu: "01820",
+        });
+    });
 });
 
 jest.mock("@/store", () => ({
@@ -314,7 +320,7 @@ describe("service-location.vue", () => {
             };
 
             // Assert
-            wrapper.setData({zipCode: newServiceZipCodeQuestion.zipCode});
+            wrapper.setData({ zipCode: newServiceZipCodeQuestion.zipCode });
             wrapper.vm.$nextTick(() => {
                 expect(wrapper.vm.zipContainsMilitaryBase).toBe(true);
             });

From 08459d274124ccdb0c4b1679659aa96f96a8a3ae Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 14 Mar 2023 09:05:18 -0400
Subject: [PATCH 251/261] Added 'billToAccountNumber' required gate to
 'getPricedMobileFeePart'

---
 .../helpers/service-location-helper/service-location-helper.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
index f9529ccec..22ea1a641 100644
--- a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
+++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
@@ -7,7 +7,7 @@ export async function getPricedMobileFeePart(
     parentAccountNumber,
     billToAccountNumber
 ) {
-    if (!serviceZipCode || !serviceType || !parentAccountNumber) {
+    if (!serviceZipCode || !serviceType || !parentAccountNumber || !billToAccountNumber) {
         return Promise.resolve(null);
     }
 

From 6496b985b5a02b6f2fb53089d9dec88fc4c055e0 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 14 Mar 2023 09:25:24 -0400
Subject: [PATCH 252/261] Removed unnecessary "emits" directive"

---
 .../mobile-location-modal-questions.vue                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index cdba0058f..3a40ef9db 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -62,7 +62,7 @@ import { deepClone } from "@/layouts/service-location/helpers/object-cloning-hel
 
 export default {
     name: "mobile-location-modal-questions",
-    emits: ["update:modelValue", "updated-zip-code"], // The component emits an event
+    emits: ["update:modelValue"], // The component emits an event
     data() {
         return {
             internalModel: deepClone(this.modelValue),

From dd35ef9ca251f28c3426aca65dae1f0df756fa5c Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 14 Mar 2023 09:36:31 -0400
Subject: [PATCH 253/261] Moved resetMobileFeePart into service-location-helper

---
 .../service-location-helper.js                | 16 ++++++++++++++
 .../service-location/service-location.vue     | 21 +++++--------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
index 22ea1a641..0622aead1 100644
--- a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
+++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
@@ -1,4 +1,5 @@
 import { storeActions } from "@/constants/store-actions";
+import store from "@/store";
 import baseMixin from "@/mixins/base-mixin.js";
 
 export async function getPricedMobileFeePart(
@@ -37,3 +38,18 @@ export async function getPricedMobileFeePart(
 
     return Promise.resolve(pricingResults[0]);
 }
+
+export async function resetMobileFeePart(serviceZipCode) {
+    const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
+    const parentAccountNumber = store.getters.payment.parentAccountNumber;
+    const billToAccountNumber = 1;
+
+    getPricedMobileFeePart(
+        serviceZipCode,
+        serviceType,
+        parentAccountNumber,
+        billToAccountNumber
+    ).then((pricedMobileFeePart) => {
+        this.mobileFeePart = pricedMobileFeePart;
+    });
+}
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index c4944f3ee..3872ab68a 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -37,7 +37,10 @@ import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
+import {
+    getPricedMobileFeePart,
+    resetMobileFeePart,
+} from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 import store from "@/store";
 
 export default {
@@ -62,7 +65,7 @@ export default {
         const serviceZipCode = store.getters.order.serviceLocation.zipCode;
         const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
         const parentAccountNumber = store.getters.payment.parentAccountNumber;
-        const billToAccountNumber = 0;
+        const billToAccountNumber = 1;
 
         const mobileFeePartPromise = getPricedMobileFeePart(
             serviceZipCode,
@@ -157,20 +160,6 @@ export default {
         getServiceZipCodeFromStore() {
             return store.getters.order.serviceLocation.zipCode;
         },
-        resetMobileFeePart(serviceZipCode) {
-            const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
-            const parentAccountNumber = store.getters.payment.parentAccountNumber;
-            const billToAccountNumber = 0;
-
-            getPricedMobileFeePart(
-                serviceZipCode,
-                serviceType,
-                parentAccountNumber,
-                billToAccountNumber
-            ).then((pricedMobileFeePart) => {
-                this.mobileFeePart = pricedMobileFeePart;
-            });
-        },
         resetMobileLocation(updatedServiceZipCodeInfo) {
             this.streetAddress = "";
             this.apartmentNumberOrBusinessName = "";

From f6f6f7326fac72318a907a45c05a62f540bbaf29 Mon Sep 17 00:00:00 2001
From: Bill Richardson <william.richardson@safelite.com>
Date: Tue, 14 Mar 2023 10:40:01 -0400
Subject: [PATCH 254/261] remove make tall wrapper and scoot alert under
 service modal question component

---
 src/layouts/service-location/service-location.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 9563fa0aa..b93a8b3b9 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -4,18 +4,16 @@
             <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
-            <div class="fade-on-route-transition sub-container make-tall">
-                <alert
-                    class="my-4"
-                    cmsWidgetName="AlertMilitaryBaseZipWidget"
-                    v-if="zipContainsMilitaryBase"
-                    alertClass="alert-warning" />
-            </div>
             <serviceZipModalQuestion
                 v-model="serviceZipCodeQuestion"
                 ref="serviceZipCodeQuestion"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget" />
+            <alert
+                class="my-4"
+                cmsWidgetName="AlertMilitaryBaseZipWidget"
+                v-if="zipContainsMilitaryBase"
+                alertClass="alert-warning" />
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
                 :mobileFeePart="mobileFeePart"

From 99f6ef3a4e958c03029d0b4a36a773429a0baa7c Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 14 Mar 2023 10:40:45 -0400
Subject: [PATCH 255/261] WIP

---
 .../service-location-helper.js                  | 14 --------------
 .../mobile-location-modal-questions.vue         | 16 +++++++++++++---
 .../service-location/service-location.vue       | 17 +++++++++--------
 .../service-zip-modal-question.vue              | 16 ++++++++++++++++
 src/store/index.js                              |  2 +-
 5 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
index 0622aead1..ed05de924 100644
--- a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
+++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
@@ -39,17 +39,3 @@ export async function getPricedMobileFeePart(
     return Promise.resolve(pricingResults[0]);
 }
 
-export async function resetMobileFeePart(serviceZipCode) {
-    const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
-    const parentAccountNumber = store.getters.payment.parentAccountNumber;
-    const billToAccountNumber = 1;
-
-    getPricedMobileFeePart(
-        serviceZipCode,
-        serviceType,
-        parentAccountNumber,
-        billToAccountNumber
-    ).then((pricedMobileFeePart) => {
-        this.mobileFeePart = pricedMobileFeePart;
-    });
-}
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 3a40ef9db..deb23e8e4 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -56,9 +56,11 @@ import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
 import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
+import store from "@/store";
 
 // Helpers
 import { deepClone } from "@/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper";
+import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 
 export default {
     name: "mobile-location-modal-questions",
@@ -165,9 +167,6 @@ export default {
         resetModalButtonStyle() {
             this.$refs[this.modalName].resetButtonStyle();
         },
-        onAddressUpdated(updatedServiceZipCodeInfo) {
-            this.resetComponent(updatedServiceZipCodeInfo);
-        },
         async setMobileLocation() {
             // Validate the Zip Code
             const zipCodeData = await this.getZipCodeData(
@@ -178,6 +177,17 @@ export default {
                 this.displayInvalidZipAlert = true;
                 this.resetModalButtonStyle();
             } else {
+
+                // retrieve mobile fee part
+                const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
+                const parentAccountNumber = store.getters.payment.parentAccountNumber;
+                const billToAccountNumber = 1;
+
+                const mobileFeePart = await getPricedMobileFeePart(this.internalModel.addressQuestions.zipCode, serviceType, parentAccountNumber, billToAccountNumber);
+                               
+                // emit it to parent
+                this.$emit("set-mobile-fee-part", mobileFeePart);
+
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
                 this.closeModal();
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 3872ab68a..0242d7210 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -7,11 +7,14 @@
             <serviceZipModalQuestion
                 v-model="serviceZipCodeQuestion"
                 ref="serviceZipCodeQuestion"
+                :mobileFeePart="mobileFeePart"
+                @set-mobile-fee-part="setMobileFeePart"
                 linkWidgetName="ServiceZipLinkWidget"
                 modalWidgetName="ServiceZipModalWidget" />
             <mobileLocationModalQuestions
                 v-model="mobileLocationQuestions"
                 :mobileFeePart="mobileFeePart"
+                @set-mobile-fee-part="setMobileFeePart"
                 ref="mobileLocationModalQuestions"
                 linkWidgetName="MobileLocationLinkWidget"
                 modalWidgetName="MobileLocationModalWidget" />
@@ -37,10 +40,7 @@ import { Form } from "vee-validate";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import {
-    getPricedMobileFeePart,
-    resetMobileFeePart,
-} from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
+import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 import store from "@/store";
 
 export default {
@@ -104,7 +104,7 @@ export default {
             },
             set: function (newValue) {
                 if (newValue.zipCode !== this.zipCode) {
-                    this.resetMobileLocation(newValue);
+                    this.resetMobileLocation();
                 }
 
                 this.state = newValue.state;
@@ -160,14 +160,15 @@ export default {
         getServiceZipCodeFromStore() {
             return store.getters.order.serviceLocation.zipCode;
         },
-        resetMobileLocation(updatedServiceZipCodeInfo) {
+        setMobileFeePart(mobileFeePart) {
+            this.mobileFeePart = mobileFeePart;
+        },
+        resetMobileLocation() {
             this.streetAddress = "";
             this.apartmentNumberOrBusinessName = "";
             this.city = "";
 
             this.isVehicleProtected = null;
-
-            this.resetMobileFeePart(updatedServiceZipCodeInfo.zipCode);
         },
         backButtonAction() {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 4f4c98035..a54b90091 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -38,6 +38,8 @@ import textLink from "@/ux-components/text-link/text-link";
 import serviceZipQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question";
 import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
+import store from "@/store";
+import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
 
 export default {
     name: "service-zip-modal-question",
@@ -56,6 +58,10 @@ export default {
                 zipCode: "",
             }),
         },
+        mobileFeePart: {
+            type: Object,
+            default: () => ({}),
+        },       
         linkWidgetName: String,
         modalWidgetName: String,
     },
@@ -144,6 +150,16 @@ export default {
             } else {
                 this.internalModel.state = zipCodeData.state;
 
+                // retrieve mobile fee part
+                const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
+                const parentAccountNumber = store.getters.payment.parentAccountNumber;
+                const billToAccountNumber = 1;
+
+                const mobileFeePart = await getPricedMobileFeePart(this.internalModel.zipCode, serviceType, parentAccountNumber, billToAccountNumber);
+                             
+                // emit it to parent
+                this.$emit("set-mobile-fee-part", mobileFeePart);
+
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
 
diff --git a/src/store/index.js b/src/store/index.js
index 64acea595..c4c43aab4 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -918,7 +918,7 @@ export const actions = {
     getMobileFeePart(context) {
         return globalMethods.callMockHttpClient({
             method: endpoints.GetMobileFeePart.method,
-            endpoint: "https://run.mocky.io/v3/795de4cb-d014-48b4-9338-dab33261adce", //TODO: Remove Mocky Endpoint
+            endpoint: "https://run.mocky.io/v3/795de4cb-d014-48b4-9338-dab33261adce?mocky-delay=3000ms", //TODO: Remove Mocky Endpoint
         });
     },
 

From bcee963f9aeab297e612c2d7ddee88df99ec1b13 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 14 Mar 2023 13:25:26 -0400
Subject: [PATCH 256/261] Removed "initialValue" that shouldn't have been there

---
 .../address-questions/address-questions.vue                 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 1769961b7..a119f1d81 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -50,7 +50,6 @@
                         v-model="addressModel.state"
                         ref="state"
                         :options="stateOptions"
-                        initialValue="FL"
                         validationRules="state-required" />
                 </div>
                 <div class="col">
@@ -406,6 +405,11 @@ export default {
                 }
             },
         },
+        modelValue: {
+            handler() {
+                this.setupAddressLookup();
+            },
+        },
     },
     components: {
         textboxQuestion,

From 1613e192e3bbba49e7b127a1dad92b935c247800 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 14 Mar 2023 13:27:12 -0400
Subject: [PATCH 257/261] Replaced GetMobileFeePart Mocky with real call

---
 src/store/index.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index c4c43aab4..9458b993d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -916,9 +916,13 @@ export const actions = {
     },
 
     getMobileFeePart(context) {
-        return globalMethods.callMockHttpClient({
+        const serviceType = context.getters.damage.isRepair ? "Repair" : "Replace";
+        const parentAccountNumber = context.getters.payment.parentAccountNumber;
+        const billToAccountNumber = 87291; // TODO: MAKE THIS REAL
+
+        return globalMethods.callHttpClient({
             method: endpoints.GetMobileFeePart.method,
-            endpoint: "https://run.mocky.io/v3/795de4cb-d014-48b4-9338-dab33261adce?mocky-delay=3000ms", //TODO: Remove Mocky Endpoint
+            endpoint: `${endpoints.GetMobileFeePart.url}/${serviceType}/${parentAccountNumber}/${billToAccountNumber}`,
         });
     },
 

From 8c82e8f9f9f92397585b882fa4c38e58e232dcb6 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 14 Mar 2023 13:28:16 -0400
Subject: [PATCH 258/261] Added call to get mobile fee part in each component

---
 .../service-location-helper.js                  | 17 +++--------------
 .../mobile-location-modal-questions.vue         | 15 +++++++--------
 .../service-zip-modal-question.vue              | 14 +++++---------
 3 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
index ed05de924..ba81a973f 100644
--- a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
+++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
@@ -1,14 +1,8 @@
 import { storeActions } from "@/constants/store-actions";
-import store from "@/store";
 import baseMixin from "@/mixins/base-mixin.js";
 
-export async function getPricedMobileFeePart(
-    serviceZipCode,
-    serviceType,
-    parentAccountNumber,
-    billToAccountNumber
-) {
-    if (!serviceZipCode || !serviceType || !parentAccountNumber || !billToAccountNumber) {
+export async function getPricedMobileFeePart(serviceZipCode) {
+    if (!serviceZipCode) {
         return Promise.resolve(null);
     }
 
@@ -17,11 +11,7 @@ export async function getPricedMobileFeePart(
     // Get the Mobile Fee Part
     const mobileFeePart = await baseMixin.methods.dispatchStoreAction(
         storeActions.GET_MOBILE_FEE_PART,
-        {
-            serviceType: serviceType,
-            parentAccountNumber: parentAccountNumber,
-            billToAccountNumber: billToAccountNumber,
-        },
+        null,
         false
     );
 
@@ -38,4 +28,3 @@ export async function getPricedMobileFeePart(
 
     return Promise.resolve(pricingResults[0]);
 }
-
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index deb23e8e4..9c5b87858 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -161,6 +161,7 @@ export default {
                 values: {
                     state: updatedServiceZipCodeInfo.state,
                     zipCode: updatedServiceZipCodeInfo.zipCode,
+                    isVehicleProtected: updatedServiceZipCodeInfo.isVehicleProtected
                 },
             });
         },
@@ -177,14 +178,11 @@ export default {
                 this.displayInvalidZipAlert = true;
                 this.resetModalButtonStyle();
             } else {
-
                 // retrieve mobile fee part
-                const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
-                const parentAccountNumber = store.getters.payment.parentAccountNumber;
-                const billToAccountNumber = 1;
+                const serviceZipCode = this.internalModel.addressQuestions.zipCode;
+
+                const mobileFeePart = await getPricedMobileFeePart(serviceZipCode);
 
-                const mobileFeePart = await getPricedMobileFeePart(this.internalModel.addressQuestions.zipCode, serviceType, parentAccountNumber, billToAccountNumber);
-                               
                 // emit it to parent
                 this.$emit("set-mobile-fee-part", mobileFeePart);
 
@@ -200,8 +198,9 @@ export default {
                 this.internalModel = deepClone(newValue);
 
                 this.resetComponent({
-                    state: newValue.state,
-                    zipCode: newValue.zipCode,
+                    state: newValue.addressQuestions.state,
+                    zipCode: newValue.addressQuestions.zipCode,
+                    isVehicleProtected: newValue.isVehicleProtected
                 });
             },
             deep: true,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index a54b90091..c8397e490 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -61,7 +61,7 @@ export default {
         mobileFeePart: {
             type: Object,
             default: () => ({}),
-        },       
+        },
         linkWidgetName: String,
         modalWidgetName: String,
     },
@@ -142,27 +142,23 @@ export default {
             this.resetAlerts();
 
             const zipCodeData = await this.getZipCodeData(this.internalModel.zipCode);
-            this.resetModalButtonStyle();
-
+            
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
                 this.focusOnZipInput();
+                this.resetModalButtonStyle();
             } else {
                 this.internalModel.state = zipCodeData.state;
 
                 // retrieve mobile fee part
-                const serviceType = store.getters.damage.isRepair ? "Repair" : "Replace";
-                const parentAccountNumber = store.getters.payment.parentAccountNumber;
-                const billToAccountNumber = 1;
+                const serviceZipCode = this.internalModel.zipCode;
+                const mobileFeePart = await getPricedMobileFeePart(serviceZipCode);
 
-                const mobileFeePart = await getPricedMobileFeePart(this.internalModel.zipCode, serviceType, parentAccountNumber, billToAccountNumber);
-                             
                 // emit it to parent
                 this.$emit("set-mobile-fee-part", mobileFeePart);
 
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
-
                 this.closeModal();
             }
         },

From f89705c7a13d015bbb0e0ebc33a1a032af9162d2 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 14 Mar 2023 13:32:51 -0400
Subject: [PATCH 259/261] Prettified

---
 .../mobile-location-modal-questions.vue                       | 4 ++--
 .../service-zip-modal-question/service-zip-modal-question.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 9c5b87858..9bba10910 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -161,7 +161,7 @@ export default {
                 values: {
                     state: updatedServiceZipCodeInfo.state,
                     zipCode: updatedServiceZipCodeInfo.zipCode,
-                    isVehicleProtected: updatedServiceZipCodeInfo.isVehicleProtected
+                    isVehicleProtected: updatedServiceZipCodeInfo.isVehicleProtected,
                 },
             });
         },
@@ -200,7 +200,7 @@ export default {
                 this.resetComponent({
                     state: newValue.addressQuestions.state,
                     zipCode: newValue.addressQuestions.zipCode,
-                    isVehicleProtected: newValue.isVehicleProtected
+                    isVehicleProtected: newValue.isVehicleProtected,
                 });
             },
             deep: true,
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index c8397e490..50041cec3 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -142,7 +142,7 @@ export default {
             this.resetAlerts();
 
             const zipCodeData = await this.getZipCodeData(this.internalModel.zipCode);
-            
+
             if (!zipCodeData.isValid) {
                 this.displayInvalidZipAlert = true;
                 this.focusOnZipInput();

From 0d5231ff8702a4aa8f9d7de4505f53484a6630c3 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 14 Mar 2023 13:59:24 -0400
Subject: [PATCH 260/261] Fixed unit tests

---
 .../mobile-location-modal-questions.spec.js   | 26 +++++++++++++++++
 .../mobile-location-modal-questions.vue       |  2 +-
 .../service-zip-modal-question.spec.js        | 28 +++++++++++++++++++
 .../service-zip-modal-question.vue            |  1 +
 4 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
index ab0ba6573..fbea693b9 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.spec.js
@@ -93,6 +93,32 @@ const mockMixin = {
     },
 };
 
+const mockGetPricedMobileFeePart = (mockServiceZipCode) => {
+    let mobileFeePart = {};
+
+    if (mockServiceZipCode === "43235") {
+        mobileFeePart = {
+            partNumber: "MOBILE FEE",
+            description: "MOBILE FEE",
+            partType: "FEE",
+            laborAmount: 49.99,
+            sellingPrice: 0,
+            kitPrice: 0,
+        };
+    }
+
+    return Promise.resolve(mobileFeePart);
+};
+
+jest.mock(
+    "@/layouts/service-location/helpers/service-location-helper/service-location-helper",
+    () => ({
+        getPricedMobileFeePart: jest.fn((mockServiceZipCode) => {
+            return mockGetPricedMobileFeePart(mockServiceZipCode);
+        }),
+    })
+);
+
 describe("mobile-location-modal-questions.vue", () => {
     it("Should copy the modelValue to the internalModel when the component is mounted", async () => {
         // Arrange
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 9bba10910..b4da4ddfa 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -64,7 +64,7 @@ import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/servi
 
 export default {
     name: "mobile-location-modal-questions",
-    emits: ["update:modelValue"], // The component emits an event
+    emits: ["update:modelValue", "set-mobile-fee-part"],
     data() {
         return {
             internalModel: deepClone(this.modelValue),
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
index becbd9ebd..407e129cf 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.spec.js
@@ -16,6 +16,32 @@ jest.mock("@/digital-components/modal/modal", () => ({
     },
 }));
 
+const mockGetPricedMobileFeePart = (mockServiceZipCode) => {
+    let mobileFeePart = {};
+
+    if (mockServiceZipCode === "43235") {
+        mobileFeePart = {
+            partNumber: "MOBILE FEE",
+            description: "MOBILE FEE",
+            partType: "FEE",
+            laborAmount: 49.99,
+            sellingPrice: 0,
+            kitPrice: 0,
+        };
+    }
+
+    return Promise.resolve(mobileFeePart);
+};
+
+jest.mock(
+    "@/layouts/service-location/helpers/service-location-helper/service-location-helper",
+    () => ({
+        getPricedMobileFeePart: jest.fn((mockServiceZipCode) => {
+            return mockGetPricedMobileFeePart(mockServiceZipCode);
+        }),
+    })
+);
+
 const linkWidgetName = "linkWidgetName";
 const modalWidgetName = "modalWidgetName";
 
@@ -126,6 +152,7 @@ describe("service-zip-modal-question.vue", () => {
             mixins: [mockMixin],
             props: {
                 modelValue: serviceZipCodeQuestion,
+                mobileFeePart: {},
                 linkWidgetName: linkWidgetName,
                 modalWidgetName: modalWidgetName,
             },
@@ -134,6 +161,7 @@ describe("service-zip-modal-question.vue", () => {
 
         // Act
         wrapper.vm.internalModel.zipCode = zip;
+
         await wrapper.vm.setZipCode();
 
         let expectedEmit = [[{ state: "OH", zipCode: "43235" }]];
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 50041cec3..2c1e0e588 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -43,6 +43,7 @@ import { getPricedMobileFeePart } from "@/layouts/service-location/helpers/servi
 
 export default {
     name: "service-zip-modal-question",
+    emits: ["update:modelValue", "set-mobile-fee-part"],
     data() {
         return {
             internalModel: this.copyModel(this.modelValue),

From 4af0938aa8b2b625b17a9f4a16d3b40a37385082 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Tue, 14 Mar 2023 16:14:40 -0400
Subject: [PATCH 261/261] CSR-1012 modal closes when x button is clicked even
 on invalid input

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

diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index a18881796..ae475c853 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -19,7 +19,7 @@
                         ref="closeButton"
                         type="button"
                         class="btn-close"
-                        data-bs-dismiss="modal"
+                        @mousedown="closeModal"
                         aria-label="Close"></button>
                 </div>
                 <div class="modal-body ps-5 pe-5 pb-4 pt-0">