From 64d5912a74de6884922bdde26e2f69d4ef0b07a7 Mon Sep 17 00:00:00 2001 From: Mojtaba-z Date: Wed, 26 Nov 2025 16:15:27 +0330 Subject: [PATCH] fix - transaction dashboard total amount / total weight --- .../services/transaction_dashboard_service.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/warehouse/services/transaction_dashboard_service.py b/apps/warehouse/services/transaction_dashboard_service.py index a3c9db6..fd2bfab 100644 --- a/apps/warehouse/services/transaction_dashboard_service.py +++ b/apps/warehouse/services/transaction_dashboard_service.py @@ -35,11 +35,17 @@ 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"), 0), - total_weight=Coalesce(Sum("weight"), 0), + total_amount=Coalesce(Sum("price_paid", filter=Q(transaction_status="success")), 0), unique_ranchers=Count("rancher", distinct=True), ) + transaction_stats['total_weight'] = items.aggregate( + total_weight=Coalesce(Sum( + "weight", + filter=Q(transaction__transaction_status="success") + ), 0) + )['total_weight'] + products_stats = items.values( product_id=Case( When(gov_product__isnull=False, then="gov_product_id"),