@defra-fish/gafl-webapp-service 1.59.0-rc.2 → 1.59.0-rc.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.59.0-rc.2",
+  "version": "1.59.0-rc.4",
   "description": "The websales frontend for the GAFL service",
   "type": "module",
   "engines": {
@@ -36,8 +36,8 @@
     "prepare": "gulp --gulpfile build/gulpfile.cjs"
   },
   "dependencies": {
-    "@defra-fish/business-rules-lib": "1.59.0-rc.2",
-    "@defra-fish/connectors-lib": "1.59.0-rc.2",
+    "@defra-fish/business-rules-lib": "1.59.0-rc.4",
+    "@defra-fish/connectors-lib": "1.59.0-rc.4",
     "@defra/hapi-gapi": "^2.0.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -80,5 +80,5 @@
       "./gafl-jest-matchers.js"
     ]
   },
-  "gitHead": "79ed1c32b80408a0c2b99b39dee1833684f38778"
+  "gitHead": "5e8bd6ced8acd15794692b128dbac03afacd2d98"
 }

package/src/locales/cy.json

@@ -478,8 +478,8 @@
   "licence_type_12m": "12 mis",
   "licence_type_1d": "1 diwrnod",
   "licence_type_8d": "8 niwrnod",
-  "licence_type_attended_rods_note": "Dim ond deiliaid y drwydded all defnyddio’r wialen, ac mae’n rhaid cadw golwg ar y wialen drwy’r amser.",
-  "licence_type_byelaws": "is-ddeddfau pysgota lleol (yn agor ar dudalen newydd)",
+  "licence_type_attended_rods_note": "Dim ond deiliad y drwydded all ddefnyddio’r wialen ac mae’n rhaid cadw golwg ar y wialen drwy’r amser. Mae’n rhaid i ddeiliaid y drwydded ddilyn yr ",
+  "licence_type_byelaws": "is-ddeddfau pysgota â gwialen (yn agor mewn tab newydd)",
   "licence_type_error_choose": "Dewiswch un o’r mathau o drwyddedau pysgota",
   "licence_type_na": "Nid oes cyfnodau byrrach ar gael ar gyfer y math hwn o drwydded.",
   "licence_type_payment_edge_case": "Mae’n rhaid i chi gwblhau eich taliad cyn 11:30pm ar 31 Mawrth 2025 i dalu’r pris a ddangosir",
@@ -491,15 +491,17 @@
   "licence_type_radio_trout_two_rod": "Brithyllod a physgod bras (hyd at 2 wialen)",
   "licence_type_radio_trout_two_rod_payment_summary": "Brithyllod a physgod bras (hyd at 2 wialen)",
   "licence_type_rules": "rheolau pysgota â gwialen (yn agor ar dudalen newydd)",
-  "licence_type_salmon_acr_note_1": "Yn ôl y gyfraith, mae'n rhaid i chi roi gwybod am ",
-  "licence_type_salmon_acr_note_2": " ffurflen daliadau (yn agor ar dudalen newydd)",
-  "licence_type_salmon_acr_note_3": " o'ch gweithgarwch pysgota eog a brithyllod môr blynyddol yng Nghymru a Lloegr, hyd yn oed os nad ydych yn dal unrhyw beth neu os nad ydych yn pysgota.",
-  "licence_type_salmon_acr_warning": "Bydd angen i chi gyflwyno ffurflen dalfa flynyddol",
+  "licence_type_salmon_acr_note_1": "Mae’n cwmpasu pysgota ar gyfer eogiaid a brithyllod y môr gan ddefnyddio hyd at 2 wialen, yn ogystal â brithyllod anfudol a physgod dŵr croyw gan ddefnyddio hyd at 3 gwialen.",
+  "licence_type_salmon_acr_note_2": "Mae’n rhaid i chi ",
+  "licence_type_salmon_acr_note_3": " pan fyddwch wedi gorffen pysgota am y flwyddyn, hyd yn oed os nad ydych wedi dal unrhyw eogiaid na brithyllod y môr.",
+  "licence_type_salmon_acr_note_2_BOBO": "Mae’n rhaid iddynt ",
+  "licence_type_salmon_acr_note_3_BOBO": " pan fyddant wedi gorffen pysgota am y flwyddyn, hyd yn oed os nad ydynt wedi dal unrhyw eogiaid na brithyllod y môr.",
+  "licence_type_salmon_acr_note_link": "gyflwyno ffurflen ddalfa flynyddol (yn agor mewn tab newydd)",
   "licence_type_salmon_junior": "You’ll only need this licence if you are specifically fishing for salmon or sea trout.",
