@@ -60,23 +53,15 @@
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
border-radius: 4px;
top: 48px;
- height: 246px;
+ height: 186px;
width: 327px;
}
- .loading-modal-body {
- position: relative;
- padding: 20px 10px;
- }
-
.loading-modal-text {
padding: 0 24px 0 24px;
}
.modal-icon-container {
- position: relative;
- width: 75px;
- height: 75px;
margin: 15px auto;
padding-bottom: 26px;
}
@@ -85,6 +70,8 @@
position: absolute;
vertical-align: middle;
border: 0;
+ width: 327px;
+ height: 186px;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue
index 3919388ce..849d99ab5 100644
--- a/src/common-components/textbox-question/textbox-question.vue
+++ b/src/common-components/textbox-question/textbox-question.vue
@@ -2,8 +2,8 @@
-
-
@@ -60,7 +60,7 @@ export default {
let initialValue;
switch (typeof modelValue) {
- case "number":
+ case "number":
initialValue = modelValue;
break;
default:
@@ -71,7 +71,7 @@ export default {
const fieldOptions = {
type: "text",
value: modelValue,
- initialValue: initialValue
+ initialValue: initialValue,
};
const {
@@ -159,6 +159,7 @@ export default {
border: 1px solid $gray-500;
border-radius: .5rem;
min-height: 3rem;
+ padding: 12px 16px;
&::placeholder {
color: $gray-500;
}
@@ -182,4 +183,4 @@ export default {
display: none;
}
}
-
\ No newline at end of file
+
diff --git a/src/helpers/damage-helper.js b/src/helpers/damage-helper.js
index a3b9a2878..0928a2656 100644
--- a/src/helpers/damage-helper.js
+++ b/src/helpers/damage-helper.js
@@ -4,10 +4,17 @@ import { storeActions } from "@/constants/store-actions";
export function getDamageString() {
const damageLocations = store.getters.damage.glassToReplace;
+ const isRepair = store.getters.damage.isRepair;
+
let returnString;
if (!damageLocations) {
return;
}
+ // If it's a repair it's always a windshield.
+ if(isRepair){
+ return "windshield"
+ }
+
if (damageLocations.length > 1) {
returnString = "match"
} else {
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index a9cf1bd53..454a17b83 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -12,28 +12,28 @@
-
-
-
-
car.vehicle.carId === carEntered.carId);
+ if (matchingCars.length === 1) {
+ // and one and only one of them matches the carId entered, save the vehicle info
+ // so we can go to the Heritage Funnel directly
+ const matchingCar = matchingCars[0];
+ this.updateVehicleInfo(matchingCar.vin, matchingCar.vehicle);
+ }
+
// update data if the zip or service zip is servicable
this.updateCustomerInfo();
}
@@ -285,13 +294,17 @@ export default {
navigateAfterSaveToHeritageFunnel(this.$route);
}
} else if (carsFound.length > 1) {
- // if multiple cars were found
- if (carsFound.find(car => car.vehicle.carId === carEntered.carId)) {
- // and one of them matches the car id entered
+ // if multiple cars were found
+ let matchingCars = carsFound.filter(car => car.vehicle.carId === carEntered.carId);
+ if (matchingCars.length === 1) {
this.$refs.loadingModal.showModal();
+
+ // and one and only of them matches the car id entered
+ const matchingCar = matchingCars[0];
+ this.updateVehicleInfo(matchingCar.vin, matchingCar.vehicle);
navigateAfterSaveToHeritageFunnel(this.$route);
} else {
- // and there is no match, navigate to "address-vehicles" page
+ // if there are no matches or there are multiple matches, navigate to "address-vehicles" page
this.$router.navigateAfterSave(this.navigationScenarios.CONTINUING_WITH_MULTIPLE_VEHICLES, this.$route, {}, {}, carsFound);
}
}
@@ -334,8 +347,7 @@ export default {
store.commit(storeMutations.UPDATE_REGISTRATION_LAST_NAME, this.customerQuestions.lastName);
store.commit(storeMutations.UPDATE_SERVICE_LOCATION_ZIP_CODE, this.serviceZipCode);
store.commit(storeMutations.UPDATE_CUSTOMER_EMAIL_ADDRESS, this.customerQuestions.emailAddress);
- },
-
+ },
updateServiceLocationIfNecessary() {
const serviceLocation = store.getters.order.serviceLocation;
@@ -360,13 +372,14 @@ export default {
return text;
},
AlertMatchedDifferentVehicleBody(){
- let content = this.getCmsContent("AlertMatchedDifferentVehicleWidget", "BodyText");
- content = content.replaceAll("{custom:glassText}", getDamageString());
- const vinYmmFound = `${this.customAlertData?.vehicleInfo?.year} ${this.customAlertData?.vehicleInfo?.make} ${this.customAlertData?.vehicleInfo?.model}`;
- const vinYmmExpected = `${store.getters.vehicle.year} ${store.getters.vehicle.make} ${store.getters.vehicle.model}`;
- content = content.replaceAll("{custom:vinYmmFound}", vinYmmFound);
- content = content.replaceAll("{custom:vinYmmExpected}", vinYmmExpected);
+ const vinYmmFound = `${this.customAlertData?.vehicleInfo?.year} ${this.customAlertData?.vehicleInfo?.make} ${this.customAlertData?.vehicleInfo?.model}`;
+ const vinYmmExpected = `${store.getters.vehicle.year} ${store.getters.vehicle.make} ${store.getters.vehicle.model}`;
+
+ const content = this.getCmsContent("AlertMatchedDifferentVehicleWidget", "BodyText")
+ .replaceAll("{custom:glassText}", getDamageString())
+ .replaceAll("{custom:vinYmmFound}", vinYmmFound)
+ .replaceAll("{custom:vinYmmExpected}", vinYmmExpected);
return content;
},
diff --git a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
index 4408a803f..c310fbd10 100644
--- a/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
@@ -1,7 +1,7 @@
@@ -21,12 +21,14 @@