darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-16 20:49:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add billing details fields to Usage for all services report

Browse Source
This commit is contained in:
Pea Tyczynska
2021-03-02 13:13:41 +00:00
parent 2a9ebfb1cc
commit 95f46ced8a
2 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/main/views/platform_admin.py
View File

@@ -280,14 +280,19 @@ def usage_for_all_services():
if form.validate_on_submit():
start_date = form.start_date.data
end_date = form.end_date.data
headers = ["organisation_id", "organisation_name", "service_id", "service_name",
"sms_cost", "sms_fragments", "letter_cost", "letter_breakdown"]
headers = [
"organisation_id", "organisation_name", "service_id", "service_name",
"sms_cost", "sms_fragments", "letter_cost", "letter_breakdown", "purchase_order_number",
"contact_names", "contact_email_addresses", "billing_reference"
]
result = billing_api_client.get_usage_for_all_services(start_date, end_date)
rows = [
[
r['organisation_id'], r["organisation_name"], r["service_id"], r["service_name"],
r["sms_cost"], r['sms_fragments'], r["letter_cost"], r["letter_breakdown"].strip()
r["organisation_id"], r["organisation_name"], r["service_id"], r["service_name"],
r["sms_cost"], r["sms_fragments"], r["letter_cost"], r["letter_breakdown"].strip(),
r.get("purchase_order_number"), r.get("contact_names"), r.get("contact_email_addresses"),
r.get("billing_reference")
]
for r in result
]