From 111a44d1f9ec0fdd7179593637dee7dada3f14e8 Mon Sep 17 00:00:00 2001 From: Mojtaba-z Date: Sat, 29 Nov 2025 12:31:59 +0330 Subject: [PATCH] fix - transaction dashboard items filter v2 --- apps/warehouse/services/transaction_dashboard_service.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/warehouse/services/transaction_dashboard_service.py b/apps/warehouse/services/transaction_dashboard_service.py index c8de24f..750356f 100644 --- a/apps/warehouse/services/transaction_dashboard_service.py +++ b/apps/warehouse/services/transaction_dashboard_service.py @@ -57,14 +57,18 @@ class TransactionDashboardService: success_transactions=Count("id", filter=Q(transaction_status="success")), failed_transactions=Count("id", filter=Q(transaction_status="failed")), waiting_transactions=Count("id", filter=Q(transaction_status="waiting")), - total_amount=Coalesce(Sum("price_paid", filter=Q(transaction_status="success")), 0), + total_amount=Coalesce( + Sum( + "price_paid", filter=Q(transaction_status='success' if not status else status) + ), 0 + ), unique_ranchers=Count("rancher", distinct=True), ) transaction_stats['total_weight'] = items.aggregate( total_weight=Coalesce(Sum( "weight", - filter=Q(transaction__transaction_status="success") + filter=Q(transaction__transaction_status="success" if not status else status) ), 0) )['total_weight']