diff --git a/app/holds.js b/app/holds.js
index 3c6b9ae..59ce1de 100644
--- a/app/holds.js
+++ b/app/holds.js
@@ -16,6 +16,10 @@ const getHolds = async (page = 1, pageSize = 100, usePagination = true) => {
x.marketingYear = 'All'
x.canBeRemoved = true
}
+ if (!x.agreementNumber) {
+ x.agreementNumber = 'All'
+ x.canBeRemoved = true
+ }
return x
})
}
diff --git a/app/views/payment-holds.njk b/app/views/payment-holds.njk
index 99c3dc6..c363fc8 100644
--- a/app/views/payment-holds.njk
+++ b/app/views/payment-holds.njk
@@ -84,6 +84,7 @@
+
@@ -95,6 +96,7 @@
{{ paymentHold.holdCategoryName }} |
{{ paymentHold.holdCategorySchemeName }} |
{{ paymentHold.marketingYear }} |
+ {{ paymentHold.agreementNumber }} |
{{ paymentHold.dateTimeAdded }} |
{% if paymentHold.canBeRemoved %}
diff --git a/package-lock.json b/package-lock.json
index 4aacb3d..29a8563 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "ffc-pay-web",
- "version": "1.20.21",
+ "version": "1.20.22",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "ffc-pay-web",
- "version": "1.20.21",
+ "version": "1.20.22",
"license": "OGL-UK-3.0",
"dependencies": {
"@azure/identity": "4.3.0",
diff --git a/package.json b/package.json
index f445f0b..54d97de 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "ffc-pay-web",
- "version": "1.20.21",
+ "version": "1.20.22",
"description": "FFC payment management service",
"homepage": "https://github.com/DEFRA/ffc-pay-web",
"main": "app/index.js",
diff --git a/test/integration/narrow/routes/holds.test.js b/test/integration/narrow/routes/holds.test.js
index a53bab2..30abc43 100644
--- a/test/integration/narrow/routes/holds.test.js
+++ b/test/integration/narrow/routes/holds.test.js
@@ -96,7 +96,8 @@ describe('Payment holds', () => {
expect(holdCells.eq(1).text()).toEqual(mockPaymentHolds[i].holdCategoryName)
expect(holdCells.eq(2).text()).toEqual(mockPaymentHolds[i].holdCategorySchemeName)
expect(holdCells.eq(3).text()).toEqual(mockPaymentHolds[i].marketingYear)
- expect(holdCells.eq(4).text()).toEqual(mockPaymentHolds[i].dateTimeAdded)
+ expect(holdCells.eq(4).text()).toEqual(mockPaymentHolds[i].agreementNumber)
+ expect(holdCells.eq(5).text()).toEqual(mockPaymentHolds[i].dateTimeAdded)
})
})
|