xoliqberdiyev/ibapp-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
behruz-dev
2025-11-06 10:27:13 +05:00
parent 75a71235a7
commit fb7806d612
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/apps/counterparty/views/counterparty.py
View File

@@ -192,20 +192,17 @@ class CounterPartyIncomeExpenceStatisticsApiView(views.APIView):
counterparty=counterparty, counterparty=counterparty,
is_deleted=False, is_deleted=False,
) )
income_by_currency = {}
expence_by_currency = {}
income_by_currency = {
'uzs': {'total': 0, 'count': 0, 'amount_uzs': 0},
'usd': {'total': 0, 'count': 0, 'amount_uzs': 0}
}
for income in incomes: for income in incomes:
currency = income.currency currency = income.currency
amount = income.price amount = income.price
if currency not in income_by_currency:
income_by_currency[currency] = {
'total': 0,
'count': 0,
'amount_uzs': 0
}
income_by_currency[currency]['total'] += amount income_by_currency[currency]['total'] += amount
income_by_currency[currency]['count'] += 1 income_by_currency[currency]['count'] += 1
@@ -214,17 +211,15 @@ class CounterPartyIncomeExpenceStatisticsApiView(views.APIView):
else: else:
income_by_currency[currency]['amount_uzs'] += amount income_by_currency[currency]['amount_uzs'] += amount
expence_by_currency = {
'uzs': {'total': 0, 'count': 0, 'amount_uzs': 0},
'usd': {'total': 0, 'count': 0, 'amount_uzs': 0}
}
for expence in expences: for expence in expences:
currency = expence.currency currency = expence.currency
amount = expence.price amount = expence.price
if currency not in expence_by_currency:
expence_by_currency[currency] = {
'total': 0,
'count': 0,
'amount_uzs': 0
}
expence_by_currency[currency]['total'] += amount expence_by_currency[currency]['total'] += amount
expence_by_currency[currency]['count'] += 1 expence_by_currency[currency]['count'] += 1
@@ -233,12 +228,10 @@ class CounterPartyIncomeExpenceStatisticsApiView(views.APIView):
else: else:
expence_by_currency[currency]['amount_uzs'] += amount expence_by_currency[currency]['amount_uzs'] += amount
# UZS bo'yicha jami
total_income_uzs = sum(data['amount_uzs'] for data in income_by_currency.values()) total_income_uzs = sum(data['amount_uzs'] for data in income_by_currency.values())
total_expence_uzs = sum(data['amount_uzs'] for data in expence_by_currency.values()) total_expence_uzs = sum(data['amount_uzs'] for data in expence_by_currency.values())
balance_uzs = total_income_uzs - total_expence_uzs balance_uzs = total_income_uzs - total_expence_uzs
# USD bo'yicha jami
total_income_usd = income_by_currency.get('usd', {}).get('total', 0) total_income_usd = income_by_currency.get('usd', {}).get('total', 0)
total_expence_usd = expence_by_currency.get('usd', {}).get('total', 0) total_expence_usd = expence_by_currency.get('usd', {}).get('total', 0)
balance_usd = total_income_usd - total_expence_usd balance_usd = total_income_usd - total_expence_usd