Merge branch 'master' into cookie-page-updates

app/main/forms.py

@@ -584,6 +584,17 @@ class ServiceLetterContactBlockForm(StripWhitespaceForm):
             )
 
 
+class ServiceSwitchLettersForm(StripWhitespaceForm):
+
+    enabled = RadioField(
+        'Send letters',
+        choices=[
+            ('on', 'On'),
+            ('off', 'Off'),
+        ],
+    )
+
+
 class ServiceBrandingOrg(StripWhitespaceForm):
 
     def __init__(self, organisations=[], *args, **kwargs):

app/main/views/service_settings.py

@@ -35,6 +35,7 @@ from app.main.forms import (
     FreeSMSAllowance,
     ServiceEditInboundNumberForm,
     SMSPrefixForm,
+    ServiceSwitchLettersForm,
 )
 from app import user_api_client, current_service, organisations_client, inbound_number_client, billing_api_client
 from notifications_utils.formatters import formatted_list
@@ -252,14 +253,6 @@ def update_service_permissions(service_id, permissions, sms_sender=None):
     service_api_client.update_service_with_properties(service_id, data)
 
 
-@main.route("/services/<service_id>/service-settings/can-send-letters")
-@login_required
-@user_has_permissions(admin_override=True)
-def service_switch_can_send_letters(service_id):
-    switch_service_permissions(service_id, 'letter')
-    return redirect(url_for('.service_settings', service_id=service_id))
-
-
 @main.route("/services/<service_id>/service-settings/send-letters-as-pdf")
 @login_required
 @user_has_permissions(admin_override=True)
@@ -268,14 +261,6 @@ def service_switch_send_letters_as_pdf(service_id):
     return redirect(url_for('.service_settings', service_id=service_id))
 
 
-@main.route("/services/<service_id>/service-settings/can-send-international-sms")
-@login_required
-@user_has_permissions(admin_override=True)
-def service_switch_can_send_international_sms(service_id):
-    switch_service_permissions(service_id, 'international_sms')
-    return redirect(url_for('.service_settings', service_id=service_id))
-
-
 @main.route("/services/<service_id>/service-settings/can-send-email")
 @login_required
 @user_has_permissions(admin_override=True)
@@ -502,12 +487,25 @@ def service_set_inbound_sms(service_id):
     )
 
 
-@main.route("/services/<service_id>/service-settings/set-letters", methods=['GET'])
+@main.route("/services/<service_id>/service-settings/set-letters", methods=['GET', 'POST'])
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
 def service_set_letters(service_id):
+    form = ServiceSwitchLettersForm(
+        enabled='on' if 'letter' in current_service['permissions'] else 'off'
+    )
+    if form.validate_on_submit():
+        force_service_permission(
+            service_id,
+            'letter',
+            on=(form.enabled.data == 'on'),
+        )
+        return redirect(
+            url_for(".service_settings", service_id=service_id)
+        )
     return render_template(
         'views/service-settings/set-letters.html',
+        form=form,
     )
 
 

app/templates/admin_template.html

@@ -82,6 +82,7 @@
             <li><a href="https://status.notifications.service.gov.uk">System status</a></li>
             <li><a href="https://www.gov.uk/performance/govuk-notify">Performance</a></li>
             <li><a href="https://ukgovernmentdigital.slack.com/messages/govuk-notify">Slack channel</a></li>
+            <li><a href="https://governmentasaplatform.blog.gov.uk/category/gov-uk-notify/">Blog</a></li>
           </ul>
         </div>
         <div class="column-one-quarter">

app/templates/views/pricing.html

@@ -87,7 +87,7 @@
 
     </details>
 
