From 1cafcc4e34d9f572dea14b86c6fbfc9f19a6d4e0 Mon Sep 17 00:00:00 2001 From: odscjen Date: Thu, 2 May 2024 12:17:02 +0100 Subject: [PATCH 1/2] add payee and paymentAddress fields --- README.md | 18 ++++++++++++++++-- release-schema.json | 10 ++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 99ee50d..cd96a68 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,16 @@ A contracting process where fees are applied to access bidding documents and to "methodOfPayment": [ "wireTransfer", "cheque" - ] + ], + "payee": { + "id": "ORG-0001", + "name": "Highway Division" + }, + "paymentAddress": { + "locality": "Jawali", + "region": "Himachal Pradesh", + "countryName": "India" + } }, { "id": "2", @@ -45,7 +54,11 @@ A contracting process where fees are applied to access bidding documents and to "description": "Fee payable within e-procurement system.", "methodOfPayment": [ "wireTransfer" - ] + ], + "payee": { + "id": "ORG-0001", + "name": "Highway Division" + } } ] } @@ -88,6 +101,7 @@ Report issues for this extension in the [ocds-extensions repository](https://git * Make `ParticipationFee.id` required so that participation fees are merged by identifier * Add `relativeValue` field +* Add `payee` and `paymentAddress` fields ### v1.1.5 diff --git a/release-schema.json b/release-schema.json index 77db891..2127bce 100644 --- a/release-schema.json +++ b/release-schema.json @@ -63,6 +63,16 @@ "codelist": "methodOfPayment.csv", "openCodelist": true, "uniqueItems": true + }, + "payee": { + "title": "Payee", + "description": "The organization that receives the participation fees.", + "$ref": "#/definitions/OrganizationReference" + }, + "paymentAddress": { + "title": "Payment address", + "description": "The address to which non-electronic participation fees should be submitted.", + "$ref": "#/definitions/Address" } } }, From c32a7283f6a2a3531f5cf5827be895fbf03deb10 Mon Sep 17 00:00:00 2001 From: odscjen Date: Fri, 3 May 2024 09:18:55 +0100 Subject: [PATCH 2/2] apply review suggestions --- README.md | 6 ++++-- release-schema.json | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index cd96a68..548969c 100644 --- a/README.md +++ b/README.md @@ -100,8 +100,10 @@ Report issues for this extension in the [ocds-extensions repository](https://git ### Unreleased * Make `ParticipationFee.id` required so that participation fees are merged by identifier -* Add `relativeValue` field -* Add `payee` and `paymentAddress` fields +* Add fields: + * `relativeValue` + * `payee` + * `paymentAddress` ### v1.1.5 diff --git a/release-schema.json b/release-schema.json index 2127bce..ea3fabe 100644 --- a/release-schema.json +++ b/release-schema.json @@ -51,7 +51,7 @@ ] }, "methodOfPayment": { - "title": "Method(s) of payment", + "title": "Payment methods", "description": "The accepted ways in which fees can be paid.", "type": [ "array", @@ -64,15 +64,15 @@ "openCodelist": true, "uniqueItems": true }, - "payee": { - "title": "Payee", - "description": "The organization that receives the participation fees.", - "$ref": "#/definitions/OrganizationReference" - }, "paymentAddress": { "title": "Payment address", - "description": "The address to which non-electronic participation fees should be submitted.", + "description": "The physical address to which to submit non-electronic participation payments.", "$ref": "#/definitions/Address" + }, + "payee": { + "title": "Payee", + "description": "The organization that receives the participation fee.", + "$ref": "#/definitions/OrganizationReference" } } },