@defra-fish/gafl-webapp-service 1.23.0 → 1.24.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.23.0",
+  "version": "1.24.0-rc.2",
   "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.23.0",
-    "@defra-fish/connectors-lib": "1.23.0",
+    "@defra-fish/business-rules-lib": "1.24.0-rc.2",
+    "@defra-fish/connectors-lib": "1.24.0-rc.2",
     "@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": "17bfa0e0f8071495932dd25f05f70f936f42d676"
+  "gitHead": "e5369641c3f61b5bfcd5b378695122d6d90a1b38"
 }

package/src/locales/cy.json

@@ -302,7 +302,7 @@
   "licence_length_eight_day": "Mae trwyddedau wyth niwrnod yn ddilys am wyth niwrnod yn olynol o’r amser cychwyn a ddewiswch",
   "licence_length_error_choose": "Dewiswch hyd y drwydded",
   "licence_length_one_day": "Mae trwyddedau un diwrnod yn ddilys am 24 awr o’r amser cychwyn a ddewiswch",
-  "licence_length_title_other": "How long do they want the licence for?",
+  "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": "Licence number",
   "licence_start_days": " diwrnod nesaf",
@@ -358,7 +358,7 @@
   "licence_summary_type": "Type",
   "licence_type_12m": "12 mis",
   "licence_type_1d": "1 diwrnod",
-  "licence_type_8d": "8 diwrnod",
+  "licence_type_8d": "8 niwrnod",
   "licence_type_attended_rods_note": "Mae’r gwialenni i’w defnyddio gan ddeiliad y drwydded yn unig ac mae’n rhaid eu goruchwylio ar bob adeg.",
   "licence_type_byelaws": "is-ddeddfau pysgota lleol (yn agor mewn tab newydd)",
   "licence_type_error_choose": "Dewiswch un o’r mathau o drwyddedau pysgota",
@@ -430,7 +430,7 @@
   "our_address_3": "Deanery Road",
   "our_address_4": "Bristol",
   "our_address_5": "BS1 5AH",
-  "over_65": "Dros 65, ",
+  "over_65": "Dros 65",
   "payment_cancelled_title": "Your payment has been cancelled",
   "payment_failed_expired": "The payment was not completed within 90 minutes of being created",
   "payment_failed_not_taken": "No money has been taken from your account.",

package/src/locales/en.json

@@ -430,7 +430,7 @@
   "our_address_3": "Deanery Road",
   "our_address_4": "Bristol",
   "our_address_5": "BS1 5AH",
-  "over_65": "Over 65, ",
+  "over_65": "Over 65",
   "payment_cancelled_title": "Your payment has been cancelled",
   "payment_failed_expired": "The payment was not completed within 90 minutes of being created",
   "payment_failed_not_taken": "No money has been taken from your account.",

package/src/pages/contact/digital-licence/check-confirmation-contact/__tests__/__snapshots__/check-confirmation-contact.spec.js.snap

