darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 15:57:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4229 from alphagov/monthly-usage-multirate-181935935

Browse Source 
Support multiple rates in monthly SMS usage
This commit is contained in:
Ben Thorner
2022-05-11 11:26:44 +01:00
committed by GitHub
parent 5c4b361345 bb0fb73bc8
commit 84dde0f824
8 changed files with 220 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/templates/views/usage.html
View File

@@ -83,7 +83,7 @@
{% if months %}
<div class="dashboard-table usage-table body-copy-table">
{% call(month, row_index) list_table(
{% call(item, row_index) list_table(
months,
caption="Total spend",
caption_visible=False,
@@ -95,29 +95,29 @@
field_headings_visible=True
) %}
{% call row_heading() %}
{{ month.name }}
{{ item.month }}
{% endcall %}
{% call field(align='left') %}
{{ big_number(
(month.sms_rate * month.sms_paid_count) + month.letter_total,
item.sms_cost + item.letter_cost,
currency="£",
smallest=True
) }}
<ul>
{% if month.sms_free_count %}
<li class="tabular-numbers">{{ month.sms_free_count|format_thousands }} free {{ month.sms_free_count|message_count_label('sms', suffix='') }}</li>
{% if item.sms_free_allowance_used %}
<li class="tabular-numbers">{{ item.sms_free_allowance_used|format_thousands }} free {{ item.sms_free_count|message_count_label('sms', suffix='') }}</li>
{% endif %}
{% if month.sms_paid_count %}
<li class="tabular-numbers">{{ month.sms_paid_count|message_count('sms') }} at
{{- ' {:.2f}p'.format(month.sms_rate * 100) }}</li>
{% endif %}
{% for letter in month.letters%}
{% if letter.billing_units %}
<li class="tabular-numbers">{{ "{:,} {}".format(letter.billing_units, letter.postage_description) }} {{ letter.billing_units|message_count_label('letter', suffix='') }} at
{% for sms in item.sms_breakdown %}
<li class="tabular-numbers">{{ sms.sms_charged|message_count('sms') }} at
{{- ' {:.2f}p'.format(sms.rate * 100) }}</li>
{% endfor %}
{% 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 %}
{% if not (month.sms_free_count or month.sms_paid_count or month.letters) %}
{% if not (item.sms_free_allowance_used or item.sms_cost or item.letter_breakdown) %}
<li aria-hidden="true">–</li>
{% endif %}
</ul>