-    <h2 class="heading-medium">Letters</h2>
+    <h2 class="heading-medium" id="letters">Letters</h2>
     <p>The cost of sending a letter depends on how many sheets of paper you need.</p>
     <div class="bottom-gutter-3-2">
       {% call mapping_table(

app/templates/views/roadmap.html

@@ -16,27 +16,52 @@
 
     <h1 class="heading-large">Roadmap</h1>
     <p>The GOV.UK Notify roadmap shows the things we’re working on and when we hope to have them ready for you to use.</p>
-    <p>It’s only a guide and things might change.</p>
+    <p class="panel panel-border-wide">This roadmap is a only a guide and things might change.</p>
     <p>You can <a href="{{url_for('.feedback', ticket_type='ask-question-give-feedback')}}">contact us</a> for more detail about these features, or to suggest something else you’d like Notify to offer.</p>
 
     <h2 class="heading-medium">Sending and receiving messages</h2>
-    <p>We’re working on new features so that you can:</p>
+
+    <h2 class="heading-small">February to March 2018</h2>
+
     <ul class="list list-bullet">
-      <li>allow services to get text messages replies via the API (November 2017)</li>
-      <li>posting delivery receipts to services (December 2017)</li>
-      <li>sending of pre-compiled letters (January 2018)</li>
-      <li>customising the expiry time for text messages (February - April 2018)</li>
-      <li>sending of pre-compiled text messages and emails (February - April 2018)</li>
-      <li>distributing delivery of notifications over a period of time (May 2018 onwards)</li>
-      <li>Automated content scanning for banned content (May 2018 onwards)</li>
-      <li>Checking mobile numbers are valid before sending (May 2018 onwards)</li>
+      <li>Sending pre-compiled text messages and emails through templates</li>
+      <li>Sending of pre-compiled letters</li>
+    </ul>
+
+    <h2 class="heading-small">April 2018 onwards</h2>
+
+    <ul class="list list-bullet">
+      <li>Additional letter formatting options</li>
+      <li>Customised expiry time for text messages</li>
+      <li>Distributed delivery of notifications over a period of time</li>
+      <li>Automated content scanning for banned content</li>
+      <li>Checking mobile numbers are valid before sending</li>
+      <li>Sending of pre-compiled text messages and emails without templates</li>
+      <li>Publishing patterns for effective notifications</li>
+      <li>Saving work in progress/draft templates</li>
+      <li>Exploring other channels (Facebook messenger, WhatsApp, Push Notifications)</li>
     </ul>
 
     <h2 class="heading-medium">Managing your account</h2>
-    <p>We want to offer the functionality for:</p>
+
+    <h2 class="heading-small">February to March 2018</h2>
+
     <ul class="list list-bullet">
-      <li>allow service owners to manage team members details (February - April 2018)</li>
-      <li>allowing people to request to join a service (February - April 2018)</li>
+      <li>Caseworking interface</li>
+      <li>Organisational view of service activity</li>
+    </ul>
+
+    <h2 class="heading-small">April 2018 onwards</h2>
+
+    <ul class="list list-bullet">
+      <li>Allow multiple teams within a service</li>
+      <li>Add NHS and Parliament email sending domains</li>
+      <li>Let service owners to update team members phone number or email address</li>
+      <li>Let teams to enable or disable features themselves</li>
+      <li>Retire version 1 of the API</li>
+      <li>Add public endpoints for usage and reporting</li>
+      <li>Self-service access to invoices</li>
+      <li>Additional payment methods for teams using Notify</li>
     </ul>
 
   </div>

app/templates/views/service-settings.html

@@ -243,11 +243,6 @@
             {{ 'Stop sending emails' if 'email' in current_service.permissions else 'Allow to send emails' }}
           </a>
         </li>
-        <li class="bottom-gutter">
-          <a href="{{ url_for('.service_switch_can_send_letters', service_id=current_service.id) }}" class="button">
-            {{ 'Stop sending letters' if 'letter' in current_service.permissions else 'Allow to send letters' }}
-          </a>
-        </li>
         {% if 'letter' in current_service.permissions %}
           <li class="bottom-gutter">
             <a href="{{ url_for('.service_switch_send_letters_as_pdf', service_id=current_service.id) }}" class="button">

app/templates/views/service-settings/set-letters.html

@@ -1,34 +1,26 @@
 {% extends "withnav_template.html" %}
-{% from "components/textbox.html" import textbox %}
+{% from "components/radios.html" import radios %}
 {% from "components/page-footer.html" import page_footer %}
 
 {% block service_page_title %}
-  Text message sender
+  Send letters
 {% endblock %}
 
 {% block maincolumn_content %}
 
   <div class="grid-row">
     <div class="column-five-sixths">
-      <h1 class="heading-large">Letters</h1>
-      {% if 'letter' in current_service.permissions %} 
-        <p>
-          Your service can send letters.
-        </p>
-        <p>
-          If you want to stop your service from sending letters,
-          <a href="{{ url_for('.support') }}">get in touch with the GOV.UK Notify team</a>.
-        </p>
-      {% else %}
-        <p>
-          Using GOV.UK Notify to send letters is an invitation&#8209;only feature.
-        </p>
-        <p>
-          If you want to try it out,
-          <a href="{{ url_for('.support') }}">get in touch with the GOV.UK Notify team</a>.
-        </p>
-      {% endif %}
+      <h1 class="heading-large">Send letters</h1>
+      <p>
+        It costs between 30p and 45p to send a letter using Notify.
+      </p>
+      <p>
+        See <a href="{{ url_for(".pricing", _anchor="letters") }}">pricing</a> for the list
+        of rates.
+      </p>
+      {{ radios(form.enabled) }}
       {{ page_footer(
+        'Save',
         back_link=url_for('.service_settings', service_id=current_service.id),
         back_link_text='Back to settings'
       ) }}

tests/app/main/views/service_settings/test_service_setting_permissions.py

@@ -31,9 +31,6 @@ def get_service_settings_page(
     ({'permissions': ['email']}, '.service_switch_can_send_email', {}, 'Stop sending emails'),
     ({'permissions': []}, '.service_switch_can_send_email', {}, 'Allow to send emails'),
 
-    ({'permissions': ['letter']}, '.service_switch_can_send_letters', {}, 'Stop sending letters'),
-    ({'permissions': []}, '.service_switch_can_send_letters', {}, 'Allow to send letters'),
-
     ({'permissions': ['sms']}, '.service_switch_can_send_sms', {}, 'Stop sending sms'),
     ({'permissions': []}, '.service_switch_can_send_sms', {}, 'Allow to send sms'),
 

tests/app/main/views/test_service_settings.py

@@ -530,8 +530,6 @@ def test_route_permissions(
     'main.service_request_to_go_live',
     'main.service_switch_live',
     'main.service_switch_research_mode',
-    'main.service_switch_can_send_letters',
-    'main.service_switch_can_send_international_sms',
     'main.archive_service',
 ])
 def test_route_invalid_permissions(
@@ -584,8 +582,6 @@ def test_route_for_platform_admin(
 @pytest.mark.parametrize('route', [
     'main.service_switch_live',
     'main.service_switch_research_mode',
-    'main.service_switch_can_send_letters',
-    'main.service_switch_can_send_international_sms',
 ])
 def test_route_for_platform_admin_update_service(
         mocker,
@@ -1557,40 +1553,50 @@ def test_should_set_sms_allowance(
     )
 
 
+@pytest.mark.parametrize((
+    'expected_initial_value,'
+    'posted_value,'
+    'initial_permissions,'
+    'expected_updated_permissions'
+), [
+    ('off', 'on', ['email', 'sms'], ['email', 'sms', 'letter']),
+    ('on', 'off', ['email', 'sms', 'letter'], ['email', 'sms']),
+])
 def test_switch_service_enable_letters(
-    logged_in_platform_admin_client,
+    client_request,
     service_one,
     mocker,
+    expected_initial_value,
+    posted_value,
+    initial_permissions,
+    expected_updated_permissions,
 ):
     mocked_fn = mocker.patch('app.service_api_client.update_service_with_properties', return_value=service_one)
+    service_one['permissions'] = initial_permissions
 
-    response = logged_in_platform_admin_client.get(
-        url_for('main.service_switch_can_send_letters', service_id=service_one['id'])
+    page = client_request.get(
+        'main.service_set_letters',
+        service_id=service_one['id'],
     )
 
-    assert response.status_code == 302
-    assert response.location == url_for('main.service_settings', service_id=service_one['id'], _external=True)
-    assert 'letter' in mocked_fn.call_args[0][1]['permissions']
+    assert page.select_one('input[checked]')['value'] == expected_initial_value
+    assert len(page.select('input[checked]')) == 1
+
+    client_request.post(
+        'main.service_set_letters',
+        service_id=service_one['id'],
+        _data={'enabled': posted_value},
+        _expected_redirect=url_for(
+            'main.service_settings',
+            service_id=service_one['id'],
+            _external=True
+        )
+    )
+
+    assert set(mocked_fn.call_args[0][1]['permissions']) == set(expected_updated_permissions)
     assert mocked_fn.call_args[0][0] == service_one['id']
 
 
-def test_switch_service_disable_letters(
-    logged_in_platform_admin_client,
-    service_one,
-    mocker,
-):
-    service_one['permissions'] = ['letter']
-    mocked_fn = mocker.patch('app.service_api_client.update_service_with_properties', return_value=service_one)
-
-    response = logged_in_platform_admin_client.get(
-        url_for('main.service_switch_can_send_letters', service_id=service_one['id'])
-    )
-
-    assert response.status_code == 302
-    assert response.location == url_for('main.service_settings', service_id=service_one['id'], _external=True)
-    assert mocked_fn.call_args == call(service_one['id'], {"permissions": []})
-
-
 @pytest.mark.parametrize('permissions, expected_checked', [
     (['international_sms'], 'on'),
     ([''], 'off'),
@@ -1802,21 +1808,6 @@ def test_cant_resume_active_service(
 
 
 @pytest.mark.parametrize('endpoint, permissions, expected_p', [
-    (
-        'main.service_set_letters',
-        [],
-        (
-            'Using GOV.UK Notify to send letters is an invitation‑only '
-            'feature.'
-        )
-    ),
-    (
-        'main.service_set_letters',
-        ['letter'],
-        (
-            'Your service can send letters.'
-        )
-    ),
     (
         'main.service_set_inbound_sms',
         ['sms'],