From 7fae07a59e3b695cb382f77f52d25855452ff171 Mon Sep 17 00:00:00 2001
From: Katie <katie.oh@safelite.com>
Date: Thu, 12 May 2022 15:53:49 -0400
Subject: [PATCH] CSR-416 Revert

---
 .../heritage-integration/navigation-helper.js        | 12 ++++++++++++
 src/layouts/address-lookup/address-lookup.vue        | 12 +-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index 9bf69ddcf..6d2c0d93e 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -58,6 +58,8 @@ export async function navigateAfterSaveToHeritageFunnel(currentRoute) {
     const currentComponent = currentRoute.matched[0].components;
     currentComponent.default.methods.resetDependentState();
 
+    setupOrderBeforeSave();
+
     // Create the order (or save existing order) when navigating to Heritage Funnel.
     await saveOrder();
 
@@ -142,4 +144,14 @@ function isVinRelatedPage(toRoute) {
         fmgPageValue === fmgPageValues.ADDRESS_LOOKUP ||
         fmgPageValue === fmgPageValues.ADDRESS_VEHICLES ||
         fmgPageValue === fmgPageValues.ESTIMATE;
+}
+
+function setupOrderBeforeSave() {
+    const serviceLocation = store.getters.order.serviceLocation;
+
+    if (!serviceLocation.zipCode && serviceLocation.zipCode == store.getters.vehicle.registration.zipCode) {
+        baseMixin.methods.dispatchStoreAction(
+            storeActions.UPDATE_SERVICE_LOCATION_WITH_VEHICLE_REGISTRATION
+        );
+    }
 }
\ No newline at end of file
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index f95c5de28..b6140be2f 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -264,8 +264,6 @@ export default {
 			this.displayVinLookupByHomeAddressNotAllowedAlert = false;
 		},
 		navigateForward(carEntered, carsFound) {
-			this.setupServiceLocationIfNecessary();
-
 			if (carsFound.length == 1) {
 				// if a different vehicle is found than the one entered and the selected glass
 				// is not available for that vehicle
@@ -336,15 +334,7 @@ export default {
 			store.commit(storeMutations.UPDATE_SERVICE_LOCATION_ZIP_CODE, this.serviceZipCode);			
 			store.commit(storeMutations.UPDATE_CUSTOMER_EMAIL_ADDRESS, this.customerQuestions.emailAddress);
 		},
-		setupServiceLocationIfNecessary() {
-			const serviceLocation = store.getters.order.serviceLocation;
-
-			if (!serviceLocation.zipCode && serviceLocation.zipCode == store.getters.vehicle.registration.zipCode) {
-				baseMixin.methods.dispatchStoreAction(
-					storeActions.UPDATE_SERVICE_LOCATION_WITH_VEHICLE_REGISTRATION
-				);
-			}
-		}
+		
 	},
 	computed: {
 		AlertNonServiceableZipHeader(){