fi
This commit is contained in:
@@ -284,10 +284,10 @@ class CounterpartyAKTApiView(views.APIView):
|
|||||||
currency = request.query_params.get('currency', 'uzs')
|
currency = request.query_params.get('currency', 'uzs')
|
||||||
|
|
||||||
counterparty = get_object_or_404(Counterparty, id=id)
|
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
|
orders__counterparty=counterparty, is_deleted=False, process=100, payment_percentage=100
|
||||||
).distinct().order_by('-created_at')
|
).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')
|
incomes = Income.objects.filter(counterparty=counterparty, is_deleted=False).distinct().order_by('-created_at')
|
||||||
|
|
||||||
# TODO: date va end date boyicha filter
|
# TODO: date va end date boyicha filter
|
||||||
@@ -346,7 +346,7 @@ class CounterpartyAKTApiView(views.APIView):
|
|||||||
|
|
||||||
return Response(response, status=200)
|
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: {
|
daily_data = defaultdict(lambda: {
|
||||||
'parties': [],
|
'parties': [],
|
||||||
'expences': [],
|
'expences': [],
|
||||||
|
|||||||
Reference in New Issue
Block a user