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:21:44 +05:00
parent 2e3b76d33f
commit 75a71235a7
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,9 +233,15 @@ 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 = 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_expence_usd = expence_by_currency.get('usd', {}).get('total', 0)
balance_usd = total_income_usd - total_expence_usd
data = { data = {
'counterparty': { 'counterparty': {
@@ -245,16 +251,19 @@ class CounterPartyIncomeExpenceStatisticsApiView(views.APIView):
'income': { 'income': {
'by_currency': income_by_currency, 'by_currency': income_by_currency,
'total_uzs': total_income_uzs, 'total_uzs': total_income_uzs,
'total_usd': total_income_usd,
'total_count': sum(data['count'] for data in income_by_currency.values()) 'total_count': sum(data['count'] for data in income_by_currency.values())
}, },
'expence': { 'expence': {
'by_currency': expence_by_currency, 'by_currency': expence_by_currency,
'total_uzs': total_expence_uzs, 'total_uzs': total_expence_uzs,
'total_usd': total_expence_usd,
'total_count': sum(data['count'] for data in expence_by_currency.values()) 'total_count': sum(data['count'] for data in expence_by_currency.values())
}, },
'balance': { 'balance': {
'uzs': balance, 'uzs': balance_uzs,
'status': 'positive' if balance > 0 else 'negative' if balance < 0 else 'zero' 'usd': balance_usd,
'status': 'positive' if balance_uzs > 0 else 'negative' if balance_uzs < 0 else 'zero'
} }
} }