feat: O14 -> O15a Let recipients reply to your emails

feat: O15a -> O18

- Refactored existing email_reply_to.html to include new content
- Added an "I'll do this later" link which directs user to "add recipients"
- Backlinks for both O15a and O18

Author: joybytes

app/main/forms.py

@@ -2375,6 +2375,21 @@ def get_placeholder_form_instance(
     return PlaceholderForm(placeholder_value=dict_to_populate_from.get(placeholder_name, ""))
 
 
+class AddRecipientForm(StripWhitespaceForm):
+    ADD_RECIPIENT_CHOICES = [
+        ("upload_csv", "Upload a list of email addresses"),
+        ("enter_single", "Enter a single email address"),
+        ("use_my_email", "Use my email address"),
+    ]
+
+    add_recipient_method = GovukRadiosField(
+        "",
+        choices=ADD_RECIPIENT_CHOICES,
+        thing="how to add recipients",
+        validators=[DataRequired()],
+    )
+
+
 class SetSenderForm(StripWhitespaceForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

app/main/views/service_settings/index.py

@@ -405,12 +405,26 @@ def service_email_reply_to(service_id):
             back="set_sender",
             template_id=template_id,
         )
-    return render_template("views/service-settings/email_reply_to.html", alternative_backlink=backlink)
+
+    return render_template(
+        "views/service-settings/email_reply_to.html",
+        alternative_backlink=backlink,
+        template_id=template_id,
+        service_id=current_service.id,
+    )
 
 
 @main.route("/services/<uuid:service_id>/service-settings/email-reply-to/add", methods=["GET", "POST"])
 @user_has_permissions("manage_service")
 def service_add_email_reply_to(service_id):
+    back = request.args.get("back")
+    template_id = request.args.get("template_id")
+
+    backlink = None
+
+    if back == "email_reply_to" and template_id:
+        backlink = url_for(".service_email_reply_to", service_id=service_id, template_id=template_id, back="from_name")
+
     form = ServiceReplyToEmailForm()
     first_email_address = current_service.count_email_reply_to_addresses == 0
     is_default = first_email_address if first_email_address else form.is_default.data
@@ -451,6 +465,7 @@ def service_add_email_reply_to(service_id):
         form=form,
         first_email_address=first_email_address,
         error_summary_enabled=True,
+        alternative_backlink=backlink,
     )
 
 

app/templates/views/service-settings/email-reply-to/add.html

@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block backLink %}
-  {{ govukBackLink({ "href": url_for('main.service_email_reply_to', service_id=current_service.id) }) }}
+  {{ govukBackLink({ "href": alternative_backlink or url_for('main.service_email_reply_to', service_id=current_service.id) }) }}
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/service-settings/email_reply_to.html

@@ -9,19 +9,14 @@
 {% endblock %}
 
 {% block backLink %}
-  {{ govukBackLink({ "href": url_for('main.service_settings', service_id=current_service.id) }) }}
+  {{ govukBackLink({ "href": alternative_backlink or url_for('main.service_settings', service_id=current_service.id) }) }}
 {% endblock %}
 
 {% block maincolumn_content %}
 
-  {{ page_header('Reply-to email addresses') }}
+  {{ page_header('Let recipients reply to your emails') }}
 
   <div class="user-list">
-    {% if not current_service.email_reply_to_addresses %}
-      <div class="user-list-item">
-        <p class="govuk-body user-list-item-blank hint">You have not added any reply-to email addresses yet</p>
-      </div>
-    {% endif %}
     {% for item in current_service.email_reply_to_addresses %}
       <div class="user-list-item">
         <div class="govuk-grid-row">
@@ -59,23 +54,31 @@ <h2 class="user-list-item-heading">
           {{ govukButton({
             "element": "a",
             "text": "Add reply-to email address",
-            "href": url_for('main.service_add_email_reply_to', service_id=current_service.id),
+            "href": url_for('main.service_add_email_reply_to', service_id=current_service.id, back="email_reply_to", template_id=template_id),
           }) }}
         </div>
       {% endif %}
     </div>
     <div class="govuk-grid-column-five-sixths">
       <p class="govuk-body">
-        You need to add at least one reply-to address so recipients can reply to your messages.
+          You must set up a reply-to email address for your service.
       </p>
       <p class="govuk-body">
-        Emails with a reply-to address:
+          Emails with a reply-to address are:
       </p>
       <ul class="govuk-list govuk-list--bullet">
-        <li>are less likely to be labelled as spam</li>
-        <li>appear more trustworthy</li>
+          <li>more likely to be delivered</li>
+          <li>less likely to end up in a junk folder</li>
+          <li>less likely to be reported as spam</li>
       </ul>
     </div>
+      <div class="govuk-grid-column-five-sixths">
+          <p class="govuk-body">
+              <a href="{{ url_for('main.add_recipients', service_id=service_id, template_id=template_id, back="email_reply_to") }}" class="govuk-link govuk-link--no-visited-state">
+                  I’ll do this later
+              </a>
+          </p>
+      </div>
   </div>
 
 {% endblock %}