fix
This commit is contained in:
@@ -202,29 +202,31 @@ class PartyStatisticsApiView(generics.GenericAPIView):
|
|||||||
pagination_class = None
|
pagination_class = None
|
||||||
|
|
||||||
def get(self, request):
|
def get(self, request):
|
||||||
qeryset = self.filter_queryset(self.queryset)
|
queryset = self.filter_queryset(self.queryset)
|
||||||
today = now().date()
|
today = now().date()
|
||||||
usd = qeryset.filter(currency='usd').aggregate(
|
|
||||||
|
usd = queryset.filter(currency='usd').aggregate(
|
||||||
total_price_usd=Sum('party_amount__total_price'),
|
total_price_usd=Sum('party_amount__total_price'),
|
||||||
cost_amount_usd=Sum('party_amount__cost_amount'),
|
cost_amount_usd=Sum('party_amount__cost_amount'),
|
||||||
calculated_amount_usd=Sum('party_amount__calculated_amount'),
|
calculated_amount_usd=Sum('party_amount__calculated_amount'),
|
||||||
paid_amount_usd=Sum('party_amount__paid_amount'),
|
paid_amount_usd=Sum('party_amount__paid_amount'),
|
||||||
payment_amount_usd=Sum('party_amount__payment_amount'),
|
payment_amount_usd=Sum('party_amount__payment_amount'),
|
||||||
overdue_payments=Sum(
|
overdue_payments_usd=Sum(
|
||||||
'party_amount__overdue_amount',
|
'party_amount__payment_amount',
|
||||||
filter=Q(payment_date__lt=today)
|
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'),
|
total_price_uzs=Sum('party_amount__total_price'),
|
||||||
cost_amount_uzs=Sum('party_amount__cost_amount'),
|
cost_amount_uzs=Sum('party_amount__cost_amount'),
|
||||||
calculated_amount_uzs=Sum('party_amount__calculated_amount'),
|
calculated_amount_uzs=Sum('party_amount__calculated_amount'),
|
||||||
paid_amount_uzs=Sum('party_amount__paid_amount'),
|
paid_amount_uzs=Sum('party_amount__paid_amount'),
|
||||||
payment_amount_uzs=Sum('party_amount__payment_amount'),
|
payment_amount_uzs=Sum('party_amount__payment_amount'),
|
||||||
overdue_payments=Sum(
|
overdue_payments_uzs=Sum(
|
||||||
'party_amount__overdue_amount',
|
'party_amount__payment_amount',
|
||||||
filter=Q(payment_date__lt=today)
|
filter=Q(party_amount__payment_date__lt=today)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
res = {
|
res = {
|
||||||
'usd': usd,
|
'usd': usd,
|
||||||
|
|||||||
Reference in New Issue
Block a user