darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-11 18:37:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove free sms fragment limit from go live flow

Browse Source
This commit is contained in:
Leo Hemsted
2018-01-16 17:40:31 +00:00
parent 005600c923
commit 2edb1eb704
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main/views/service_settings.py
+1 -2
View File
@@ -162,7 +162,7 @@ def service_request_to_go_live(service_id):
'message': ( 'message': (
'On behalf of {} ({})\n' 'On behalf of {} ({})\n'
'\n---' '\n---'
'\nOrganisation type: {} ({:,} free text messages)' '\nOrganisation type: {}'
'\nMOU in place: {}' '\nMOU in place: {}'
'\nChannel: {}\nStart date: {}\nStart volume: {}' '\nChannel: {}\nStart date: {}\nStart volume: {}'
'\nPeak volume: {}' '\nPeak volume: {}'
@@ -171,7 +171,6 @@ def service_request_to_go_live(service_id):
current_service['name'], current_service['name'],
url_for('main.service_dashboard', service_id=current_service['id'], _external=True), url_for('main.service_dashboard', service_id=current_service['id'], _external=True),
current_service['organisation_type'], current_service['organisation_type'],
current_service['free_sms_fragment_limit'],
form.mou.data, form.mou.data,
formatted_list(filter(None, ( formatted_list(filter(None, (
'email' if form.channel_email.data else None, 'email' if form.channel_email.data else None,
tests/__init__.py
-2
View File
@@ -56,7 +56,6 @@ def service_json(
service_callback_api=None, service_callback_api=None,
permissions=None, permissions=None,
organisation_type='central', organisation_type='central',
free_sms_fragment_limit=250000,
prefix_sms=True, prefix_sms=True,
): ):
if users is None: if users is None:
@@ -70,7 +69,6 @@ def service_json(
'name': name, 'name': name,
'users': users, 'users': users,
'message_limit': message_limit, 'message_limit': message_limit,
'free_sms_fragment_limit': free_sms_fragment_limit,
'active': active, 'active': active,
'restricted': restricted, 'restricted': restricted,
'email_from': email_from, 'email_from': email_from,
tests/app/main/views/test_service_settings.py
+1 -1
View File
@@ -488,7 +488,7 @@ def test_should_redirect_after_request_to_go_live(
returned_message = mock_post.call_args[1]['data']['message'] returned_message = mock_post.call_args[1]['data']['message']
assert 'On behalf of service one' in returned_message assert 'On behalf of service one' in returned_message
assert 'Organisation type: central (250,000 free text messages)' in returned_message assert 'Organisation type: central' in returned_message
assert 'Channel: email and text messages' in returned_message assert 'Channel: email and text messages' in returned_message
assert 'Start date: 01/01/2017' in returned_message assert 'Start date: 01/01/2017' in returned_message
assert 'Start volume: 100,000' in returned_message assert 'Start volume: 100,000' in returned_message