Merge pull request #2161 from Safelite/Feature/Digital/CSR-2338

CSR-2338

src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue

@@ -97,6 +97,7 @@ export default {
         "updated-mobile-fee-part",
         "updated-contains-military-base",
         "updated-bill-to-account-number",
+        "mobileLocationSelected",
     ],
     data() {
         return {
@@ -286,13 +287,15 @@ export default {
                     // update the page level model
                     this.$emit("update:modelValue", this.internalModel);
 
-                    this.closeModal();
+                    //Page advance to Schedule page
+                    this.$emit("mobileLocationSelected");
                 }
             } else {
                 // Update the page level model
                 this.$emit("update:modelValue", this.internalModel);
 
-                this.closeModal();
+                //Page advance to Schedule page
+                this.$emit("mobileLocationSelected");
             }
         },
     },
@@ -305,6 +308,9 @@ export default {
             deep: true,
         },
     },
+    unmounted() {
+        if (this.isModalOpened) this.closeModal();
+    },
     components: {
         textLink,
         modal,

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

@@ -96,7 +96,8 @@
                         validationRules="mobile-location-required"
                         ref="mobileLocationQuestions"
                         linkWidgetName="MobileLocationLinkWidget"
-                        modalWidgetName="MobileLocationModalWidget" />
+                        modalWidgetName="MobileLocationModalWidget"
+                        @mobileLocationSelected="forwardButtonAction" />
 
                     <shopQuestion
                         ref="shopQuestion"