This commit is contained in:
behruz-dev
2025-11-14 15:33:43 +05:00
parent 5337656005
commit bac0040672

View File

@@ -284,10 +284,10 @@ class CounterpartyAKTApiView(views.APIView):
currency = request.query_params.get('currency', 'uzs')
counterparty = get_object_or_404(Counterparty, id=id)
parties = Party.objects.filter(
parties = Party.objects.prefetch_related('orders', 'orders__product').filter(
orders__counterparty=counterparty, is_deleted=False, process=100, payment_percentage=100
).distinct().order_by('-created_at')
expences = Expence.objects.filter(counterparty=counterparty, is_deleted=False).distinct().order_by('-created_at')
expences = Expence.objects.select_related().filter(counterparty=counterparty, is_deleted=False).distinct().order_by('-created_at')
incomes = Income.objects.filter(counterparty=counterparty, is_deleted=False).distinct().order_by('-created_at')
# TODO: date va end date boyicha filter
@@ -346,7 +346,7 @@ class CounterpartyAKTApiView(views.APIView):
return Response(response, status=200)
def _group_by_date(self, parties, expences, incomes):
def _group_by_date(self, parties, incomes, expences):
daily_data = defaultdict(lambda: {
'parties': [],
'expences': [],