diff --git a/app/main/views/platform_admin.py b/app/main/views/platform_admin.py index f1b007a72..db5ec765f 100644 --- a/app/main/views/platform_admin.py +++ b/app/main/views/platform_admin.py @@ -279,8 +279,8 @@ def get_billing_report(): end_date = form.end_date.data headers = [ "organisation_id", "organisation_name", "service_id", "service_name", - "sms_cost", "sms_fragments", "total_letters", "letter_cost", "letter_breakdown", "purchase_order_number", - "contact_names", "contact_email_addresses", "billing_reference" + "sms_cost", "sms_chargeable_units", "total_letters", "letter_cost", "letter_breakdown", + "purchase_order_number", "contact_names", "contact_email_addresses", "billing_reference" ] try: result = billing_api_client.get_data_for_billing_report(start_date, end_date) @@ -294,7 +294,7 @@ def get_billing_report(): rows = [ [ r["organisation_id"], r["organisation_name"], r["service_id"], r["service_name"], - r["sms_cost"], r["sms_fragments"], r["total_letters"], r["letter_cost"], r["letter_breakdown"].strip(), + r["sms_cost"], r["sms_chargeable_units"], r["total_letters"], 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") ] diff --git a/tests/app/main/views/test_platform_admin.py b/tests/app/main/views/test_platform_admin.py index b5674f2fc..4c19466e5 100644 --- a/tests/app/main/views/test_platform_admin.py +++ b/tests/app/main/views/test_platform_admin.py @@ -935,7 +935,7 @@ def test_get_billing_report_when_calls_api_and_download_data( 'service_id': '48e82ac0-c8c4-4e46-8712-c83c35a94006', 'service_name': 'a - with sms and letter', 'sms_cost': 0, - 'sms_fragments': 0, + 'sms_chargeable_units': 0, 'purchase_order_number': 'PO1234', 'contact_names': 'Anne, Marie, Josh', 'contact_email_addresses': 'billing@example.com, accounts@example.com', @@ -956,10 +956,10 @@ def test_get_billing_report_when_calls_api_and_download_data( ) assert response.get_data(as_text=True) == ( - 'organisation_id,organisation_name,service_id,service_name,sms_cost,sms_fragments,total_letters,letter_cost' + - ',letter_breakdown,purchase_order_number,contact_names,contact_email_addresses,billing_reference' + + 'organisation_id,organisation_name,service_id,service_name,sms_cost,sms_chargeable_units' + + ',total_letters,letter_cost,letter_breakdown,purchase_order_number,contact_names,contact_email_addresses' + - '\r\n' + + ',billing_reference\r\n' + '7832a1be-a1f0-4f2a-982f-05adfd3d6354,' + 'Org for a - with sms and letter,' +