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

Merge branch 'develop' into feature/CSR-2166

Browse source
This commit is contained in:
Adam Caouette 2024-09-23 18:29:15 -04:00
commit 5331699d53
5 changed files with 38 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/helpers/heritage-integration/order-helper.js
View file

@ -57,7 +57,7 @@ export async function saveSession({
pageNameToLog, pageNameToLog,
shouldAwaitSaveSessionQueue = false, shouldAwaitSaveSessionQueue = false,
submitAfterSave = false, submitAfterSave = false,
createDeleteStatusWorkOrderForPia = false, createUnscheduledStatusWorkOrderForPIA = false,
}) { }) {
var saveSessionPromise; var saveSessionPromise;
if (store.getters.applicationUser.saveSessionPromise) { if (store.getters.applicationUser.saveSessionPromise) {
@ -67,7 +67,7 @@ export async function saveSession({
return saveSessionHelper( return saveSessionHelper(
pageNameToLog, pageNameToLog,
submitAfterSave, submitAfterSave,
createDeleteStatusWorkOrderForPia createUnscheduledStatusWorkOrderForPIA
); );
}); });
} else { } else {
@ -75,7 +75,7 @@ export async function saveSession({
saveSessionPromise = saveSessionHelper( saveSessionPromise = saveSessionHelper(
pageNameToLog, pageNameToLog,
submitAfterSave, submitAfterSave,
createDeleteStatusWorkOrderForPia createUnscheduledStatusWorkOrderForPIA
); );
} }
store.commit(storeMutations.UPDATE_SAVE_SESSION_PROMISE, saveSessionPromise); store.commit(storeMutations.UPDATE_SAVE_SESSION_PROMISE, saveSessionPromise);
@ -88,13 +88,13 @@ export async function saveSession({
export async function submitWorkOrder({ export async function submitWorkOrder({
pageNameToLog, pageNameToLog,
submitAfterSave = false, submitAfterSave = false,
createDeleteStatusWorkOrderForPia = false, createUnscheduledStatusWorkOrderForPIA = false,
}) { }) {
await saveSession({ await saveSession({
pageNameToLog: pageNameToLog, pageNameToLog: pageNameToLog,
shouldAwaitSaveSessionQueue: true, shouldAwaitSaveSessionQueue: true,
submitAfterSave: submitAfterSave, submitAfterSave: submitAfterSave,
createDeleteStatusWorkOrderForPia: createDeleteStatusWorkOrderForPia, createUnscheduledStatusWorkOrderForPIA: createUnscheduledStatusWorkOrderForPIA,
}); });
} }
@ -139,13 +139,13 @@ async function loadSession(
async function saveSessionHelper( async function saveSessionHelper(
pageNameToLog, pageNameToLog,
submitAfterSave = false, submitAfterSave = false,
createDeleteStatusWorkOrderForPia = false createUnscheduledStatusWorkOrderForPIA = false
) { ) {
const savedSessionInfo = await baseMixin.methods.dispatchStoreActionWithLogging( const savedSessionInfo = await baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.SAVE_SESSION, storeActions.SAVE_SESSION,
{ {
submitAfterSave: submitAfterSave, submitAfterSave: submitAfterSave,
createDeleteStatusWorkOrderForPia: createDeleteStatusWorkOrderForPia, createUnscheduledStatusWorkOrderForPIA: createUnscheduledStatusWorkOrderForPIA,
}, },
pageNameToLog pageNameToLog
); );

4
src/helpers/heritage-integration/order-helper.spec.js
View file

@ -179,7 +179,7 @@ describe("saveSession", () => {
// Assert // Assert
expect(mocks.baseMixin.methods.dispatchStoreActionWithLogging).toHaveBeenCalledWith( expect(mocks.baseMixin.methods.dispatchStoreActionWithLogging).toHaveBeenCalledWith(
storeActions.SAVE_SESSION, storeActions.SAVE_SESSION,
{ createDeleteStatusWorkOrderForPia: false, submitAfterSave: false }, { createUnscheduledStatusWorkOrderForPIA: false, submitAfterSave: false },
"test" "test"
); );
expect(mocks.baseMixin.methods.dispatchStoreAction).toHaveBeenCalledWith( expect(mocks.baseMixin.methods.dispatchStoreAction).toHaveBeenCalledWith(
@ -287,7 +287,7 @@ describe("submitWorkOrder", () => {
// Assert // Assert
expect(mocks.baseMixin.methods.dispatchStoreActionWithLogging).toHaveBeenCalledWith( expect(mocks.baseMixin.methods.dispatchStoreActionWithLogging).toHaveBeenCalledWith(
storeActions.SAVE_SESSION, storeActions.SAVE_SESSION,
{ createDeleteStatusWorkOrderForPia: false, submitAfterSave: true }, { createUnscheduledStatusWorkOrderForPIA: false, submitAfterSave: true },
"test" "test"
); );
expect(mocks.baseMixin.methods.dispatchStoreAction).toHaveBeenCalledWith( expect(mocks.baseMixin.methods.dispatchStoreAction).toHaveBeenCalledWith(

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

@ -551,23 +551,21 @@ export default {
}, },
async setupPia() { async setupPia() {
this.$refs.loadingModal.showModal(); this.$refs.loadingModal.showModal();
// if we don't have a work order in delete substatus, set the flag and submit.
// we need a work order number for pia so we can pass it to safeliteHop. // we need a work order number for pia so we can pass it to safeliteHop.
if (!store.getters.order.workOrderNumber) { // this will create one in delete substatus.
try { try {
await submitWorkOrder({ await submitWorkOrder({
pageNameToLog: "payment-method", pageNameToLog: "payment-method",
submitAfterSave: false, submitAfterSave: false,
createDeleteStatusWorkOrderForPia: true, createUnscheduledStatusWorkOrderForPIA: true,
}); });
} 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.query[queryStrings.DISPLAY_PIA_ALERT] = true; this.$route.query[queryStrings.DISPLAY_PIA_ALERT] = true;
return; return;
}
} }
this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE); this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE);
this.$router.navigateWithoutSaving( this.$router.navigateWithoutSaving(
this.navigationScenarios.CLICKED_PAY_NOW, this.navigationScenarios.CLICKED_PAY_NOW,
@ -594,10 +592,10 @@ export default {
); );
}, },
shouldHideRecalibration() { shouldHideRecalibration() {
const recalSettingValue = return (
this.getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)?.toLowerCase() === this.getSettingValue(experimentSettings.RECAL_PRICE_REMOVE).toLowerCase() === "true" &&
"true"; this.isRecalibrationOnOrder
return recalSettingValue; );
}, },
showApplePay() { showApplePay() {
return baseMixin.methods.showApplePay(); return baseMixin.methods.showApplePay();

4
src/layouts/service-zip/service-zip.vue
View file

@ -213,7 +213,7 @@ export default {
const supportingItemsPromise = await this.dispatchStoreActionWithLogging( const supportingItemsPromise = await this.dispatchStoreActionWithLogging(
storeActions.GET_SUPPORTING_ITEMS, storeActions.GET_SUPPORTING_ITEMS,
null, null,
"estimate" "service-zip"
); );
const promiseResultMap = [ const promiseResultMap = [
@ -232,7 +232,7 @@ export default {
); );
// call saveSession here - navigateWithSaving saves too late in the flow // call saveSession here - navigateWithSaving saves too late in the flow
await saveSession({ pageNameToLog: "estimate" }); await saveSession({ pageNameToLog: "service-zip" });
return this.$router.navigateWithSaving( return this.$router.navigateWithSaving(
this.navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS, this.navigationScenarios.CLICKED_FORWARD_WITH_NO_QUESTIONS,
this.$route this.$route

14
src/store/index.js
View file

@ -109,6 +109,7 @@ const getDefaultState = () => {
insuranceCoverage: { insuranceCoverage: {
isVerified: null, isVerified: null,
coverageStatus: null, coverageStatus: null,
coverageSubStatus: null,
coverageType: null, coverageType: null,
coverageVerificationType: null, coverageVerificationType: null,
}, },
@ -690,6 +691,8 @@ export const mutations = {
state.order.payment.insuranceCoverage.coverageStatus = coverageStatusValue( state.order.payment.insuranceCoverage.coverageStatus = coverageStatusValue(
sessionInformation?.order.insuranceCoverage.coverageStatus sessionInformation?.order.insuranceCoverage.coverageStatus
); );
state.order.payment.insuranceCoverage.coverageSubStatus =
sessionInformation?.order.insuranceCoverage.coverageSubStatus;
state.order.payment.insuranceCoverage.coverageType = coverageTypeValue( state.order.payment.insuranceCoverage.coverageType = coverageTypeValue(
sessionInformation?.order.insuranceCoverage.coverageType sessionInformation?.order.insuranceCoverage.coverageType
); );
@ -1534,9 +1537,12 @@ export const actions = {
? context.getters.payment.billToAccountNumber ? context.getters.payment.billToAccountNumber
: applicationConfig.CASH_DEFAULT_BILL_TO_ACCOUNT_NUMBER; : applicationConfig.CASH_DEFAULT_BILL_TO_ACCOUNT_NUMBER;
const covStatus = context.getters.payment?.insuranceCoverage?.coverageStatus;
const covSubStatus = context.getters.payment?.insuranceCoverage?.coverageSubStatus;
return globalMethods.callHttpClient({ return globalMethods.callHttpClient({
method: endpoints.GetMobileFeePart.method, method: endpoints.GetMobileFeePart.method,
endpoint: `${endpoints.GetMobileFeePart.url}/${damageType}/${parentAccountNumber}/${billToAccountNumber}`, endpoint: `${endpoints.GetMobileFeePart.url}/${damageType}/${parentAccountNumber}/${billToAccountNumber}/${covStatus}/${covSubStatus}`,
logApiCall: true, logApiCall: true,
pageNameToLog: pageNameToLog, pageNameToLog: pageNameToLog,
}); });
@ -1818,8 +1824,8 @@ export const actions = {
const lineItems = context.state.order.lineItems; const lineItems = context.state.order.lineItems;
const submitAfterSave = payload?.submitAfterSave === "true"; const submitAfterSave = payload?.submitAfterSave === "true";
const createDeleteStatusWorkOrderForPia = const createUnscheduledStatusWorkOrderForPIA =
payload?.createDeleteStatusWorkOrderForPia === "true"; payload?.createUnscheduledStatusWorkOrderForPIA === "true";
// create a new array to avoid mutating state // create a new array to avoid mutating state
const newGlassToReplace = convertGlassPieceNamingForApi(damage.glassToReplace); const newGlassToReplace = convertGlassPieceNamingForApi(damage.glassToReplace);
@ -1954,7 +1960,7 @@ export const actions = {
referralNumber: order.referralNumber?.toString(), referralNumber: order.referralNumber?.toString(),
referralSequenceNumber: order.referralSequenceNumber, referralSequenceNumber: order.referralSequenceNumber,
eon: order.eon, eon: order.eon,
createDeleteStatusWorkOrderForPia: createDeleteStatusWorkOrderForPia, createUnscheduledStatusWorkOrderForPIA: createUnscheduledStatusWorkOrderForPIA,
lockToken: order.lockToken, lockToken: order.lockToken,
isRecalAckOptIn: order.isRecalAckOptIn, isRecalAckOptIn: order.isRecalAckOptIn,
}, },