Merge branch 'master' into testing-doc

app/config.py

@@ -76,7 +76,6 @@ class Config(object):
         r"ucds\.email",
         r"naturalengland\.org\.uk",
         r"hmcts\.net",
-        r"irmsecurity\.com",  # temp addition for pen testers to be able to create account
     ]
 
 

app/main/views/send.py

@@ -369,7 +369,6 @@ def recheck_messages(service_id, template_type, upload_id):
 @login_required
 @user_has_permissions('send_texts', 'send_emails', 'send_letters')
 def start_job(service_id, upload_id):
-
     upload_data = session['upload_data']
 
     if request.files or not upload_data.get('valid'):
@@ -378,14 +377,6 @@ def start_job(service_id, upload_id):
 
     session.pop('upload_data')
 
-    template = service_api_client.get_service_template(
-        service_id,
-        upload_data.get('template_id')
-    )['data']
-
-    if template['template_type'] == 'letter':
-        abort(403)
-
     job_api_client.create_job(
         upload_id,
         service_id,

app/main/views/service_settings.py

@@ -186,12 +186,12 @@ def service_switch_can_send_letters(service_id):
     return redirect(url_for('.service_settings', service_id=service_id))
 
 
-@main.route("/services/<service_id>/service-settings/deactivate", methods=['GET', 'POST'])
+@main.route("/services/<service_id>/service-settings/archive", methods=['GET', 'POST'])
 @login_required
 @user_has_permissions('manage_settings', admin_override=True)
-def deactivate_service(service_id):
+def archive_service(service_id):
     if request.method == 'POST':
-        service_api_client.deactivate_service(service_id)
+        service_api_client.archive_service(service_id)
         return redirect(url_for('.service_settings', service_id=service_id))
     else:
         flash('There\'s no way to reverse this! Are you sure you want to archive this service?', 'delete')

app/notify_client/service_api_client.py

@@ -103,8 +103,8 @@ class ServiceAPIClient(NotifyAdminAPIClient):
     def update_service_with_properties(self, service_id, properties):
         return self.update_service(service_id, **properties)
 
-    def deactivate_service(self, service_id):
-        return self.post('/service/{}/deactivate'.format(service_id), data=None)
+    def archive_service(self, service_id):
+        return self.post('/service/{}/archive'.format(service_id), data=None)
 
     def remove_user_from_service(self, service_id, user_id):
         """

app/templates/admin_template.html

@@ -95,6 +95,7 @@
             <li><a href="{{ url_for("main.trial_mode") }}">Trial mode</a></li>
             <li><a href="{{ url_for("main.pricing") }}">Pricing</a></li>
             <li><a href="{{ url_for("main.delivery_and_failure") }}">Delivery and failure</a></li>
+            <li><a href="https://www.gov.uk/performance/govuk-notify">Performance</a></li>
           </ul>
         </div>
         <div class="column-one-third">

app/templates/views/dashboard/all-template-statistics.html

@@ -6,11 +6,7 @@
 
 {% block maincolumn_content %}
 
-  <div class="grid-row bottom-gutter">
-    <div class="column-half">
-      <h2 class="heading-large">Templates sent</h2>
-    </div>
-  </div>
+  <h2 class="heading-large">All templates used this year</h2>
 
   {% include 'views/dashboard/template-statistics.html' %}
 

app/templates/views/service-settings.html

@@ -111,7 +111,7 @@
         </li>
         {% if current_service.active %}
           <li class="bottom-gutter">
-            <a href="{{ url_for('.deactivate_service', service_id=current_service.id) }}" class="button">
+            <a href="{{ url_for('.archive_service', service_id=current_service.id) }}" class="button">
               Archive service
             </a>
           </li>

app/templates/views/signedout.html

@@ -121,7 +121,7 @@
       <div class="grid-row bottom-gutter">
         <div class="column-half">
           <h3 class="visually-hidden">Services</h3>
-          <div class="product-page-big-number">27</div>
+          <div class="product-page-big-number">28</div>
           services
         </div>
         <div class="column-half">