Merge pull request #3745 from alphagov/reply-to-address-in-ticket

Add email reply to address to go live ticket

app/main/views/service_settings.py

@@ -208,12 +208,15 @@ def submit_request_to_go_live(service_id):
             '\n---'
             '\nOrganisation type: {organisation_type}'
             '\nAgreement signed: {agreement}'
+            '\n'
             '\nEmails in next year: {volume_email_formatted}'
             '\nText messages in next year: {volume_sms_formatted}'
             '\nLetters in next year: {volume_letter_formatted}'
+            '\n'
             '\nConsent to research: {research_consent}'
             '\nOther live services: {existing_live}'
             '\n'
+            '\nService reply-to address: {email_reply_to}'
             '\n---'
             '\nRequest sent by {email_address}'
             '\n'
@@ -230,6 +233,7 @@ def submit_request_to_go_live(service_id):
             research_consent='Yes' if current_service.consent_to_research else 'No',
             existing_live='Yes' if current_user.live_services else 'No',
             email_address=current_user.email_address,
+            email_reply_to=current_service.default_email_reply_to_address or 'not set',
         ),
         ticket_type=zendesk_client.TYPE_QUESTION,
         user_email=current_user.email_address,

tests/app/main/views/test_service_settings.py

@@ -1661,10 +1661,13 @@ def test_should_redirect_after_request_to_go_live(
         '---\n'
         'Organisation type: Central\n'
         'Agreement signed: Can’t tell (domain is user.gov.uk).\n'
+        '\n'
         '{formatted_displayed_volumes}'
+        '\n'
         'Consent to research: Yes\n'
         'Other live services: No\n'
         '\n'
+        'Service reply-to address: test@example.com\n'
         '---\n'
         'Request sent by test@user.gov.uk\n'
     ).format(
@@ -1724,12 +1727,15 @@ def test_request_to_go_live_displays_go_live_notes_in_zendesk_ticket(
         '---\n'
         'Organisation type: Central\n'
         'Agreement signed: No (organisation is Org 1, a crown body). {go_live_note}\n'
+        '\n'
         'Emails in next year: 111,111\n'
         'Text messages in next year: 222,222\n'
         'Letters in next year: 333,333\n'
+        '\n'
         'Consent to research: Yes\n'
         'Other live services: No\n'
         '\n'
+        'Service reply-to address: test@example.com\n'
         '---\n'
         'Request sent by test@user.gov.uk\n'
     ).format(