Skip to content

Commit

Permalink
Display payment data in USD
Browse files Browse the repository at this point in the history
  • Loading branch information
sravfeyn committed Sep 12, 2024
1 parent 7714d9a commit 35ced03
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions commcare_connect/reports/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,15 @@ def _get_table_data_for_quarter(quarter):
.annotate(Sum("amount"))
)

approved_payment_strings = [
f"{p['amount__sum']} {p['opportunity_access__opportunity__currency']}" for p in approved_payment_data
]
def payment_strings(payment_data):
from commcare_connect.accounting.models import Currency

strings = []
for p in payment_data:
currency = Currency.by_code(p["opportunity_access__opportunity__currency"])
amount = p["amount__sum"] / currency.rate_to_default
strings.append(f"{amount} USD")
return strings

total_payment_data = (
Payment.objects.filter(
Expand All @@ -89,16 +95,13 @@ def _get_table_data_for_quarter(quarter):
.values("opportunity_access__opportunity__currency")
.annotate(Sum("amount"))
)
total_payment_strings = [
f"{p['amount__sum']} {p['opportunity_access__opportunity__currency']}" for p in total_payment_data
]

return {
"quarter": f"{quarter[0]} Q{quarter[1]}",
"users": len(user_set),
"services": service_count,
"approved_payments": approved_payment_strings,
"total_payments": total_payment_strings,
"approved_payments": payment_strings(approved_payment_data),
"total_payments": payment_strings(total_payment_data),
"beneficiaries": len(beneficiary_set),
}

Expand Down

0 comments on commit 35ced03

Please sign in to comment.