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

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

Browse Source 
Remove free text allowance remaining column from organisation report
This commit is contained in:
Chris Hill-Scott
2021-11-26 10:59:44 +00:00
committed by GitHub
parent 64515555a8 c9767fc179
commit 5a96daa307
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -719,10 +719,10 @@ def test_download_organisation_usage_report(
) )
assert csv_report.string == ( assert csv_report.string == (
"Service ID,Service Name,Emails sent,Free text message allowance remaining," "Service ID,Service Name,Emails sent,"
"Spent on text messages (£),Spent on letters (£)" "Spent on text messages (£),Spent on letters (£)"
"\r\n596364a0-858e-42c8-9062-a8fe822260eb,Service 1,13000,,1.93,30.50" "\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\n147ad62a-2951-4fa1-9ca0-093cd1a52c52,Service 1,23000,3.94,60.50\r\n"
) )