From 919ce8684f995798a9e203a68fc1b4536f4fb33a Mon Sep 17 00:00:00 2001 From: dwindown Date: Tue, 4 Nov 2025 18:57:28 +0700 Subject: [PATCH] fix: Use real data for conversion rate and hide low stock alert when zero --- admin-spa/src/routes/Dashboard/index.tsx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/admin-spa/src/routes/Dashboard/index.tsx b/admin-spa/src/routes/Dashboard/index.tsx index afdc386..e7c2ab6 100644 --- a/admin-spa/src/routes/Dashboard/index.tsx +++ b/admin-spa/src/routes/Dashboard/index.tsx @@ -203,7 +203,7 @@ export default function Dashboard() { revenue: { current: currentRevenue, change: undefined }, orders: { current: currentOrders, change: undefined }, avgOrderValue: { current: currentOrders > 0 ? currentRevenue / currentOrders : 0, change: undefined }, - conversionRate: { current: DUMMY_DATA.metrics.conversionRate.today, change: undefined }, + conversionRate: { current: data?.metrics?.conversionRate?.today ?? 0, change: undefined }, }; } @@ -215,10 +215,9 @@ export default function Dashboard() { const currentOrders = currentData.reduce((sum: number, d: any) => sum + d.orders, 0); const previousOrders = previousData.reduce((sum: number, d: any) => sum + d.orders, 0); - // Calculate conversion rate from period data (simplified) - const factor = Number(period) / 30; - const currentConversionRate = DUMMY_DATA.metrics.conversionRate.today * factor; - const previousConversionRate = DUMMY_DATA.metrics.conversionRate.yesterday * factor; + // Get conversion rate from real API data + const currentConversionRate = data?.metrics?.conversionRate?.today ?? 0; + const previousConversionRate = data?.metrics?.conversionRate?.yesterday ?? 0; return { revenue: { @@ -325,14 +324,14 @@ export default function Dashboard() { {/* Low Stock Alert Banner */} - {DUMMY_DATA.lowStock.length > 0 && ( + {(data?.lowStock?.length ?? 0) > 0 && (
- {DUMMY_DATA.lowStock.length} {__('products need attention')} + {data?.lowStock?.length ?? 0} {__('products need attention')} {__('Stock levels are running low')}