ECC-2111 changing content on confirmation email (#1101)

* ECC-2111 changing content on conformation email * requested changes applied * amending click to select
hmrc · Oct 27, 2023 · e241c3b · e241c3b
1 parent 702bb8f
commit e241c3b
Show file tree

Hide file tree

Showing 4 changed files with 104 additions and 61 deletions.
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecc/eccRegistrationSuccessful.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecc/eccRegistrationSuccessful.scala.html
@@ -42,31 +42,45 @@
  <li style="margin: 0 0 10px; font-size: 19px;">move goods to or from Great Britain</li>
  <li style="margin: 0 0 10px; font-size: 19px;">subscribe to customs services</li>
  <li style="margin: 0 0 10px; font-size: 19px;">use the Customs Declaration Service</li>
-
- <li style="margin: 0 0 30px; font-size: 19px;">get an EORI number starting with XI</li>
-
 </ul>
 
-<h2 style="margin: 0 0 30px; font-size: 19px;">Use the Customs Declaration Service</h2>
+<h2 style="margin: 30px 0 30px; font-size: 19px;">Get your EORI number</h2>
 
-<p style="margin: 0 0 30px; font-size: 19px;">We have subscribed you to the Customs Declaration Service. This means you can do things like:</p>
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we cannot send EORI numbers by email. You can obtain your EORI number by following these steps:</p>
 
-<ul style="margin: 0 0 10px; font-size: 19px;">
- <li style="margin: 0 0 10px; font-size: 19px;">submit import and export declarations using your customs declaration software</li>
- <li style="margin: 0 0 10px; font-size: 19px;">pay Customs Duty and import VAT</li>
- <li style="margin: 0 0 10px; font-size: 19px;">get your postponed import VAT statements</li>
-</ul>
+<ol style="margin: 0 0 10px; font-size: 19px;">
+        <li style="margin: 0 0 10px; font-size: 19px;">Go to GOV.UK and search for, 'Get an EORI'.</li>
+        <li style="margin: 0 0 10px; font-size: 19px;">Select the link that says, 'Get an EORI number'.</li>
+        <li style="margin: 0 0 10px; font-size: 19px;">On the Get an EORI number page, select the link that says, 'This guide is also available in Welsh (Cymraeg.)'</li>
+        <li style="margin: 0 0 10px; font-size: 19px;">On the Cael rhif EORI page, select the link that reads, 'Gwneud cais am rif EORI'</li>
+        <li style="margin: 0 0 10px; font-size: 19px;">On the Gwneud cais am rif EORI page, select the link that says, 'wirio statws cais rydych eisoes wedi'i wneud'. You'll find this link near the end of the page.</li>
+        <li style="margin: 0 0 10px; font-size: 19px;">Toggle to Welsh using the Cymraeg button near the start of the page. Sign in using your Government Gateway user ID and password.</li>
+</ol>
+
+<h2 style="margin: 30px 0 30px; font-size: 19px;">About the Customs Declaration Service</h2>
 
-<p style="margin: 0 0 10px; font-size: 19px;">For more information, search 'Customs Declaration Service' on GOV.UK.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">We have subscribed you to the Customs Declaration Service.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">For more information, search ‘Customs Declaration Service’ on GOV.UK.</p>
 } else {
 <ul style="margin: 0 0 10px; font-size: 19px;">
   @dynamicSubscriptionContent
  <li style="margin: 0 0 10px; font-size: 19px;">move goods to or from Great Britain</li>
  <li style="margin: 0 0 10px; font-size: 19px;">subscribe to other customs services</li>
+</ul>
 
- <li style="margin: 0 0 30px; font-size: 19px;">get an EORI number starting with XI</li>
+<h2 style="margin: 30px 0 30px; font-size: 19px;">Get your EORI number</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">For security reasons, we cannot send EORI numbers by email. You can obtain your EORI number by following these steps:</p>
+
+<ol style="margin: 0 0 10px; font-size: 19px;">
+    <li style="margin: 0 0 10px; font-size: 19px;">Go to GOV.UK and search for, 'Get an EORI'.</li>
+    <li style="margin: 0 0 10px; font-size: 19px;">Select the link that says, 'Get an EORI number'.</li>
+    <li style="margin: 0 0 10px; font-size: 19px;">On the Get an EORI number page, select the link that says, 'This guide is also available in Welsh (Cymraeg.)'</li>
+    <li style="margin: 0 0 10px; font-size: 19px;">On the Cael rhif EORI page, select the link that reads, 'Gwneud cais am rif EORI'</li>
+    <li style="margin: 0 0 10px; font-size: 19px;">On the Gwneud cais am rif EORI page, select the link that says, 'wirio statws cais rydych eisoes wedi'i wneud'. You'll find this link near the end of the page.</li>
+    <li style="margin: 0 0 10px; font-size: 19px;">Toggle to Welsh using the Cymraeg button near the start of the page. Sign in using your Government Gateway user ID and password.</li>
+</ol>
 
-</ul>
 }
 }
 
