ADR-1116 content sweep (#161)

* ADR-1337 before you start content update * ADR-1337 tasklist content updated * ADR-1116 updates declare alcoholic products content under subtask ADR-1339 * ADR-1116 subtask ADR-1339 declare product content change updated * ADR-1116 spr multi page content added under 1339 * ADR-1116 declare adjustments and duty suspended content subtasks 1340 and 1341 * ADR-1116 check and send content updated subtask 1342 * ADR-1116 content updated for view returns 1343 * ADR-1116 urls updated subtask 1344 * ADR-1116 adjustment duty page date hint updated * ADR-1116 hint text added to LPA fields subtask 1345 * ADR-1116 tasklist updated 1356 * ADR-1116 date pattern updated to follow d mmmm yyyy under subtask 1346 * ADR-1337 before you start content update * ADR-1337 tasklist content updated * ADR-1116 updates declare alcoholic products content under subtask ADR-1339 * ADR-1116 subtask ADR-1339 declare product content change updated * ADR-1116 spr multi page content added under 1339 * ADR-1116 declare adjustments and duty suspended content subtasks 1340 and 1341 * ADR-1116 check and send content updated subtask 1342 * ADR-1116 content updated for view returns 1343 * ADR-1116 urls updated subtask 1344 * ADR-1116 adjustment duty page date hint updated * ADR-1116 hint text added to LPA fields subtask 1345 * ADR-1116 tasklist updated 1356 * ADR-1116 date pattern updated to follow d mmmm yyyy under subtask 1346 * ADR-1116 remove full stop on hint text * ADR-1116 reverts routes * ADR-1116 adjustment caption text updated * ADR-1116 adjustment caption fix * ADR-1116 duty suspended hint update * ADR-1116 spr lpa hint added * ADR-1116 duty suspended hint text and labels updated * ADR-1116 duty suspended hint and labels updated * ADR-1116 spr heading replaces caption * ADR-1116 language change 'up to' on all hint text * ADR-1116 hint text added to fields * ADR-1116 missing hint text added * ADR-1116 adjustment CYA removes regime for heading * ADR-1116 updates remove spr screen tables and date format * ADR-1116 remove product changed to entry * ADR-1116: fix entry deletion in SPR list for returns, fix single SPR question screen, fix Duty Due screen formatting * ADR-1116: fixed remove spr entry error message * ADR-1116: fixed caption for duty due page in return journey --------- Co-authored-by: chiransandi <[email protected]> Co-authored-by: Michele Satta <[email protected]>
hmrc · Sep 30, 2024 · 11e69a1 · 11e69a1
1 parent 1cd32bc
commit 11e69a1
Show file tree

Hide file tree

Showing 24 changed files with 258 additions and 248 deletions.
diff --git a/app/controllers/adjustment/CheckYourAnswersController.scala b/app/controllers/adjustment/CheckYourAnswersController.scala
@@ -110,8 +110,7 @@ class CheckYourAnswersController @Inject() (
           _                 <- cacheConnector.set(updateUserAnswers)
         } yield Ok(
           view(
-            summaryList,
-            adjustmentType
+            summaryList
           )
         )
       case None                 =>

diff --git a/app/viewmodels/DateTimeHelper.scala b/app/viewmodels/DateTimeHelper.scala
@@ -25,7 +25,7 @@ class DateTimeHelper @Inject() () {
   private val ukTimeZone: ZoneId = TimeZone.getTimeZone("Europe/London").toZoneId
 
   private val monthYearFormatter     = DateTimeFormatter.ofPattern("LLLL yyyy")
-  private val dateMonthYearFormatter = DateTimeFormatter.ofPattern("dd LLLL yyyy")
+  private val dateMonthYearFormatter = DateTimeFormatter.ofPattern("d LLLL yyyy")
   private val hourMinuteFormatter    = DateTimeFormatter.ofPattern("K:mm")
   private val merediemFormat         = DateTimeFormatter.ofPattern("a")
 

diff --git a/app/viewmodels/checkAnswers/checkAndSubmit/DutyDueForThisReturnHelper.scala b/app/viewmodels/checkAnswers/checkAndSubmit/DutyDueForThisReturnHelper.scala
@@ -127,7 +127,7 @@ class DutyDueForThisReturnHelper @Inject() (
         TableRowViewModel(
           cells = Seq(
             TableRow(
-              content = Text(messages("dutyDueForThisReturn.table.dutyDue", messages(s"return.regime.$alcoholRegime"))),
+              content = Text(messages("dutyDueForThisReturn.table.dutyDue", messages(s"alcoholType.$alcoholRegime"))),
               classes = Constants.boldFontCssClass
             ),
             TableRow(Text(Money.format(alcoholDuty.totalDuty)))

diff --git a/app/viewmodels/returns/DutyCalculationHelper.scala b/app/viewmodels/returns/DutyCalculationHelper.scala
@@ -36,9 +36,9 @@ object DutyCalculationHelper {
       TableViewModel(
         head = Seq(
           HeadCell(Text(messages("dutyCalculation.table.description"))),
-          HeadCell(Text(messages("dutyCalculation.table.litresOfPureAlcohol"))),
-          HeadCell(Text(messages("dutyCalculation.table.dutyRate"))),
-          HeadCell(Text(messages("dutyCalculation.table.dutyDue"))),
+          HeadCell(Text(messages("dutyCalculation.table.litresOfPureAlcohol")), format = Some("numeric")),
+          HeadCell(Text(messages("dutyCalculation.table.dutyRate")), format = Some("numeric")),
+          HeadCell(Text(messages("dutyCalculation.table.dutyDue")), format = Some("numeric")),
           HeadCell(Text(messages("dutyCalculation.table.action")))
         ),
         rows = rows
@@ -79,9 +79,9 @@ object DutyCalculationHelper {
     TableRowViewModel(
       cells = Seq(
         TableRow(Text(rateBandRecap(rateBand))),
-        TableRow(Text(messages("site.4DP", totalByTaxType.pureAlcohol))),
-        TableRow(Text(messages("site.currency.2DP", totalByTaxType.dutyRate))),
-        TableRow(Text(messages("site.currency.2DP", totalByTaxType.dutyDue)))
+        TableRow(Text(messages("site.4DP", totalByTaxType.pureAlcohol)), format = Some("numeric")),
+        TableRow(Text(messages("site.currency.2DP", totalByTaxType.dutyRate)), format = Some("numeric")),
+        TableRow(Text(messages("site.currency.2DP", totalByTaxType.dutyDue)), format = Some("numeric"))
       ),
       actions = Seq(
         TableRowActionViewModel(

diff --git a/app/viewmodels/returns/MultipleSPRListHelper.scala b/app/viewmodels/returns/MultipleSPRListHelper.scala
@@ -40,12 +40,15 @@ object MultipleSPRListHelper {
                 classes = "govuk-!-width-half"
               ),
               HeadCell(
+                format = Some("numeric"),
                 content = Text(messages("multipleSPRList.totalLitres.label"))
               ),
               HeadCell(
+                format = Some("numeric"),
                 content = Text(messages("multipleSPRList.pureAlcohol.label"))
               ),
               HeadCell(
+                format = Some("numeric"),
                 content = Text(messages("multipleSPRList.dutyRate.label"))
               ),
               HeadCell(
@@ -88,9 +91,9 @@ object MultipleSPRListHelper {
       TableRowViewModel(
         cells = Seq(
           TableRow(Text(rateBandRecap(sprEntry.rateBand))),
-          TableRow(Text(messages("site.2DP", sprEntry.dutyByTaxType.totalLitres))),
-          TableRow(Text(messages("site.4DP", sprEntry.dutyByTaxType.pureAlcohol))),
-          TableRow(Text(messages("site.currency.2DP", sprEntry.dutyByTaxType.dutyRate)))
+          TableRow(Text(messages("site.2DP", sprEntry.dutyByTaxType.totalLitres)), format = Some("numeric")),
+          TableRow(Text(messages("site.4DP", sprEntry.dutyByTaxType.pureAlcohol)), format = Some("numeric")),
+          TableRow(Text(messages("site.currency.2DP", sprEntry.dutyByTaxType.dutyRate)), format = Some("numeric"))
         ),
         actions = Seq(
           TableRowActionViewModel(

diff --git a/app/viewmodels/returns/ReturnPeriodViewModel.scala b/app/viewmodels/returns/ReturnPeriodViewModel.scala
@@ -23,7 +23,7 @@ import java.time.format.DateTimeFormatter
 case class ReturnPeriodViewModel(fromDate: String, toDate: String)
 object ReturnPeriodViewModel {
 
-  val viewDateFormatter: DateTimeFormatter = DateTimeFormatter.ofPattern("d MMM yyyy")
+  val viewDateFormatter: DateTimeFormatter = DateTimeFormatter.ofPattern("d MMMM yyyy")
 
   def apply(returnPeriod: ReturnPeriod): ReturnPeriodViewModel = {
     val yearMonth = returnPeriod.period

diff --git a/app/views/TaskListView.scala.html b/app/views/TaskListView.scala.html
@@ -34,20 +34,12 @@
 
 @heading(messages("taskList.title"))
 
-@subheading(text = messages(s"taskList.status.${taskList.status.messageKey}"), classes = "govuk-heading-s")
-
-@paragraph(messages("taskList.section.completed", taskList.completedTasks, taskList.totalTasks))
-
 @paragraph(messages("taskList.expiry.date", taskList.sessionExpiryDate))
 
-<ol class="govuk-heading-m">
     @for(section <- taskList.sections) {
-    <li>
         @subheading(section.title, classes = "govuk-heading-m")
         @govukTaskList(section.taskList)
-    </li>
     }
-</ol>
 
 @paragraph( content =
         HtmlContent(

diff --git a/app/views/adjustment/AdjustmentListView.scala.html b/app/views/adjustment/AdjustmentListView.scala.html
@@ -44,7 +44,7 @@
 
     @sectionHeading(
         id = "adjustment-list-section",
-        text = messages("section.adjustment"),
+        text = messages("section.alcoholDutyReturn"),
     )
 
     @pageHeading(messages("adjustmentList.heading"))

diff --git a/app/views/adjustment/AdjustmentVolumeView.scala.html b/app/views/adjustment/AdjustmentVolumeView.scala.html
@@ -47,8 +47,6 @@
 
         @pageHeading(messages("adjustmentVolume.heading"))
 
-        @paragraph(messages("adjustmentVolume.hint"), classes = "govuk-hint")
-
         @subHeading(rateBandContent, "govuk-heading-s")
 
         @govukInput(
@@ -62,6 +60,7 @@
             .asNumeric()
             .withWidth(Fixed10)
             .withSuffix(PrefixOrSuffix(content = messages("site.unit.litres")))
+            .withHint(Hint(content = messages("adjustmentVolume.totalLitresVolume.hint")))
         )
 
         @govukInput(
@@ -75,6 +74,7 @@
         .asNumeric()
         .withWidth(Fixed10)
         .withSuffix(PrefixOrSuffix(content = messages("site.unit.litres")))
+        .withHint(Hint(content = messages("adjustmentVolume.pureAlcoholVolume.hint")))
         )
 
         @govukButton(

diff --git a/app/views/adjustment/AdjustmentVolumeWithSPRView.scala.html b/app/views/adjustment/AdjustmentVolumeWithSPRView.scala.html
@@ -49,8 +49,6 @@
 
         @subHeading(rateBandContent, "govuk-heading-s")
 
-        @paragraph(messages("adjustmentVolume.hint"), classes = "govuk-hint")
-
         @govukInput(
             InputViewModel(
                 field = form("volumes"),
@@ -62,6 +60,7 @@
             .asNumeric()
             .withWidth(Fixed10)
             .withSuffix(PrefixOrSuffix(content = messages("site.unit.litres")))
+            .withHint(Hint(content = messages("adjustmentVolume.totalLitresVolume.hint")))
         )
 
         @govukInput(
@@ -75,6 +74,7 @@
             .asNumeric()
             .withWidth(Fixed10)
             .withSuffix(PrefixOrSuffix(content = messages("site.unit.litres")))
+            .withHint(Hint(content = messages("adjustmentVolume.pureAlcoholVolume.hint")))
         )
 
 

diff --git a/app/views/adjustment/CheckYourAnswersView.scala.html b/app/views/adjustment/CheckYourAnswersView.scala.html
@@ -26,14 +26,14 @@
     subHeading: SubHeading
 )
 
-@(list: SummaryList, adjustmentType: AdjustmentType)(implicit request: Request[_], messages: Messages)
+@(list: SummaryList)(implicit request: Request[_], messages: Messages)
 
 @layout(pageTitle = titleNoForm(messages("checkYourAnswers.title"))) {
      @formHelper(action = controllers.adjustment.routes.CheckYourAnswersController.onSubmit(), Symbol("autoComplete") -> "off") {
 
          @sectionHeading(
              id = "check-your-answers-section",
-            text = messages(s"section.adjustment.$adjustmentType"),
+             text = messages("section.adjustment.checkAnswers"),
          )
 
          @pageHeading(messages("checkYourAnswers.heading"))

diff --git a/app/views/adjustment/DeclareAdjustmentQuestionView.scala.html b/app/views/adjustment/DeclareAdjustmentQuestionView.scala.html
@@ -47,6 +47,12 @@
         @bulletList(Seq(
         messages("declareAdjustmentQuestion.para1.list1"),
         messages("declareAdjustmentQuestion.para1.list2"),
+        ))
+
+        @paragraph(messages("declareAdjustmentQuestion.p2"))
+        @paragraph(messages("declareAdjustmentQuestion.p3"))
+
+        @bulletList(Seq(
         messages("declareAdjustmentQuestion.para1.list3"),
         messages("declareAdjustmentQuestion.para1.list4"),
         messages("declareAdjustmentQuestion.para1.list5"),

diff --git a/app/views/dutySuspended/DutySuspendedDeliveriesGuidanceView.scala.html b/app/views/dutySuspended/DutySuspendedDeliveriesGuidanceView.scala.html
@@ -14,7 +14,7 @@
  * limitations under the License.
  *@
 
-@import components.{PageHeading, SectionHeading, Paragraph, NumberedList}
+@import components.{PageHeading, SectionHeading, Paragraph, BulletList}
 
 @this(
         layout: templates.Layout,
@@ -23,7 +23,7 @@
         sectionHeading: SectionHeading,
         pageHeading: PageHeading,
         paragraph: Paragraph,
-        numberedList: NumberedList
+        bulletList: BulletList,
 )
 
 @()(implicit request: Request[_], messages: Messages)
@@ -35,7 +35,7 @@
 
         @sectionHeading(
             id = "duty-suspended-deliveries-guidance-section",
-            text = messages("section.alcoholDutyReturn"),
+            text = messages("section.dutySuspended"),
         )
 
         @pageHeading(messages("dutySuspendedDeliveriesGuidance.heading"))
@@ -44,14 +44,19 @@
 
         @paragraph(messages("dutySuspendedDeliveriesGuidance.p2"))
 
-        @numberedList(Seq(
+        @bulletList(Seq(
             messages("dutySuspendedDeliveriesGuidance.para.list.1"),
             messages("dutySuspendedDeliveriesGuidance.para.list.2"),
-            messages("dutySuspendedDeliveriesGuidance.para.list.3")
         ))
 
         @paragraph(messages("dutySuspendedDeliveriesGuidance.p3"))
 
+        @bulletList(Seq(
+        messages("dutySuspendedDeliveriesGuidance.para.list.3")
+        ))
+
+        @paragraph(messages("dutySuspendedDeliveriesGuidance.p4"))
+
         @govukButton(
             ButtonViewModel("continueButton", messages("site.continue"))
         )

diff --git a/app/views/returns/AlcoholTypeView.scala.html b/app/views/returns/AlcoholTypeView.scala.html
@@ -46,7 +46,8 @@
 
         @pageHeading(messages("alcoholType.heading"))
 
-        @paragraph(messages("alcoholType.paragraph"))
+        @paragraph(messages("alcoholType.p1"))
+        @paragraph(messages("alcoholType.p2"))
 
         @govukCheckboxes(
             CheckboxesViewModel(

diff --git a/app/views/returns/DeclareAlcoholDutyQuestionView.scala.html b/app/views/returns/DeclareAlcoholDutyQuestionView.scala.html
@@ -58,12 +58,11 @@
         ))
 
         @if(showCider) {
-          @subHeading(messages("declareAlcoholDutyQuestion.cider.h2"))
+          @paragraph(messages("declareAlcoholDutyQuestion.cider.p1"))
 
           @bulletList(Seq(
             messages("declareAlcoholDutyQuestion.cider.p1.l1"),
-            messages("declareAlcoholDutyQuestion.cider.p1.l2"),
-            messages("declareAlcoholDutyQuestion.cider.p1.l3")
+            messages("declareAlcoholDutyQuestion.cider.p1.l2")
           ))
         }
 
@@ -89,9 +88,8 @@
 
           @bulletList(Seq(
             messages("declareAlcoholDutyQuestion.cider.p2.l1"),
-            messages("declareAlcoholDutyQuestion.cider.p2.l2"),
-            messages("declareAlcoholDutyQuestion.cider.p2.l3")
-          ))
+            messages("declareAlcoholDutyQuestion.cider.p2.l2")
+        ))
         }
 
         @sectionBreak()

diff --git a/app/views/returns/DeleteMultipleSPREntryView.scala.html b/app/views/returns/DeleteMultipleSPREntryView.scala.html
@@ -27,7 +27,7 @@
 
 @(form: Form[_], regime:AlcoholRegime, index:Int)(implicit request: Request[_], messages: Messages)
 
-@layout(pageTitle = title(form, messages("deleteMultipleSPREntry.title"))) {
+@layout(pageTitle = title(form, messages("deleteMultipleSPREntry.title", messages(s"return.regime.$regime")))) {
 
     @formHelper(action = controllers.returns.routes.DeleteMultipleSPREntryController.onSubmit(regime, Some(index)), Symbol("autoComplete") -> "off") {
 
@@ -41,7 +41,7 @@
         @govukRadios(
             RadiosViewModel.yesNo(
                 field = form("deleteMultipleSPREntry-yesNoValue"),
-                legend = LegendViewModel(messages("deleteMultipleSPREntry.heading")).asPageHeading()
+                legend = LegendViewModel(messages("deleteMultipleSPREntry.heading", messages(s"return.regime.$regime"))).asPageHeading()
             )
             .withHint(Hint(content = HtmlContent(messages("deleteMultipleSPREntry.hint"))))
         )

diff --git a/app/views/returns/DutyCalculationView.scala.html b/app/views/returns/DutyCalculationView.scala.html
@@ -47,14 +47,12 @@
 
     @bulletList(Seq(messages("dutyCalculation.list")))
 
-    @subHeading(messages("dutyCalculation.h2"))
-
     @govukTable(Table(
       caption = Some(messages("productList.caption")),
-      captionClasses = "govuk-table__caption--m",
+      captionClasses = "govuk-table__caption--l",
       head = Some(dutyDueViewModel.head),
       rows = dutyDueViewModel.rows.map(row => {
-        val actions = TableRow(content = HtmlContent(tableRowActionList(
+        val actions = TableRow(format = Some("numeric"), content = HtmlContent(tableRowActionList(
           id = "productList",
           actions = row.actions.map(action => tableRowAction(
             id = "",

diff --git a/app/views/returns/HowMuchDoYouNeedToDeclareView.scala.html b/app/views/returns/HowMuchDoYouNeedToDeclareView.scala.html
@@ -58,8 +58,6 @@
           ))
         }
 
-        @paragraph(messages("howMuchDoYouNeedToDeclare.hint"), classes = "govuk-hint")
-
         @if(howMuchDoYouNeedToDeclareHelper.core.nonEmpty) {
           @subHeading(messages(s"howMuchDoYouNeedToDeclare.core.heading", messages(s"return.regime.$regime")), classes = "govuk-heading-m")
           @for((quantityViewModel, index) <- howMuchDoYouNeedToDeclareHelper.core.zipWithIndex) {
@@ -75,6 +73,7 @@
               .asNumeric()
               .withWidth(Fixed10)
               .withSuffix(PrefixOrSuffix(content = messages("site.unit.litres")))
+              .withHint(Hint(content = messages("howMuchDoYouNeedToDeclare.hint")))
             )
             @govukInput(
               InputViewModel(
@@ -87,6 +86,7 @@
               .asNumeric()
               .withWidth(Fixed10)
               .withSuffix(PrefixOrSuffix(content = messages("site.unit.litres")))
+              .withHint(Hint(content = messages("howMuchDoYouNeedToDeclare.pureAlcohol.hint")))
             )
 
             @govukInput(
@@ -116,6 +116,7 @@
               .asNumeric()
               .withWidth(Fixed10)
               .withSuffix(PrefixOrSuffix(content = messages("site.unit.litres")))
+              .withHint(Hint(content = messages("howMuchDoYouNeedToDeclare.hint")))
             )
             @govukInput(
               InputViewModel(
@@ -128,6 +129,7 @@
               .asNumeric()
               .withWidth(Fixed10)
               .withSuffix(PrefixOrSuffix(content = messages("site.unit.litres")))
+              .withHint(Hint(content = messages("howMuchDoYouNeedToDeclare.pureAlcohol.hint")))
             )
 
             @govukInput(

diff --git a/app/views/returns/MultipleSPRListView.scala.html b/app/views/returns/MultipleSPRListView.scala.html
@@ -33,7 +33,7 @@
 
 @(form: Form[_], regime:AlcoholRegime, sprTable:TableViewModel)(implicit request: Request[_], messages: Messages)
 
-@layout(pageTitle = title(form, messages("multipleSPRList.title")), fullWidth = true, showBackLink = false) {
+@layout(pageTitle = title(form, messages(s"multipleSPRList.title", messages(s"alcoholType.$regime"))), fullWidth = true, showBackLink = false) {
 
     @formHelper(action = controllers.returns.routes.MultipleSPRListController.onSubmit(regime), Symbol("autoComplete") -> "off") {
 
@@ -45,11 +45,9 @@
             text = messages(s"section.return.$regime")
         )
 
-        @pageHeading(messages(s"multipleSPRList.heading"))
+        @pageHeading(messages(s"multipleSPRList.heading", messages(s"alcoholType.$regime")))
 
         @govukTable(Table(
-          caption = Some(messages("multipleSPRList.subheading")),
-          captionClasses = "govuk-table__caption--m",
           head = Some(sprTable.head),
           rows = sprTable.rows.map(row => {
             val actionList = TableRow(content = HtmlContent(tableRowActionList(
@@ -61,6 +59,7 @@
                 visuallyHiddenContent = action.visuallyHiddenText
               )
               ))))
+
             row.cells :+ actionList
           }
           ))