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

Merge pull request #4225 from alphagov/free-allowance-api-181934027

Browse Source 
Change annual usage to work with multiple SMS rates
This commit is contained in:
Ben Thorner
2022-04-29 13:22:54 +01:00
committed by GitHub
parent 208985aa25 5511f15ae8
commit 3a1ac189ff
5 changed files with 179 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/templates/views/dashboard/_usage.html
View File

@@ -8,9 +8,9 @@
</div>
<div class='govuk-grid-column-one-third'>
<div class="keyline-block">
{% if sms_chargeable %}
{% if sms_cost %}
{{ big_number(
sms_chargeable * sms_rate,
sms_cost,
'spent on text messages',
currency="£",
smaller=True

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

@@ -33,13 +33,15 @@
{% if sms_free_allowance > 0 %}
{{ big_number(sms_allowance_remaining, 'free allowance remaining', smaller=True) }}
{% endif %}
{% if sms_chargeable %}
{{ big_number(
sms_chargeable,
'at {:.2f} pence per message'.format(sms_rate * 100),
smaller=True
) }}
{% endif %}
{% for row in sms_breakdown %}
{% if row.charged_units > 0 %}
{{ big_number(
row.charged_units,
'at {:.2f} pence per message'.format(row.rate * 100),
smaller=True
) }}
{% endif %}
{% endfor %}
</div>
</div>
<div class='govuk-grid-column-one-third'>
@@ -59,7 +61,7 @@
<div class='govuk-grid-column-one-third'>
<div class="keyline-block">
{{ big_number(
(sms_chargeable * sms_rate),
sms_cost,
'spent',
currency="£",
smaller=True