@defra-fish/gafl-webapp-service 1.61.0-rc.8 → 1.61.0-rc.9
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 +4 -4
- package/src/locales/cy.json +20 -18
- package/src/locales/en.json +20 -18
- 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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@defra-fish/gafl-webapp-service",
|
|
3
|
-
"version": "1.61.0-rc.
|
|
3
|
+
"version": "1.61.0-rc.9",
|
|
4
4
|
"description": "The websales frontend for the GAFL service",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"engines": {
|
|
@@ -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.9",
|
|
40
|
+
"@defra-fish/connectors-lib": "1.61.0-rc.9",
|
|
41
41
|
"@defra/hapi-gapi": "^2.0.0",
|
|
42
42
|
"@hapi/boom": "^9.1.2",
|
|
43
43
|
"@hapi/catbox-redis": "^6.0.2",
|
|
@@ -79,5 +79,5 @@
|
|
|
79
79
|
"./gafl-jest-matchers.js"
|
|
80
80
|
]
|
|
81
81
|
},
|
|
82
|
-
"gitHead": "
|
|
82
|
+
"gitHead": "b9c65c7827bb974c94056bf5e387d80564d3ddc6"
|
|
83
83
|
}
|
package/src/locales/cy.json
CHANGED
|
@@ -792,27 +792,29 @@
|
|
|
792
792
|
"terms_conds_warning": "Rhybudd Peidiwch â chau'r porwr na defnyddio'r botwm yn ôl pan fyddwch yn talu",
|
|
793
793
|
"terms_conds_agree_notify_self": "Rwy'n cytuno â’r amodau a thelerau",
|
|
794
794
|
"terms_conds_body_notify_self": "Pan fyddwch chi’n prynu’r drwydded hon mae’n rhaid i chi:",
|
|
795
|
-
"
|
|
796
|
-
"
|
|
797
|
-
"
|
|
798
|
-
"
|
|
799
|
-
"
|
|
800
|
-
"
|
|
801
|
-
"
|
|
802
|
-
"
|
|
803
|
-
"
|
|
795
|
+
"terms_conds_bulletpoint_1_1_notify": "cadarnhau bod yr holl wybodaeth a gyflwynwyd yn gywir",
|
|
796
|
+
"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.",
|
|
797
|
+
"terms_conds_bulletpoint_2_notify_self": "beidio â rhannu eich trwydded - mae’n ddilys ar gyfer y deiliad a enwir yn unig",
|
|
798
|
+
"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",
|
|
799
|
+
"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",
|
|
800
|
+
"terms_conds_bulletpoint_5_1_notify_self": "cydymffurfio gyda’r ",
|
|
801
|
+
"terms_conds_bulletpoint_5_2_notify_self": " sy’n berthnasol i’r ardal lle’r ydych chi’n dymuno pysgota",
|
|
802
|
+
"terms_conds_bulletpoint_5_link_notify_self": "is-ddeddfau cenedlaethol a lleol (yn agor mewn tab newydd)",
|
|
803
|
+
"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",
|
|
804
|
+
"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 ",
|
|
805
|
+
"terms_conds_bulletpoint_7_link_notify_self": "gyflwyno datganiad ar-lein (yn agor mewn tab newydd)",
|
|
804
806
|
"terms_conds_title_notify_self": "A ydych chi’n cytuno gydag amodau’r drwydded?",
|
|
805
807
|
"terms_conds_agree_notify_bobo": "Rwy’n cadarnhau bod deiliad y drwydded yn cytuno gydag amodau’r drwydded",
|
|
806
808
|
"terms_conds_body_notify_bobo": "Mae’n rhaid i ddeiliad y drwydded:",
|
|
807
|
-
"
|
|
808
|
-
"
|
|
809
|
-
"
|
|
810
|
-
"
|
|
811
|
-
"
|
|
812
|
-
"
|
|
813
|
-
"
|
|
814
|
-
"
|
|
815
|
-
"
|
|
809
|
+
"terms_conds_bulletpoint_2_notify_bobo": "beidio â rhannu ei drwydded - mae’n ddilys ar gyfer y deiliad a enwir yn unig",
|
|
810
|
+
"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",
|
|
811
|
+
"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",
|
|
812
|
+
"terms_conds_bulletpoint_5_1_notify_bobo": "cydymffurfio gyda’r ",
|
|
813
|
+
"terms_conds_bulletpoint_5_2_notify_bobo": " sy’n berthnasol i’r ardal lle mae'n dymuno pysgota",
|
|
814
|
+
"terms_conds_bulletpoint_5_link_notify_bobo": "is-ddeddfau cenedlaethol a lleol (yn agor mewn tab newydd)",
|
|
815
|
+
"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",
|
|
816
|
+
"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 ",
|
|
817
|
+
"terms_conds_bulletpoint_7_link_notify_bobo": "cyflwyno datganiad ar-lein (yn agor mewn tab newydd)",
|
|
816
818
|
"terms_conds_title_notify_bobo": "A yw deiliad y drwydded yn cytuno ag amodau’r drwydded?",
|
|
817
819
|
"there_is_a_problem": "Mae problem",
|
|
818
820
|
"total": "Cyfanswm",
|
package/src/locales/en.json
CHANGED
|
@@ -792,27 +792,29 @@
|
|
|
792
792
|
"terms_conds_warning": "Do not close the browser or use the back button during payment",
|
|
793
793
|
"terms_conds_agree_notify_self": "I agree to the licence conditions",
|
|
794
794
|
"terms_conds_body_notify_self": "When you buy this licence you must:",
|
|
795
|
-
"
|
|
796
|
-
"
|
|
797
|
-
"
|
|
798
|
-
"
|
|
799
|
-
"
|
|
800
|
-
"
|
|
801
|
-
"
|
|
802
|
-
"
|
|
803
|
-
"
|
|
795
|
+
"terms_conds_bulletpoint_1_1_notify": "confirm all the information submitted is accurate",
|
|
796
|
+
"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.",
|
|
797
|
+
"terms_conds_bulletpoint_2_notify_self": "not share your licence - it is only valid for the named licence holder",
|
|
798
|
+
"terms_conds_bulletpoint_3_notify_self": "carry proof of your licence when you go fishing and show it to our enforcement officers if asked",
|
|
799
|
+
"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",
|
|
800
|
+
"terms_conds_bulletpoint_5_1_notify_self": "comply with the ",
|
|
801
|
+
"terms_conds_bulletpoint_5_2_notify_self": " that apply to the area you want to fish",
|
|
802
|
+
"terms_conds_bulletpoint_5_link_notify_self": "national and local byelaws (opens in new tab)",
|
|
803
|
+
"terms_conds_bulletpoint_6_notify_self": "only use your licence for the specified date and time, number of rods and species of fish",
|
|
804
|
+
"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 ",
|
|
805
|
+
"terms_conds_bulletpoint_7_link_notify_self": "submit a catch return (opens in new tab)",
|
|
804
806
|
"terms_conds_title_notify_self": "Do you agree to the licence conditions?",
|
|
805
807
|
"terms_conds_agree_notify_bobo": "I confirm the licence holder agrees to the licence conditions",
|
|
806
808
|
"terms_conds_body_notify_bobo": "The licence holder must:",
|
|
807
|
-
"
|
|
808
|
-
"
|
|
809
|
-
"
|
|
810
|
-
"
|
|
811
|
-
"
|
|
812
|
-
"
|
|
813
|
-
"
|
|
814
|
-
"
|
|
815
|
-
"
|
|
809
|
+
"terms_conds_bulletpoint_2_notify_bobo": "not share their licence - it is only valid for the named licence holder",
|
|
810
|
+
"terms_conds_bulletpoint_3_notify_bobo": "carry proof of their licence when they go fishing and show it to our enforcement officers if asked",
|
|
811
|
+
"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",
|
|
812
|
+
"terms_conds_bulletpoint_5_1_notify_bobo": "comply with the ",
|
|
813
|
+
"terms_conds_bulletpoint_5_2_notify_bobo": " that apply to the area they want to fish",
|
|
814
|
+
"terms_conds_bulletpoint_5_link_notify_bobo": "national and local byelaws (opens in new tab)",
|
|
815
|
+
"terms_conds_bulletpoint_6_notify_bobo": "only use their licence for the specified date and time, number of rods and species of fish",
|
|
816
|
+
"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 ",
|
|
817
|
+
"terms_conds_bulletpoint_7_link_notify_bobo": "submit a catch return (opens in new tab)",
|
|
816
818
|
"terms_conds_title_notify_bobo": "Does the licence holder agree to the licence conditions?",
|
|
817
819
|
"there_is_a_problem": "There is a problem",
|
|
818
820
|
"total": "Total",
|
|
@@ -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>
|