[JB][OPS-8200] update face-to-face emails to format amount in gds for…

…mat (#1098) * [JB][OPS-8200] update face-to-face emails to format amount in gds format * format change
hmrc · Sep 21, 2023 · d58f1be · d58f1be
1 parent 4d814cf
commit d58f1be
Show file tree

Hide file tree

Showing 17 changed files with 68 additions and 64 deletions.
diff --git a/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/AmountFormatter.scala b/app/uk/gov/hmrc/hmrcemailrenderer/templates/onlinepaymentservice/AmountFormatter.scala
@@ -34,6 +34,10 @@ object AmountFormatter extends Logging {
 
   def formatAmount(amount: String): String = formatter.format(toDouble(amount))
   def formatAmountInPence(amountInPence: String): String = formatter.format(toDouble(amountInPence) / 100)
+  def formatAmountInPenceGdsFormat(amountInPence: String): String =
+    formatter
+      .format(toDouble(amountInPence) / 100)
+      .replace(".00", "")
 
   private def toDouble(s: String): Double =
     Try(s.toDouble)

diff --git a/...emplates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful.scala.html b/...emplates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -42,18 +42,18 @@
 
             <tr>
                 <th>Amount</th>
-                <td>@formatAmountInPence(params("amountInPence").toString)</td>
+                <td>@formatAmountInPenceGdsFormat(params("amountInPence").toString)</td>
             </tr>
 
             @{
                 if(params.contains("transactionFeeInPence")) {
                         <tr>
                         <th>Card fee</th>
-                        <td>{formatAmountInPence(params("transactionFeeInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)}</td>
                         </tr>
                         <tr>
                         <th>Total paid</th>
-                        <td>{formatAmountInPence(params("totalAmountInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)}</td>
                         </tr>
                 }
             }

diff --git a/...templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful.scala.txt b/...templates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful.scala.txt
@@ -14,7 +14,7 @@
 * limitations under the License.
 *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -38,14 +38,14 @@
 
 
             Amount
-            @formatAmountInPence(params("amountInPence").toString)
+            @formatAmountInPenceGdsFormat(params("amountInPence").toString)
 
             @if(params.contains("transactionFeeInPence")) {
                 Card fee
-                @formatAmountInPence(params("transactionFeeInPence").toString)
+                @formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)
 
                 Total paid
-                @formatAmountInPence(params("totalAmountInPence").toString)
+                @formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)
             }
 
 

diff --git a/...lates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful_cy.scala.html b/...lates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful_cy.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -42,19 +42,19 @@
 
             <tr>
                 <th>Swm</th>
-                <td>@formatAmountInPence(params("amountInPence").toString)</td>
+                <td>@formatAmountInPenceGdsFormat(params("amountInPence").toString)</td>
             </tr>
 
             @{
                 if(params.contains("transactionFeeInPence")) {
                         <tr>
                         <th>Ffi’r cerdyn</th>
-                        <td>{formatAmountInPence(params("transactionFeeInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)}</td>
                         </tr>
 
                         <tr>
                         <th>Cyfanswm a dalwyd</th>
-                        <td>{formatAmountInPence(params("totalAmountInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)}</td>
                         </tr>
                 }
             }

diff --git a/...plates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful_cy.scala.txt b/...plates/onlinepaymentservice/face_to_face_payment_email_no_receipt_successful_cy.scala.txt
@@ -14,7 +14,7 @@
 * limitations under the License.
 *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -34,14 +34,14 @@
             @params("transactionReference")
 
             Swm
-            @formatAmountInPence(params("amountInPence").toString)
+            @formatAmountInPenceGdsFormat(params("amountInPence").toString)
 
             @if(params.contains("transactionFeeInPence")) {
                 Ffi’r cerdyn
-                @formatAmountInPence(params("transactionFeeInPence").toString)
+                @formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)
 
                 Cyfanswm a dalwyd
-                @formatAmountInPence(params("totalAmountInPence").toString)
+                @formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)
             }
 
     Os oes gennych gyfrif treth ar-lein, bydd eich taliad yn cymryd 3 i 5 diwrnod i ymddangos yn eich cyfrif.

diff --git a/...plates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful.scala.html b/...plates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -42,19 +42,19 @@
 
             <tr>
                 <th>Amount</th>
-                <td>@formatAmountInPence(params("amountInPence").toString)</td>
+                <td>@formatAmountInPenceGdsFormat(params("amountInPence").toString)</td>
             </tr>
 
             @{
                 if(params.contains("transactionFeeInPence")) {
                         <tr>
                         <th>Card fee</th>
-                        <td>{formatAmountInPence(params("transactionFeeInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)}</td>
                         </tr>
 
                         <tr>
                         <th>Total</th>
-                        <td>{formatAmountInPence(params("totalAmountInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)}</td>
                         </tr>
                 }
             }

diff --git a/...mplates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful.scala.txt b/...mplates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful.scala.txt
@@ -14,7 +14,7 @@
 * limitations under the License.
 *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -35,14 +35,14 @@ Your card payment to HMRC has not been made. No money has been taken from your a
               @params("transactionReference")
 
               Amount
-              @formatAmountInPence(params("amountInPence").toString)
+              @formatAmountInPenceGdsFormat(params("amountInPence").toString)
 
               @if(params.contains("transactionFeeInPence")) {
                 Card fee
-                @formatAmountInPence(params("transactionFeeInPence").toString)
+                @formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)
 
                 Total
-                @formatAmountInPence(params("totalAmountInPence").toString)
+                @formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)
               }
 
 If you still need to pay

diff --git a/...tes/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful_cy.scala.html b/...tes/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful_cy.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -42,19 +42,19 @@
 
             <tr>
                 <th>Swm</th>
-                <td>@formatAmountInPence(params("amountInPence").toString)</td>
+                <td>@formatAmountInPenceGdsFormat(params("amountInPence").toString)</td>
             </tr>
 
             @{
                 if(params.contains("transactionFeeInPence")) {
                         <tr>
                         <th>Ffi’r cerdyn</th>
-                        <td>{formatAmountInPence(params("transactionFeeInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)}</td>
                         </tr>
 
                         <tr>
                         <th>Cyfanswm</th>
-                        <td>{formatAmountInPence(params("totalAmountInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)}</td>
                         </tr>
                 }
             }

diff --git a/...ates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful_cy.scala.txt b/...ates/onlinepaymentservice/face_to_face_payment_email_no_receipt_unsuccessful_cy.scala.txt
@@ -14,7 +14,7 @@
 * limitations under the License.
 *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -34,14 +34,14 @@ Nid yw’r taliad drwy ddefnyddio’ch cerdyn wedi’i gyflwyno i CThEF. Does di
               @params("transactionReference")
 
               Swm
-              @formatAmountInPence(params("amountInPence").toString)
+              @formatAmountInPenceGdsFormat(params("amountInPence").toString)
 
               @if(params.contains("transactionFeeInPence")) {
                 Ffi’r cerdyn
-                @formatAmountInPence(params("transactionFeeInPence").toString)
+                @formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)
 
                 Cyfanswm
-                @formatAmountInPence(params("totalAmountInPence").toString)
+                @formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)
               }
 
 Os oes dal angen i chi dalu

diff --git a/...lrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful.scala.html b/...lrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -42,19 +42,19 @@
 
             <tr>
                 <th>Amount</th>
-                <td>@formatAmountInPence(params("amountInPence").toString)</td>
+                <td>@formatAmountInPenceGdsFormat(params("amountInPence").toString)</td>
             </tr>
 
             @{
                 if(params.contains("transactionFeeInPence")) {
                         <tr>
                         <th>Card fee</th>
-                        <td>{formatAmountInPence(params("transactionFeeInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)}</td>
                         </tr>
 
                         <tr>
                         <th>Total paid</th>
-                        <td>{formatAmountInPence(params("totalAmountInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)}</td>
                         </tr>
                 }
             }

diff --git a/...ilrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful.scala.txt b/...ilrenderer/templates/onlinepaymentservice/face_to_face_payment_email_successful.scala.txt
@@ -14,7 +14,7 @@
 * limitations under the License.
 *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -34,14 +34,14 @@
             @params("transactionReference")
 
             Amount
-            @formatAmountInPence(params("amountInPence").toString)
+            @formatAmountInPenceGdsFormat(params("amountInPence").toString)
 
             @if(params.contains("transactionFeeInPence")) {
                 Card fee
-                @formatAmountInPence(params("transactionFeeInPence").toString)
+                @formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)
 
                 Total paid
-                @formatAmountInPence(params("totalAmountInPence").toString)
+                @formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)
             }
 
             Card type

diff --git a/...nderer/templates/onlinepaymentservice/face_to_face_payment_email_successful_cy.scala.html b/...nderer/templates/onlinepaymentservice/face_to_face_payment_email_successful_cy.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -42,19 +42,19 @@
 
             <tr>
                 <th>Swm</th>
-                <td>@formatAmountInPence(params("amountInPence").toString)</td>
+                <td>@formatAmountInPenceGdsFormat(params("amountInPence").toString)</td>
             </tr>
 
             @{
                 if(params.contains("transactionFeeInPence")) {
                         <tr>
                         <th>Ffi’r cerdyn</th>
-                        <td>{formatAmountInPence(params("transactionFeeInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)}</td>
                         </tr>
 
                         <tr>
                         <th>Cyfanswm a dalwyd</th>
-                        <td>{formatAmountInPence(params("totalAmountInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)}</td>
                         </tr>
                 }
             }

diff --git a/...enderer/templates/onlinepaymentservice/face_to_face_payment_email_successful_cy.scala.txt b/...enderer/templates/onlinepaymentservice/face_to_face_payment_email_successful_cy.scala.txt
@@ -14,7 +14,7 @@
 * limitations under the License.
 *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -34,14 +34,14 @@
             @params("transactionReference")
 
             Swm
-            @formatAmountInPence(params("amountInPence").toString)
+            @formatAmountInPenceGdsFormat(params("amountInPence").toString)
 
             @if(params.contains("transactionFeeInPence")) {
                 Ffi’r cerdyn
-                @formatAmountInPence(params("transactionFeeInPence").toString)
+                @formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)
 
                 Cyfanswm a dalwyd
-                @formatAmountInPence(params("totalAmountInPence").toString)
+                @formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)
             }
 
             Math o gerdyn

diff --git a/...enderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful.scala.html b/...enderer/templates/onlinepaymentservice/face_to_face_payment_email_unsuccessful.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPence
+@import uk.gov.hmrc.hmrcemailrenderer.templates.onlinepaymentservice.AmountFormatter.formatAmountInPenceGdsFormat
 
 @(params: Map[String, Any])
 
@@ -42,19 +42,19 @@
 
             <tr>
                 <th>Amount</th>
-                <td>@formatAmountInPence(params("amountInPence").toString)</td>
+                <td>@formatAmountInPenceGdsFormat(params("amountInPence").toString)</td>
             </tr>
 
             @{
                 if(params.contains("transactionFeeInPence")) {
                         <tr>
                         <th>Card fee</th>
-                        <td>{formatAmountInPence(params("transactionFeeInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("transactionFeeInPence").toString)}</td>
                         </tr>
 
                         <tr>
                         <th>Total</th>
-                        <td>{formatAmountInPence(params("totalAmountInPence").toString)}</td>
+                        <td>{formatAmountInPenceGdsFormat(params("totalAmountInPence").toString)}</td>
                         </tr>
                 }
             }