Merge pull request #3179 from Safelite/feature/CASH-2563

Feature/CASH 2563
This commit is contained in:
Chris 2026-05-14 13:40:14 -04:00 committed by GitHub
commit f0d806accb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 9 deletions

View file

@ -73,10 +73,11 @@ export default {
},
arePagePrerequisitesValid() {
return (
store.getters.order.customer.firstName &&
store.getters.order.customer.lastName &&
store.getters.order.customer.emailAddress &&
store.getters.order.customer.phoneNumber
(store.getters.order.customer.firstName &&
store.getters.order.customer.lastName &&
store.getters.order.customer.emailAddress &&
store.getters.order.customer.phoneNumber) ||
baseMixin.methods.hasSubmittedOrder()
);
},
},

View file

@ -80,15 +80,21 @@ export async function beforeEach(to, from) {
const exceptionPages = [
FUNNEL_START_PAGE.name,
routeData.CONFIRMATION.name,
routeData.BAILOUT.name,
routeData.BAILOUT_SUCCESS.name,
];
if (!exceptionPages.some((name) => to.name === name) && !isVirtualRoute(to.name)) {
router.push({
name: routeData.CONFIRMATION.name,
});
return false;
if (to.name === routeData.BAILOUT.name) {
router.push({
name: routeData.BAILOUT_SUCCESS.name,
});
return false;
} else {
router.push({
name: routeData.CONFIRMATION.name,
});
return false;
}
}
}