Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DC-5622: Remove all private beta related content #1104

Merged
merged 3 commits into from
Oct 20, 2023
Merged

DC-5622: Remove all private beta related content #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c10b574
Removed privateBeta reference from ECL templates
liandra-giacomine Oct 13, 2023
a35bfa2
Merge branch 'main' into ECL-562
liandra-giacomine Oct 18, 2023
10f3035
scalafmt
liandra-giacomine Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 18 additions & 20 deletions app/preview/TemplateParams.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3555,28 +3555,26 @@ object TemplateParams3 {
"secondContactEmail" -> "joe.smith@test.com"
),
"ecl_return_submitted" -> Map(
"name" -> "John Doe",
"dateSubmitted" -> "1 September 2023",
"periodStartDate" -> "1 April 2022",
"periodEndDate" -> "31 March 2023",
"chargeReference" -> "XY007000075424",
"fyStartYear" -> "2022",
"fyEndYear" -> "2023",
"datePaymentDue" -> "30 September 2023",
"amountDue" -> "£10,000",
"privateBetaEnabled" -> "true"
"name" -> "John Doe",
"dateSubmitted" -> "1 September 2023",
"periodStartDate" -> "1 April 2022",
"periodEndDate" -> "31 March 2023",
"chargeReference" -> "XY007000075424",
"fyStartYear" -> "2022",
"fyEndYear" -> "2023",
"datePaymentDue" -> "30 September 2023",
"amountDue" -> "£10,000"
),
"ecl_return_submitted_cy" -> Map(
"name" -> "John Doe",
"dateSubmitted" -> "1 Medi 2023",
"periodStartDate" -> "1 Ebrill 2022",
"periodEndDate" -> "31 Mawrth 2023",
"chargeReference" -> "XY007000075424",
"fyStartYear" -> "2022",
"fyEndYear" -> "2023",
"datePaymentDue" -> "30 Medi 2023",
"amountDue" -> "£10,000",
"privateBetaEnabled" -> "true"
"name" -> "John Doe",
"dateSubmitted" -> "1 Medi 2023",
"periodStartDate" -> "1 Ebrill 2022",
"periodEndDate" -> "31 Mawrth 2023",
"chargeReference" -> "XY007000075424",
"fyStartYear" -> "2022",
"fyEndYear" -> "2023",
"datePaymentDue" -> "30 Medi 2023",
"amountDue" -> "£10,000"
),
"ecl_nil_return_submitted" -> Map(
"name" -> "John Doe",
Expand Down
14 changes: 5 additions & 9 deletions app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclReturnSubmitted.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,18 @@
You will not receive an email or notification from HMRC to remind you to make a payment.
</p>

@if(params("privateBetaEnabled").toString.toBoolean){
<p>You will be able to pay the levy from August 2023.</p>
}
<p>
You will be charged interest if you make a late payment.
</p>

@if(!params("privateBetaEnabled").toString.toBoolean) {
<p style="font-weight: bold;">How to pay the levy</p>
<p style="font-weight: bold;">How to pay the levy</p>

<p>You can pay the levy by going to the guidance on how to pay:</p>
<p>You can pay the levy by going to the guidance on how to pay:</p>

<a href="https://www.gov.uk/guidance/pay-your-economic-crime-levy" style="color: #005EA5;">
<a href="https://www.gov.uk/guidance/pay-your-economic-crime-levy" style="color: #005EA5;">
https://www.gov.uk/guidance/pay-your-economic-crime-levy
</a>
}
</a>

<p style="font-weight: bold;">Why you got this email</p>

<p>This is the email address you provided when you submitted your return.</p>
Expand Down
6 changes: 1 addition & 5 deletions app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclReturnSubmitted.scala.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,12 @@ You must pay the levy by @params("datePaymentDue"). Your ECL return number must

You will not receive an email or notification from HMRC to remind you to make a payment.

@if(params("privateBetaEnabled").toString.toBoolean){
You will be able to pay the levy from August 2023.
}
You will be charged interest if you make a late payment.
@if(!params("privateBetaEnabled").toString.toBoolean) {

How to pay the levy

You can pay the levy by going to the guidance on how to pay:
https://www.gov.uk/guidance/pay-your-economic-crime-levy
}

Why you got this email

Expand Down
16 changes: 6 additions & 10 deletions app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclReturnSubmitted_cy.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,18 @@
Ni fyddwch yn cael e-bost na hysbysiad oddi wrth CThEF i’ch atgoffa i dalu.
</p>

@if(params("privateBetaEnabled").toString.toBoolean){
<p>Byddwch yn gallu talu’r ardoll o fis Awst 2023.</p>
}
<p>
Codir llog arnoch os ydych yn talu’n hwyr.
</p>

@if(!params("privateBetaEnabled").toString.toBoolean) {
<p style="font-weight: bold;">Sut i dalu’r ardoll</p>
<p style="font-weight: bold;">Sut i dalu’r ardoll</p>

<p>Gallwch dalu’r ardoll drwy fynd i’r arweiniad ar sut i dalu:</p>
<p>Gallwch dalu’r ardoll drwy fynd i’r arweiniad ar sut i dalu:</p>

<a href="https://www.gov.uk/guidance/pay-your-economic-crime-levy" style="color: #005EA5;">
https://www.gov.uk/guidance/pay-your-economic-crime-levy
</a>

<a href="https://www.gov.uk/guidance/pay-your-economic-crime-levy" style="color: #005EA5;">
https://www.gov.uk/guidance/pay-your-economic-crime-levy
</a>
}
<p style="font-weight: bold;">Pam cawsoch yr e-bost hwn</p>

<p>Hwn yw’r cyfeiriad e-bost a roddwyd gennych pan wnaethoch gyflwyno’ch datganiad.</p>
Expand Down
6 changes: 1 addition & 5 deletions app/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/eclReturnSubmitted_cy.scala.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,12 @@ Mae’n rhaid i chi dalu’r ardoll erbyn @params("datePaymentDue"). Mae’n rha

Ni fyddwch yn cael e-bost na hysbysiad oddi wrth CThEF i’ch atgoffa i dalu.

@if(params("privateBetaEnabled").toString.toBoolean){
Byddwch yn gallu talu’r ardoll o fis Awst 2023.
}
Codir llog arnoch os ydych yn talu’n hwyr.
@if(!params("privateBetaEnabled").toString.toBoolean) {

Sut i dalu’r ardoll

Gallwch dalu’r ardoll drwy fynd i’r arweiniad ar sut i dalu:
https://www.gov.uk/guidance/pay-your-economic-crime-levy
}

Pam cawsoch yr e-bost hwn

Expand Down
44 changes: 20 additions & 24 deletions test/uk/gov/hmrc/hmrcemailrenderer/templates/ecl/EclTemplatesSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ class EclTemplatesSpec extends TemplateComparisonSpec with CommonParamsForSpec {
"eclRegistrationDate" -> "20 September 2023",
"dateDue" -> "30 September 2023",
"isPrimaryContact" -> "true",
"secondContactEmail" -> "joe.smith@test.com",
"privateBetaEnabled" -> "true"
"secondContactEmail" -> "joe.smith@test.com"
)

compareContent("ecl_registration_submitted", registrationSubmittedParams)(ecl)
Expand All @@ -46,8 +45,7 @@ class EclTemplatesSpec extends TemplateComparisonSpec with CommonParamsForSpec {
"eclRegistrationDate" -> "20 September 2023",
"dateDue" -> "30 September 2023",
"isPrimaryContact" -> "true",
"secondContactEmail" -> "joe.smith@test.com",
"privateBetaEnabled" -> "true"
"secondContactEmail" -> "joe.smith@test.com"
)

compareContent("ecl_registration_submitted_cy", registrationSubmittedParams, isWelsh = true)(ecl)
Expand All @@ -71,33 +69,31 @@ class EclTemplatesSpec extends TemplateComparisonSpec with CommonParamsForSpec {

"include return submitted content" in {
val returnSubmittedParams = commonParameters ++ Map(
"name" -> "John Doe",
"dateSubmitted" -> "1 September 2023",
"periodStartDate" -> "1 April 2022",
"periodEndDate" -> "31 March 2023",
"chargeReference" -> "XY007000075424",
"fyStartYear" -> "2022",
"fyEndYear" -> "2023",
"datePaymentDue" -> "30 September 2023",
"amountDue" -> "£10,000",
"privateBetaEnabled" -> "true"
"name" -> "John Doe",
"dateSubmitted" -> "1 September 2023",
"periodStartDate" -> "1 April 2022",
"periodEndDate" -> "31 March 2023",
"chargeReference" -> "XY007000075424",
"fyStartYear" -> "2022",
"fyEndYear" -> "2023",
"datePaymentDue" -> "30 September 2023",
"amountDue" -> "£10,000"
)

compareContent("ecl_return_submitted", returnSubmittedParams)(ecl)
}

"include return submitted content cy" in {
val returnSubmittedParams = commonParameters ++ Map(
"name" -> "John Doe",
"dateSubmitted" -> "1 Medi 2023",
"periodStartDate" -> "1 Ebrill 2022",
"periodEndDate" -> "31 Mawrth 2023",
"chargeReference" -> "XY007000075424",
"fyStartYear" -> "2022",
"fyEndYear" -> "2023",
"datePaymentDue" -> "30 Medi 2023",
"amountDue" -> "£10,000",
"privateBetaEnabled" -> "true"
"name" -> "John Doe",
"dateSubmitted" -> "1 Medi 2023",
"periodStartDate" -> "1 Ebrill 2022",
"periodEndDate" -> "31 Mawrth 2023",
"chargeReference" -> "XY007000075424",
"fyStartYear" -> "2022",
"fyEndYear" -> "2023",
"datePaymentDue" -> "30 Medi 2023",
"amountDue" -> "£10,000"
)

compareContent("ecl_return_submitted_cy", returnSubmittedParams, isWelsh = true)(ecl)
Expand Down