@defra-fish/gafl-webapp-service 1.61.0-rc.1 → 1.61.0-rc.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +6 -7
- package/src/locales/cy.json +33 -30
- package/src/locales/en.json +33 -30
- package/src/pages/concessions/disability/disability-concession.njk +9 -8
- package/src/pages/licence-details/licence-to-start/licence-to-start.njk +0 -55
- package/src/pages/order-complete/order-complete/__tests__/__snapshots__/order-complete.spec.js.snap +9 -18
- package/src/pages/order-complete/order-complete/__tests__/order-complete.spec.js +2 -4
- package/src/pages/order-complete/order-complete/order-complete.njk +1 -1
- package/src/pages/order-complete/order-complete/route.js +3 -7
- package/src/pages/summary/licence-summary/route.js +0 -4
- package/src/pages/terms-and-conditions/__tests__/__snapshots__/route.spec.js.snap +12 -12
- package/src/pages/terms-and-conditions/__tests__/route.spec.js +14 -12
- package/src/pages/terms-and-conditions/route.js +6 -6
- package/src/pages/terms-and-conditions/terms-and-conditions.njk +6 -4
- package/src/services/address-lookup/address-lookup-service.js +1 -1
package/package.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@defra-fish/gafl-webapp-service",
|
|
3
|
-
"version": "1.61.0-rc.
|
|
3
|
+
"version": "1.61.0-rc.11",
|
|
4
4
|
"description": "The websales frontend for the GAFL service",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"engines": {
|
|
7
|
-
"node": ">=
|
|
7
|
+
"node": ">=20"
|
|
8
8
|
},
|
|
9
9
|
"keywords": [
|
|
10
10
|
"rod",
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
"prepare": "gulp --gulpfile build/gulpfile.cjs"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@defra-fish/business-rules-lib": "1.61.0-rc.
|
|
40
|
-
"@defra-fish/connectors-lib": "1.61.0-rc.
|
|
39
|
+
"@defra-fish/business-rules-lib": "1.61.0-rc.11",
|
|
40
|
+
"@defra-fish/connectors-lib": "1.61.0-rc.11",
|
|
41
41
|
"@defra/hapi-gapi": "^2.0.0",
|
|
42
42
|
"@hapi/boom": "^9.1.2",
|
|
43
43
|
"@hapi/catbox-redis": "^6.0.2",
|
|
@@ -52,13 +52,12 @@
|
|
|
52
52
|
"debug": "^4.3.3",
|
|
53
53
|
"disinfect": "^1.1.0",
|
|
54
54
|
"find": "^0.3.0",
|
|
55
|
-
"flatpickr": "^4.6.9",
|
|
56
55
|
"govuk-frontend": "^5.2.0",
|
|
57
56
|
"hapi-i18n": "^3.0.1",
|
|
58
57
|
"joi": "^17.6.0",
|
|
59
58
|
"moment": "^2.29.1",
|
|
60
59
|
"moment-timezone": "^0.5.34",
|
|
61
|
-
"node-fetch": "^2.
|
|
60
|
+
"node-fetch": "^2.7.0",
|
|
62
61
|
"nunjucks": "^3.2.3",
|
|
63
62
|
"openid-client": "^4.9.1",
|
|
64
63
|
"semver": "^7.3.5",
|
|
@@ -80,5 +79,5 @@
|
|
|
80
79
|
"./gafl-jest-matchers.js"
|
|
81
80
|
]
|
|
82
81
|
},
|
|
83
|
-
"gitHead": "
|
|
82
|
+
"gitHead": "ca0af7012d18aa9414afce422db4af34ed59dacd"
|
|
84
83
|
}
|
package/src/locales/cy.json
CHANGED
|
@@ -254,7 +254,8 @@
|
|
|
254
254
|
"cookies_survey_subheading": "Arolwg o’n perfformiad",
|
|
255
255
|
"cookies_title": "Cwcis",
|
|
256
256
|
"cost": "Cost",
|
|
257
|
-
"disability_concession_12_month": "
|
|
257
|
+
"disability_concession_12_month": "Mae deiliaid trwydded blwyddyn yn gymwys ar gyfer consesiwn os byddant yn derbyn Taliad Anibyniaeth Personol (PIP), Lwfans Byw i’r Anabl (DLA) neu wedi bodloni’r meini prawf ar gyfer ",
|
|
258
|
+
"disability_concession_12_month_link": "Bathodyn Glas (yn agor mewn tab newydd)",
|
|
258
259
|
"disability_concession_badge_error_msg": "Nodwch rif Bathodyn Glas deiliad y drwydded",
|
|
259
260
|
"disability_concession_error_choose_option": "Dewiswch un o’r opsiynau.",
|
|
260
261
|
"disability_concession_error_ni_empty": "Nodwch Rif Yswiriant Gwladol deiliad y drwydded",
|
|
@@ -264,12 +265,15 @@
|
|
|
264
265
|
"disability_concession_ni_hint": "Mae hwn ar eich cerdyn Yswiriant Gwladol, llythyr budd-daliadau, slip talu neu P60. Er enghraifft 'QQ 12 34 56 C'",
|
|
265
266
|
"disability_concession_ni_label_jr": "Rhif Yswiriant Gwladol neu Gyfeirnod Plant",
|
|
266
267
|
"disability_concession_ni_label": "Rhif Yswiriant Gwladol",
|
|
267
|
-
"
|
|
268
|
-
"
|
|
269
|
-
"
|
|
270
|
-
"
|
|
271
|
-
"
|
|
272
|
-
"
|
|
268
|
+
"disability_concession_radio_badge_self": "Ydw, yn meddu ar Fathodyn Glas neu wedi bodloni’r meini prawf",
|
|
269
|
+
"disability_concession_radio_badge_bobo": "Ydyn, yn meddu ar Fathodyn Glas neu wedi bodloni’r meini prawf",
|
|
270
|
+
"disability_concession_radio_dla": "neu’r Lwfans Byw i’r Anabl (DLA)",
|
|
271
|
+
"disability_concession_radio_no_self": "Nac ydw",
|
|
272
|
+
"disability_concession_radio_no_bobo": "Nac ydyn",
|
|
273
|
+
"disability_concession_radio_pip_self": "Ydw, Taliad Anibyniaeth Personol (PIP)",
|
|
274
|
+
"disability_concession_radio_pip_bobo": "Ydyn, Taliad Anibyniaeth Personol (PIP)",
|
|
275
|
+
"disability_concession_title_bobo": "Ydyn nhw’n gymwys ar gyfer consesiwn?",
|
|
276
|
+
"disability_concession_title_self": "Ydych chi’n gymwys ar gyfer consesiwn?",
|
|
273
277
|
"date_day": "Diwrnod",
|
|
274
278
|
"dob_entry_hint": "Er enghraifft, 23 11 1979",
|
|
275
279
|
"dob_error_date_real": "Mae’n rhaid i’r dyddiad geni fod yn ddyddiad dilys",
|
|
@@ -552,11 +556,8 @@
|
|
|
552
556
|
"order_complete_before_leave_page_bulletpoint_2_link": "darllen yr adroddiad blynyddol pysgodfeydd ar gyfer Lloegr (yn agor mewn tab newydd)",
|
|
553
557
|
"order_complete_before_leave_page_paragraph": "Efallai yr hoffech:",
|
|
554
558
|
"order_complete_before_leave_page_title": "Cyn i chi adael y dudalen hon",
|
|
555
|
-
"
|
|
556
|
-
"
|
|
557
|
-
"order_complete_future_payments_link": "ganslo’r taliad ar gyfer trwyddedau yn y dyfodol nawr ",
|
|
558
|
-
"order_complete_future_payments_postal_paragraph_1": "Byddwch yn derbyn llythyr yn cadarnhau eich cytundeb taliad cerdyn sy’n ailadrodd. Os ydych chi wedi newid eich meddwl, gallwch ",
|
|
559
|
-
"order_complete_future_payments_postal_paragraph_2": " neu ganslo’n ddiweddarach gan ddefnyddio'r manylion yn y llythyr.",
|
|
559
|
+
"order_complete_future_payments_digital_paragraph": "Byddwch yn derbyn e-bost neu neges destun yn fuan yn cadarnhau eich cytundeb taliad cerdyn sy’n ailadrodd. Os ydych chi wedi newid eich meddwl, gallwch ganslo taliadau trwyddedau ar gyfer y dyfodol gan ddefnyddio’r manylion yn yr e-bost neu’r neges.",
|
|
560
|
+
"order_complete_future_payments_postal_paragraph": "Byddwch yn derbyn llythyr yn cadarnhau eich cytundeb taliad cerdyn sy’n ailadrodd. Os ydych chi wedi newid eich meddwl, gallwch ganslo taliadau trwyddedau ar gyfer y dyfodol gan ddefnyddio’r manylion yn eich llythyr.",
|
|
560
561
|
"order_complete_future_payments_title": "Taliadau am drwyddedau yn y dyfodol",
|
|
561
562
|
"order_complete_licence_details_bobo_digital_paragraph": "Bydd y drwydded hefyd yn cael ei hanfon ar ffurf e-bost neu neges destun.",
|
|
562
563
|
"order_complete_licence_details_bobo_digital_confirmation_paragraph": "Bydd manylion y drwydded yn cael eu hanfon ar ffurf e-bost neu neges destun.",
|
|
@@ -795,27 +796,29 @@
|
|
|
795
796
|
"terms_conds_warning": "Rhybudd Peidiwch â chau'r porwr na defnyddio'r botwm yn ôl pan fyddwch yn talu",
|
|
796
797
|
"terms_conds_agree_notify_self": "Rwy'n cytuno â’r amodau a thelerau",
|
|
797
798
|
"terms_conds_body_notify_self": "Pan fyddwch chi’n prynu’r drwydded hon mae’n rhaid i chi:",
|
|
798
|
-
"
|
|
799
|
-
"
|
|
800
|
-
"
|
|
801
|
-
"
|
|
802
|
-
"
|
|
803
|
-
"
|
|
804
|
-
"
|
|
805
|
-
"
|
|
806
|
-
"
|
|
799
|
+
"terms_conds_bulletpoint_1_1_notify": "cadarnhau bod yr holl wybodaeth a gyflwynwyd yn gywir",
|
|
800
|
+
"terms_conds_bulletpoint_1_2_notify": "Bydd gwybodaeth anghywir yn arwain at anfon trwydded annilys. Gallai unrhyw un sy’n pysgota gyda thrwydded bysgota annilys gael ei erlyn.",
|
|
801
|
+
"terms_conds_bulletpoint_2_notify_self": "beidio â rhannu eich trwydded - mae’n ddilys ar gyfer y deiliad a enwir yn unig",
|
|
802
|
+
"terms_conds_bulletpoint_3_notify_self": "cario tystiolaeth o’ch trwydded pan fyddwch yn pysgota, a dangos tystiolaeth i’n swyddogion gorfodi os gofynnir amdani",
|
|
803
|
+
"terms_conds_bulletpoint_4_notify_self": "cael caniatâd i bysgota gan berchennog hawliau pysgota’r dyfroedd, fel arfer yn bysgodfa neu’n glwb genweirio, ynghyd â dal y drwydded hon",
|
|
804
|
+
"terms_conds_bulletpoint_5_1_notify_self": "cydymffurfio gyda’r ",
|
|
805
|
+
"terms_conds_bulletpoint_5_2_notify_self": " sy’n berthnasol i’r ardal lle’r ydych chi’n dymuno pysgota",
|
|
806
|
+
"terms_conds_bulletpoint_5_link_notify_self": "is-ddeddfau cenedlaethol a lleol (yn agor mewn tab newydd)",
|
|
807
|
+
"terms_conds_bulletpoint_6_notify_self": "defnyddio eich trwydded ar gyfer y dyddiad a’r amser, nifer y gwialenni a rhywogaethau pysgod a nodir yn unig",
|
|
808
|
+
"terms_conds_bulletpoint_7_notify_self": "cyflwyno datganiad blynyddol, hyd yn oed os nad ydych wedi dal unrhyw eogiaid na brithyllod y môr, neu os na fuoch yn pysgota - gallwch ",
|
|
809
|
+
"terms_conds_bulletpoint_7_link_notify_self": "gyflwyno datganiad ar-lein (yn agor mewn tab newydd)",
|
|
807
810
|
"terms_conds_title_notify_self": "A ydych chi’n cytuno gydag amodau’r drwydded?",
|
|
808
811
|
"terms_conds_agree_notify_bobo": "Rwy’n cadarnhau bod deiliad y drwydded yn cytuno gydag amodau’r drwydded",
|
|
809
812
|
"terms_conds_body_notify_bobo": "Mae’n rhaid i ddeiliad y drwydded:",
|
|
810
|
-
"
|
|
811
|
-
"
|
|
812
|
-
"
|
|
813
|
-
"
|
|
814
|
-
"
|
|
815
|
-
"
|
|
816
|
-
"
|
|
817
|
-
"
|
|
818
|
-
"
|
|
813
|
+
"terms_conds_bulletpoint_2_notify_bobo": "beidio â rhannu ei drwydded - mae’n ddilys ar gyfer y deiliad a enwir yn unig",
|
|
814
|
+
"terms_conds_bulletpoint_3_notify_bobo": "cario tystiolaeth o’i drwydded pan fydd yn pysgota, a dangos tystiolaeth i’n swyddogion gorfodi os gofynnir amdani",
|
|
815
|
+
"terms_conds_bulletpoint_4_notify_bobo": "cael caniatâd i bysgota gan berchennog hawliau pysgota’r dyfroedd, fel arfer yn bysgodfa neu’n glwb genweirio, ynghyd â dal y drwydded hon",
|
|
816
|
+
"terms_conds_bulletpoint_5_1_notify_bobo": "cydymffurfio gyda’r ",
|
|
817
|
+
"terms_conds_bulletpoint_5_2_notify_bobo": " sy’n berthnasol i’r ardal lle mae'n dymuno pysgota",
|
|
818
|
+
"terms_conds_bulletpoint_5_link_notify_bobo": "is-ddeddfau cenedlaethol a lleol (yn agor mewn tab newydd)",
|
|
819
|
+
"terms_conds_bulletpoint_6_notify_bobo": "defnyddio ei drwydded ar gyfer y dyddiad a’r amser, nifer y gwialenni a rhywogaethau pysgod a nodir yn unig",
|
|
820
|
+
"terms_conds_bulletpoint_7_notify_bobo": "cyflwyno datganiad blynyddol, hyd yn oed os nad yw wedi dal unrhyw eogiaid na brithyllod y môr, neu os na fu'n pysgota - gellir ",
|
|
821
|
+
"terms_conds_bulletpoint_7_link_notify_bobo": "cyflwyno datganiad ar-lein (yn agor mewn tab newydd)",
|
|
819
822
|
"terms_conds_title_notify_bobo": "A yw deiliad y drwydded yn cytuno ag amodau’r drwydded?",
|
|
820
823
|
"there_is_a_problem": "Mae problem",
|
|
821
824
|
"total": "Cyfanswm",
|
package/src/locales/en.json
CHANGED
|
@@ -254,7 +254,8 @@
|
|
|
254
254
|
"cookies_survey_subheading": "Our performance survey",
|
|
255
255
|
"cookies_title": "Cookies",
|
|
256
256
|
"cost": "Cost",
|
|
257
|
-
"disability_concession_12_month": "12 month licence holders
|
|
257
|
+
"disability_concession_12_month": "12 month licence holders are eligible for a concession if they receive Personal Independence Payment (PIP), Disability Living Allowance (DLA), have or meet the criteria for a ",
|
|
258
|
+
"disability_concession_12_month_link": "Blue Badge (opens in new tab)",
|
|
258
259
|
"disability_concession_badge_error_msg": "Enter the licence holder’s Blue Badge number",
|
|
259
260
|
"disability_concession_error_choose_option": "Choose one of the options.",
|
|
260
261
|
"disability_concession_error_ni_empty": "Enter the licence holder’s National Insurance number",
|
|
@@ -264,12 +265,15 @@
|
|
|
264
265
|
"disability_concession_ni_hint": "This can be found on a National Insurance card, benefit letter, payslip or P60. For example 'QQ 12 34 56 C'",
|
|
265
266
|
"disability_concession_ni_label_jr": "National Insurance or Child Reference number",
|
|
266
267
|
"disability_concession_ni_label": "National Insurance number",
|
|
267
|
-
"
|
|
268
|
-
"
|
|
269
|
-
"
|
|
270
|
-
"
|
|
271
|
-
"
|
|
272
|
-
"
|
|
268
|
+
"disability_concession_radio_badge_self": "Yes, have or meet the eligibility criteria for Blue Badge",
|
|
269
|
+
"disability_concession_radio_badge_bobo": "Yes, have or meet the eligibility criteria for Blue Badge",
|
|
270
|
+
"disability_concession_radio_dla": "Or Disability Living Allowance (DLA)",
|
|
271
|
+
"disability_concession_radio_no_self": "No",
|
|
272
|
+
"disability_concession_radio_no_bobo": "No",
|
|
273
|
+
"disability_concession_radio_pip_self": "Yes, Personal Independence Payment (PIP)",
|
|
274
|
+
"disability_concession_radio_pip_bobo": "Yes, Personal Independence Payment (PIP)",
|
|
275
|
+
"disability_concession_title_bobo": "Are they eligible for a concession?",
|
|
276
|
+
"disability_concession_title_self": "Are you eligible for a concession?",
|
|
273
277
|
"date_day": "Day",
|
|
274
278
|
"dob_entry_hint": "For example, 23 11 1979",
|
|
275
279
|
"dob_error_date_real": "Date of birth must be a real date",
|
|
@@ -555,11 +559,8 @@
|
|
|
555
559
|
"order_complete_before_leave_page_bulletpoint_2_link": "read the latest fisheries annual report for England (opens in new tab)",
|
|
556
560
|
"order_complete_before_leave_page_paragraph": "You may like to:",
|
|
557
561
|
"order_complete_before_leave_page_title": "Before you leave this page",
|
|
558
|
-
"
|
|
559
|
-
"
|
|
560
|
-
"order_complete_future_payments_link": "cancel the future licence payments now",
|
|
561
|
-
"order_complete_future_payments_postal_paragraph_1": "You will get a letter confirming your recurring card payment agreement. If you have changed your mind, you can ",
|
|
562
|
-
"order_complete_future_payments_postal_paragraph_2": " or cancel later using the details in the letter.",
|
|
562
|
+
"order_complete_future_payments_digital_paragraph": "You will shortly get an email or text message confirming your recurring card payment agreement. If you have changed your mind, you can cancel the future licence payments using the details in the email or text message.",
|
|
563
|
+
"order_complete_future_payments_postal_paragraph": "You will get a letter confirming your recurring card payment agreement. If you have changed your mind, you can cancel the future licence payments using the details in your letter.",
|
|
563
564
|
"order_complete_future_payments_title": "Future licence payments",
|
|
564
565
|
"order_complete_licence_details_bobo_digital_paragraph": "The licence will also be sent by email or text message.",
|
|
565
566
|
"order_complete_licence_details_bobo_digital_confirmation_paragraph": "Licence details will also be sent by email or text message.",
|
|
@@ -795,27 +796,29 @@
|
|
|
795
796
|
"terms_conds_warning": "Do not close the browser or use the back button during payment",
|
|
796
797
|
"terms_conds_agree_notify_self": "I agree to the licence conditions",
|
|
797
798
|
"terms_conds_body_notify_self": "When you buy this licence you must:",
|
|
798
|
-
"
|
|
799
|
-
"
|
|
800
|
-
"
|
|
801
|
-
"
|
|
802
|
-
"
|
|
803
|
-
"
|
|
804
|
-
"
|
|
805
|
-
"
|
|
806
|
-
"
|
|
799
|
+
"terms_conds_bulletpoint_1_1_notify": "confirm all the information submitted is accurate",
|
|
800
|
+
"terms_conds_bulletpoint_1_2_notify": "Incorrect information will result in issuing of an invalid licence. Anyone fishing with an invalid fishing licence may be prosecuted.",
|
|
801
|
+
"terms_conds_bulletpoint_2_notify_self": "not share your licence - it is only valid for the named licence holder",
|
|
802
|
+
"terms_conds_bulletpoint_3_notify_self": "carry proof of your licence when you go fishing and show it to our enforcement officers if asked",
|
|
803
|
+
"terms_conds_bulletpoint_4_notify_self": "get permission to fish from the owner of the water's fishing rights, usually a fishery or angling club, in addition to having this licence",
|
|
804
|
+
"terms_conds_bulletpoint_5_1_notify_self": "comply with the ",
|
|
805
|
+
"terms_conds_bulletpoint_5_2_notify_self": " that apply to the area you want to fish",
|
|
806
|
+
"terms_conds_bulletpoint_5_link_notify_self": "national and local byelaws (opens in new tab)",
|
|
807
|
+
"terms_conds_bulletpoint_6_notify_self": "only use your licence for the specified date and time, number of rods and species of fish",
|
|
808
|
+
"terms_conds_bulletpoint_7_notify_self": "submit an annual catch return, even if you did not catch any salmon or sea trout, or did not go fishing - you can ",
|
|
809
|
+
"terms_conds_bulletpoint_7_link_notify_self": "submit a catch return (opens in new tab)",
|
|
807
810
|
"terms_conds_title_notify_self": "Do you agree to the licence conditions?",
|
|
808
811
|
"terms_conds_agree_notify_bobo": "I confirm the licence holder agrees to the licence conditions",
|
|
809
812
|
"terms_conds_body_notify_bobo": "The licence holder must:",
|
|
810
|
-
"
|
|
811
|
-
"
|
|
812
|
-
"
|
|
813
|
-
"
|
|
814
|
-
"
|
|
815
|
-
"
|
|
816
|
-
"
|
|
817
|
-
"
|
|
818
|
-
"
|
|
813
|
+
"terms_conds_bulletpoint_2_notify_bobo": "not share their licence - it is only valid for the named licence holder",
|
|
814
|
+
"terms_conds_bulletpoint_3_notify_bobo": "carry proof of their licence when they go fishing and show it to our enforcement officers if asked",
|
|
815
|
+
"terms_conds_bulletpoint_4_notify_bobo": "get permission to fish from the owner of the water's fishing rights, usually a fishery or angling club, in addition to having this licence",
|
|
816
|
+
"terms_conds_bulletpoint_5_1_notify_bobo": "comply with the ",
|
|
817
|
+
"terms_conds_bulletpoint_5_2_notify_bobo": " that apply to the area they want to fish",
|
|
818
|
+
"terms_conds_bulletpoint_5_link_notify_bobo": "national and local byelaws (opens in new tab)",
|
|
819
|
+
"terms_conds_bulletpoint_6_notify_bobo": "only use their licence for the specified date and time, number of rods and species of fish",
|
|
820
|
+
"terms_conds_bulletpoint_7_notify_bobo": "submit an annual catch return, even if they did not catch any salmon or sea trout, or did not go fishing - they can ",
|
|
821
|
+
"terms_conds_bulletpoint_7_link_notify_bobo": "submit a catch return (opens in new tab)",
|
|
819
822
|
"terms_conds_title_notify_bobo": "Does the licence holder agree to the licence conditions?",
|
|
820
823
|
"there_is_a_problem": "There is a problem",
|
|
821
824
|
"total": "Total",
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
{% from "radios/macro.njk" import govukRadios %}
|
|
3
3
|
{% from "input/macro.njk" import govukInput %}
|
|
4
4
|
|
|
5
|
-
{% set title = mssgs.
|
|
5
|
+
{% set title = mssgs.disability_concession_title_self if data.isLicenceForYou else mssgs.disability_concession_title_bobo %}
|
|
6
6
|
{% set describedByTag = "ni-number-hint" %}
|
|
7
|
+
{% set suffix = 'self' if data.isLicenceForYou else 'bobo' %}
|
|
7
8
|
|
|
8
9
|
{%
|
|
9
10
|
set errorMap = {
|
|
@@ -54,7 +55,7 @@
|
|
|
54
55
|
|
|
55
56
|
{% block pageContent %}
|
|
56
57
|
{% if not data.hasJunior and not data.hasSenior %}
|
|
57
|
-
<p class="govuk-
|
|
58
|
+
<p class="govuk-hint">{{ mssgs.disability_concession_12_month }}<a href="https://www.gov.uk/government/publications/blue-badge-can-i-get-one/can-i-get-a-blue-badge" class="govuk-link" target="_blank">{{ mssgs.disability_concession_12_month_link }}</a></p>
|
|
58
59
|
{% endif %}
|
|
59
60
|
|
|
60
61
|
{{ govukRadios({
|
|
@@ -62,19 +63,19 @@
|
|
|
62
63
|
name: "disability-concession",
|
|
63
64
|
items: [
|
|
64
65
|
{
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
66
|
+
html: mssgs['disability_concession_radio_pip_' ~ suffix] ~ '<br>' ~ mssgs.disability_concession_radio_dla,
|
|
67
|
+
value: data.pipDla,
|
|
68
|
+
checked: payload['disability-concession'] === data.pipDla,
|
|
69
|
+
conditional: { html: pipDla }
|
|
69
70
|
},
|
|
70
71
|
{
|
|
71
|
-
text: mssgs
|
|
72
|
+
text: mssgs['disability_concession_radio_badge_' ~ suffix],
|
|
72
73
|
value: data.blueBadge,
|
|
73
74
|
checked: payload['disability-concession'] === data.blueBadge,
|
|
74
75
|
conditional: { html: blueBadge }
|
|
75
76
|
},
|
|
76
77
|
{
|
|
77
|
-
text: mssgs
|
|
78
|
+
text: mssgs['disability_concession_radio_no_' ~ suffix],
|
|
78
79
|
value: data.no,
|
|
79
80
|
checked: payload['disability-concession'] === data.no
|
|
80
81
|
}
|
|
@@ -118,59 +118,4 @@
|
|
|
118
118
|
import { initAll } from '/public/javascript/govuk-frontend-min.js'
|
|
119
119
|
initAll()
|
|
120
120
|
</script>
|
|
121
|
-
<script src="/public/javascript/flatpickr-min.js"></script>
|
|
122
|
-
<script nonce="{{nonce}}">(function () {
|
|
123
|
-
const dataInputDiv = document.getElementById('licence-start-date')
|
|
124
|
-
const calImageDiv = document.createElement('div')
|
|
125
|
-
calImageDiv.id = 'cal-image-div'
|
|
126
|
-
const calImage = document.createElement('img')
|
|
127
|
-
calImage.src = '/public/images/icon-calendar-2x.png'
|
|
128
|
-
calImage.alt = '{{ mssgs.licence_date_picker }}'
|
|
129
|
-
calImageDiv.appendChild(calImage)
|
|
130
|
-
calImageDiv.setAttribute('aria-hidden', true)
|
|
131
|
-
dataInputDiv.appendChild(calImageDiv)
|
|
132
|
-
const fpk = flatpickr(calImageDiv, {
|
|
133
|
-
dateFormat: "d m Y",
|
|
134
|
-
disableMobile: true,
|
|
135
|
-
minDate: 'today',
|
|
136
|
-
maxDate: '{{ data.maxStartDate }}',
|
|
137
|
-
position: 'below',
|
|
138
|
-
monthSelectorType: 'static',
|
|
139
|
-
showMonths: 1,
|
|
140
|
-
clickOpens: false,
|
|
141
|
-
ariaDateFormat: "",
|
|
142
|
-
onChange: function(selectedDates, dateStr, instance) {
|
|
143
|
-
var d = new Date(selectedDates[0])
|
|
144
|
-
document.getElementById('licence-start-date-day').value = d.getDate()
|
|
145
|
-
document.getElementById('licence-start-date-month').value = d.getMonth() + 1
|
|
146
|
-
document.getElementById('licence-start-date-year').value = d.getFullYear()
|
|
147
|
-
},
|
|
148
|
-
onOpen: [ function(selectedDates, dateStr, instance) {
|
|
149
|
-
if (!document.getElementById('year-read-only')) {
|
|
150
|
-
const yearInputWrapper = document.getElementsByClassName('numInputWrapper')[0];
|
|
151
|
-
yearInputWrapper.style.display= 'none';
|
|
152
|
-
const currentMonthDiv = document.getElementsByClassName('flatpickr-current-month')[0];
|
|
153
|
-
const yearReadOnly = document.createElement('span');
|
|
154
|
-
yearReadOnly.id = 'year-read-only';
|
|
155
|
-
yearReadOnly.innerHTML = ' ' + instance.currentYear;
|
|
156
|
-
currentMonthDiv.appendChild(yearReadOnly);
|
|
157
|
-
}
|
|
158
|
-
} ],
|
|
159
|
-
onYearChange: function(selectedDates, dateStr, instance) {
|
|
160
|
-
const yearReadOnly = document.getElementById('year-read-only');
|
|
161
|
-
yearReadOnly.innerHTML = ' ' + instance.currentYear;
|
|
162
|
-
}
|
|
163
|
-
})
|
|
164
|
-
window.addEventListener('keydown', function (event) {
|
|
165
|
-
if (event.defaultPrevented) {
|
|
166
|
-
return;
|
|
167
|
-
}
|
|
168
|
-
if (event.key === 'Esc' || event.key === 'Escape' ) {
|
|
169
|
-
fpk.close()
|
|
170
|
-
}
|
|
171
|
-
})
|
|
172
|
-
calImageDiv.onclick = function() {
|
|
173
|
-
fpk.toggle()
|
|
174
|
-
}
|
|
175
|
-
})()</script>
|
|
176
121
|
{% endblock %}
|
package/src/pages/order-complete/order-complete/__tests__/__snapshots__/order-complete.spec.js.snap
CHANGED
|
@@ -2,8 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
exports[`The order completion handler 8 day licence sets as non_postal 1`] = `
|
|
4
4
|
Object {
|
|
5
|
-
"
|
|
6
|
-
"futurePaymentsParagraphTwo": "future payments digital two",
|
|
5
|
+
"futurePaymentsParagraph": "future payments digital",
|
|
7
6
|
"licenceDetailsDigitalParagraph": "fishing self digital confirmation licence details",
|
|
8
7
|
"licenceDetailsParagraphTwo": "paragraph self licence details",
|
|
9
8
|
"licenceTitle": "title self licence details",
|
|
@@ -16,8 +15,7 @@ Object {
|
|
|
16
15
|
|
|
17
16
|
exports[`The order completion handler 12 month digital licence for someone else 1`] = `
|
|
18
17
|
Object {
|
|
19
|
-
"
|
|
20
|
-
"futurePaymentsParagraphTwo": "future payments digital two",
|
|
18
|
+
"futurePaymentsParagraph": "future payments digital",
|
|
21
19
|
"licenceDetailsDigitalParagraph": "fishing bobo digital licence details",
|
|
22
20
|
"licenceDetailsParagraphTwo": "paragraph bobo licence details",
|
|
23
21
|
"licenceTitle": "title bobo licence details",
|
|
@@ -30,8 +28,7 @@ Object {
|
|
|
30
28
|
|
|
31
29
|
exports[`The order completion handler 12 month digital licence for you 1`] = `
|
|
32
30
|
Object {
|
|
33
|
-
"
|
|
34
|
-
"futurePaymentsParagraphTwo": "future payments digital two",
|
|
31
|
+
"futurePaymentsParagraph": "future payments digital",
|
|
35
32
|
"licenceDetailsDigitalParagraph": "fishing self digital licence details",
|
|
36
33
|
"licenceDetailsParagraphTwo": "paragraph self licence details",
|
|
37
34
|
"licenceTitle": "title self licence details",
|
|
@@ -44,8 +41,7 @@ Object {
|
|
|
44
41
|
|
|
45
42
|
exports[`The order completion handler 12 month postal licence for someone else with digital confirmation 1`] = `
|
|
46
43
|
Object {
|
|
47
|
-
"
|
|
48
|
-
"futurePaymentsParagraphTwo": "future payments digital two",
|
|
44
|
+
"futurePaymentsParagraph": "future payments digital",
|
|
49
45
|
"licenceDetailsDigitalParagraph": "fishing bobo digital confirmation licence details",
|
|
50
46
|
"licenceDetailsParagraphTwo": "paragraph bobo licence details",
|
|
51
47
|
"licenceTitle": "title bobo licence details",
|
|
@@ -58,8 +54,7 @@ Object {
|
|
|
58
54
|
|
|
59
55
|
exports[`The order completion handler 12 month postal licence for someone else with none digital confirmation 1`] = `
|
|
60
56
|
Object {
|
|
61
|
-
"
|
|
62
|
-
"futurePaymentsParagraphTwo": "future payments digital two",
|
|
57
|
+
"futurePaymentsParagraph": "future payments digital",
|
|
63
58
|
"licenceDetailsDigitalParagraph": undefined,
|
|
64
59
|
"licenceDetailsParagraphTwo": "paragraph bobo licence details",
|
|
65
60
|
"licenceTitle": "title bobo licence details",
|
|
@@ -72,8 +67,7 @@ Object {
|
|
|
72
67
|
|
|
73
68
|
exports[`The order completion handler 12 month postal licence for you with digital confirmation 1`] = `
|
|
74
69
|
Object {
|
|
75
|
-
"
|
|
76
|
-
"futurePaymentsParagraphTwo": "future payments digital two",
|
|
70
|
+
"futurePaymentsParagraph": "future payments digital",
|
|
77
71
|
"licenceDetailsDigitalParagraph": "fishing self digital confirmation licence details",
|
|
78
72
|
"licenceDetailsParagraphTwo": "paragraph self licence details",
|
|
79
73
|
"licenceTitle": "title self licence details",
|
|
@@ -86,8 +80,7 @@ Object {
|
|
|
86
80
|
|
|
87
81
|
exports[`The order completion handler 12 month postal licence for you with none digital confirmation 1`] = `
|
|
88
82
|
Object {
|
|
89
|
-
"
|
|
90
|
-
"futurePaymentsParagraphTwo": "future payments digital two",
|
|
83
|
+
"futurePaymentsParagraph": "future payments digital",
|
|
91
84
|
"licenceDetailsDigitalParagraph": undefined,
|
|
92
85
|
"licenceDetailsParagraphTwo": "paragraph self licence details",
|
|
93
86
|
"licenceTitle": "title self licence details",
|
|
@@ -100,8 +93,7 @@ Object {
|
|
|
100
93
|
|
|
101
94
|
exports[`The order completion handler 12 month recurring payment with digital reminder 1`] = `
|
|
102
95
|
Object {
|
|
103
|
-
"
|
|
104
|
-
"futurePaymentsParagraphTwo": "future payments digital two",
|
|
96
|
+
"futurePaymentsParagraph": "future payments digital",
|
|
105
97
|
"licenceDetailsDigitalParagraph": "fishing self digital licence details",
|
|
106
98
|
"licenceDetailsParagraphTwo": "paragraph self licence details",
|
|
107
99
|
"licenceTitle": "title self licence details",
|
|
@@ -114,8 +106,7 @@ Object {
|
|
|
114
106
|
|
|
115
107
|
exports[`The order completion handler 12 month recurring payment with postal reminder 1`] = `
|
|
116
108
|
Object {
|
|
117
|
-
"
|
|
118
|
-
"futurePaymentsParagraphTwo": "future payments postal two",
|
|
109
|
+
"futurePaymentsParagraph": "future payments postal",
|
|
119
110
|
"licenceDetailsDigitalParagraph": "fishing self digital licence details",
|
|
120
111
|
"licenceDetailsParagraphTwo": "paragraph self licence details",
|
|
121
112
|
"licenceTitle": "title self licence details",
|
|
@@ -99,10 +99,8 @@ const getMessages = () => ({
|
|
|
99
99
|
order_complete_when_fishing_bobo_postal_digital: 'fishing bobo postal digital when fishing',
|
|
100
100
|
order_complete_when_fishing_self_non_postal_digital: 'fishing self non postal digital when fishing',
|
|
101
101
|
order_complete_when_fishing_bobo_non_postal_digital: 'fishing bobo non postal digital when fishing',
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
order_complete_future_payments_postal_paragraph_1: 'future payments postal one',
|
|
105
|
-
order_complete_future_payments_postal_paragraph_2: 'future payments postal two'
|
|
102
|
+
order_complete_future_payments_digital_paragraph: 'future payments digital',
|
|
103
|
+
order_complete_future_payments_postal_paragraph: 'future payments postal'
|
|
106
104
|
})
|
|
107
105
|
|
|
108
106
|
const getSampleRequest = ({
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
|
|
30
30
|
{% if (data.recurringPayment) %}
|
|
31
31
|
<h2 class="govuk-heading-m">{{ mssgs.order_complete_future_payments_title }}</h2>
|
|
32
|
-
<p class="govuk-body">{{ data.content.
|
|
32
|
+
<p class="govuk-body">{{ data.content.futurePaymentsParagraph }}</p>
|
|
33
33
|
{% endif %}
|
|
34
34
|
|
|
35
35
|
<h2 class="govuk-heading-m">{{ mssgs.order_complete_when_fishing_title }}</h2>
|
|
@@ -94,13 +94,9 @@ const getOrderCompleteContent = (permission, mssgs, transaction) => {
|
|
|
94
94
|
? mssgs.order_complete_when_fishing_self_postal_non_digital_2
|
|
95
95
|
: mssgs.order_complete_when_fishing_bobo_postal_non_digital_2,
|
|
96
96
|
|
|
97
|
-
|
|
98
|
-
? mssgs.
|
|
99
|
-
: mssgs.
|
|
100
|
-
|
|
101
|
-
futurePaymentsParagraphTwo: digitalReminder(permission)
|
|
102
|
-
? mssgs.order_complete_future_payments_digital_paragraph_2
|
|
103
|
-
: mssgs.order_complete_future_payments_postal_paragraph_2
|
|
97
|
+
futurePaymentsParagraph: digitalReminder(permission)
|
|
98
|
+
? mssgs.order_complete_future_payments_digital_paragraph
|
|
99
|
+
: mssgs.order_complete_future_payments_postal_paragraph
|
|
104
100
|
}
|
|
105
101
|
}
|
|
106
102
|
|
|
@@ -23,8 +23,6 @@ import { nextPage } from '../../../routes/next-page.js'
|
|
|
23
23
|
import { addLanguageCodeToUri } from '../../../processors/uri-helper.js'
|
|
24
24
|
import { displayPermissionPrice } from '../../../processors/price-display.js'
|
|
25
25
|
import { hasJunior } from '../../../processors/concession-helper.js'
|
|
26
|
-
import db from 'debug'
|
|
27
|
-
const debug = db('webapp:licence-summary')
|
|
28
26
|
|
|
29
27
|
class RowGenerator {
|
|
30
28
|
constructor (request, permission) {
|
|
@@ -190,14 +188,12 @@ export const getData = async request => {
|
|
|
190
188
|
|
|
191
189
|
status.fromSummary = getFromSummary(status.fromSummary, permission.isRenewal)
|
|
192
190
|
await request.cache().helpers.status.setCurrentPermission(status)
|
|
193
|
-
debug('retrieving permit info')
|
|
194
191
|
const hash = hashPermission(permission)
|
|
195
192
|
if (permission.hash !== hash) {
|
|
196
193
|
permission.permit = await findPermit(permission)
|
|
197
194
|
permission.hash = hash
|
|
198
195
|
await request.cache().helpers.transaction.setCurrentPermission(permission)
|
|
199
196
|
}
|
|
200
|
-
debug('retrieved permit', JSON.stringify(permission))
|
|
201
197
|
|
|
202
198
|
return {
|
|
203
199
|
licenceSummaryRows: getLicenceSummaryRows(request, permission),
|
|
@@ -5,13 +5,13 @@ Object {
|
|
|
5
5
|
"agree": "Notify bobo agree",
|
|
6
6
|
"body": "Notify bobo body",
|
|
7
7
|
"bulletpoint": Object {
|
|
8
|
-
"
|
|
9
|
-
"
|
|
10
|
-
"
|
|
11
|
-
"
|
|
12
|
-
"
|
|
8
|
+
"bulletpointFiveLink": "Notify bobo bulletpoint 5 link",
|
|
9
|
+
"bulletpointFivePartOne": "Notify bobo bulletpoint 5 part 1",
|
|
10
|
+
"bulletpointFivePartTwo": "Notify bobo bulletpoint 5 part 2",
|
|
11
|
+
"bulletpointFour": "Notify bobo bulletpoint 4",
|
|
12
|
+
"bulletpointSeven": "Notify bobo bulletpoint 7",
|
|
13
|
+
"bulletpointSevenLink": "Notify bobo bulletpoint 7 link",
|
|
13
14
|
"bulletpointSix": "Notify bobo bulletpoint 6",
|
|
14
|
-
"bulletpointSixLink": "Notify bobo bulletpoint 6 link",
|
|
15
15
|
"bulletpointThree": "Notify bobo bulletpoint 3",
|
|
16
16
|
"bulletpointTwo": "Notify bobo bulletpoint 2",
|
|
17
17
|
},
|
|
@@ -24,13 +24,13 @@ Object {
|
|
|
24
24
|
"agree": "Notify self agree",
|
|
25
25
|
"body": "Notify self body",
|
|
26
26
|
"bulletpoint": Object {
|
|
27
|
-
"
|
|
28
|
-
"
|
|
29
|
-
"
|
|
30
|
-
"
|
|
31
|
-
"
|
|
27
|
+
"bulletpointFiveLink": "Notify self bulletpoint 5 link",
|
|
28
|
+
"bulletpointFivePartOne": "Notify self bulletpoint 5 part 1",
|
|
29
|
+
"bulletpointFivePartTwo": "Notify self bulletpoint 5 part 2",
|
|
30
|
+
"bulletpointFour": "Notify self bulletpoint 4",
|
|
31
|
+
"bulletpointSeven": "Notify self bulletpoint 7",
|
|
32
|
+
"bulletpointSevenLink": "Notify self bulletpoint 7 link",
|
|
32
33
|
"bulletpointSix": "Notify self bulletpoint 6",
|
|
33
|
-
"bulletpointSixLink": "Notify self bulletpoint 6 link",
|
|
34
34
|
"bulletpointThree": "Notify self bulletpoint 3",
|
|
35
35
|
"bulletpointTwo": "Notify self bulletpoint 2",
|
|
36
36
|
},
|
|
@@ -18,27 +18,29 @@ jest.mock('../../../processors/mapping-constants.js', () => ({
|
|
|
18
18
|
const getMessages = () => ({
|
|
19
19
|
terms_conds_agree_notify_bobo: 'Notify bobo agree',
|
|
20
20
|
terms_conds_body_notify_bobo: 'Notify bobo body',
|
|
21
|
-
|
|
21
|
+
terms_conds_bulletpoint_1_notify: 'Notify bobo bulletpoint 1 part 1',
|
|
22
|
+
terms_conds_bulletpoint_1_1_notify: 'Notify bobo bulletpoint 1 part 2',
|
|
22
23
|
terms_conds_bulletpoint_2_notify_bobo: 'Notify bobo bulletpoint 2',
|
|
23
24
|
terms_conds_bulletpoint_3_notify_bobo: 'Notify bobo bulletpoint 3',
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
25
|
+
terms_conds_bulletpoint_4_notify_bobo: 'Notify bobo bulletpoint 4',
|
|
26
|
+
terms_conds_bulletpoint_5_1_notify_bobo: 'Notify bobo bulletpoint 5 part 1',
|
|
27
|
+
terms_conds_bulletpoint_5_2_notify_bobo: 'Notify bobo bulletpoint 5 part 2',
|
|
28
|
+
terms_conds_bulletpoint_5_link_notify_bobo: 'Notify bobo bulletpoint 5 link',
|
|
28
29
|
terms_conds_bulletpoint_6_notify_bobo: 'Notify bobo bulletpoint 6',
|
|
29
|
-
|
|
30
|
+
terms_conds_bulletpoint_7_notify_bobo: 'Notify bobo bulletpoint 7',
|
|
31
|
+
terms_conds_bulletpoint_7_link_notify_bobo: 'Notify bobo bulletpoint 7 link',
|
|
30
32
|
terms_conds_title_notify_bobo: 'Notify bobo title',
|
|
31
33
|
terms_conds_agree_notify_self: 'Notify self agree',
|
|
32
34
|
terms_conds_body_notify_self: 'Notify self body',
|
|
33
|
-
terms_conds_bulletpoint_1_notify_self: 'Notify self bulletpoint 1',
|
|
34
35
|
terms_conds_bulletpoint_2_notify_self: 'Notify self bulletpoint 2',
|
|
35
36
|
terms_conds_bulletpoint_3_notify_self: 'Notify self bulletpoint 3',
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
terms_conds_bulletpoint_4_notify_self: 'Notify self bulletpoint 4',
|
|
38
|
+
terms_conds_bulletpoint_5_1_notify_self: 'Notify self bulletpoint 5 part 1',
|
|
39
|
+
terms_conds_bulletpoint_5_2_notify_self: 'Notify self bulletpoint 5 part 2',
|
|
40
|
+
terms_conds_bulletpoint_5_link_notify_self: 'Notify self bulletpoint 5 link',
|
|
40
41
|
terms_conds_bulletpoint_6_notify_self: 'Notify self bulletpoint 6',
|
|
41
|
-
|
|
42
|
+
terms_conds_bulletpoint_7_notify_self: 'Notify self bulletpoint 7',
|
|
43
|
+
terms_conds_bulletpoint_7_link_notify_self: 'Notify self bulletpoint 7 link',
|
|
42
44
|
terms_conds_title_notify_self: 'Notify self title'
|
|
43
45
|
})
|
|
44
46
|
|
|
@@ -36,15 +36,15 @@ const getContent = (permission, mssgs) => {
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
const getBulletpointContent = (isLicenceForYou, mssgs) => ({
|
|
39
|
-
bulletpointOne: mssgs[`terms_conds_bulletpoint_1_notify_${isLicenceForYou ? 'self' : 'bobo'}`],
|
|
40
39
|
bulletpointTwo: mssgs[`terms_conds_bulletpoint_2_notify_${isLicenceForYou ? 'self' : 'bobo'}`],
|
|
41
40
|
bulletpointThree: mssgs[`terms_conds_bulletpoint_3_notify_${isLicenceForYou ? 'self' : 'bobo'}`],
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
41
|
+
bulletpointFour: mssgs[`terms_conds_bulletpoint_4_notify_${isLicenceForYou ? 'self' : 'bobo'}`],
|
|
42
|
+
bulletpointFivePartOne: mssgs[`terms_conds_bulletpoint_5_1_notify_${isLicenceForYou ? 'self' : 'bobo'}`],
|
|
43
|
+
bulletpointFiveLink: mssgs[`terms_conds_bulletpoint_5_link_notify_${isLicenceForYou ? 'self' : 'bobo'}`],
|
|
44
|
+
bulletpointFivePartTwo: mssgs[`terms_conds_bulletpoint_5_2_notify_${isLicenceForYou ? 'self' : 'bobo'}`],
|
|
46
45
|
bulletpointSix: mssgs[`terms_conds_bulletpoint_6_notify_${isLicenceForYou ? 'self' : 'bobo'}`],
|
|
47
|
-
|
|
46
|
+
bulletpointSeven: mssgs[`terms_conds_bulletpoint_7_notify_${isLicenceForYou ? 'self' : 'bobo'}`],
|
|
47
|
+
bulletpointSevenLink: mssgs[`terms_conds_bulletpoint_7_link_notify_${isLicenceForYou ? 'self' : 'bobo'}`]
|
|
48
48
|
})
|
|
49
49
|
|
|
50
50
|
export const validator = Joi.object({
|
|
@@ -38,13 +38,15 @@
|
|
|
38
38
|
<div class="govuk-!-margin-bottom-9">
|
|
39
39
|
<p class="govuk-body">{{ data.content.body }}</p>
|
|
40
40
|
<ul class="govuk-list govuk-list--bullet">
|
|
41
|
-
<li>{{
|
|
41
|
+
<li>{{ mssgs.terms_conds_bulletpoint_1_1_notify }}</li>
|
|
42
|
+
<p>{{ mssgs.terms_conds_bulletpoint_1_2_notify }}</p>
|
|
42
43
|
<li>{{ data.content.bulletpoint.bulletpointTwo }}</li>
|
|
43
44
|
<li>{{ data.content.bulletpoint.bulletpointThree }}</li>
|
|
44
|
-
<li>{{ data.content.bulletpoint.
|
|
45
|
-
<li>{{ data.content.bulletpoint.
|
|
45
|
+
<li>{{ data.content.bulletpoint.bulletpointFour }}</li>
|
|
46
|
+
<li>{{ data.content.bulletpoint.bulletpointFivePartOne }}<a class="govuk-link" href="https://www.gov.uk/freshwater-rod-fishing-rules" rel="noreferrer noopener" target="_blank">{{ data.content.bulletpoint.bulletpointFiveLink }}</a>{{ data.content.bulletpoint.bulletpointFivePartTwo }}</li>
|
|
47
|
+
<li>{{ data.content.bulletpoint.bulletpointSix }}</li>
|
|
46
48
|
{% if data.isSalmonAndSeaTrout %}
|
|
47
|
-
<li>{{ data.content.bulletpoint.
|
|
49
|
+
<li>{{ data.content.bulletpoint.bulletpointSeven }}<a class="govuk-link" href="https://www.gov.uk/catch-return" rel="noreferrer noopener" target="_blank">{{ data.content.bulletpoint.bulletpointSevenLink }}</a></li>
|
|
48
50
|
{% endif %}
|
|
49
51
|
</ul>
|
|
50
52
|
</div>
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import fetch from 'node-fetch'
|
|
2
|
-
|
|
3
2
|
import { ADDRESS_LOOKUP_SERVICE, ADDRESS_LOOKUP_TIMEOUT_MS_DEFAULT } from '../../constants.js'
|
|
4
3
|
import db from 'debug'
|
|
5
4
|
const debug = db('webapp:address-lookup-service')
|
|
5
|
+
|
|
6
6
|
export default async (premises, postcode) => {
|
|
7
7
|
const url = new URL(process.env.ADDRESS_LOOKUP_URL)
|
|
8
8
|
|