From 5cd446f01294d6aa05a755cbb6a465f82199c40b Mon Sep 17 00:00:00 2001
From: paddynski-opencast
 <128393110+paddynski-opencast@users.noreply.github.com>
Date: Fri, 5 Jan 2024 10:01:59 +0000
Subject: [PATCH] DC-5867: Amended registration received e-mail (#1132)

* ECL-688: Amended registration received e-mail

* ECL-688: Amended registration received e-mail

* ECL-688: Amended registration received e-mail

* ECL-688: Amended registration received e-mail
---
 app/preview/TemplateParams.scala              | 10 ++++++--
 .../ecl/eclRegistrationReceived.scala.html    | 25 ++++++++++++++-----
 .../ecl/eclRegistrationReceived.scala.txt     |  9 ++++++-
 .../ecl/eclRegistrationReceived_cy.scala.html | 25 ++++++++++++++-----
 .../ecl/eclRegistrationReceived_cy.scala.txt  |  9 ++++++-
 5 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/app/preview/TemplateParams.scala b/app/preview/TemplateParams.scala
index 3abafbf11..4cb5d1cc6 100644
--- a/app/preview/TemplateParams.scala
+++ b/app/preview/TemplateParams.scala
@@ -3621,7 +3621,10 @@ object TemplateParams3 {
       "answers" -> "eyJuYW1lIjoidGVzdCIsImFuc3dlcnMiOlsiMiIsIjMiLCJIb3BlIHRoaXMgd29ya3MiXX0="
     ),
     "ecl_registration_received" -> Map(
-      "name" -> "John Doe"
+      "name"       -> "John Doe",
+      "dateDue"    -> "30 September 2024",
+      "previousFY" -> "2022",
+      "currentFY"  -> "2023"
     ),
     "iforms_submission_rejection_email_non_agent" -> Map(
       "name" -> "John"
@@ -3636,7 +3639,10 @@ object TemplateParams3 {
       "name" -> "John Doe"
     ),
     "ecl_registration_received_cy" -> Map(
-      "name" -> "John Doe"
+      "name"       -> "John Doe",
+      "dateDue"    -> "30 Medi 2024",
+      "previousFY" -> "2022",
+      "currentFY"  -> "2023"
     ),
     "customs_financials_requested_duty_deferment_not_found" -> Map(
       "recipientName_FullName" -> "ABC ltd"
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived.scala.html
index d7bcf8b51..02c7cc29b 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived.scala.html
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived.scala.html
@@ -26,7 +26,7 @@
             We have received your answers as part of your registration for the Economic Crime Levy (ECL). Please save this email for your records.
         </p>
 
-        <p style="font-weight: bold;">What happens next</p>
+        <h2 class="govuk-heading-l">What happens next</h2>
 
         <p>
             We will review your answers. We may contact you using the details you provided if we need any more information. This process will take up to 15 working days.
@@ -40,15 +40,28 @@
             You can then add the Economic Crime Levy to your business tax account.
         </p>
 
-        <p style="font-weight: bold;">How to submit a return</p>
+        <h2 class="govuk-heading-l">How to submit a return</h2>
 
         <p>
             You will need to complete a return and pay the levy on a yearly basis.
         </p>
 
-        <p>
-            The next deadline for submitting a return and making a payment is 30 September 2023. You will be charged interest if you make a late payment.
-        </p>
+        @if(params.contains("currentFY")) {
+            <p>
+                The next deadline for submitting a return and making a payment is @params("dateDue"). You will be charged interest if you make a late payment.
+            </p>
+        }
+
+        @if(params.contains("previousFY")) {
+            @params.get("previousFY").map(_.toString.toInt).map { previousFY =>
+                <p>
+                    You need to submit a return for the @previousFY to @(previousFY + 1) financial year as soon as possible.
+                </p>
+                <p>
+                    The return will show as overdue because it's in the previous financial year.
+                </p>
+            }
+        }
 
         <p>
             You will not receive an email or notification from HMRC to remind you to submit a return.
@@ -66,7 +79,7 @@
             <li>the contact details of the person in your organisation who is completing the return</li>
         </ul>
 
-        <p style="font-weight: bold;">Why you got this email</p>
+        <h2 class="govuk-heading-l">Why you got this email</h2>
 
         <p>
             This email address is registered as the email address we can use to contact you about the ECL.
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived.scala.txt
index 68a069667..a2536b589 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived.scala.txt
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived.scala.txt
@@ -17,7 +17,14 @@ How to submit a return
 
 You will need to complete a return and pay the levy on a yearly basis.
 
-The next deadline for submitting a return and making a payment is 30 September 2023. You will be charged interest if you make a late payment.
+@if(params.contains("currentFY")) {
+The next deadline for submitting a return and making a payment is @params("dateDue"). You will be charged interest if you make a late payment.
+}
+
+@if(params.contains("previousFY")) { @params.get("previousFY").map(_.toString.toInt).map { previousFY =>
+You need to submit a return for the @previousFY to @(previousFY + 1) financial year as soon as possible.
+The return will show as overdue because it's in the previous financial year.
+}}
 
 You will not receive an email or notification from HMRC to remind you to submit a return.
 
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived_cy.scala.html
index 0d71d8d4b..f59f530c9 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived_cy.scala.html
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived_cy.scala.html
@@ -26,7 +26,7 @@
             Mae’r atebion ar gyfer eich cofrestriad ar gyfer yr Ardoll Troseddau Economaidd (ECL) wedi dod i law. Cadwch yr e-bost hwn ar gyfer eich cofnodion.
         </p>
 
-        <p style="font-weight: bold;">Yr hyn sy’n digwydd nesaf</p>
+        <h2 class="govuk-heading-l">Yr hyn sy’n digwydd nesaf</h2>
 
         <p>
             Byddwn yn adolygu’ch atebion. Efallai y byddwn yn cysylltu â chi gan ddefnyddio’r manylion a roddwyd gennych os bydd angen rhagor o wybodaeth arnom. Bydd y broses hon yn cymryd hyd at 15 diwrnod gwaith.
@@ -40,15 +40,28 @@
             Gallwch wedyn ychwanegu’r Ardoll Troseddau Economaidd at eich cyfrif treth busnes.
         </p>
 
-        <p style="font-weight: bold;">Sut i gyflwyno datganiad</p>
+        <h2 class="govuk-heading-l">Sut i gyflwyno datganiad</h2>
 
         <p>
             Bydd angen i chi lenwi datganiad a thalu’r ardoll yn flynyddol.
         </p>
 
-        <p>
-            Y dyddiad cau nesaf ar gyfer cyflwyno datganiad a gwneud taliad yw 30 Medi 2023. Codir llog arnoch os ydych yn talu’n hwyr.
-        </p>
+        @if(params.contains("currentFY")) {
+            <p>
+                Y dyddiad cau nesaf ar gyfer cyflwyno datganiad a gwneud taliad yw @params("dateDue"). Codir llog arnoch os ydych yn talu’n hwyr.
+            </p>
+        }
+
+        @if(params.contains("previousFY")) {
+            @params.get("previousFY").map(_.toString.toInt).map { previousFY =>
+                <p>
+                    Bydd angen i chi gyflwyno Ffurflen Dreth ar gyfer blwyddyn ariannol @previousFY i @(previousFY + 1) cyn gynted â phosibl.
+                </p>
+                <p>
+                    Bydd y Ffurflen Dreth yn ymddangos fel hwyr oherwydd ei bod yn y flwyddyn ariannol flaenorol.
+                </p>
+            }
+        }
 
         <p>
             Ni fyddwch yn cael e-bost na hysbysiad oddi wrth CThEF i’ch atgoffa i gyflwyno datganiad.
@@ -66,7 +79,7 @@
             <li>manylion cyswllt y person yn eich sefydliad sy’n llenwi’r datganiad</li>
         </ul>
 
-        <p style="font-weight: bold;">Pam cawsoch yr e-bost hwn</p>
+        <h2 class="govuk-heading-l">Pam cawsoch yr e-bost hwn</h2>
 
         <p>
             Dyma’r cyfeiriad e-bost sydd wedi’i gofrestru er mwyn i ni allu cysylltu â chi ynghylch yr ECL.
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived_cy.scala.txt
index 85b50bc7a..c12488a44 100644
--- a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived_cy.scala.txt
+++ b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationReceived_cy.scala.txt
@@ -17,7 +17,14 @@ Sut i gyflwyno datganiad
 
 Bydd angen i chi lenwi datganiad a thalu’r ardoll yn flynyddol.
 
-Y dyddiad cau nesaf ar gyfer cyflwyno datganiad a gwneud taliad yw 30 Medi 2023. Codir llog arnoch os ydych yn talu’n hwyr.
+@if(params.contains("currentFY")) {
+Y dyddiad cau nesaf ar gyfer cyflwyno datganiad a gwneud taliad yw @params("dateDue"). Codir llog arnoch os ydych yn talu’n hwyr.
+}
+
+@if(params.contains("previousFY")) { @params.get("previousFY").map(_.toString.toInt).map { previousFY =>
+Bydd angen i chi gyflwyno Ffurflen Dreth ar gyfer blwyddyn ariannol @previousFY i @(previousFY + 1) cyn gynted â phosibl.
+Bydd y Ffurflen Dreth yn ymddangos fel hwyr oherwydd ei bod yn y flwyddyn ariannol flaenorol.
+}}
 
 Ni fyddwch yn cael e-bost na hysbysiad oddi wrth CThEF i’ch atgoffa i gyflwyno datganiad.