From abdf73bcb08a23c3a6b6d7e409c6bac84eddaf80 Mon Sep 17 00:00:00 2001 From: hosseintaromi Date: Wed, 1 Oct 2025 18:19:18 +0800 Subject: [PATCH] feat(orders): enhance OrderDetailPage UI and set default status in OrdersListPage --- .../orders/order-detail/OrderDetailPage.tsx | 71 ++++++++----------- .../orders/orders-list/OrdersListPage.tsx | 2 +- 2 files changed, 30 insertions(+), 43 deletions(-) diff --git a/src/pages/orders/order-detail/OrderDetailPage.tsx b/src/pages/orders/order-detail/OrderDetailPage.tsx index 39059d3..e595712 100644 --- a/src/pages/orders/order-detail/OrderDetailPage.tsx +++ b/src/pages/orders/order-detail/OrderDetailPage.tsx @@ -220,56 +220,43 @@ const OrderDetailPage = () => {
{order?.items && order.items.length > 0 ? ( -
-
-
محصول
-
تعداد
-
وزن (گرم)
-
قیمت واحد
-
جمع
-
+
{order.items.map((item) => { const baseWeight = (item.weight ?? 0) as number; const weightGr = Math.round(baseWeight * 1000); const formatFa = (n: number) => new Intl.NumberFormat('fa-IR').format(n); return ( -
-
-
-
- {item.product_name || `محصول شناسه: ${item.product_id}`} +
+
+
+
+
+ {item.product_name || `محصول شناسه: ${item.product_id}`} +
+
+ {item.product_variant_name || `واریانت شناسه: ${item.product_variant_id}`} +
-
- {item.product_variant_name || `واریانت شناسه: ${item.product_variant_id}`} +
+
جمع
+
{formatCurrency(item.total_price || 0)}
-
{formatFa(item.quantity || 0)}
-
{formatFa(weightGr)}
-
{formatCurrency(item.unit_price || 0)}
-
{formatCurrency(item.total_price || 0)}
-
-
-
- {item.product_name || `محصول شناسه: ${item.product_id}`} -
-
- {item.product_variant_name || `واریانت شناسه: ${item.product_variant_id}`} -
-
- تعداد - {formatFa(item.quantity || 0)} -
-
- وزن (گرم) - {formatFa(weightGr)} -
-
- قیمت واحد - {formatCurrency(item.unit_price || 0)} -
-
- جمع - {formatCurrency(item.total_price || 0)} +
+
+
تعداد
+
{formatFa(item.quantity || 0)}
+
+
+
وزن (گرم)
+
{formatFa(weightGr)}
+
+
+
+
قیمت واحد
+
{formatCurrency(item.unit_price || 0)}
+
+
diff --git a/src/pages/orders/orders-list/OrdersListPage.tsx b/src/pages/orders/orders-list/OrdersListPage.tsx index 218d8cd..6450923 100644 --- a/src/pages/orders/orders-list/OrdersListPage.tsx +++ b/src/pages/orders/orders-list/OrdersListPage.tsx @@ -67,7 +67,7 @@ const OrdersListPage = () => { page: 1, limit: 20, order_number: '', - status: undefined, + status: 'pending', payment_status: undefined, search: '', });