Merge pull request #2677 from Safelite/feature/CASH-1221

CASH-1221

src/digital-components/date-picker/date-picker.vue

@@ -307,6 +307,7 @@ export default {
             },
             set(newSelectedDate) {
                 this.$emit("update:modelValue", newSelectedDate);
+                this.dispatchStoreAction(this.storeActions.SAVE_WAITLIST_REQUESTED, false, false);
             },
         },
         dropOffDurationText() {

src/layouts/schedule/schedule.vue

@@ -22,6 +22,7 @@
                         @updated-serviceability="setServiceabilityDetails"
                         @updated-contains-military-base="setContainsMilitaryBase"
                         @updated-bill-to-account-number="setBillToAccountNumber"
+                        @reset-waitlist="resetWaitlist"
                         linkWidgetName="ServiceZipLinkWidget"
                         modalWidgetName="ServiceZipModalWidget" />
                     <alert
@@ -991,6 +992,10 @@ export default {
 
             this.isVehicleProtected = null;
         },
+        resetWaitlist() {
+            this.dispatchStoreAction(this.storeActions.SAVE_WAITLIST_REQUESTED, false, false);
+            this.waitListRequested = false;
+        },
         setServiceabilityDetails(serviceabilityDetails) {
             this.isGlassServiceableInshop = serviceabilityDetails.isGlassServiceableInshop;
             this.isRecalibrationServiceableInshop =
@@ -1105,6 +1110,7 @@ export default {
             };
         },
         onShopSelected(shopQuestionPopUpData) {
+            this.resetWaitlist();
             this.shopProviderData = shopQuestionPopUpData.shopProviderData;
             this.setServiceabilityDetails(shopQuestionPopUpData.serviceabilityDetails);
             const selectedProvider = this.shopProviderData.shopProviders.find((shopProvider) => {

src/layouts/schedule/time-slot-question/time-slot-question.vue

@@ -76,6 +76,7 @@ import alert from "@/ux-components/alert/alert.vue";
 import experimentMixin from "@/mixins/experiment-mixin";
 import { experimentSettings } from "@/constants/experiments";
 import store from "@/store";
+import { storeActions } from "@/constants/store-actions";
 
 // Helpers
 import { deepClone } from "@/helpers/object-helper";
@@ -144,7 +145,6 @@ export default {
         return {
             selectedRouteCode: null,
             timeSlotModalListButton: timeSlotModalListButton,
-            waitListRequested: this.getWaitListRequestedFromStore(),
             selectedAnswerForDropOffOrInshop: null,
             selectedAnswerForTimeSlots: null,
         };
@@ -345,6 +345,14 @@ export default {
         waitListSuccessText() {
             return this.getCmsContent("WaitListSuccessWidget", "BodyText");
         },
+        waitListRequested: {
+            get() {
+                return this.$store.getters.order.customer?.waitListRequested;
+            },
+            set(value) {
+                this.dispatchStoreAction(storeActions.SAVE_WAITLIST_REQUESTED, value);
+            },
+        },
         isMobileAppointment() {
             return this.appointmentType === AppointmentTypeStrings.MOBILE;
         },

src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue

@@ -219,7 +219,7 @@ export default {
                     this.$emit("updated-serviceability", serviceabilityDetails.data);
                     this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase);
                     this.$emit("updated-bill-to-account-number", billToAccountNumber);
-
+                    this.$emit("reset-waitlist");
                     // update the page level model
                     this.$emit("update:modelValue", this.internalModel);