From 71d4a5c91807191e061ba90039fdcc7d12ec51a1 Mon Sep 17 00:00:00 2001
From: bmauger <mauger.bryan@gmail.com>
Date: Mon, 9 May 2022 16:45:06 -0400
Subject: [PATCH 1/4] CSR-101-updates consolidate code.

---
 src/layouts/vin-lookup/vin-lookup.vue | 61 +++++++++++----------------
 1 file changed, 24 insertions(+), 37 deletions(-)

diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 7fe982fdb..6b0a3f224 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -64,14 +64,6 @@
             />
           </div>
         </div>
-        <alert
-          class="my-3"
-          :manualHeadline="MatchedDifferentVehicleAlertHeader"
-          :manualCopy="MatchedDifferentVehicleAlertBody"
-          v-model="customAlertData"
-          v-if="matchedDifferentVehicle"
-          alertClass="alert-danger"
-        />
         <alert
           class="my-3"
           v-model="customAlertData"
@@ -87,13 +79,6 @@
           v-if="noServiceZip"
           alertClass="alert-warning"
         />
-        <alert
-          class="my-3"
-          v-model="customAlertData"
-          v-if="foundWindshieldAlert"
-          alertClass="alert-warning"
-          cmsWidgetName="FoundWindshieldAlert"
-        />
         <alert
           class="my-3"
           v-model="customAlertData"
@@ -116,13 +101,6 @@
           v-if="isVinFieldReadOnly"
           alertClass="alert-success"
         />
-        <funnelFooter
-          cmsWidgetName="FunnelFooterWidget"
-          ref="funnelFooter"
-          :isForwardActionDisabled="!meta.valid"
-          @back-clicked="backButtonAction"
-          @ForwardClicked="forwardButtonAction"
-        />
       </div>
       <alert
         class="my-3"
@@ -154,6 +132,13 @@
         alertClass="alert-success"
         cmsWidgetName="PerfectMatchNewVinAlert"
       />
+      <funnelFooter
+        cmsWidgetName="FunnelFooterWidget"
+        ref="funnelFooter"
+        :isForwardActionDisabled="!meta.valid"
+        @back-clicked="backButtonAction"
+        @ForwardClicked="forwardButtonAction"
+      />
     </div>
   </Form>
 </template>
@@ -313,34 +298,36 @@ export default {
       this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route);
     },
     async forwardButtonAction() {
-      const zipValidation = await this.validateZip(this.zip);
-      if (!zipValidation.data.isServiceable) {
+      const zipValidation = this.validateZip(this.zip);
+      const vehicleLookup = this.lookupVehicle(this.vin);
+      const zipValidationResponse = await zipValidation;
+      const vehicleLookupResponse = await vehicleLookup.catch(() => {
+        this.vinNotFound = true;
+        this.$refs.funnelFooter.removeLoader();
+        this.noServiceZip = false;
+        return;
+      });
+      if (!zipValidationResponse.data.isServiceable) {
         this.customAlertData.zip = this.zip;
         this.$refs.funnelFooter.removeLoader();
         this.noServiceZip = true;
         this.invalidZip = this.zip;
         return;
       }
-      const vehicleLookup = await this.lookupVehicle(this.vin).catch(() => {
-        this.vinNotFound = true;
-        this.$refs.funnelFooter.removeLoader();
-        this.noServiceZip = false;
-        return;
-      });
-      this.isCarIdDifferent = vehicleLookup.data.carId !== store.getters.vehicle.carId;
+      this.isCarIdDifferent = vehicleLookupResponse.data.carId !== store.getters.vehicle.carId;
 
-      if (this.isCarIdDifferent && (vehicleLookup.data.carId !== this.previouslyEnteredCarId)) {
-        this.previouslyEnteredCarId = vehicleLookup.data.carId;
+      if (this.isCarIdDifferent && (vehicleLookupResponse.data.carId !== this.previouslyEnteredCarId)) {
+        this.previouslyEnteredCarId = vehicleLookupResponse.data.carId;
         this.noServiceZip = false;
-        this.customAlertData.vehicleInfo = vehicleLookup.data;
-        this.$refs.funnelFooter.updateButtonText(`Continue with ${vehicleLookup.data.year} ${vehicleLookup.data.make} ${vehicleLookup.data.model}`);
+        this.customAlertData.vehicleInfo = vehicleLookupResponse.data;
+        this.$refs.funnelFooter.updateButtonText(`Continue with ${vehicleLookupResponse.data.year} ${vehicleLookupResponse.data.make} ${vehicleLookupResponse.data.model}`);
         this.isVinValid = true;
-        this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(vehicleLookup.data.carId);
+        this.isSelectedGlassAvailableForVehicle = await isGlassAvailableForCarId(vehicleLookupResponse.data.carId);
         this.$refs.funnelFooter.removeLoader();
         this.isCarIdDifferent = true;
         return;
       }
-      this.updateStore(vehicleLookup.data);
+      this.updateStore(vehicleLookupResponse.data);
       this.navigateForward();
     },
     navigateForward(){

From 7959dbc45365cbffb6a0c51344d24d1457703997 Mon Sep 17 00:00:00 2001
From: Donielle Austin <Donielle.Austin@safelite.com>
Date: Tue, 10 May 2022 10:31:16 -0400
Subject: [PATCH 2/4] ui defect

---
 src/layouts/estimate/estimate.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 708e532f1..4dde1dd61 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -143,4 +143,7 @@ export default {
     font-weight: 500; 
     color: $black; 
   }
+  div .current_car_info-text{
+    padding-bottom: 16px; 
+  }
 </style>
\ No newline at end of file

From 8446f8bf6cf28329e1ab4314e4ea9b8765a3c0d1 Mon Sep 17 00:00:00 2001
From: bmauger <mauger.bryan@gmail.com>
Date: Tue, 10 May 2022 13:26:20 -0400
Subject: [PATCH 3/4] Remove duplicate alert.

---
 src/layouts/vin-lookup/vin-lookup.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index f11b920ad..3f24f53b7 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -79,13 +79,6 @@
           alertClass="alert-warning"
           cmsWidgetName="VinNotFound"
         />
-        <alert
-          class="my-3"
-          v-model="customAlertData"
-          v-if="perfectMatchNewVinAlert"
-          alertClass="alert-warning"
-          cmsWidgetName="PerfectMatchNewVinAlert"
-        />
         <alert
           class="my-3"
           :manualHeadline="PerfectMatchNewVinAlertReadOnlyHeader"

From 62ab6b3111020b51ccf8ba980722a92ebd768afb Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Tue, 10 May 2022 15:09:26 -0400
Subject: [PATCH 4/4] CSR-507 | Alerts were outside of fade transition wrapper

---
 src/layouts/vin-lookup/vin-lookup.vue | 74 +++++++++++++--------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 3f24f53b7..05c251bfd 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -87,44 +87,44 @@
           v-if="isVinFieldReadOnly"
           alertClass="alert-success"
         />
+        <alert
+          class="my-3"
+          :manualHeadline="MatchedDifferentVehicleAlertHeader"
+          :manualCopy="MatchedDifferentVehicleAlertBody"
+          v-model="customAlertData"
+          v-if="isCarIdDifferent"
+          alertClass="alert-danger"
+        />
+        <alert
+          class="my-3"
+          :manualHeadline="NoServiceZipHeader"
+          :manualCopy="NoServiceZipBody"
+          v-model="customAlertData"
+          v-if="noServiceZip"
+          alertClass="alert-warning"
+        />
+        <alert
+          class="my-3"
+          v-model="customAlertData"
+          v-if="vinNotFound"
+          alertClass="alert-warning"
+          cmsWidgetName="VinNotFound"
+        />
+        <alert
+          class="my-3"
+          v-model="customAlertData"
+          v-if="perfectMatchNewVinAlert"
+          alertClass="alert-success"
+          cmsWidgetName="PerfectMatchNewVinAlert"
+        />
+        <funnelFooter
+          cmsWidgetName="FunnelFooterWidget"
+          ref="funnelFooter"
+          :isForwardActionDisabled="!meta.valid"
+          @back-clicked="backButtonAction"
+          @ForwardClicked="forwardButtonAction"
+        />
       </div>
-      <alert
-        class="my-3"
-        :manualHeadline="MatchedDifferentVehicleAlertHeader"
-        :manualCopy="MatchedDifferentVehicleAlertBody"
-        v-model="customAlertData"
-        v-if="isCarIdDifferent"
-        alertClass="alert-danger"
-      />
-      <alert
-        class="my-3"
-        :manualHeadline="NoServiceZipHeader"
-        :manualCopy="NoServiceZipBody"
-        v-model="customAlertData"
-        v-if="noServiceZip"
-        alertClass="alert-warning"
-      />
-      <alert
-        class="my-3"
-        v-model="customAlertData"
-        v-if="vinNotFound"
-        alertClass="alert-warning"
-        cmsWidgetName="VinNotFound"
-      />
-      <alert
-        class="my-3"
-        v-model="customAlertData"
-        v-if="perfectMatchNewVinAlert"
-        alertClass="alert-success"
-        cmsWidgetName="PerfectMatchNewVinAlert"
-      />
-      <funnelFooter
-        cmsWidgetName="FunnelFooterWidget"
-        ref="funnelFooter"
-        :isForwardActionDisabled="!meta.valid"
-        @back-clicked="backButtonAction"
-        @ForwardClicked="forwardButtonAction"
-      />
     </div>
   </Form>
 </template>