[Kingston] New wording on container request emails

And a link to status page for request.

For FD-3630

templates/email/default/waste/other-reported.html

@@ -10,15 +10,20 @@
 
 <th style="[% td_style %][% primary_column_style %]" id="primary_column">
   [% start_padded_box | safe %]
- [% IF report.category == 'Request new container' %]
-  <h1 style="[% h1_style %]">Your request has been&nbsp;logged</h1>
- [% ELSE %]
-  <h1 style="[% h1_style %]">Your report has been&nbsp;logged</h1>
- [% END %]
-
-[% IF cobrand.moniker == 'sutton' %]
-<p style="[% p_style %]">Thank you for contacting the London Borough of Sutton.</p>
-[% END %]
+
+  [% IF report.category == 'Request new container' %]
+    [% IF cobrand.moniker == 'kingston' %]
+      <h1 style="[% h1_style %]">Your bin request has been&nbsp;logged</h1>
+    [% ELSE %]
+      <h1 style="[% h1_style %]">Your request has been&nbsp;logged</h1>
+    [% END %]
+  [% ELSE %]
+    <h1 style="[% h1_style %]">Your report has been&nbsp;logged</h1>
+  [% END %]
+
+  [% IF cobrand.moniker == 'sutton' %]
+  <p style="[% p_style %]">Thank you for contacting the London Borough of Sutton.</p>
+  [% END %]
 
 [% INCLUDE '_council_reference.html' problem=report %]
 
@@ -39,6 +44,22 @@ <h1 style="[% h1_style %]">Your report has been&nbsp;logged</h1>
             <li>We will not be able to exchange a bin, box or caddy if the old bin is not available, and you may not receive your replacement.</li>
         </ul>
     [% END %]
+
+[% ELSIF cobrand.moniker == 'kingston' AND report.category == 'Request new container' %]
+  <p style="[% p_style %]">We aim to deliver your bin in [% cobrand.wasteworks_config.request_timeframe %].</p>
+  <p style="[% p_style %]">
+    <b>On delivery day</b><br>
+    You do not need to be home for our crew to deliver the bin.
+  </p>
+  <p style="[% p_style %]">
+    <b>Collecting your old bin</b>
+    If you&apos;ve requested a collection of your old bin, we'll schedule a specific date for our crew
+    to remove it. We aim for this to be the same day as we deliver your new bin, but it could be a different day.
+  </p>
+  <p style="[% p_style %]">
+    <strong>Use track your request link to check for your scheduled delivery date.</strong>
+  </p>
+
 [% ELSE %]
 
     [% IF report.category == 'Report missed collection' %]
@@ -58,6 +79,10 @@ <h1 style="[% h1_style %]">Your report has been&nbsp;logged</h1>
 [% WRAPPER '_email_sidebar.html' object = report %]
     <h2 style="[% h2_style %]">[% report.title | html %]</h2>
     [% report.detail | html_para_email(secondary_p_style) %]
+
+    [% IF cobrand.moniker == 'kingston' AND report.category == 'Request new container' %]
+      <a style="[% button_style %]" href="[% cobrand.feature('waste_features').track_request_url %]?client_ref=RBK-[% report.id %]">Track your request</a>
+    [% END %]
 [% END %]
 
 [% INCLUDE '_email_bottom.html' %]

templates/email/default/waste/other-reported.txt

@@ -1,7 +1,12 @@
-[% IF cobrand.moniker == 'kingston' %][% SET prefix = 'RBK-' ~%]
+[% SET subject_text = 'Your report has been logged' ~%]
+[% IF cobrand.moniker == 'kingston' ~%]
+    [% SET prefix = 'RBK-' ~%]
+    [% IF report.category == 'Request new container' ~%]
+        [% subject_text = 'Your bin request has been logged' ~%]
+    [% END ~%]
 [% ELSIF cobrand.moniker == 'sutton' %][% SET prefix = 'LBS-' ~%]
 [% ELSE %][% SET prefix = '' %][% END ~%]
-Subject: Your report has been logged, reference [% prefix %][% report.id %]
+Subject: [% subject_text ~%], reference [% prefix %][% report.id %]
 
 Dear [% report.name %],
 
@@ -30,6 +35,17 @@ If you have requested a bin, box or caddy to be collected as part of the request
 * We will not be able to exchange a bin, box or caddy if the old bin is not available, and you may not receive your replacement.
 [% END %]
 
+[% ELSIF cobrand.moniker == 'kingston' AND report.category == 'Request new container' %]
+
+On delivery day - You do not need to be home for our crew to deliver the bin.
+
+Collecting your old bin - If you've requested a collection of your old bin, we'll schedule a specific date for our
+crew to remove it. We aim for this to be the same day as we deliver your new bin, but it could be a different day.
+
+We aim to deliver this container to you within [% cobrand.wasteworks_config.request_timeframe %]. If
+you have requested a replacement bin please leave your broken one
+available for collection at the front of your property.
+
 [% ELSE %]
 
 [% IF report.category == 'Report missed collection' %]
@@ -52,6 +68,10 @@ And details:
 
 [% report.detail %]
 
+[% IF cobrand.moniker == 'kingston' AND report.category == 'Request new container' %]
+Track your request: [% cobrand.feature('waste_features').track_request_url %]?client_ref=RBK-[% report.id %]
+[% END %]
+
 [% signature %]
 
 This email was sent automatically, from an unmonitored email account - so

templates/email/kingston/alert-update.html

@@ -23,7 +23,11 @@ <h1 style="[% h1_style %]">New updates</h1>
 [% WRAPPER '_email_sidebar.html' object = report %]
     <h2 style="[% h2_style %]">[% title %]</h2>
     [% report.detail | html_para_email(secondary_p_style) %]
+    [% IF report.category == 'Request new container' %]
+    <a style="[% button_style %]" href="[% cobrand.feature('waste_features').track_request_url %]?client_ref=RBK-[% report.id %]">Track your request</a>
+    [% ELSE %]
     [% TRY %][% INCLUDE '_council_reference_alert_update.html' problem=report p_style=secondary_p_style %][% CATCH file %][% END %]
+    [% END %]
 [% END %]
 
 [% INCLUDE '_email_bottom.html' %]

templates/email/kingston/alert-update.txt

@@ -1,5 +1,9 @@
 Subject: Update on report, reference RBK-[% report.id %]
 
+[% IF report.category == 'Request new container' %]
+Track your request - [% cobrand.feature('waste_features').track_request_url %]?client_ref=RBK-[% report.id %]
+[% END %]
+
 The following updates have been left on this report:
 
 [% INCLUDE '_email_comment_list.txt' %]