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

Merge pull request #764 from alphagov/rates

Browse Source 
mmg rates set to 1.65p
This commit is contained in:
Leo Hemsted
2016-07-07 14:58:10 +01:00
committed by GitHub
parent dfbd6610cb aac3112274
commit 4a81a1f82b
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/views/dashboard.py
View File

@@ -178,7 +178,10 @@ def get_dashboard_partials(service_id):
} }
def calculate_usage(usage, sms_free_allowance=250000, sms_rate=0.018): def calculate_usage(usage):
# TODO: Don't hardcode these - get em from the API
sms_free_allowance = 250000
sms_rate = 0.0165
sms_sent = usage.get('sms_count', 0) sms_sent = usage.get('sms_count', 0)
emails_sent = usage.get('email_count', 0) emails_sent = usage.get('email_count', 0)

2
app/templates/views/pricing.html
View File

@@ -26,7 +26,7 @@
<li>Up to 306 characters = 2 text messages</li> <li>Up to 306 characters = 2 text messages</li>
<li>Up to 459 characters = 3 text messages</li> <li>Up to 459 characters = 3 text messages</li>
</ul></li> </ul></li>
<li>Standard text message rate: 1.8p + VAT</li> <li>Standard text message rate: 1.65p + VAT</li>
</ul> </ul>
<p> <p>

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

@@ -34,7 +34,7 @@
{% if sms_chargeable %} {% if sms_chargeable %}
{{ big_number( {{ big_number(
sms_chargeable, sms_chargeable,
'at {:.1f}p per message'.format(sms_rate * 100), 'at {:.2f}p per message'.format(sms_rate * 100),
smaller=True smaller=True
) }} ) }}
{% endif %} {% endif %}