Merge pull request #3179 from Safelite/feature/CASH-2563
Feature/CASH 2563
This commit is contained in:
commit
f0d806accb
2 changed files with 16 additions and 9 deletions
|
|
@ -73,10 +73,11 @@ export default {
|
||||||
},
|
},
|
||||||
arePagePrerequisitesValid() {
|
arePagePrerequisitesValid() {
|
||||||
return (
|
return (
|
||||||
store.getters.order.customer.firstName &&
|
(store.getters.order.customer.firstName &&
|
||||||
store.getters.order.customer.lastName &&
|
store.getters.order.customer.lastName &&
|
||||||
store.getters.order.customer.emailAddress &&
|
store.getters.order.customer.emailAddress &&
|
||||||
store.getters.order.customer.phoneNumber
|
store.getters.order.customer.phoneNumber) ||
|
||||||
|
baseMixin.methods.hasSubmittedOrder()
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -80,15 +80,21 @@ export async function beforeEach(to, from) {
|
||||||
const exceptionPages = [
|
const exceptionPages = [
|
||||||
FUNNEL_START_PAGE.name,
|
FUNNEL_START_PAGE.name,
|
||||||
routeData.CONFIRMATION.name,
|
routeData.CONFIRMATION.name,
|
||||||
routeData.BAILOUT.name,
|
|
||||||
routeData.BAILOUT_SUCCESS.name,
|
routeData.BAILOUT_SUCCESS.name,
|
||||||
];
|
];
|
||||||
|
|
||||||
if (!exceptionPages.some((name) => to.name === name) && !isVirtualRoute(to.name)) {
|
if (!exceptionPages.some((name) => to.name === name) && !isVirtualRoute(to.name)) {
|
||||||
router.push({
|
if (to.name === routeData.BAILOUT.name) {
|
||||||
name: routeData.CONFIRMATION.name,
|
router.push({
|
||||||
});
|
name: routeData.BAILOUT_SUCCESS.name,
|
||||||
return false;
|
});
|
||||||
|
return false;
|
||||||
|
} else {
|
||||||
|
router.push({
|
||||||
|
name: routeData.CONFIRMATION.name,
|
||||||
|
});
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue