remove letters from dashboard

app/templates/main_nav.html

@@ -16,7 +16,7 @@
       <li><a class="govuk-link govuk-link--no-visited-state{{ casework_navigation.is_selected('sent-messages') }}" href="{{ url_for('.view_notifications', service_id=current_service.id, status='sending,delivered,failed') }}">Sent messages</a></li>
     {% endif %}
     {% if not current_service.has_permission('broadcast') %}
-      <li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('uploads') }} demo-tooltip" data-demo-tooltip="⚠️ This feature is not available in demo mode" href="{{ url_for('main.uploads', service_id=current_service.id) }}">Letters</a></li>
+      <!-- <li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('uploads') }} demo-tooltip" data-demo-tooltip="⚠️ This feature is not available in demo mode" href="{{ url_for('main.uploads', service_id=current_service.id) }}">Letters</a></li> -->
     {% endif %}
     <li><a class="govuk-link govuk-link--no-visited-state{{ main_navigation.is_selected('team-members') }}" href="{{ url_for('.manage_users', service_id=current_service.id) }}">Team members</a></li>
     {% if current_user.has_permissions('manage_service', allow_org_user=True) and not current_service.has_permission('broadcast') %}

app/templates/views/dashboard/_totals.html

@@ -2,7 +2,7 @@
 
 <div class="ajax-block-container">
   <div class="govuk-grid-row">
-    <div id="total-email" class="govuk-grid-column-one-third">
+    <div id="total-email" class="govuk-grid-column-one-half">
       {{ big_number_with_status(
         statistics['email']['requested'],
         statistics['email']['requested']|message_count_label('email', suffix='sent'),
@@ -14,7 +14,7 @@
         smaller=True,
       ) }}
     </div>
-    <div id="total-sms" class="govuk-grid-column-one-third">
+    <div id="total-sms" class="govuk-grid-column-one-half">
       {{ big_number_with_status(
         statistics['sms']['requested'],
         statistics['sms']['requested']|message_count_label('sms', suffix='sent'),
@@ -26,7 +26,7 @@
         smaller=True,
       ) }}
     </div>
-    <div id="total-letters" class="govuk-grid-column-one-third">
+    <!-- <div id="total-letters" class="govuk-grid-column-one-third">
       {{ big_number_with_status(
         statistics['letter']['requested'],
         statistics['letter']['requested']|message_count_label('letter', suffix='sent'),
@@ -37,6 +37,6 @@
         link=url_for(".view_notifications", service_id=service_id, message_type='letter', status=''),
         smaller=True,
       ) }}
-    </div>
+    </div> -->
   </div>
 </div>

app/templates/views/dashboard/_usage.html

@@ -1,12 +1,12 @@
 {% from "components/big-number.html" import big_number %}
 
 <div class='govuk-grid-row ajax-block-container'>
-  <div class='govuk-grid-column-one-third'>
+  <div class='govuk-grid-column-one-half'>
     <div class="keyline-block">
       {{ big_number("Unlimited", 'free email allowance', smaller=True) }}
     </div>
   </div>
