From 86e21f2b4b4c96213f973e000ac7918cb1b4a89c Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Fri, 19 Jan 2018 13:53:17 +0000
Subject: [PATCH] Remove platform admin letter/international buttons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Users can choose whether to have these features on or off now. And
a platform admin can still use the same controls to switch the features
on or off on behalf of a user. There’s no need for the separate buttons.
---
 app/main/views/service_settings.py               | 16 ----------------
 app/templates/views/service-settings.html        |  5 -----
 .../test_service_setting_permissions.py          |  3 ---
 tests/app/main/views/test_service_settings.py    |  4 ----
 4 files changed, 28 deletions(-)

diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py
index 6ecf54c98..b99ef1807 100644
--- a/app/main/views/service_settings.py
+++ b/app/main/views/service_settings.py
@@ -253,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)
@@ -269,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)
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index 561d606d7..99a6b4e7b 100644
--- a/app/templates/views/service-settings.html
+++ b/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">
diff --git a/tests/app/main/views/service_settings/test_service_setting_permissions.py b/tests/app/main/views/service_settings/test_service_setting_permissions.py
index 71ffc7018..4e0d08b36 100644
--- a/tests/app/main/views/service_settings/test_service_setting_permissions.py
+++ b/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'),
 
diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py
index a346aea45..b87f3a572 100644
--- a/tests/app/main/views/test_service_settings.py
+++ b/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,