-  "licence_type_title_other": "Pa fath o drwydded yr hoffent ei chael?",
-  "licence_type_title_you": "Pa drwydded hoffech chi ei chael?",
-  "licence_type_troute_three_rod": "Dim ond trwydded tair gwialen y bydd ei hangen arnoch os ydych yn bwriadu pysgota â thair gwialen ar yr un pryd. Gall hyn fod ar gyfer pysgota cerpynnod arbenigol, er enghraifft. Bydd hyn yn addas ar gyfer pob math o bysgota â gwialen ac yn gadael i chi bysgota brithyllod anfudol a physgod bras, yn amodol ar y ",
-  "licence_type_troute_two_rod": "Y drwydded pysgod bras â dwy wialen yw’r drwydded wialen symlaf. Bydd hyn yn eich gwarchod ar gyfer pob math o bysgota gyda gwialen ac yn gadael i chi bysgota brithyllod anfudol a physgod bras. Bydd yn caniatáu i chi bysgota gydag un neu ddwy wialen ar yr un pryd, yn amodol ar y ",
+  "licence_type_title_other": "Pa fath o drwydded sydd ei hangen arnynt?",
+  "licence_type_title_you": "Pa fath o drwydded sydd ei hangen arnoch?",
+  "licence_type_trout_three_rod": "Mae’n cwmpasu brithyllod anfudol a phob pysgodyn dŵr croyw, ond nid eogiaid na brithyllod y môr. Mae’r holl ddulliau pysgota gan ddefnyddio hyd at 3 gwialen wedi’u cwmpasu. Er enghraifft pysgota arbenigol ar gyfer carp gan ddefnyddio 3 gwialen ar yr un pryd.",
+  "licence_type_trout_two_rod": "Mae’n cwmpasu brithyllod anfudol a phob pysgodyn dŵr croyw, ond nid eogiaid na brithyllod y môr. Mae’r holl ddulliau pysgota gan ddefnyddio hyd at 2 wialen wedi’u cwmpasu.",
   "name_abbr_hint": "Peidiwch â defnyddio byrfoddau na llysenwau",
   "name_first_empty_error_msg": "Rhowch yr enw cyntaf",
   "name_first_empty_error": "Rhowch enw cyntaf deiliad y drwydded",

package/src/locales/en.json

@@ -478,8 +478,8 @@
   "licence_type_12m": "12 months",
   "licence_type_1d": "1 day",
   "licence_type_8d": "8 days",
-  "licence_type_attended_rods_note": "Rods are for use by the licence holder only and must be attended at all times.",
-  "licence_type_byelaws": "local fishing byelaws (opens in new tab)",
+  "licence_type_attended_rods_note": "Rods must only be used by the licence holder and must be attended at all times. You must follow the ",
+  "licence_type_byelaws": "rod fishing byelaws (opens in new tab)",
   "licence_type_error_choose": "Choose one of the fishing licence types",
   "licence_type_na": "Shorter lengths are not available for this licence type",
   "licence_type_payment_edge_case": "You must complete payment before 11:30pm on 31 March 2025 to get the price shown",
@@ -491,15 +491,17 @@
   "licence_type_radio_trout_two_rod": "Trout and coarse (up to 2 rods)",
   "licence_type_radio_trout_two_rod_payment_summary": "Trout and coarse (up to 2 rods)",
   "licence_type_rules": "rod fishing rules (opens in new tab)",
