@defra-fish/gafl-webapp-service 1.58.0-rc.11 → 1.58.0-rc.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.58.0-rc.11",
+  "version": "1.58.0-rc.12",
   "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.11",
-    "@defra-fish/connectors-lib": "1.58.0-rc.11",
+    "@defra-fish/business-rules-lib": "1.58.0-rc.12",
+    "@defra-fish/connectors-lib": "1.58.0-rc.12",
     "@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": "07d834ede6126348ee4073360e20fbddac50041c"
+  "gitHead": "ab9cb3b6afa14e6ba82df8a96ef13102c9c604d1"
 }

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

@@ -105,7 +105,8 @@ const getSampleRequest = ({
   statusSet = () => {},
   statusSetCurrentPermission = () => {},
   transactionCost = 1,
-  messages = getMessages()
+  messages = getMessages(),
+  agreementId
 } = {}) => ({
   cache: () => ({
     helpers: {
@@ -116,7 +117,8 @@ const getSampleRequest = ({
       },
       transaction: {
         get: async () => ({
-          cost: transactionCost
+          cost: transactionCost,
+          agreementId
         }),
         getCurrentPermission: () => permission
       }
@@ -205,17 +207,16 @@ describe('The order completion handler', () => {
   })
 
   it.each`
-    show     | recurring | expected
-    ${true}  | ${true}   | ${true}
-    ${true}  | ${false}  | ${false}
-    ${false} | ${false}  | ${false}
-    ${false} | ${true}   | ${false}
+    show     | agreementId  | expected
+    ${true}  | ${'foo123'}  | ${true}
+    ${true}  | ${undefined} | ${false}
+    ${false} | ${'foo123'}  | ${false}
+    ${false} | ${undefined} | ${false}
   `(
-    'recurringPayment returns $expected when SHOW_RECURRING_PAYMENTS is $show and the permission recurring payment is $recurring',
-    async ({ show, recurring, expected }) => {
+    'recurringPayment returns $expected when SHOW_RECURRING_PAYMENTS is $show and the transaction agreementId is $agreementId',
+    async ({ show, agreementId, expected }) => {
       process.env.SHOW_RECURRING_PAYMENTS = show
-      const permission = getSamplePermission({ isRecurringPayment: recurring })
-      const request = getSampleRequest({ permission })
+      const request = getSampleRequest({ agreementId })
       const { recurringPayment } = await getData(request)
 
       expect(recurringPayment).toBe(expected)

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

@@ -41,7 +41,7 @@ export const getData = async request => {
     digitalConfirmation: digital && permission.licensee.postalFulfilment,
     digitalLicence: digital && !permission.licensee.postalFulfilment,
     postalLicence: permission.licensee.postalFulfilment,
-    recurringPayment: isRecurringPayment(permission),
+    recurringPayment: isRecurringPayment(transaction),
     uri: {
       feedback: process.env.FEEDBACK_URI || FEEDBACK_URI_DEFAULT,
       licenceDetails: addLanguageCodeToUri(request, LICENCE_DETAILS.uri),
@@ -58,7 +58,7 @@ const postalFulfilment = permission => {
   }
 }
 
-const isRecurringPayment = permission => process.env.SHOW_RECURRING_PAYMENTS?.toLowerCase() === 'true' && permission.isRecurringPayment
+const isRecurringPayment = transaction => process.env.SHOW_RECURRING_PAYMENTS?.toLowerCase() === 'true' && !!transaction.agreementId
 
 const digitalConfirmation = permission =>
   permission.licensee.preferredMethodOfConfirmation === HOW_CONTACTED.email ||