@@ -8,8 +8,8 @@ Object {
     "preferredMethodOfConfirmation": "email",
   },
   "uri": Object {
-    "contact": "/buy/contact",
-    "licenceConfirmationMethod": "/buy/confirmation-method",
+    "change": "licence-confirmation-method.url?change=mobile",
+    "contact": "contact.url",
   },
 }
 `;

package/src/pages/contact/digital-licence/check-confirmation-contact/__tests__/check-confirmation-contact.spec.js

@@ -1,7 +1,22 @@
-import { CONTACT } from '../../../../../uri.js'
+import { CONTACT, LICENCE_CONFIRMATION_METHOD } from '../../../../../uri.js'
 import { HOW_CONTACTED } from '../../../../../processors/mapping-constants.js'
 import { getData } from '../route.js'
 import GetDataRedirect from '../../../../../handlers/get-data-redirect.js'
+import { addLanguageCodeToUri } from '../../../../../processors/uri-helper.js'
+
+jest.mock('../../../../../processors/uri-helper.js')
+jest.mock('../../../../../processors/mapping-constants.js', () => ({
+  HOW_CONTACTED: {
+    none: 'nada',
+    email: 'e-mail',
+    text: 'mobile-phone'
+  }
+}))
+jest.mock('../../../../../uri.js', () => ({
+  ...jest.requireActual('../../../../../uri.js'),
+  CONTACT: { uri: 'contact.url' },
+  LICENCE_CONFIRMATION_METHOD: { uri: 'licence-confirmation-method.url' }
+}))
 
 describe('.getData', () => {
   const createRequestMock = (options = {}) => ({
@@ -20,13 +35,42 @@ describe('.getData', () => {
     }))
   })
 
+  beforeEach(jest.resetAllMocks)
+
   it('if preferred method of confirmation is none, redirects to contact page', async () => {
     const getDataRedirectError = new GetDataRedirect(CONTACT.uri)
     const func = async () => await getData(createRequestMock({ preferredMethodOfConfirmation: HOW_CONTACTED.none }))
     await expect(func).rejects.toThrow(getDataRedirectError)
   })
 
+  describe.each([
+    { urlName: 'change', url: `${LICENCE_CONFIRMATION_METHOD.uri}?change=email`, preferredMethodOfConfirmation: HOW_CONTACTED.email },
+    { urlName: 'change', url: `${LICENCE_CONFIRMATION_METHOD.uri}?change=mobile`, preferredMethodOfConfirmation: HOW_CONTACTED.text },
+    { urlName: 'contact', url: CONTACT.uri, preferredMethodOfConfirmation: HOW_CONTACTED.email }
+  ])('$urlName $confirmation is decorated by addLanguageCodeToUri', ({ urlName, url, preferredMethodOfConfirmation }) => {
+    it(`passes request and ${urlName} url to addLanguageCodeToUri`, async () => {
+      const request = createRequestMock({ preferredMethodOfConfirmation })
+      await getData(request)
+      expect(addLanguageCodeToUri).toHaveBeenCalledWith(request, url)
+    })
+
+    it(`returns decorated value for ${urlName} from addLanguageCodeToUri`, async () => {
+      const expectedUrl = Symbol(urlName)
+      addLanguageCodeToUri.mockReturnValue(expectedUrl)
+      const request = createRequestMock()
+      const data = await getData(request)
+      expect(data).toEqual(
+        expect.objectContaining({
+          uri: expect.objectContaining({
+            [urlName]: expectedUrl
+          })
+        })
+      )
+    })
+  })
+
   it('returns the expected data', async () => {
+    addLanguageCodeToUri.mockImplementation((_request, uri) => uri)
     expect(await getData(createRequestMock())).toMatchSnapshot()
   })
 })

package/src/pages/contact/digital-licence/check-confirmation-contact/check-confirmation-contact.njk

@@ -1,15 +1,12 @@
 {% extends "standard-form.njk" %}
 {% from "back-link/macro.njk" import govukBackLink %}
 
-
 {% if data.licensee.preferredMethodOfConfirmation == 'Email' %} 
   {% set contactType = mssgs.email_address %}
   {% set contactInfo = data.licensee.email  %}
-  {% set changeLinkUrl = data.uri.licenceConfirmationMethod + '?change=email' %}
 {% else %}
   {% set contactType = mssgs.phone_number  %}
   {% set contactInfo = data.licensee.mobilePhone %}
-  {% set changeLinkUrl = data.uri.licenceConfirmationMethod + '?change=mobile' %}
 {% endif %}
 
 {% set title = mssgs.check_conf_contact_title_1 + contactType + mssgs.check_conf_contact_title_2 %}
@@ -36,7 +33,7 @@
       </p>
 
       <p class="govuk-body govuk-!-margin-bottom-6">
-        <a class="govuk-link" href="{{ changeLinkUrl }}">
+        <a class="govuk-link" href="{{ data.uri.change }}">
           {{ mssgs.licence_summary_change }} {{ contactType }}
         </a>
       </p>

package/src/pages/contact/digital-licence/check-confirmation-contact/route.js

@@ -3,6 +3,7 @@ import { HOW_CONTACTED } from '../../../../processors/mapping-constants.js'
 import GetDataRedirect from '../../../../handlers/get-data-redirect.js'
 import pageRoute from '../../../../routes/page-route.js'
 import { nextPage } from '../../../../routes/next-page.js'
+import { addLanguageCodeToUri } from '../../../../processors/uri-helper.js'
 
 export const getData = async request => {
   const { licensee } = await request.cache().helpers.transaction.getCurrentPermission()
@@ -11,11 +12,14 @@ export const getData = async request => {
     throw new GetDataRedirect(CONTACT.uri)
   }
 
+  const whatToChange = licensee.preferredMethodOfConfirmation === HOW_CONTACTED.email ? '?change=email' : '?change=mobile'
+  const change = addLanguageCodeToUri(request, `${LICENCE_CONFIRMATION_METHOD.uri}${whatToChange}`)
+
   return {
     licensee,
     uri: {
-      licenceConfirmationMethod: LICENCE_CONFIRMATION_METHOD.uri,
-      contact: CONTACT.uri
+      contact: addLanguageCodeToUri(request, CONTACT.uri),
+      change
     }
   }
 }

package/src/pages/licence-details/licence-length/__tests__/route.spec.js

@@ -1,6 +1,6 @@
 import { getData } from '../route'
 import '../../../../processors/pricing-summary.js'
-import '../../../../processors/licence-type-display.js'
+import { licenceTypeDisplay } from '../../../../processors/licence-type-display.js'
 
 jest.mock('../../../../processors/pricing-summary.js')
 jest.mock('../../../../processors/licence-type-display.js')
@@ -15,7 +15,10 @@ describe('licence-length > route', () => {
           getCurrentPermission: mockTransactionCacheGet
         }
       }
-    })
+    }),
+    i18n: {
+      getCatalog: () => ({})
+    }
   }
 
   describe('getData', () => {
@@ -30,5 +33,32 @@ describe('licence-length > route', () => {
       const result = await getData(mockRequest)
       expect(result.isLicenceForYou).toBeFalsy()
     })
+
+    it('licenceTypeDisplay is called with the expected arguments', async () => {
+      const catalog = Symbol('mock catalog')
+      const permission = Symbol('mock permission')
+      const sampleRequest = {
+        ...mockRequest,
+        i18n: {
+          getCatalog: () => catalog
+        }
+      }
+      mockTransactionCacheGet.mockImplementationOnce(() => permission)
+
+      await getData(sampleRequest)
+
+      expect(licenceTypeDisplay).toHaveBeenCalledWith(permission, catalog)
+    })
+
+    it('return value of licenceTypeDisplay is used for licenceTypeStr', async () => {
+      const returnValue = Symbol('return value')
+      licenceTypeDisplay.mockReturnValueOnce(returnValue)
+      mockTransactionCacheGet.mockImplementationOnce(() => ({ isLicenceForYou: false }))
+
+      const result = await getData(mockRequest)
+      const ret = result.licenceTypeStr
+
+      expect(ret).toEqual(returnValue)
+    })
   })
 })

package/src/pages/licence-details/licence-length/licence-length.njk

@@ -56,8 +56,8 @@
 {% block pricingSummary %}
     {{ pricingSummary(data.pricing.byLength, {
         'total': { desc: mssgs.total }
-    }, mssgs,
-    data.licenceTypeStr
+    }, data.licenceTypeStr,
+    mssgs
     )}}
 {% endblock %}
 

package/src/pages/licence-details/licence-length/route.js

@@ -18,7 +18,7 @@ export const getData = async request => {
   return {
     pricing,
     isLicenceForYou: permission.isLicenceForYou,
-    licenceTypeStr: licenceTypeDisplay(permission)
+    licenceTypeStr: licenceTypeDisplay(permission, request.i18n.getCatalog())
   }
 }
 

package/src/pages/licence-details/licence-type/licence-type.njk

@@ -81,8 +81,8 @@
         '8D': { desc: mssgs.licence_type_8d },
         '1D': { desc: mssgs.licence_type_1d },
         'no-short': mssgs.licence_type_na
-    }, mssgs,
-    null
+    }, null,
+    mssgs
     )}}
 {% endblock %}
 

package/src/pages/macros/pricing-summary.njk

@@ -1,13 +1,9 @@
-{% from "licence-type-summary.njk" import licenceTypeSummary %}
-
-{% macro pricingSummary(selectors, content, mssgs, licenceType) %}
+{% macro pricingSummary(selectors, content, subHeader, mssgs) %}
 <aside class="govuk-grid-column-one-third payment-summary-wrap">
     {% for selector, load in selectors %}
     <div id="pricing-{{ selector }}" role="status" class="payment-summary initially-hidden">
         <h2 class="govuk-heading-m">{{ mssgs.no_licence_req_body }}</h2>
-        {% block licenceTypeSummary %}
-            {{ licenceTypeSummary(mssgs, licenceType) }}
-        {% endblock %}
+        <p class="govuk-body-s">{{ subHeader }}</p>
         {% for k, v in load %}
             {% if content[k].desc %}
                 <div class="govuk-body" id="pricing-summary-element-cost">

package/src/pages/order-complete/licence-details/__tests__/licence-details.spec.js

@@ -69,5 +69,11 @@ const createMockRequest = status => ({
         }))
       }
     }
-  }))
+  })),
+  i18n: {
+    getCatalog: () => ({
+      over_65: 'Over 65',
+      licence_type_radio_trout_three_rod: 'Trout and coarse, up to 3 rods'
+    })
+  }
 })

package/src/pages/order-complete/licence-details/__tests__/route.spec.js

@@ -0,0 +1,89 @@
+import { getData } from '../route'
+import { licenceTypeDisplay } from '../../../../processors/licence-type-display.js'
+import { COMPLETION_STATUS, CommonResults, ShowDigitalLicencePages } from '../../../../constants.js'
+
+jest.mock('../../../../processors/licence-type-display.js')
+jest.mock('../../../../constants', () => ({
+  COMPLETION_STATUS: {
+    agreed: 'agreed',
+    posted: 'posted',
+    finalised: 'finalised'
+  },
+  CommonResults: {
+    ok: 'ok'
+  },
+  ShowDigitalLicencePages: {
+    YES: 'yes'
+  }
+}))
+
+describe('licence-length > route', () => {
+  const mockTransactionCacheGet = jest.fn()
+  const mockStatusCacheGet = jest.fn()
+
+  const mockRequest = {
+    cache: () => ({
+      helpers: {
+        transaction: {
+          getCurrentPermission: mockTransactionCacheGet
+        },
+        status: {
+          get: mockStatusCacheGet
+        }
+      }
+    }),
+    i18n: {
+      getCatalog: () => ({})
+    }
+  }
+
+  describe('getData', () => {
+    it('licenceTypeDisplay is called with the expected arguments', async () => {
+      const catalog = Symbol('mock catalog')
+      const permission = Symbol('mock permission')
+      const status = {
+        [COMPLETION_STATUS.agreed]: 'agreed',
+        [COMPLETION_STATUS.posted]: 'posted',
+        [COMPLETION_STATUS.finalised]: 'finalised',
+        [CommonResults.OK]: 'ok',
+        [ShowDigitalLicencePages.YES]: 'yes'
+      }
+      const sampleRequest = {
+        ...mockRequest,
+        i18n: {
+          getCatalog: () => catalog
+        }
+      }
+      mockTransactionCacheGet.mockImplementationOnce(() => permission)
+      mockStatusCacheGet.mockImplementationOnce(() => status)
+
+      await getData(sampleRequest)
+
+      expect(licenceTypeDisplay).toHaveBeenCalledWith(permission, catalog)
+    })
+
+    it('return value of licenceTypeDisplay is used for licenceTypeStr', async () => {
+      const returnValue = Symbol('return value')
+      licenceTypeDisplay.mockReturnValueOnce(returnValue)
+
+      const permission = {
+        startDate: '2021-01-01'
+      }
+
+      const status = {
+        [COMPLETION_STATUS.agreed]: 'agreed',
+        [COMPLETION_STATUS.posted]: 'posted',
+        [COMPLETION_STATUS.finalised]: 'finalised',
+        [CommonResults.OK]: 'ok',
+        [ShowDigitalLicencePages.YES]: 'yes'
+      }
+      mockTransactionCacheGet.mockImplementationOnce(() => permission)
+      mockStatusCacheGet.mockImplementationOnce(() => status)
+
+      const result = await getData(mockRequest)
+      const ret = result.licenceTypeStr
+
+      expect(ret).toEqual(returnValue)
+    })
+  })
+})

package/src/pages/order-complete/licence-details/route.js

@@ -34,7 +34,7 @@ export const getData = async request => {
     endTimeString,
     disabled: concessionHelper.hasDisabled(permission),
     ageConcession: concessionHelper.getAgeConcession(permission),
-    licenceTypeStr: licenceTypeDisplay(permission)
+    licenceTypeStr: licenceTypeDisplay(permission, request.i18n.getCatalog())
   }
 }
 

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

@@ -3,8 +3,10 @@ import { LICENCE_SUMMARY_SEEN, CONTACT_SUMMARY_SEEN } from '../../../../constant
 import { NAME } from '../../../../uri.js'
 import GetDataRedirect from '../../../../handlers/get-data-redirect.js'
 import '../../find-permit.js'
+import { licenceTypeDisplay } from '../../../../processors/licence-type-display.js'
 
 jest.mock('../../find-permit.js')
+jest.mock('../../../../processors/licence-type-display.js')
 
 describe('licence-summary > route', () => {
   beforeEach(jest.clearAllMocks)
@@ -59,7 +61,12 @@ describe('licence-summary > route', () => {
             setCurrentPermission: mockTransactionCacheSet
           }
         }
-      })
+      }),
+      i18n: {
+        getCatalog: () => ({
+          licence_type_radio_salmon: 'Salmon and sea trout'
+        })
+      }
     }
 
     it('should return the name page uri', async () => {
@@ -106,5 +113,40 @@ describe('licence-summary > route', () => {
       expect(error).toBeInstanceOf(GetDataRedirect)
       expect(error.redirectUrl).toBe(NAME.uri)
     })
+
+    it('licenceTypeDisplay is called with the expected arguments', async () => {
+      mockStatusCacheGet.mockImplementationOnce(() => ({ renewal: true }))
+      const catalog = Symbol('mock catalog')
+      const permission = {
+        permit: {
+          cost: 1
+        },
+        licensee: {
+          birthDate: '1996-01-01'
+        }
+      }
+      const sampleRequest = {
+        ...mockRequest,
+        i18n: {
+          getCatalog: () => catalog
+        }
+      }
+
+      mockTransactionCacheGet.mockImplementationOnce(() => permission)
+
+      await getData(sampleRequest)
+
+      expect(licenceTypeDisplay).toHaveBeenCalledWith(permission, catalog)
+    })
+
+    it('return value of licenceTypeDisplay is used for licenceTypeStr', async () => {
+      const returnValue = Symbol('return value')
+      licenceTypeDisplay.mockReturnValueOnce(returnValue)
+
+      const result = await getData(mockRequest)
+      const ret = result.licenceTypeStr
+
+      expect(ret).toEqual(returnValue)
+    })
   })
 })

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

@@ -67,7 +67,7 @@ export const getData = async request => {
     permission,
     startTimeString,
     startAfterPaymentMinutes: START_AFTER_PAYMENT_MINUTES,
-    licenceTypeStr: licenceTypeDisplay(permission),
+    licenceTypeStr: licenceTypeDisplay(permission, request.i18n.getCatalog()),
     isRenewal: status.renewal,
     isContinuing: !!(permission.renewedEndDate && permission.renewedEndDate === permission.licenceStartDate),
     hasExpired: moment(moment().tz(SERVICE_LOCAL_TIME)).isAfter(moment(permission.renewedEndDate, cacheDateFormat)),

package/src/processors/__tests__/licence-type-display.spec.js

@@ -0,0 +1,103 @@
+import { hasJunior, hasSenior } from '../concession-helper.js'
+import { licenceTypeDisplay, licenceTypeAndLengthDisplay, isPhysical } from '../licence-type-display.js'
+
+const permission = {}
+
+const mssgs = {
+  over_65: 'Over 65',
+  age_junior: 'Junior',
+  licence_type_radio_salmon: 'Salmon and sea trout',
+  licence_type_radio_trout_two_rod: 'Trout and coarse, up to 2 rods',
+  licence_type_radio_trout_three_rod: 'Trout and coarse, up to 3 rods'
+}
+
+jest.mock('../concession-helper', () => ({
+  hasJunior: jest.fn(),
+  hasSenior: jest.fn()
+}))
+
+jest.mock('../mapping-constants', () => ({
+  LICENCE_TYPE: {
+    'trout-and-coarse': 'Trout and coarse',
+    'salmon-and-sea-trout': 'Salmon and sea trout'
+  }
+}))
+
+describe('licenceTypeDisplay', () => {
+  it('returns junior if person is junior', () => {
+    hasJunior.mockImplementationOnce(() => true)
+    permission.licenceType = 'Salmon and sea trout'
+    const result = licenceTypeDisplay(permission, mssgs)
+    expect(result).toEqual('Junior, Salmon and sea trout')
+  })
+
+  it('returns senior if person is senior', () => {
+    hasSenior.mockImplementationOnce(() => true)
+    permission.licenceType = 'Salmon and sea trout'
+    const result = licenceTypeDisplay(permission, mssgs)
+    expect(result).toEqual('Over 65, Salmon and sea trout')
+  })
+
+  it.each([
+    ['Salmon and sea trout', null, 'Salmon and sea trout'],
+    ['Trout and coarse', '2', 'Trout and coarse, up to 2 rods'],
+    ['Trout and coarse', '3', 'Trout and coarse, up to 3 rods']
+  ])('returns correct licence type', (licenceType, numberOfRods, expected) => {
+    permission.licenceType = licenceType
+    permission.numberOfRods = numberOfRods
+    const result = licenceTypeDisplay(permission, mssgs)
+    expect(result).toEqual(expected)
+  })
+})
+
+describe('licenceTypeAndLengthDisplay', () => {
+  it.each([
+    ['12M', 'Salmon and sea trout', null, 'Salmon and sea trout, 12 months'],
+    ['12M', 'Trout and coarse', '2', 'Trout and coarse, up to 2 rods, 12 months'],
+    ['12M', 'Trout and coarse', '3', 'Trout and coarse, up to 3 rods, 12 months'],
+    ['8D', 'Salmon and sea trout', null, 'Salmon and sea trout, 8 days'],
+    ['8D', 'Trout and coarse', '2', 'Trout and coarse, up to 2 rods, 8 days'],
+    ['8D', 'Trout and coarse', '3', 'Trout and coarse, up to 3 rods, 8 days'],
+    ['1D', 'Salmon and sea trout', null, 'Salmon and sea trout, 1 day'],
+    ['1D', 'Trout and coarse', '2', 'Trout and coarse, up to 2 rods, 1 day'],
+    ['1D', 'Trout and coarse', '3', 'Trout and coarse, up to 3 rods, 1 day']
+  ])('returns correct licence length', (licenceLength, licenceType, numberOfRods, expected) => {
+    permission.licenceLength = licenceLength
+    permission.licenceType = licenceType
+    permission.numberOfRods = numberOfRods
+    const result = licenceTypeAndLengthDisplay(permission, mssgs)
+    expect(result).toEqual(expected)
+  })
+
+  it('returns junior if licence length is junior', () => {
+    hasJunior.mockImplementationOnce(() => true)
+    permission.licenceLength = '12M'
+    permission.licenceType = 'Salmon and sea trout'
+    const result = licenceTypeAndLengthDisplay(permission, mssgs)
+    expect(result).toEqual('Junior, Salmon and sea trout, 12 months')
+  })
+
+  it('returns senior if licence length is senior', () => {
+    hasSenior.mockImplementationOnce(() => true)
+    permission.licenceLength = '12M'
+    permission.licenceType = 'Salmon and sea trout'
+    const result = licenceTypeAndLengthDisplay(permission, mssgs)
+    expect(result).toEqual('Over 65, Salmon and sea trout, 12 months')
+  })
+})
+
+describe('isPhysical', () => {
+  it('returns true if licence length is 12 months and is not a junior', () => {
+    hasJunior.mockImplementationOnce(() => false)
+    permission.licenceLength = '12M'
+    const result = isPhysical(permission)
+    expect(result).toEqual(true)
+  })
+
+  it('returns false if licence length is not 12 months and a junior', () => {
+    hasJunior.mockImplementationOnce(() => true)
+    permission.licenceLength = '8D'
+    const result = isPhysical(permission)
+    expect(result).toEqual(false)
+  })
+})

package/src/processors/__tests__/payment.spec.js

@@ -5,6 +5,9 @@ jest.mock('../licence-type-display.js')
 licenceTypeAndLengthDisplay.mockReturnValue('Trout and coarse, up to 2 rods, 8 day')
 
 const createRequest = (opts = {}) => ({
+  i18n: {
+    getCatalog: () => ({})
+  },
   headers: opts.headers || { 'x-forwarded-proto': 'https' },
   info: { host: opts.host || 'localhost:1234' },
   server: { info: { protocol: opts.protocol || '' } }
@@ -64,6 +67,46 @@ describe('preparePayment', () => {
     expect(result.reference).toBe(transaction.id)
   })
 
+  it('licenceTypeAndLengthDisplay is called with the expected arguments', () => {
+    const catalog = Symbol('mock catalog')
+    const createMockRequest = (opts = {}) => ({
+      i18n: {
+        getCatalog: () => catalog
+      },
+      headers: opts.headers || { 'x-forwarded-proto': 'https' },
+      info: { host: opts.host || 'localhost:1234' },
+      server: { info: { protocol: opts.protocol || '' } }
+    })
+    const request = createMockRequest()
+    const permission = {
+      licensee: {
+        firstName: 'Lando',
+        lastName: 'Norris',
+        email: 'test@example.com',
+        premises: '4',
+        street: 'Buttercup lane',
+        locality: 'Clifton',
+        postcode: 'BS8 3TP',
+        town: 'Bristol',
+        country: 'GB-ENG'
+      }
+    }
+
+    preparePayment(request, transaction)
+
+    expect(licenceTypeAndLengthDisplay).toHaveBeenCalledWith(permission, catalog)
+  })
+
+  it('return value of licenceTypeDisplay', () => {
+    const returnValue = Symbol('return value')
+    licenceTypeAndLengthDisplay.mockReturnValueOnce(returnValue)
+
+    const result = preparePayment(request, transaction)
+    const ret = result.description
+
+    expect(ret).toEqual(returnValue)
+  })
+
   describe('provides the correct description', () => {
     it('when there is only 1 permission', () => {
       expect(result.description).toBe('Trout and coarse, up to 2 rods, 8 day')

package/src/processors/__tests__/uri-helper.spec.js

@@ -18,4 +18,31 @@ describe('URI Helpers: addLanguageCodeToURI', () => {
     const result = addLanguageCodeToUri(mockRequest, uri)
     expect(result).toEqual(expect.stringMatching(new RegExp(expected)))
   })
+
+  describe.each([
+    ['https://my-url.com/path?data=true', 'https://my-url.com/path?data=true&lang=cy'],
+    ['https://my-url.com/path?data-1=false&data-2=9', 'https://my-url.com/path?data-1=false&data-2=9&lang=cy']
+  ])('', (urlToDecorate, decoratedUrl) => {
+    it('if the supplied url has a querystring already, the language parameter is added to the end with an ampersand', () => {
+      const mockRequest = {
+        path: '/any/page',
+        url: {
+          search: '?lang=cy'
+        }
+      }
+      const result = addLanguageCodeToUri(mockRequest, urlToDecorate)
+      expect(result).toEqual(decoratedUrl)
+    })
+
+    it('if the request.path is used instead of a url and has a querystring, the language parameter is added to the end with an ampersand', () => {
+      const mockRequest = {
+        path: urlToDecorate,
+        url: {
+          search: '?lang=cy'
+        }
+      }
+      const result = addLanguageCodeToUri(mockRequest, urlToDecorate)
+      expect(result).toEqual(decoratedUrl)
+    })
+  })
 })

package/src/processors/licence-type-display.js

@@ -1,33 +1,37 @@
 import * as concessionHelper from './concession-helper.js'
 import * as mappings from './mapping-constants.js'
 
-export const licenceTypeDisplay = permission => {
+export const licenceTypeDisplay = (permission, mssgs) => {
   const typesStrArr = []
 
   // Build the display string for the licence type
   if (concessionHelper.hasJunior(permission)) {
-    typesStrArr.push('Junior')
+    typesStrArr.push(mssgs.age_junior)
   } else if (concessionHelper.hasSenior(permission)) {
-    typesStrArr.push('Over 65')
+    typesStrArr.push(mssgs.over_65)
   }
 
-  typesStrArr.push(permission.licenceType)
-
-  if (permission.licenceType === mappings.LICENCE_TYPE['trout-and-coarse']) {
-    typesStrArr.push(permission.numberOfRods === '2' ? 'up to 2 rods' : 'up to 3 rods')
+  if (permission.licenceType === mappings.LICENCE_TYPE['salmon-and-sea-trout']) {
+    typesStrArr.push(mssgs.licence_type_radio_salmon)
+  } else if (permission.licenceType === mappings.LICENCE_TYPE['trout-and-coarse']) {
+    if (permission.numberOfRods === '2') {
+      typesStrArr.push(mssgs.licence_type_radio_trout_two_rod)
+    } else {
+      typesStrArr.push(mssgs.licence_type_radio_trout_three_rod)
+    }
   }
 
   return typesStrArr.join(', ')
 }
 
-export const licenceTypeAndLengthDisplay = permission => {
+export const licenceTypeAndLengthDisplay = (permission, mssgs) => {
   switch (permission.licenceLength) {
     case '12M':
-      return `${licenceTypeDisplay(permission)}, 12 months`
+      return `${licenceTypeDisplay(permission, mssgs)}, 12 months`
     case '8D':
-      return `${licenceTypeDisplay(permission)}, 8 days`
+      return `${licenceTypeDisplay(permission, mssgs)}, 8 days`
     default:
-      return `${licenceTypeDisplay(permission)}, 1 day`
+      return `${licenceTypeDisplay(permission, mssgs)}, 1 day`
   }
 }
 

package/src/processors/payment.js

@@ -23,7 +23,10 @@ export const preparePayment = (request, transaction) => {
     return_url: url.href,
     amount: transaction.cost * 100,
     reference: transaction.id,
-    description: transaction.permissions.length === 1 ? licenceTypeAndLengthDisplay(transaction.permissions[0]) : 'Multiple permits',
+    description:
+      transaction.permissions.length === 1
+        ? licenceTypeAndLengthDisplay(transaction.permissions[0], request.i18n.getCatalog())
+        : 'Multiple permits',
     delayed_capture: false,
     moto: process.env.CHANNEL === 'telesales'
   }

package/src/processors/uri-helper.js

@@ -1,4 +1,5 @@
 export const addLanguageCodeToUri = (request, uri) => {
   const path = uri || request.path
-  return `${path}${/\?.*lang=cy.*$/.test(request.url.search) ? '?lang=cy' : ''}`
+  const languageSpecifier = /.*\?.*/.test(path) ? '&lang=cy' : '?lang=cy'
+  return `${path}${/\?.*lang=cy.*$/.test(request.url.search) ? languageSpecifier : ''}`
 }

package/src/services/payment/__test__/govuk-pay-service.spec.js

@@ -5,19 +5,56 @@ import { AGREED } from '../../../uri.js'
 describe('The govuk-pay-service', () => {
   it('prepares a correct payment response endpoint for http', async () => {
     expect(
-      preparePayment({ info: { host: '0.0.0.0:3000' }, headers: { 'x-forwarded-proto': 'http' } }, mockTransaction).return_url
+      preparePayment(
+        {
+          i18n: {
+            getCatalog: () => ({
+              over_65: 'Over 65',
+              licence_type_radio_trout_three_rod: 'Trout and coarse, up to 3 rods'
+            })
+          },
+          info: { host: '0.0.0.0:3000' },
+          headers: { 'x-forwarded-proto': 'http' }
+        },
+        mockTransaction
+      ).return_url
     ).toEqual('http://0.0.0.0:3000' + AGREED.uri)
   })
 
   it('prepares a correct payment response endpoint for https', async () => {
     expect(
-      preparePayment({ info: { host: '0.0.0.0:3000' }, headers: { 'x-forwarded-proto': 'https' } }, mockTransaction).return_url
+      preparePayment(
+        {
+          i18n: {
+            getCatalog: () => ({
+              over_65: 'Over 65',
+              licence_type_radio_trout_three_rod: 'Trout and coarse, up to 3 rods'
+            })
+          },
+          info: { host: '0.0.0.0:3000' },
+          headers: { 'x-forwarded-proto': 'https' }
+        },
+        mockTransaction
+      ).return_url
     ).toEqual('https://0.0.0.0:3000' + AGREED.uri)
   })
 
   it('prepares a correct payment creation object', async () => {
     expect(
-      preparePayment({ info: { host: '0.0.0.0:3000' }, headers: {}, server: { info: { protocol: 'https' } } }, mockTransaction)
+      preparePayment(
+        {
+          i18n: {
+            getCatalog: () => ({
+              over_65: 'Over 65',
+              licence_type_radio_salmon: 'Salmon and sea trout'
+            })
+          },
+          info: { host: '0.0.0.0:3000' },
+          headers: {},
+          server: { info: { protocol: 'https' } }
+        },
+        mockTransaction
+      )
     ).toEqual({
       amount: 5400,
       delayed_capture: false,
@@ -42,7 +79,21 @@ describe('The govuk-pay-service', () => {
     const mockTransaction2 = Object.assign({}, mockTransaction)
     mockTransaction2.permissions[0].licensee.locality = 'Stoke Bishop'
     mockTransaction2.permissions[0].licenceLength = '8D'
-    expect(preparePayment({ info: { host: '0.0.0.0:3000' }, headers: { 'x-forwarded-proto': 'https' } }, mockTransaction2)).toEqual({
+    expect(
+      preparePayment(
+        {
+          i18n: {
+            getCatalog: () => ({
+              over_65: 'Over 65',
+              licence_type_radio_salmon: 'Salmon and sea trout'
+            })
+          },
+          info: { host: '0.0.0.0:3000' },
+          headers: { 'x-forwarded-proto': 'https' }
+        },
+        mockTransaction2
+      )
+    ).toEqual({
       amount: 5400,
       delayed_capture: false,
       description: 'Over 65, Salmon and sea trout, 8 days',

package/src/pages/macros/licence-type-summary.njk

@@ -1,19 +0,0 @@
-{% macro licenceTypeSummary(mssgs, licenceTypeStr) %}
-    {% set licenceTypeSubHeading %}
-        {% if licenceTypeStr === 'Over 65, Trout and coarse, up to 2 rods' %}
-            {{ mssgs.over_65 + mssgs.licence_type_radio_trout_two_rod }}
-        {% elseif licenceTypeStr === 'Over 65, Trout and coarse, up to 3 rods' %}
-            {{ mssgs.over_65 + mssgs.licence_type_radio_trout_three_rod }}
-        {% elseif licenceTypeStr === 'Over 65, Salmon and sea trout' %}
-            {{ mssgs.over_65 + mssgs.licence_type_radio_salmon }}
-        {% elseif licenceTypeStr === 'Trout and coarse, up to 2 rods' %}
-            {{ mssgs.licence_type_radio_trout_two_rod }}
-        {% elseif licenceTypeStr === 'Trout and coarse, up to 3 rods' %}
-            {{ mssgs.licence_type_radio_trout_three_rod }}
-        {% elseif licenceTypeStr === 'Salmon and sea trout' %}
-            {{ mssgs.licence_type_radio_salmon }}
-        {% endif %}
-    {% endset %}
-<p class="govuk-body-s">{{ licenceTypeSubHeading }}</p>
-{% endmacro %}
-