@@ -81,11 +95,7 @@ <h2 style="margin: 0 0 30px; font-size: 19px;">Use the Customs Declaration Servi
 
 @eoriOnly
 
-<h2 style="margin: 0 0 30px; font-size: 19px;">If you move goods to or from Northern Ireland</h2>
-
-<p style="margin: 0 0 30px; font-size: 19px;">If you do not have an EU EORI number you will need to get an EORI number starting with XI.</p>
-
-<p style="margin: 0 0 30px; font-size: 19px;">To get an EORI number starting with XI, search ‘get an EORI number’ on GOV.UK.</p>
+<br />
 
 <p style="margin: 0 0 30px; font-size: 19px;">From HMRC</p>
 

diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecc/eccRegistrationSuccessful.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecc/eccRegistrationSuccessful.scala.txt
@@ -28,29 +28,42 @@ You can now:
 - move goods to or from Great Britain
 - subscribe to customs services
 - use the Customs Declaration Service
-- get an EORI number starting with XI
 
-Use the Customs Declaration Service
 
-We have subscribed you to the Customs Declaration Service. This means you can do things like:
+Get your EORI number
 
-- submit import and export declarations using your customs declaration software
-- pay Customs Duty and import VAT
-- get your postponed import VAT statements
+For security reasons, we cannot send EORI numbers by email. You can obtain your EORI number by following these steps:
 
-For more information, search 'Customs Declaration Service' on GOV.UK.
+- Go to GOV.UK and search for, 'Get an EORI'.
+- Select the link that says, 'Get an EORI number'.
+- On the Get an EORI number page, select the link that says, 'This guide is also available in Welsh (Cymraeg.)'
+- On the Cael rhif EORI page, select the link that reads, 'Gwneud cais am rif EORI'
+- On the Gwneud cais am rif EORI page, select the link that says, 'wirio statws cais rydych eisoes wedi'i wneud'. You'll find this link near the end of the page.
+- Toggle to Welsh using the Cymraeg button near the start of the page. Sign in using your Government Gateway user ID and password.
+
+About the Customs Declaration Service
+
+We have subscribed you to the Customs Declaration Service.
+For more information, search ‘Customs Declaration Service’ on GOV.UK.
 } else {
 @dynamicSubscriptionContent
 - move goods to or from Great Britain
 - subscribe to other customs services
-- get an EORI number starting with XI
 
-}
-If you move goods to or from Northern Ireland
+Get your EORI number
+
+For security reasons, we cannot send EORI numbers by email. You can obtain your EORI number by following these steps:
 
-If you do not have an EU EORI number you will need to get an EORI number starting with XI.
+- Go to GOV.UK and search for, 'Get an EORI'.
+- Select the link that says, 'Get an EORI number'.
+- On the Get an EORI number page, select the link that says, 'This guide is also available in Welsh (Cymraeg.)'
+- On the Cael rhif EORI page, select the link that reads, 'Gwneud cais am rif EORI'
+- On the Gwneud cais am rif EORI page, select the link that says, 'wirio statws cais rydych eisoes wedi'i wneud'. You'll find this link near the end of the page.
+- Toggle to Welsh using the Cymraeg button near the start of the page. Sign in using your Government Gateway user ID and password.
 
