Merge pull request #3166 from alphagov/usage-back-on-dashboard

Put usage summary back on the dashboard

app/templates/views/dashboard/_usage.html

@@ -1,16 +1,16 @@
 {% from "components/big-number.html" import big_number %}
 
 <div class='grid-row ajax-block-container'>
-  <div class='column-half'>
+  <div class='{{ column_width }}'>
     <div class="keyline-block">
       {{ big_number("Unlimited", 'free email allowance', smaller=True) }}
     </div>
   </div>
-  <div class='column-half'>
+  <div class='{{ column_width }}'>
     <div class="keyline-block">
       {% if sms_chargeable %}
         {{ big_number(
-          total_sms_cost,
+          sms_chargeable * sms_rate,
           'spent on text messages',
           currency="£",
           smaller=True
@@ -20,4 +20,14 @@
       {% endif %}
     </div>
   </div>
+  <div class='{{ column_width }}'>
+    <div class="keyline-block">
+      {{ big_number(
+        letter_cost,
+        'spent on letters',
+        currency="£",
+        smaller=True
+      ) }}
+    </div>
+  </div>
 </div>

app/templates/views/dashboard/dashboard.html

@@ -43,6 +43,15 @@
       ) }}
     {% endif %}
 
+    {% if current_user.has_permissions('manage_service') %}
+      <h2 class='heading-medium'>This year</h2>
+      {{ ajax_block(partials, updates_url, 'usage') }}
+      {{ show_more(
+        url_for(".usage", service_id=current_service['id']),
+        'See usage'
+      ) }}
+    {% endif %}
+
   </div>
 
 {% endblock %}