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

Merge branch 'develop' into feature/CSR-2253

Browse source
This commit is contained in:
CarlNation 2024-10-15 09:27:06 -04:00
commit 3654b58914
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/global-methods.js
View file

@ -6,6 +6,7 @@ import store from "@/store";
import { applicationConfig } from "@/constants/application-config.js"; import { applicationConfig } from "@/constants/application-config.js";
import { GaCategories, GaActions, GaLabels } from "@/constants/analytics"; import { GaCategories, GaActions, GaLabels } from "@/constants/analytics";
import { getSessionKeyValue } from "@/helpers/heritage-integration/cookie-helper";
import { headerKeys } from "@/constants/header-keys"; import { headerKeys } from "@/constants/header-keys";
import axiosResponseInterceptorMessages from "@/constants/axios-response-interceptor-messages.js"; import axiosResponseInterceptorMessages from "@/constants/axios-response-interceptor-messages.js";
@ -65,7 +66,7 @@ export default {
const headers = { const headers = {
[headerKeys.EXPERIMENT]: JSON.stringify(store.getters.experimentSettings), [headerKeys.EXPERIMENT]: JSON.stringify(store.getters.experimentSettings),
[headerKeys.APPLICATION_NAME]: applicationConfig.APPLICATION_NAME, [headerKeys.APPLICATION_NAME]: applicationConfig.APPLICATION_NAME,
[headerKeys.SESSION_SEQUENCE_NUMBER]: store.getters.applicationUser?.savedSessionId, [headerKeys.SESSION_SEQUENCE_NUMBER]: getSessionKeyValue(),
[headerKeys.REFERRAL_SEQUENCE_NUMBER]: order?.referralSequenceNumber, [headerKeys.REFERRAL_SEQUENCE_NUMBER]: order?.referralSequenceNumber,
[headerKeys.TRANSACTION_ID]: crypto.randomUUID(), [headerKeys.TRANSACTION_ID]: crypto.randomUUID(),
[headerKeys.EON]: order?.eon, [headerKeys.EON]: order?.eon,

2
src/helpers/heritage-integration/navigation-helper.js
View file

@ -134,6 +134,8 @@ export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLo
} }
if ( if (
(process.env.VUE_APP_HERITAGE_FUNNEL.includes("fixmyglasstest") &&
process.env.VUE_APP_CURRENT_ENVIRONMENT === "Localhost") ||
(process.env.VUE_APP_HERITAGE_FUNNEL.includes("fixmyglassdev") && (process.env.VUE_APP_HERITAGE_FUNNEL.includes("fixmyglassdev") &&
process.env.VUE_APP_CURRENT_ENVIRONMENT === "Localhost") || process.env.VUE_APP_CURRENT_ENVIRONMENT === "Localhost") ||
(process.env.VUE_APP_HERITAGE_FUNNEL.includes("localhost") && (process.env.VUE_APP_HERITAGE_FUNNEL.includes("localhost") &&

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

@ -36,7 +36,7 @@
:showInsuranceCoverageAs="showInsuranceCoverageAs" :showInsuranceCoverageAs="showInsuranceCoverageAs"
:shouldHideRecalibration="shouldHideRecalibration" :shouldHideRecalibration="shouldHideRecalibration"
:isItac="isItac" :isItac="isItac"
:isNocomp="isNocomp" /> :isNoComp="isNoComp" />
<hr class="my-5" /> <hr class="my-5" />

9
src/store/index.js
View file

@ -810,8 +810,11 @@ export const getters = {
return false; return false;
}, },
shouldHideRecalibration: (state) => { shouldHideRecalibration: (state) => {
return (experimentMixin.methods.getSettingValue(experimentSettings.RECAL_PRICE_REMOVE) return (
?.toLowerCase() === "true" && getters.isRecalibrationOnOrder); experimentMixin.methods
.getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)
?.toLowerCase() === "true" && getters.isRecalibrationOnOrder
);
}, },
areRearWipersOnOrder: (state) => { areRearWipersOnOrder: (state) => {
return !!state.order.lineItems.vaps?.some( return !!state.order.lineItems.vaps?.some(
@ -2622,6 +2625,7 @@ export const actions = {
carId: order.vehicle.carId, carId: order.vehicle.carId,
correlationId: order.referralCorrelationId, correlationId: order.referralCorrelationId,
eon: order.eon, eon: order.eon,
isInsurance: order.payment.isInsurance,
isRepair: order.damage.isRepair, isRepair: order.damage.isRepair,
glassToReplace: renameGlassToReplaceAttributes(order.damage.glassToReplace), glassToReplace: renameGlassToReplaceAttributes(order.damage.glassToReplace),
lineItemsOnOrder: getArrayOfAllLineItemsAndChildParts(lineItemsToUse), lineItemsOnOrder: getArrayOfAllLineItemsAndChildParts(lineItemsToUse),
@ -2694,6 +2698,7 @@ export const actions = {
carId: order.vehicle.carId, carId: order.vehicle.carId,
correlationId: order.referralCorrelationId, correlationId: order.referralCorrelationId,
eon: order.eon, eon: order.eon,
isInsurance: order.payment.isInsurance,
isRepair: order.damage.isRepair, isRepair: order.damage.isRepair,
glassToReplace: renameGlassToReplaceAttributes(order.damage.glassToReplace), glassToReplace: renameGlassToReplaceAttributes(order.damage.glassToReplace),
lineItemsOnOrder: getArrayOfAllLineItemsAndChildParts(lineItemsToUse), lineItemsOnOrder: getArrayOfAllLineItemsAndChildParts(lineItemsToUse),