@defra-fish/gafl-webapp-service 1.25.0-rc.9 → 1.25.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.25.0-rc.9",
+  "version": "1.25.0",
   "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.25.0-rc.9",
-    "@defra-fish/connectors-lib": "1.25.0-rc.9",
+    "@defra-fish/business-rules-lib": "1.25.0",
+    "@defra-fish/connectors-lib": "1.25.0",
     "@defra/hapi-gapi": "^1.1.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -76,5 +76,5 @@
     "gulp-sourcemaps": "^3.0.0",
     "node-sass": "^6.0.1"
   },
-  "gitHead": "eb7494f1d8e330e6aa095bd224f363b2856894af"
+  "gitHead": "568226f08abee6272fe1d506f65c57615af50fd2"
 }

package/src/handlers/error-handler.js

@@ -21,11 +21,11 @@ export const errorHandler = async (request, h) => {
      */
     return h
       .view(CLIENT_ERROR.page, {
-        mssgs,
         altLang,
+        mssgs,
+        paymentInProgress,
         referer: request?.headers?.referer,
         clientError: request.response.output.payload,
-        paymentInProgress,
         path: request.path,
         uri: {
           new: NEW_TRANSACTION.uri,

package/src/locales/cy.json

@@ -164,7 +164,7 @@
   "cookies_security_table_row_3": "Defnyddir i ddiogelu’r gwasanaeth yn erbyn gweithgarwch maleisus",
   "cookies_security_table_row_4": "Nes eich bod yn cau eich porwr",
   "cookies_survey_body_1": "Rydym yn defnyddio ",
-  "cookies_survey_body_2": " er mwyn casglu ymatebion i’r arolwg. Os ydych yn cymryd rhan, bydd SmartSurvey yn cadw cwcis ychwanegol ar eich cyfrifiadur i olrhain eich cynnydd drwyddo..",
+  "cookies_survey_body_2": " er mwyn casglu ymatebion i’r arolwg. Os ydych yn cymryd rhan, bydd SmartSurvey yn cadw cwcis ychwanegol ar eich cyfrifiadur i olrhain eich cynnydd drwyddo.",
   "cookies_survey_body_3": "Gweler ",
   "cookies_survey_body_4": " a ",
   "cookies_survey_body_5": " am ragor o wybodaeth.",
@@ -270,9 +270,9 @@
   "important_info_contact_post": "Post",
   "important_info_contact_title_other": "Sut y dylem gysylltu â deiliad y drwydded ynghylch nodiadau atgoffa a newidiadau pwysig?",
   "important_info_contact_title_you": "Sut dylen ni gysylltu â chi am nodiadau atgoffa a newidiadau pwysig?",
-  "licence_confirm_method_error_choose": "Dewiswch sut dylen anfon y drwydded",
+  "licence_confirm_method_error_choose": "Dewiswch sut dylem anfon y drwydded",
   "licence_confirm_method_how_body_item": "Byddaf yn gwneud nodyn o rif y drwydded",
-  "licence_confirm_method_how_body_text": "Dyma lle y byddwn yn anfon cadarnhad o’ch trwydded bysgota",
+  "licence_confirm_method_how_body_text": "Dyma sut y byddwn yn anfon cadarnhad o’r drwydded bysgota",
   "licence_confirm_method_how_title_other": "Sut fydden nhw’n dymuno derbyn eu cadarnhad trwydded bysgota?",
   "licence_confirm_method_how_title_you": "Sut hoffech chi dderbyn cadarnhad o'ch trwydded bysgota?",
   "licence_confirm_method_where_body_hint_other": "Licence information will be sent by email or text message only. We will not send a licence card.",
@@ -433,10 +433,10 @@
   "ordnance_body_link": "OS (yn agor ar dudalen newydd)",
   "ordnance_subheading": "Ordnance Survey terms and conditions",
   "ordnance_title": "Ordnance Survey terms and conditions - GOV.UK",
-  "our_address_1": "Environment Agency",
+  "our_address_1": "Asiantaeth yr Amgylchedd",
   "our_address_2": "Horizon House",
   "our_address_3": "Deanery Road",
-  "our_address_4": "Bristol",
+  "our_address_4": "Bryste",
   "our_address_5": "BS1 5AH",
   "over_65": "Dros 65",
   "payment_cancelled_title": "Your payment has been cancelled",
@@ -450,59 +450,59 @@
   "phone_number": "rhif ffôn",
   "pound": "£",
   "pricing_summary_heading": "You can go fishing without a rod licence because you’re under 13. You’ll need to get a licence to fish as soon as you turn 13.",
-  "privacy_dp_officer_body_1": "Our Data Protection Officer (DPO) is responsible for independent advice and monitoring of the Environment Agency’s use of personal data. You can read our ",
-  "privacy_dp_officer_body_2": " which explains how we deal with personal data in general. If you have any concerns or queries about how we process personal data, or if you would like to make a complaint or request relating to data protection, please contact our DPO using the following details:",
-  "privacy_dp_officer_body_link": "personal information charter (opens in new tab)",
+  "privacy_dp_officer_body_1": "Mae ein Swyddog Diogelu Data yn gyfrifol am gyngor annibynnol a monitro defnydd Asiantaeth yr Amgylchedd o ddata personol. Gallwch ddarllen ein  ",
+  "privacy_dp_officer_body_2": ", sy'n esbonio sut rydym yn ymdrin â data personol yn gyffredinol. Os oes gennych unrhyw bryderon neu ymholiadau am sut rydym yn prosesu data personol, neu os hoffech wneud cwyn neu gais sy’n ymwneud â diogelu data, cysylltwch â’n Swyddog Diogelu Data gan ddefnyddio’r manylion canlynol:",
+  "privacy_dp_officer_body_link": "siarter gwybodaeth bersonol (yn agor mewn tab newydd)",
   "privacy_heading": "Get a fishing licence privacy policy",
-  "privacy_how_body_1": "We are the Environment Agency and we are the official authority for issuing fishing licences in England (except the River Tweed), Wales and the Border Esk region of Scotland. We are the controller for personal data collected and processed for our Get a fishing licence service. A data controller determines how and why personal data (personal information) is processed.",
-  "privacy_how_body_2": "Children under the age of 13 do not require a licence and you should not provide us with their personal data. If you are not the angler and you are providing us with someone else’s personal data to apply for a licence on their behalf, please make them aware of this privacy notice.",
-  "privacy_length_kept_body_1": "We will keep personal data for the duration of the licence and for 6 years after it expires in line with our standard information retention policy.",
-  "privacy_needed_body_1": "The personal data we need about the angler is:",
-  "privacy_needed_body_3": "We require this personal data because it is necessary to process the application for a licence. If you don’t provide this information then we can’t issue a licence.",
-  "privacy_needed_body_4": "The lawful basis we rely on to process your personal data is article 6(1)(e) of the UK GDPR, which allows us to process personal data when this is necessary to exercise our official authority set out in law (in this case the Salmon and Freshwater Fisheries Act 1975).",
-  "privacy_needed_body_5": "If you have a disability and would like to be issued with a disabled licence, you can voluntarily provide us with your:",
-  "privacy_needed_body_6": "If you would like to receive marketing emails from us you can sign up to receive our email newsletter.",
-  "privacy_needed_body_7": "The lawful basis we rely on for processing this special category personal data is your explicit consent under article 6(1)(a) and 9(2)(a) of the UK GDPR. We will only use this personal data to assess your eligibility for a disabled licence. Consent can be withdrawn at any time.",
-  "privacy_needed_body_bulleypoint_1": "name and address",
-  "privacy_needed_body_bulleypoint_2": "date of birth",
-  "privacy_needed_body_bulleypoint_3": "contact details including phone number, email address or both",
-  "privacy_needed_body_bulleypoint_4": "National Insurance number (if relevant)",
-  "privacy_needed_body_bulleypoint_5": "Blue Badge number (if relevant)",
-  "privacy_subheading_dp_officer": "Data Protection Officer",
-  "privacy_subheading_how": "How we use personal data",
-  "privacy_subheading_length_kept": "How long we keep personal data",
-  "privacy_subheading_needed": "The personal data we need",
-  "privacy_subheading_usage": "Service Usage",
-  "privacy_subheading_what_we_do": "What we do with personal data",
-  "privacy_subheading_where_stored": "Where personal data is processed and stored",
-  "privacy_title": "Get a fishing licence privacy policy - GOV.UK",
-  "privacy_usage_body_1": "We use Google Analytics to collect anonymised information about how the service is used. We use this data to improve the service.",
-  "privacy_usage_body_2": "We do not send any data to Google that could be used to personally identify you and we do not allow Google to use or share our analytics data.",
-  "privacy_what_we_do_body_1": "We use personal data to:",
-  "privacy_what_we_do_body_2": "We may use other organisations to do any of these activities on our behalf. These include:",
-  "privacy_what_we_do_body_3": "We do not use personal data to make an automated decision or for automated profiling.",
-  "privacy_what_we_do_bulletpoint_1": "process your transaction, including taking payment",
-  "privacy_what_we_do_bulletpoint_10": "SSCL - for Direct Debit payments",
-  "privacy_what_we_do_bulletpoint_11": "Post Office - to take payments and process applications",
-  "privacy_what_we_do_bulletpoint_12": "Paragon - for licence printing and mailing",
-  "privacy_what_we_do_bulletpoint_13": "SendInBlue - for marketing emails",
-  "privacy_what_we_do_bulletpoint_14": "SmartSurvey - to ask anglers to provide feedback on the service",
-  "privacy_what_we_do_bulletpoint_qa": "Substance and QA Research",
-  "privacy_what_we_do_bulletpoint_15": "GOV.Notify - to communicate information about licences",
-  "privacy_what_we_do_bulletpoint_hh": "HH Global - for catch return reminder letter printing and mailing",
-  "privacy_what_we_do_bulletpoint_2": "determine the type of licence (based on age and disability information if provided)",
-  "privacy_what_we_do_bulletpoint_3": "issue a licence and send this to the angler",
-  "privacy_what_we_do_bulletpoint_cr": "issue catch return forms and reminders to the angler",
-  "privacy_what_we_do_bulletpoint_4": "communicate information about licences",
-  "privacy_what_we_do_bulletpoint_5": "check licences",
-  "privacy_what_we_do_bulletpoint_6": "email newsletters to people who sign up",
-  "privacy_what_we_do_bulletpoint_7": "ask anglers to provide feedback on the service",
-  "privacy_what_we_do_bulletpoint_8": "provide updates to byelaws",
+  "privacy_how_body_1": "Ni yw Asiantaeth yr Amgylchedd a ni yw’r awdurdod swyddogol ar gyfer dyrannu trwyddedau pysgota yn Lloegr (ac eithrio afon Tuedd), Cymru ac afon Border Esk yr Alban. Ni hefyd sy’n rheoli data personol a gesglir ac a brosesir ar gyfer ein gwasanaeth Cais am Drwydded Bysgota. Mae rheolydd data'n penderfynu sut a pham mae data personol (gwybodaeth bersonol) yn cael ei brosesu.",
+  "privacy_how_body_2": "Nid oes angen trwydded ar blant dan 13 oed ac ni ddylech roi eu data personol i ni. Os nad chi yw’r genweiriwr ac rydych yn rhoi data personol rhywun arall i ni er mwyn cyflwyno cais am drwydded ar ei ran, sicrhewch ei fod yn ymwybodol o’r hysbysiad preifatrwydd hwn.",
+  "privacy_length_kept_body_1": "Byddwn yn cadw data personol am hyd y drwydded ac am chwe blynedd ar ôl iddi ddod i ben yn unol â'n polisi cadw gwybodaeth safonol.",
+  "privacy_needed_body_1": "Dyma’r data personol y mae ei angen arnom am y genweiriwr:",
+  "privacy_needed_body_3": "Rydym yn prosesu’r data personol hwn oherwydd ei fod yn angenrheidiol er mwyn prosesu’r cais am drwydded. Os nad ydych chi’n darparu’r wybodaeth hon, yna ni allwn ddyrannu trwydded.",
+  "privacy_needed_body_4": "Y sail gyfreithiol rydym yn dibynnu arni er mwyn prosesu eich data personol yw Erthygl 6(1)(e) GDPR y DU, sy’n ein caniatáu i brosesu data personol pan fydd hyn yn angenrheidiol i arfer ein hawdurdod swyddogol a nodir yn y gyfraith (yn yr achos hwn, Deddf Pysgodfeydd Eogiaid a Dŵr Croyw 1975).",
+  "privacy_needed_body_5": "Os oes gennych anabledd a hoffech dderbyn trwydded anabl, gallwch ddarparu’r canlynol inni o’ch gwirfodd:",
+  "privacy_needed_body_6": "Os hoffech dderbyn e-byst marchnata gennym ni, gallwch gofrestru i dderbyn ein cylchlythyr dros e-bost.",
+  "privacy_needed_body_7": "Y sail gyfreithiol rydym yn dibynnu arni ar gyfer prosesu’r data personol categori arbennig hwn yw eich cydsyniad penodol dan Erthygl 6(1)(a) a 9(2)(a) GDPR y DU. Byddwn yn defnyddio’r data personol hwn i asesu eich cymhwysedd ar gyfer trwydded anabl yn unig. Mae modd tynnu cydsyniad yn ôl ar unrhyw adeg.",
+  "privacy_needed_body_bulleypoint_1": "enw a chyfeiriad",
+  "privacy_needed_body_bulleypoint_2": "dyddiad geni",
+  "privacy_needed_body_bulleypoint_3": "manylion cyswllt, gan gynnwys rhif ffôn, cyfeiriad e-bost neu’r ddau",
+  "privacy_needed_body_bulleypoint_4": "Rhif Yswiriant Gwladol (os yw'n berthnasol)",
+  "privacy_needed_body_bulleypoint_5": "Rhif Bathodyn Glas (os yw'n berthnasol)",
+  "privacy_subheading_dp_officer": "Swyddog Diogelu Data",
+  "privacy_subheading_how": "Sut rydym yn defnyddio data personol",
+  "privacy_subheading_length_kept": "Pa mor hir y byddwn yn cadw data personol?",
+  "privacy_subheading_needed": "Y data personol y mae ei angen arnom",
+  "privacy_subheading_usage": "Defnydd o’r gwasanaeth",
+  "privacy_subheading_what_we_do": "Yr hyn yr ydym yn ei wneud gyda data personol",
+  "privacy_subheading_where_stored": "Lle caiff data personol ei brosesu a'i storio?",
+  "privacy_title": "Mynnu polisi preifatrwydd trwydded bysgota",
+  "privacy_usage_body_1": "Rydym yn defnyddio Google Analytics i gasglu gwybodaeth ddienw am sut y defnyddir y gwasanaeth. Rydym yn defnyddio’r data hwn i wella’r gwasanaeth.",
+  "privacy_usage_body_2": "Nid ydym yn anfon unrhyw ddata at Google a allai gael ei ddefnyddio i’ch adnabod yn bersonol ac nid ydym yn caniatáu i Google ddefnyddio neu rannu ein data dadansoddeg.",
+  "privacy_what_we_do_body_1": "Rydym yn defnyddio data personol i wneud y canlynol:",
+  "privacy_what_we_do_body_2": "Efallai y byddwn yn defnyddio sefydliadau eraill i ymgymryd â’r gweithgareddau hyn ar ein rhan. Mae’r rhain yn cynnwys y canlynol:",
+  "privacy_what_we_do_body_3": "Nid ydym yn defnyddio data personol i wneud penderfyniad awtomatig neu ar gyfer proffilio awtomatig.",
+  "privacy_what_we_do_bulletpoint_1": "prosesu eich trafodiad, gan gynnwys cymryd taliad",
+  "privacy_what_we_do_bulletpoint_10": "SSCL – ar gyfer taliadau debyd uniongyrchol",
+  "privacy_what_we_do_bulletpoint_11": "Swyddfa’r Post – i gymryd taliadau ac i brosesu ceisiadau",
+  "privacy_what_we_do_bulletpoint_12": "Paragon – ar gyfer argraffu a phostio trwyddedau",
+  "privacy_what_we_do_bulletpoint_13": "SendInBlue - ar gyfer negeseuon marchnata",
+  "privacy_what_we_do_bulletpoint_14": "SmartSurvey – er mwyn gofyn i genweirwyr ddarparu adborth ar y gwasanaeth",
+  "privacy_what_we_do_bulletpoint_qa": "Substance a QA research",
+  "privacy_what_we_do_bulletpoint_15": "GOV.Notify – er mwyn cyfleu gwybodaeth am drwyddedau",
+  "privacy_what_we_do_bulletpoint_hh": "HH Global -  i argraffu ac anfon llythyr atgoffa ar gyfer y ffurflen ddalfa",
+  "privacy_what_we_do_bulletpoint_2": "penderfynu ar y math o drwydded (yn seiliedig ar yr wybodaeth am oedran ac anabledd a ddarperir)",
+  "privacy_what_we_do_bulletpoint_3": "dyrannu trwydded ac anfon hon at y genweiriwr",
+  "privacy_what_we_do_bulletpoint_cr": "anfon ffurflenni dalfa a nodiadau atgoffa i’r genweiriwr",
+  "privacy_what_we_do_bulletpoint_4": "cyfleu gwybodaeth am drwyddedau",
+  "privacy_what_we_do_bulletpoint_5": "gwirio trwyddedau",
+  "privacy_what_we_do_bulletpoint_6": "e-bostio cylchlythyrau at bobl sy'n cofrestru amdanynt",
+  "privacy_what_we_do_bulletpoint_7": "gofyn i genweirwyr ddarparu adborth ar y gwasanaeth",
+  "privacy_what_we_do_bulletpoint_8": "darparu diweddariadau o ran is-ddeddfau",
   "privacy_what_we_do_bulletpoint_enforcement": "enforcement purposes",
-  "privacy_what_we_do_bulletpoint_9": "GOV.UK Pay and Worldpay - for card payments",
-  "privacy_where_stored_body_1": "We transfer personal data through Amazon Web Services (AWS) servers in the UK. We store the data on Microsoft Azure servers in Ireland.",
-  "privacy_where_stored_body_2": "The organisations we share personal data with process and store data in the UK. Our processor may also store this data outside the UK in Switzerland.",
-  "privacy_where_stored_body_3": "We do not store payment details.",
+  "privacy_what_we_do_bulletpoint_9": "GOV.UK Pay a Worldpay – ar gyfer taliadau cardiau",
+  "privacy_where_stored_body_1": "Rydym yn trosglwyddo data personol drwy weinyddwyr Amazon Web Services (AWS) yn y DU. Rydym yn storio’r data ar weinyddwyr Microsoft Azure yn Iwerddon.",
+  "privacy_where_stored_body_2": "Mae’r sefydliadau rydym yn rhannu data personol â hwy yn prosesu a storio data yn y DU. Gall ein prosesydd hefyd storio'r data hwn y tu allan i’r DU yn y Swistir.",
+  "privacy_where_stored_body_3": "Nid ydym yn storio manylion talu.",
   "purpose": "Diben",
   "refund_bulletpoint_1": "Gall Asiantaeth yr Amgylchedd ad-dalu cost trwydded i’r prynwr yn unig. Dylai’r holl geisiadau am ad-daliad gael eu cyfeirio i Asiantaeth yr Amgylchedd, ac eithrio mewn achosion lle mae’r drwydded wedi cael ei phrynu drwy drydydd parti (ac eithrio Swyddfa’r Post), pan ddylai ceisiadau am ad-daliadau gael eu cyfeirio iddyn nhw. Ffoniwch Asiantaeth yr Amgylchedd ar 03708 506506.",
   "refund_bulletpoint_2_1": "Ni fydd Asiantaeth yr Amgylchedd yn codi ffi pan fyddwch yn prynu trwydded drwy ein ",

package/src/locales/en.json

@@ -79,7 +79,7 @@
   "address_lookup_content_info": "This is where we will send the licence card. A bankside enforcement officer may ask for this information if the licence is checked.",
   "address_lookup_crown_copyright_new_tab": "OS (opens in a new tab)",
   "address_lookup_crown_copyright_ref": "100024198.",
-  "address_lookup_crown_copyright_terms_link": "terms and conditions (opens in a new tab)",
+  "address_lookup_crown_copyright_terms_link": "terms and conditions",
   "address_lookup_crown_copyright_terms": "Use of this addressing data is subject to the ",
   "address_lookup_crown_copyright": "© Crown copyright and database rights 2022 ",
   "address_lookup_error_empty_name_num": "Enter a building number or name",

package/src/pages/layout/layout.njk

@@ -101,7 +101,7 @@
     <div class="no-print">
         {% if (title === mssgs.address_lookup_title_you) or (title === mssgs.address_lookup_title_other) %}
             <p class="govuk-body-s">{{ mssgs.address_lookup_crown_copyright }}<a class="govuk-link" href="http://www.ordnancesurvey.co.uk" rel="noreferrer noopener" target="_blank">{{ mssgs.address_lookup_crown_copyright_new_tab }}</a> {{ mssgs.address_lookup_crown_copyright_ref }}
-            <br>{{ mssgs.address_lookup_crown_copyright_terms }} <a class="govuk-link" href="{{ data.uri.osTerms }}" rel="noreferrer noopener" target="_blank">{{ mssgs.address_lookup_crown_copyright_terms_link }}</a></p>
+            <br>{{ mssgs.address_lookup_crown_copyright_terms }} <a class="govuk-link" href="{{ data.uri.osTerms }}">{{ mssgs.address_lookup_crown_copyright_terms_link }}</a></p>
         {% endif %}
         <p class="govuk-!-margin-top-5 govuk-!-margin-bottom-0">{{ mssgs.footer_ea_helpline }} <a class="govuk-link" href="tel:+443448005386">0344 800 5386</a></p>
         <p class="govuk-!-margin-top-0">{{ mssgs.footer_ea_helpline_opening_hours }}</p>