Move the ‘estimated usage’ questions

We get a bunch of requests to go live where people have told us they're
going to send email but there is no email reply-to address present.

These come from 2 scenarios:

1. when there are email templates, and no reply to address – but they
   ignore the checklist
2. when there are no email templates (yet) but they provide anticipated
   volumes for email

At the moment we only auto-check for a reply to address when they have
email templates. And because the question about anticipated volumes
follows the checklist, you'll get a checklist that passes (reply
addresses not required as no templates present) - but your future intent
that differs (reply address IS required because you have anticipated
volumes).

So let’s bring the request for anticipated volumes into the checklist,
that way we can dynamically add the requirement for a reply to address
if they say they will send email but don't have templates yet.

We should begin storing it in the database against the service to stop
people having to re-enter it each time they try to complete the go live
screens.

This also means moving the ‘consent to research question’ along with
the questions about volume, because
- we want people to answer both before going live
- we don’t want to clutter up the summary page by asking questions there
  too

app/templates/views/service-settings/estimate-usage.html

@@ -1,35 +1,26 @@
 {% extends "withnav_template.html" %}
-{% from "components/checkbox.html" import checkbox_group %}
-{% from "components/textbox.html" import textbox %}
-{% from "components/radios.html" import radios %}
-{% from "components/page-footer.html" import page_footer %}
-{% from "components/banner.html" import banner_wrapper %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/radios.html" import radios %}
+{% from "components/textbox.html" import textbox %}
 
 {% block service_page_title %}
-  Request to go live
+  Estimate usage
 {% endblock %}
 
 {% block maincolumn_content %}
-
-      <h1 class="heading-large">Request to go live</h1>
-
+  <div class="grid-row">
+    <div class="column-whole">
       {% call form_wrapper() %}
+        <h1 class="heading-large">Estimate usage</h1>
         <div class="form-group">
           {{ textbox(form.volume_email, width='1-2', hint='For example, 1,000,000') }}
           {{ textbox(form.volume_sms, width='1-2', hint='For example, 500,000') }}
           {{ textbox(form.volume_letter, width='1-2', hint='For example, 5,000') }}
         </div>
-        {{ radios(form.research_consent, hint='You don’t have to take part and you can unsubscribe at any time') }}
-        <p>
-          When we receive your request we’ll get back to you within one working day.
-        </p>
-
-
-        <p class="bottom-gutter">
-          By requesting to go live you’re agreeing to our <a href="{{ url_for('.terms') }}">terms of use</a>.
-        </p>
-        {{ page_footer('Request to go live') }}
+        {{ radios(form.consent_to_research, hint='You don’t have to take part and you can unsubscribe at any time') }}
+        {{ page_footer('Continue') }}
       {% endcall %}
-
+    </div>
+  </div>
 {% endblock %}

app/templates/views/service-settings/request-to-go-live.html

@@ -1,9 +1,6 @@
 {% extends "withnav_template.html" %}
-{% from "components/checkbox.html" import checkbox_group %}
-{% from "components/textbox.html" import textbox %}
-{% from "components/radios.html" import radios %}
+{% from "components/form.html" import form_wrapper %}
 {% from "components/page-footer.html" import page_footer %}
-{% from "components/banner.html" import banner_wrapper %}
 {% from "components/task-list.html" import task_list_wrapper, task_list_item %}
 
 {% block service_page_title %}
@@ -15,6 +12,11 @@
     <div class="column-whole">
       <h1 class="heading-large">Before you request to go live</h1>
       {% call task_list_wrapper() %}
+        {{ task_list_item(
+          current_service.has_estimated_usage,
+          'Estimate usage',
+          url_for('main.estimate_usage', service_id=current_service.id),
+        ) }}
         {{ task_list_item(
           current_service.has_team_members,
           'Add a team member who can manage settings, team and usage',
@@ -49,11 +51,14 @@
       {% endcall %}
       {% if current_user.is_gov_user %}
         <p>
-          You also need to accept our <a href="{{ url_for('.terms') }}">terms of use</a>.
+          When we receive your request we’ll get back to you within one working day.
         </p>
-        <p>
-          <a href="{{ url_for('main.submit_request_to_go_live', service_id=current_service.id) }}" class="button">Continue</a>
+        <p class="bottom-gutter">
+          By requesting to go live you’re agreeing to our <a href="{{ url_for('.terms') }}">terms of use</a>.
         </p>
+        {% call form_wrapper() %}
+          {{ page_footer('Request to go live') }}
+        {% endcall %}
       {% else %}
         <p>
           Only team members with a government email address can request to go live.