fix - transaction dashboard total amount / total weight
This commit is contained in:
@@ -35,11 +35,17 @@ class TransactionDashboardService:
|
|||||||
success_transactions=Count("id", filter=Q(transaction_status="success")),
|
success_transactions=Count("id", filter=Q(transaction_status="success")),
|
||||||
failed_transactions=Count("id", filter=Q(transaction_status="failed")),
|
failed_transactions=Count("id", filter=Q(transaction_status="failed")),
|
||||||
waiting_transactions=Count("id", filter=Q(transaction_status="waiting")),
|
waiting_transactions=Count("id", filter=Q(transaction_status="waiting")),
|
||||||
total_amount=Coalesce(Sum("price_paid"), 0),
|
total_amount=Coalesce(Sum("price_paid", filter=Q(transaction_status="success")), 0),
|
||||||
total_weight=Coalesce(Sum("weight"), 0),
|
|
||||||
unique_ranchers=Count("rancher", distinct=True),
|
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(
|
products_stats = items.values(
|
||||||
product_id=Case(
|
product_id=Case(
|
||||||
When(gov_product__isnull=False, then="gov_product_id"),
|
When(gov_product__isnull=False, then="gov_product_id"),
|
||||||
|
|||||||
Reference in New Issue
Block a user