@defra-fish/gafl-webapp-service 1.75.0 → 1.76.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.75.0",
+  "version": "1.76.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.75.0",
-    "@defra-fish/connectors-lib": "1.75.0",
+    "@defra-fish/business-rules-lib": "1.76.0-rc.2",
+    "@defra-fish/connectors-lib": "1.76.0-rc.2",
     "@defra/hapi-gapi": "2.0.0",
     "@hapi/boom": "9.1.2",
     "@hapi/catbox-redis": "6.0.2",
@@ -72,12 +72,12 @@
     "gulp-minify": "3.1.0",
     "gulp-sass": "5.1.0",
     "gulp-sourcemaps": "3.0.0",
-    "sass": "1.69.3"
+    "sass": "1.102.0"
   },
   "jest": {
     "setupFilesAfterEnv": [
       "./gafl-jest-matchers.js"
     ]
   },
-  "gitHead": "0fec5ec015fb288eabf13f366319bcb9214e81c0"
+  "gitHead": "254132463f912d406c9260b08e694e20dbc2cc46"
 }

package/src/locales/cy.json

@@ -743,16 +743,17 @@
   "refund_bulletpoint_6": "Gallwch wneud cais am ad-daliad llawn os byddwch yn uwchraddio trwydded 2 wialen i drwydded 3 gwialen o fewn 14 diwrnod i’r dyddiad y prynwyd y drwydded yn wreiddiol. Byddwn yn ad-dalu cost y drwydded 2 wialen ar ôl i chi brynu’r drwydded 3 gwialen.",
   "refund_bulletpoint_7": "Gallwch wneud cais am ad-daliad os byddwch yn uwchraddio trwydded bysgota pysgod bras i drwydded eog a brithyllod y môr o fewn 14 diwrnod i’r dyddiad y prynwyd y drwydded yn wreiddiol. Byddwn yn ad-dalu cost y drwydded bysgota pysgod bras ar ôl i chi brynu’r drwydded eog a brithyllod y môr.",
   "refund_heading": "Polisi ad-dalu",
-  "renewal_inactive_has_expired_1": " has expired on ",
-  "renewal_inactive_has_expired_2": " and can no longer be renewed",
-  "renewal_inactive_not_annual_1": " is not a 12 month licence and cannot be renewed.",
-  "renewal_inactive_not_due_1": "The licence ending in ",
-  "renewal_inactive_not_due_2": " does not expire until ",
-  "renewal_inactive_title_1": "You are renewing this licence too early",
-  "renewal_inactive_title_2": "The licence renewal has expired",
-  "renewal_inactive_title_3": "You cannot renew an 8 day or 1 day licence",
-  "renewal_inactive_title_4": "You can ",
-  "renewal_inactive_title_link": "buy a new licence.",
+  "renewal_inactive_has_expired_1": " i ben ar ",
+  "renewal_inactive_has_expired_2": " ac nid oes modd ei hadnewyddu bellach.",
+  "renewal_inactive_not_annual_1": " yn drwydded 12 mis, felly nid oes modd ei hadnewyddu.",
+  "renewal_inactive_not_due_1": "Nid yw’r drwydded sy’n gorffen â ",
+  "renewal_inactive_not_due_2": " yn dod i ben tan ",
+  "renewal_inactive_not_due_3": "Daeth y drwydded sy’n gorffen â ",
+  "renewal_inactive_title_1": "Rydych chi’n adnewyddu’r drwydded hon yn rhy gynnar",
+  "renewal_inactive_title_2": "Mae cyfnod adnewyddu’r drwydded wedi dod i ben",
+  "renewal_inactive_title_3": "Nid oes modd adnewyddu trwydded 8 diwrnod na thrwydded 1 diwrnod",
+  "renewal_inactive_title_4": "Gallwch chi ",
+  "renewal_inactive_title_link": "brynu trwydded newydd.",
   "renewal_start_date_error_format": "Nid yw hwn yn ddyddiad dilys. Rhowch y dyddied yr hoffech i’r drwydded ddechrau gan gynnwys y diwrnod, mis a’r flwyddyn",
   "renewal_start_date_error_hint": "Rhowch ddyddiad rhwng ",
   "renewal_start_date_error_max_1": "Mae’n rhaid i’r trwydded newydd ddechrau o fewn ",

