From b527befe4acc8757e19ee28e7bdd5c411a8e18d0 Mon Sep 17 00:00:00 2001 From: parsa aghaei Date: Sun, 16 Aug 2026 18:20:46 +0330 Subject: [PATCH] fix: resolve wallet topup callback and verify flow, fix admin orders BigInt serialization 500 error, and fix reactive B2B settings toggle --- backend/src/main.ts | 5 ++ backend/src/payment/payment.controller.ts | 20 +++++ backend/src/payment/payment.service.ts | 8 +- backend/src/payment/zibal.service.ts | 25 ++++++ backend/src/settings/settings.service.ts | 58 +++++++++++++- frontend/application/app/ClientLayout.tsx | 3 +- .../application/app/payment/verify/page.tsx | 77 +++++++++++++++---- frontend/application/components/AuthModal.tsx | 3 +- frontend/application/components/Footer.tsx | 3 +- frontend/application/components/Header.tsx | 3 +- 10 files changed, 176 insertions(+), 29 deletions(-) diff --git a/backend/src/main.ts b/backend/src/main.ts index defcdccf..b3683f7a 100644 --- a/backend/src/main.ts +++ b/backend/src/main.ts @@ -9,6 +9,11 @@ import { PrismaExceptionFilter } from './common/filters/prisma-exception.filter' import { DecimalInterceptor } from './common/interceptors/decimal.interceptor'; import helmet from 'helmet'; +// Ensure BigInt can be serialized to JSON across all NestJS / Express responses +(BigInt.prototype as any).toJSON = function () { + return Number(this); +}; + async function bootstrap() { process.env.JWT_ACCESS_SECRET = process.env.JWT_ACCESS_SECRET || diff --git a/backend/src/payment/payment.controller.ts b/backend/src/payment/payment.controller.ts index b933bd7a..5095afd3 100644 --- a/backend/src/payment/payment.controller.ts +++ b/backend/src/payment/payment.controller.ts @@ -11,6 +11,7 @@ import { HttpStatus, Headers, Ip, + BadRequestException, } from '@nestjs/common'; import type { Request, Response } from 'express'; import { PaymentService } from './payment.service'; @@ -138,6 +139,25 @@ export class PaymentController { } } + @Get('zibal/verify') + @ApiOperation({ summary: 'استعلام و تایید تراکنش زیبال توسط کلاینت' }) + async verifyPaymentDirect( + @Query('trackId') trackId: string, + @Query('success') success?: string, + @Query('status') status?: string, + @Query('orderId') orderId?: string, + @Ip() ip?: string, + @Headers('user-agent') userAgent?: string, + ) { + if (!trackId) { + throw new BadRequestException('trackId is required'); + } + return this.paymentService.verifyAndProcess(trackId, success, status, orderId, { + ipAddress: ip, + userAgent, + }); + } + @Post('zibal/callback') @ApiOperation({ summary: 'دریافت وب‌هوک / کال‌بک لِیزی زیبال' }) async handleZibalLazyCallback( diff --git a/backend/src/payment/payment.service.ts b/backend/src/payment/payment.service.ts index 8d655954..f7854610 100644 --- a/backend/src/payment/payment.service.ts +++ b/backend/src/payment/payment.service.ts @@ -56,9 +56,9 @@ export class PaymentService { ); } - const frontendUrl = await this.zibalService.getFrontendUrl(); + const backendUrl = await this.zibalService.getBackendUrl(); const callbackUrl = - customCallbackUrl || `${frontendUrl}/payment/verify?orderId=${order.id}`; + customCallbackUrl || `${backendUrl}/payment/zibal/callback?orderId=${order.id}`; const requestPayload = { amountRials, @@ -151,9 +151,9 @@ export class PaymentService { } const amountRials = Math.round(amountTomans * 10); - const frontendUrl = await this.zibalService.getFrontendUrl(); + const backendUrl = await this.zibalService.getBackendUrl(); const callbackUrl = - customCallbackUrl || `${frontendUrl}/payment/verify?type=wallet`; + customCallbackUrl || `${backendUrl}/payment/zibal/callback?type=WALLET_TOPUP`; const requestPayload = { amountRials, diff --git a/backend/src/payment/zibal.service.ts b/backend/src/payment/zibal.service.ts index 6334157b..4632d8ba 100644 --- a/backend/src/payment/zibal.service.ts +++ b/backend/src/payment/zibal.service.ts @@ -122,6 +122,31 @@ export class ZibalService implements IPaymentGateway { return envUrl ? envUrl.replace(/\/+$/, '') : 'https://canina.ir'; } + /** + * Retrieves base backend API URL for Zibal callbacks + */ + async getBackendUrl(): Promise { + try { + const setting = await this.prisma.uiText.findUnique({ + where: { key: 'BACKEND_URL' }, + }); + if (setting && setting.value && setting.value.trim() !== '') { + return setting.value.trim().replace(/\/+$/, ''); + } + } catch (e) { + this.logger.warn(`Could not read BACKEND_URL from db: ${e}`); + } + + const envUrl = process.env.BACKEND_URL || process.env.API_URL; + if (envUrl) return envUrl.replace(/\/+$/, ''); + + const frontendUrl = await this.getFrontendUrl(); + if (frontendUrl.includes('stage')) { + return 'https://stageapi.canina.ir/api'; + } + return 'https://api.canina.ir/api'; + } + /** * 1. Request Payment (درخواست پرداخت با قابلیت Retry) * Amount must be in Rials. diff --git a/backend/src/settings/settings.service.ts b/backend/src/settings/settings.service.ts index bca01acd..66e3bc2e 100644 --- a/backend/src/settings/settings.service.ts +++ b/backend/src/settings/settings.service.ts @@ -22,14 +22,40 @@ export class SettingsService { this.prisma.setting.findMany(), ]); - const merged = [...uiTexts]; + const mergedMap = new Map(); + + // 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).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; + const promises: Promise[] = []; + 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() { diff --git a/frontend/application/app/ClientLayout.tsx b/frontend/application/app/ClientLayout.tsx index c4f3212c..f4ac3984 100644 --- a/frontend/application/app/ClientLayout.tsx +++ b/frontend/application/app/ClientLayout.tsx @@ -38,6 +38,7 @@ export default function ClientLayout({ children }: { children: React.ReactNode } const fetchSettings = useSettingsStore((state) => state.fetchSettings); const getText = useSettingsStore((state) => state.getText); + const isB2BEnabled = useSettingsStore((state) => state.getBoolean('b2bRegistrationOpen', true) && state.getBoolean('b2b_enabled', true)); useEffect(() => { fetchSettings(); @@ -105,7 +106,7 @@ export default function ClientLayout({ children }: { children: React.ReactNode }