-  "licence_type_salmon_acr_note_1": "Licence holders must by law ",
-  "licence_type_salmon_acr_note_2": " report a catch return (opens in new tab)",
-  "licence_type_salmon_acr_note_3": "of yearly salmon and sea trout fishing activity in England and Wales, even if they did not fish or catch anything.",
-  "licence_type_salmon_acr_warning": "Salmon and sea trout licence holders will need to submit an annual catch return",
+  "licence_type_salmon_acr_note_1": "Covers salmon and sea trout using up to 2 rods and also non-migratory trout and all freshwater fish using up to 3 rods.",
+  "licence_type_salmon_acr_note_2": "You must ",
+  "licence_type_salmon_acr_note_3": " when you have finished fishing for the year, even if you did not catch any salmon or sea trout or did not go fishing.",
+  "licence_type_salmon_acr_note_2_BOBO": "The licence holder must ",
+  "licence_type_salmon_acr_note_3_BOBO": " when they have finished fishing for the year, even if they did not catch any salmon or sea trout or did not go fishing.",
+  "licence_type_salmon_acr_note_link": "report an annual catch return (opens in new tab)",
   "licence_type_salmon_junior": "You’ll only need this licence if you are specifically fishing for salmon or sea trout.",
-  "licence_type_title_other": "Which type of licence do they want?",
-  "licence_type_title_you": "Which type of licence do you want?",
-  "licence_type_troute_three_rod": "This licence will suit anglers planning to fish with 3 rods at the same time. This may be for specialist carp fishing for example. This will cover the licence holder for all the forms of fishing with a rod and allow non-migratory trout and coarse fishing, subject to the ",
-  "licence_type_troute_two_rod": "The 2 rods coarse licence is the simplest fishing licence. This will cover all the forms of fishing with a rod and let the licence holder fish non-migratory trout and coarse fish. It will allow the licence holder to fish with 1 or 2 rods at the same time, subject to the ",
+  "licence_type_title_other": "Which type of licence do they need?",
+  "licence_type_title_you": "Which type of licence do you need?",
+  "licence_type_trout_three_rod": "Covers non-migratory trout and all freshwater fish, but not salmon or sea trout. All rod fishing methods using up to 3 rods are covered. For example, specialist carp fishing using 3 rods at the same time.",
+  "licence_type_trout_two_rod": "Covers non-migratory trout and all freshwater fish, but not salmon or sea trout. All rod fishing methods using up to 2 rods are covered.",
   "name_abbr_hint": "Do not use abbreviations or nicknames",
   "name_first_empty_error_msg": "Enter the first name",
   "name_first_empty_error": "Enter the licence holder’s first name",

package/src/pages/licence-details/licence-type/licence-type.njk

@@ -15,29 +15,26 @@
 %}
 
 {% set troutAndCoarse2Rod %}
-    <p class="govuk-body-m">
-        {{ mssgs.licence_type_troute_two_rod }}
-        <a class="govuk-link" rel="noreferrer noopener" target="_blank" href="{{ data.uri.freshWaterFishingRules }}">{{ mssgs.licence_type_rules }}</a>{{ mssgs.and }}<a class="govuk-link" rel="noreferrer noopener" target="_blank" href="{{ data.uri.localByelaws }}">{{ mssgs.licence_type_byelaws }}</a>{{ mssgs.full_stop }}
-     </p>
+    <p class="govuk-body-m"> {{ mssgs.licence_type_trout_two_rod }}</p>
 {% endset -%}
 
 {% set troutAndCoarse3Rod %}
-    <p class="govuk-body-m">
-        {{ mssgs.licence_type_troute_three_rod }}
-        <a class="govuk-link" rel="noreferrer noopener" target="_blank" href="{{ data.uri.freshWaterFishingRules }}">{{ mssgs.licence_type_rules }}</a>{{ mssgs.and }}<a class="govuk-link" rel="noreferrer noopener" target="_blank" href="{{ data.uri.localByelaws }}">{{ mssgs.licence_type_byelaws }}</a>{{ mssgs.full_stop }}
-    </p>
+    <p class="govuk-body-m"> {{ mssgs.licence_type_trout_three_rod }}</p>
 {% endset -%}
 
 {% set salmonAndSeaTrout %}
     {% if data.hasJunior %}<p class="govuk-body-m">{{ mssgs.licence_type_salmon_junior }}</p>{% endif %}