-To get an EORI number starting with XI, search ‘get an EORI number’ on GOV.UK.
+
+
+}
 
 From HMRC
 

diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecc/eccRegistrationSuccessful_cy.scala.html b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecc/eccRegistrationSuccessful_cy.scala.html
@@ -42,29 +42,44 @@
  <li style="margin: 0 0 10px; font-size: 19px;">symud nwyddau i Brydain Fawr neu oddi yno</li>
  <li style="margin: 0 0 10px; font-size: 19px;">tanysgrifio i wasanaethau tollau</li>
  <li style="margin: 0 0 10px; font-size: 19px;">defnyddio’r Gwasanaeth Datganiadau Tollau</li>
- <li style="margin: 0 0 30px; font-size: 19px;">cael rhif EORI sy’n dechrau gydag XI</li>
 </ul>
 
-<h2 style="margin: 0 0 30px; font-size: 19px;">Defnyddio’r Gwasanaeth Datganiadau Tollau</h2>
+<h2 style="margin: 30px 0 30px; font-size: 19px;">Cael eich rhif EORI</h2>
 
-<p style="margin: 0 0 30px; font-size: 19px;">Rydym wedi’ch tanysgrifio i’r Gwasanaeth Datganiadau Tollau Mae hyn yn golygu y gallwch chi wneud pethau fel:</p>
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, ni allwn anfon rhifau EORI drwy e-bost. Gallwch gael eich rhif EORI drwy ddilyn y camau canlynol:</p>
 
-<ul style="margin: 0 0 30px; font-size: 19px;">
- <li style="margin: 0 0 10px; font-size: 19px;">cyflwyno datganiadau mewnforio ac allforio gan ddefnyddio’ch meddalwedd datganiad tollau</li>
- <li style="margin: 0 0 10px; font-size: 19px;">talu Tollau Tramor a TAW Mewnforio</li>
- <li style="margin: 0 0 30px; font-size: 19px;">cael eich datganiadau TAW mewnforio ohiriedig</li>
-</ul>
+<ol style="margin: 0 0 10px; font-size: 19px;">
+    <li style="margin: 0 0 10px; font-size: 19px;">Ewch i GOV.UK a chwilio am, 'Get an EORI'.</li>
+    <li style="margin: 0 0 10px; font-size: 19px;">Dewiswch y cysylltiad ar y dudalen sy'n nodi 'Get an EORI number'.</li>
+    <li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Get an EORI number', dewiswch y cysylltiad sy'n nodi 'This guide is also available in Welsh (Cymraeg).'</li>
+    <li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Cael rhif EORI', dewiswch y cysylltiad sy'n nodi 'Gwneud cais am rif EORI'</li>
+    <li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Gwneud cais am rif EORI', dewiswch y cysylltiad sy'n nodi sut i 'wirio statws cais rydych eisoes wedi'i wneud'. Gallwch ddod o hyd i'r cysylltiad hwn yn agos at waelod y dudalen.</li>
+    <li style="margin: 0 0 10px; font-size: 19px;">Gellir toglo i'r Gymraeg drwy bwyso'r botwm ar frig y dudalen. Mewngofnodwch gan ddefnyddio'ch Dynodydd Defnyddiwr (ID) a'ch cyfrinair ar gyfer Porth y Llywodraeth.</li>
+</ol>
 