package/src/locales/en.json

@@ -755,10 +755,11 @@
   "refund_bulletpoint_7": "You can request a refund if you upgrade a coarse fish licence to a salmon and sea trout licence within 14 days of the original purchase date. We will refund the cost of the coarse fish licence after you have purchased the salmon and sea trout licence.",
   "refund_heading": "Refund policy",
   "renewal_inactive_has_expired_1": " has expired on ",
-  "renewal_inactive_has_expired_2": " and can no longer be renewed",
+  "renewal_inactive_has_expired_2": " and can no longer be renewed.",
   "renewal_inactive_not_annual_1": " is not a 12 month licence and cannot be renewed.",
   "renewal_inactive_not_due_1": "The licence ending in ",
   "renewal_inactive_not_due_2": " does not expire until ",
+  "renewal_inactive_not_due_3": "The licence ending in ",
   "renewal_inactive_title_1": "You are renewing this licence too early",
   "renewal_inactive_title_2": "The licence renewal has expired",
   "renewal_inactive_title_3": "You cannot renew an 8 day or 1 day licence",

package/src/pages/renewals/renewal-inactive/__tests__/route.spec.js

@@ -15,14 +15,15 @@ jest.mock('../../../../processors/uri-helper.js', () => ({
 }))
 
 const getMessages = (overrides = {}) => ({
-  renewal_inactive_title_1: 'You are renewing this licence too early',
-  renewal_inactive_title_2: 'The licence renewal has expired',
-  renewal_inactive_title_3: 'You cannot renew an 8 day or 1 day licence',
-  renewal_inactive_not_due_1: 'The licence ending in ',
-  renewal_inactive_not_due_2: ' does not expire until ',
-  renewal_inactive_has_expired_1: ' has expired on ',
-  renewal_inactive_has_expired_2: ' and can no longer be renewed',
-  renewal_inactive_not_annual_1: ' is not a 12 month licence and cannot be renewed.',
+  renewal_inactive_title_1: 'renewal_inactive_title_1',
+  renewal_inactive_title_2: 'renewal_inactive_title_2',
+  renewal_inactive_title_3: 'renewal_inactive_title_3',
+  renewal_inactive_not_due_1: 'renewal_inactive_not_due_1 ',
+  renewal_inactive_not_due_2: ' renewal_inactive_not_due_2 ',
+  renewal_inactive_not_due_3: 'renewal_inactive_not_due_3 ',
+  renewal_inactive_has_expired_1: ' renewal_inactive_has_expired_1 ',
+  renewal_inactive_has_expired_2: ' renewal_inactive_has_expired_2',
+  renewal_inactive_not_annual_1: ' renewal_inactive_not_annual_1',
   ...overrides
 })
 
