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

Merge pull request #1579 from Safelite/feature/csr-1795

Browse source 
CSR 1795 & 1801
This commit is contained in:
chloeherdsafelite 2023-11-28 13:44:02 -05:00 committed by GitHub
commit 064d1a1bc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/constants/query-strings.js
View file

@ -19,6 +19,7 @@ const queryStrings = {
AUTH_CODE: "auth_code", AUTH_CODE: "auth_code",
TRANSACTION_ID: "transaction_id", TRANSACTION_ID: "transaction_id",
TRANS_REFERENCE_NUMBER: "auth_trans_ref_no", TRANS_REFERENCE_NUMBER: "auth_trans_ref_no",
DISPLAY_PIA_ALERT: "displayPiaAlert",
}; };
export { queryStrings }; export { queryStrings };

8
src/layouts/payment-method/payment-method.vue
View file

@ -103,6 +103,7 @@ import {
getNewlyInactivatedPromos, getNewlyInactivatedPromos,
} from "@/helpers/promotions-helper"; } from "@/helpers/promotions-helper";
import { queryStrings } from "@/constants/query-strings"; import { queryStrings } from "@/constants/query-strings";
import { routerParams } from "@/router/router-constants/router-params";
import { getQuerystringParameter } from "@/helpers/querystring-helper"; import { getQuerystringParameter } from "@/helpers/querystring-helper";
import { deepClone } from "@/helpers/object-helper"; import { deepClone } from "@/helpers/object-helper";
@ -421,7 +422,7 @@ export default {
} catch (error) { } catch (error) {
console.log("error: response from pia submit work order:" + error.message); console.log("error: response from pia submit work order:" + error.message);
this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE); this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
this.$route.params[this.routerParams.DISPLAY_PIA_ALERT] = true; this.$route.params[routerParams.DISPLAY_PIA_ALERT] = true;
return; return;
} }
} }
@ -469,7 +470,10 @@ export default {
return this.paymentMethodInternalModel; return this.paymentMethodInternalModel;
}, },
shouldDisplayPiaAlert() { shouldDisplayPiaAlert() {
return this.$route.params[this.routerParams.DISPLAY_PIA_ALERT]; return (
this.$route.query[queryStrings.DISPLAY_PIA_ALERT] ||
this.$route.params[routerParams.DISPLAY_PIA_ALERT]
);
}, },
// Necessary to make the watcher of lineItems work // Necessary to make the watcher of lineItems work
// JavaScript does not keep a record of the old value, only a reference to it's location in the memory. // JavaScript does not keep a record of the old value, only a reference to it's location in the memory.

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

@ -24,12 +24,9 @@ export default {
if (piaError) { if (piaError) {
console.log("Error during payment: " + piaError); console.log("Error during payment: " + piaError);
this.$router.navigateWithoutSaving( this.$router.navigateWithoutSaving(this.navigationScenarios.PIA_ERROR, this.$route, {
this.navigationScenarios.PIA_ERROR, [queryStrings.DISPLAY_PIA_ALERT]: true,
this.$route, });
{},
{ [routerParams.DISPLAY_PIA_ALERT]: true }
);
} else { } else {
switch (store.getters.order.payment.piaType) { switch (store.getters.order.payment.piaType) {
case paymentMethods.CREDIT_CARD: case paymentMethods.CREDIT_CARD: