diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html index a7e0e032a..193e308f8 100644 --- a/app/templates/main_nav.html +++ b/app/templates/main_nav.html @@ -16,7 +16,7 @@
  • Sent messages
  • {% endif %} {% if not current_service.has_permission('broadcast') %} -
  • Letters
  • + {% endif %}
  • Team members
  • {% if current_user.has_permissions('manage_service', allow_org_user=True) and not current_service.has_permission('broadcast') %} diff --git a/app/templates/views/dashboard/_totals.html b/app/templates/views/dashboard/_totals.html index d1528729b..8aaefd124 100644 --- a/app/templates/views/dashboard/_totals.html +++ b/app/templates/views/dashboard/_totals.html @@ -2,7 +2,7 @@
    -
    +
    {{ big_number_with_status( statistics['email']['requested'], statistics['email']['requested']|message_count_label('email', suffix='sent'), @@ -14,7 +14,7 @@ smaller=True, ) }}
    -
    +
    {{ big_number_with_status( statistics['sms']['requested'], statistics['sms']['requested']|message_count_label('sms', suffix='sent'), @@ -26,7 +26,7 @@ smaller=True, ) }}
    -
    +
    diff --git a/app/templates/views/dashboard/_usage.html b/app/templates/views/dashboard/_usage.html index 4046e6c91..af8e39919 100644 --- a/app/templates/views/dashboard/_usage.html +++ b/app/templates/views/dashboard/_usage.html @@ -1,12 +1,12 @@ {% from "components/big-number.html" import big_number %}
    -
    +
    {{ big_number("Unlimited", 'free email allowance', smaller=True) }}
    -
    +
    {% if sms_cost %} {{ big_number( @@ -20,7 +20,7 @@ {% endif %}
    -
    +
    diff --git a/app/templates/views/organisations/organisation/index.html b/app/templates/views/organisations/organisation/index.html index 7b9d89c9f..7fabec5d1 100644 --- a/app/templates/views/organisations/organisation/index.html +++ b/app/templates/views/organisations/organisation/index.html @@ -70,14 +70,14 @@ {{ service.service_name }}
    -
    +
    {{ big_number( service.emails_sent, label=service.emails_sent|message_count_label('email'), smallest=True ) }}
    -
    +
    {% if service.sms_cost %} {{ big_number( service.sms_cost, @@ -93,14 +93,14 @@ ) }} {% endif %}
    -
    +
    {% endfor %} diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index d7ade8672..f89dfbe9c 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -201,7 +201,7 @@ {% endcall %} - {% call mapping_table( + {% endif %}
    diff --git a/app/templates/views/usage.html b/app/templates/views/usage.html index 4bd7f6c77..b31f05c61 100644 --- a/app/templates/views/usage.html +++ b/app/templates/views/usage.html @@ -18,14 +18,14 @@
    -
    +

    Emails

    {{ big_number(emails_sent, 'sent', smaller=True) }} {{ big_number("Unlimited", 'free allowance', smaller=True) }}
    -
    +

    Text messages

    {{ big_number(sms_sent, 'sent', smaller=True) }} @@ -44,21 +44,21 @@ {% endfor %}
    -
    +
    -
    +
     
    -
    +
    {{ big_number( sms_cost, @@ -68,7 +68,7 @@ ) }}
    -
    +
    @@ -111,12 +111,12 @@
  • {{ sms.charged_units|message_count('sms') }} at {{- ' {:.2f}p'.format(sms.rate * 100) }}
  • {% endfor %} - {% for letter in item.letter_breakdown %} + {% if not (item.sms_free_allowance_used or item.sms_cost or item.letter_breakdown) %} {% endif %} diff --git a/tests/app/main/test_permissions.py b/tests/app/main/test_permissions.py index 426405650..7b4a12f09 100644 --- a/tests/app/main/test_permissions.py +++ b/tests/app/main/test_permissions.py @@ -126,7 +126,6 @@ def test_service_navigation_for_org_user( ( 'Send messages', 'Sent messages', - 'Letters', 'Team members', ), 403, @@ -136,7 +135,6 @@ def test_service_navigation_for_org_user( ( 'Send messages', 'Sent messages', - 'Letters', 'Team members', 'Usage', ), diff --git a/tests/app/test_navigation.py b/tests/app/test_navigation.py index bd4757373..adf8708e3 100644 --- a/tests/app/test_navigation.py +++ b/tests/app/test_navigation.py @@ -514,7 +514,7 @@ def test_navigation_urls( ] == [ '/services/{}'.format(SERVICE_ONE_ID), '/services/{}/templates'.format(SERVICE_ONE_ID), - '/services/{}/uploads'.format(SERVICE_ONE_ID), + # '/services/{}/uploads'.format(SERVICE_ONE_ID), '/services/{}/users'.format(SERVICE_ONE_ID), '/services/{}/usage'.format(SERVICE_ONE_ID), '/services/{}/service-settings'.format(SERVICE_ONE_ID), @@ -593,7 +593,7 @@ def test_caseworkers_get_caseworking_navigation( ) page = client_request.get('main.choose_template', service_id=SERVICE_ONE_ID) assert normalize_spaces(page.select_one('header + .govuk-width-container nav').text) == ( - 'Send messages Sent messages Letters Team members' + 'Send messages Sent messages Team members' ) @@ -612,5 +612,5 @@ def test_caseworkers_see_jobs_nav_if_jobs_exist( ) page = client_request.get('main.choose_template', service_id=SERVICE_ONE_ID) assert normalize_spaces(page.select_one('header + .govuk-width-container nav').text) == ( - 'Send messages Sent messages Letters Team members' + 'Send messages Sent messages Team members' )