@defra-fish/gafl-webapp-service 1.65.0-rc.1 → 1.65.0-rc.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.65.0-rc.1",
+  "version": "1.65.0-rc.11",
   "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.65.0-rc.1",
-    "@defra-fish/connectors-lib": "1.65.0-rc.1",
+    "@defra-fish/business-rules-lib": "1.65.0-rc.11",
+    "@defra-fish/connectors-lib": "1.65.0-rc.11",
     "@defra/hapi-gapi": "2.0.0",
     "@hapi/boom": "9.1.2",
     "@hapi/catbox-redis": "6.0.2",
@@ -79,5 +79,5 @@
       "./gafl-jest-matchers.js"
     ]
   },
-  "gitHead": "3e4014cd3d4fae6d6dc6b7f5b338821a572286fb"
+  "gitHead": "2510a8ab91d2e52d2440a776b2a435c8ab08d4e2"
 }

package/src/handlers/__tests__/cancel-recurring-payment-authentication-handler.spec.js

@@ -1,6 +1,11 @@
 import handler from '../cancel-recurring-payment-authentication-handler'
-import { CANCEL_RP_IDENTIFY, CANCEL_RP_DETAILS } from '../../uri.js'
-import { addLanguageCodeToUri } from '../../processors/uri-helper.js'
+import {
+  CANCEL_RP_IDENTIFY,
+  CANCEL_RP_DETAILS,
+  CANCEL_RP_AGREEMENT_NOT_FOUND,
+  CANCEL_RP_ALREADY_CANCELLED,
+  CANCEL_RP_LICENCE_NOT_FOUND
+} from '../../uri.js'
 import { salesApi } from '@defra-fish/connectors-lib'
 
 jest.mock('../../processors/uri-helper.js')
@@ -19,7 +24,10 @@ jest.mock('@defra-fish/business-rules-lib', () => ({
 }))
 jest.mock('../../uri.js', () => ({
   CANCEL_RP_IDENTIFY: { page: 'cancel-rp-identify page', uri: Symbol('cancel-rp-identify-uri') },
-  CANCEL_RP_DETAILS: { uri: Symbol('cancel-rp-details-uri') }
+  CANCEL_RP_DETAILS: { uri: Symbol('cancel-rp-details-uri') },
+  CANCEL_RP_AGREEMENT_NOT_FOUND: { uri: Symbol('cancel-rp-agreement-not-found-uri') },
+  CANCEL_RP_ALREADY_CANCELLED: { uri: Symbol('cancel-rp-already-cancelled-uri ') },
+  CANCEL_RP_LICENCE_NOT_FOUND: { uri: Symbol('cancel-rp-licence-not-found-uri') }
 }))
 jest.mock('../../processors/recurring-payments-write-cache.js')
 
@@ -52,22 +60,15 @@ const getSampleRequest = (payloadOverride = {}) => {
   }
 }
 
