WIP

src/layouts/service-location/service-location.vue

@@ -190,10 +190,10 @@ export default {
             },
         },
         showMilitaryZipAlert() {
-            return (
+            const isZipServiceableMobile =
-                this.zipContainsMilitaryBase &&
+                this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
-                (this.isZipServiceableMobile == null || this.isZipServiceableMobile === true)
+
-            );
+            return this.zipContainsMilitaryBase && isZipServiceableMobile;
         },
     },
     methods: {

src/layouts/service-location/service-type-question/service-type-question.vue

@@ -55,8 +55,13 @@ export default {
             return filteredAnswers;
         },
         serviceability() {
-            const mobileAvailable =
+            let mobileAvailable;
-                this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
+            if (this.IsRecalibrationServiceableMobile == null) {
+                mobileAvailable = this.isGlassServiceableMobile;
+            } else {
+                mobileAvailable = this.isGlassServiceableMobile && this.isRecalibrationServiceableMobile;
+            }
+
             const inshopAvailable =
                 this.isGlassServiceableInshop && this.isRecalibrationServiceableInshop;
 
@@ -87,6 +92,8 @@ export default {
             handler(newValue) {
                 if (newValue == "MobileOnly") {
                     this.selectedValues = "Mobile";
+                } else {
+                    this.selectedValues = null;
                 }
             },
         },

src/store/index.js

@@ -43,6 +43,7 @@ const getDefaultState = () => {
                 state: null,
                 zipCode: null,
                 zipCodeCtu: null,
+                serviceType: null,
             },
             customer: {
                 emailAddress: null,