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

Merge pull request #3458 from alphagov/bump-utils-letter-timings

Browse Source 
Bump utils to 39.4.2
This commit is contained in:
Chris Hill-Scott
2020-05-27 15:42:21 +01:00
committed by GitHub
parent 026d4af2ec 67be9d98c9
commit e430455822
5 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,6 +134,14 @@ def view_notification(service_id, notification_id):
status='sending,delivered,failed',
)
if notification['notification_type'] == 'letter':
estimated_letter_delivery_date = get_letter_timings(
notification['created_at'],
postage=notification['postage']
).earliest_delivery
else:
estimated_letter_delivery_date = None
return render_template(
'views/notifications/notification.html',
finished=(notification['status'] in (DELIVERED_STATUSES + FAILURE_STATUSES)),
@@ -154,10 +162,7 @@ def view_notification(service_id, notification_id):
created_at=notification['created_at'],
updated_at=notification['updated_at'],
help=get_help_argument(),
estimated_letter_delivery_date=get_letter_timings(
notification['created_at'],
postage=notification['postage']
).earliest_delivery,
estimated_letter_delivery_date=estimated_letter_delivery_date,
notification_id=notification['id'],
postage=notification['postage'],
can_receive_inbound=(current_service.has_permission('inbound_sms')),