diff --git a/docs/source/contracting/http/example_tender.http b/docs/source/contracting/http/example_tender.http index 0fff5e0ca7..1bee6e733b 100644 --- a/docs/source/contracting/http/example_tender.http +++ b/docs/source/contracting/http/example_tender.http @@ -10,13 +10,13 @@ X-Content-Type-Options: nosniff "procurementMethod": "open", "status": "complete", "awardPeriod": { - "startDate": "2020-08-29T01:00:00+03:00", - "endDate": "2020-08-29T01:00:00+03:00" + "startDate": "2020-09-05T01:00:00.022147+03:00", + "endDate": "2020-09-05T01:00:00.022811+03:00" }, "mainProcurementCategory": "goods", "enquiryPeriod": { - "startDate": "2020-08-13T01:00:00+03:00", - "endDate": "2020-08-21T01:00:00+03:00" + "startDate": "2020-08-25T01:00:00.018142+03:00", + "endDate": "2020-08-31T01:00:00.018786+03:00" }, "submissionMethod": "electronicAuction", "procuringEntity": { @@ -47,8 +47,8 @@ X-Content-Type-Options: nosniff "dateModified": "2020-09-08T01:00:01+03:00", "numberOfBids": 1, "tenderPeriod": { - "startDate": "2020-08-21T01:00:00+03:00", - "endDate": "2020-08-28T01:00:00+03:00" + "startDate": "2020-08-31T01:00:00.019431+03:00", + "endDate": "2020-09-04T01:00:00.020073+03:00" }, "contracts": [ { @@ -156,8 +156,8 @@ X-Content-Type-Options: nosniff } ], "auctionPeriod": { - "startDate": "2020-08-28T01:00:00+03:00", - "endDate": "2020-08-29T01:00:00+03:00" + "startDate": "2020-09-04T01:00:00.020778+03:00", + "endDate": "2020-09-05T01:00:00.021405+03:00" }, "procurementMethodType": "belowThreshold", "awards": [ diff --git a/docs/source/locale/uk/LC_MESSAGES/tendering/basic-actions/bidding.po b/docs/source/locale/uk/LC_MESSAGES/tendering/basic-actions/bidding.po index e8a50c1532..005dbfd255 100644 --- a/docs/source/locale/uk/LC_MESSAGES/tendering/basic-actions/bidding.po +++ b/docs/source/locale/uk/LC_MESSAGES/tendering/basic-actions/bidding.po @@ -19,6 +19,18 @@ msgstr "Операції для учасників закупівлі" msgid "Registration of Bid proposal" msgstr "Реєстрація цінової пропозиції " +msgid "Also documents could be uploaded if:" +msgstr "Також можливо завантажувати документи за таких умов:" + +msgid "exists `award` in status `active`" +msgstr "є `award` в статусі `active`" + +msgid "tender has criterion `CRITERION.OTHER.CONTRACT.GUARANTEE`" +msgstr "у тенедра наявний критерій `CRITERION.OTHER.CONTRACT.GUARANTEE`" + +msgid "document has type `contractGuarantees`" +msgstr "документ має тип `contractGuarantees`" + msgid "Uploading Bid documents" msgstr "Завантаження документів пропозиції" diff --git a/docs/source/tendering/basic-actions/bidding.rst b/docs/source/tendering/basic-actions/bidding.rst index 64268b43cc..a19f5dbda4 100644 --- a/docs/source/tendering/basic-actions/bidding.rst +++ b/docs/source/tendering/basic-actions/bidding.rst @@ -15,6 +15,14 @@ Registration of Bid proposal HTTP/1.1 201 Created Location: /tenders/64e93250be76435397e8c992ed4214d1/bids/4879d3f8ee2443169b5fbbc9f89fa607 +Also documents could be uploaded if: + - exists `award` in status `active` + - tender has criterion `CRITERION.OTHER.CONTRACT.GUARANTEE` + - document has type `contractGuarantees` + +.. include:: ../http/criteria/add-bid-document-with-active-award.http + :code: + Uploading Bid documents ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/source/tendering/http/criteria/add-bid-document-with-active-award.http b/docs/source/tendering/http/criteria/add-bid-document-with-active-award.http new file mode 100644 index 0000000000..ae350c6809 --- /dev/null +++ b/docs/source/tendering/http/criteria/add-bid-document-with-active-award.http @@ -0,0 +1,35 @@ +POST /api/2.5/tenders/24660b6d159d42adb6aaba9d978575c7/bids/7d0b2418ff254e1c827ffe021c832900/documents?acc_token=f0760e708e124c8fb9f34e562dbf59cf HTTP/1.0 +Authorization: Bearer token +Content-Length: 1551 +Content-Type: application/json +Host: lb-api-sandbox.prozorro.gov.ua +DATA: +{ + "data": { + "hash": "md5:00000000000000000000000000000000", + "description": "document description modified", + "title": "Notice.pdf", + "url": "http://public-docs-sandbox.prozorro.gov.ua/get/989723c05a4246dfa9199c3727deb4a6?KeyID=a8968c46&Signature=y87Tei%252BRdqEID6fl815tazVP1pwISubhiT5bdGHlJEPuxxPlYcYebcmQHc3SVjf%252Bmznstx8QJ19JB7s8tQ6yCQ%253D%253D", + "format": "application/pdf", + "documentOf": "tender", + "author": "tender_owner", + "documentType": "contractGuarantees" + } +} + +Response: 201 Created +Content-Type: application/json; charset=UTF-8 +{ + "data": { + "hash": "md5:00000000000000000000000000000000", + "description": "document description modified", + "title": "Notice.pdf", + "url": "http://public-docs-sandbox.prozorro.gov.ua/get/989723c05a4246dfa9199c3727deb4a6?KeyID=a8968c46&Signature=RknHmCXe1C0T0rP4bqC%2FqybCY9mL8hD6Dj7IQuhLLET6hzGrSV4kuDo0XooVwu2rqKYCdVGKOqr0us8W8RLSBw%253D%253D", + "format": "application/pdf", + "documentOf": "tender", + "datePublished": "2021-01-10T23:06:03.375403+02:00", + "documentType": "contractGuarantees", + "id": "89f61e167b004d8ebc8038b16341db8a", + "dateModified": "2021-01-10T23:06:03.375436+02:00" + } +} diff --git a/docs/source/tendering/http/criteria/add-requirement-response-from-bid.http b/docs/source/tendering/http/criteria/add-requirement-response-from-bid.http index b6cd09f8cf..9ce4cd894f 100644 --- a/docs/source/tendering/http/criteria/add-requirement-response-from-bid.http +++ b/docs/source/tendering/http/criteria/add-requirement-response-from-bid.http @@ -49,8 +49,3 @@ DATA: } } -Response: 200 OK -Content-Type: application/json -X-Content-Type-Options: nosniff -null - diff --git a/docs/source/tendering/http/criteria/update-tender-status-without-criteria.http b/docs/source/tendering/http/criteria/update-tender-status-without-criteria.http index c4996294ec..4b06dde887 100644 --- a/docs/source/tendering/http/criteria/update-tender-status-without-criteria.http +++ b/docs/source/tendering/http/criteria/update-tender-status-without-criteria.http @@ -10,17 +10,3 @@ DATA: } } -Response: 403 Forbidden -Content-Type: application/json -X-Content-Type-Options: nosniff -{ - "status": "error", - "errors": [ - { - "description": "Tender must contain all 9 `EXCLUSION` criteria", - "location": "body", - "name": "data" - } - ] -} -