@@ -63,19 +64,19 @@ describe('renewal-inactive > route', () => {
     describe.each([
       [
         RENEWAL_ERROR_REASON.NOT_DUE,
-        'The licence ending in abc-123 does not expire until 12th Never',
+        'renewal_inactive_not_due_1 abc-123 renewal_inactive_not_due_2 12th Never',
         { renewal_inactive_title_1: 'Renewal inactive title 1' },
         'Renewal inactive title 1'
       ],
       [
         RENEWAL_ERROR_REASON.EXPIRED,
-        'The licence ending in abc-123 has expired on 12th Never and can no longer be renewed',
+        'renewal_inactive_not_due_3 abc-123 renewal_inactive_has_expired_1 12th Never renewal_inactive_has_expired_2',
         { renewal_inactive_title_2: 'Renewal inactive title 2' },
         'Renewal inactive title 2'
       ],
       [
         RENEWAL_ERROR_REASON.NOT_ANNUAL,
-        'The licence ending in abc-123 is not a 12 month licence and cannot be renewed.',
+        'renewal_inactive_not_due_1 abc-123 renewal_inactive_not_annual_1',
         { renewal_inactive_title_3: 'Renewal inactive title 3' },
         'Renewal inactive title 3'
       ],
@@ -186,21 +187,27 @@ describe('renewal-inactive > route', () => {
 
   describe('getTitleAndBodyMessage', () => {
     it.each([
-      ['The licence ending in ABC123 does not expire until 13 December 2020', RENEWAL_ERROR_REASON.NOT_DUE],
-      ['The licence ending in ABC123 has expired on 13 December 2020 and can no longer be renewed', RENEWAL_ERROR_REASON.EXPIRED],
-      ['The licence ending in ABC123 is not a 12 month licence and cannot be renewed.', RENEWAL_ERROR_REASON.NOT_ANNUAL],
-      ['The licence ending in ABC123 does not expire until 13 December 2020', RENEWAL_ERROR_REASON.NOT_DUE],
-      ['The licence ending in ABC123 has expired on 13 December 2020 and can no longer be renewed', RENEWAL_ERROR_REASON.EXPIRED],
-      ['The licence ending in ABC123 is not a 12 month licence and cannot be renewed.', RENEWAL_ERROR_REASON.NOT_ANNUAL]
+      ['renewal_inactive_not_due_1 ABC123 renewal_inactive_not_due_2 13 December 2020', RENEWAL_ERROR_REASON.NOT_DUE],
+      [
+        'renewal_inactive_not_due_3 ABC123 renewal_inactive_has_expired_1 13 December 2020 renewal_inactive_has_expired_2',
+        RENEWAL_ERROR_REASON.EXPIRED
+      ],
+      ['renewal_inactive_not_due_1 ABC123 renewal_inactive_not_annual_1', RENEWAL_ERROR_REASON.NOT_ANNUAL],
+      ['renewal_inactive_not_due_1 ABC123 renewal_inactive_not_due_2 13 December 2020', RENEWAL_ERROR_REASON.NOT_DUE],
+      [
+        'renewal_inactive_not_due_3 ABC123 renewal_inactive_has_expired_1 13 December 2020 renewal_inactive_has_expired_2',
+        RENEWAL_ERROR_REASON.EXPIRED
+      ],
+      ['renewal_inactive_not_due_1 ABC123 renewal_inactive_not_annual_1', RENEWAL_ERROR_REASON.NOT_ANNUAL]
     ])('should return and object with bodyMessage as %s if the reason is %s', (expected, reason) => {
       const result = getTitleAndBodyMessage(getMessages(), reason, 'ABC123', '13 December 2020')
       expect(result.bodyMessage).toBe(expected)
     })
 
     it.each([
-      ['You are renewing this licence too early', RENEWAL_ERROR_REASON.NOT_DUE],
-      ['The licence renewal has expired', RENEWAL_ERROR_REASON.EXPIRED],
-      ['You cannot renew an 8 day or 1 day licence', RENEWAL_ERROR_REASON.NOT_ANNUAL]
+      ['renewal_inactive_title_1', RENEWAL_ERROR_REASON.NOT_DUE],
+      ['renewal_inactive_title_2', RENEWAL_ERROR_REASON.EXPIRED],
+      ['renewal_inactive_title_3', RENEWAL_ERROR_REASON.NOT_ANNUAL]
     ])('should return and object with title as %s if the reason is %s', (expected, reason) => {
       const result = getTitleAndBodyMessage(getMessages(), reason, 'ABC123', '13 December 2020')
       expect(result.title).toBe(expected)

package/src/pages/renewals/renewal-inactive/route.js

@@ -15,7 +15,7 @@ export const getTitleAndBodyMessage = (mssgs, reason, referenceNumber, validTo)
       }
     case RENEWAL_ERROR_REASON.EXPIRED:
       return {
-        bodyMessage: `${mssgs.renewal_inactive_not_due_1}${referenceNumber}${mssgs.renewal_inactive_has_expired_1}${validTo}${mssgs.renewal_inactive_has_expired_2}`,
+        bodyMessage: `${mssgs.renewal_inactive_not_due_3}${referenceNumber}${mssgs.renewal_inactive_has_expired_1}${validTo}${mssgs.renewal_inactive_has_expired_2}`,
         title: mssgs.renewal_inactive_title_2
       }
     case RENEWAL_ERROR_REASON.NOT_ANNUAL: