fixup! fixup! fixup! fixup! [Kingston] New wording on container reque…

…st emails; link to status page for request
mysociety · May 7, 2024 · 531e6ad · 531e6ad
1 parent be22e85
commit 531e6ad
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/templates/email/default/alert-update.html b/templates/email/default/alert-update.html
@@ -13,9 +13,6 @@
 <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="[% cobrand.feature('waste_features').track_request_url %]?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 %]

diff --git a/templates/email/default/alert-update.txt b/templates/email/default/alert-update.txt
@@ -3,10 +3,6 @@ Subject: New [% site_name %] updates on report: '[% report.title %]'
 You asked us to send you an email every time an update was made to the
 [% site_name %] report: [% report.title %].
 
-[% 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 %]
-
 The following updates have been left on this report:
 
 [% INCLUDE '_email_comment_list.txt' %]

diff --git a/templates/email/kingston/alert-update.html b/templates/email/kingston/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</h1>
+  [% 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>
+  [% END %]
   [%~ INCLUDE '_email_comment_list.html' %]
   [% TRY %][% INCLUDE '_alert_update_after_updates.html' %][% CATCH file %][% END %]
  [% IF unsubscribe_url %]

diff --git a/templates/email/kingston/alert-update.txt b/templates/email/kingston/alert-update.txt
@@ -1,7 +1,15 @@
-Subject: Update on report, reference RBK-[% report.id %]
+[% SET subject_text = 'Update on report, ' ~%]
+[% IF report.category == 'Request new container' ~%]
+[% subject_text = 'Update on your bin request, ' ~%]
+[% END ~%]
+Subject: [% subject_text ~%] reference RBK-[% report.id %]
 
 The following updates have been left on this report:
 
+[% IF report.category == 'Request new container' %]
+Track your request - [% cobrand.feature('waste_features').track_request_url %]?client_ref=RBK-[% report.id %]
+[% END %]
+
 [% INCLUDE '_email_comment_list.txt' %]
 
 [% state_message %]