ECL-684: Registration Email Confirmation Page - Content Update (#1116)

* ECL-684: Registration Email Confirmation Page - Content Update * Updated Welsh * ECL-684: Fixed unit tests for ECL * ECL-684: Registration Email Confirmation Page - Content update * ECL-684: Fixed text indentation for ECL registration submitted email --------- Co-authored-by: Liam <liam.oconnor@digital.hmrc.gov.uk>
hmrc · Dec 5, 2023 · 28d1751 · 28d1751
1 parent f18f9c6
commit 28d1751
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 12 deletions.
diff --git a/app/preview/TemplateParams.scala b/app/preview/TemplateParams.scala
@@ -3521,17 +3521,21 @@ object TemplateParams3 {
       "name"                     -> "John Doe",
       "eclRegistrationReference" -> "XMECL0000000001",
       "eclRegistrationDate"      -> "20 September 2023",
-      "dateDue"                  -> "30 September 2023",
+      "dateDue"                  -> "30 September 2024",
       "isPrimaryContact"         -> "true",
-      "secondContactEmail"       -> "joe.smith@test.com"
+      "secondContactEmail"       -> "joe.smith@test.com",
+      "previousFY"               -> "2022",
+      "currentFY"                -> "2023"
     ),
     "ecl_registration_submitted_cy" -> Map(
       "name"                     -> "John Doe",
       "eclRegistrationReference" -> "XMECL0000000001",
       "eclRegistrationDate"      -> "20 September 2023",
-      "dateDue"                  -> "30 September 2023",
+      "dateDue"                  -> "30 September 2024",
       "isPrimaryContact"         -> "true",
-      "secondContactEmail"       -> "joe.smith@test.com"
+      "secondContactEmail"       -> "joe.smith@test.com",
+      "previousFY"               -> "2022",
+      "currentFY"                -> "2023"
     ),
     "ecl_return_submitted" -> Map(
       "name"            -> "John Doe",

diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationSubmitted.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationSubmitted.scala.html
@@ -49,9 +49,22 @@
             You will not receive an email or notification from HMRC to remind you to submit a return.
         </p>
 
-        <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("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 style="font-weight: bold;">How to submit a return</p>
 

diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationSubmitted.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationSubmitted.scala.txt
@@ -14,7 +14,14 @@ You will need to complete a return and pay the levy on a yearly basis.
 
 You will not receive an email or notification from HMRC to remind you to submit a return.
 
+@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.
+}}
 
 How to submit a return
 

diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationSubmitted_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationSubmitted_cy.scala.html
@@ -49,9 +49,23 @@
             Ni fyddwch yn cael e-bost na hysbysiad oddi wrth CThEF i’ch atgoffa i gyflwyno datganiad.
         </p>
 
-        <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("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 style="font-weight: bold;">Sut i gyflwyno datganiad</p>
 

diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationSubmitted_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclRegistrationSubmitted_cy.scala.txt
@@ -14,7 +14,14 @@ Bydd angen i chi lenwi datganiad a thalu’r ardoll yn flynyddol.
 
 Ni fyddwch yn cael e-bost na hysbysiad oddi wrth CThEF i’ch atgoffa i gyflwyno datganiad.
 
+@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.
+}}
 
 Sut i gyflwyno datganiad
 

diff --git a/test/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/EclTemplatesSpec.scala b/test/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/EclTemplatesSpec.scala
@@ -32,7 +32,9 @@ class EclTemplatesSpec extends TemplateComparisonSpec with CommonParamsForSpec {
         "eclRegistrationDate"      -> "20 September 2023",
         "dateDue"                  -> "30 September 2023",
         "isPrimaryContact"         -> "true",
-        "secondContactEmail"       -> "joe.smith@test.com"
+        "secondContactEmail"       -> "joe.smith@test.com",
+        "previousFY"               -> "2022",
+        "currentFY"                -> "2023"
       )
 
       compareContent("ecl_registration_submitted", registrationSubmittedParams)(ecl)
@@ -45,7 +47,9 @@ class EclTemplatesSpec extends TemplateComparisonSpec with CommonParamsForSpec {
         "eclRegistrationDate"      -> "20 September 2023",
         "dateDue"                  -> "30 September 2023",
         "isPrimaryContact"         -> "true",
-        "secondContactEmail"       -> "joe.smith@test.com"
+        "secondContactEmail"       -> "joe.smith@test.com",
+        "previousFY"               -> "2022",
+        "currentFY"                -> "2023"
       )
 
       compareContent("ecl_registration_submitted_cy", registrationSubmittedParams, isWelsh = true)(ecl)