@defra-fish/gafl-webapp-service 1.61.0-rc.9 → 1.62.0-rc.0

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.61.0-rc.9",
+  "version": "1.62.0-rc.0",
   "description": "The websales frontend for the GAFL service",
   "type": "module",
   "engines": {
-    "node": ">=18.17"
+    "node": ">=20"
   },
   "keywords": [
     "rod",
@@ -36,8 +36,8 @@
     "prepare": "gulp --gulpfile build/gulpfile.cjs"
   },
   "dependencies": {
-    "@defra-fish/business-rules-lib": "1.61.0-rc.9",
-    "@defra-fish/connectors-lib": "1.61.0-rc.9",
+    "@defra-fish/business-rules-lib": "1.62.0-rc.0",
+    "@defra-fish/connectors-lib": "1.62.0-rc.0",
     "@defra/hapi-gapi": "^2.0.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -52,12 +52,12 @@
     "debug": "^4.3.3",
     "disinfect": "^1.1.0",
     "find": "^0.3.0",
-    "govuk-frontend": "^5.2.0",
+    "govuk-frontend": "^5.10.2",
     "hapi-i18n": "^3.0.1",
     "joi": "^17.6.0",
     "moment": "^2.29.1",
     "moment-timezone": "^0.5.34",
-    "node-fetch": "^2.6.7",
+    "node-fetch": "^2.7.0",
     "nunjucks": "^3.2.3",
     "openid-client": "^4.9.1",
     "semver": "^7.3.5",
@@ -79,5 +79,5 @@
       "./gafl-jest-matchers.js"
     ]
   },
-  "gitHead": "b9c65c7827bb974c94056bf5e387d80564d3ddc6"
+  "gitHead": "d56e1a0d0f4b22f1dded800c0ed511b737cb91a7"
 }

package/src/handlers/__tests__/authentication-handler.redirect.spec.js

@@ -1,13 +1,15 @@
 import handler from '../authentication-handler.js'
