Merge branch 'release/2025.09.04' into feature/CASH-1339
This commit is contained in:
scottkiener-at-safelite
GitHub
commit
228a127238
15 changed files with 69 additions and 71 deletions
|
|
@ -26,7 +26,7 @@ const errorMessages = {
|
|||
VIN_FORMAT:
|
||||
"Invalid VIN. Please make sure that you entered the correct 17-digit, alpha-numeric number. VINs do not contain the letters I, O, or Q",
|
||||
OPTION_REQUIRED: "Please select an option",
|
||||
RECAL_ACK_REQUIRED: "Please acknowledge recalibration alert",
|
||||
RECAL_ACK_REQUIRED: "You must agree to the terms to submit",
|
||||
VEHICLE_REQUIRED: "Please select a vehicle",
|
||||
MOBILE_LOCATION_REQUIRED: "Please enter your service address",
|
||||
DATE_REQUIRED: "Please select a date",
|
||||
|
|
@ -37,6 +37,7 @@ const errorMessages = {
|
|||
MODEL_REQUIRED: "Please select your vehicle model",
|
||||
STYLE_REQUIRED: "Please select your vehicle style",
|
||||
PROMO_REQUIRED: "Please enter a promo code",
|
||||
INSURANCE_COMPANY_REQUIRED: "Please select an insurance company",
|
||||
};
|
||||
|
||||
export { errorMessages };
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
v-model="addressModel.streetAddress"
|
||||
ref="autocomplete"
|
||||
customInputId="streetAddress"
|
||||
placeholderText="Search"
|
||||
placeholderText="Start typing address"
|
||||
aria-haspopup=""
|
||||
hasIcon
|
||||
validationRules="street-address-required"
|
||||
|
|
|
|||
|
|
@ -12,12 +12,17 @@
|
|||
</h5>
|
||||
</div>
|
||||
<div
|
||||
v-if="subText"
|
||||
v-if="subText && !alignLeft"
|
||||
class="d-flex align-items-center justify-content-center container-fluid overflow-hidden mt-1">
|
||||
<p class="text-center small fw-normal sub-text">
|
||||
<span v-html="subText"></span>
|
||||
</p>
|
||||
</div>
|
||||
<div v-if="subText && alignLeft" class="d-flex overflow-hidden mt-1 mx-0">
|
||||
<p class="small fw-normal sub-text">
|
||||
<span v-html="subText"></span>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -33,6 +38,7 @@ export default {
|
|||
type: String,
|
||||
default: "dark-header",
|
||||
},
|
||||
alignLeft: Boolean,
|
||||
},
|
||||
components: {
|
||||
buttonBack,
|
||||
|
|
|
|||
|
|
@ -28,6 +28,5 @@ describe("customerQuestions.vue", () => {
|
|||
expect(addressQuestions.exists()).toBe(true);
|
||||
expect(firstName.exists()).toBe(true);
|
||||
expect(lastName.exists()).toBe(true);
|
||||
expect(emailAddress.exists()).toBe(true);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -23,24 +23,6 @@
|
|||
autocomplete="family-name" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mt-4">
|
||||
<div class="col">
|
||||
<textboxQuestion
|
||||
cmsWidgetName="EmailAddressQuestionWidget"
|
||||
v-model="customerModel.emailOrSms"
|
||||
ref="emailAddress"
|
||||
customInputId="emailOrSms"
|
||||
:isRequired="!isEmailOptional"
|
||||
:validationRules="EmailOrSmsvalidationRules"
|
||||
:addOptionalText="isEmailOptional"
|
||||
autocomplete="email" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mb-0">
|
||||
<div class="col">
|
||||
<textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
|
@ -51,7 +33,6 @@ import { defineRule } from "vee-validate";
|
|||
import { required } from "@/helpers/validation-rules";
|
||||
import { regex } from "@/helpers/validation-rules";
|
||||
import { errorMessages } from "@/constants/error-messages";
|
||||
import textBlock from "@/digital-components/text-block/text-block";
|
||||
|
||||
// DEFINE VALIDATION RULES
|
||||
defineRule("first-name-required", required(errorMessages.FIRST_NAME_REQUIRED));
|
||||
|
|
@ -101,7 +82,6 @@ export default {
|
|||
components: {
|
||||
addressQuestions,
|
||||
textboxQuestion,
|
||||
textBlock,
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -266,12 +266,16 @@ export default {
|
|||
<style lang="scss" scoped>
|
||||
.header-copy {
|
||||
font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
.vinlookupquestion p {
|
||||
font-size: 1.25rem;
|
||||
}
|
||||
.header-sub-copy {
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
|
||||
.select-an-option {
|
||||
font-family: UrbanistSemibold;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
customInputId="autocomplete"
|
||||
class="mb-4 mt-5"
|
||||
cmsWidgetName="InsuranceCoQuestionWidget"
|
||||
includeSearchIcon />
|
||||
includeSearchIcon
|
||||
:validationRules="validationRules" />
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
|
@ -35,6 +36,7 @@ export default {
|
|||
props: {
|
||||
originalList: Array,
|
||||
modelValue: String,
|
||||
validationRules: String,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -9,8 +9,10 @@
|
|||
|
||||
<div v-if="originalList.length > 0">
|
||||
<insurance-company-question
|
||||
isRequired
|
||||
v-model="parentAccountNumber"
|
||||
:originalList="originalList" />
|
||||
:originalList="originalList"
|
||||
validationRules="insurance-company-required" />
|
||||
</div>
|
||||
<textLink
|
||||
id="payOnMyOwnBackButton"
|
||||
|
|
@ -55,6 +57,10 @@ import { partNumberStrings } from "@/constants/part-number-strings";
|
|||
import { deepClone } from "@/helpers/object-helper";
|
||||
import store from "@/store";
|
||||
import { flushSaveSessionQueue } from "@/helpers/heritage-integration/order-helper";
|
||||
import { errorMessages } from "@/constants/error-messages";
|
||||
import { required, regex } from "@/helpers/validation-rules";
|
||||
|
||||
defineRule("insurance-company-required", required(errorMessages.INSURANCE_COMPANY_REQUIRED));
|
||||
|
||||
export default {
|
||||
name: "insurance-company",
|
||||
|
|
|
|||
|
|
@ -22,16 +22,6 @@
|
|||
mask="#####"
|
||||
validationRules="registration-zip-required|zip-format" />
|
||||
|
||||
<textboxQuestion
|
||||
cmsWidgetName="EmailAddressQuestionWidget"
|
||||
v-model="emailOrSms"
|
||||
customInputId="emailOrSms"
|
||||
:isRequired="!IsEmailOptional"
|
||||
:validationRules="EmailOrSmsValidationRules"
|
||||
:addOptionalText="IsEmailOptional" />
|
||||
|
||||
<textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
|
||||
|
||||
<alert
|
||||
v-if="displayInvalidZipAlert"
|
||||
class="my-3"
|
||||
|
|
@ -100,7 +90,6 @@ import navbar from "@/fmg-components/nav-bar/nav-bar";
|
|||
import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
|
||||
import alert from "@/ux-components/alert/alert";
|
||||
import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
|
||||
import textBlock from "@/digital-components/text-block/text-block";
|
||||
|
||||
// Supporting files
|
||||
import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
|
||||
|
|
@ -459,7 +448,6 @@ export default {
|
|||
funnelSubHeader,
|
||||
textboxQuestion,
|
||||
alert,
|
||||
textBlock,
|
||||
Form,
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -60,14 +60,30 @@
|
|||
class="service-questions" />
|
||||
<textBlock cmsWidgetName="CallOrTextWidget" justifyText="left" />
|
||||
<hr class="my-5" />
|
||||
<div class="d-flex flex-row checkbox-group">
|
||||
<checkboxQuestion
|
||||
cmsWidgetName="RecalConfirmWidget"
|
||||
class="mb-3"
|
||||
isRequired="true"
|
||||
<div class="d-flex flex-column checkbox-group">
|
||||
<Field
|
||||
name="recalAckOptIn"
|
||||
:rules="'recal-ack-required'"
|
||||
v-model="isRecalAckOptIn"
|
||||
validationRules="recal-ack-required"
|
||||
@text-link-clicked="openModal('RecalModal')" />
|
||||
v-slot="{ meta, errors }">
|
||||
<checkboxQuestion
|
||||
cmsWidgetName="RecalConfirmWidget"
|
||||
class="mb-3"
|
||||
isRequired="true"
|
||||
v-model="isRecalAckOptIn"
|
||||
validationRules="recal-ack-required"
|
||||
checkboxName="recalAckOptIn"
|
||||
:class="{ 'is-invalid': meta.touched && errors.length > 0 }"
|
||||
@text-link-clicked="openModal('RecalModal')" />
|
||||
</Field>
|
||||
<div id="form-test-error" class="row form-test-error">
|
||||
<error-message
|
||||
role="comment"
|
||||
aria-atomic="true"
|
||||
aria-live="polite"
|
||||
class="small mt-1 text-danger d-block"
|
||||
:name="'recalAckOptIn'"></error-message>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -158,6 +174,8 @@ import {
|
|||
} from "@/helpers/pricing-helper.js";
|
||||
import { consumeQueryFromStash } from "@/router/methods/helpers/querystring-stash";
|
||||
import { debugLog } from "@/helpers/debug-log-helper";
|
||||
import { ErrorMessage } from "vee-validate";
|
||||
import { Field } from "vee-validate";
|
||||
|
||||
defineRule("payment-method-required", required(errorMessages.OPTION_REQUIRED));
|
||||
defineRule("recal-ack-required", required(errorMessages.RECAL_ACK_REQUIRED));
|
||||
|
|
@ -845,6 +863,7 @@ export default {
|
|||
navbar,
|
||||
funnelSubHeader,
|
||||
Form,
|
||||
Field,
|
||||
loadingModal,
|
||||
cart,
|
||||
alert,
|
||||
|
|
@ -854,6 +873,7 @@ export default {
|
|||
checkboxQuestion,
|
||||
contentGroupModal,
|
||||
afterpayBreakout,
|
||||
ErrorMessage,
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
@ -877,6 +897,17 @@ export default {
|
|||
> * {
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
:deep(.form-check-input:invalid),
|
||||
:deep(.form-check-input[aria-invalid="true"]),
|
||||
:deep(.is-invalid .form-check-input) {
|
||||
border-color: $danger;
|
||||
box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);
|
||||
}
|
||||
|
||||
:deep(.is-invalid .form-check-label) {
|
||||
color: $danger;
|
||||
}
|
||||
}
|
||||
.questions-about-service {
|
||||
.service-questions {
|
||||
|
|
|
|||
|
|
@ -16,17 +16,6 @@
|
|||
isRequired
|
||||
validationRules="zip-required|zip-format" />
|
||||
|
||||
<textboxQuestion
|
||||
class="mb-0"
|
||||
cmsWidgetName="EmailAddressQuestionWidget"
|
||||
v-model="emailOrSms"
|
||||
inputId="emailOrSms"
|
||||
:isRequired="!IsEmailOptional"
|
||||
disableAutoFill
|
||||
:validationRules="EmailOrSmsValidationRules"
|
||||
:addOptionalText="IsEmailOptional" />
|
||||
<textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
|
||||
|
||||
<alert
|
||||
ref="alertInvalidZip"
|
||||
v-if="displayInvalidZipAlert"
|
||||
|
|
@ -71,7 +60,6 @@ import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-heade
|
|||
import buttonQuestion from "@/digital-components/button-question/button-question";
|
||||
import alert from "@/ux-components/alert/alert";
|
||||
import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
|
||||
import textBlock from "@/digital-components/text-block/text-block";
|
||||
import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
|
||||
|
||||
//Supporting Files
|
||||
|
|
@ -348,7 +336,6 @@ export default {
|
|||
Form,
|
||||
alert,
|
||||
textboxQuestion,
|
||||
textBlock,
|
||||
loadingModal,
|
||||
},
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,7 +4,10 @@
|
|||
<div class="container vehicle">
|
||||
<div class="row">
|
||||
<div class="col-12 col-md-10 col-lg-8 col-xl-7">
|
||||
<funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" class="siteSubHeader" />
|
||||
<funnelSubHeader
|
||||
cmsWidgetName="FunnelSubHeaderWidget"
|
||||
class="siteSubHeader"
|
||||
:alignLeft="true" />
|
||||
<vehicleQuestion
|
||||
ref="vehicleYearQuestion"
|
||||
v-model="selectedYear"
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ export default {
|
|||
}
|
||||
a {
|
||||
font-size: 0.875rem;
|
||||
text-decoration: none;
|
||||
}
|
||||
.vin-toggle {
|
||||
display: inline-flex;
|
||||
|
|
|
|||
|
|
@ -40,16 +40,6 @@
|
|||
isRequired
|
||||
validationRules="zip-required|zip-format" />
|
||||
|
||||
<textboxQuestion
|
||||
cmsWidgetName="EmailAddressQuestionWidget"
|
||||
v-model="emailOrSms"
|
||||
customInputId="emailOrSms"
|
||||
:isRequired="!IsEmailOptional"
|
||||
:validationRules="EmailOrSmsValidationRules"
|
||||
:addOptionalText="IsEmailOptional" />
|
||||
|
||||
<textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
|
||||
|
||||
<alert
|
||||
ref="alertInvalidZip"
|
||||
v-if="displayInvalidZipAlert"
|
||||
|
|
@ -135,7 +125,6 @@ import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-heade
|
|||
import alert from "@/ux-components/alert/alert";
|
||||
import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
|
||||
import vinInformation from "@/layouts/vin-lookup/vin-information/vin-information";
|
||||
import textBlock from "@/digital-components/text-block/text-block";
|
||||
import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
|
||||
|
||||
// Supporting files
|
||||
|
|
@ -590,7 +579,6 @@ export default {
|
|||
textboxQuestion,
|
||||
alert,
|
||||
vinInformation,
|
||||
textBlock,
|
||||
Form,
|
||||
loadingModal,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ html {
|
|||
&:hover {
|
||||
@include box-shadow-hover($red-200);
|
||||
z-index: 5;
|
||||
border-radius: 50rem;
|
||||
}
|
||||
|
||||
input[type="radio"]:focus + .list-button-content {
|
||||
|
|
@ -133,6 +134,7 @@ html {
|
|||
background-image: url("data:image/svg+xml,%3Csvg width='16' height='16' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M15.7817 14.7328L11.8252 10.7762C12.8833 9.45005 13.3936 7.76911 13.2513 6.07849C13.1091 4.38788 12.325 2.81587 11.0601 1.6852C9.79515 0.554524 8.14538 -0.0490261 6.44946 -0.00154744C4.75353 0.0459312 3.14012 0.740836 1.94045 1.94051C0.740775 3.14018 0.0458701 4.75359 -0.00160848 6.44952C-0.0490871 8.14545 0.554463 9.79521 1.68514 11.0601C2.81581 12.325 4.38782 13.1091 6.07843 13.2514C7.76905 13.3937 9.44999 12.8834 10.7762 11.8252L14.7349 15.7839C14.8044 15.8527 14.8869 15.907 14.9774 15.9439C15.068 15.9808 15.165 15.9995 15.2628 15.9989C15.3606 15.9983 15.4573 15.9784 15.5475 15.9405C15.6376 15.9025 15.7194 15.8471 15.7881 15.7776C15.8568 15.708 15.9112 15.6256 15.9481 15.535C15.985 15.4444 16.0036 15.3474 16.0031 15.2496C16.0025 15.1518 15.9826 15.0551 15.9446 14.965C15.9067 14.8748 15.8513 14.7931 15.7817 14.7243V14.7328ZM6.63737 11.7913C5.61803 11.7913 4.62157 11.4891 3.77402 10.9228C2.92646 10.3564 2.26587 9.5515 1.87578 8.60975C1.4857 7.668 1.38363 6.63172 1.5825 5.63196C1.78136 4.6322 2.27222 3.71386 2.99301 2.99307C3.7138 2.27229 4.63214 1.78142 5.6319 1.58256C6.63166 1.38369 7.66793 1.48576 8.60969 1.87585C9.55144 2.26593 10.3564 2.92652 10.9227 3.77408C11.489 4.62163 11.7913 5.61809 11.7913 6.63743C11.7896 8.00382 11.2461 9.31376 10.2799 10.2799C9.3137 11.2461 8.00376 11.7897 6.63737 11.7913Z' fill='%23d4281c'/%3E%3C/svg%3E%0A");
|
||||
border: 1px solid $red;
|
||||
border-left: none;
|
||||
border-radius: 0 0.5rem 0.5rem 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue