@@ -29,7 +51,7 @@ import { errorMessages } from "@/constants/error-messages";
defineRule("first-name-required", required(errorMessages.FIRST_NAME_REQUIRED));
defineRule("last-name-required", required(errorMessages.LAST_NAME_REQUIRED));
defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIRED));
-defineRule("email-address-format", regex(/^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+).([a-zA-Z]{2,})$/, errorMessages.EMAIL_ADDRESS_FORMAT));
+defineRule("email-address-format", regex(/^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+)\.([a-zA-Z]{2,})$/, errorMessages.EMAIL_ADDRESS_FORMAT));
export default ({
name: "customer-questions",
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index f21015061..34937bfb7 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -10,7 +10,7 @@
+
{{ copy.split(':')[1].split(',')[1] }}
@@ -240,4 +240,4 @@ export default {
line-height: inherit;
}
}
-
\ No newline at end of file
+
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.spec.js b/src/layouts/license-plate-lookup/license-plate-lookup.spec.js
index 9afd7e39a..281947ae4 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.spec.js
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.spec.js
@@ -86,7 +86,6 @@ describe("license-plate-lookup.vue", () => {
//Assert
expect(wrapper.vm.$router.navigate).toHaveBeenCalled();
-
});
});
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 5e7fdc2c1..38217009d 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -8,28 +8,73 @@
@@ -46,56 +91,25 @@ import alert from "@/ux-components/alert/alert";
import textboxQuestion from "@/common-components/textbox-question/textbox-question";
import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
// Supporting files
-import {
- fetchCmsContentForPage
-} from "@/helpers/cms-content-helper";
-import {
- settleAllPromises
-} from "@/helpers/layout-helper";
+import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import { settleAllPromises } from "@/helpers/layout-helper";
import store from "@/store";
import baseMixin from "@/mixins/base-mixin.js";
-import {
- storeActions
-} from "@/constants/store-actions";
-import {
- storeMutations
-} from "@/constants/store-mutations";
-import {
- errorMessages
-} from "@/constants/error-messages";
-import {
- navigateAfterSaveToHeritageFunnel
-} from "@/helpers/heritage-integration/navigation-helper";
-import {
- getDamageString,
- isGlassAvailableForCarId,
-} from "@/helpers/damage-helper";
-import {
- required,
- regex,
-} from "@/helpers/validation-rules";
-import {
- Form,
- defineRule,
-} from "vee-validate";
+import { storeActions } from "@/constants/store-actions";
+import { storeMutations } from "@/constants/store-mutations";
+import { errorMessages } from "@/constants/error-messages";
+import { navigateAfterSaveToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import { getDamageString, isGlassAvailableForCarId, } from "@/helpers/damage-helper";
+import { required, regex, } from "@/helpers/validation-rules";
+import { Form, defineRule, } from "vee-validate";
// DEFINE VALIDATION RULES
-defineRule(
- "license-plate-required",
- required(errorMessages.LICENSE_PLATE_REQUIRED)
-);
+defineRule("license-plate-required", required(errorMessages.LICENSE_PLATE_REQUIRED));
defineRule("zip-required", required(errorMessages.REGISTRATION_ZIP_REQUIRED));
-defineRule(
- "email-address-required",
- required(errorMessages.EMAIL_ADDRESS_REQUIRED)
-);
-defineRule(
- "email-address-format",
- regex(
- /^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+).([a-zA-Z]{2,})$/,
- errorMessages.EMAIL_ADDRESS_FORMAT
- )
-);
+defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
+defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIRED));
+defineRule("email-address-format", regex(/^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+)\.([a-zA-Z]{2,})$/, errorMessages.EMAIL_ADDRESS_FORMAT));
+
export default {
name: "license-plate-lookup",
async beforeRouteEnter(to, from, next) {
@@ -188,12 +202,12 @@ export default {
},
attachCustomEvents() {
this.prependActionToMethod(this, this.forwardButtonAction, () => {
- this.pushEventToGA(
+ this.pushEventToGA(
this.$route.query[this.queryStrings.FMG_PAGE],
this.GaActions.SUBMITTED,
this.GaLabels.LICENSE_PLATE_LOOKUP,
true
- );
+ );
});
},
getLicensePlateFromStore() {
@@ -212,20 +226,29 @@ export default {
this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route);
},
async forwardButtonAction() {
- const zipValidation = this.serviceZip ?
- await this.validateZip(this.serviceZip) :
- await this.validateZip(this.registrationZip);
- if (!zipValidation.data.isServiceable) {
+
+ //Call zip validation services
+ const registrationZipValidationPromise = this.validateZip(this.registrationZip);
+ const serviceZipValidationPromise = this.serviceZip ? this.validateZip(this.serviceZip) : null;
+ const registrationZipValidationResults = await registrationZipValidationPromise;
+ const serviceZipValidationResults = serviceZipValidationPromise !== null ? (await serviceZipValidationPromise) : registrationZipValidationResults;
+
+ //Handle service zip validations
+ if (!serviceZipValidationResults.data.isServiceable) {
this.$refs.funnelFooter.removeLoader();
this.isVinValid = true;
this.isRegistrationZipServicable = false;
this.isCarIdDifferent = false;
this.zipToDisplay = this.serviceZip ? this.serviceZip : this.registrationZip;
return;
- }
+ } else if (!this.serviceZip) {
+ this.serviceZip = this.registrationZip;
+ }
+
+ //Lookup vin
const vinLookup = await this.lookupVin(
this.licensePlate,
- zipValidation.data.state
+ registrationZipValidationResults.data.state
).catch(() => {
this.$refs.funnelFooter.removeLoader();
this.isVinValid = false;
@@ -235,6 +258,7 @@ export default {
this.isCarIdDifferent =
vinLookup.data.vehicle.carId !== store.getters.vehicle.carId;
+ //Handle changing car
if (
this.isCarIdDifferent &&
vinLookup.data.vehicle.carId !== this.previouslyEnteredCarId
@@ -251,12 +275,15 @@ export default {
return;
}
+ //Save
this.updateCustomerInfo(
vinLookup.data.vin,
vinLookup.data.vehicle,
- zipValidation.data.state
+ registrationZipValidationResults.data.state,
+ serviceZipValidationResults.data.state
);
-
+
+ //Navigate
this.navigateForward();
},
navigateForward() {
@@ -281,12 +308,9 @@ export default {
});
},
lookupVin(plate, state) {
- return baseMixin.methods.dispatchStoreAction(
- storeActions.LOOKUP_VIN_BY_PLATE,
- { licensePlate: plate, licenseState: state }
- );
+ return baseMixin.methods.dispatchStoreAction(storeActions.LOOKUP_VIN_BY_PLATE,{ licensePlate: plate, licenseState: state }, false);
},
- updateCustomerInfo(vin, vehicleInfo, registrationState) {
+ updateCustomerInfo(vin, vehicleInfo, registrationState, serviceState) {
if (this.isCarIdDifferent && !this.isSelectedGlassAvailableForVehicle) {
store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
}
@@ -304,6 +328,7 @@ export default {
store.commit(storeMutations.UPDATE_REGISTRATION_STATE, registrationState);
store.commit(storeMutations.UPDATE_REGISTRATION_ZIP_CODE, this.registrationZip);
store.commit(storeMutations.UPDATE_SERVICE_LOCATION_ZIP_CODE, this.serviceZip);
+ store.commit(storeMutations.UPDATE_SERVICE_LOCATION_STATE, serviceState);
store.commit(storeMutations.UPDATE_CUSTOMER_EMAIL_ADDRESS, this.email);
},
},
@@ -335,4 +360,4 @@ export default {
loadingModal,
},
};
-
\ No newline at end of file
+
diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js
index b722fccbf..0ce0fe085 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.spec.js
+++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js
@@ -18,6 +18,7 @@ import store from "@/store";
import { validate } from "vee-validate";
import { damageLocationsSelected } from "@/constants/damage-locations-selected.js";
import { routerParams } from "@/router/router-constants/router-params";
+import * as cookieHelper from "@/helpers/heritage-integration/cookie-helper";
// Mock our module for promises.
jest.mock("@/helpers/layout-helper.js", () => ({
@@ -29,6 +30,11 @@ jest.mock("@/helpers/cms-content-helper", () => ({
fetchCmsContentForPage: jest.fn(),
}));
+// Mock getFunnelCookie
+jest.mock("@/helpers/heritage-integration/cookie-helper", () => ({
+ getFunnelCookie: jest.fn(),
+}));
+
// Mock Store
jest.mock("@/store", () => ({
commit: jest.fn(),
@@ -653,6 +659,10 @@ describe("vehicle-damage.vue", () => {
})
});
+describe("vehicle-damage.vue wasDelayedClaimRegistration", () => {
+ test.todo("if wasDelayedClaimRegistration, should hide back button")
+});
+
// THE FOLLOWING TEST IS NOT NECESSARILY REQUIRED FOR COVERAGE
// BUT KEEP FOR AN EXAMPLE OF A VALIDATION TEST
//
@@ -741,6 +751,7 @@ function setupMocks({pageHeaderWidgetHeaderText, mountOptionsMockData}) {
settleAllPromises.mockImplementation(() => apiPromise);
fetchCmsContentForPage.mockImplementation(() => Promise.resolve());
+ cookieHelper.getFunnelCookie = jest.spyOn(cookieHelper, "getFunnelCookie").mockReturnValue({});
//Mock damage initialize methods
damageLocationQuestion.methods = {
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index ddeae5bec..d4e44feb7 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -32,7 +32,7 @@
:selectedDamageLocations="selectedDamageLocations"
/>
-
@@ -56,10 +56,10 @@ defineRule("windshield-chip-count-required", required(errorMessages.WINDSHIELD_C
defineRule("windshield-replace-options-required", required(errorMessages.WINSHIELD_REPLACE_OPTIONS_REQUIRED));
defineRule("check-for-repair-and-replace", (value, [otherFieldValue]) => {
- if (value.toString().toUpperCase().includes(damageLocationsSelected.REPAIR.toUpperCase()) &&
- otherFieldValue.toString().toUpperCase().includes(damageLocationsSelected.WINDSHIELD.toUpperCase()) &&
- Array.isArray(otherFieldValue) &&
- otherFieldValue.length > 1)
+ if (value.toString().toUpperCase().includes(damageLocationsSelected.REPAIR.toUpperCase()) &&
+ otherFieldValue.toString().toUpperCase().includes(damageLocationsSelected.WINDSHIELD.toUpperCase()) &&
+ Array.isArray(otherFieldValue) &&
+ otherFieldValue.length > 1)
{
return false;
}
@@ -72,8 +72,8 @@ defineRule("repair-only", (value) => {
return false;
});
defineRule("prevent-split-and-single-together", (value) => {
- if (value.toString().toUpperCase().includes(damageLocationsSelected.SINGLE.toUpperCase()) &&
- (value.toString().toUpperCase().includes(damageLocationsSelected.DRIVER.toUpperCase()) ||
+ if (value.toString().toUpperCase().includes(damageLocationsSelected.SINGLE.toUpperCase()) &&
+ (value.toString().toUpperCase().includes(damageLocationsSelected.DRIVER.toUpperCase()) ||
value.toString().toUpperCase().includes(damageLocationsSelected.PASSENGER.toUpperCase())))
{
return false;
@@ -145,7 +145,7 @@ export default ({
}
},
isWindshieldDamageLocation() {
- return this.selectedDamageLocations.some(selectedDamages =>
+ return this.selectedDamageLocations.some(selectedDamages =>
{
return Boolean(selectedDamages.toUpperCase() === "WINDSHIELD");
});
@@ -193,4 +193,4 @@ export default ({
alert,
},
})
-
\ No newline at end of file
+
diff --git a/src/layouts/vehicle-make/vehicle-make.vue b/src/layouts/vehicle-make/vehicle-make.vue
index 9e75d7036..aecd90a6f 100644
--- a/src/layouts/vehicle-make/vehicle-make.vue
+++ b/src/layouts/vehicle-make/vehicle-make.vue
@@ -88,6 +88,10 @@ export default {
store.commit(storeMutations.UPDATE_STYLE, null);
store.commit(storeMutations.UPDATE_CAR_ID, null);
store.commit(storeMutations.UPDATE_VEHICLE_CATEGORY, null);
+ store.commit(storeMutations.UPDATE_VEHICLE_VIN, null);
+ store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_URL, null);
+ store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER, null);
+ store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR, null);
// Invokes
store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
diff --git a/src/layouts/vehicle-model/vehicle-model.vue b/src/layouts/vehicle-model/vehicle-model.vue
index 66516a729..c661c824e 100644
--- a/src/layouts/vehicle-model/vehicle-model.vue
+++ b/src/layouts/vehicle-model/vehicle-model.vue
@@ -88,6 +88,10 @@ export default {
store.commit(storeMutations.UPDATE_STYLE, null);
store.commit(storeMutations.UPDATE_CAR_ID, null);
store.commit(storeMutations.UPDATE_VEHICLE_CATEGORY, null);
+ store.commit(storeMutations.UPDATE_VEHICLE_VIN, null);
+ store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_URL, null);
+ store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER, null);
+ store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR, null);
// Invokes
store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
diff --git a/src/layouts/vehicle-style/vehicle-style.vue b/src/layouts/vehicle-style/vehicle-style.vue
index 4f756b600..c7589d32d 100644
--- a/src/layouts/vehicle-style/vehicle-style.vue
+++ b/src/layouts/vehicle-style/vehicle-style.vue
@@ -101,6 +101,7 @@ export default {
store.commit(storeMutations.UPDATE_IS_REPAIR, null);
store.commit(storeMutations.UPDATE_NUMBER_OF_CHIPS, null);
store.commit(storeMutations.UPDATE_GLASS_TO_REPLACE, []);
+ store.commit(storeMutations.UPDATE_VEHICLE_VIN, null);
},
},
diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue
index ddca6b8bd..1041f82ae 100644
--- a/src/layouts/vehicle-year/vehicle-year.vue
+++ b/src/layouts/vehicle-year/vehicle-year.vue
@@ -107,8 +107,11 @@ export default {
store.commit(storeMutations.UPDATE_STYLE, null);
store.commit(storeMutations.UPDATE_CAR_ID, null);
store.commit(storeMutations.UPDATE_VEHICLE_CATEGORY, null);
+ store.commit(storeMutations.UPDATE_VEHICLE_VIN, null);
+ store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_URL, null);
+ store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER, null);
+ store.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR, null);
-
// Invokes
store.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
store.dispatch(storeActions.RESET_REGISTRATION_STATE_AND_DEPENDENCIES);
diff --git a/src/layouts/vin-lookup/vin-information/vin-information.vue b/src/layouts/vin-lookup/vin-information/vin-information.vue
index 3e5b67a91..91cee616f 100644
--- a/src/layouts/vin-lookup/vin-information/vin-information.vue
+++ b/src/layouts/vin-lookup/vin-information/vin-information.vue
@@ -41,6 +41,9 @@ export default {
font-size: .875rem;
color: $gray-600;
}
+ li {
+ line-height: 26px;
+ }
a {
font-size: .875rem;
}
@@ -70,6 +73,7 @@ export default {
overflow: hidden;
opacity: 0;
img {
+ max-width: 420px;
width: 117%;
height: auto;
}
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index f6c3b5ecb..6c0f305b5 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -14,7 +14,7 @@
/>
-
+
-
+
@@ -41,7 +42,7 @@
mask="#####"
isRequired
disableAutoFill
- validationRules="zip-required"
+ validationRules="zip-required|zip-format"
/>
@@ -54,34 +55,35 @@
isRequired
disableAutoFill
validationRules="email-address-required|email-address-format"
+ semiAggressiveValidation
/>
{{ alertHeadline }}
-
-
-
- {{ copy.split(':')[1].split(',')[1] }}
-
-
-
-
-
+
+
+
+
+
+
+ {{ getRouterLinkDisplayTextFromCopy(copy) }}
+
+
+
+