5 files changed, 143 insertions, 3 deletions
diff --git a/templates/web/base/waste/confirmation.html b/templates/web/base/waste/confirmation.html
new file mode 100644
index 000000000..9bacd9a2b
--- /dev/null
+++ b/templates/web/base/waste/confirmation.html
@@ -0,0 +1,34 @@
+[%
+IF first_page == 'request';
+    title = 'Container request sent';
+ELSIF first_page == 'report';
+    title = 'Missed collection reported';
+ELSE;
+    title = 'Enquiry submitted';
+END ~%]
+[% INCLUDE header.html %]
+
+<div class="govuk-panel govuk-panel--confirmation">
+    <h1 class="govuk-panel__title">
+        [% title %]
+    </h1>
+    <div class="govuk-panel__body">
+        <p>Your [% first_page %] has been sent;
+          [% IF data.email %]
+            a copy has been sent to your email address, [% data.email %].
+          [% END %]
+        </p>
+        <p>
+          [% IF first_page == 'request' %]
+            Containers arrive typically within two weeks, but this may vary due to demand.
+          [% END %]
+          [% IF report_ids.size > 1 %]
+            Your reference numbers are: <strong>[% report_ids.join(', ') %]</strong>.
+          [% ELSE %]
+            Your reference number is <strong>[% report_ids.join(', ') %]</strong>.
+          [% END %]
+        </p>
+    </div>
+</div>
+
+[% INCLUDE footer.html %]
diff --git a/templates/web/base/waste/index.html b/templates/web/base/waste/index.html
index 8e02c5b71..0750ac82a 100644
--- a/templates/web/base/waste/index.html
+++ b/templates/web/base/waste/index.html
@@ -14,9 +14,6 @@
   [% END %]
 <form method="post">
   [% PROCESS form %]
-  <input type="hidden" name="token" value="[% csrf_token %]">
-  <input type="hidden" name="process" value="[% process %]">
-  <input type="hidden" name="saved_data" value="[% saved_data %]">
 </form>
 
 [% INCLUDE footer.html %]
diff --git a/templates/web/base/waste/summary.html b/templates/web/base/waste/summary.html
new file mode 100644
index 000000000..7fa79b05b
--- /dev/null
+++ b/templates/web/base/waste/summary.html
@@ -0,0 +1,70 @@
+[% SET bodyclass = 'waste' %]
+
+[% USE date(format = '%A, %-d~~~ %B') ~%]
+[% PROCESS 'waste/govuk/fields.html' ~%]
+[% INCLUDE header.html %]
+
+[% PROCESS errors %]
+[% SET data = form.saved_data ~%]
+
+<h1 class="govuk-heading-xl">[% title %]</h1>
+<p>Please review the information you’ve provided before you submit your [% thing %].</p>
+
+<div class="waste__summary">
+<dl class="govuk-summary-list">
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">
+      [% summary_title %]
+    </dt>
+    <dd class="govuk-summary-list__value">
+    </dd>
+    <dd class="govuk-summary-list__actions">
+    <form method="post">
+        <input type="hidden" name="saved_data" value="[% form.fif.saved_data %]">
+        <input type="hidden" name="goto" value="[% step1 %]">
+        <input type="submit" class="govuk-button govuk-button--secondary govuk-!-margin-bottom-0" value="Change answers">
+    </form>
+    </dd>
+  </div>
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key govuk-summary-list__key--sub">Address</dt>
+        <dd class="govuk-summary-list__value">[% property.address %]</dd>
+    </div>
+    [% INCLUDE answers %]
+  
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">
+      About you
+    </dt>
+    <dd class="govuk-summary-list__value">
+    </dd>
+    <dd class="govuk-summary-list__actions">
+    <form method="post">
+        <input type="hidden" name="saved_data" value="[% form.fif.saved_data %]">
+        <input type="hidden" name="goto" value="about_you">
+        <input type="submit" class="govuk-button govuk-button--secondary govuk-!-margin-bottom-0" value="Change answers">
+    </form>
+    </dd>
+  </div>
+
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key govuk-summary-list__key--sub">Your name</dt>
+        <dd class="govuk-summary-list__value">[% data.name %]</dd>
+    </div>
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key govuk-summary-list__key--sub">Telephone number</dt>
+        <dd class="govuk-summary-list__value">[% data.phone %]</dd>
+    </div>
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key govuk-summary-list__key--sub">Email</dt>
+        <dd class="govuk-summary-list__value">[% data.email %]</dd>
+    </div>
+
+</dl>
+
+<form method="post">
+    [% PROCESS form %]
+</form>
+</div>
+
+[% INCLUDE footer.html %]
diff --git a/templates/web/base/waste/summary_report.html b/templates/web/base/waste/summary_report.html
new file mode 100644
index 000000000..a67090e6e
--- /dev/null
+++ b/templates/web/base/waste/summary_report.html
@@ -0,0 +1,19 @@
+[%
+title = 'Submit missed bin report';
+thing = 'missed bin report';
+summary_title = 'Missed collection';
+step1 = 'report';
+%]
+
+[% BLOCK answers %]
+  [% FOR service IN data.keys.grep('^service-') %]
+    [% NEXT UNLESS data.$service %]
+    [% SET service_id = service.replace('service-', '') %]
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key govuk-summary-list__key--sub">[% services.$service_id.service_name %]</dt>
+        <dd class="govuk-summary-list__value">[% date.format(services.$service_id.last.date) | replace('~~~', services.$service_id.last.ordinal) %]</dd>
+    </div>
+  [% END %]
+[% END %]
+
+[% PROCESS waste/summary.html %]
diff --git a/templates/web/base/waste/summary_request.html b/templates/web/base/waste/summary_request.html
new file mode 100644
index 000000000..83c4091aa
--- /dev/null
+++ b/templates/web/base/waste/summary_request.html
@@ -0,0 +1,20 @@
+[%
+title = 'Submit container request';
+thing = 'container request';
+summary_title = 'Container requests';
+step1 = 'request';
+%]
+
+[% BLOCK answers %]
+  [% FOR container IN data.keys.grep('^container-') %]
+    [% NEXT UNLESS data.$container %]
+    [% SET container_id = container.replace('container-', '') %]
+    [% SET quantity_key = container.replace('container-', 'quantity-') %]
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key govuk-summary-list__key--sub">[% containers.$container_id %]</dt>
+        <dd class="govuk-summary-list__value">[% data.$quantity_key %]</dd>
+    </div>
+  [% END %]
+[% END %]
+
+[% PROCESS waste/summary.html %]