Skip to content

fix(storefront): Fix loyalty points not showing at checkout when store has discount preset #805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leomp12 merged 3 commits into from
Aug 8, 2026
Merged

fix(storefront): Fix loyalty points not showing at checkout when store has discount preset #805

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c1fdb5
fix(storefront): Fix loyalty points not showing at checkout when stor…
vitorrgg Aug 5, 2026
eda8ad0
fix(storefront): Prevent discount and free shipping info from vanishi…
leomp12 Aug 7, 2026
1bd5eba
fix(storefront): Stop preset from skipping the modules API request
leomp12 Aug 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 38 additions & 8 deletions packages/storefront/src/lib/state/modules-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,18 @@ const modulesInfo = reactive<{
available_extra_discount?: ApplyDiscountResponse['available_extra_discount'],
},
}>(emptyInfo);
const infoPreset: { [modName: string]: Record<string, any> } = {};
loadingGlobalInfoPreset.then((modulesInfoPreset) => {
Object.assign(modulesInfo, modulesInfoPreset);
// Copied and gap filled: must not alias (and later empty)
// `window.$storefront.modulesInfoPreset`, nor override persisted info
Object.keys(modulesInfoPreset).forEach((modName) => {
infoPreset[modName] = { ...modulesInfoPreset[modName] };
Object.keys(infoPreset[modName]).forEach((field) => {
if (modulesInfo[modName][field] === undefined) {
modulesInfo[modName][field] = infoPreset[modName][field];
}
});
});
});
const modulesInfoEmitter = mitt();

Expand Down Expand Up @@ -63,12 +73,17 @@ export const fetchModule: FetchModule = (modName, reqOptions) => {

if (!import.meta.env.SSR) {
const storageKey = 'MODULES_INFO';
const fetchedModules = new Set<ModuleApiEndpoint>();
const sessionJson = sessionStorage.getItem(storageKey);
if (sessionJson) {
try {
const persistedValue = JSON.parse(sessionJson);
if (persistedValue.__timestamp >= Date.now() - 1000 * 60 * 5) {
delete persistedValue.__timestamp;
if (Array.isArray(persistedValue.__fetched)) {
persistedValue.__fetched.forEach((modName) => fetchedModules.add(modName));
}
delete persistedValue.__fetched;
Object.assign(modulesInfo, persistedValue);
} else {
sessionStorage.removeItem(storageKey);
Expand All @@ -81,11 +96,18 @@ if (!import.meta.env.SSR) {
const fetchInfo = () => {
const modulesToFetch: { modName: ModuleApiEndpoint, reqOptions?: any }[] = [];
(['list_payments', 'calculate_shipping'] as const).forEach((modName) => {
if (!Object.keys(modulesInfo[modName]).length) {
modulesToFetch.push({ modName });
} else {
const isInfoSet = Object.keys(modulesInfo[modName]).length > 0;
if (isInfoSet) {
modulesInfoEmitter.emit(modName, modulesInfo[modName]);
}
// Preset covers `calculate_shipping` (single field), but `list_payments`
// may still miss `loyalty_points_programs` and others
const canSkipRequest = modName === 'calculate_shipping'
? isInfoSet
: fetchedModules.has(modName);
if (!canSkipRequest) {
modulesToFetch.push({ modName });
}
});
if (Object.keys(utm).length || sessionCoupon) {
const { apiContext } = globalThis.$storefront;
Expand Down Expand Up @@ -120,9 +142,6 @@ if (!import.meta.env.SSR) {
fetchModule(modName, reqOptions)
.then(async (response) => {
if (response.ok) {
Object.keys(modulesInfo[modName]).forEach((key) => {
delete modulesInfo[modName][key];
});
const modInfo = {};
const { result } = await response.json();
if (Array.isArray(result)) {
Expand Down Expand Up @@ -184,10 +203,21 @@ if (!import.meta.env.SSR) {
}
});
}
Object.assign(modulesInfo[modName], modInfo);
// Preset must survive a response missing the field (app error)
const nextInfo = { ...infoPreset[modName], ...modInfo };
Object.keys(modulesInfo[modName]).forEach((key) => {
if (nextInfo[key] === undefined) {
delete modulesInfo[modName][key];
}
});
Object.assign(modulesInfo[modName], nextInfo);
if (Object.keys(modInfo).length) {
fetchedModules.add(modName);
}
sessionStorage.setItem(storageKey, JSON.stringify({
...modulesInfo,
__timestamp: Date.now(),
__fetched: [...fetchedModules],
}));
modulesInfoEmitter.emit(modName, modulesInfo[modName]);
}
Expand Down