-<p style="margin: 0 0 30px; font-size: 19px;">I gael rhagor o wybodaeth, chwiliwch am 'Customs Declaration Service' ar GOV.UK.</p>
+<h2 style="margin: 30px 0 30px; font-size: 19px;">Defnyddio'r Gwasanaeth Datganiadau Tollau</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">Rydym wedi’ch tanysgrifio i’r Gwasanaeth Datganiadau Tollau.</p>
+<p style="margin: 0 0 30px; font-size: 19px;">I gael rhagor o wybodaeth, chwiliwch am ‘Customs Declaration Service’ ar GOV.UK.</p>
 } else {
 <ul style="margin: 0 0 30px; font-size: 19px;">
  @dynamicSubscriptionContent
-
  <li style="margin: 0 0 10px; font-size: 19px;">symud nwyddau i Brydain Fawr neu oddi yno</li>
  <li style="margin: 0 0 10px; font-size: 19px;">tanysgrifio i wasanaethau tollau eraill</li>
-
- <li style="margin: 0 0 30px; font-size: 19px;">cael rhif EORI sy’n dechrau gydag XI</li>
 </ul>
+
+<h2 style="margin: 30px 0 30px; font-size: 19px;">Cael eich rhif EORI</h2>
+
+<p style="margin: 0 0 30px; font-size: 19px;">Am resymau diogelwch, ni allwn anfon rhifau EORI drwy e-bost. Gallwch gael eich rhif EORI drwy ddilyn y camau canlynol:</p>
+
+<ol style="margin: 0 0 10px; font-size: 19px;">
+    <li style="margin: 0 0 10px; font-size: 19px;">Ewch i GOV.UK a chwilio am, 'Get an EORI'.</li>
+    <li style="margin: 0 0 10px; font-size: 19px;">Dewiswch y cysylltiad ar y dudalen sy'n nodi 'Get an EORI number'.</li>
+    <li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Get an EORI number', dewiswch y cysylltiad sy'n nodi 'This guide is also available in Welsh (Cymraeg).'</li>
+    <li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Cael rhif EORI', dewiswch y cysylltiad sy'n nodi 'Gwneud cais am rif EORI'</li>
+    <li style="margin: 0 0 10px; font-size: 19px;">Ar y dudalen 'Gwneud cais am rif EORI', dewiswch y cysylltiad sy'n nodi sut i 'wirio statws cais rydych eisoes wedi'i wneud'. Gallwch ddod o hyd i'r cysylltiad hwn yn agos at waelod y dudalen.</li>
+    <li style="margin: 0 0 10px; font-size: 19px;">Gellir toglo i'r Gymraeg drwy bwyso'r botwm ar frig y dudalen. Mewngofnodwch gan ddefnyddio'ch Dynodydd Defnyddiwr (ID) a'ch cyfrinair ar gyfer Porth y Llywodraeth.</li>
+</ol>
 }
 }
 @template_main(params, s"${applicationCompleteCY(params, "Application Complete")}", isWelsh=true) {
@@ -75,12 +90,6 @@ <h2 style="margin: 0 0 30px; font-size: 19px;">Defnyddio’r Gwasanaeth Datgania
  <p style="margin: 0 0 30px; font-size: 19px;">Erbyn hyn, gallwch wneud y canlynol:</p>
 
 @eoriOnly
-
- <h2 style="margin: 0 0 30px; font-size: 19px;">Os ydych yn symud nwyddau i Ogledd Iwerddon neu oddi yno</h2>
-
- <p style="margin: 0 0 30px; font-size: 19px;">Os nad oes gennych rif EORI yn yr UE, bydd angen i chi gael rhif EORI sy’n dechrau gydag XI.</p>
-
- <p style="margin: 0 0 30px; font-size: 19px;">I gael rhif EORI sy’n dechrau gydag XI, ewch i GOV.UK a chwilio am ‘get an EORI number’.</p>
-
+ <br />
  <p style="margin: 0 0 30px; font-size: 19px;">Oddi wrth CThEF</p>
 }
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecc/eccRegistrationSuccessful_cy.scala.txt b/app/uk/gov/hmrc/hmrcemailrenderer/templates/ecc/eccRegistrationSuccessful_cy.scala.txt
@@ -28,29 +28,40 @@ Erbyn hyn, gallwch wneud y canlynol:
 - symud nwyddau i Brydain Fawr neu oddi yno
 - tanysgrifio i wasanaethau tollau
 - defnyddio’r Gwasanaeth Datganiadau Tollau
-- cael rhif EORI sy’n dechrau gydag XI
 
