darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-03-14 07:12:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4106 from alphagov/revert-4080-remove-sms-allowance-remainder-org-report

Browse Source 
Revert "Remove free text allowance remaining column from organisation report"
This commit is contained in:
Pea Tyczynska
2021-12-29 10:16:16 +00:00
committed by GitHub
parent e97db6e80a e8876a0632
commit 65241b11df
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/main/views/organisations.py
View File

@@ -188,8 +188,7 @@ def download_organisation_usage_report(org_id):
('service_id', 'Service ID'),
('service_name', 'Service Name'),
('emails_sent', 'Emails sent'),
# TODO: reinstate this once the API is returning correct data
# ('sms_remainder', 'Free text message allowance remaining'),
('sms_remainder', 'Free text message allowance remaining'),
])
monetary_column_names = OrderedDict([

10
tests/app/main/views/organisations/test_organisations.py
View File

@@ -696,7 +696,7 @@ def test_download_organisation_usage_report(
'letter_cost': 30.5,
'sms_billable_units': 122,
'sms_cost': 1.934,
'sms_remainder': None
'sms_remainder': 0
},
{
'service_id': SERVICE_TWO_ID,
@@ -707,7 +707,7 @@ def test_download_organisation_usage_report(
'letter_cost': 60.5,
'sms_billable_units': 322,
'sms_cost': 3.935,
'sms_remainder': None
'sms_remainder': 0
},
]}
)
@@ -720,10 +720,10 @@ def test_download_organisation_usage_report(
)
assert csv_report.string == (
"Service ID,Service Name,Emails sent,"
"Service ID,Service Name,Emails sent,Free text message allowance remaining,"
"Spent on text messages (£),Spent on letters (£)"
"\r\n596364a0-858e-42c8-9062-a8fe822260eb,Service 1,13000,1.93,30.50"
"\r\n147ad62a-2951-4fa1-9ca0-093cd1a52c52,Service 1,23000,3.94,60.50\r\n"
"\r\n596364a0-858e-42c8-9062-a8fe822260eb,Service 1,13000,0,1.93,30.50"
"\r\n147ad62a-2951-4fa1-9ca0-093cd1a52c52,Service 1,23000,0,3.94,60.50\r\n"
)