diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html index ebce22710..0ff3f50e3 100644 --- a/app/templates/views/service-settings.html +++ b/app/templates/views/service-settings.html @@ -45,7 +45,8 @@ {% call row() %} {{ text_field('Email reply to address') }} - {% call field() %} + {% call field(status='default' if default_reply_to_email_address == "None" else '') %} + {{ default_reply_to_email_address }} {% if reply_to_email_address_count > 1 %}
diff --git a/app/templates/views/service-settings/email_reply_to.html b/app/templates/views/service-settings/email_reply_to.html index baa3f035a..99b49b82a 100644 --- a/app/templates/views/service-settings/email_reply_to.html +++ b/app/templates/views/service-settings/email_reply_to.html @@ -22,7 +22,7 @@
{% call(item, row_number) list_table( reply_to_email_addresses, - empty_message="You haven’t added any email addresses yet.", + empty_message="You haven’t added any email reply to addresses yet", caption="Reply to email addresses", caption_visible=false, field_headings=[ @@ -39,7 +39,27 @@ {% endif %} {% endcall %} - {{ edit_field('Change', url_for('.service_edit_email_reply_to', service_id =current_service.id, reply_to_email_id = item.id)) }} + {{ edit_field('Change', url_for('.service_edit_email_reply_to', service_id =current_service.id, reply_to_email_id = item.id)) }} {% endcall %}
-{% endblock %} \ No newline at end of file +
+
+

+ Your emails will be sent from + {{ current_service.email_from }}@notifications.service.gov.uk +

+

+ This is so they have the best chance of being delivered. + This email address can’t receive replies. +

+

+ Set up separate email addresses to receive replies + from your users. + {% if current_service.restricted and not reply_to_email_addresses %} + Your service can’t go live until you’ve added at least one + reply to address. + {% endif %} +

+
+
+{% endblock %} diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index e720f01c6..7e97eced7 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -713,7 +713,7 @@ def test_no_reply_to_email_addresses_message_shows( service_id=SERVICE_ONE_ID ) - assert normalize_spaces(page.select('tbody tr')[0].text) == "You haven’t added any email addresses yet." + assert normalize_spaces(page.select('tbody tr')[0].text) == "You haven’t added any email reply to addresses yet" assert len(page.select('tbody tr')) == 1