darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 07:35:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Billing report only has services with bills to pay

Browse Source
This commit is contained in:
Pea Tyczynska
2021-03-10 17:00:26 +00:00
parent dd278a0567
commit 04525dc8c1
3 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/platform_stats/rest.py
View File

@@ -77,17 +77,18 @@ def get_data_for_billing_report():
]
combined = {}
for s in sms_costs:
entry = {
"organisation_id": str(s.organisation_id) if s.organisation_id else "",
"organisation_name": s.organisation_name or "",
"service_id": str(s.service_id),
"service_name": s.service_name,
"sms_cost": float(s.sms_cost),
"sms_fragments": s.chargeable_billable_sms,
"letter_cost": 0,
"letter_breakdown": ""
}
combined[s.service_id] = entry
if float(s.sms_cost) > 0:
entry = {
"organisation_id": str(s.organisation_id) if s.organisation_id else "",
"organisation_name": s.organisation_name or "",
"service_id": str(s.service_id),
"service_name": s.service_name,
"sms_cost": float(s.sms_cost),
"sms_fragments": s.chargeable_billable_sms,
"letter_cost": 0,
"letter_breakdown": ""
}
combined[s.service_id] = entry
for letter_cost in letter_costs:
if letter_cost.service_id in combined: