@defra-fish/gafl-webapp-service 1.58.0-rc.1 → 1.58.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.58.0-rc.1",
+  "version": "1.58.0-rc.3",
   "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.58.0-rc.1",
-    "@defra-fish/connectors-lib": "1.58.0-rc.1",
+    "@defra-fish/business-rules-lib": "1.58.0-rc.3",
+    "@defra-fish/connectors-lib": "1.58.0-rc.3",
     "@defra/hapi-gapi": "^2.0.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",
@@ -80,5 +80,5 @@
       "./gafl-jest-matchers.js"
     ]
   },
-  "gitHead": "e00aea1ef5780d2c91cc88c39483fd73bfdbc1fb"
+  "gitHead": "c212ed313ee072f1cef1fc75bff40526a94ee7c6"
 }

package/src/locales/cy.json

@@ -546,7 +546,7 @@
   "order_complete_before_leave_page_bulletpoint_1": " - mae’n cymryd 30 eiliad",
   "order_complete_before_leave_page_bulletpoint_1_link": "ein cynorthwyo i wella’r gwasanaeth hwn (yn agor mewn tab newydd)",
   "order_complete_before_leave_page_bulletpoint_2": " i weld sut yr ydym yn gwario incwm o drwyddedau pysgota",
-  "order_complete_before_leave_page_bulletpoint_2_link": "darllen yr adroddiad blynyddol pysgodfeydd (yn agor mewn tab newydd)",
+  "order_complete_before_leave_page_bulletpoint_2_link": "darllen yr adroddiad blynyddol pysgodfeydd ar gyfer Lloegr (yn agor mewn tab newydd)",
   "order_complete_before_leave_page_paragraph": "Efallai yr hoffech:",
   "order_complete_before_leave_page_title": "Cyn i chi adael y dudalen hon",
   "order_complete_future_payments_digital_paragraph_1": "Byddwch yn derbyn e-bost neu neges destun yn fuan yn cadarnhau eich cytundeb taliad cerdyn sy'n ailadrodd. Os ydych chi wedi newid eich meddwl, gallwch ",

package/src/locales/en.json

@@ -551,7 +551,7 @@
   "order_complete_before_leave_page_bulletpoint_1": " - takes 30 seconds",
   "order_complete_before_leave_page_bulletpoint_1_link": "help us improve this service (opens in new tab)",
   "order_complete_before_leave_page_bulletpoint_2": " to see how we spend income from fishing licences",
-  "order_complete_before_leave_page_bulletpoint_2_link": "read the latest fisheries annual report (opens in new tab)",
+  "order_complete_before_leave_page_bulletpoint_2_link": "read the latest fisheries annual report for England (opens in new tab)",
   "order_complete_before_leave_page_paragraph": "You may like to:",
   "order_complete_before_leave_page_title": "Before you leave this page",
   "order_complete_future_payments_digital_paragraph_1": "You will shortly get an email or text message confirming your recurring card payment agreement. If you have changed your mind, you can ",

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

@@ -5,7 +5,6 @@ import { COMPLETION_STATUS, FEEDBACK_URI_DEFAULT } from '../../../../constants.j
 import { displayStartTime } from '../../../../processors/date-and-time-display.js'
 import { LICENCE_TYPE } from '../../../../processors/mapping-constants.js'
 import { displayPrice } from '../../../../processors/price-display.js'
-import { validForRecurringPayment } from '../../../../processors/recurring-pay-helper.js'
 
 jest.mock('../../../../processors/recurring-pay-helper.js')
 jest.mock('../../../../processors/date-and-time-display.js')
@@ -50,14 +49,16 @@ const getSamplePermission = ({
   licenceType = LICENCE_TYPE['trout-and-coarse'],
   isLicenceForYou = true,
   licenceLength = '12M',
-  licensee = getSampleLicensee()
+  licensee = getSampleLicensee(),
+  isRecurringPayment = false
 } = {}) => ({
   startDate: '2019-12-14T00:00:00Z',
   licensee,
   isLicenceForYou,
   licenceType,
   referenceNumber,
-  licenceLength
+  licenceLength,
+  isRecurringPayment
 })
 
 const getSampleCompletionStatus = ({ agreed = true, posted = true, finalised = true, setUpPayment = true } = {}) => ({
@@ -203,27 +204,23 @@ describe('The order completion handler', () => {
     expect(displayStartTime).toHaveBeenCalledWith(request, permission)
   })
 
-  it('validForRecurringPayment is called with a permission', async () => {
-    const permission = getSamplePermission()
-
-    await getData(getSampleRequest({ permission }))
-
-    expect(validForRecurringPayment).toHaveBeenCalledWith(permission)
-  })
-
   it.each`
-    agreement | valid    | expected
-    ${true}   | ${true}  | ${true}
-    ${true}   | ${false} | ${false}
-    ${false}  | ${false} | ${false}
-    ${false}  | ${true}  | ${false}
+    show     | recurring | expected
+    ${true}  | ${true}   | ${true}
+    ${true}  | ${false}  | ${false}
+    ${false} | ${false}  | ${false}
+    ${false} | ${true}   | ${false}
   `(
-    'recurringPayment returns $expected when status for setup of recurring payment agreement is $agreement and valid for recurring payment is $valid',
-    async ({ agreement, valid, expected }) => {
-      validForRecurringPayment.mockReturnValueOnce(valid)
-      const completionStatus = getSampleCompletionStatus({ setUpPayment: agreement })
-      const { recurringPayment } = await getData(getSampleRequest({ completionStatus }))
+    'recurringPayment returns $expected when SHOW_RECURRING_PAYMENTS is $show and the permission recurring payment is $recurring',
+    async ({ show, recurring, expected }) => {
+      process.env.SHOW_RECURRING_PAYMENTS = show
+      const permission = getSamplePermission({ isRecurringPayment: recurring })
+      const request = getSampleRequest({ permission })
+      const { recurringPayment } = await getData(request)
+
       expect(recurringPayment).toBe(expected)
+
+      delete process.env.SHOW_RECURRING_PAYMENTS
     }
   )
 

package/src/pages/order-complete/order-complete/order-complete.njk

@@ -50,7 +50,7 @@
             <p class="govuk-body">{{ mssgs.order_complete_before_leave_page_paragraph }}</p>
             <ul class="govuk-list govuk-list--bullet">
                 <li><a class="govuk-link" rel="noreferrer noopener" target="_blank" href="{{ data.uri.feedback }}">{{ mssgs.order_complete_before_leave_page_bulletpoint_1_link }}</a>{{ mssgs.order_complete_before_leave_page_bulletpoint_1 }}</li>
-                <li><a class="govuk-link" rel="noreferrer noopener" target="_blank" href="https://www.gov.uk/government/publications/fisheries-annual-report-2021-to-2022/fisheries-annual-report-2021-to-2022">{{ mssgs.order_complete_before_leave_page_bulletpoint_2_link }}</a>{{ mssgs.order_complete_before_leave_page_bulletpoint_2 }}</li>
+                <li><a class="govuk-link" rel="noreferrer noopener" target="_blank" href="https://www.gov.uk/government/collections/fisheries-annual-reports">{{ mssgs.order_complete_before_leave_page_bulletpoint_2_link }}</a>{{ mssgs.order_complete_before_leave_page_bulletpoint_2 }}</li>
             </ul>
         </div>
     </div>

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

@@ -1,5 +1,4 @@
 import pageRoute from '../../../routes/page-route.js'
-import { validForRecurringPayment } from '../../../processors/recurring-pay-helper.js'
 import Boom from '@hapi/boom'
 import { COMPLETION_STATUS, FEEDBACK_URI_DEFAULT } from '../../../constants.js'
 import { ORDER_COMPLETE, NEW_TRANSACTION, LICENCE_DETAILS } from '../../../uri.js'
@@ -42,7 +41,7 @@ export const getData = async request => {
     digitalConfirmation: digital && permission.licensee.postalFulfilment,
     digitalLicence: digital && !permission.licensee.postalFulfilment,
     postalLicence: permission.licensee.postalFulfilment,
-    recurringPayment: isRecurringPayment(status, permission),
+    recurringPayment: isRecurringPayment(permission),
     uri: {
       feedback: process.env.FEEDBACK_URI || FEEDBACK_URI_DEFAULT,
       licenceDetails: addLanguageCodeToUri(request, LICENCE_DETAILS.uri),
@@ -59,7 +58,7 @@ const postalFulfilment = permission => {
   }
 }
 
-const isRecurringPayment = (status, permission) => validForRecurringPayment(permission) && status.permissions[0]['set-up-payment']
+const isRecurringPayment = permission => process.env.SHOW_RECURRING_PAYMENTS?.toLowerCase() === 'true' && permission.isRecurringPayment
 
 const digitalConfirmation = permission =>
   permission.licensee.preferredMethodOfConfirmation === HOW_CONTACTED.email ||