fixup! [Kingston] New wording on container request emails; link to st…

…atus page for request

templates/email/default/alert-update.html

@@ -13,6 +13,9 @@
 <th style="[% td_style %][% primary_column_style %]" id="primary_column">
   [% start_padded_box | safe %]
   <h1 style="[% h1_style %]">New updates on <a href="[% problem_url %]">[% title %]</a></h1>
+  [% IF cobrand.moniker == 'kingston' AND report.category == 'Request new container' %]
+  <a style="[% button_style %]" href="https://kingston-self.test.achieveservice.com/service/Status_update_for_waste_container_request?client_ref=RBK-[% report.id %]">Track your request</a>
+  [% END %]
   [%~ INCLUDE '_email_comment_list.html' %]
   [% TRY %][% INCLUDE '_alert_update_after_updates.html' %][% CATCH file %][% END %]
  [% IF unsubscribe_url %]

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

@@ -57,9 +57,9 @@ <h1 style="[% h1_style %]">Your report has been&nbsp;logged</h1>
     You do not need to be home for our crew to deliver the bin.
   </p>
   <p style="[% p_style %]">
-    If you&apos;ve requested a replacement for a damaged bin, leave your old bin
-    at the front of your property. The crew will remove it when they deliver
-    the new bin.
+    <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>

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 %],
 
@@ -34,9 +39,8 @@ If you have requested a bin, box or caddy to be collected as part of the request
 
 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.
+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