From b807d2563217058cd207534f4194de0442a247b5 Mon Sep 17 00:00:00 2001 From: parsa aghaei Date: Sun, 16 Aug 2026 18:32:49 +0330 Subject: [PATCH] fix: resolve admin orders re-fetching loop and update order confirmation SMS pattern args structure --- backend/src/common/services/sms.service.ts | 6 ++++-- backend/src/orders/orders.service.ts | 4 ++++ backend/src/payment/payment.service.ts | 11 ++++++++++- frontend/admin-panel/src/pages/Orders.tsx | 15 +++++++-------- .../admin-panel/src/pages/SmsSettingsPage.tsx | 2 +- 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/backend/src/common/services/sms.service.ts b/backend/src/common/services/sms.service.ts index 4d68f6d6..cd220b6c 100644 --- a/backend/src/common/services/sms.service.ts +++ b/backend/src/common/services/sms.service.ts @@ -345,7 +345,7 @@ export class SmsService { { id: config.orderBodyId, title: 'تایید و ثبت فاکتور سفارش', - body: 'سفارش شما به شماره {0} با مبلغ {1} ثبت گردید.', + body: '{0} عزیز ، سفارش شما به شماره {1} به مبلغ {2} با موفقیت ثبت شد.\nکنینا ایران', assigned: 'order', }, { @@ -874,14 +874,16 @@ export class SmsService { */ async sendOrderConfirmation( phone: string, + customerName: string, orderNumber: string, amount: string, ): Promise { const config = await this.getSmsConfig(); + const cleanName = (customerName || 'مشتری').trim(); return this.sendPatternSms({ to: phone, bodyId: config.orderBodyId, - args: [orderNumber, amount], + args: [cleanName, orderNumber, amount], type: 'ORDER_CONFIRMATION', }); } diff --git a/backend/src/orders/orders.service.ts b/backend/src/orders/orders.service.ts index fde0d52b..5bb2d886 100644 --- a/backend/src/orders/orders.service.ts +++ b/backend/src/orders/orders.service.ts @@ -242,9 +242,11 @@ export class OrdersService { // Send Order Confirmation SMS for wallet orders if (user.mobile) { + const customerName = user.firstName || 'مشتری'; this.smsService .sendOrderConfirmation( user.mobile, + customerName, trackingNumber, Number(finalAmount).toLocaleString('fa-IR'), ) @@ -288,9 +290,11 @@ export class OrdersService { where: { id: userId }, }); if (user?.mobile) { + const customerName = user.firstName || 'مشتری'; await this.smsService .sendOrderConfirmation( user.mobile, + customerName, trackingNumber, Number(finalAmount).toLocaleString('fa-IR'), ) diff --git a/backend/src/payment/payment.service.ts b/backend/src/payment/payment.service.ts index f7854610..87ebb1f1 100644 --- a/backend/src/payment/payment.service.ts +++ b/backend/src/payment/payment.service.ts @@ -491,9 +491,18 @@ export class PaymentService { const formattedAmount = Number(transaction.amount).toLocaleString( 'fa-IR', ); + const customerName = + transaction.user?.firstName || + transaction.order?.user?.firstName || + 'مشتری'; this.smsService - .sendOrderConfirmation(customerMobile, trackingNum, formattedAmount) + .sendOrderConfirmation( + customerMobile, + customerName, + trackingNum, + formattedAmount, + ) .catch((err) => { this.logger.warn(`Could not send SMS confirmation: ${err}`); }); diff --git a/frontend/admin-panel/src/pages/Orders.tsx b/frontend/admin-panel/src/pages/Orders.tsx index fcb34ed7..eb8d71db 100644 --- a/frontend/admin-panel/src/pages/Orders.tsx +++ b/frontend/admin-panel/src/pages/Orders.tsx @@ -118,20 +118,19 @@ export default function Orders() { setOrders(response.data.data); setTotalPages(response.data.meta?.lastPage || 1); - // Update selectedOrder if open - if (selectedOrder) { - const updated = response.data.data.find((o: Order) => o.id === selectedOrder.id); - if (updated) { - setSelectedOrder(updated); - } - } + // Update selectedOrder if open without causing re-fetch loop + setSelectedOrder((currentSelected) => { + if (!currentSelected) return null; + const updated = response.data.data.find((o: Order) => o.id === currentSelected.id); + return updated || currentSelected; + }); } } catch (err) { console.error('Failed to fetch orders', err); } finally { setIsLoading(false); } - }, [page, search, status, selectedOrder]); + }, [page, search, status]); useEffect(() => { const delayDebounceFn = setTimeout(() => { diff --git a/frontend/admin-panel/src/pages/SmsSettingsPage.tsx b/frontend/admin-panel/src/pages/SmsSettingsPage.tsx index 06f963ab..e85c1e69 100644 --- a/frontend/admin-panel/src/pages/SmsSettingsPage.tsx +++ b/frontend/admin-panel/src/pages/SmsSettingsPage.tsx @@ -1372,7 +1372,7 @@ export default function SmsSettingsPage() { required value={newPatternBody} onChange={(e) => setNewPatternBody(e.target.value)} - placeholder="کاربر گرامی، سفارش {0} با مبلغ {1} تومان در کنینا ثبت شد." + placeholder="{0} عزیز ، سفارش شما به شماره {1} به مبلغ {2} با موفقیت ثبت شد. کنینا ایران" className="w-full border border-gray-200 rounded-xl p-3 outline-none focus:ring-2 focus:ring-purple-500 text-sm font-medium leading-relaxed" />