Merge pull request #2114 from DEFRA/develop

SEMVER - (MINOR): Release 1.58.0
DEFRA · Jan 27, 2025 · 9801704 · 9801704
2 parents 518fbfa + 1c82e1f
commit 9801704
Show file tree

Hide file tree

Showing 49 changed files with 783 additions and 268 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,123 @@
 
+## v1.58.0-rc.13 (2025-01-22)
+
+#### :rocket: Enhancement
+* `recurring-payments-job`
+  * [#2112](https://github.com/DEFRA/rod-licensing/pull/2112) Get id from payment creation request ([@ScottDormand96](https://github.com/ScottDormand96))
+
+#### Committers: 1
+- Scott Dormand ([@ScottDormand96](https://github.com/ScottDormand96))
+
+## v1.58.0-rc.12 (2025-01-20)
+
+#### :rocket: Enhancement
+* `gafl-webapp-service`
+  * [#2111](https://github.com/DEFRA/rod-licensing/pull/2111) Check recurring status based on transaction ([@irisfaraway](https://github.com/irisfaraway))
+
+#### Committers: 1
+- Iris Faraway ([@irisfaraway](https://github.com/irisfaraway))
+
+## v1.58.0-rc.11 (2025-01-16)
+
+#### :rocket: Enhancement
+* `recurring-payments-job`
+  * [#2109](https://github.com/DEFRA/rod-licensing/pull/2109) Recurring payment job sends payment requests to GOV.UK Pay ([@irisfaraway](https://github.com/irisfaraway))
+
+#### Committers: 1
+- Iris Faraway ([@irisfaraway](https://github.com/irisfaraway))
+
+## v1.58.0-rc.10 (2025-01-16)
+
+#### :rocket: Enhancement
+* `gafl-webapp-service`
+  * [#2090](https://github.com/DEFRA/rod-licensing/pull/2090) Mobile phone links ([@ScottDormand96](https://github.com/ScottDormand96))
+
+#### Committers: 1
+- Scott Dormand ([@ScottDormand96](https://github.com/ScottDormand96))
+
+## v1.58.0-rc.9 (2025-01-15)
+
+#### :bug: Bug Fix
+* `gafl-webapp-service`
+  * [#2101](https://github.com/DEFRA/rod-licensing/pull/2101) Move continue button to below the pricing summary ([@lailien3](https://github.com/lailien3))
+
+#### Committers: 1
+- laila aleissa ([@lailien3](https://github.com/lailien3))
+
+## v1.58.0-rc.8 (2025-01-14)
+
+#### :bug: Bug Fix
+* `gafl-webapp-service`
+  * [#2106](https://github.com/DEFRA/rod-licensing/pull/2106) Capitalising Date Entry Fields ([@lailien3](https://github.com/lailien3))
+
+#### Committers: 1
+- laila aleissa ([@lailien3](https://github.com/lailien3))
+
+## v1.58.0-rc.7 (2025-01-07)
+
+#### :bug: Bug Fix
+* `gafl-webapp-service`
+  * [#2107](https://github.com/DEFRA/rod-licensing/pull/2107) Added Welsh to Missing Address Error ([@lailien3](https://github.com/lailien3))
+
+#### Committers: 1
+- laila aleissa ([@lailien3](https://github.com/lailien3))
+
+## v1.58.0-rc.6 (2025-01-07)
+
+#### :bug: Bug Fix
+* `gafl-webapp-service`
+  * [#2105](https://github.com/DEFRA/rod-licensing/pull/2105) Add Welsh to Hidden Date Picker Text ([@lailien3](https://github.com/lailien3))
+
+#### Committers: 1
+- laila aleissa ([@lailien3](https://github.com/lailien3))
+
+## v1.58.0-rc.5 (2025-01-07)
+
+#### :bug: Bug Fix
+* `gafl-webapp-service`
+  * [#2104](https://github.com/DEFRA/rod-licensing/pull/2104) Welsh Missing From Payment Errors ([@lailien3](https://github.com/lailien3))
+
+#### Committers: 1
+- laila aleissa ([@lailien3](https://github.com/lailien3))
+
+## v1.58.0-rc.4 (2025-01-07)
+
+#### :bug: Bug Fix
+* `gafl-webapp-service`
+  * [#2102](https://github.com/DEFRA/rod-licensing/pull/2102) Add Missing Welsh to Newsletter Page ([@lailien3](https://github.com/lailien3))
+
+#### Committers: 1
+- laila aleissa ([@lailien3](https://github.com/lailien3))
+
+## v1.58.0-rc.3 (2025-01-03)
+
+#### :bug: Bug Fix
+* `gafl-webapp-service`
+  * [#2103](https://github.com/DEFRA/rod-licensing/pull/2103) Incorrect Link to Fisheries Report ([@lailien3](https://github.com/lailien3))
+
+#### Committers: 1
+- laila aleissa ([@lailien3](https://github.com/lailien3))
+
+## v1.58.0-rc.2 (2024-12-23)
+
+#### :rocket: Enhancement
+* `dynamics-lib`, `gafl-webapp-service`
+  * [#2096](https://github.com/DEFRA/rod-licensing/pull/2096) Update order complete page RCP logic ([@irisfaraway](https://github.com/irisfaraway))
+
+#### Committers: 1
+- Iris Faraway ([@irisfaraway](https://github.com/irisfaraway))
+
+
+## v1.58.0-rc.0 (2024-12-23)
+
+#### :rocket: Enhancement
+* `gafl-webapp-service`
+  * [#2098](https://github.com/DEFRA/rod-licensing/pull/2098) New price increase ([@ScottDormand96](https://github.com/ScottDormand96))
+  * [#2099](https://github.com/DEFRA/rod-licensing/pull/2099) Payment edge case 2025 ([@ScottDormand96](https://github.com/ScottDormand96))
+
+#### Committers: 1
+- Scott Dormand ([@ScottDormand96](https://github.com/ScottDormand96))
+
 
 ## v1.57.0-rc.12 (2024-12-13)
 

diff --git a/docker/env/recurring_payments_job.env.example b/docker/env/recurring_payments_job.env.example
@@ -11,4 +11,7 @@ SALES_API_URL=http://host.docker.internal:4000
 SALES_API_TIMEOUT_MS=120000
 
 # Recurring Payments start delay for local
-RECURRING_PAYMENTS_LOCAL_DELAY=30
+RECURRING_PAYMENTS_LOCAL_DELAY=30
+
+# GOV.UK Pay
+GOV_PAY_API_URL=https://publicapi.payments.service.gov.uk/v1/payments
diff --git a/docker/env/recurring_payments_job.secrets.env.example b/docker/env/recurring_payments_job.secrets.env.example
@@ -13,3 +13,6 @@ OAUTH_SCOPE=<insert here>
 
 DYNAMICS_API_PATH=<insert here>
 DYNAMICS_API_VERSION=<insert here>
+
+# GOV.UK Pay
+GOV_PAY_RECURRING_APIKEY=<insert here>
diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "1.57.0",
+  "version": "1.58.0-rc.13",
   "npmClient": "npm",
   "publishConfig": {
     "registry": "http://registry.npmjs.org/"

diff --git a/packages/business-rules-lib/package-lock.json b/packages/business-rules-lib/package-lock.json
diff --git a/packages/business-rules-lib/package.json b/packages/business-rules-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/business-rules-lib",
-  "version": "1.57.0",
+  "version": "1.58.0-rc.13",
   "description": "Shared business rules for the rod licensing digital services",
   "type": "module",
   "engines": {

diff --git a/packages/connectors-lib/package-lock.json b/packages/connectors-lib/package-lock.json
diff --git a/packages/connectors-lib/package.json b/packages/connectors-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/connectors-lib",
-  "version": "1.57.0",
+  "version": "1.58.0-rc.13",
   "description": "Shared connectors",
   "type": "module",
   "engines": {

diff --git a/packages/dynamics-lib/package-lock.json b/packages/dynamics-lib/package-lock.json
diff --git a/packages/dynamics-lib/package.json b/packages/dynamics-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/dynamics-lib",
-  "version": "1.57.0",
+  "version": "1.58.0-rc.13",
   "description": "Framework to support integration with dynamics",
   "type": "module",
   "engines": {

diff --git a/packages/dynamics-lib/src/entities/__tests__/permission.entity.spec.js b/packages/dynamics-lib/src/entities/__tests__/permission.entity.spec.js
@@ -18,6 +18,7 @@ describe('permission entity', () => {
         defra_stagingid: '71ad9a25-2a03-406b-a0e3-f4ff37799374',
         defra_datasource: 910400003,
         defra_renewal: true,
+        defra_rcpagreement: false,
         defra_licenceforyou: 1
       },
       optionSetData
@@ -32,6 +33,7 @@ describe('permission entity', () => {
       stagingId: '71ad9a25-2a03-406b-a0e3-f4ff37799374',
       dataSource: expect.objectContaining({ id: 910400003, label: 'Web Sales', description: 'Web Sales' }),
       isRenewal: true,
+      isRecurringPayment: false,
       isLicenceForYou: expect.objectContaining({ id: 1, label: 'Yes', description: 'Yes' })
     }
 
@@ -76,6 +78,7 @@ describe('permission entity', () => {
     permission.stagingId = '71ad9a25-2a03-406b-a0e3-f4ff37799374'
     permission.dataSource = optionSetData.defra_datasource.options['910400003']
     permission.isRenewal = true
+    permission.isRecurringPayment = false
     permission.isLicenceForYou = optionSetData.defra_islicenceforyou.options['1']
 
     permission.bindToEntity(Permission.definition.relationships.licensee, contact)
@@ -97,7 +100,8 @@ describe('permission entity', () => {
         'defra_ContactId@odata.bind': `$${contact.uniqueContentId}`,
         'defra_Transaction@odata.bind': `$${transaction.uniqueContentId}`,
         'defra_POCLFileId@odata.bind': `$${poclFile.uniqueContentId}`,
-        defra_renewal: true
+        defra_renewal: true,
+        defra_rcpagreement: false
       })
     )
   })

diff --git a/packages/dynamics-lib/src/entities/permission.entity.js b/packages/dynamics-lib/src/entities/permission.entity.js
@@ -24,6 +24,7 @@ export class Permission extends BaseEntity {
       stagingId: { field: 'defra_stagingid', type: 'string' },
       dataSource: { field: 'defra_datasource', type: 'optionset', ref: 'defra_datasource' },
       isRenewal: { field: 'defra_renewal', type: 'boolean' },
+      isRecurringPayment: { field: 'defra_rcpagreement', type: 'boolean' },
       isLicenceForYou: { field: 'defra_licenceforyou', type: 'optionset', ref: 'defra_islicenceforyou' }
     },
     relationships: {
@@ -127,6 +128,18 @@ export class Permission extends BaseEntity {
     super._setState('isRenewal', isRenewal)
   }
 
+  /**
+   * Whether the permission has a recurring payment agreement
+   * @type {boolean}
+   */
+  get isRecurringPayment () {
+    return super._getState('isRecurringPayment')
+  }
+
+  set isRecurringPayment (isRecurringPayment) {
+    super._setState('isRecurringPayment', isRecurringPayment)
+  }
+
   /*
    * Whether the permission is for the user purchasing the licence or someone else
    * @type {boolean}

diff --git a/packages/fulfilment-job/package-lock.json b/packages/fulfilment-job/package-lock.json
diff --git a/packages/fulfilment-job/package.json b/packages/fulfilment-job/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/fulfilment-job",
-  "version": "1.57.0",
+  "version": "1.58.0-rc.13",
   "description": "Rod Licensing Sales Fulfilment Job",
   "type": "module",
   "engines": {
@@ -35,8 +35,8 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@defra-fish/connectors-lib": "1.57.0",
-    "@defra-fish/dynamics-lib": "1.57.0",
+    "@defra-fish/connectors-lib": "1.58.0-rc.13",
+    "@defra-fish/dynamics-lib": "1.58.0-rc.13",
     "commander": "^7.2.0",
     "debug": "^4.3.3",
     "merge2": "^1.4.1",

diff --git a/packages/gafl-webapp-service/assets/sass/rod-licensing/_calendar.scss b/packages/gafl-webapp-service/assets/sass/rod-licensing/_calendar.scss
@@ -24,7 +24,7 @@ div#cal-image-div {
     color: #1d70b8;
   }
   &.selected {
-    colour: #fff;
+    color: #fff;
     background: #2d89c9;
     border-color: #2d89c9;
   }

diff --git a/packages/gafl-webapp-service/assets/sass/rod-licensing/_general.scss b/packages/gafl-webapp-service/assets/sass/rod-licensing/_general.scss
@@ -113,3 +113,19 @@ div.initially-hidden {
 .phone-number {
   white-space: nowrap;
 }
+
+@media (max-width: 640px) {
+  .govuk-grid-row:has(.payment-summary-wrap) {
+    position: relative;
+    padding-bottom: 75px;
+
+    #continue {
+      position: absolute;
+      top: auto;
+      bottom: 0;
+      left: 15px;
+      right: 15px;
+      width: auto;
+    }
+  }
+}
diff --git a/packages/gafl-webapp-service/package-lock.json b/packages/gafl-webapp-service/package-lock.json
diff --git a/packages/gafl-webapp-service/package.json b/packages/gafl-webapp-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@defra-fish/gafl-webapp-service",
-  "version": "1.57.0",
+  "version": "1.58.0-rc.13",
   "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.57.0",
-    "@defra-fish/connectors-lib": "1.57.0",
+    "@defra-fish/business-rules-lib": "1.58.0-rc.13",
+    "@defra-fish/connectors-lib": "1.58.0-rc.13",
     "@defra/hapi-gapi": "^2.0.0",
     "@hapi/boom": "^9.1.2",
     "@hapi/catbox-redis": "^6.0.2",