-  <div class='govuk-grid-column-one-third'>
+  <div class='govuk-grid-column-one-half'>
     <div class="keyline-block">
       {% if sms_cost %}
         {{ big_number(
@@ -20,7 +20,7 @@
       {% endif %}
     </div>
   </div>
-  <div class='govuk-grid-column-one-third'>
+  <!-- <div class='govuk-grid-column-one-third'>
     <div class="keyline-block">
       {{ big_number(
         letter_cost,
@@ -29,5 +29,5 @@
         smaller=True
       ) }}
     </div>
-  </div>
+  </div> -->
 </div>

app/templates/views/organisations/organisation/index.html

@@ -70,14 +70,14 @@
         <a href="{{ url_for('main.usage', service_id=service.service_id) }}" class="govuk-link govuk-link--no-visited-state browse-list-link">{{ service.service_name  }}</a>
       </h3>
       <div class="govuk-grid-row">
-        <div class="govuk-grid-column-one-third">
+        <div class="govuk-grid-column-one-half">
           {{ big_number(
             service.emails_sent,
             label=service.emails_sent|message_count_label('email'),
             smallest=True
           ) }}
         </div>
-        <div class="govuk-grid-column-one-third">
+        <div class="govuk-grid-column-one-half">
           {% if service.sms_cost %}
             {{ big_number(
               service.sms_cost,
@@ -93,14 +93,14 @@
             ) }}
           {% endif %}
         </div>
-        <div class="govuk-grid-column-one-third">
+        <!-- <div class="govuk-grid-column-one-third">
           {{ big_number(
             service.letter_cost,
             'spent on letters',
             currency="£",
             smallest=True
           ) }}
-        </div>
+        </div> -->
       </div>
     </div>
   {% endfor %}

app/templates/views/service-settings.html

@@ -201,7 +201,7 @@
 
         {% endcall %}
 
-        {% call mapping_table(
+        <!-- {% call mapping_table(
           caption='Letter settings',
           field_headings=['Label', 'Value', 'Action'],
           field_headings_visible=False,
@@ -269,7 +269,7 @@
             )}}
           {% endcall %}
 
-        {% endcall %}
+        {% endcall %} -->
       {% endif %}
     </div>
 

app/templates/views/usage.html

@@ -18,14 +18,14 @@
     </div>
     <div id='pill-selected-item'>
       <div class='govuk-grid-row'>
-        <div class='govuk-grid-column-one-third'>
+        <div class='govuk-grid-column-one-half'>
           <h2 class='heading-small'>Emails</h2>
           <div class="keyline-block">
             {{ big_number(emails_sent, 'sent', smaller=True) }}
             {{ big_number("Unlimited", 'free allowance', smaller=True) }}
           </div>
         </div>
-        <div class='govuk-grid-column-one-third'>
+        <div class='govuk-grid-column-one-half'>
           <h2 class='heading-small'>Text messages</h2>
           <div class="keyline-block">
             {{ big_number(sms_sent, 'sent', smaller=True) }}
@@ -44,21 +44,21 @@
             {% endfor %}
           </div>
         </div>
-        <div class='govuk-grid-column-one-third'>
+        <!-- <div class='govuk-grid-column-one-third'>
           <h2 class='heading-small'>Letters</h2>
           <div class="keyline-block">
             {{ big_number(letter_sent, 'sent', smaller=True) }}
           </div>
-        </div>
+        </div> -->
       </div>
 
       <div class='govuk-grid-row'>
-        <div class='govuk-grid-column-one-third'>
+        <div class='govuk-grid-column-one-half'>
           <div class="keyline-block">
             &nbsp;
           </div>
         </div>
-        <div class='govuk-grid-column-one-third'>
+        <div class='govuk-grid-column-one-half'>
           <div class="keyline-block">
             {{ big_number(
               sms_cost,
@@ -68,7 +68,7 @@
             ) }}
           </div>
         </div>
-        <div class='govuk-grid-column-one-third'>
+        <!-- <div class='govuk-grid-column-one-third'>
           <div class="keyline-block">
             {{ big_number(
                 letter_cost,
@@ -77,7 +77,7 @@
                 smaller=True
               ) }}
           </div>
-        </div>
+        </div> -->
 
       </div>
 
@@ -111,12 +111,12 @@
                   <li class="tabular-numbers">{{ sms.charged_units|message_count('sms') }} at
                   {{- ' {:.2f}p'.format(sms.rate * 100) }}</li>
               {% endfor %}
-              {% for letter in item.letter_breakdown %}
+              <!-- {% for letter in item.letter_breakdown %}
                 {% if letter.sent %}
                   <li class="tabular-numbers">{{ "{:,} {}".format(letter.sent, letter.postage_description) }} {{ letter.sent|message_count_label('letter', suffix='') }} at
                   {{ letter.rate | format_number_in_pounds_as_currency }}</li>
                 {% endif %}
-              {% endfor %}
+              {% endfor %} -->
               {% if not (item.sms_free_allowance_used or item.sms_cost or item.letter_breakdown) %}
                 <li aria-hidden="true">–</li>
               {% endif %}

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',
         ),

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'
     )