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

Merge pull request #2324 from alphagov/state_postage

Browse Source 
Display postage on letter notification page
This commit is contained in:
Pea (Malgorzata Tyczynska)
2018-09-25 13:36:34 +01:00
committed by GitHub
parent faee3b61dd d982385042
commit 6d32d8b756
4 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/main/views/notifications.py
View File

@@ -91,6 +91,7 @@ def view_notification(service_id, notification_id):
help=get_help_argument(), help=get_help_argument(),
estimated_letter_delivery_date=get_letter_timings(notification['created_at']).earliest_delivery, estimated_letter_delivery_date=get_letter_timings(notification['created_at']).earliest_delivery,
notification_id=notification['id'], notification_id=notification['id'],
postage=notification['postage'],
can_receive_inbound=(current_service.has_permission('inbound_sms')), can_receive_inbound=(current_service.has_permission('inbound_sms')),
is_precompiled_letter=notification['template']['is_precompiled_letter'] is_precompiled_letter=notification['template']['is_precompiled_letter']
) )

3
app/templates/views/notifications/notification.html
View File

@@ -35,6 +35,9 @@
</p> </p>
{% if template.template_type == 'letter' %} {% if template.template_type == 'letter' %}
<p>
Postage: {{ postage }} class
</p>
<p> <p>
Estimated delivery date: {{ estimated_letter_delivery_date|string|format_date_short }} Estimated delivery date: {{ estimated_letter_delivery_date|string|format_date_short }}
</p> </p>

4
tests/__init__.py
View File

@@ -369,6 +369,7 @@ def notification_json(
reply_to_text=None, reply_to_text=None,
client_reference=None, client_reference=None,
created_by_name=None, created_by_name=None,
postage=None,
): ):
if template is None: if template is None:
template = template_json(service_id, str(generate_uuid()), type_=template_type) template = template_json(service_id, str(generate_uuid()), type_=template_type)
@@ -388,6 +389,8 @@ def notification_json(
if status is None: if status is None:
status = 'delivered' status = 'delivered'
links = {} links = {}
if template_type == 'letter':
postage = 'second'
if with_links: if with_links:
links = { links = {
@@ -415,6 +418,7 @@ def notification_json(
'service': service_id, 'service': service_id,
'template_version': template['version'], 'template_version': template['version'],
'personalisation': personalisation or {}, 'personalisation': personalisation or {},
'postage': postage,
'notification_type': template_type, 'notification_type': template_type,
'reply_to_text': reply_to_text, 'reply_to_text': reply_to_text,
'client_reference': client_reference, 'client_reference': client_reference,

3
tests/app/main/views/test_notifications.py
View File

@@ -157,6 +157,9 @@ def test_notification_page_shows_page_for_letter_notification(
'sample template sent by Test User on 1 January at 1:01am' 'sample template sent by Test User on 1 January at 1:01am'
) )
assert normalize_spaces(page.select('main p:nth-of-type(2)')[0].text) == ( assert normalize_spaces(page.select('main p:nth-of-type(2)')[0].text) == (
'Postage: second class'
)
assert normalize_spaces(page.select('main p:nth-of-type(3)')[0].text) == (
'Estimated delivery date: 6 January' 'Estimated delivery date: 6 January'
) )
assert page.select('p.notification-status') == [] assert page.select('p.notification-status') == []