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

Merge pull request #2240 from Safelite/feature/CASH-109

Browse source 
Feature/cash 109
This commit is contained in:
CarlNation 2025-01-22 11:07:35 -05:00 committed by GitHub
commit 479df01043
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -76,6 +76,10 @@ export async function getImplicitNavigation(toRoute) {
const skipVin = await skipVinLookup(); const skipVin = await skipVinLookup();
if (store.getters.order.payment.insuranceCoverage?.isVerified) {
return fmgPageValues.HERITAGE;
}
if (quoteComponent.methods.arePagePrerequisitesValid()) { if (quoteComponent.methods.arePagePrerequisitesValid()) {
// Do not send to quote if verified insurance user. // Do not send to quote if verified insurance user.
if (store.getters.requiresVerifiedRedirecting) { if (store.getters.requiresVerifiedRedirecting) {

28
src/router/index.js
View file

@ -83,6 +83,8 @@ const routes = [
const fromReturnUser = from?.name === fmgPageValues.RETURN_USER; const fromReturnUser = from?.name === fmgPageValues.RETURN_USER;
const fromContentSite = getQuerystringParameter(queryStrings.START_TYPE) === "fmg"; const fromContentSite = getQuerystringParameter(queryStrings.START_TYPE) === "fmg";
const toReturnUserPage = to.query?.fmgPage === fmgPageValues.RETURN_USER; const toReturnUserPage = to.query?.fmgPage === fmgPageValues.RETURN_USER;
log(" --fromReturnUser ", fromReturnUser);
log(" --to.query.fmgPage ", to.query?.fmgPage);
// Intercept all navigation if a submitted order exists in storage // Intercept all navigation if a submitted order exists in storage
if (window.sessionStorage.getItem("submittedOrder") !== null) { if (window.sessionStorage.getItem("submittedOrder") !== null) {
@ -103,9 +105,17 @@ const routes = [
!toReturnUserPage !toReturnUserPage
) { ) {
log(" --from content site navigate to return user"); log(" --from content site navigate to return user");
var qso = {
fmgPage: fmgPageValues.RETURN_USER,
};
const lg = getQuerystringParameter(queryStrings.LOG);
if (lg) {
qso[queryStrings.LOG] = true;
}
router.push({ router.push({
path: "/", path: "/",
query: { fmgPage: fmgPageValues.RETURN_USER }, query: Object.assign({}, qso),
}); });
return; return;
} }
@ -156,21 +166,27 @@ const routes = [
log(" --load session end"); log(" --load session end");
//Update external parameter state but not when returning from heritage //Update external parameter state but not when returning from heritage
if (!to.query.fmgPage?.startsWith("service-location")) { if (!to.query.fmgPage?.startsWith("service-location") && !fromReturnUser) {
updateExternalParameterState(); updateExternalParameterState();
} }
// clear part related state because heritage selected a new vehicle // clear part related state because heritage selected a new vehicle
if ( if (
to.query.fmgPage === fmgPageValues.VEHICLE && to.query.fmgPage === fmgPageValues.VEHICLE &&
eval(getFunnelCookie()?.HasDelayedClaimRegistration) eval(getFunnelCookie()?.HasDelayedClaimRegistration &&
!fromReturnUser)
) { ) {
store.commit(storeMutations.RESET_GLASS_PARTS_STATE); store.commit(storeMutations.RESET_GLASS_PARTS_STATE);
} }
// if coming from the return user page, clear the destination page so implicit navigation runs // if coming from the return user page, clear the destination page so implicit navigation runs
log(" --to.query ", JSON.stringify(to.query));
if (fromReturnUser && to.query) { if (fromReturnUser && to.query) {
to.query[queryStrings.FMG_PAGE] = ""; log( " --clear to.query");
delete to.query[queryStrings.FMG_PAGE];
//to.query[queryStrings.FMG_PAGE] = "";
log(" --to.query cleared ", JSON.stringify(to.query));
} }
const pageToRedirectTo = await getPageToRouteExistingOrderTo(to); const pageToRedirectTo = await getPageToRouteExistingOrderTo(to);
@ -550,7 +566,7 @@ async function navigate(
const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR); const pageError = getQuerystringParameter(queryStrings.PAGE_ERROR);
const logQs = getQuerystringParameter(queryStrings.LOG); const logQs = getQuerystringParameter(queryStrings.LOG);
baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, logQs, false); baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, logQs, false);
log("------------- router index.js navigate start -----------------"); log("------------- router index.js navigate start -----------------");
log(" --scenario: ", scenario); log(" --scenario: ", scenario);
log(" --isSavingNavigation: ", isSavingNavigation); log(" --isSavingNavigation: ", isSavingNavigation);
@ -614,6 +630,8 @@ function getNavigationMap(scenario, currentRoute) {
function log(message, data) { function log(message, data) {
const log = getQuerystringParameter(queryStrings.LOG); const log = getQuerystringParameter(queryStrings.LOG);
baseMixin.methods.dispatchStoreAction(storeActions.SAVE_LOGGING_OPTION, log, false);
data = data ?? ""; data = data ?? "";
const outData = typeof data === "object" ? JSON.stringify(data) : data; const outData = typeof data === "object" ? JSON.stringify(data) : data;