fix: resolve wallet topup callback and verify flow, fix admin orders BigInt serialization 500 error, and fix reactive B2B settings toggle
Deploy Canina / deploy (push) Successful in 1m41s
Deploy Canina / deploy (push) Successful in 1m41s
This commit is contained in:
1 parent
42707c04cf
commit
b527befe4a
10 files changed
+176
-29
No files matched your search
@@ -22,14 +22,40 @@ export class SettingsService {
|
||||
this.prisma.setting.findMany(),
|
||||
]);
|
||||
|
||||
const merged = [...uiTexts];
|
||||
const mergedMap = new Map<string, string>();
|
||||
|
||||
// 1. Add all from uiTexts
|
||||
uiTexts.forEach((u) => {
|
||||
mergedMap.set(u.key, u.value);
|
||||
});
|
||||
|
||||
// 2. Add from settings and unpack object keys
|
||||
settings.forEach((s) => {
|
||||
const valStr =
|
||||
typeof s.value === 'string' ? s.value : JSON.stringify(s.value);
|
||||
merged.push({ key: s.key, value: valStr });
|
||||
mergedMap.set(s.key, valStr);
|
||||
|
||||
if (
|
||||
typeof s.value === 'object' &&
|
||||
s.value !== null &&
|
||||
!Array.isArray(s.value)
|
||||
) {
|
||||
Object.entries(s.value as Record<string, any>).forEach(([k, v]) => {
|
||||
mergedMap.set(k, String(v));
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
return merged;
|
||||
// If b2bRegistrationOpen is set, sync b2b_enabled
|
||||
if (mergedMap.has('b2bRegistrationOpen')) {
|
||||
const val = mergedMap.get('b2bRegistrationOpen')!;
|
||||
mergedMap.set('b2b_enabled', val);
|
||||
}
|
||||
|
||||
return Array.from(mergedMap.entries()).map(([key, value]) => ({
|
||||
key,
|
||||
value,
|
||||
}));
|
||||
}
|
||||
|
||||
async updateUiText(key: string, value: string) {
|
||||
@@ -80,11 +106,35 @@ export class SettingsService {
|
||||
|
||||
async updateCategorySetting(category: string, value: Prisma.InputJsonValue) {
|
||||
const key = `${category}_config`;
|
||||
return this.prisma.setting.upsert({
|
||||
const res = await this.prisma.setting.upsert({
|
||||
where: { key },
|
||||
update: { category, value },
|
||||
create: { key, category, value },
|
||||
});
|
||||
|
||||
// If system config is updated, also sync individual keys into uiText for fast & reliable lookup
|
||||
if (category === 'system' && typeof value === 'object' && value !== null) {
|
||||
const obj = value as Record<string, any>;
|
||||
const promises: Promise<any>[] = [];
|
||||
if ('b2bRegistrationOpen' in obj) {
|
||||
const valStr = String(obj.b2bRegistrationOpen);
|
||||
promises.push(
|
||||
this.prisma.uiText.upsert({
|
||||
where: { key: 'b2bRegistrationOpen' },
|
||||
update: { value: valStr },
|
||||
create: { key: 'b2bRegistrationOpen', value: valStr },
|
||||
}),
|
||||
this.prisma.uiText.upsert({
|
||||
where: { key: 'b2b_enabled' },
|
||||
update: { value: valStr },
|
||||
create: { key: 'b2b_enabled', value: valStr },
|
||||
}),
|
||||
);
|
||||
}
|
||||
await Promise.all(promises);
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
async getSmsSettings() {
|
||||
|
||||
Reference in new issue
Block a user