-const getSampleResponseTooklkit = () => ({
-  redirectWithLanguageCode: jest.fn().mockReturnValue('redirected')
+const getSampleResponseToolkit = () => ({
+  redirectWithLanguageCode: jest.fn(() => 'redirected')
 })
 
-const invokeHandlerWithMocks = async ({ salesApiResponse, decoratedIdentifyUri } = {}) => {
-  if (typeof salesApiResponse !== 'undefined') {
+const invokeHandlerWithMocks = async ({ h = getSampleResponseToolkit(), salesApiResponse } = {}) => {
+  if (salesApiResponse) {
     salesApi.authenticateRecurringPayment.mockResolvedValueOnce(salesApiResponse)
   }
-  if (decoratedIdentifyUri) {
-    addLanguageCodeToUri.mockReturnValueOnce(decoratedIdentifyUri)
-  }
   const request = getSampleRequest()
-  const h = getSampleResponseTooklkit()
-  if (decoratedIdentifyUri) {
-    h.redirect = jest.fn().mockReturnValue('redirect-response')
-  }
   const result = await handler(request, h)
   return { request, h, result }
 }
@@ -106,24 +107,35 @@ describe('Cancel RP Authentication Handler', () => {
   })
 
   describe('Unsuccessful authentication - no match', () => {
-    it('redirects to the decorated identify URI', async () => {
-      const { h } = await invokeHandlerWithMocks({ salesApiResponse: null, decoratedIdentifyUri: 'decorated-identify-uri' })
-      expect(h.redirect).toHaveBeenCalledWith('decorated-identify-uri')
+    it('redirects to the CANCEL_RP_LICENCE_NOT_FOUND.uri', async () => {
+      const { h } = await invokeHandlerWithMocks({ salesApiResponse: null })
+      expect(h.redirectWithLanguageCode).toHaveBeenCalledWith(CANCEL_RP_LICENCE_NOT_FOUND.uri)
+    })
+
+    it('returns value of redirect', async () => {
+      const h = getSampleResponseToolkit()
+      const redirectResult = Symbol('redirected')
+      h.redirectWithLanguageCode.mockReturnValueOnce(redirectResult)
+      const { result } = await invokeHandlerWithMocks({
+        h,
+        salesApiResponse: null
+      })
+      expect(result).toBe(redirectResult)
     })
 
     it('sets page cache error and preserves payload', async () => {
-      const { request } = await invokeHandlerWithMocks({ salesApiResponse: null, decoratedIdentifyUri: 'decorated-identify-uri' })
+      const { request } = await invokeHandlerWithMocks({ salesApiResponse: null })
       expect(request.cache().helpers.page.setCurrentPermission).toHaveBeenCalledWith(
         CANCEL_RP_IDENTIFY.page,
         expect.objectContaining({
           payload: expect.any(Object),
-          error: { referenceNumber: 'not-found' }
+          errorRedirect: true
         })
       )
     })
 
     it('marks status as unauthorised', async () => {
-      const { request } = await invokeHandlerWithMocks({ salesApiResponse: null, decoratedIdentifyUri: 'decorated-identify-uri' })
+      const { request } = await invokeHandlerWithMocks({ salesApiResponse: null })
       expect(request.cache().helpers.status.setCurrentPermission).toHaveBeenCalledWith(
         expect.objectContaining({ authentication: { authorised: false } })
       )
@@ -131,26 +143,23 @@ describe('Cancel RP Authentication Handler', () => {
   })
 
   describe('Unsuccessful authentication - no recurring payment agreement', () => {
-    it('redirects to the decorated identify URI', async () => {
+    it('redirects to the CANCEL_RP_AGREEMENT_NOT_FOUND.uri', async () => {
       const { h } = await invokeHandlerWithMocks({
         salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: null },
         decoratedIdentifyUri: 'decorated-identify-uri'
       })
-      expect(h.redirect).toHaveBeenCalledWith('decorated-identify-uri')
+      expect(h.redirectWithLanguageCode).toHaveBeenCalledWith(CANCEL_RP_AGREEMENT_NOT_FOUND.uri)
     })
 
-    it('sets page cache error for no RCP setup', async () => {
-      const { request } = await invokeHandlerWithMocks({
-        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: null },
-        decoratedIdentifyUri: 'decorated-identify-uri'
+    it('returns value of redirect', async () => {
+      const h = getSampleResponseToolkit()
+      const redirectResult = Symbol('redirected')
+      h.redirectWithLanguageCode.mockReturnValueOnce(redirectResult)
+      const { result } = await invokeHandlerWithMocks({
+        h,
+        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: null }
       })
-      expect(request.cache().helpers.page.setCurrentPermission).toHaveBeenCalledWith(
-        CANCEL_RP_IDENTIFY.page,
-        expect.objectContaining({
-          payload: expect.any(Object),
-          error: { recurringPayment: 'not-set-up' }
-        })
-      )
+      expect(result).toBe(redirectResult)
     })
 
     it('marks status as unauthorised', async () => {
@@ -164,33 +173,41 @@ describe('Cancel RP Authentication Handler', () => {
     })
   })
 
-  describe('Unsuccessful authentication - RCP cancelled', () => {
-    it('redirects to the decorated identify URI', async () => {
+  describe('Unsuccessful authentication - RCP already cancelled', () => {
+    it('redirects to the CANCEL_RP_ALREADY_CANCELLED.uri', async () => {
       const { h } = await invokeHandlerWithMocks({
-        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } },
-        decoratedIdentifyUri: 'decorated-identify-uri'
+        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } }
       })
-      expect(h.redirect).toHaveBeenCalledWith('decorated-identify-uri')
+      expect(h.redirectWithLanguageCode).toHaveBeenCalledWith(CANCEL_RP_ALREADY_CANCELLED.uri)
     })
 
-    it('sets page cache error for RCP cancelled', async () => {
+    it('returns value of redirect', async () => {
+      const h = getSampleResponseToolkit()
+      const redirectResult = Symbol('redirected')
+      h.redirectWithLanguageCode.mockReturnValueOnce(redirectResult)
+      const { result } = await invokeHandlerWithMocks({
+        h,
+        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } }
+      })
+      expect(result).toBe(redirectResult)
+    })
+
+    it('sets page cache for RCP already cancelled', async () => {
       const { request } = await invokeHandlerWithMocks({
-        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } },
-        decoratedIdentifyUri: 'decorated-identify-uri'
+        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } }
       })
       expect(request.cache().helpers.page.setCurrentPermission).toHaveBeenCalledWith(
         CANCEL_RP_IDENTIFY.page,
         expect.objectContaining({
           payload: expect.any(Object),
-          error: { recurringPayment: 'rcp-cancelled' }
+          errorRedirect: true
         })
       )
     })
 
     it('marks status as unauthorised', async () => {
       const { request } = await invokeHandlerWithMocks({
-        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } },
-        decoratedIdentifyUri: 'decorated-identify-uri'
+        salesApiResponse: { permission: { id: 'perm-id' }, recurringPayment: { id: 'rcp-id', status: 1, cancelledDate: '2024-01-01' } }
       })
       expect(request.cache().helpers.status.setCurrentPermission).toHaveBeenCalledWith(
         expect.objectContaining({ authentication: { authorised: false } })
@@ -207,7 +224,7 @@ describe('Cancel RP Authentication Handler', () => {
     request.cache().helpers.status.getCurrentPermission.mockReturnValueOnce({
       referenceNumber: 'A1B2C3'
     })
-    const h = getSampleResponseTooklkit()
+    const h = getSampleResponseToolkit()
     await handler(request, h)
     expect(salesApi.authenticateRecurringPayment).toHaveBeenCalledWith('A1B2C3', expect.anything(), expect.anything())
   })

package/src/handlers/cancel-recurring-payment-authentication-handler.js

@@ -1,26 +1,21 @@
-import { CANCEL_RP_IDENTIFY, CANCEL_RP_DETAILS } from '../../src/uri.js'
-import { addLanguageCodeToUri } from '../processors/uri-helper.js'
+import {
+  CANCEL_RP_IDENTIFY,
+  CANCEL_RP_DETAILS,
+  CANCEL_RP_AGREEMENT_NOT_FOUND,
+  CANCEL_RP_ALREADY_CANCELLED,
+  CANCEL_RP_LICENCE_NOT_FOUND
+} from '../../src/uri.js'
 import { salesApi } from '@defra-fish/connectors-lib'
 import { validation } from '@defra-fish/business-rules-lib'
 import { setupCancelRecurringPaymentCacheFromAuthResult } from '../processors/recurring-payments-write-cache.js'
+import { cacheDateFormat } from '../../src/processors/date-and-time-display.js'
+import moment from 'moment-timezone'
 import Joi from 'joi'
 
-const buildAuthFailure = (referenceNumber, payload, error) => ({
-  page: {
-    page: CANCEL_RP_IDENTIFY.page,
-    data: { payload, error }
-  },
-  status: {
-    referenceNumber,
-    authentication: { authorised: false }
-  },
-  redirectPath: CANCEL_RP_IDENTIFY.uri
-})
-
-const applyAuthFailure = async (request, h, failure) => {
-  await request.cache().helpers.page.setCurrentPermission(failure.page.page, failure.page.data)
-  await request.cache().helpers.status.setCurrentPermission(failure.status)
-  return h.redirect(addLanguageCodeToUri(request, failure.redirectPath))
+const applyAuthFailure = async (request, h, { pageData, redirectUri, statusData }) => {
+  await request.cache().helpers.page.setCurrentPermission(CANCEL_RP_IDENTIFY.page, pageData)
+  await request.cache().helpers.status.setCurrentPermission(statusData)
+  return h.redirectWithLanguageCode(redirectUri)
 }
 
 const cancelRecurringPaymentAuthenticationHandler = async (request, h) => {
@@ -36,16 +31,29 @@ const cancelRecurringPaymentAuthenticationHandler = async (request, h) => {
 
   const authenticationResult = await salesApi.authenticateRecurringPayment(referenceNumber, dateOfBirth, postcode)
 
-  const failures = error => applyAuthFailure(request, h, buildAuthFailure(referenceNumber, payload, error))
+  const context = {
+    pageData: { payload },
+    statusData: { referenceNumber, authentication: { authorised: false } },
+    redirectUri: CANCEL_RP_IDENTIFY.uri
+  }
 
   if (!authenticationResult) {
-    return failures({ referenceNumber: 'not-found' })
-  }
-  if (!authenticationResult.recurringPayment) {
-    return failures({ recurringPayment: 'not-set-up' })
+    context.pageData.errorRedirect = true
+    context.redirectUri = CANCEL_RP_LICENCE_NOT_FOUND.uri
+  } else if (!authenticationResult.recurringPayment) {
+    context.pageData.errorRedirect = true
+    context.redirectUri = CANCEL_RP_AGREEMENT_NOT_FOUND.uri
+  } else if (authenticationResult.recurringPayment.cancelledDate) {
+    context.pageData.errorRedirect = true
+    context.redirectUri = CANCEL_RP_ALREADY_CANCELLED.uri
+    context.pageData.payload = {
+      ...context.pageData.payload,
+      endDate: moment(authenticationResult.recurringPayment.endDate).format(cacheDateFormat)
+    }
   }
-  if (authenticationResult.recurringPayment.cancelledDate) {
-    return failures({ recurringPayment: 'rcp-cancelled' })
+
+  if (context.pageData.error || context.pageData.errorRedirect) {
+    return applyAuthFailure(request, h, context)
   }
 
   await setupCancelRecurringPaymentCacheFromAuthResult(request, authenticationResult)

package/src/handlers/result-functions.js

@@ -18,7 +18,8 @@ import {
   LICENCE_SUMMARY,
   NAME,
   TERMS_AND_CONDITIONS,
-  CHOOSE_PAYMENT
+  CHOOSE_PAYMENT,
+  JOURNEY_GOAL
 } from '../uri.js'
 
 import dateOfBirth from '../pages/concessions/date-of-birth/result-function.js'
@@ -38,6 +39,7 @@ import addressEntry from '../pages/contact/address/entry/result-function.js'
 import licenceSummary from '../pages/summary/licence-summary/result-function.js'
 import termsAndConditions from '../pages/terms-and-conditions/result-function.js'
 import choosePayment from '../pages/recurring-payments/choose-payment/result-function.js'
+import journeyGoal from '../pages/journey-goal/result-function.js'
 
 /**
  * The result function determines the navigation in the route definition
@@ -59,5 +61,6 @@ export default {
   [NAME.page]: name,
   [LICENCE_SUMMARY.page]: licenceSummary,
   [TERMS_AND_CONDITIONS.page]: termsAndConditions,
-  [CHOOSE_PAYMENT.page]: choosePayment
+  [CHOOSE_PAYMENT.page]: choosePayment,
+  [JOURNEY_GOAL.page]: journeyGoal
 }

package/src/locales/cy.json

@@ -440,6 +440,10 @@
   "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_not_found_rp_body_1": "If you keep seeing this page you can cancel your recurring card payment by:",
+  "licence_not_found_rp_bullet_point_1": "emailing ",
+  "licence_not_found_rp_bullet_point_1_2": " up to 15 days before your payment date",
+  "licence_not_found_rp_bullet_point_2": "calling 03708 506 506 (8am to 6pm, Monday to Friday, except public holidays) up to the day before your payment date.",
   "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",
@@ -605,14 +609,14 @@
   "order_complete_when_fishing_title": "Wrth bysgota",
   "order_complete_title_application": "Cais wedi’i gwblhau",
   "order_complete_title_payment": "Taliad wedi’i gwblhau: ",
-  "ordnance_body_1": "Addressing information and mapping data from Ordnance Survey is © Crown copyright and database rights 2016",
-  "ordnance_body_2": " 100024198. Use of this data is subject to the following conditions by way of exception to the standard Open Government Licence referred to at the foot of this page:",
-  "ordnance_body_bulletpoint_1": "You are granted a non-exclusive, royalty free revocable licence solely to view the licensed mapping and addressing data for non-commercial purposes for the period during which we make it available;",
-  "ordnance_body_bulletpoint_2": "You are not permitted to copy, sub-license, distribute, sell or otherwise make available such data to third parties in any form; and",
-  "ordnance_body_bulletpoint_3": "Third party rights to enforce the terms of this licence shall be reserved to OS.",
+  "ordnance_body_1": "Mae gwybodaeth cyfeiriadau a data mapio gan yr Arolwg Ordnans yn unol â hawlfraint y Goron a hawliau cronfeydd data 2022",
+  "ordnance_body_2": " 100024198. Rydych yn defnyddio’r data hwn yn unol â’r amodau canlynol fel eithriad i’r Drwydded Lywodraeth Agored safonol y cyfeirir ati ar waelod y dudalen hon:",
+  "ordnance_body_bulletpoint_1": "Rhoddir trwydded ddirymiadwy, anghyfyngedig a heb freindal i chi i weld y data mapio a chyfeiriadau trwyddedig at ddibenion anfasnachol am y cyfnod yr ydym yn ei darparu;",
+  "ordnance_body_bulletpoint_2": "Ni chewch gopïo, is-drwyddedu, dosbarthu na gwerthu unrhyw ran o’r data hwn i drydydd partïon mewn unrhyw ffurf; a",
+  "ordnance_body_bulletpoint_3": "Bydd yr Arolwg Ordnans yn cadw’r hawlio trydydd parti i orfodi amodau’r drwydded hon.",
   "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",
+  "ordnance_subheading": "Yr Arolwg Ordnans – telerau ac amodau",
+  "ordnance_title": "Yr Arolwg Ordnans – telerau ac amodau",
   "our_address_1": "Asiantaeth yr Amgylchedd",
   "our_address_2": "Horizon House",
   "our_address_3": "Deanery Road",
@@ -786,7 +790,29 @@
   "role_required_body_1": "You were successfully signed in but you do not have the correct role assigned to access the telesales application.",
   "role_required_body_2": "Please contact your Microsoft Dynamics administrator to request access.",
   "role_required_title": "Role required",
+  "rp_licence_already_cancelled_heading": "Your recurring card payment agreement is already cancelled",
+  "rp_licence_already_cancelled_body_1": "Licence ending ",
+  "rp_licence_already_cancelled_body_1_1": " expires on ",
+  "rp_licence_already_cancelled_body_1_2": " and will not renew automatically. To continue fishing after this date you need to ",
+  "rp_licence_already_cancelled_body_link": "get a new licence (opens in new tab)",
+  "rp_licence_already_cancelled_body_2_1": "If you need help email ",
+  "rp_licence_already_cancelled_body_2_2": " or call 03708 506 506 (8am to 6pm, Monday to Friday, except public holidays).",
+  "rp_licence_already_cancelled_body_3_1": "Go back",
+  "rp_licence_already_cancelled_body_3_2": " to cancel the recurring card payment for a different licence.",
+  "rp_licence_already_cancelled_body_ea_link": "enquiries@environment-agency.gov.uk",
+  "rp_cancel_already_cancelled_title": "Already cancelled - Cancel your recurring card payment ",
   "rp_cancel_complete_title": "Cancel your recurring card payment agreement - complete",
+  "rp_cancel_identify_title": "Cancel your recurring card payment agreement - identify",
+  "rp_cancel_no_agreement_found_title": "Agreement not found - Cancel your recurring card payment",
+  "rp_cancel_no_agreement_found_heading": "There is no recurring card payment linked to this licence",
+  "rp_cancel_no_agreement_found_licence_will_not_renew_1": "Licence ending ",
+  "rp_cancel_no_agreement_found_licence_will_not_renew_2": " will not renew automatically.",
+  "rp_cancel_no_agreement_found_go_back_link": "Go back",
+  "rp_cancel_no_agreement_found_go_back_instruction": " to cancel the recurring card payment for a different licence.",
+  "rp_cancel_no_agreement_found_need_help_1": "If you need help email ",
+  "rp_cancel_no_agreement_found_need_help_email": "enquiries@environment-agency.gov.uk",
+  "rp_cancel_no_agreement_found_need_help_2": " or call 03708 506 506 (8am to 6pm, Monday to Friday, except public holidays). ",
+  "rp_cancel_no_agreement_found_call_charges_link": "View call charges (opens in new tab).",
   "rp_cancel_confirm_accept": "Yes, cancel my recurring payment agreement",
   "rp_cancel_confirm_body": "Your current licence will reman valid until it expires on ",
   "rp_cancel_confirm_reject": "No, I've changed my mind",

package/src/locales/en.json

@@ -389,6 +389,18 @@
   "important_info_contact_post": "Post",
   "important_info_contact_title_other": "How should we contact the licence holder about updates affecting their licence?",
   "important_info_contact_title_you": "How should we contact you about updates affecting your licence?",
+  "journey_goal_title": "What do you wish to do?",
+  "journey_goal_heading": "What do you wish to do?",
+  "journey_goal_error": "Please select what you wish to do",
+  "journey_goal_get_new_licence": "Get a new licence",
+  "journey_goal_renew_existing_licence": "Renew a 12-month licence",
+  "journey_goal_renew_existing_licence_proviso": "For licences that expired in the last 30 days",
+  "journey_goal_you_will_need": "You will need",
+  "journey_goal_cancel_recurring_payment": "Cancel a recurring card payment",
+  "journey_goal_instructions_req_1": "the last 6 characters of your licence number",
+  "journey_goal_instructions_req_2": "your date of birth",
+  "journey_goal_instructions_req_3": "your postcode",
+  "journey_goal_": "",
   "licence_1_day": "1-day",
   "licence_8_day": "8-day",
   "licence_12_month": "12-month",
@@ -439,6 +451,10 @@
   "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_not_found_rp_body_1": "If you keep seeing this page you can cancel your recurring card payment by:",
+  "licence_not_found_rp_bullet_point_1": "emailing ",
+  "licence_not_found_rp_bullet_point_1_2": " up to 15 days before your payment date",
+  "licence_not_found_rp_bullet_point_2": "calling 03708 506 506 (8am to 6pm, Monday to Friday, except public holidays) up to the day before your payment date.",
   "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.",
@@ -786,7 +802,29 @@
   "role_required_body_1": "You were successfully signed in but you do not have the correct role assigned to access the telesales application.",
   "role_required_body_2": "Please contact your Microsoft Dynamics administrator to request access.",
   "role_required_title": "Role required",
+  "rp_licence_already_cancelled_heading": "Your recurring card payment agreement is already cancelled",
+  "rp_licence_already_cancelled_body_1": "Licence ending ",
+  "rp_licence_already_cancelled_body_1_1": " expires on ",
+  "rp_licence_already_cancelled_body_1_2": " and will not renew automatically. To continue fishing after this date you need to ",
+  "rp_licence_already_cancelled_body_link": "get a new licence (opens in new tab)",
+  "rp_licence_already_cancelled_body_2_1": "If you need help email ",
+  "rp_licence_already_cancelled_body_2_2": " or call 03708 506 506 (8am to 6pm, Monday to Friday, except public holidays).",
+  "rp_licence_already_cancelled_body_3_1": "Go back",
+  "rp_licence_already_cancelled_body_3_2": " to cancel the recurring card payment for a different licence.",
+  "rp_licence_already_cancelled_body_ea_link": "enquiries@environment-agency.gov.uk",
+  "rp_cancel_already_cancelled_title": "Already cancelled - Cancel your recurring card payment ",
   "rp_cancel_complete_title": "Cancel your recurring card payment agreement - complete",
+  "rp_cancel_identify_title": "Cancel your recurring card payment agreement - identify",
+  "rp_cancel_no_agreement_found_title": "Agreement not found - Cancel your recurring card payment",
+  "rp_cancel_no_agreement_found_heading": "There is no recurring card payment linked to this licence",
+  "rp_cancel_no_agreement_found_licence_will_not_renew_1": "Licence ending ",
+  "rp_cancel_no_agreement_found_licence_will_not_renew_2": " will not renew automatically.",
+  "rp_cancel_no_agreement_found_go_back_link": "Go back",
+  "rp_cancel_no_agreement_found_go_back_instruction": " to cancel the recurring card payment for a different licence.",
+  "rp_cancel_no_agreement_found_need_help_1": "If you need help email ",
+  "rp_cancel_no_agreement_found_need_help_email": "enquiries@environment-agency.gov.uk",
+  "rp_cancel_no_agreement_found_need_help_2": " or call 03708 506 506 (8am to 6pm, Monday to Friday, except public holidays). ",
+  "rp_cancel_no_agreement_found_call_charges_link": "View call charges (opens in new tab).",
   "rp_cancel_confirm_accept": "Yes, cancel my recurring payment agreement",
   "rp_cancel_confirm_body": "Your current licence will reman valid until it expires on ",
   "rp_cancel_confirm_reject": "No, I've changed my mind",

package/src/pages/journey-goal/__tests__/result-function.spec.js

@@ -0,0 +1,33 @@
+import resultFunction from '../result-function.js'
+
+describe('resultFunction', () => {
+  const getMockRequest = journeyGoal => ({
+    payload: {
+      'journey-goal': journeyGoal
+    }
+  })
+  it.each(['purchase-permission', 'renew-permission', 'cancel-recurring-payment'])(
+    'returns journey goal for recognised journey goal - %s',
+    async journeyGoal => {
+      const mockRequest = getMockRequest(journeyGoal)
+      const result = await resultFunction(mockRequest)
+      expect(result).toBe(journeyGoal)
+    }
+  )
+
+  describe.each(['invalid-goal', 'unknown-journey-goal'])('handles unrecognised journey goal - %s', journeyGoal => {
+    it('returns null for unrecognised journey goal', async () => {
+      const mockRequest = getMockRequest(journeyGoal)
+      const result = await resultFunction(mockRequest)
+      expect(result).toBeNull()
+    })
+
+    it('logs an error for unrecognised journey goal', async () => {
+      const consoleErrorSpy = jest.spyOn(console, 'error')
+      const mockRequest = getMockRequest(journeyGoal)
+      await resultFunction(mockRequest)
+      expect(consoleErrorSpy).toHaveBeenCalledWith('Unknown journey goal selected:', journeyGoal)
+      consoleErrorSpy.mockRestore()
+    })
+  })
+})

package/src/pages/journey-goal/__tests__/route.spec.js

@@ -0,0 +1,50 @@
+import pageRoute from '../../../routes/page-route.js'
+import { JOURNEY_GOAL } from '../../../uri.js'
+import { nextPage } from '../../../routes/next-page.js'
+import { journeyGoalResults } from '../result-function.js'
+import '../route.js'
+
+jest.mock('../../../routes/page-route.js')
+jest.mock('../../../uri.js', () => ({
+  ...jest.requireActual('../../../uri.js'),
+  JOURNEY_GOAL: { page: 'journey/goal/page', uri: Symbol('/journey/goal/page') }
+}))
+jest.mock('../../../routes/next-page.js')
+jest.mock('../result-function.js', () => ({
+  journeyGoalResults: {
+    PURCHASE_PERMISSION: Symbol('purchase-permission'),
+    RENEW_PERMISSION: Symbol('renew-permission'),
+    CANCEL_RECURRING_PAYMENT: Symbol('cancel-recurring-payment')
+  }
+}))
+
+const getData = pageRoute.mock.calls[0][4]
+
+describe('Journey Goal Page Route', () => {
+  it('passes JOURNEY_GOAL.page as view', () => {
+    expect(pageRoute).toHaveBeenCalledWith(JOURNEY_GOAL.page, expect.anything(), expect.anything(), expect.anything(), expect.anything())
+  })
+
+  it('passes JOURNEY_GOAL.uri as path', () => {
+    expect(pageRoute).toHaveBeenCalledWith(expect.anything(), JOURNEY_GOAL.uri, expect.anything(), expect.anything(), expect.anything())
+  })
+
+  it('passes function as validator', () => {
+    expect(pageRoute).toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.any(Function), expect.anything(), expect.anything())
+  })
+
+  it('passes nextPage function as completion function', () => {
+    expect(pageRoute).toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.anything(), nextPage, expect.anything())
+  })
+
+  it('passes function as getData parameter', () => {
+    expect(pageRoute).toHaveBeenCalledWith(expect.anything(), expect.anything(), expect.anything(), expect.anything(), expect.any(Function))
+  })
+
+  describe('getData', () => {
+    it('returns journey goal data', async () => {
+      const data = await getData()
+      expect(data).toEqual(expect.objectContaining({ journeyGoals: journeyGoalResults }))
+    })
+  })
+})

package/src/pages/journey-goal/journey-goal.njk

@@ -0,0 +1,52 @@
+{% extends "standard-form.njk" %}
+
+{% from "radios/macro.njk" import govukRadios %}
+
+{% set title = mssgs.journey_goal_title %}
+{% set errorMsg = mssgs.journey_goal_error %}
+
+{% set instructions %}
+  <p class="govuk-body-m">{{ mssgs.journey_goal_you_will_need }}</p>
+  <ul class="govuk-list govuk-list--bullet">
+    <li>{{ mssgs.journey_goal_instructions_req_1 }}</li>
+    <li>{{ mssgs.journey_goal_instructions_req_2 }}</li>
+    <li>{{ mssgs.journey_goal_instructions_req_3 }}</li>
+  </ul>
+{% endset %}
+
+{% block pageContent %}
+  {{ govukRadios({
+    idPrefix: 'journey-goal',
+    name: "journey-goal",
+    items: [
+      {
+        "id": "selector-buy-licence",
+        value: data.journeyGoals.PURCHASE_PERMISSION,
+        text: mssgs.journey_goal_get_new_licence,
+        checked: payload['journey-goal'] === data.journeyGoals.PURCHASE_PERMISSION
+      },
+      {
+        "id": "selector-renew-licence",
+        value: data.journeyGoals.RENEW_PERMISSION,
+        text: mssgs.journey_goal_renew_existing_licence,
+        checked: payload['journey-goal'] === data.journeyGoals.RENEW_PERMISSION,
+        hint: {
+          text: mssgs.journey_goal_renew_existing_licence_proviso
+        },
+        conditional: {
+          html: instructions
+        }
+      },
+      {
+        "id": "selector-cancel-recurring-payment",
+        value: data.journeyGoals.CANCEL_RECURRING_PAYMENT,
+        text: mssgs.journey_goal_cancel_recurring_payment,
+        checked: payload['journey-goal'] === data.journeyGoals.CANCEL_RECURRING_PAYMENT,
+        conditional: {
+          html: instructions
+        }
+      }
+    ],
+    errorMessage: { text: errorMsg } if error['journey-goal']
+  }) }}
+{% endblock %}

package/src/pages/journey-goal/result-function.js

@@ -0,0 +1,21 @@
+export const journeyGoalResults = Object.freeze({
+  PURCHASE_PERMISSION: 'purchase-permission',
+  RENEW_PERMISSION: 'renew-permission',
+  CANCEL_RECURRING_PAYMENT: 'cancel-recurring-payment'
+})
+
+const journeyGoalResult = async request => {
+  switch (request.payload['journey-goal']) {
+    case 'purchase-permission':
+      return journeyGoalResults.PURCHASE_PERMISSION
+    case 'renew-permission':
+      return journeyGoalResults.RENEW_PERMISSION
+    case 'cancel-recurring-payment':
+      return journeyGoalResults.CANCEL_RECURRING_PAYMENT
+    default:
+      console.error('Unknown journey goal selected:', request.payload['journey-goal'])
+      return null
+  }
+}
+
+export default journeyGoalResult

package/src/pages/journey-goal/route.js

@@ -0,0 +1,10 @@
+import pageRoute from '../../routes/page-route.js'
+import { JOURNEY_GOAL } from '../../uri.js'
+import { nextPage } from '../../routes/next-page.js'
+import { journeyGoalResults } from './result-function.js'
+
+const getData = async () => ({
+  journeyGoals: journeyGoalResults
+})
+
+export default pageRoute(JOURNEY_GOAL.page, JOURNEY_GOAL.uri, () => {}, nextPage, getData)