Merge pull request #6 from open-contracting-extensions/169_add_address

add nonElectronicSubmissionAddress object
open-contracting-extensions · Nov 28, 2023 · b666394 · b666394
2 parents fcf4c21 + b945435
commit b666394
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,6 @@ In the European Union, this extension's fields correspond to [eForms BG-102 (Sub
   "tender": {
     "submissionTerms": {
       "electronicSubmissionPolicy": "notAllowed",
-      "nonElectronicSubmissionRationale": "Inclusion of a physical model",
       "advancedElectronicSignatureRequired": false,
       "electronicCataloguePolicy": "notAllowed",
       "variantPolicy": "notAllowed",
@@ -30,7 +29,17 @@ In the European Union, this extension's fields correspond to [eForms BG-102 (Sub
       "depositsGuarantees": "An on-demand performance bond issued by an entity that the Contracting Entity judges to be acceptable (e.g. a bank or insurance company) and whose value is a percentage of the total contract price.",
       "subcontractingClauses": [
         "subc-oblig"
-      ]
+      ],
+      "nonElectronicSubmission": {
+        "address": {
+          "streetAddress": "Town Hall, St Aldate's",
+          "region": "Oxfordshire",
+          "locality": "Oxford",
+          "postalCode": "OX1 1BX",
+          "countryName": "United Kingdom"
+        },
+        "rationale": "Inclusion of a physical model"
+      }
     }
   }
 }
@@ -42,6 +51,11 @@ Report issues for this extension in the [ocds-extensions repository](https://git
 
 ## Changelog
 
+### 2023-10-20
+
+* Add `SubmissionTerms.nonElectronicSubmission` field.
+* Remove `SubmissionTerms.nonElectronicSubmissionRationale` field.
+
 ### 2023-06-07
 
 * Define "electronic catalog" for the `electronicCataloguePolicy` field.

diff --git a/release-schema.json b/release-schema.json
@@ -115,15 +115,6 @@
             "null"
           ]
         },
-        "nonElectronicSubmissionRationale": {
-          "title": "Non-electronic submission rationale",
-          "description": "The rationale for electronic submission not being allowed.",
-          "type": [
-            "string",
-            "null"
-          ],
-          "minLength": 1
-        },
         "subcontractingClauses": {
           "title": "Subcontracting clauses",
           "description": "The information about subcontracting that needs to be provided in the bid.",
@@ -137,6 +128,28 @@
           },
           "uniqueItems": true,
           "minItems": 1
+        },
+        "nonElectronicSubmission": {
+          "title": "Non-electronic submission",
+          "description": "Information about non-electronic submission requirements.",
+          "type": "object",
+          "properties": {
+            "rationale": {
+              "title": "Rationale",
+              "description": "The rationale for electronic submission not being allowed.",
+              "type": [
+                "string",
+                "null"
+              ],
+              "minLength": 1
+            },
+            "address": {
+              "title": "Address",
+              "description": "The address to which non-electronic bids should be submitted.",
+              "$ref": "#/definitions/Address"
+            }
+          },
+          "minProperties": 1
         }
       },
       "minProperties": 1