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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.60.0-rc.1",
+  "version": "1.60.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.60.0-rc.1",
-    "@defra-fish/connectors-lib": "1.60.0-rc.1",
+    "@defra-fish/business-rules-lib": "1.60.0-rc.3",
+    "@defra-fish/connectors-lib": "1.60.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": "788bfa677a11c509bc44e31f98bd12e98d3f57b4"
+  "gitHead": "78528be2315fd176a037e49a3507587240deae93"
 }

package/src/locales/cy.json

@@ -533,7 +533,7 @@
   "new_prices_row_12_month": "12 mis",
   "new_prices_row_concession": "12 mis - pobl hŷn neu anabl",
   "new_prices_row_junior": "12 mis - ieuenctid (13 i 16)",
-  "newsletter_error_choose": "Dewiswch os hoffech dderbyn ein cylchlythyr dros e-bost",
+  "newsletter_error_choose": "Dewiswch un o’r opsiynau",
   "newsletter_error_set_email": "Nodwch gyfeiriad e-bost yn y fformat cywir, fel enw@enghraifft.com",
   "newsletter_subscribe": "Mynnwch yr wybodaeth ddiweddaraf am genweirio, pysgodfeydd a sut rydym yn gwario eich arian trwydded. Gallwch ddatdanysgrifio ar unrhyw adeg.",
   "newsletter_title": "A hoffech chi dderbyn ein cylchlythyr dros e-bost?",

package/src/locales/en.json

@@ -533,7 +533,7 @@
   "new_prices_row_12_month": "12-month",
   "new_prices_row_concession": "12-month senior or disabled",
   "new_prices_row_junior": "12-month junior (13 to 16)",
-  "newsletter_error_choose": "Choose if you would like to receive our email newsletter",
+  "newsletter_error_choose": "Choose one of the options",
   "newsletter_error_set_email": "Enter an email address in the correct format, like name@example.com",
   "newsletter_subscribe": "Stay up to date with the latest news on angling, fisheries and how we spend your licence money. You can unsubscribe at any time.",
   "newsletter_title": "Would you like to receive our email newsletter?",

package/src/pages/contact/newsletter/newsletter.njk

@@ -65,7 +65,7 @@
         {
           value: "no",
           text: mssgs.no,
-          checked: true if not payload or payload['newsletter'] === 'no' else false
+          checked: payload.newsletter === 'no'
         }
       ]
     }) }}

package/src/processors/__tests__/recurring-pay-helper.spec.js

@@ -50,20 +50,15 @@ describe('validForRecurringPayment', () => {
 
 describe('isRecurringPayment', () => {
   it.each`
-    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 transaction agreementId is $agreementId',
-    async ({ show, agreementId, expected }) => {
-      process.env.SHOW_RECURRING_PAYMENTS = show
-      const transaction = { agreementId }
+    agreementId  | expected
+    ${'foo123'}  | ${true}
+    ${undefined} | ${false}
+  `('recurringPayment returns $expected when transaction agreementId is $agreementId', async ({ show, agreementId, expected }) => {
+    process.env.SHOW_RECURRING_PAYMENTS = show
+    const transaction = { agreementId }
 
-      expect(isRecurringPayment(transaction)).toBe(expected)
+    expect(isRecurringPayment(transaction)).toBe(expected)
 
-      delete process.env.SHOW_RECURRING_PAYMENTS
-    }
-  )
+    delete process.env.SHOW_RECURRING_PAYMENTS
+  })
 })

package/src/processors/recurring-pay-helper.js

@@ -22,4 +22,4 @@ export const validForRecurringPayment = permission => {
   )
 }
 
-export const isRecurringPayment = transaction => process.env.SHOW_RECURRING_PAYMENTS?.toLowerCase() === 'true' && !!transaction.agreementId
+export const isRecurringPayment = transaction => !!transaction.agreementId