-import { IDENTIFY, CONTROLLER, RENEWAL_INACTIVE } from '../../uri.js'
+import { LICENCE_NOT_FOUND, CONTROLLER, RENEWAL_INACTIVE } from '../../uri.js'
 import { salesApi } from '@defra-fish/connectors-lib'
 
 jest.mock('../../processors/uri-helper.js')
 jest.mock('../page-handler.js', () => ({ errorShimm: () => {} }))
 jest.mock('../../uri.js', () => ({
   IDENTIFY: {
-    page: 'identify page',
-    uri: Symbol('identify uri')
+    page: 'identify page'
+  },
+  LICENCE_NOT_FOUND: {
+    uri: Symbol('licence not found uri')
   },
   CONTROLLER: {
     uri: Symbol('controller uri')
@@ -40,7 +42,7 @@ const getSampleAuthResult = (description = 'M', durationMagnitude = 12) => ({
 })
 
 describe.each([
-  [false, 'identify', IDENTIFY.uri, 1],
+  [false, 'licence not found', LICENCE_NOT_FOUND.uri, 1],
   [getSampleAuthResult(), 'controller', CONTROLLER.uri, -1],
   [getSampleAuthResult(), 'renewal inactive', RENEWAL_INACTIVE.uri, 61],
   [getSampleAuthResult(), 'renewal inactive', RENEWAL_INACTIVE.uri, -61],

package/src/handlers/authentication-handler.js

@@ -1,5 +1,5 @@
 import { setUpCacheFromAuthenticationResult, setUpPayloads } from '../processors/renewals-write-cache.js'
-import { IDENTIFY, CONTROLLER, RENEWAL_INACTIVE } from '../uri.js'
+import { IDENTIFY, RENEWAL_INACTIVE, LICENCE_NOT_FOUND, CONTROLLER } from '../uri.js'
 import { RENEWAL_ERROR_REASON } from '../constants.js'
 import { validation, RENEW_BEFORE_DAYS, RENEW_AFTER_DAYS, SERVICE_LOCAL_TIME } from '@defra-fish/business-rules-lib'
 import Joi from 'joi'
@@ -8,7 +8,7 @@ import moment from 'moment-timezone'
 
 /**
  * Handler to authenticate the user on the easy renewals journey. It will
- * (1) Redirect back to the identification page where there is an authentication failure
+ * (1) Redirect to an error page where there is an authentication failure
  * (2) Redirect to an error page where the renewal has expired
  * (3) Redirect back to an error page where a licence is already issued
  * (4) Establish the session cache and redirect into the controller where the user is authenticated
@@ -43,9 +43,9 @@ export default async (request, h) => {
 
   if (!authenticationResult) {
     payload.referenceNumber = referenceNumber
-    await request.cache().helpers.page.setCurrentPermission(IDENTIFY.page, { payload, error: { referenceNumber: 'string.invalid' } })
+    await request.cache().helpers.page.setCurrentPermission(IDENTIFY.page, { payload })
     await request.cache().helpers.status.setCurrentPermission({ referenceNumber, authentication: { authorized: false } })
-    return h.redirectWithLanguageCode(IDENTIFY.uri)
+    return h.redirectWithLanguageCode(LICENCE_NOT_FOUND.uri)
   } else {
     // Test for 12 month licence
     const daysDiff = moment(authenticationResult.permission.endDate).diff(moment().tz(SERVICE_LOCAL_TIME).startOf('day'), 'days')

package/src/locales/cy.json

@@ -254,7 +254,8 @@
   "cookies_survey_subheading": "Arolwg o’n perfformiad",
   "cookies_title": "Cwcis",
   "cost": "Cost",
-  "disability_concession_12_month": "Gall deiliaid trwydded 12 mis fod yn gymwys i gael consesiynau anabledd",
+  "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 ",
+  "disability_concession_12_month_link": "Bathodyn Glas (yn agor mewn tab newydd)",
   "disability_concession_badge_error_msg": "Nodwch rif Bathodyn Glas deiliad y drwydded",
   "disability_concession_error_choose_option": "Dewiswch un o’r opsiynau.",
   "disability_concession_error_ni_empty": "Nodwch Rif Yswiriant Gwladol deiliad y drwydded",
@@ -264,12 +265,15 @@
   "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'",
   "disability_concession_ni_label_jr": "Rhif Yswiriant Gwladol neu Gyfeirnod Plant",
   "disability_concession_ni_label": "Rhif Yswiriant Gwladol",
-  "disability_concession_radio_badge": "Bathodyn Glas",
-  "disability_concession_radio_dla": "neu Lwfans Byw i’r Anabl",
-  "disability_concession_radio_no": "Nac ydw",
-  "disability_concession_radio_pip": "Taliad Annibyniaeth Personol (PIP)",
-  "disability_concession_title_other": "A ydyw’n derbyn unrhyw un o’r canlynol?",
-  "disability_concession_title_you": "Ydych chi’n derbyn unrhyw un o’r canlynol?",
+  "disability_concession_radio_badge_self": "Ydw, yn meddu ar Fathodyn Glas neu wedi bodloni’r meini prawf",
+  "disability_concession_radio_badge_bobo": "Ydyn, yn meddu ar Fathodyn Glas neu wedi bodloni’r meini prawf",
+  "disability_concession_radio_dla": "neu’r Lwfans Byw i’r Anabl (DLA)",
+  "disability_concession_radio_no_self": "Nac ydw",
+  "disability_concession_radio_no_bobo": "Nac ydyn",
+  "disability_concession_radio_pip_self": "Ydw, Taliad Anibyniaeth Personol (PIP)",
+  "disability_concession_radio_pip_bobo": "Ydyn, Taliad Anibyniaeth Personol (PIP)",
+  "disability_concession_title_bobo": "Ydyn nhw’n gymwys ar gyfer consesiwn?",
+  "disability_concession_title_self": "Ydych chi’n gymwys ar gyfer consesiwn?",
   "date_day": "Diwrnod",
   "dob_entry_hint": "Er enghraifft, 23 11 1979",
   "dob_error_date_real": "Mae’n rhaid i’r dyddiad geni fod yn ddyddiad dilys",
@@ -328,8 +332,6 @@
   "identify_error_date_real": "Mae’n rhaid i’r dyddiad geni fod yn ddyddiad dilys",
   "identify_error_empty_postcode": "Nid ydych wedi nodi cod post",
   "identify_error_empty": "Rhowch chwe nodyn olaf eich trwydded",
-  "identify_error_invalid_1": "Nid oes gennym gofnod o rif trwydded sy'n gorffen gyda ",
-  "identify_error_invalid_2": " sy’n cyd-fynd â'r manylion hyn.",
   "identify_error_missing_day": "Mae’n rhaid i’r dyddiad geni gynnwys diwrnod",
   "identify_error_missing_month": "Mae’n rhaid i’r dyddiad geni gynnwys mis",
   "identify_error_missing_year": "Mae’n rhaid i’r dyddiad geni gynnwys blwyddyn",
@@ -416,6 +418,13 @@
   "licence_length_title_other": "Am ba hyd y maent am gael y drwydded?",
   "licence_length_title_you": "Am ba hyd yr hoffech chi gael y drwydded?",
   "licence_num": "Rhif trwydded",
+  "licence_not_found_title": "Ni allwn ddod o hyd i drwydded sy’n cyfateb â'r manylion a roddwyd",
+  "licence_not_found_body_1": "Gwiriwch eich bod wedi mewnbynnu’r manylion yn gywir - ",
+  "licence_not_found_body_previous_page": "ewch yn ôl i’r dudalen flaenorol",
+  "licence_not_found_body_2": "Os byddwch yn parhau i weld y dudalen hon gallwch ofyn am gymorth drwy e-bostio ",
+  "licence_not_found_body_ea_link": "enquiries@environment-agency.gov.uk",
+  "licence_not_found_body_3": " neu ffonio 03708 506 506 (8am - 6pm o ddydd Llun i ddydd Gwener, ac eithrio gwyliau cyhoeddus). ",
+  "licence_not_found_body_call_charges_link": "Gallwch weld costau’r galwadau yma (yn agor mewn tab newydd)",
   "licence_start_days": " diwrnod nesaf",
   "licence_start_enter_todays_date": "Rhowch ddyddiad heddiw os ydych chi am i’r drwydded 1 diwrnod neu 8 diwrnod ddechrau yn hwyrach heddiw.",
   "licence_start_error_date_real": "Mae’n rhaid i ddyddiad dechrau’r drwydded fod yn ddyddiad dilys",
@@ -462,7 +471,8 @@
   "licence_start_title_other": "Dyddiad dechrau’r drwydded?",
   "licence_start_title_you": "Pryd yr hoffech i'ch trwydded ddechrau?",
   "licence_start_today_or_within": "Gall y drwydded ddechrau heddiw neu unrhyw ddiwrnod o fewn y ",
-  "licence_summary_blue_badge_num": "Rhif Bathodyn Glas",
+  "licence_summary_blue_badge": "Bathodyn Glas",
+  "licence_summary_blue_badge_eligible": "Cymwys",
   "licence_summary_change": "Newid",
   "licence_summary_disability_concession": "Consesiwn anabledd",
   "licence_summary_dob": "Dyddiad geni",

package/src/locales/en.json

@@ -254,7 +254,8 @@
   "cookies_survey_subheading": "Our performance survey",
   "cookies_title": "Cookies",
   "cost": "Cost",
-  "disability_concession_12_month": "12 month licence holders may be eligible for disability concessions",
+  "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 ",
+  "disability_concession_12_month_link": "Blue Badge (opens in new tab)",
   "disability_concession_badge_error_msg": "Enter the licence holder’s Blue Badge number",
   "disability_concession_error_choose_option": "Choose one of the options.",
   "disability_concession_error_ni_empty": "Enter the licence holder’s National Insurance number",
@@ -264,12 +265,15 @@
   "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'",
   "disability_concession_ni_label_jr": "National Insurance or Child Reference number",
   "disability_concession_ni_label": "National Insurance number",
-  "disability_concession_radio_badge": "Blue Badge",
-  "disability_concession_radio_dla": "or Disability Living Allowance (DLA)",
-  "disability_concession_radio_no": "No",
-  "disability_concession_radio_pip": "Personal Independence Payment (PIP)",
-  "disability_concession_title_other": "Do they receive any of the following?",
-  "disability_concession_title_you": "Do you receive any of the following?",
+  "disability_concession_radio_badge_self": "Yes, have or meet the eligibility criteria for Blue Badge",
+  "disability_concession_radio_badge_bobo": "Yes, have or meet the eligibility criteria for Blue Badge",
+  "disability_concession_radio_dla": "Or Disability Living Allowance (DLA)",
+  "disability_concession_radio_no_self": "No",
+  "disability_concession_radio_no_bobo": "No",
+  "disability_concession_radio_pip_self": "Yes, Personal Independence Payment (PIP)",
+  "disability_concession_radio_pip_bobo": "Yes, Personal Independence Payment (PIP)",
+  "disability_concession_title_bobo": "Are they eligible for a concession?",
+  "disability_concession_title_self": "Are you eligible for a concession?",
   "date_day": "Day",
   "dob_entry_hint": "For example, 23 11 1979",
   "dob_error_date_real": "Date of birth must be a real date",
@@ -328,8 +332,6 @@
   "identify_error_date_real": "Date of birth must be a real date",
   "identify_error_empty_postcode": "You did not enter a postcode",
   "identify_error_empty": "Enter the last six characters of your licence number",
-  "identify_error_invalid_1": "We do not have any record of a licence number ending ",
-  "identify_error_invalid_2": " matching these details.",
   "identify_error_missing_day": "Date of birth must include a day",
   "identify_error_missing_month": "Date of birth must include a month",
   "identify_error_missing_year": "Date of birth must include a year",
@@ -415,6 +417,13 @@
   "licence_length_one_day": "1 day licences are valid for 24 hours from the start time that you select.",
   "licence_length_title_other": "How long do they want the licence for?",
   "licence_length_title_you": "How long do you want your licence for?",
+  "licence_not_found_title": "We cannot find a licence matching the details you provided",
+  "licence_not_found_body_1": "Check you have entered your details correctly - ",
+  "licence_not_found_body_previous_page": "go back to the previous page",
+  "licence_not_found_body_2": "If you keep seeing this page you can get help by emailing ",
+  "licence_not_found_body_ea_link": "enquiries@environment-agency.gov.uk",
+  "licence_not_found_body_3": " or calling 03708 506 506 (8am to 6pm, Monday to Friday, except public holidays). ",
+  "licence_not_found_body_call_charges_link": "View call charges (opens in new tab)",
   "licence_num": "Licence number",
   "licence_start_days": " days",
   "licence_start_enter_todays_date": "Enter today’s date if you want the 1-day or 8-day licence to start later today.",
@@ -462,7 +471,8 @@
   "licence_start_title_other": "When should the licence start?",
   "licence_start_title_you": "When would you like your licence to start?",
   "licence_start_today_or_within": "The licence can start today or any day within the next ",
-  "licence_summary_blue_badge_num": "Blue Badge number",
+  "licence_summary_blue_badge": "Blue Badge",
+  "licence_summary_blue_badge_eligible": "Eligible",
   "licence_summary_change": "Change",
   "licence_summary_disability_concession": "Disability concession",
   "licence_summary_dob": "Date of birth",

package/src/pages/concessions/disability/__tests__/disability-concession.spec.js

@@ -31,15 +31,6 @@ describe('The disability concession page', () => {
     expect(response.headers.location).toHaveValidPathFor(DISABILITY_CONCESSION.uri)
   })
 
-  it('redirects back to itself on posting blue badge with an empty blue number', async () => {
-    const response = await injectWithCookies('POST', DISABILITY_CONCESSION.uri, {
-      'disability-concession': disabilityConcessionTypes.blueBadge,
-      'blue-badge-number': ''
-    })
-    expect(response.statusCode).toBe(302)
-    expect(response.headers.location).toHaveValidPathFor(DISABILITY_CONCESSION.uri)
-  })
-
   it('on setting a correct ni number it redirects to the licence-to-start page', async () => {
     const response = await injectWithCookies('POST', DISABILITY_CONCESSION.uri, {
       'disability-concession': disabilityConcessionTypes.pipDla,
@@ -62,32 +53,28 @@ describe('The disability concession page', () => {
     })
   })
 
-  it('on setting a correct blue badge number redirects to the licence-to-start page', async () => {
+  it('on selecting blue badge or meets criteria of bb, it causes a redirect to the licence-to-start page', async () => {
     const response = await injectWithCookies('POST', DISABILITY_CONCESSION.uri, {
-      'disability-concession': disabilityConcessionTypes.blueBadge,
-      'blue-badge-number': '1234'
+      'disability-concession': disabilityConcessionTypes.blueBadge
     })
     expect(response.statusCode).toBe(302)
     expect(response.headers.location).toHaveValidPathFor(LICENCE_TO_START.uri)
   })
 
-  it('on setting a correct blue badge number adds a disabled concession to the cache', async () => {
+  it('on selecting blue badge or meets criteria of bb, it adds a disabled concession to the cache', async () => {
     await injectWithCookies('POST', DISABILITY_CONCESSION.uri, {
-      'disability-concession': disabilityConcessionTypes.blueBadge,
-      'blue-badge-number': '1234'
+      'disability-concession': disabilityConcessionTypes.blueBadge
     })
     const { payload } = await injectWithCookies('GET', TEST_TRANSACTION.uri)
     expect(concessionHelper.hasDisabled(JSON.parse(payload).permissions[0])).toBeTruthy()
     expect(JSON.parse(payload).permissions[0].concessions[0].proof).toEqual({
-      type: CONCESSION_PROOF.blueBadge,
-      referenceNumber: '1234'
+      type: CONCESSION_PROOF.blueBadge
     })
   })
 
   it('on setting a disability concession and changing to a 8 day licence and back, the concession is restored', async () => {
     await injectWithCookies('POST', DISABILITY_CONCESSION.uri, {
-      'disability-concession': disabilityConcessionTypes.blueBadge,
-      'blue-badge-number': '1234'
+      'disability-concession': disabilityConcessionTypes.blueBadge
     })
     await injectWithCookies('POST', LICENCE_LENGTH.uri, { 'licence-length': '8D' })
     const { payload } = await injectWithCookies('GET', TEST_TRANSACTION.uri)
@@ -96,8 +83,7 @@ describe('The disability concession page', () => {
     const { payload: payload2 } = await injectWithCookies('GET', TEST_TRANSACTION.uri)
     expect(concessionHelper.hasDisabled(JSON.parse(payload2).permissions[0])).toBeTruthy()
     expect(JSON.parse(payload2).permissions[0].concessions[0].proof).toEqual({
-      type: CONCESSION_PROOF.blueBadge,
-      referenceNumber: '1234'
+      type: CONCESSION_PROOF.blueBadge
     })
   })
 

package/src/pages/concessions/disability/disability-concession.njk

@@ -2,8 +2,9 @@
 {% from "radios/macro.njk" import govukRadios %}
 {% from "input/macro.njk" import govukInput %}
 
-{% set title = mssgs.disability_concession_title_you if data.isLicenceForYou else mssgs.disability_concession_title_other %}
+{% set title = mssgs.disability_concession_title_self if data.isLicenceForYou else mssgs.disability_concession_title_bobo %}
 {% set describedByTag = "ni-number-hint" %}
+{% set suffix = 'self' if data.isLicenceForYou else 'bobo' %}
 
 {%
     set errorMap = {
@@ -13,10 +14,6 @@
         'ni-number': {
             'string.empty': { ref: '#ni-number', text: mssgs.disability_concession_error_ni_empty },
             'string.pattern.base': { ref: '#ni-number', text: mssgs.disability_concession_error_ni_pattern }
-        },
-        'blue-badge-number': {
-            'string.empty': { ref: '#blue-badge-number', text: mssgs.disability_concession_badge_error_msg },
-            'string.max': { ref: '#blue-badge-number', text: mssgs.disability_concession_badge_error_msg }
         }
     }
 %}
@@ -38,23 +35,9 @@
     }) }}
 {% endset -%}
 
-{% set blueBadge %}
-    {{ govukInput({
-      label: {
-        html: mssgs.disability_concession_badge_error_msg
-      },
-      id: "blue-badge-number",
-      name: "blue-badge-number",
-      value: payload['blue-badge-number'],
-      classes: "govuk-input--width-20",
-      attributes: { maxlength: 25 },
-      errorMessage: { text: mssgs.disability_concession_badge_error_msg } if error['blue-badge-number']
-    }) }}
-{% endset -%}
-
 {% block pageContent %}
     {% if not data.hasJunior and not data.hasSenior %}
-        <p class="govuk-body-m">{{ mssgs.disability_concession_12_month }}</p>
+        <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>
     {% endif %}
 
     {{ govukRadios({
@@ -62,21 +45,20 @@
            name: "disability-concession",
            items: [
                {
-                   html: mssgs.disability_concession_radio_pip + '</br> ' + mssgs.disability_concession_radio_dla,
-                   value: data.pipDla,
-                   checked: payload['disability-concession'] === data.pipDla,
-                   conditional: { html: pipDla }
+                  html: mssgs['disability_concession_radio_pip_' ~ suffix] ~ '<br>' ~ mssgs.disability_concession_radio_dla,
+                  value: data.pipDla,
+                  checked: payload['disability-concession'] === data.pipDla,
+                  conditional: { html: pipDla }
                },
                {
-                  text: mssgs.disability_concession_radio_badge,
+                  text: mssgs['disability_concession_radio_badge_' ~ suffix],
                   value: data.blueBadge,
-                  checked: payload['disability-concession'] === data.blueBadge,
-                  conditional: { html: blueBadge }
+                  checked: payload['disability-concession'] === data.blueBadge
                },
                {
-                   text: mssgs.disability_concession_radio_no,
-                   value: data.no,
-                   checked: payload['disability-concession'] === data.no
+                  text: mssgs['disability_concession_radio_no_' ~ suffix],
+                  value: data.no,
+                  checked: payload['disability-concession'] === data.no
                }
            ],
            errorMessage: { text: mssgs.disability_concession_error_choose_option } if error['disability-concession']

package/src/pages/concessions/disability/route.js

@@ -14,11 +14,6 @@ const validator = Joi.object({
     is: disabilityConcessionTypes.pipDla,
     then: validation.contact.createNationalInsuranceNumberValidator(Joi).required(),
     otherwise: Joi.string().empty('')
-  }),
-  'blue-badge-number': Joi.alternatives().conditional('disability-concession', {
-    is: disabilityConcessionTypes.blueBadge,
-    then: Joi.string().max(25).required(),
-    otherwise: Joi.string().empty('')
   })
 }).options({ abortEarly: false, allowUnknown: true })
 

package/src/pages/concessions/disability/update-transaction.js

@@ -19,7 +19,7 @@ export default async request => {
     concessionHelper.addDisabled(permission, CONCESSION_PROOF.NI, payload['ni-number'])
     Object.assign(permission, { licenceLength: '12M', licenceStartTime: '0' })
   } else if (payload['disability-concession'] === disabilityConcessionTypes.blueBadge) {
-    concessionHelper.addDisabled(permission, CONCESSION_PROOF.blueBadge, payload['blue-badge-number'])
+    concessionHelper.addDisabled(permission, CONCESSION_PROOF.blueBadge)
     Object.assign(permission, { licenceLength: '12M', licenceStartTime: '0' })
   } else {
     concessionHelper.removeDisabled(permission)

package/src/pages/layout/layout.njk

@@ -5,6 +5,7 @@
     <meta name="robots" content="noindex">
 {% endif %}
 
+{% from "cookie-banner/macro.njk" import govukCookieBanner %}
 {% from "header/macro.njk" import govukHeader %}
 {% from "button/macro.njk" import govukButton %}
 {% from "back-link/macro.njk" import govukBackLink %}
@@ -13,115 +14,112 @@
     {% set htmlLang = "cy" %}
 {% endif %}
 
+{% set govukRebrand = true %}
+
 {% macro csrf() %}
     <div><input type="hidden" name="{{CSRF_TOKEN_NAME}}" value="{{CSRF_TOKEN_VALUE}}"></div>
 {% endmacro %}
 
+{% set cbHtml %}
+  <p class="govuk-body">{{ mssgs.analytics_banner_preamble_1 }}</p>
+  <p class="govuk-body">{{ mssgs.analytics_banner_preamble_2 }}</p>
+{% endset %}
+
 {% block head %}
-<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
-<link href="/public/stylesheets/main.css" rel="stylesheet" type="text/css" />
-<meta http-equiv="Cache-Control" content="no-store" />
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="Expires" content="-1">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
+    <link href="/public/stylesheets/main.css" rel="stylesheet" type="text/css" />
+    <meta http-equiv="Cache-Control" content="no-store" />
+    <meta http-equiv="Pragma" content="no-cache">
+    <meta http-equiv="Expires" content="-1">
 {% endblock %}
 
 {% block header %}
-    {% if displayAnalytics %}
-        {% if not analyticsMessageDisplayed %}
-            <form method="POST" novalidate action='{{ uri.analyticsFormAction }}'>
-                {% if not analyticsSelected %}
-                    <div id="cookie-banner" class="cookie-banner no-print" role="region" aria-label="cookie banner">
-                        <div id="cookie-message" class="cookie-message no-print" role="region" aria-label="cookie message">
-                            <div class="govuk-width-container">
-                                <h2 class="govuk-cookie-banner__heading govuk-heading-m">
-                                    {{ mssgs.analytics_banner_title }}
-                                </h2>
-                                <div class="govuk-cookie-banner__content">
-                                    <p class="govuk-body">
-                                    {{ mssgs.analytics_banner_preamble_1 }}
-                                    </p>
-                                    <p class="govuk-body">
-                                    {{ mssgs.analytics_banner_preamble_2 }}
-                                    </p>
-                                </div>
-                                <div class="govuk-button-group">
-                                    {{ govukButton({
-                                        attributes: { id: 'accept' },
-                                        preventDoubleClick: true,
-                                        name: "analyticsResponse",
-                                        text: mssgs.analytics_banner_accept,
-                                        value: 'accept'
-                                    }) }}
-                                    {{ govukButton({
-                                        attributes: { id: 'reject' },
-                                        preventDoubleClick: true,
-                                        name: "analyticsResponse",
-                                        text: mssgs.analytics_banner_reject,
-                                        value: 'reject'
-                                    }) }}
-                                    <a class="govuk-link" href="{{ _uri.cookies }}">{{ mssgs.analytics_banner_view_cookies_link }}</a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                {% endif %}
-                {% if analyticsSelected %}
-                    {% if acceptedTracking %}
-                        <div id="cookie-accept" class="cookie-message" role="region" aria-label="cookie accept">
-                            <div class="govuk-width-container">
-                                <div class="govuk-cookie-banner__content">
-                                    <p class="govuk-body" id="cookie-acceptance">
-                                        {{ mssgs.analytics_banner_acceptance_1 }} <a class="govuk-link" href="{{ _uri.cookies }}">{{ mssgs.analytics_banner_cookies_link }}</a> {{ mssgs.analytics_banner_acceptance_2 }}
-                                    </p>
-                                </div>
-                                <div class="govuk-button-group">
-                                    {{ govukButton({
-                                        attributes: { id: 'hide' },
-                                        preventDoubleClick: true,
-                                        name: "hide",
-                                        text: mssgs.analytics_banner_hide,
-                                        value: true
-                                    }) }}
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    {% else %}
-                        <div id="cookie-reject" class="cookie-banner no-print" role="region">
-                            <div class="govuk-width-container">
-                                <div class="govuk-cookie-banner__content">
-                                    <p class="govuk-body">
-                                        {{ mssgs.analytics_banner_rejection_1 }} <a class="govuk-link" href="{{ _uri.cookies }}">{{ mssgs.analytics_banner_cookies_link }}</a> {{ mssgs.analytics_banner_rejection_2 }}
-                                    </p>
-                                </div>
-                                <div class="govuk-button-group">
-                                    {{ govukButton({
-                                        attributes: { id: 'hide' },
-                                        preventDoubleClick: true,
-                                        name: "hideMessage",
-                                        text: mssgs.analytics_banner_hide,
-                                        value: true
-                                    }) }}
-                                </div>
-                            </div>
-                        </div>
-                    {% endif %}
-                {% endif %}
+  <form action="{{ uri.analyticsFormAction }}" method="POST">
+    {{ csrf() }}
 
-            {{ csrf() }}
-            </form>
+    {% if displayAnalytics and not analyticsMessageDisplayed %}
+      {% if not analyticsSelected %}
+        {{ govukCookieBanner({
+          rebrand: true,
+          ariaLabel: mssgs.analytics_banner_title,
+          messages: [
+            {
+              headingText: mssgs.analytics_banner_title,
+              html: cbHtml,
+              actions: [
+                {
+                  text: mssgs.analytics_banner_accept,
+                  type: "submit",
+                  name: "analyticsResponse",
+                  id: "analytics-accept",
+                  value: "accept"
+                },
+                {
+                  text: mssgs.analytics_banner_reject,
+                  type: "submit",
+                  name: "analyticsResponse",
+                  id: "analytics-reject",
+                  value: "reject"
+                },
+                {
+                  text: mssgs.analytics_banner_view_cookies_link,
+                  href: _uri.cookies,
+                  id: "analytics-view"
+                }
+              ]
+            }
+          ]
+        }) }}
+      {% else %}
+        {% if acceptedTracking %}
+          {% set messageHtml %}
+            <p class="govuk-body">
+              {{ mssgs.analytics_banner_acceptance_1 }}
+              <a class="govuk-link" href="{{ _uri.cookies }}">{{ mssgs.analytics_banner_cookies_link }}</a>
+              {{ mssgs.analytics_banner_acceptance_2 }}
+            </p>
+          {% endset %}
+        {% else %}
+          {% set messageHtml %}
+            <p class="govuk-body">
+              {{ mssgs.analytics_banner_rejection_1 }}
+              <a class="govuk-link" href="{{ _uri.cookies }}">{{ mssgs.analytics_banner_cookies_link }}</a>
+              {{ mssgs.analytics_banner_rejection_2 }}
+            </p>
+          {% endset %}
         {% endif %}
+
+        {{ govukCookieBanner({
+          rebrand: true,
+          ariaLabel: mssgs.analytics_banner_title,
+          messages: [
+            {
+              html: messageHtml,
+              actions: [
+                {
+                  text: mssgs.analytics_banner_hide,
+                  type: 'submit',
+                  name: 'hideMessage',
+                  id: 'hide-message',
+                  value: "true"
+                }
+              ]
+            }
+          ]
+        }) }}
+      {% endif %}
     {% endif %}
 
     {{ govukHeader({
-        assetsPath: assetPath + '/images',
-        homepageUrl: "https://www.gov.uk/",
-        serviceUrl: "/",
-        classes: "no-print",
-        containerClasses: "govuk-width-container",
-        serviceName: mssgs.header_service_name if not TELESALES else "Get a rod fishing licence (TELESALES)",
-        useTudorCrown: true
+      rebrand: true,
+      assetsPath: assetPath + '/images',
+      homepageUrl: "https://www.gov.uk/",
+      serviceUrl: "/",
+      classes: "no-print",
+      containerClasses: "govuk-width-container",
+      serviceName: mssgs.header_service_name if not TELESALES else "Get a rod fishing licence (TELESALES)"
     }) }}
+  </form>
 {% endblock %}
 
 {% block beforeContent %}
@@ -245,6 +243,7 @@
     </div>
     </footer>
 {% endblock %}
+
 {% block bodyEnd %}
     <script type="module" src="/public/javascript/govuk-frontend-min.js"></script>
     <script nonce="{{nonce}}" type="module">

package/src/pages/renewals/identify/__tests__/{identity.spec.js → identify.spec.js}

@@ -9,7 +9,8 @@ import {
   RENEWAL_INACTIVE,
   LICENCE_LENGTH,
   CONTACT_SUMMARY,
-  NEW_TRANSACTION
+  NEW_TRANSACTION,
+  LICENCE_NOT_FOUND
 } from '../../../../uri.js'
 import { start, stop, initialize, injectWithCookies, mockSalesApi } from '../../../../__mocks__/test-utils-system.js'
 
@@ -52,15 +53,12 @@ mockSalesApi()
 salesApi.countries.getAll = jest.fn(() => Promise.resolve(mockDefraCountries))
 
 describe('The easy renewal identification page', () => {
-  it('redirects to identify page when called with an invalid permission reference', async () => {
+  it('redirects from identify to licence not found page when called with an invalid permission reference', async () => {
     const data = await injectWithCookies('GET', RENEWAL_PUBLIC.uri.replace('{referenceNumber}', 'not-a-valid-reference-number'))
     expect(data.statusCode).toBe(302)
     expect(data.headers.location).toHaveValidPathFor(IDENTIFY.uri)
-    const data2 = await injectWithCookies('GET', IDENTIFY.uri)
-    expect(data2.statusCode).toBe(302)
-    expect(data2.headers.location).toHaveValidPathFor(IDENTIFY.uri)
-    const data3 = await injectWithCookies('GET', IDENTIFY.uri)
-    expect(data3.statusCode).toBe(200)
+    const data2 = await injectWithCookies('GET', LICENCE_NOT_FOUND.uri)
+    expect(data2.statusCode).toBe(200)
   })
 
   it('returns successfully when called with a valid reference ', async () => {
@@ -87,7 +85,7 @@ describe('The easy renewal identification page', () => {
     expect(data.headers.location).toHaveValidPathFor(IDENTIFY.uri)
   })
 
-  it('redirects back to itself on posting an valid but not authenticated details', async () => {
+  it('redirects to licence not found on posting valid but not authenticated details', async () => {
     salesApi.authenticate.mockImplementation(jest.fn(async () => new Promise(resolve => resolve(null))))
     await injectWithCookies('GET', VALID_RENEWAL_PUBLIC_URI)
     await injectWithCookies('GET', IDENTIFY.uri)
@@ -100,8 +98,8 @@ describe('The easy renewal identification page', () => {
     expect(data.headers.location).toHaveValidPathFor(AUTHENTICATE.uri)
     const data2 = await injectWithCookies('GET', AUTHENTICATE.uri)
     expect(data2.statusCode).toBe(302)
-    expect(data2.headers.location).toHaveValidPathFor(IDENTIFY.uri)
-    const data3 = await injectWithCookies('GET', IDENTIFY.uri)
+    expect(data2.headers.location).toHaveValidPathFor(LICENCE_NOT_FOUND.uri)
+    const data3 = await injectWithCookies('GET', LICENCE_NOT_FOUND.uri)
     expect(data3.statusCode).toBe(200)
   })
 

package/src/pages/renewals/identify/identify.njk

@@ -15,11 +15,7 @@
     set errorMap = {
         'referenceNumber' : {
             'string.empty': { text: mssgs.identify_error_empty, ref: '#ref' },
-            'string.pattern.base': { text: mssgs.identify_error_pattern, ref: '#ref' },
-            'string.invalid': {
-                text: mssgs.identify_error_invalid_1 + payload.referenceNumber + mssgs.identify_error_invalid_2,
-                ref: "#ref"
-            }
+            'string.pattern.base': { text: mssgs.identify_error_pattern, ref: '#ref' }
         },
         'postcode': {
             'string.empty': { ref: '#postcode', text: mssgs.identify_error_empty_postcode },

package/src/pages/renewals/identify/route.js

@@ -1,4 +1,4 @@
-import { IDENTIFY, AUTHENTICATE, NEW_TRANSACTION } from '../../../uri.js'
+import { IDENTIFY, NEW_TRANSACTION, AUTHENTICATE } from '../../../uri.js'
 import pageRoute from '../../../routes/page-route.js'
 import Joi from 'joi'
 import { validation } from '@defra-fish/business-rules-lib'

package/src/pages/renewals/licence-not-found/__tests__/route.spec.js

@@ -0,0 +1,22 @@
+import pageRoute from '../../../../routes/page-route.js'
+import { LICENCE_NOT_FOUND } from '../../../../uri.js'
+import '../route.js'
+
+jest.mock('../../../../routes/page-route.js', () => jest.fn())
+jest.mock('../../../../uri.js', () => ({
+  RENEWAL_PUBLIC: { uri: Symbol('renewal public uri') },
+  LICENCE_NOT_FOUND: {
+    page: Symbol('licence-not-found page'),
+    uri: Symbol('licence-not-found uri')
+  }
+}))
+
+describe('LICENCE_NOT_FOUND route', () => {
+  it('passes LICENCE_NOT_FOUND.page as the first argument to pageRoute', () => {
+    expect(pageRoute.mock.calls[0][0]).toBe(LICENCE_NOT_FOUND.page)
+  })
+
+  it('passes LICENCE_NOT_FOUND.uri as the second argument to pageRoute', () => {
+    expect(pageRoute.mock.calls[0][1]).toBe(LICENCE_NOT_FOUND.uri)
+  })
+})

package/src/pages/renewals/licence-not-found/licence-not-found.njk

@@ -0,0 +1,23 @@
+{% extends "layout.njk" %}
+{% extends "standard-form.njk" %}
+
+{% set title = mssgs.licence_not_found_title %}
+
+{% block content %}
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <h1 class="govuk-heading-l">{{ mssgs.licence_not_found_title }}</h1>
+    <p class="govuk-body">
+      {{ mssgs.licence_not_found_body_1 }}
+      <a class="govuk-link" href="/buy/renew/identify">{{ mssgs.licence_not_found_body_previous_page }}</a>{{ mssgs.full_stop }}
+    </p>
+    <p class="govuk-body">
+      {{ mssgs.licence_not_found_body_2 }}
+      <a href="mailto:enquiries@environment-agency.gov.uk">{{ mssgs.licence_not_found_body_ea_link }}</a>
+      {{ mssgs.licence_not_found_body_3 }}
+      <a href="https://www.gov.uk/call-charges" target="_blank" rel="noopener">
+        {{ mssgs.licence_not_found_body_call_charges_link }}</a>{{ mssgs.full_stop }}
+    </p>
+  </div>
+</div>
+{% endblock %}

package/src/pages/renewals/licence-not-found/route.js

@@ -0,0 +1,4 @@
+import { LICENCE_NOT_FOUND } from '../../../uri.js'
+import pageRoute from '../../../routes/page-route.js'
+
+export default pageRoute(LICENCE_NOT_FOUND.page, LICENCE_NOT_FOUND.uri, null)

package/src/pages/summary/licence-summary/__tests__/__snapshots__/route.spec.js.snap

@@ -599,7 +599,7 @@ Array [
       "text": "licence_summary_disability_concession",
     },
     "value": Object {
-      "html": "<span>licence_summary_none</span>",
+      "html": "licence_summary_none",
     },
   },
   Object {
@@ -930,15 +930,15 @@ Array [
           },
           "href": "/buy/disability-concession",
           "text": "contact_summary_change",
-          "visuallyHiddenText": "licence_summary_blue_badge_num",
+          "visuallyHiddenText": "licence_summary_blue_badge",
         },
       ],
     },
     "key": Object {
-      "text": "licence_summary_blue_badge_num",
+      "text": "licence_summary_blue_badge",
     },
     "value": Object {
-      "html": "AB1 CDE 0 1234F5678",
+      "html": "licence_summary_blue_badge_eligible",
     },
   },
   Object {
@@ -1172,7 +1172,7 @@ Array [
       "text": "licence_summary_disability_concession",
     },
     "value": Object {
-      "html": "<span>licence_summary_none</span>",
+      "html": "licence_summary_none",
     },
   },
   Object {

package/src/pages/summary/licence-summary/__tests__/route.spec.js

@@ -84,7 +84,8 @@ const getMockRequest = ({
       licence_type_12m: 'licence_type_12m',
       licence_type_8d: 'licence_type_8d',
       licence_type_1d: 'licence_type_1d',
-      licence_summary_blue_badge_num: 'licence_summary_blue_badge_num',
+      licence_summary_blue_badge: 'licence_summary_blue_badge',
+      licence_summary_blue_badge_eligible: 'licence_summary_blue_badge_eligible',
       licence_summary_ni_num: 'licence_summary_ni_num',
       licence_summary_disability_concession: 'licence_summary_disability_concession',
       free: 'gratis',
@@ -163,8 +164,7 @@ const getMockBlueBadgePermission = () => ({
     {
       type: mappingConstants.CONCESSION.DISABLED,
       proof: {
-        type: mappingConstants.CONCESSION_PROOF.blueBadge,
-        referenceNumber: 'AB1 CDE 0 1234F5678'
+        type: mappingConstants.CONCESSION_PROOF.blueBadge
       }
     }
   ]

package/src/pages/summary/licence-summary/route.js

@@ -70,7 +70,7 @@ class RowGenerator {
 
   _getConcessionText () {
     if (this.disabled?.proof?.type === CONCESSION_PROOF.blueBadge) {
-      return this.labels.licence_summary_blue_badge_num
+      return this.labels.licence_summary_blue_badge
     } else if (this.disabled?.proof?.type === CONCESSION_PROOF.NI) {
       return this.labels.licence_summary_ni_num
     }
@@ -93,7 +93,16 @@ class RowGenerator {
   }
 
   generateConcessionRow () {
-    const label = this.disabled ? this.disabled.proof.referenceNumber : `<span>${this.labels.licence_summary_none}</span>`
+    const label = (() => {
+      if (this.disabled?.proof?.type === CONCESSION_PROOF.blueBadge) {
+        return this.labels.licence_summary_blue_badge_eligible
+      }
+      if (this.disabled?.proof?.type === CONCESSION_PROOF.NI) {
+        return this.disabled.proof.referenceNumber
+      }
+      return this.labels.licence_summary_none
+    })()
+
     const concessionText = this._getConcessionText()
     return this._generateRow(concessionText, label, DISABILITY_CONCESSION.uri, concessionText, 'change-benefit-check')
   }

package/src/routes/journey-definition.js

@@ -28,7 +28,8 @@ import {
   RENEWAL_INACTIVE,
   RENEWAL_START_DATE,
   CHOOSE_PAYMENT,
-  SET_UP_PAYMENT
+  SET_UP_PAYMENT,
+  LICENCE_NOT_FOUND
 } from '../uri.js'
 
 import { CommonResults, CONTACT_SUMMARY_SEEN, ShowDigitalLicencePages } from '../constants.js'
@@ -416,6 +417,11 @@ export default [
     }
   },
 
+  {
+    current: LICENCE_NOT_FOUND,
+    backLink: IDENTIFY.uri
+  },
+
   // The change start time is handled directly - not via the controller, as it has dynamic validation
   {
     current: RENEWAL_START_DATE,

package/src/routes/routes.js

@@ -30,6 +30,7 @@ import paymentFailed from '../pages/payment/failed/route.js'
 import identify from '../pages/renewals/identify/route.js'
 import invalidLink from '../pages/renewals/renewal-inactive/route.js'
 import renewalStartDate from '../pages/renewals/renewal-start-date/route.js'
+import licenceNotFound from '../pages/renewals/licence-not-found/route.js'
 
 import staticAssets from './static-routes.js'
 import miscRoutes from './misc-routes.js'
@@ -71,7 +72,8 @@ const routes = [
   ...invalidLink,
   ...renewalStartDate,
   ...choosePayment,
-  ...setUpRecurring
+  ...setUpRecurring,
+  ...licenceNotFound
 ]
 
 if (process.env.CHANNEL === 'telesales') {

package/src/services/address-lookup/address-lookup-service.js

@@ -1,8 +1,8 @@
 import fetch from 'node-fetch'
-
 import { ADDRESS_LOOKUP_SERVICE, ADDRESS_LOOKUP_TIMEOUT_MS_DEFAULT } from '../../constants.js'
 import db from 'debug'
 const debug = db('webapp:address-lookup-service')
+
 export default async (premises, postcode) => {
   const url = new URL(process.env.ADDRESS_LOOKUP_URL)
 

package/src/uri.js

@@ -48,6 +48,7 @@ export const IDENTIFY = { uri: '/buy/renew/identify', page: 'identify' }
 export const RENEWAL_INACTIVE = { uri: '/buy/renew/inactive', page: 'renewal-inactive' }
 export const AUTHENTICATE = { uri: '/buy/renew/authenticate' }
 export const RENEWAL_START_DATE = { uri: '/buy/renew/renewal-start-date', page: 'renewal-start-date' }
+export const LICENCE_NOT_FOUND = { uri: '/buy/renew/licence-not-found', page: 'licence-not-found' }
 
 export const CONTROLLER = { uri: '/buy' }
 export const NEW_TRANSACTION = { uri: '/buy/new' }