-Defnyddio’r Gwasanaeth Datganiadau Tollau
 
-Rydym wedi’ch tanysgrifio i’r Gwasanaeth Datganiadau Tollau Mae hyn yn golygu y gallwch chi wneud pethau fel:
+Cael eich rhif EORI
 
-- cyflwyno datganiadau mewnforio ac allforio gan ddefnyddio’ch meddalwedd datganiad tollau
-- talu Tollau Tramor a TAW Mewnforio
-- cael eich datganiadau TAW mewnforio ohiriedig
+Am resymau diogelwch, ni allwn anfon rhifau EORI drwy e-bost. Gallwch gael eich rhif EORI drwy ddilyn y camau canlynol:
 
-I gael rhagor o wybodaeth, chwiliwch am 'Customs Declaration Service' ar GOV.UK.
+- Ewch i GOV.UK a chwilio am, 'Get an EORI'.
+- Dewiswch y cysylltiad ar y dudalen sy'n nodi 'Get an EORI number'.
+- Ar y dudalen 'Get an EORI number', dewiswch y cysylltiad sy'n nodi 'This guide is also available in Welsh (Cymraeg).'
+- Ar y dudalen 'Cael rhif EORI', dewiswch y cysylltiad sy'n nodi 'Gwneud cais am rif EORI'
+- Ar y dudalen 'Gwneud cais am rif EORI', dewiswch y cysylltiad sy'n nodi sut i 'wirio statws cais rydych eisoes wedi'i wneud'. Gallwch ddod o hyd i'r cysylltiad hwn yn agos at waelod y dudalen.
+- Gellir toglo i'r Gymraeg drwy bwyso'r botwm ar frig y dudalen. Mewngofnodwch gan ddefnyddio'ch Dynodydd Defnyddiwr (ID) a'ch cyfrinair ar gyfer Porth y Llywodraeth.
+
+Defnyddio'r Gwasanaeth Datganiadau Tollau
+
+Rydym wedi’ch tanysgrifio i’r Gwasanaeth Datganiadau Tollau.
+I gael rhagor o wybodaeth, chwiliwch am ‘Customs Declaration Service’ ar GOV.UK.
 } else {
 @dynamicSubscriptionContent
 - symud nwyddau i Brydain Fawr neu oddi yno
 - tanysgrifio i wasanaethau tollau eraill
-- cael rhif EORI sy’n dechrau gydag XI
-}
 
-Os ydych yn symud nwyddau i Ogledd Iwerddon neu oddi yno
+Cael eich rhif EORI
 
-Os nad oes gennych rif EORI yn yr UE, bydd angen i chi gael rhif EORI sy’n dechrau gydag XI.
+Am resymau diogelwch, ni allwn anfon rhifau EORI drwy e-bost. Gallwch gael eich rhif EORI drwy ddilyn y camau canlynol:
 
-I gael rhif EORI sy’n dechrau gydag XI, ewch i GOV.UK a chwilio am ‘get an EORI number’.
+- Ewch i GOV.UK a chwilio am, 'Get an EORI'.
+- Dewiswch y cysylltiad ar y dudalen sy'n nodi 'Get an EORI number'.
+- Ar y dudalen 'Get an EORI number', dewiswch y cysylltiad sy'n nodi 'This guide is also available in Welsh (Cymraeg).'
+- Ar y dudalen 'Cael rhif EORI', dewiswch y cysylltiad sy'n nodi 'Gwneud cais am rif EORI'
+- Ar y dudalen 'Gwneud cais am rif EORI', dewiswch y cysylltiad sy'n nodi sut i 'wirio statws cais rydych eisoes wedi'i wneud'. Gallwch ddod o hyd i'r cysylltiad hwn yn agos at waelod y dudalen.
+- Gellir toglo i'r Gymraeg drwy bwyso'r botwm ar frig y dudalen. Mewngofnodwch gan ddefnyddio'ch Dynodydd Defnyddiwr (ID) a'ch cyfrinair ar gyfer Porth y Llywodraeth.
+
+}
 
 Oddi wrth CThEF