CASH-176
CASH-176 service zip changes for sms
This commit is contained in:
parent
a7a901d8da
commit
690d992ef7
7 changed files with 74 additions and 17 deletions
|
|
@ -18,6 +18,8 @@ const errorMessages = {
|
||||||
LAST_NAME_REQUIRED: "Please enter your last name",
|
LAST_NAME_REQUIRED: "Please enter your last name",
|
||||||
EMAIL_ADDRESS_REQUIRED: "Please enter your email address",
|
EMAIL_ADDRESS_REQUIRED: "Please enter your email address",
|
||||||
EMAIL_ADDRESS_FORMAT: "Please enter a valid email address",
|
EMAIL_ADDRESS_FORMAT: "Please enter a valid email address",
|
||||||
|
EMAIL_SMS_REQUIRED: "Please enter your mobile phone number or email",
|
||||||
|
EMAIL_SMS_FORMAT: "Please enter a valid mobile phone number or email",
|
||||||
SERVICE_ZIP_REQUIRED: "Please enter your service ZIP",
|
SERVICE_ZIP_REQUIRED: "Please enter your service ZIP",
|
||||||
SERVICE_ZIP_FORMAT: "Please enter a valid service ZIP",
|
SERVICE_ZIP_FORMAT: "Please enter a valid service ZIP",
|
||||||
VIN_REQUIRED: "Please enter your VIN",
|
VIN_REQUIRED: "Please enter your VIN",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
const storeActions = {
|
const storeActions = {
|
||||||
// Content Actions
|
// Content Actions
|
||||||
GET_PAGE_DATA: "getPageData",
|
GET_PAGE_DATA: "getPageData",
|
||||||
|
SAVE_PAGE_DATA: "savePageData",
|
||||||
|
|
||||||
// Vehicle Actions
|
// Vehicle Actions
|
||||||
GET_VEHICLE_YEARS: "getVehicleYears",
|
GET_VEHICLE_YEARS: "getVehicleYears",
|
||||||
|
|
|
||||||
|
|
@ -121,9 +121,9 @@ export default {
|
||||||
const partsOrQuestions = orderFromStore.damage?.partQuestionAnswers;
|
const partsOrQuestions = orderFromStore.damage?.partQuestionAnswers;
|
||||||
|
|
||||||
if (partsOrQuestions) {
|
if (partsOrQuestions) {
|
||||||
partsOrQuestions.forEach(pqa => {
|
partsOrQuestions.forEach((pqa) => {
|
||||||
const payloadPartQuestions = [];
|
const payloadPartQuestions = [];
|
||||||
pqa.answeredQuestions.forEach(answer => {
|
pqa.answeredQuestions.forEach((answer) => {
|
||||||
payloadPartQuestions.push({
|
payloadPartQuestions.push({
|
||||||
questionSeq: answer?.questionNum,
|
questionSeq: answer?.questionNum,
|
||||||
questionText: answer?.questionText,
|
questionText: answer?.questionText,
|
||||||
|
|
|
||||||
|
|
@ -23,11 +23,11 @@
|
||||||
<textboxQuestion
|
<textboxQuestion
|
||||||
class="mb-0"
|
class="mb-0"
|
||||||
cmsWidgetName="EmailAddressQuestionWidget"
|
cmsWidgetName="EmailAddressQuestionWidget"
|
||||||
v-model="emailAddress"
|
v-model="emailOrSms"
|
||||||
inputId="emailAddress"
|
inputId="emailOrSms"
|
||||||
:isRequired="!IsEmailOptional"
|
:isRequired="!IsEmailOptional"
|
||||||
disableAutoFill
|
disableAutoFill
|
||||||
:validationRules="EmailValidationRules"
|
:validationRules="EmailOrSmsValidationRules"
|
||||||
:addOptionalText="IsEmailOptional" />
|
:addOptionalText="IsEmailOptional" />
|
||||||
<textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
|
<textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
|
||||||
|
|
||||||
|
|
@ -88,16 +88,17 @@ import vinPagesMixin from "@/mixins/vin-pages-mixin";
|
||||||
import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
|
import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
|
||||||
import baseMixin from "@/mixins/base-mixin.js";
|
import baseMixin from "@/mixins/base-mixin.js";
|
||||||
import { queryStrings } from "@/constants/query-strings";
|
import { queryStrings } from "@/constants/query-strings";
|
||||||
|
import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
|
||||||
|
|
||||||
// Define Validation Rules
|
// Define Validation Rules
|
||||||
defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
|
defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
|
||||||
defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_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-sms-required", required(errorMessages.EMAIL_SMS_REQUIRED));
|
||||||
defineRule(
|
defineRule(
|
||||||
"email-address-format",
|
"email-sms-format",
|
||||||
regex(
|
regex(
|
||||||
/^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9-]+)\.([a-zA-Z]{2,})$/,
|
/^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9-]+)\.([a-zA-Z]{2,})$|^\(?(\d{3})\)?[-. ]?(\d{3})[-. ]?(\d{4})$/,
|
||||||
errorMessages.EMAIL_ADDRESS_FORMAT
|
errorMessages.EMAIL_SMS_FORMAT
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
|
defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
|
||||||
|
|
@ -108,7 +109,7 @@ export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
|
serviceZipCode: this.getZipFromStore() ?? this.$route.query.zipcode,
|
||||||
emailAddress: this.getEmailFromStore(),
|
emailOrSms: this.getEmailOrSmsFromStore(),
|
||||||
displayInvalidZipAlert: false,
|
displayInvalidZipAlert: false,
|
||||||
displayNonServiceableZipAlert: false,
|
displayNonServiceableZipAlert: false,
|
||||||
};
|
};
|
||||||
|
|
@ -160,11 +161,11 @@ export default {
|
||||||
store.getters.order.serviceLocation.zipCode
|
store.getters.order.serviceLocation.zipCode
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
getEmailFromStore() {
|
getEmailOrSmsFromStore() {
|
||||||
return (
|
return store.getters.emailOrSms;
|
||||||
store.getters.externalParameterServiceZip.emailAddress ??
|
},
|
||||||
store.getters.order.customer.emailAddress
|
getPhoneFromStore() {
|
||||||
);
|
return store.getters.order.customer.phoneNumber;
|
||||||
},
|
},
|
||||||
arePagePrerequisitesValid() {
|
arePagePrerequisitesValid() {
|
||||||
return store.getters.damage.isRepair || store.getters.damage.glassToReplace?.length > 0;
|
return store.getters.damage.isRepair || store.getters.damage.glassToReplace?.length > 0;
|
||||||
|
|
@ -186,7 +187,23 @@ export default {
|
||||||
},
|
},
|
||||||
async forwardButtonAction() {
|
async forwardButtonAction() {
|
||||||
const zipCodeData = await this.getZipCodeData(this.serviceZipCode);
|
const zipCodeData = await this.getZipCodeData(this.serviceZipCode);
|
||||||
await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailAddress, false);
|
|
||||||
|
if (vinPagesMixin.methods.isPhoneNumber(this.emailOrSms)) {
|
||||||
|
const phone = this.emailOrSms.replace(/[()]/g, "");
|
||||||
|
await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, phone, false);
|
||||||
|
} else {
|
||||||
|
await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailOrSms, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.dispatchStoreAction(
|
||||||
|
storeActions.SAVE_PAGE_DATA,
|
||||||
|
{
|
||||||
|
page: fmgPageValues.EMAIL_SMS_PAGES,
|
||||||
|
data: { emailOrSmsValue: this.emailOrSms },
|
||||||
|
},
|
||||||
|
false
|
||||||
|
);
|
||||||
|
|
||||||
await this.dispatchStoreAction(
|
await this.dispatchStoreAction(
|
||||||
storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
|
storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,11 @@ export default {
|
||||||
? "email-address-format"
|
? "email-address-format"
|
||||||
: "email-address-required|email-address-format";
|
: "email-address-required|email-address-format";
|
||||||
},
|
},
|
||||||
|
EmailOrSmsValidationRules() {
|
||||||
|
return this.IsEmailOptional
|
||||||
|
? "email-sms-format"
|
||||||
|
: "email-sms-required|email-sms-format";
|
||||||
|
},
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
async navigateForwardWithSingleCarMatch() {
|
async navigateForwardWithSingleCarMatch() {
|
||||||
|
|
@ -56,5 +61,9 @@ export default {
|
||||||
false
|
false
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
isPhoneNumber(input) {
|
||||||
|
const phoneRegex = /^\(?(\d{3})\)?[-. ]?(\d{3})[-. ]?(\d{4})$/;
|
||||||
|
return phoneRegex.test(input);
|
||||||
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,7 @@ const fmgPageValues = {
|
||||||
PAYMENT_PIA_RETURN: "payment-pia-return",
|
PAYMENT_PIA_RETURN: "payment-pia-return",
|
||||||
CONFIRMATION: "confirmation",
|
CONFIRMATION: "confirmation",
|
||||||
RETURN_USER: "return-user",
|
RETURN_USER: "return-user",
|
||||||
|
EMAIL_SMS_PAGES: "email-or-sms-related-pages",
|
||||||
};
|
};
|
||||||
|
|
||||||
const funnelStartPageName = fmgPageValues.VEHICLE;
|
const funnelStartPageName = fmgPageValues.VEHICLE;
|
||||||
|
|
|
||||||
|
|
@ -997,6 +997,26 @@ export const getters = {
|
||||||
externalParameterEstimate: (state) => externalParameterState?.estimate,
|
externalParameterEstimate: (state) => externalParameterState?.estimate,
|
||||||
externalParameterCustomer: (state) => externalParameterState?.customer,
|
externalParameterCustomer: (state) => externalParameterState?.customer,
|
||||||
isExternalParameter: (state) => externalParameterState?.isExternalParameter,
|
isExternalParameter: (state) => externalParameterState?.isExternalParameter,
|
||||||
|
|
||||||
|
emailOrSms: (state) => {
|
||||||
|
const email = externalParameterState.serviceZip.emailAddress ?? state.order.customer.emailAddress;
|
||||||
|
const phone = state.order.customer.phoneNumber;
|
||||||
|
|
||||||
|
if (!phone && !email) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (phone && !email) {
|
||||||
|
return phone;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (email && !phone) {
|
||||||
|
return email;
|
||||||
|
}
|
||||||
|
|
||||||
|
// if we're here, then we have both email and phone so get the value from pageData to reflect what they entered on the page
|
||||||
|
return state.applicationUser.pageData[fmgPageValues.EMAIL_SMS_PAGES]?.emailOrSmsValue;
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
function getNonFalseValuesOfPropertyInArrayOfObjects(array, propertyName) {
|
function getNonFalseValuesOfPropertyInArrayOfObjects(array, propertyName) {
|
||||||
|
|
@ -3042,7 +3062,14 @@ export const actions = {
|
||||||
},
|
},
|
||||||
|
|
||||||
savePhoneNumber(context, phoneNumber) {
|
savePhoneNumber(context, phoneNumber) {
|
||||||
context.commit(storeMutations.UPDATE_CUSTOMER_PHONE_NUMBER, phoneNumber === "" ? null : phoneNumber);
|
context.commit(
|
||||||
|
storeMutations.UPDATE_CUSTOMER_PHONE_NUMBER,
|
||||||
|
phoneNumber === "" ? null : phoneNumber
|
||||||
|
);
|
||||||
|
},
|
||||||
|
|
||||||
|
savePageData(context, emailOrSms) {
|
||||||
|
context.commit(storeMutations.UPDATE_PAGE_DATA, emailOrSms);
|
||||||
},
|
},
|
||||||
|
|
||||||
saveVin(context, { isSelectedGlassAvailableForVehicle, vehicleInfo }) {
|
saveVin(context, { isSelectedGlassAvailableForVehicle, vehicleInfo }) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue