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

Merge pull request #2862 from Safelite/feature/CASH-1338

Browse source 
CASH-1338: fix instances where wrong pageName is set and/or pass in pageName var
This commit is contained in:
AdamCaouetteSafelite 2025-09-22 14:58:01 -04:00 committed by GitHub
commit d1bbcfa387
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 37 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/layouts/schedule/schedule.vue
View file

@ -497,14 +497,14 @@ export default {
);
const serviceZipCode = store.getters.order.serviceLocation.zipCode;
const zipCodeDataPromise = getZipCodeData(serviceZipCode);
const zipCodeDataPromise = getZipCodeData(serviceZipCode, to.name);
const serviceabilityDetailsPromise = getServiceabilityDetails(
serviceZipCode,
null,
"service-location"
to.name
);
const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode, "service-location");
const shopProviderData = await getShopProviderData(serviceZipCode);
const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode, to.name);
const shopProviderData = await getShopProviderData(serviceZipCode, to.name);
const providerNumber = shopProviderData?.data?.shopProviders[0]?.providerNumber;
// Get pricingByDayUpcharge needed for Pricing By Day
@ -515,7 +515,7 @@ export default {
const premiumFeePromise = baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.GET_MOBILE_PREMIUM_FEE,
null,
"schedule"
to.name
);
const premiumFeeWithPricePromise = premiumFeePromise.then((result) => {
if (result.data) {
@ -524,7 +524,7 @@ export default {
{
availableLineItems: [result.data],
},
"schedule",
to.name,
false
);
} else {
@ -1305,7 +1305,7 @@ export default {
) {
navigateToHeritageFunnel({
shouldSaveSession: false,
pageNameToLog: "service-location",
pageNameToLog: this.pageName,
navType: "back",
});
} else {
@ -1630,7 +1630,7 @@ export default {
handleZipCodeChange(newZipCode) {
this.resetMobileLocation();
getShopProviderData(newZipCode.zipCode).then((result) => {
getShopProviderData(newZipCode.zipCode, this.pageName).then((result) => {
this.shopProviderData = result.data;
this.resetSelectedProvider();
this.state = newZipCode.state;

18
src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
View file

@ -7,8 +7,8 @@ export async function getPricedMobileFeePart(serviceZipCode, pageNameToLog) {
return null;
}
const zipCodeData = await getZipCodeData(serviceZipCode);
const providerData = await getShopProviderData(serviceZipCode);
const zipCodeData = await getZipCodeData(serviceZipCode, pageNameToLog);
const providerData = await getShopProviderData(serviceZipCode, pageNameToLog);
// Get the Mobile Fee Part
const mobileFeePart = await baseMixin.methods.dispatchStoreActionWithLogging(
@ -50,7 +50,7 @@ export async function getPricedRecycleFeePart(serviceZipCode, pageNameToLog) {
return null;
}
const zipCodeData = await getZipCodeData(serviceZipCode);
const zipCodeData = await getZipCodeData(serviceZipCode, pageNameToLog);
// Get supporting items
const supportingItems = await baseMixin.methods.dispatchStoreActionWithLogging(
@ -102,23 +102,23 @@ export async function getServiceabilityDetails(serviceZipCode, lineItems, pageNa
);
}
export async function getBillToAccountNumber(providerNumber) {
export async function getBillToAccountNumber(providerNumber, pageNameToLog) {
// Get the BillTo Account Number
return await baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.GET_BILL_TO_ACCOUNT_NUMBER,
{ providerNumber: providerNumber },
"service-location",
pageNameToLog,
false
);
}
export async function getShopProviderData(serviceZipCode) {
export async function getShopProviderData(serviceZipCode, pageNameToLog) {
return await baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.GET_PROVIDERS,
{
serviceZipCode: serviceZipCode,
},
"service-location"
pageNameToLog
);
}
@ -139,6 +139,6 @@ export async function getClosestApplicableShops(serviceZipCode, carId, pageNameT
return closestShops.data;
}
export async function getZipCodeData(serviceZipCode) {
return await baseMixin.methods.getZipCodeData(serviceZipCode, "service-location");
export async function getZipCodeData(serviceZipCode, pageNameToLog) {
return await baseMixin.methods.getZipCodeData(serviceZipCode, pageNameToLog);
}

18
src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
View file

@ -193,8 +193,7 @@ export default {
return;
}
const zipCodeData = await this.getZipCodeData(
this.internalModel.addressQuestions.zipCode,
"service-location"
this.internalModel.addressQuestions.zipCode
);
if (!zipCodeData.isValid) {
@ -216,26 +215,21 @@ export default {
// retrieve mobile fee part
const serviceZipCode = this.internalModel.addressQuestions.zipCode;
const mobileFeePart = await getPricedMobileFeePart(
serviceZipCode,
"service-location"
);
const mobileFeePart = await getPricedMobileFeePart(serviceZipCode, this.pageName);
// retrieve recycle fee part
const recycleFeePart = await getPricedRecycleFeePart(
serviceZipCode,
"service-location"
);
const recycleFeePart = await getPricedRecycleFeePart(serviceZipCode, this.pageName);
// retrieve serviceability details
const serviceabilityDetails = await getServiceabilityDetails(
serviceZipCode,
null,
"service-location"
this.pageName
);
const billToAccountNumber = await getBillToAccountNumber(
this.internalModel.zipCodeCtu
this.internalModel.zipCodeCtu,
this.pageName
);
// update content related to service zip code

10
src/layouts/service-location/service-location.vue
View file

@ -226,17 +226,17 @@ export default {
const cmsContentPromise = fetchCmsContentForPage(to.name);
const serviceZipCode = store.getters.order.serviceLocation.zipCode;
const zipCodeDataPromise = getZipCodeData(serviceZipCode);
const zipCodeDataPromise = getZipCodeData(serviceZipCode, to.name);
const serviceabilityDetailsPromise = getServiceabilityDetails(
serviceZipCode,
null,
"service-location"
to.name
);
const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode, "service-location");
const mobileFeePartPromise = getPricedMobileFeePart(serviceZipCode, to.name);
const shopProviderDataPromise = getShopProviderData(serviceZipCode); // shopQuestion.methods.loadInitialData(serviceZipCode);
const shopProviderDataPromise = getShopProviderData(serviceZipCode, to.name); // shopQuestion.methods.loadInitialData(serviceZipCode);
// Settle promises and get results
const promiseResultMap = [
@ -846,7 +846,7 @@ export default {
zipCode: {
handler(newValue) {
if (!this.navigatingForward) {
getShopProviderData(this.zipCode).then(async (result) => {
getShopProviderData(this.zipCode, this.pageName).then(async (result) => {
this.shopProviderData = result.data;
if (this.selectedAppointmentType === "Mobile") {
this.selectedProvider = new Provider(

13
src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
View file

@ -162,7 +162,7 @@ export default {
const zipCodeData = await this.getZipCodeData(
this.internalModel.zipCode,
"service-location"
this.pageName
);
if (!zipCodeData.isValid) {
@ -175,7 +175,7 @@ export default {
const closestShops = await getClosestApplicableShops(
this.internalModel.zipCode,
this.carId,
"service-location"
this.pageName
);
if (!closestShops || closestShops.inShopProviders?.length === 0) {
@ -193,24 +193,25 @@ export default {
const serviceZipCode = this.internalModel.zipCode;
const mobileFeePart = await getPricedMobileFeePart(
serviceZipCode,
"service-location"
this.pageName
);
// retrieve recycle fee part
const recycleFeePart = await getPricedRecycleFeePart(
serviceZipCode,
"service-location"
this.pageName
);
// retrieve serviceability details
const serviceabilityDetails = await getServiceabilityDetails(
serviceZipCode,
null,
"service-location"
this.pageName
);
const billToAccountNumber = await getBillToAccountNumber(
this.internalModel.zipCodeCtu
this.internalModel.zipCodeCtu,
this.pageName
);
// update content related to service zip code

4
src/layouts/service-location/shop-question/shop-question-popup.vue
View file

@ -280,7 +280,7 @@ export default {
}
this.isLoading = true;
this.zipCodeData = await this.getZipCodeData(this.localZipCode, "service-location");
this.zipCodeData = await this.getZipCodeData(this.localZipCode, this.pageName);
// Add zipCode to zipCodeData as it does not come back from endpoint
this.zipCodeData.zipCode = this.localZipCode;
if (this.zipCodeData.isValid) {
@ -289,7 +289,7 @@ export default {
const closestShops = await getClosestApplicableShops(
this.localZipCode,
this.$store.getters.order.vehicle.carId,
"service-location"
this.pageName
);
if (!closestShops || closestShops.inShopProviders?.length === 0) {
this.isLoading = false;