Merge branch 'release/2023.07.27' into rlsmerge/2023.07.27-to-develop

This commit is contained in:
CarlNation 2023-07-24 13:48:12 -04:00
commit 72881bafd8
4 changed files with 14 additions and 4 deletions

View file

@ -56,7 +56,7 @@
:class="[!isLoading ? 'date-picker-hidden' : '']" :class="[!isLoading ? 'date-picker-hidden' : '']"
loaderColor="blue" loaderColor="blue"
loaderPosition="center" /> loaderPosition="center" />
<div class="row form-test-error"> <div class="row form-test-error" id="date-of-month-error">
<ErrorMessage name="date-of-month" class="small mt-1"></ErrorMessage> <ErrorMessage name="date-of-month" class="small mt-1"></ErrorMessage>
</div> </div>
<button <button
@ -685,6 +685,12 @@ export default {
value: newValue, value: newValue,
}); });
}, },
errorMessage(newValue, oldValue) {
// Check for changing from no error message to some error message.
if (newValue && !oldValue) {
this.scrollToElement("date-of-month-error");
}
},
}, },
components: { components: {
loader, loader,

View file

@ -150,7 +150,7 @@ export default {
(store.getters.order.damage.isRepair || (store.getters.order.damage.isRepair ||
(store.getters.order.lineItems?.glassParts != null && (store.getters.order.lineItems?.glassParts != null &&
store.getters.order.lineItems.glassParts.length > 0)) && store.getters.order.lineItems.glassParts.length > 0)) &&
!store.getters.payment.insuranceCoverage.isVerified store.getters.order.referralNumber?.length !== 6
); );
}, },
getDefaultIsInsuranceSelectedValue(availableLineItems) { getDefaultIsInsuranceSelectedValue(availableLineItems) {

View file

@ -15,7 +15,9 @@
v-model="vin" v-model="vin"
customInputId="vin" customInputId="vin"
isRequired isRequired
validationRules="vin-required|vin-format" :validationRules="
!vinPopulatedOnPageLoad ? 'vin-required|vin-format' : ''
"
:isDisabled="vinPopulatedOnPageLoad" :isDisabled="vinPopulatedOnPageLoad"
maxLength="17" maxLength="17"
:mask="vinMask" :mask="vinMask"

View file

@ -446,7 +446,9 @@ export default {
const payment = store.getters.payment; const payment = store.getters.payment;
if (payment.isInsurance && payment.insuranceCoverage.isVerified) { if (store.getters.order.referralNumber?.length === 6) {
navigateToHeritageFunnel({ loadingModal: self.$refs.loadingModal });
} else if (payment.isInsurance && payment.insuranceCoverage.isVerified) {
navigateToHeritageFunnel({ loadingModal: self.$refs.loadingModal }); navigateToHeritageFunnel({ loadingModal: self.$refs.loadingModal });
} else { } else {
self.$router.navigateWithSaving( self.$router.navigateWithSaving(