Merge branch 'issues/commercial/1273-ref-number-com'

10 files changed, 22 insertions, 12 deletions

diff --git a/templates/email/buckinghamshire/other-reported.html b/templates/email/buckinghamshire/other-reported.html
index fe03376f5..584c5b89e 100644
--- a/templates/email/buckinghamshire/other-reported.html
+++ b/templates/email/buckinghamshire/other-reported.html
@@ -12,8 +12,8 @@ INCLUDE '_email_top.html';
   [% start_padded_box %]
   <h1 style="[% h1_style %]">Your report has been&nbsp;logged</h1>
   <p style="[% p_style %]">Your report to [% report.body %] has been logged on [% site_name %].</p>
-[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %]
-<p style="[% p_style %]">Please note that [% c.cobrand.council_name %] is not responsible for this type
+[% IF cobrand.is_council && !cobrand.owns_problem( report ) %]
+<p style="[% p_style %]">Please note that [% cobrand.council_name %] is not responsible for this type
 of report, so it will instead be sent to [% report.body %].</p>
 [% ELSE %]
 [% TRY %][% INCLUDE '_council_reference.html' problem=report %][% CATCH file %][% END %]
diff --git a/templates/email/buckinghamshire/other-reported.txt b/templates/email/buckinghamshire/other-reported.txt
index 50a879d79..7f78617e0 100644
--- a/templates/email/buckinghamshire/other-reported.txt
+++ b/templates/email/buckinghamshire/other-reported.txt
@@ -4,8 +4,8 @@ Hello [% report.name %],
 
 Your report to [% report.body %] has been logged on [% site_name %].
 
-[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %]
-Please note that [% c.cobrand.council_name %] is not responsible for this type
+[% IF cobrand.is_council && !cobrand.owns_problem( report ) %]
+Please note that [% cobrand.council_name %] is not responsible for this type
 of report, so it will instead be sent to [% report.body %].
 [% ELSE %]
 [% TRY %][% INCLUDE '_council_reference.txt' problem=report %][% CATCH file %][% END %]
diff --git a/templates/email/default/other-reported.html b/templates/email/default/other-reported.html
index fe03376f5..584c5b89e 100644
--- a/templates/email/default/other-reported.html
+++ b/templates/email/default/other-reported.html
@@ -12,8 +12,8 @@ INCLUDE '_email_top.html';
   [% start_padded_box %]
   <h1 style="[% h1_style %]">Your report has been&nbsp;logged</h1>
   <p style="[% p_style %]">Your report to [% report.body %] has been logged on [% site_name %].</p>
-[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %]
-<p style="[% p_style %]">Please note that [% c.cobrand.council_name %] is not responsible for this type
+[% IF cobrand.is_council && !cobrand.owns_problem( report ) %]
+<p style="[% p_style %]">Please note that [% cobrand.council_name %] is not responsible for this type
 of report, so it will instead be sent to [% report.body %].</p>
 [% ELSE %]
 [% TRY %][% INCLUDE '_council_reference.html' problem=report %][% CATCH file %][% END %]
diff --git a/templates/email/default/other-reported.txt b/templates/email/default/other-reported.txt
index 1dc8d0b44..7b1230555 100644
--- a/templates/email/default/other-reported.txt
+++ b/templates/email/default/other-reported.txt
@@ -4,8 +4,8 @@ Hello [% report.name %],
 
 Your report to [% report.body %] has been logged on [% site_name %].
 
-[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %]
-Please note that [% c.cobrand.council_name %] is not responsible for this type
+[% IF cobrand.is_council && !cobrand.owns_problem( report ) %]
+Please note that [% cobrand.council_name %] is not responsible for this type
 of report, so it will instead be sent to [% report.body %].
 [% ELSE %]
 [% TRY %][% INCLUDE '_council_reference.txt' problem=report %][% CATCH file %][% END %]
diff --git a/templates/email/fixamingata/other-reported.html b/templates/email/fixamingata/other-reported.html
index 3ba29dcb0..0b0160696 100644
--- a/templates/email/fixamingata/other-reported.html
+++ b/templates/email/fixamingata/other-reported.html
@@ -12,8 +12,8 @@ INCLUDE '_email_top.html';
   [% start_padded_box %]
   <h1 style="[% h1_style %]">Din rapport har&nbsp;loggats</h1>
   <p style="[% p_style %]">Din rapport till [% report.body %] har blivit loggad på [% site_name %].
-[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %]
-Eftersom [% c.cobrand.council_name %] inte är ansvarig för den här typen av
+[% IF cobrand.is_council && !cobrand.owns_problem( report ) %]
+Eftersom [% cobrand.council_name %] inte är ansvarig för den här typen av
 rapporter, så kommer rapporten istället att skickas till [% report.body %].
 [% END %]
   </p>
diff --git a/templates/email/fixamingata/other-reported.txt b/templates/email/fixamingata/other-reported.txt
index 2c50c765c..e39adf527 100644
--- a/templates/email/fixamingata/other-reported.txt
+++ b/templates/email/fixamingata/other-reported.txt
@@ -4,8 +4,8 @@ Hej [% report.name %],
 
 Din rapport till [% report.body %] har blivit loggad på [% site_name %].
 
-[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %]
-Eftersom [% c.cobrand.council_name %] inte är ansvarig för den här typen av
+[% IF cobrand.is_council && !cobrand.owns_problem( report ) %]
+Eftersom [% cobrand.council_name %] inte är ansvarig för den här typen av
 rapporter, så kommer rapporten istället att skickas till [% report.body %].
 [% END %]
 
diff --git a/templates/email/fixmystreet.com/_council_reference.html b/templates/email/fixmystreet.com/_council_reference.html
new file mode 100644
index 000000000..7a37c4454
--- /dev/null
+++ b/templates/email/fixmystreet.com/_council_reference.html
@@ -0,0 +1,4 @@
+[% IF sent_confirm_id_ref ~%]
+<p style="[% p_style %]">The report's reference number is <strong>[% sent_confirm_id_ref %]</strong>.
+  Please quote this if you need to contact the council about this report.</p>
+[%~ END %]
diff --git a/templates/email/fixmystreet.com/_council_reference.txt b/templates/email/fixmystreet.com/_council_reference.txt
new file mode 100644
index 000000000..5eac50791
--- /dev/null
+++ b/templates/email/fixmystreet.com/_council_reference.txt
@@ -0,0 +1,4 @@
+[% IF sent_confirm_id_ref ~%]
+The report's reference number is [% sent_confirm_id_ref %]. Please quote this
+if you need to contact the council about this report.
+[%~ END %]
diff --git a/templates/email/fixmystreet.com/confirm_report_sent.html b/templates/email/fixmystreet.com/confirm_report_sent.html
new file mode 100644
index 000000000..5a0c19f0d
--- /dev/null
+++ b/templates/email/fixmystreet.com/confirm_report_sent.html
@@ -0,0 +1 @@
+[% INCLUDE 'other-reported.html' %]
\ No newline at end of file
diff --git a/templates/email/fixmystreet.com/confirm_report_sent.txt b/templates/email/fixmystreet.com/confirm_report_sent.txt
new file mode 100644
index 000000000..3d566f89b
--- /dev/null
+++ b/templates/email/fixmystreet.com/confirm_report_sent.txt
@@ -0,0 +1 @@
+[% INCLUDE 'other-reported.txt' %]