Merge branch 'master' into platform-admin

app/main/views/jobs.py

@@ -45,9 +45,7 @@ def view_job(service_id, job_id):
         notifications=notifications['notifications'],
         counts={
             'queued': 0 if finished else job['notification_count'],
-            'sent': job['notification_count'] if finished else 0,
+            'sent': job['notification_count'] if finished else 0
-            'failed': 0,
-            'cost': u'£0.00'
         },
         uploaded_at=job['created_at'],
         finished_at=job['updated_at'] if finished else None,
@@ -74,9 +72,7 @@ def view_job_updates(service_id, job_id):
             'partials/jobs/count.html',
             counts={
                 'queued': 0 if finished else job['notification_count'],
-                'sent': job['notification_count'] if finished else 0,
+                'sent': job['notification_count'] if finished else 0
-                'failed': 0,
-                'cost': u'£0.00'
             }
         ),
         'notifications': render_template(

app/templates/partials/jobs/count.html

@@ -7,18 +7,7 @@
   </li>
   <li class="column-one-quarter">
     {{ big_number(
-      counts.sent, 'sent'
+      counts.sent, 'processed'
-    )}}
-  </li>
-  <li class="column-one-quarter">
-    {{ big_number(
-      counts.failed,
-      'failed'
-    )}}
-  </li>
-  <li class="column-one-quarter">
-    {{ big_number(
-      counts.cost, 'total cost'
     )}}
   </li>
 </ul>

app/templates/views/dashboard/jobs.html

@@ -4,7 +4,7 @@
   jobs,
   caption="Recent batch jobs",
   empty_message='You haven’t sent any text messages yet',
-  field_headings=['File', 'Started', right_aligned_field_heading('Rows'), right_aligned_field_heading('Sent')]
+  field_headings=['File', 'Started', right_aligned_field_heading('Rows')]
 ) %}
   {% call field() %}
     <a href="{{ url_for('.view_job', service_id=service_id, job_id=item.id) }}">{{ item.original_file_name }}</a>
@@ -15,9 +15,6 @@
   {% call field(align='right') %}
     {{ item.notification_count }}
   {% endcall %}
-  {% call field(align='right') %}
-    {{ item.notifications_sent }}
-  {% endcall %}
 {% endcall %}
 {% if more_jobs_to_show %}
   {% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']) %}

app/templates/views/help.html

@@ -1,7 +1,7 @@
 {% extends "withoutnav_template.html" %}
 
 {% block page_title %}
-  Cookies – GOV.UK Notify
+  Help – GOV.UK Notify
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/service-settings.html

@@ -27,12 +27,7 @@
       } if not service.active else {
         'title': 'Reactivate API keys',
         'link': url_for('.service_status_change', service_id=service_id)
-      },
+      }
-      {
-        'title': 'Delete this service from GOV.UK Notify',
-        'link': url_for('.service_delete', service_id=service_id),
-        'destructive': True
-      },
     ]) }}
 
 {% endblock %}

tests/app/main/views/test_jobs.py

@@ -74,9 +74,8 @@ def test_should_show_updates_for_one_job_as_json(
 
         assert response.status_code == 200
         content = json.loads(response.get_data(as_text=True))
-        assert 'sent' in content['counts']
+        assert 'processed' in content['counts']
         assert 'queued' in content['counts']
-        assert 'failed' in content['counts']
         assert 'Recipient' in content['notifications']
         assert 'Status' in content['notifications']
         assert 'Started' in content['status']