From 5d49e8aa169c1e9c5ab71abad2be7508bc3967f4 Mon Sep 17 00:00:00 2001 From: behruz-dev Date: Thu, 6 Nov 2025 16:09:12 +0500 Subject: [PATCH] fix --- core/apps/orders/views/party.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/core/apps/orders/views/party.py b/core/apps/orders/views/party.py index e9a2e4f..112e966 100644 --- a/core/apps/orders/views/party.py +++ b/core/apps/orders/views/party.py @@ -202,29 +202,31 @@ class PartyStatisticsApiView(generics.GenericAPIView): pagination_class = None def get(self, request): - qeryset = self.filter_queryset(self.queryset) + queryset = self.filter_queryset(self.queryset) today = now().date() - usd = qeryset.filter(currency='usd').aggregate( + + usd = queryset.filter(currency='usd').aggregate( total_price_usd=Sum('party_amount__total_price'), cost_amount_usd=Sum('party_amount__cost_amount'), calculated_amount_usd=Sum('party_amount__calculated_amount'), paid_amount_usd=Sum('party_amount__paid_amount'), payment_amount_usd=Sum('party_amount__payment_amount'), - overdue_payments=Sum( - 'party_amount__overdue_amount', - filter=Q(payment_date__lt=today) + overdue_payments_usd=Sum( + 'party_amount__payment_amount', + filter=Q(party_amount__payment_date__lt=today) ) ) - uzs = qeryset.filter(currency='uzs').aggregate( + + uzs = queryset.filter(currency='uzs').aggregate( total_price_uzs=Sum('party_amount__total_price'), cost_amount_uzs=Sum('party_amount__cost_amount'), calculated_amount_uzs=Sum('party_amount__calculated_amount'), paid_amount_uzs=Sum('party_amount__paid_amount'), payment_amount_uzs=Sum('party_amount__payment_amount'), - overdue_payments=Sum( - 'party_amount__overdue_amount', - filter=Q(payment_date__lt=today) - ) + overdue_payments_uzs=Sum( + 'party_amount__payment_amount', + filter=Q(party_amount__payment_date__lt=today) + ) ) res = { 'usd': usd,