From dca8a41b586df8553474f8ac539c4414b5fe09a9 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Fri, 25 Jul 2025 12:53:54 -0400
Subject: [PATCH 1/3] CASH-1245

CASH-1245 added loading modal to hide the scroll to top and also to work like the other page transitions
---
 src/layouts/schedule/schedule.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index b43087bff..c6c43071a 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -1304,6 +1304,9 @@ export default {
                 );
             }
         },
+        showLoadingModal() {
+            this.$refs.loadingModal.showModal();
+        },
         async forwardButtonAction() {
             this.navigatingForward = true;
             var ctu = this.zipCodeCtu;
@@ -1431,6 +1434,7 @@ export default {
                     this.pageName
                 );
             }
+            this.showLoadingModal();
         },
         setDisplayWaitList() {
             const dateString = this.isMobileSelected

From 0f18cca165470a905b630a639787e8f2ce9db8b2 Mon Sep 17 00:00:00 2001
From: Chloe Herd <chloe.herd@safelite.com>
Date: Fri, 25 Jul 2025 13:37:32 -0400
Subject: [PATCH 2/3] Set serviceability details for ZIP when zip is changed

---
 src/layouts/schedule/schedule.vue                 |  1 +
 .../shop-question/shop-question-popup.vue         | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 33c1a697e..a79b2b1f5 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -110,6 +110,7 @@
                         :selectedProviderNumberFromParent="selectedProvider?.providerNumber"
                         :shopProviderDataFromParent="shopProviderData"
                         @shop-selected="onShopSelected"
+                        @updated-serviceability="setServiceabilityDetails"
                         :zipCodeFromParent="zipCode"
                         cmsWidgetName="YourSafeliteShopWidget" />
 
diff --git a/src/layouts/service-location/shop-question/shop-question-popup.vue b/src/layouts/service-location/shop-question/shop-question-popup.vue
index df0a185a3..ff3a9f75a 100644
--- a/src/layouts/service-location/shop-question/shop-question-popup.vue
+++ b/src/layouts/service-location/shop-question/shop-question-popup.vue
@@ -307,10 +307,6 @@ export default {
             // I think we should call our new pushGA Event here with new mapped data
         },
         async setZipCodeAndShop() {
-            const selectedProvider = this.shopProviders.find(
-                (provider) => provider.providerNumber == this.localSelectedProviderNumber
-            );
-
             const shopQuestionPopUpData = {
                 zipCodeData: this.zipCodeData,
                 shopProviderData: this.localShopProviderData,
@@ -318,6 +314,17 @@ export default {
             };
             this.$emit("shop-selected", shopQuestionPopUpData);
 
+            if (this.zipCodeData) {
+                // retrieve serviceability details
+                const serviceabilityDetails = await getServiceabilityDetails(
+                    this.zipCodeData.zipCode,
+                    null,
+                    this.pageName
+                );
+
+                this.$emit("updated-serviceability", serviceabilityDetails.data);
+            }
+
             this.closeModal();
         },
     },

From a8ac52220057d1c0d60fa6b3b03f77165c85eb18 Mon Sep 17 00:00:00 2001
From: Chris Redelinghuys <chris.redelinghuys@safelite.com>
Date: Fri, 25 Jul 2025 14:14:33 -0400
Subject: [PATCH 3/3] CASH-1247: Preselect In-Shop if Drop-off was selected

---
 .../appointment-type-question/appointment-type-question.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
index 5189a15a4..469344d04 100644
--- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
+++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue
@@ -73,7 +73,11 @@ export default {
         },
         selectedValue: {
             get: function () {
-                return this.modelValue;
+                if (this.modelValue === AppointmentTypeStrings.DROP_OFF) {
+                    return AppointmentTypeStrings.IN_SHOP;
+                } else {
+                    return this.modelValue;
+                }
             },
             set: function (newValue) {
                 this.$emit("update:modelValue", newValue);