jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1950 from Safelite/feature/CSR-2183-safari-confirmation-alert-bugfix-ajc

Browse source
This commit is contained in:
CarlNation 2024-08-24 14:09:14 -04:00 committed by GitHub
commit 4dcb26b2ee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/global-methods.js
View file

@ -98,7 +98,7 @@ export default {
); );
} }
if (error.response.status != "404") { if (error.response.status && error.response.status != "404") {
// Do not route to error logic when no wipers found or no promo found (404s) // Do not route to error logic when no wipers found or no promo found (404s)
router.navigateError(); router.navigateError();

3
src/layouts/payment-pia-return/payment-pia-return.vue
View file

@ -185,9 +185,6 @@ export default {
await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_ORDER); await baseMixin.methods.dispatchStoreAction(storeActions.CREATE_SUBMITTED_ORDER);
this.$router.navigateWithoutSaving(this.navigationScenarios.PIA_SUCCESS, this.$route); this.$router.navigateWithoutSaving(this.navigationScenarios.PIA_SUCCESS, this.$route);
}, },
forwardButtonAction() {
this.$router.navigateWithoutSaving(this.navigationScenarios.PIA_SUCCESS, this.$route);
},
}, },
components: { components: {
loadingModal, loadingModal,

3
src/router/index.js
View file

@ -268,11 +268,14 @@ router.beforeEach(async (to, from, next) => {
if ((isInIframe && notToPIAReturn) || fromPaymentToConfirmation) { if ((isInIframe && notToPIAReturn) || fromPaymentToConfirmation) {
const newUrl = `${window.top.location.origin}${to.href}`; const newUrl = `${window.top.location.origin}${to.href}`;
window.top.location.href = newUrl; window.top.location.href = newUrl;
next(false);
// Refresh page if navigating to self to prevent locking. // Refresh page if navigating to self to prevent locking.
// For now only carved out for vehicle; all modals are opened through anchor tags at the moment, // For now only carved out for vehicle; all modals are opened through anchor tags at the moment,
// which also self navigate, but relied on the page remaining the same on self-navigation. // which also self navigate, but relied on the page remaining the same on self-navigation.
} else if (toQueryPage === fromQueryPage && toQueryPage === getRedirectedStartPage()) { } else if (toQueryPage === fromQueryPage && toQueryPage === getRedirectedStartPage()) {
router.go(0); router.go(0);
next(false);
} else { } else {
next(); next();
} }