From 91f2a31d6b4cb74783040223ab50ec01aca9d950 Mon Sep 17 00:00:00 2001
From: Kroell <Katie.Kroell@safelite.com>
Date: Tue, 31 Jan 2023 14:18:51 -0500
Subject: [PATCH] changes to alert

---
 .../address-vehicles-question.vue             | 22 ++++++-----
 .../address-vehicles/address-vehicles.vue     | 39 +++----------------
 2 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
index 538ee298..bf89ece0 100644
--- a/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
+++ b/src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
@@ -1,4 +1,14 @@
 <template>
+    <alert
+        ref="differentVehicleAlert"
+        v-if="isCarIdDifferent"
+        class="my-4"
+        cmsWidgetName="FoundWindshield"
+        :manualHeadline="differentVehicleAlertHeader"
+        :manualCopy="differentVehicleAlertBody"
+        alertClass="alert-warning"
+        v-bind:isDismissible="false"
+        id="address-vehicles-question-alert" />
     <buttonQuestion
         class="address-vehicles-question"
         buttonTypeString="listButton"
@@ -9,15 +19,6 @@
         isRequired
         :validation-rules="validationRules"
         :valueToLogType="ValueToLogTypes.LAST_5" />
-    <alert
-        ref="differentVehicleAlert"
-        v-if="isCarIdDifferent"
-        class="my-3"
-        cmsWidgetName="FoundWindshield"
-        :manualHeadline="differentVehicleAlertHeader"
-        :manualCopy="differentVehicleAlertBody"
-        alertClass="alert-warning"
-        v-bind:isDismissible="false" />
 </template>
 
 <script>
@@ -79,4 +80,7 @@ export default {
         }
     }
 }
+#address-vehicles-question-alert p {
+    margin-bottom: 0 !important; // Overrides extra margin-bottom on alert body text
+}
 </style>
\ No newline at end of file
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index 2d22b2d0..d7c28942 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -20,18 +20,7 @@
         :manualHeadline="AlertFoundMultipleVehiclesHeader"
         manualCopy=""
         v-bind:isDismissible="false"
-        id="address-vehicles-alert"
-      />
-      <alert
-        cmsWidgetName="FoundWindshield"
-        ref="alertFoundWindshield"
-        class="my-4"
-        alertClass="alert-warning"
-        :manualHeadline="AlertFoundWindshieldHeader"
-        :manualCopy="AlertFoundWindshieldBody"
-        v-if="isCarIdDifferent"
-        v-bind:isDismissible="false"
-        id="address-vehicles-alert"
+        id="multiple-vehicles-alert"
       />
       <addressVehiclesQuestion
         ref="addressVehiclesQuestion"
@@ -39,6 +28,7 @@
         :vehicles="VehiclesForQuestions"
         validationRules="vehicle-required"
         v-model="selectedVehicleVin"
+        :isCarIdDifferent="isCarIdDifferent"
       />
       <div
         class="alert-provide-vin my-3"
@@ -77,10 +67,7 @@ import { issPageValues } from "@/router/router-constants/issPage-values";
 import { errorMessages } from "@/constants/error-messages";
 import { required } from "@/helpers/validation-rules";
 import { Form, defineRule } from "vee-validate";
-import {
-  getDamageString,
-  isGlassAvailableForCarId,
-} from "@/helpers/damage-helper";
+import { isGlassAvailableForCarId } from "@/helpers/damage-helper";
 import {
   doesCopyContainRouterLink,
   splitCopyOnCMSPlaceHolder,
@@ -142,22 +129,6 @@ export default {
         "HeadlineText"
       ).replaceAll("{custom:vehicleCount}", this.vehicleCount);
     },
-    AlertFoundWindshieldHeader() {
-      return this.getCmsContent("FoundWindshield", "HeadlineText").replaceAll(
-        "{custom:damage}",
-        getDamageString()
-      );
-    },
-    AlertFoundWindshieldBody() {
-      return this.getCmsContent(
-        "FoundWindshield",
-        "BodyText"
-      )
-        .replaceAll("{custom:damage}", getDamageString())
-        .replaceAll("{custom:vinlookupYear}", this.selectedVehicle.vehicle.year)
-        .replaceAll("{custom:vinlookupMake}", this.selectedVehicle.vehicle.make)
-        .replaceAll("{custom:vinlookupModel}", this.selectedVehicle.vehicle.model)
-    },
     AlertProvideVinBody() {
       return this.getCmsContent("ProvideVinAlert", "BodyText");
     },
@@ -290,7 +261,7 @@ export default {
   }
 }
 
-#address-vehicles-alert p {
-  margin-bottom: 0 !important; // Overrides extra margin-bottom on alert body
+#multiple-vehicles-alert p {
+  margin-bottom: 0 !important; // Overrides extra margin-bottom on alert body text
 }
 </style>
\ No newline at end of file