-    {{ govukWarningText({
-      text: mssgs.licence_type_salmon_acr_warning,
-      iconFallbackText: "Warning",
-      classes: "govuk-!-margin-top-6"
-    }) }}
     <p class="govuk-body-m">
-        {{ mssgs.licence_type_salmon_acr_note_1 }}<a class="govuk-link" rel="noreferrer noopener" target="_blank" href="https://www.gov.uk/catch-return">{{ mssgs.licence_type_salmon_acr_note_2 }}</a>
-        {{ mssgs.licence_type_salmon_acr_note_3 }}</p>
+        {{ mssgs.licence_type_salmon_acr_note_1 }}</p>
+    <p class="govuk-body-m">
+        {% if data.isLicenceForYou %}
+            {{ mssgs.licence_type_salmon_acr_note_2 }} <a class="govuk-link" rel="noreferrer noopener" target="_blank" href="{{ data.uri.catchReturn }}">{{ mssgs.licence_type_salmon_acr_note_link }}</a>
+            {{ mssgs.licence_type_salmon_acr_note_3 }}
+        {% else %}
+            {{ mssgs.licence_type_salmon_acr_note_2_BOBO }} <a class="govuk-link" rel="noreferrer noopener" target="_blank" href="{{ data.uri.catchReturn }}">{{ mssgs.licence_type_salmon_acr_note_link }}</a>
+            {{ mssgs.licence_type_salmon_acr_note_3_BOBO }}
+        {% endif %}
+    </p>
 {% endset -%}
 
 {% set items = [
@@ -59,7 +56,6 @@
             id: 'selector-' + data.licenseTypes.salmonAndSeaTrout,
             text: mssgs.licence_type_radio_salmon,
             value: "salmon-and-sea-trout",
-            hint: { text: mssgs.licence_type_radio_salmon_hint },
             checked: payload['licence-type'] === data.licenseTypes.salmonAndSeaTrout,
             conditional: { html: salmonAndSeaTrout }
         }
@@ -67,7 +63,8 @@
 %}
 
 {% block pageContent %}
-    <p class="govuk-body-m">{{ mssgs.licence_type_attended_rods_note }}</p>
+    <p class="govuk-body-m">{{ mssgs.licence_type_attended_rods_note }}<a class="govuk-link" rel="noreferrer noopener" target="_blank" href="{{ data.uri.freshWaterFishingRules }}">{{ mssgs.licence_type_byelaws }}</a>{{ mssgs.full_stop }}
+    </p>
     {{ govukRadios({
         idPrefix: "licence-type",
         name: "licence-type",

package/src/pages/licence-details/licence-type/route.js

@@ -1,4 +1,4 @@
-import { LICENCE_TYPE, FRESHWATER_FISING_RULES, LOCAL_BYELAWS } from '../../../uri.js'
+import { LICENCE_TYPE, FRESHWATER_FISING_RULES, LOCAL_BYELAWS, CATCH_RETURN } from '../../../uri.js'
 import pageRoute from '../../../routes/page-route.js'
 import { pricingDetail } from '../../../processors/pricing-summary.js'
 import Joi from 'joi'
@@ -29,7 +29,8 @@ export const getData = async request => {
     hasJunior: concessionHelper.hasJunior(permission),
     uri: {
       freshWaterFishingRules: FRESHWATER_FISING_RULES.uri,
-      localByelaws: LOCAL_BYELAWS.uri
+      localByelaws: LOCAL_BYELAWS.uri,
+      catchReturn: CATCH_RETURN.uri
     }
   }
 }

package/src/uri.js

@@ -86,3 +86,4 @@ export const GET_PRICING_LENGTHS = { uri: '/buy/get-pricing/lengths' }
 
 export const FRESHWATER_FISING_RULES = { uri: 'https://www.gov.uk/freshwater-rod-fishing-rules' }
 export const LOCAL_BYELAWS = { uri: 'https://www.gov.uk/government/collections/local-fishing-byelaws' }
+export const CATCH_RETURN = { uri: 'https://www.gov.uk/catch-return' }