diff --git a/src/helpers/heritage-integration/cookie-helper.js b/src/helpers/heritage-integration/cookie-helper.js index abb1c0a67..579993795 100644 --- a/src/helpers/heritage-integration/cookie-helper.js +++ b/src/helpers/heritage-integration/cookie-helper.js @@ -18,7 +18,7 @@ export function updateOrCreateFunnelCookie() { ReferralNumber: store.getters.order.referralNumber, ReferralDate: store.getters.order.referralDate, ReferralCorrelationId: store.getters.order.referralCorrelationId, - ReferralParentAccountNumber: store.getters.order.accountNumber, + ReferralParentAccountNumber: store.getters.order.payment.parentAccountNumber, HasDelayedClaimRegistration: wasClaimRegistrationDelayed, SuppressConceptFunnel: shouldSuppressConceptFunnel, SavedSessionId: store.getters.applicationUser.savedSessionId, diff --git a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js index 26f2e6962..6f65b2646 100644 --- a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js +++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js @@ -16,6 +16,10 @@ export async function getPricedMobileFeePart(serviceZipCode, pageNameToLog) { false ); + if (mobileFeePart.data === null || mobileFeePart.data === undefined || mobileFeePart.data === "") { + return null; + } + // Get the Mobile Fee Part Price const pricingResults = await baseMixin.methods.dispatchStoreActionWithLogging( storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA, diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue index 3d0d5f588..4096f4e1d 100644 --- a/src/layouts/service-location/service-location.vue +++ b/src/layouts/service-location/service-location.vue @@ -349,11 +349,19 @@ export default { }, methods: { arePagePrerequisitesValid() { - return ( + // insurance drops the recycle fee on replace orders so it won't be in supportingItems + if (store.getters.payment.isInsurance && !store.getters.order.damage.isRepair) { + return ( + store.getters.order.serviceLocation.zipCode !== null && + store.getters.payment.isInsurance !== null); + } + else { + return ( store.getters.lineItems.supportingItems !== null && store.getters.order.serviceLocation.zipCode !== null && store.getters.payment.isInsurance !== null - ); + ); + } }, setData(zipCodeData, serviceabilityDetails, mobileFeePart, shopProviderData) { if (zipCodeData) { diff --git a/src/store/index.js b/src/store/index.js index eeb70ec0a..cff4c71ea 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -2229,6 +2229,7 @@ export const actions = { const vehicle = context.getters.order.vehicle; + // TODO: Insurance pricing...`ParentAccountNumber=${context.getters.order.payment.parentAccountNumber}` let queryString = `ParentAccountNumber=${applicationConfig.CASH_PARENT_ACCOUNT_NUMBER}` + `&CTU=${ctuToUse}` +