diff --git a/core/apps/counterparty/views/counterparty.py b/core/apps/counterparty/views/counterparty.py index a40d948..0f47ce8 100644 --- a/core/apps/counterparty/views/counterparty.py +++ b/core/apps/counterparty/views/counterparty.py @@ -233,9 +233,15 @@ class CounterPartyIncomeExpenceStatisticsApiView(views.APIView): else: 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_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 = { 'counterparty': { @@ -245,17 +251,20 @@ class CounterPartyIncomeExpenceStatisticsApiView(views.APIView): 'income': { 'by_currency': income_by_currency, 'total_uzs': total_income_uzs, + 'total_usd': total_income_usd, 'total_count': sum(data['count'] for data in income_by_currency.values()) }, 'expence': { 'by_currency': expence_by_currency, 'total_uzs': total_expence_uzs, + 'total_usd': total_expence_usd, 'total_count': sum(data['count'] for data in expence_by_currency.values()) }, 'balance': { - 'uzs': balance, - 'status': 'positive' if balance > 0 else 'negative' if balance < 0 else 'zero' + 'uzs': balance_uzs, + 'usd': balance_usd, + 'status': 'positive' if balance_uzs > 0 else 'negative' if balance_uzs < 0 else 'zero' } } - return Response(data, status=200) + return Response(data, status=200) \ No newline at end of file