diff --git a/docs.py b/docs.py old mode 100755 new mode 100644 index fb84f27..d5df081 --- a/docs.py +++ b/docs.py @@ -2,22 +2,25 @@ # -*- coding: utf-8 -*- import json import os -from datetime import timedelta, datetime +from datetime import timedelta -from openprocurement.auctions.core.utils import get_now from openprocurement.auctions.core.tests.base import PrefixedRequestClass import openprocurement.auctions.lease.tests.base as base_test -from openprocurement.auctions.lease.constants import DEFAULT_PROCUREMENT_METHOD_TYPE_FINANCIAL -from openprocurement.auctions.lease.tests.base import test_auction_data as base_test_auction_data, test_bids, test_financial_bids +from openprocurement.auctions.lease.constants import DEFAULT_PROCUREMENT_METHOD_TYPE_LEASE +from openprocurement.auctions.lease.tests.base import ( + test_auction_data as base_test_auction_data, test_bids +) from openprocurement.auctions.lease.tests.base import test_auction_maximum_data from openprocurement.auctions.lease.tests.tender import BaseAuctionWebTest from webtest import TestApp +from openprocurement.auctions.core.utils import ( + apply_data_patch, get_now, SANDBOX_MODE +) -now = datetime.now() +now = get_now() test_auction_data = base_test_auction_data.copy() -test_financial_auction_data = test_auction_data.copy() -test_financial_auction_data["procurementMethodType"] = DEFAULT_PROCUREMENT_METHOD_TYPE_FINANCIAL +test_auction_data["procurementMethodType"] = DEFAULT_PROCUREMENT_METHOD_TYPE_LEASE bid = { "data": { @@ -187,8 +190,9 @@ def generate_docservice_url(self): def test_docs_acceleration(self): # SANDBOX_MODE=TRUE data = test_auction_data.copy() - data['procurementMethodDetails'] = 'quick, accelerator=1440' - data['submissionMethodDetails'] = 'quick' + if SANDBOX_MODE: + data['procurementMethodDetails'] = 'quick, accelerator=1440' + data['submissionMethodDetails'] = 'quick' data['mode'] = 'test' data["auctionPeriod"] = { "startDate": (now + timedelta(days=12)).isoformat() @@ -320,6 +324,8 @@ def test_docs_tutorial(self): # Uploading documentation # + self.set_status("active.tendering") + with open('docs/source/tutorial/upload-auction-notice.http', 'w') as self.app.file_obj: response = self.app.post_json('/auctions/{}/documents?acc_token={}'.format(self.auction_id, owner_token), {'data': { @@ -1236,137 +1242,3 @@ def _test_docs_complaints(self): response = self.app.get('/auctions/{}/awards'.format( self.auction_id, award_id)) self.assertEqual(response.status, '200 OK') - - def test_docs_fintutorial(self): - request_path = '/auctions?opt_pretty=1' - - # Creating auction - # - - with open('docs/source/tutorial/finauction-post-attempt-json-data.http', 'w') as self.app.file_obj: - response = self.app.post_json( - '/auctions?opt_pretty=1', {"data": test_financial_auction_data}) - self.assertEqual(response.status, '201 Created') - - auction = response.json['data'] - owner_token = response.json['access']['token'] - - with open('docs/source/tutorial/blank-finauction-view.http', 'w') as self.app.file_obj: - response = self.app.get('/auctions/{}'.format(auction['id'])) - self.assertEqual(response.status, '200 OK') - - self.app.get('/auctions') - with open('docs/source/tutorial/initial-finauction-listing.http', 'w') as self.app.file_obj: - response = self.app.get('/auctions') - self.assertEqual(response.status, '200 OK') - - self.app.authorization = ('Basic', ('broker', '')) - self.auction_id = auction['id'] - - # Uploading documentation - # - - with open('docs/source/tutorial/upload-finauction-notice.http', 'w') as self.app.file_obj: - response = self.app.post_json('/auctions/{}/documents?acc_token={}'.format(self.auction_id, owner_token), - {'data': { - 'title': u'Notice.pdf', - 'url': self.generate_docservice_url(), - 'hash': 'md5:' + '0' * 32, - 'format': 'application/pdf', - "documentType": "technicalSpecifications", - "description": "technical specification" - }}) - self.assertEqual(response.status, '201 Created') - - doc_id = response.json["data"]["id"] - with open('docs/source/tutorial/finauction-documents.http', 'w') as self.app.file_obj: - response = self.app.get('/auctions/{}/documents/{}'.format( - self.auction_id, doc_id)) - self.assertEqual(response.status, '200 OK') - - with open('docs/source/tutorial/finauction-upload-award-criteria.http', 'w') as self.app.file_obj: - response = self.app.post_json('/auctions/{}/documents?acc_token={}'.format(self.auction_id, owner_token), - {'data': { - 'title': u'AwardCriteria.pdf', - 'url': self.generate_docservice_url(), - 'hash': 'md5:' + '0' * 32, - 'format': 'application/pdf', - }}) - self.assertEqual(response.status, '201 Created') - - doc_id = response.json["data"]["id"] - - with open('docs/source/tutorial/finauction-documents-2.http', 'w') as self.app.file_obj: - response = self.app.get('/auctions/{}/documents'.format( - self.auction_id)) - self.assertEqual(response.status, '200 OK') - - with open('docs/source/tutorial/finauction-update-award-criteria.http', 'w') as self.app.file_obj: - response = self.app.put_json('/auctions/{}/documents/{}?acc_token={}'.format(self.auction_id, doc_id, owner_token), - {'data': { - 'title': u'AwardCriteria-2.pdf', - 'url': self.generate_docservice_url(), - 'hash': 'md5:' + '0' * 32, - 'format': 'application/pdf', - }}) - self.assertEqual(response.status, '200 OK') - - with open('docs/source/tutorial/finauction-documents-3.http', 'w') as self.app.file_obj: - response = self.app.get('/auctions/{}/documents'.format( - self.auction_id)) - self.assertEqual(response.status, '200 OK') - - with open('docs/source/tutorial/finauction-adding-vdr.http', 'w') as self.app.file_obj: - response = self.app.post_json('/auctions/{}/documents?acc_token={}'.format(self.auction_id, owner_token), - {'data': { - 'title': u'VDR for auction lot', - 'url': 'http://virtial-data-room.com/id_of_room', - 'documentType': 'virtualDataRoom', - }}) - self.assertEqual(response.status, '201 Created') - - # Registering bid - # - - self.app.authorization = ('Basic', ('broker', '')) - bids_access = {} - with open('docs/source/tutorial/register-finbidder.http', 'w') as self.app.file_obj: - response = self.app.post_json('/auctions/{}/bids'.format( - self.auction_id), {'data': test_financial_bids[0]}) - bid1_id = response.json['data']['id'] - bids_access[bid1_id] = response.json['access']['token'] - self.assertEqual(response.status, '201 Created') - - with open('docs/source/tutorial/activate-finbidder.http', 'w') as self.app.file_obj: - response = self.app.patch_json('/auctions/{}/bids/{}?acc_token={}'.format( - self.auction_id, bid1_id, bids_access[bid1_id]), {"data": {"status": "active"}}) - self.assertEqual(response.status, '200 OK') - - # Proposal Uploading - # - - with open('docs/source/tutorial/upload-finbid-financial-license.http', 'w') as self.app.file_obj: - response = self.app.post_json('/auctions/{}/bids/{}/documents?acc_token={}'.format(self.auction_id, bid1_id, bids_access[bid1_id]), - {'data': { - 'title': u'FinancialLicense.pdf', - 'url': self.generate_docservice_url(), - 'hash': 'md5:' + '0' * 32, - 'format': 'application/pdf', - "documentType": "financialLicense", - }}) - self.assertEqual(response.status, '201 Created') - - with open('docs/source/tutorial/finbidder-documents.http', 'w') as self.app.file_obj: - response = self.app.get('/auctions/{}/bids/{}/documents?acc_token={}'.format( - self.auction_id, bid1_id, bids_access[bid1_id])) - self.assertEqual(response.status, '200 OK') - - # Second bidder registration - # - - with open('docs/source/tutorial/register-2nd-finbidder.http', 'w') as self.app.file_obj: - response = self.app.post_json('/auctions/{}/bids'.format( - self.auction_id), {'data': test_financial_bids[1]}) - bid2_id = response.json['data']['id'] - bids_access[bid2_id] = response.json['access']['token'] - self.assertEqual(response.status, '201 Created') diff --git a/docs/source/award_workflow.rst b/docs/source/award_workflow.rst index 9bfaf1d..012dbb4 100644 --- a/docs/source/award_workflow.rst +++ b/docs/source/award_workflow.rst @@ -3,7 +3,7 @@ Award Workflow ============== -For a more detailed information see :ref:`award` +For a more detailed information see :ref:`Award` * :ref:`Qualification` * :ref:`Confirming_qualification` diff --git a/docs/source/conf.py b/docs/source/conf.py index 6c79199..8d9a067 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- # -# openprocurement.auctions.dgf documentation build configuration file, created by -# sphinx-quickstart on Wed Oct 1 02:29:13 2014. +# openprocurement.auctions.lease documentation build configuration file, created by +# sphinx-quickstart on Wed Oct 1 02:29:13 2014; +# manually modified in May 2018. # # This file is execfile()d with the current directory set to its # containing dir. @@ -31,7 +32,7 @@ # ones. import cornice extensions = [ - 'cornice.ext.sphinxext', + # 'cornice.ext.sphinxext', disabled due to import error 'sphinx.ext.intersphinx', 'sphinx.ext.graphviz', 'sphinxcontrib.httpdomain', @@ -50,8 +51,8 @@ master_doc = 'index' # General information about the project. -project = u'openprocurement.auctions.dgf' -copyright = u'2016, Quintagroup, Ltd' +project = u'openprocurement.auctions.lease' +copyright = u'2018, Quintagroup, Ltd' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -183,7 +184,7 @@ #html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'openprocurementauctionsdgfdoc' +htmlhelp_basename = 'openprocurementauctionsleasedoc' # -- Options for LaTeX output --------------------------------------------- @@ -203,7 +204,7 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('index', 'openprocurementauctionsdgf.tex', u'openprocurement.auctions.dgf Documentation', + ('index', 'openprocurementauctionslease.tex', u'openprocurement.auctions.lease Documentation', u'Myroslav Opyr', 'manual'), ] @@ -233,7 +234,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'openprocurementauctionsdgf', u'openprocurement.auctions.dgf Documentation', + ('index', 'openprocurementauctionslease', u'openprocurement.auctions.lease Documentation', [u'Myroslav Opyr'], 1) ] @@ -247,8 +248,8 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'openprocurementauctionsdgf', u'openprocurement.auctions.dgf Documentation', - u'Myroslav Opyr', 'openprocurementauctionsdgf', 'One line description of project.', + ('index', 'openprocurementauctionslease', u'openprocurement.auctions.lease Documentation', + u'Myroslav Opyr', 'openprocurementauctionslease', 'One line description of project.', 'Miscellaneous'), ] diff --git a/docs/source/fintutorial.rst b/docs/source/fintutorial.rst deleted file mode 100644 index e655323..0000000 --- a/docs/source/fintutorial.rst +++ /dev/null @@ -1,146 +0,0 @@ -.. _fintutorial: - -Fin. Tutorial -============= - -Tutorial for the `dgfFinancialAssets` procedure. - -Creating auction ----------------- - -Let's create auction with the minimal data set (only required properties): - -.. include:: tutorial/finauction-post-attempt-json-data.http - :code: - -Success! Now we can see that new object has been created. Response code is `201` -and `Location` response header reports the location of the created object. The -body of response reveals the information about the created auction: its internal -`id` (that matches the `Location` segment), its official `auctionID` and -`dateModified` datestamp stating the moment in time when auction has been last -modified. Pay attention to the `procurementMethodType`. Note that auction is -created with `active.tendering` status. - -Let's access the URL of the created object (the `Location` header of the response): - -.. include:: tutorial/blank-finauction-view.http - :code: - -We can see the same response we got after creating auction. - -Let's see what listing of auctions reveals us: - -.. include:: tutorial/initial-finauction-listing.http - :code: - -We do see the auction's internal `id` (that can be used to construct full URL by prepending `https://api-sandbox.ea.openprocurement.org/api/0/auctions/`) and its `dateModified` datestamp. - -.. index:: Document, VDR - -Uploading documentation ------------------------ - -Organizer can upload PDF files into the created auction. Uploading should -follow the :ref:`upload` rules. - -.. include:: tutorial/upload-finauction-notice.http - :code: - -`201 Created` response code and `Location` header confirm document creation. -We can additionally query the `documents` collection API endpoint to confirm the -action: - -.. include:: tutorial/finauction-documents.http - :code: - -The single array element describes the uploaded document. We can upload more documents: - -.. include:: tutorial/finauction-upload-award-criteria.http - :code: - -And again we can confirm that there are two documents uploaded. - -.. include:: tutorial/finauction-documents-2.http - :code: - -In case we made an error, we can reupload the document over the older version: - -.. include:: tutorial/finauction-update-award-criteria.http - :code: - -And we can see that it is overriding the original version: - -.. include:: tutorial/finauction-documents-3.http - :code: - -Uploading illustration ------------------------ - -Organizer can upload illustration files into the created auction. Uploading should -follow the :ref:`upload` rules. - -In order to specify illustration display order, ``index`` field can be used (for details see :ref:`document`). Since this illustration should be displayed first, it has ``"index": 1``. - -.. include:: tutorial/upload-first-auction-illustration.http - :code: - -We can check whether illustration is uploaded. - -.. include:: tutorial/auction-documents-4.http - :code: - -Organizer can upload second illustration. This illustration should be displayed second, so it has ``"index": 2``. - -.. include:: tutorial/upload-second-auction-illustration.http - :code: - -Add third illustration: - -.. include:: tutorial/upload-third-auction-illustration.http - :code: - -Note that `index` of the third illustration is the same as for the second illustration: ``"index": 2``. In such cases firstly will be displayed illustration that was uploaded earlier. - -We can check that there are three uploaded illustrations. - -.. include:: tutorial/auction-documents-5.http - :code: - -Adding virtual data room ------------------------- - -Organizer can add URL for virtual data room: - -.. include:: tutorial/finauction-adding-vdr.http - :code: - - -.. index:: Bidding - -Registering bid ---------------- - -Bidder can register a bid in `draft` status. Bidder must specify ``UA-FIN`` value for the `additionalIdentifiers` parameter. - -.. include:: tutorial/register-finbidder.http - :code: - -And activate a bid: - -.. include:: tutorial/activate-finbidder.http - :code: - -And upload license (with ``documentType: financialLicense``): - -.. include:: tutorial/upload-finbid-financial-license.http - :code: - -It is possible to check the uploaded documents: - -.. include:: tutorial/finbidder-documents.http - :code: - -For the best effect (biggest economy) auction should have multiple bidders registered: - -.. include:: tutorial/register-2nd-finbidder.http - :code: diff --git a/docs/source/index.rst b/docs/source/index.rst index 68775e4..c197314 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -26,7 +26,6 @@ Contents: upload award_workflow tutorial - fintutorial 2pc acceleration diff --git a/docs/source/locale/uk/LC_MESSAGES/2pc.po b/docs/source/locale/uk/LC_MESSAGES/2pc.po index fd70e00..7c3c328 100644 --- a/docs/source/locale/uk/LC_MESSAGES/2pc.po +++ b/docs/source/locale/uk/LC_MESSAGES/2pc.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-10-20 15:07+0200\n" diff --git a/docs/source/locale/uk/LC_MESSAGES/acceleration.po b/docs/source/locale/uk/LC_MESSAGES/acceleration.po index ee226cf..5140127 100644 --- a/docs/source/locale/uk/LC_MESSAGES/acceleration.po +++ b/docs/source/locale/uk/LC_MESSAGES/acceleration.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-16 18:19+0200\n" diff --git a/docs/source/locale/uk/LC_MESSAGES/award_workflow.po b/docs/source/locale/uk/LC_MESSAGES/award_workflow.po index fa97bf1..8559b84 100644 --- a/docs/source/locale/uk/LC_MESSAGES/award_workflow.po +++ b/docs/source/locale/uk/LC_MESSAGES/award_workflow.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 1.0.5\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-12-16 17:10+0200\n" "PO-Revision-Date: 2017-02-16 13:34+0200\n" @@ -14,43 +14,33 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/award_workflow.rst:4 msgid "Award Workflow" msgstr "Схема роботи кваліфікації" -#: ../../source/award_workflow.rst:6 -msgid "For a more detailed information see :ref:`award`" -msgstr "Для більш детальної інформації зверніться до секції :ref:`award`" +msgid "For a more detailed information see :ref:`Award`" +msgstr "Для більш детальної інформації зверніться до секції :ref:`Award`" -#: ../../source/award_workflow.rst:8 msgid ":ref:`Qualification`" msgstr "" -#: ../../source/award_workflow.rst:9 msgid ":ref:`Confirming_qualification`" msgstr "" -#: ../../source/award_workflow.rst:10 msgid ":ref:`Candidate_disqualification`" msgstr "" -#: ../../source/award_workflow.rst:11 msgid ":ref:`Waiting_refusal`" msgstr "" -#: ../../source/award_workflow.rst:62 msgid "Roles" msgstr "Ролі" -#: ../../source/award_workflow.rst:66 msgid "dashed" msgstr "пунктирна лінія" -#: ../../source/award_workflow.rst:90 msgid "Statuses" msgstr "Статуси" -#: ../../source/award_workflow.rst:93 msgid "" "The second highest valid bidder awaits for the qualification of the first " "highest valid bidder. The former can choose to refuse to wait and withdraw " @@ -61,7 +51,6 @@ msgstr "" " не чекати, та забрати свій гарантійний внесок, автоматично " "дискваліфікувавшись." -#: ../../source/award_workflow.rst:96 msgid "" "Terminal status. The second highest valid bidder chose to withdraw his " "security deposit and not to wait for the highest valid bidder to be " @@ -71,7 +60,6 @@ msgstr "" "забрати свій гарантійний внесок та не чекати на дискваліфікацію учасника з " "найвищою ставкою." -#: ../../source/award_workflow.rst:99 msgid "" "Awaiting protocol upload and confirmation by the liquidator. The highest " "valid bidder is able to submit the protocol as well, although it is not " @@ -81,7 +69,6 @@ msgstr "" "найвищою валідною ставкою може також завантажити протокол, але цього " "недостатньо для переходу до наступного статусу." -#: ../../source/award_workflow.rst:102 msgid "" "Awaiting payment. Organizer can change the status to active by confirming " "the payment has been received." @@ -150,7 +137,6 @@ msgstr "" msgid "Notes" msgstr "Примітки" -#: ../../source/award_workflow.rst:108 msgid "" "Terminal status. The auction was unsuccessful. Can be switched to either " "automatically, from any of the previous statuses or by the organizer." @@ -159,31 +145,24 @@ msgstr "" "здійснене ліквідатором, або автоматично по закінченню відповідно-" "передбачених періодів." -#: ../../source/award_workflow.rst:46 msgid "Legend" msgstr "Умовні Позначення" -#: ../../source/award_workflow.rst:48 msgid "Blue nodes represent statuses for the 2nd award ONLY" msgstr "Світло-сині об'єкти на рисунку відображають статуси лише для award #2" -#: ../../source/award_workflow.rst:50 msgid "\\* no protocol" msgstr "\\* протокол відсутній" -#: ../../source/award_workflow.rst:52 msgid "\\*\\* protocol required" msgstr "\\*\\* необхідний протокол аукціону" -#: ../../source/award_workflow.rst:54 msgid "\\*\\*\\* payment approved by the organizer" msgstr "\\*\\*\\* отримання оплати підтвердженно організатором" -#: ../../source/award_workflow.rst:68 msgid "dotted" msgstr "лінія з крапками" -#: ../../source/award_workflow.rst:72 msgid "Procedure Description" msgstr "Опис Процедури" @@ -196,7 +175,6 @@ msgstr "" "дорівнювати або бути більшою ніж стартова ціна аукціону + мінімальний крок " "(т.зв. валідна ставка). " -#: ../../source/award_workflow.rst:82 msgid "" "1.1. In case the first two highest bids do not exceed the amount of starting" " price + the minimal step, the awards are not being formed at all, and the " @@ -207,7 +185,6 @@ msgstr "" "формуються взагалі, а процедура кваліфікації переходить в статус неуспішної " "(\"unsuccessful)." -#: ../../source/award_workflow.rst:76 msgid "" "The second highest qualifying bidder, immediately after the auction ending " "receives the \"pending.waiting\" status, in which by default he/she agrees " @@ -237,11 +214,9 @@ msgstr "" "він проходить процедуру кваліфікації по такому самому принципу як і перший " "авард. " -#: ../../source/award_workflow.rst:79 msgid "Notes" msgstr "Примітки" -#: ../../source/award_workflow.rst:80 msgid "" "For the bidder to be qualified and not invalidated, his/her bid should be in" " the amount of more or equal to the starting price of the auction + the " @@ -251,7 +226,6 @@ msgstr "" "дорівнювати або бути більшою ніж стартова ціна аукціону + мінімальний крок " "(т.зв. валідна ставка)" -#: ../../source/award_workflow.rst:84 msgid "" "1.2 In case the second highest bid is smaller than the starting price + the " "minimal step, two awards are formed with the smaller one becoming " @@ -265,7 +239,6 @@ msgstr "" "більша ніж стартова ціна аукціону + мінімальний крок) проходить через " "процедуру кваліфікації та може стати переможною." -#: ../../source/award_workflow.rst:85 msgid "" "The organizer can disqualify the award at any stage of the awarding process " "up until the moment, when the contract has been uploaded and activated in " @@ -275,7 +248,6 @@ msgstr "" "процесу кваліфікації аж до моменту завантаження та активування контракту в " "системі." -#: ../../source/award_workflow.rst:86 msgid "" "The second highest qualifying bidder can disqualify himself/herself at any " "point in time BEFORE the start of his/her qualification process." @@ -284,21 +256,17 @@ msgstr "" " аукціону) може самодискваліфікуватись в будь-який момент часу ПЕРЕД " "початком його кваліфікації." -#: ../../source/award_workflow.rst:64 msgid "solid" msgstr "суцільна лінія" -#: ../../source/award_workflow.rst:56 msgid "\\*\\*\\*\\* no payment approval" msgstr "\\*\\*\\*\\* немає підтвердження оплати" -#: ../../source/award_workflow.rst:58 msgid "\\*\\*\\*\\*\\* contract activation = false by the end of \"signingPeriod\"" msgstr "" "\\*\\*\\*\\*\\* контракт не було активовано в системі до завершення періоду " "підписання контракту" -#: ../../source/award_workflow.rst:105 msgid "" "Awaiting for the contract to be signed (uploaded and activated in the system" " by the organizer). After the end of the \"signingPeriod\", the status " @@ -308,7 +276,6 @@ msgstr "" "системі організатором). Після закінчення періоду підписання " "(\"signingPeriod\"), статус \"active\" стає термінальним." -#: ../../source/award_workflow.rst:75 msgid "" "It is then when the qualification procedure enters the \"paymentPeriod\" " "stage, which lasts up to 20 days from the beginning of the highest bidder " @@ -343,7 +310,6 @@ msgstr "" "валідною ставкою (у випадку якщо до того моменту другий авард не " "самодискваліфікувався)." -#: ../../source/award_workflow.rst:74 msgid "" "The award with the highest qualifying bid initially receives a " "\"pending.verification\" status. The procedure enters the " diff --git a/docs/source/locale/uk/LC_MESSAGES/fintutorial.po b/docs/source/locale/uk/LC_MESSAGES/fintutorial.po deleted file mode 100644 index d02e6c9..0000000 --- a/docs/source/locale/uk/LC_MESSAGES/fintutorial.po +++ /dev/null @@ -1,188 +0,0 @@ -# -msgid "" -msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-16 16:42+0300\n" -"PO-Revision-Date: 2016-09-20 17:47+0200\n" -"Last-Translator: Zoriana Zaiats \n" -"Language-Team: Ukrainian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: uk\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 2.0\n" - -msgid "Fin. Tutorial" -msgstr "Фін. туторіал" - -msgid "Creating auction" -msgstr "Створення аукціону" - -msgid "" -"Let's create auction with the minimal data set (only required properties):" -msgstr "" -"Створимо аукціон з мінімально допустимим (обовязковим для заповнення) " -"набором даних:" - -msgid "" -"Success! Now we can see that new object has been created. Response code is " -"`201` and `Location` response header reports the location of the created " -"object. The body of response reveals the information about the created " -"auction: its internal `id` (that matches the `Location` segment), its " -"official `auctionID` and `dateModified` datestamp stating the moment in time" -" when auction has been last modified. Pay attention to the " -"`procurementMethodType`. Note that auction is created with " -"`active.tendering` status." -msgstr "" -"Успіх! Тепер ми бачимо, що новий об’єкт було створено. Код відповіді `201` " -"та заголовок відповіді `Location` вказує місцерозташування створеного " -"об’єкта. Тіло відповіді показує інформацію про створений аукціон, його " -"внутрішнє `id` (яке співпадає з сегментом `Location`), його офіційне " -"`auctionID` та `dateModified` дату, що показує час, коли аукціон востаннє " -"модифікувався. Зверніть увагу на `procurementMethodType`, а також на те, що " -"аукціон створюється зі статусом `active.tendering`." - -msgid "" -"Let's access the URL of the created object (the `Location` header of the " -"response):" -msgstr "Використаємо URL створеного об’єкта (заголовок відповіді `Location`):" - -msgid "We can see the same response we got after creating auction." -msgstr "Ми бачимо ту ж відповідь, що і після створення аукціону." - -msgid "Let's see what listing of auctions reveals us:" -msgstr "Подивимось, що показує список аукціонів:" - -msgid "" -"We do see the auction's internal `id` (that can be used to construct full " -"URL by prepending `https://api-" -"sandbox.ea.openprocurement.org/api/0/auctions/`) and its `dateModified` " -"datestamp." -msgstr "" -"Ми бачимо внутрішнє `id` аукціону (що може бути використано для побудови " -"повної URL-адреси, якщо додати `http://api-" -"sandbox.openprocurement.org/api/0/auctions/`) та його `dateModified` дату." - -msgid "Uploading documentation" -msgstr "Завантаження документації" - -msgid "" -"Organizer can upload PDF files into the created auction. Uploading should " -"follow the :ref:`upload` rules." -msgstr "" -"Замовник може завантажити PDF файл у створений аукціон. Завантаження повинно" -" відбуватись згідно правил :ref:`upload`." - -msgid "" -"`201 Created` response code and `Location` header confirm document creation." -" We can additionally query the `documents` collection API endpoint to " -"confirm the action:" -msgstr "" -"Код відповіді `201 Created` та заголовок `Location` підтверджують, що " -"документ було створено. Додатково можна зробити запит точки входу API " -"колекції `документів`, щоб підтвердити дію:" - -msgid "" -"The single array element describes the uploaded document. We can upload more" -" documents:" -msgstr "" -"Один елемент масиву описує завантажений документ. Ми можемо завантажити " -"більше документів:" - -msgid "And again we can confirm that there are two documents uploaded." -msgstr "І знову можна перевірити, що є два завантажених документа." - -msgid "" -"In case we made an error, we can reupload the document over the older " -"version:" -msgstr "" -"Якщо сталась помилка, ми можемо ще раз завантажити документ поверх старої " -"версії:" - -msgid "And we can see that it is overriding the original version:" -msgstr "І ми бачимо, що вона перекриває оригінальну версію:" - -msgid "Adding virtual data room" -msgstr "Додавання віртуальної кімнати для роботи з конфіденційними даними" - -msgid "Registering bid" -msgstr "Реєстрація пропозиції" - -msgid "And activate a bid:" -msgstr "І активувати пропозицію:" - -msgid "It is possible to check the uploaded documents:" -msgstr "Можна перевірити завантажені документи:" - -msgid "" -"For the best effect (biggest economy) auction should have multiple bidders " -"registered:" -msgstr "" -"Для найкращого результату (найбільшої економії) аукціон повинен мати багато " -"зареєстрованих учасників." - -msgid "Organizer can add URL for virtual data room:" -msgstr "" -"Організатор може додати URL-адресу віртуальної кімнати для роботи з " -"конфіденційними даними:" - -msgid "And upload license (with ``documentType: financialLicense``):" -msgstr "І завантажити ліцензію (вказавши ``documentType: financialLicense``):" - -msgid "Uploading illustration" -msgstr "Завантаження ілюстрації" - -msgid "" -"Organizer can upload illustration files into the created auction. Uploading " -"should follow the :ref:`upload` rules." -msgstr "" -"Організатор може завантажити файли з ілюстраціями у створений аукціон. " -"Завантаження повинно відповідати правилам :ref:`upload`." - -msgid "We can check whether illustration is uploaded." -msgstr "Ми можемо перевірити, чи завантажилась ілюстрація." - -msgid "Tutorial for the `dgfFinancialAssets` procedure." -msgstr "" -"Туторіал для процедури `dgfFinancialAssets` - продаж права вимоги за " -"кредитними договорами." - -msgid "" -"In order to specify illustration display order, ``index`` field can be used " -"(for details see :ref:`document`). Since this illustration should be " -"displayed first, it has ``\"index\": 1``." -msgstr "" -"Для того, щоб вказати порядок відображення ілюстрацій, використовується поле" -" `index` (див. :ref:`document`). Оскільки ця ілюстрація повинна бути " -"відображена першою, то вказується ``\"index\": 1``" - -msgid "" -"Organizer can upload second illustration. This illustration should be " -"displayed second, so it has ``\"index\": 2``." -msgstr "" -"Організатор може завантажити ще одну ілюстрацію. Ця ілюстрація повинна бути " -"відображена другою, тому має параметр ``\"index\": 2``." - -msgid "Add third illustration:" -msgstr "Додаємо третю ілюстрацію:" - -msgid "" -"Note that `index` of the third illustration is the same as for the second " -"illustration: ``\"index\": 2``. In such cases firstly will be displayed " -"illustration that was uploaded earlier." -msgstr "" -"Зверніть увагу, що параметр `index` третьої ілюстрації такий же як і у " -"другої: ``\"index\": 2``. У таких випадках спочатку відображатиметься " -"ілюстрація з ранішою датою публікації." - -msgid "We can check that there are three uploaded illustrations." -msgstr "Можемо перевірити, що є три завантажені ілюстрації." - -msgid "" -"Bidder can register a bid in `draft` status. Bidder must specify ``UA-FIN`` " -"value for the `additionalIdentifiers` parameter." -msgstr "" -"Учасник може зареєструвати пропозицію у статусі `draft` (чернетка). Учасник " -"повинен вказати значення ``UA-FIN`` для параметра `additionalIdentifiers`." diff --git a/docs/source/locale/uk/LC_MESSAGES/index.po b/docs/source/locale/uk/LC_MESSAGES/index.po index 0dd014e..dec9e5e 100644 --- a/docs/source/locale/uk/LC_MESSAGES/index.po +++ b/docs/source/locale/uk/LC_MESSAGES/index.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-13 12:12+0200\n" diff --git a/docs/source/locale/uk/LC_MESSAGES/overview.po b/docs/source/locale/uk/LC_MESSAGES/overview.po index 5a128af..ae1e9a3 100644 --- a/docs/source/locale/uk/LC_MESSAGES/overview.po +++ b/docs/source/locale/uk/LC_MESSAGES/overview.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-11-18 13:51+0200\n" diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/auction.po b/docs/source/locale/uk/LC_MESSAGES/standard/auction.po index 26f2235..5dc4050 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/auction.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/auction.po @@ -2,7 +2,7 @@ # Zoriana Zaiats , 2016. msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-13 15:36+0300\n" "PO-Revision-Date: 2016-10-19 12:51+0200\n" @@ -43,8 +43,8 @@ msgstr ":ref:`ProcuringEntity`, обов'язково" msgid "Organization conducting the auction." msgstr "Організатор (організація, що проводить аукціон)." -msgid ":ref:`value`, required, editable during enquiryPeriod" -msgstr ":ref:`value`, обов'язково, доступне для редагування впродовж enquiryPeriod" +msgid ":ref:`Value`, required, editable during enquiryPeriod" +msgstr ":ref:`Value`, обов'язково, доступне для редагування впродовж enquiryPeriod" msgid ":ref:`Guarantee`, editable during enquiryPeriod" msgstr ":ref:`Guarantee`, доступне для редагування впродовж enquiryPeriod" @@ -68,18 +68,18 @@ msgstr "" "Якщо поле залишилось незаповненим, то порядок дій такий же, як і при наявності двох учасників." msgid "" -"You can also fill in the field, assigning the value "1". This will show " +"You can also fill in the field, assigning the value \"1\". This will show " "that the only one bidder is needed for the procedure to be successful. " "Therewith the auction is omitted and that bid turns to a qualified award." msgstr "" -"При присвоєнні полю значення "1" пропозиція учасника торгів автоматично стає " +"При присвоєнні полю значення \"1\" пропозиція учасника торгів автоматично стає " "award'ом, що пройшов етап кваліфікації. Сам же аукціон в такому випадку відсутній. Процедура вважається успішною." msgid "Bid guarantee" msgstr "Гарантійний внесок" -msgid "list of :ref:`item` objects, required, editable during enquiryPeriod" -msgstr "список об’єктів :ref:`item`, обов’язково, доступне для редагування впродовж enquiryPeriod" +msgid "list of :ref:`Item` objects, required, editable during enquiryPeriod" +msgstr "список об’єктів :ref:`Item`, обов’язково, доступне для редагування впродовж enquiryPeriod" msgid "" "|ocdsDescription| The goods and services to be purchased, broken into line " @@ -90,43 +90,33 @@ msgstr "" "спискові елементи, де це можливо. Елементи не повинні дублюватись, замість " "цього вкажіть кількість 2." -#: ../../source/standard/auction.rst:69 msgid "list of :ref:`Feature` objects" msgstr "список об’єктів :ref:`Feature`" -#: ../../source/standard/auction.rst:71 msgid "Features of auction." msgstr "Властивості аукціону." -#: ../../source/standard/auction.rst:74 -msgid "List of :ref:`document` objects" -msgstr "Список об’єктів :ref:`document`" +msgid "List of :ref:`Document` objects" +msgstr "Список об’єктів :ref:`Document`" -#: ../../source/standard/auction.rst:76 msgid "|ocdsDescription| All documents and attachments related to the auction." msgstr "|ocdsDescription| Всі документи та додатки пов’язані із аукціоном." -#: ../../source/standard/auction.rst:80 -msgid "List of :ref:`question` objects" -msgstr "Список об’єктів :ref:`question`" +msgid "List of :ref:`Question` objects" +msgstr "Список об’єктів :ref:`Question`" -#: ../../source/standard/auction.rst:82 msgid "Questions to ``procuringEntity`` and answers to them." msgstr "Питання до організатора ``procuringEntity`` і відповіді на них." -#: ../../source/standard/auction.rst:85 -msgid "List of :ref:`complaint` objects" -msgstr "Список об’єктів :ref:`complaint`" +msgid "List of :ref:`Complaint` objects" +msgstr "Список об’єктів :ref:`Complaint`" -#: ../../source/standard/auction.rst:87 msgid "Complaints to auction conditions and their resolutions." msgstr "Скарги на умови аукціону та їх вирішення." -#: ../../source/standard/auction.rst:90 -msgid "List of :ref:`bid` objects" -msgstr "Список об’єктів :ref:`bid`" +msgid "List of :ref:`Bid` objects" +msgstr "Список об’єктів :ref:`Bid`" -#: ../../source/standard/auction.rst:94 msgid "" "|ocdsDescription| A list of all the companies who entered submissions for " "the auction." @@ -134,13 +124,11 @@ msgstr "" "|ocdsDescription| Список усіх компаній, які подали заявки для участі в " "аукціоні." -#: ../../source/standard/auction.rst:103 msgid "`currency` should either be absent or match `Auction.value.currency`" msgstr "" "Значення `currency` повинно бути або відсутнім, або співпадати з " "`Auction.value.currency`" -#: ../../source/standard/auction.rst:104 msgid "" "`valueAddedTaxIncluded` should either be absent or match " "`Auction.value.valueAddedTaxIncluded`" @@ -148,23 +136,18 @@ msgstr "" "Значення `valueAddedTaxIncluded` повинно бути або відсутнім, або співпадати " "з `Auction.value.valueAddedTaxIncluded`" -#: ../../source/standard/auction.rst:107 -msgid "List of :ref:`award` objects" -msgstr "Список об’єктів :ref:`award`" +msgid "List of :ref:`Award` objects" +msgstr "Список об’єктів :ref:`Award`" -#: ../../source/standard/auction.rst:109 msgid "All qualifications (disqualifications and awards)." msgstr "Всі кваліфікації (дискваліфікації та визначення переможця)." -#: ../../source/standard/auction.rst:112 msgid "List of :ref:`Contract` objects" msgstr "Список об’єктів :ref:`Contract`" -#: ../../source/standard/auction.rst:131 -msgid ":ref:`period`, required" -msgstr ":ref:`period`, обов'язково" +msgid ":ref:`Period`, required" +msgstr ":ref:`Period`, обов'язково" -#: ../../source/standard/auction.rst:119 msgid "" "|ocdsDescription| The period during which enquiries may be made and will be " "answered." @@ -172,7 +155,6 @@ msgstr "" "|ocdsDescription| Період, коли можна задати питання (уточнення) та отримати " "відповіді на них." -#: ../../source/standard/auction.rst:127 msgid "" "|ocdsDescription| The period when the auction is open for submissions. The " "end date is the closing date for auction submissions." @@ -180,92 +162,72 @@ msgstr "" "|ocdsDescription| Період, коли аукціон відкритий для подачі пропозицій. " "Кінцева дата - це дата, коли перестають прийматись пропозиції." -#: ../../source/standard/auction.rst:141 -msgid ":ref:`period`, read-only" -msgstr ":ref:`period`, лише для читання" +msgid ":ref:`Period`, read-only" +msgstr ":ref:`Period`, лише для читання" -#: ../../source/standard/auction.rst:136 msgid "url" msgstr "URL-адреса" -#: ../../source/standard/auction.rst:143 msgid "Awarding process period." msgstr "Період, коли відбувається визначення переможця." -#: ../../source/standard/auction.rst:145 msgid "" "|ocdsDescription| The date or period on which an award is anticipated to be " "made." msgstr "" "|ocdsDescription| Дата або період, коли очікується визначення переможця." -#: ../../source/standard/auction.rst:32 ../../source/standard/auction.rst:149 msgid "string" msgstr "рядок" -#: ../../source/standard/auction.rst:152 msgid "Tendering period (tendering)" msgstr "Очікування пропозицій (пропозиції)" -#: ../../source/standard/auction.rst:154 msgid "Auction period (auction)" msgstr "Період аукціону (аукціон)" -#: ../../source/standard/auction.rst:156 msgid "Winner qualification (qualification)" msgstr "Кваліфікація переможця (кваліфікація)" -#: ../../source/standard/auction.rst:158 msgid "Standstill period (standstill)" msgstr "Пропозиції розглянуто (розглянуто)" -#: ../../source/standard/auction.rst:160 msgid "Unsuccessful auction (unsuccessful)" msgstr "Аукціон не відбувся (не відбувся)" -#: ../../source/standard/auction.rst:162 msgid "Complete auction (complete)" msgstr "Завершений аукціон (завершений)" -#: ../../source/standard/auction.rst:164 msgid "Cancelled auction (cancelled)" msgstr "Відмінений аукціон (відмінений)" -#: ../../source/standard/auction.rst:187 msgid "List of :ref:`cancellation` objects." msgstr "Список об’єктів :ref:`cancellation`." -#: ../../source/standard/auction.rst:189 msgid "Contains 1 object with `active` status in case of cancelled Auction." msgstr "" "Містить 1 об’єкт зі статусом `active` на випадок, якщо аукціон буде " "відмінено." -#: ../../source/standard/auction.rst:195 msgid "List of :ref:`revision` objects, auto-generated" msgstr "" "Список об’єктів :ref:`revision`, генерується автоматично, лише для читання" -#: ../../source/standard/auction.rst:50 msgid "" "Total available auction budget. Bids lower than ``value`` will be rejected." msgstr "" "Повний доступний бюджет аукціону. Пропозиції, що нижчі за ``value`` будуть " "відхилені." -#: ../../source/standard/auction.rst:102 msgid "`amount` should be greater than `Auction.value.amount`" msgstr "`amount` повинна бути більша за `Auction.value.amount`" -#: ../../source/standard/auction.rst:63 msgid "List that contains single item being sold." msgstr "Список містить елементи, що продаються." -#: ../../source/standard/auction.rst:21 msgid "Detailed auction description." msgstr "Детальний опис аукціону." -#: ../../source/standard/auction.rst:92 msgid "" "A list of all bids placed in the auction with information about " "participants, their proposals and other qualification documentation." @@ -273,19 +235,15 @@ msgstr "" "Список усіх пропозицій поданих до аукціону разом із інформацією про " "учасників аукціону, їхні пропозиції та інша кваліфікаційна документація." -#: ../../source/standard/auction.rst:100 msgid "The minimal step of auction. Validation rules:" msgstr "Мінімальний крок аукціону. Правила валідації:" -#: ../../source/standard/auction.rst:138 msgid "A web address where auction is accessible for view." msgstr "Веб-адреса для перегляду аукціону." -#: ../../source/standard/auction.rst:166 msgid "Auction status." msgstr "Статус аукціону." -#: ../../source/standard/auction.rst:191 msgid "" "The :ref:`cancellation` object describes the reason of auction cancellation " "and contains accompanying documents if there are any." @@ -293,11 +251,9 @@ msgstr "" "Об’єкт :ref:`cancellation` описує причину скасування аукціону та надає " "відповідні документи, якщо такі є." -#: ../../source/standard/auction.rst:197 msgid "Historical changes to `Auction` object properties." msgstr "Зміни властивостей об’єктів `Auction`." -#: ../../source/standard/auction.rst:28 msgid "" "|ocdsDescription| AuctionID should always be the same as the OCID. It is " "included to make the flattened data structure more convenient." @@ -306,7 +262,6 @@ msgstr "" "співпадати з OCID. Його включають, щоб зробити структуру даних більш " "зручною." -#: ../../source/standard/auction.rst:43 msgid "" "|ocdsDescription| The entity managing the procurement, which may be " "different from the buyer who is paying / using the items being procured." @@ -314,43 +269,34 @@ msgstr "" "|ocdsDescription| Об’єкт, що управляє закупівлею. Він не обов’язково є " "покупцем, який платить / використовує закуплені елементи." -#: ../../source/standard/auction.rst:52 msgid "|ocdsDescription| The total estimated value of the procurement." msgstr "|ocdsDescription| Загальна кошторисна вартість закупівлі." -#: ../../source/standard/auction.rst:115 ../../source/standard/auction.rst:123 -msgid ":ref:`period`" -msgstr ":ref:`period`" +msgid ":ref:`Period`" +msgstr ":ref:`Period`" -#: ../../source/standard/auction.rst:117 msgid "Period when questions are allowed." msgstr "Період, коли дозволено задавати питання." -#: ../../source/standard/auction.rst:125 msgid "Period when bids can be submitted." msgstr "Період, коли подаються пропозиції." -#: ../../source/standard/auction.rst:133 msgid "Period when Auction is conducted. `startDate` should be provided." msgstr "" "Період, коли проводиться аукціон. Значення `startDate` (дата початку торгів)" " повинно бути вказано обов'язково." -#: ../../source/standard/auction.rst:169 msgid "string, read-only" msgstr "рядок, лише для читання" -#: ../../source/standard/auction.rst:171 msgid "Required for `dgfFinancialAssets` procedure." msgstr "" "Обов'язково для `dgfFinancialAssets` процедури (продаж права вимоги за " "кредитними договорами)." -#: ../../source/standard/auction.rst:173 msgid "This field is multilingual:" msgstr "Це поле багатомовне:" -#: ../../source/standard/auction.rst:175 msgid "" "Ukrainian by default - До участі допускаються лише ліцензовані фінансові " "установи." @@ -358,7 +304,6 @@ msgstr "" "За замовчуванням українською мовою - До участі допускаються лише ліцензовані" " фінансові установи." -#: ../../source/standard/auction.rst:177 msgid "" "``eligibilityCriteria_ru`` (Russian) - К участию допускаются только " "лицензированные финансовые учреждения." @@ -366,7 +311,6 @@ msgstr "" "``eligibilityCriteria_ru`` (російською) - К участию допускаются только " "лицензированные финансовые учреждения." -#: ../../source/standard/auction.rst:179 msgid "" "``eligibilityCriteria_en`` (English) - Only licensed financial institutions " "are eligible to participate." @@ -374,15 +318,12 @@ msgstr "" "``eligibilityCriteria_en`` (англійською) - Only licensed financial " "institutions are eligible to participate." -#: ../../source/standard/auction.rst:14 msgid "string, multilingual, read-only" msgstr "рядок, багатомовний, лише для читання" -#: ../../source/standard/auction.rst:16 msgid "Auction number in the Deposit Guarantee Fund." msgstr "Номер аукціону у Фонді Гарантування Вкладів." -#: ../../source/standard/auction.rst:34 msgid "" "Identification number of the auction (also referred to as `lot`) in the XLS " "of Deposit Guarantee Fund." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/award.po b/docs/source/locale/uk/LC_MESSAGES/standard/award.po index da40243..8c969d4 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/award.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/award.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 13:26+0200\n" @@ -14,35 +14,27 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/award.rst:8 msgid "Award" msgstr "Award" -#: ../../source/standard/award.rst:11 msgid "Schema" msgstr "Схема" -#: ../../source/standard/award.rst:14 ../../source/standard/award.rst:20 msgid "string, auto-generated, read-only" msgstr "рядок, генерується автоматично, лише для читання" -#: ../../source/standard/award.rst:25 ../../source/standard/award.rst:31 msgid "string, multilingual" msgstr "рядок, багатомовний" -#: ../../source/standard/award.rst:27 msgid "|ocdsDescription| Award title." msgstr "|ocdsDescription| Назва рішення." -#: ../../source/standard/award.rst:33 msgid "|ocdsDescription| Award description." msgstr "|ocdsDescription| Опис рішення." -#: ../../source/standard/award.rst:37 msgid "string" msgstr "рядок" -#: ../../source/standard/award.rst:39 msgid "" "|ocdsDescription| The current status of the award drawn from the " "`awardStatus` codelist." @@ -50,66 +42,52 @@ msgstr "" "|ocdsDescription| Поточний статус рішення, взятий зі списку кодів " "`awardStatus`." -#: ../../source/standard/award.rst:42 msgid "Possible values are:" msgstr "Можливі значення:" -#: ../../source/standard/award.rst:44 msgid "`pending` - the award is under review of qualification committee" msgstr "`pending` - переможець розглядається кваліфікаційною комісією" -#: ../../source/standard/award.rst:45 msgid "" "`unsuccessful` - the award has been rejected by qualification committee" msgstr "`unsuccessful` - кваліфікаційна комісія відмовила переможцю" -#: ../../source/standard/award.rst:46 msgid "`active` - the auction is awarded to the bidder from the `bid_id`" msgstr "`active` - аукціон виграв учасник з пропозицією `bid_id`" -#: ../../source/standard/award.rst:47 msgid "`cancelled` - the award has been cancelled by complaint review body" msgstr "" "`cancelled` - орган, що розглядає скарги, відмінив результати закупівлі" -#: ../../source/standard/award.rst:50 msgid "string, :ref:`Date`, auto-generated, read-only" msgstr "рядок, :ref:`Date`, генерується автоматично, лише для читання" -#: ../../source/standard/award.rst:52 msgid "|ocdsDescription| The date of the contract award." msgstr "|ocdsDescription| Дата рішення про підписання договору." -#: ../../source/standard/award.rst:56 msgid "`Value` object, auto-generated, read-only" msgstr "О’єкт :ref:`Value`, генерується автоматично, лише для читання" -#: ../../source/standard/award.rst:58 msgid "|ocdsDescription| The total value of this award." msgstr "|ocdsDescription| Загальна вартість згідно цього рішення." -#: ../../source/standard/award.rst:62 msgid "List of :ref:`Organization` objects, auto-generated, read-only" msgstr "" "Список об’єктів :ref:`Organization`, генерується автоматично, лише для " "читання" -#: ../../source/standard/award.rst:64 msgid "|ocdsDescription| The suppliers awarded with this award." msgstr "" "|ocdsDescription| Постачальники, що були визнані переможцями згідно цього " "рішення." -#: ../../source/standard/award.rst:68 msgid "List of :ref:`Item` objects, auto-generated, read-only" msgstr "" "Список об’єктів :ref:`Item`, генерується автоматично, лише для читання" -#: ../../source/standard/award.rst:74 msgid "List of :ref:`Document` objects" msgstr "Список об’єктів :ref:`Document`" -#: ../../source/standard/award.rst:76 msgid "" "|ocdsDescription| All documents and attachments related to the award, " "including any notices." @@ -117,23 +95,18 @@ msgstr "" "|ocdsDescription| Усі документи та додатки пов’язані з рішенням, включно з " "будь-якими повідомленнями." -#: ../../source/standard/award.rst:80 msgid "List of :ref:`Complaint` objects" msgstr "Список об’єктів :ref:`Complaint`" -#: ../../source/standard/award.rst:83 -msgid ":ref:`period`" -msgstr ":ref:`period`" +msgid ":ref:`Period`" +msgstr ":ref:`Period`" -#: ../../source/standard/award.rst:16 msgid "|ocdsDescription| Identifier for this award." msgstr "|ocdsDescription| Ідентифікатор цього рішення." -#: ../../source/standard/award.rst:22 msgid "The ID of a bid that the award relates to." msgstr "ID пропозиції, що виграла закупівлю" -#: ../../source/standard/award.rst:70 msgid "" "|ocdsDescription| The goods and services awarded in this award, broken into " "line items wherever possible. Items should not be duplicated, but the " @@ -143,9 +116,8 @@ msgstr "" "на окремі рядки, де це можливо. Елементи не повинні бути продубльовані, а " "повинні мати вказану кількість." -#: ../../source/standard/award.rst:85 msgid "The time frame when complaints can be submitted." msgstr "Період часу, під час якого можна подавати скарги." -#~ msgid "ID of related :ref:`lot`." -#~ msgstr "ID пов’язаного :ref:`lot`." +#~ msgid "ID of related :ref:`Lot`." +#~ msgstr "ID пов’язаного :ref:`Lot`." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/bid.po b/docs/source/locale/uk/LC_MESSAGES/standard/bid.po index 6c23beb..7781531 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/bid.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/bid.po @@ -1,7 +1,7 @@ # Zoriana Zaiats , 2016. msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-10-13 17:52+0200\n" @@ -14,57 +14,44 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/bid.rst:8 msgid "Bid" msgstr "Bid" -#: ../../source/standard/bid.rst:11 ../../source/standard/bid.rst:69 msgid "Schema" msgstr "Схема" -#: ../../source/standard/bid.rst:14 msgid "List of :ref:`Organization` objects" msgstr "Список об’єктів :ref:`Organization` " -#: ../../source/standard/bid.rst:17 -msgid "string, :ref:`date`, auto-generated" -msgstr "рядок, :ref:`date`, генерується автоматично" +msgid "string, :ref:`Date`, auto-generated" +msgstr "рядок, :ref:`Date`, генерується автоматично" -#: ../../source/standard/bid.rst:25 msgid "string" msgstr "рядок" -#: ../../source/standard/bid.rst:27 msgid "Possible values are:" msgstr "Можливі значення:" -#: ../../source/standard/bid.rst:29 msgid "`draft`" msgstr "`draft` - чернетка" -#: ../../source/standard/bid.rst:30 msgid "`active`" msgstr "`active` - активна ставка" -#: ../../source/standard/bid.rst:33 msgid ":ref:`Value`, required" msgstr ":ref:`Value`, обов’язково" -#: ../../source/standard/bid.rst:35 msgid "Validation rules:" msgstr "Правила валідації:" -#: ../../source/standard/bid.rst:37 msgid "`amount` should be less than `Auction.value.amout`" msgstr "`amount` повинно бути меншим, ніж `Auction.value.amount`" -#: ../../source/standard/bid.rst:38 msgid "`currency` should either be absent or match `Auction.value.currency`" msgstr "" "`currency` повинно або бути відсутнім, або відповідати " "`Auction.value.currency`" -#: ../../source/standard/bid.rst:39 msgid "" "`valueAddedTaxIncluded` should either be absent or match " "`Auction.value.valueAddedTaxIncluded`" @@ -72,59 +59,45 @@ msgstr "" "Значення `valueAddedTaxIncluded` повинно бути або відсутнім, або співпадати " "з `Auction.value.valueAddedTaxIncluded`" -#: ../../source/standard/bid.rst:42 msgid "List of :ref:`Document` objects" msgstr "Список об’єктів :ref:`Document`" -#: ../../source/standard/bid.rst:45 msgid "List of :ref:`Parameter` objects" msgstr "Список об’єктів :ref:`Parameter`" -#: ../../source/standard/bid.rst:53 msgid "A web address for participation in auction." msgstr "Веб-адреса для участі в аукціоні." -#: ../../source/standard/bid.rst:66 msgid "Parameter" msgstr "Parameter" -#: ../../source/standard/bid.rst:72 msgid "string, required" msgstr "рядок, обов’язковий" -#: ../../source/standard/bid.rst:77 msgid "float, required" msgstr "float, обов’язково" -#: ../../source/standard/bid.rst:22 msgid "UID, auto-generated" msgstr "UID, генерується автоматично" -#: ../../source/standard/bid.rst:51 msgid "URL" msgstr "URL-адреса" -#: ../../source/standard/bid.rst:74 msgid "Feature code." msgstr "Код критерію." -#: ../../source/standard/bid.rst:79 msgid "Feature value." msgstr "Значення критерію." -#: ../../source/standard/bid.rst:56 msgid "bool, required" msgstr "булеве значення, обов'язково" -#: ../../source/standard/bid.rst:59 msgid "bool" msgstr "булеве значення" -#: ../../source/standard/bid.rst:19 msgid "Date when bid has been submitted." msgstr "Дата подачі пропозиції." -#: ../../source/standard/bid.rst:61 msgid "Required for `dgfFinancialAssets` procedure." msgstr "" "Необхідно для `dgfFinancialAssets` процедури (продаж права вимоги за " @@ -156,5 +129,5 @@ msgstr "" #~ "`valueAddedTaxIncluded` повинно або бути відсутнім, або відповідати " #~ "`Lot.value.valueAddedTaxIncluded`" -#~ msgid "ID of related :ref:`lot`." -#~ msgstr "ID пов’язаного :ref:`lot`." +#~ msgid "ID of related :ref:`Lot`." +#~ msgstr "ID пов’язаного :ref:`Lot`." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/cancellation.po b/docs/source/locale/uk/LC_MESSAGES/standard/cancellation.po index 2820dab..270f942 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/cancellation.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/cancellation.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 14:36+0200\n" @@ -14,41 +14,30 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/cancellation.rst:8 msgid "Cancellation" msgstr "Cancellation" -#: ../../source/standard/cancellation.rst:11 msgid "Schema" msgstr "Схема" -#: ../../source/standard/cancellation.rst:17 msgid "string, multilingual, required" msgstr "рядок, багатомовний, обов’язковий" -#: ../../source/standard/cancellation.rst:22 -#: ../../source/standard/cancellation.rst:42 msgid "string" msgstr "рядок" -#: ../../source/standard/cancellation.rst:28 -#: ../../source/standard/cancellation.rst:44 msgid "Possible values are:" msgstr "Можливі значення:" -#: ../../source/standard/cancellation.rst:26 msgid "Default. The request is being prepared." msgstr "За замовчуванням. Запит оформляється." -#: ../../source/standard/cancellation.rst:28 msgid "Cancellation activated." msgstr "Скасування активоване." -#: ../../source/standard/cancellation.rst:31 msgid "List of :ref:`Document` objects" msgstr "Список об’єктів :ref:`Document`" -#: ../../source/standard/cancellation.rst:33 msgid "" "Documents accompanying the Cancellation: Protocol of Auction Committee with " "decision to cancel the Auction." @@ -56,28 +45,23 @@ msgstr "" "Супровідна документація скасування: Протокол рішення Аукціонного комітету " "організатора про скасування аукціону." -#: ../../source/standard/cancellation.rst:37 -msgid "string, :ref:`date`" -msgstr "рядок, :ref:`date`" +msgid "string, :ref:`Date`" +msgstr "рядок, :ref:`Date`" -#: ../../source/standard/cancellation.rst:39 msgid "Cancellation date." msgstr "Дата скасування" -#: ../../source/standard/cancellation.rst:46 msgid "`auction`" msgstr "`auction`" -#: ../../source/standard/cancellation.rst:14 msgid "UID, auto-generated" msgstr "UID, генерується автоматично" -#: ../../source/standard/cancellation.rst:19 msgid "The reason, why auction is being cancelled." msgstr "Причина, з якої скасовується аукціон." #~ msgid "`lot`" #~ msgstr "`lot`" -#~ msgid "ID of related :ref:`lot`." -#~ msgstr "ID пов’язаного :ref:`lot`." +#~ msgid "ID of related :ref:`Lot`." +#~ msgstr "ID пов’язаного :ref:`Lot`." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/complaint.po b/docs/source/locale/uk/LC_MESSAGES/standard/complaint.po index 1fd0060..00f8b9b 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/complaint.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/complaint.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 14:25+0200\n" @@ -14,19 +14,15 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/complaint.rst:9 msgid "Complaint" msgstr "Complaint" -#: ../../source/standard/complaint.rst:12 msgid "Schema" msgstr "Схема" -#: ../../source/standard/complaint.rst:18 msgid ":ref:`Organization`, required" msgstr ":ref:`Organization`, обов’язково" -#: ../../source/standard/complaint.rst:20 msgid "" "Organization filing a complaint (contactPoint - person, identification - " "organization that person represents)." @@ -34,149 +30,101 @@ msgstr "" "Організація, яка подає скаргу (contactPoint - людина, identification - " "організація, яку ця людина представляє)." -#: ../../source/standard/complaint.rst:23 msgid "string, required" msgstr "рядок, обов’язковий" -#: ../../source/standard/complaint.rst:25 msgid "Title of the complaint." msgstr "Заголовок скарги." -#: ../../source/standard/complaint.rst:28 msgid "Description of the issue." msgstr "Опис запитання." -#: ../../source/standard/complaint.rst:31 -#: ../../source/standard/complaint.rst:36 -#: ../../source/standard/complaint.rst:41 -#: ../../source/standard/complaint.rst:46 -#: ../../source/standard/complaint.rst:51 -#: ../../source/standard/complaint.rst:56 -#: ../../source/standard/complaint.rst:125 -msgid "string, :ref:`date`, auto-generated" -msgstr "рядок, :ref:`date`, генерується автоматично" - -#: ../../source/standard/complaint.rst:33 +msgid "string, :ref:`Date`, auto-generated" +msgstr "рядок, :ref:`Date`, генерується автоматично" + msgid "Date of posting." msgstr "Дата подання." -#: ../../source/standard/complaint.rst:38 msgid "Date when claim was submitted." msgstr "Дата, коли вимога була подана." -#: ../../source/standard/complaint.rst:48 msgid "Date of claim to complaint escalation." msgstr "Дата ескалації (перетворення вимоги на скаргу)." -#: ../../source/standard/complaint.rst:53 msgid "Date of complaint decision." msgstr "День прийняття рішення по скарзі." -#: ../../source/standard/complaint.rst:58 msgid "Date of cancelling." msgstr "Дата відхилення." -#: ../../source/standard/complaint.rst:61 -#: ../../source/standard/complaint.rst:75 -#: ../../source/standard/complaint.rst:83 -#: ../../source/standard/complaint.rst:88 -#: ../../source/standard/complaint.rst:102 -#: ../../source/standard/complaint.rst:107 -#: ../../source/standard/complaint.rst:120 msgid "string" msgstr "рядок" -#: ../../source/standard/complaint.rst:63 msgid "Possible values are:" msgstr "Можливі значення:" -#: ../../source/standard/complaint.rst:65 msgid "`draft`" msgstr "`draft` - чорновик, початковий етап" -#: ../../source/standard/complaint.rst:66 -#: ../../source/standard/complaint.rst:79 msgid "`claim`" msgstr "`claim` - вимога" -#: ../../source/standard/complaint.rst:67 msgid "`answered`" msgstr "`answered` - дано відповідь" -#: ../../source/standard/complaint.rst:68 msgid "`pending`" msgstr "`pending` - не вирішено, ще обробляється" -#: ../../source/standard/complaint.rst:69 -#: ../../source/standard/complaint.rst:92 msgid "`invalid`" msgstr "`invalid` - недійсно" -#: ../../source/standard/complaint.rst:70 -#: ../../source/standard/complaint.rst:93 msgid "`declined`" msgstr "`declined` - відхилено" -#: ../../source/standard/complaint.rst:71 -#: ../../source/standard/complaint.rst:94 msgid "`resolved`" msgstr "`resolved` - вирішено" -#: ../../source/standard/complaint.rst:72 msgid "`cancelled`" msgstr "`cancelled` - скасовано" -#: ../../source/standard/complaint.rst:77 msgid "Possible values of type are:" msgstr "Можливі значення типу:" -#: ../../source/standard/complaint.rst:80 msgid "`complaint`" msgstr "`complaint` - скарга" -#: ../../source/standard/complaint.rst:90 msgid "Possible values of resolution type are:" msgstr "Можливі значення типу вирішення:" -#: ../../source/standard/complaint.rst:97 msgid "bool" msgstr "булеве значення" -#: ../../source/standard/complaint.rst:99 msgid "Claim is satisfied?" msgstr "Вимога задовільнена?" -#: ../../source/standard/complaint.rst:109 msgid "Cancellation reason." msgstr "Причини відхилення." -#: ../../source/standard/complaint.rst:112 msgid "List of :ref:`Document` objects" msgstr "Список об’єктів :ref:`Document`" -#: ../../source/standard/complaint.rst:43 msgid "Date when Organizer answered the claim." msgstr "Дата, коли організатор відповів на вимогу." -#: ../../source/standard/complaint.rst:85 msgid "Organizer's resolution." msgstr "Рішення організатора." -#: ../../source/standard/complaint.rst:122 msgid "Participants's action." msgstr "Дія учасника." -#: ../../source/standard/complaint.rst:127 msgid "Date of participant's action." msgstr "Дата дії учасника." -#: ../../source/standard/complaint.rst:15 msgid "UID, auto-generated" msgstr "UID, генерується автоматично" -#: ../../source/standard/complaint.rst:104 msgid "Reviewer's decision." msgstr "Рішення органу оскарження." -#~ msgid "ID of related :ref:`lot`." -#~ msgstr "ID пов’язаного :ref:`lot`." +#~ msgid "ID of related :ref:`Lot`." +#~ msgstr "ID пов’язаного :ref:`Lot`." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/contract.po b/docs/source/locale/uk/LC_MESSAGES/standard/contract.po index c5bfaf2..3c01e32 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/contract.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/contract.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 13:28+0200\n" @@ -14,24 +14,18 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/contract.rst:8 msgid "Contract" msgstr "Contract" -#: ../../source/standard/contract.rst:11 msgid "Schema" msgstr "Схема" -#: ../../source/standard/contract.rst:16 msgid "|ocdsDescription| The identifier for this contract." msgstr "|ocdsDescription| Ідентифікатор цього договору." -#: ../../source/standard/contract.rst:20 ../../source/standard/contract.rst:32 -#: ../../source/standard/contract.rst:59 msgid "string, required" msgstr "рядок, обов’язковий" -#: ../../source/standard/contract.rst:22 msgid "" "|ocdsDescription| The `Award.id` against which this contract is being " "issued." @@ -39,50 +33,39 @@ msgstr "" "|ocdsDescription| `Award.id` вказує на рішення, згідно якого видається " "договір." -#: ../../source/standard/contract.rst:26 msgid "string, auto-generated, read-only" msgstr "рядок, генерується автоматично, лише для читання" -#: ../../source/standard/contract.rst:29 ../../source/standard/contract.rst:38 msgid "string" msgstr "рядок" -#: ../../source/standard/contract.rst:34 msgid "|ocdsDescription| Contract title" msgstr "|ocdsDescription| Назва договору" -#: ../../source/standard/contract.rst:40 msgid "|ocdsDescription| Contract description" msgstr "|ocdsDescription| Опис договору" -#: ../../source/standard/contract.rst:44 msgid "`Value` object, auto-generated, read-only" msgstr "Об’єкт `Value`, генерується автоматично, лише для читання" -#: ../../source/standard/contract.rst:46 msgid "|ocdsDescription| The total value of this contract." msgstr "|ocdsDescription| Загальна вартість договору." -#: ../../source/standard/contract.rst:50 msgid "List of :ref:`Item` objects, auto-generated, read-only" msgstr "" "Список об’єктів :ref:`Item`, генерується автоматично, лише для читання" -#: ../../source/standard/contract.rst:56 msgid "List of :ref:`Organization` objects, auto-generated, read-only" msgstr "" "Список об’єктів :ref:`Organization`, генерується автоматично, лише для " "читання" -#: ../../source/standard/contract.rst:61 msgid "|ocdsDescription| The current status of the contract." msgstr "|ocdsDescription| Поточний статус договору." -#: ../../source/standard/contract.rst:64 msgid "Possible values are:" msgstr "Можливі значення:" -#: ../../source/standard/contract.rst:66 msgid "" "`pending` - this contract has been proposed, but is not yet in force. It may" " be awaiting signature." @@ -90,7 +73,6 @@ msgstr "" "`pending` - цей договір запропоновано, але він ще не діє. Можливо очікується" " його підписання." -#: ../../source/standard/contract.rst:68 msgid "" "`active` - this contract has been signed by all the parties, and is now " "legally in force." @@ -98,11 +80,9 @@ msgstr "" "`active` - цей договір підписаний всіма учасниками, і зараз діє на законних " "підставах." -#: ../../source/standard/contract.rst:70 msgid "`cancelled` - this contract has been cancelled prior to being signed." msgstr "`cancelled` - цей договір було скасовано до підписання." -#: ../../source/standard/contract.rst:71 msgid "" "`terminated` - this contract was signed and in force, and has now come to a " "close. This may be due to a successful completion of the contract, or may " @@ -112,19 +92,15 @@ msgstr "" "може бути пов'язано з виконанням договору, або з достроковим припиненням " "через якусь незавершеність." -#: ../../source/standard/contract.rst:76 msgid ":ref:`Period`" msgstr ":ref:`Period`" -#: ../../source/standard/contract.rst:78 msgid "|ocdsDescription| The start and end date for the contract." msgstr "|ocdsDescription| Дата початку та завершення договору." -#: ../../source/standard/contract.rst:82 ../../source/standard/contract.rst:88 -msgid "string, :ref:`date`" -msgstr "рядок, :ref:`date`" +msgid "string, :ref:`Date`" +msgstr "рядок, :ref:`Date`" -#: ../../source/standard/contract.rst:84 msgid "" "|ocdsDescription| The date the contract was signed. In the case of multiple " "signatures, the date of the last signature." @@ -132,15 +108,12 @@ msgstr "" "|ocdsDescription| Дата підписання договору. Якщо було декілька підписань, то" " береться дата останнього підписання." -#: ../../source/standard/contract.rst:90 msgid "The date when the contract was changed or activated." msgstr "Дата, коли договір був змінений або активований." -#: ../../source/standard/contract.rst:93 msgid "List of :ref:`Document` objects" msgstr "Список об’єктів :ref:`Document`" -#: ../../source/standard/contract.rst:95 msgid "" "|ocdsDescription| All documents and attachments related to the contract, " "including any notices." @@ -148,11 +121,9 @@ msgstr "" "|ocdsDescription| Усі документи та додатки пов’язані з договором, включно з " "будь-якими повідомленнями." -#: ../../source/standard/contract.rst:14 msgid "UID, auto-generated" msgstr "UID, генерується автоматично" -#: ../../source/standard/contract.rst:52 msgid "" "|ocdsDescription| The goods, services, and any intangible outcomes in this " "contract. Note: If the items are the same as the award, do not repeat." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/document.po b/docs/source/locale/uk/LC_MESSAGES/standard/document.po index 3bccc20..14d5013 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/document.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/document.po @@ -2,7 +2,7 @@ # greg , 2016. msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-12-05 10:50+0200\n" @@ -28,8 +28,8 @@ msgstr "рядок, генерується автоматично" msgid "string" msgstr "рядок" -msgid "Possible values for :ref:`auction`" -msgstr "Можливі значення для :ref:`auction`" +msgid "Possible values for :ref:`Auction`" +msgstr "Можливі значення для :ref:`Auction`" msgid "`notice` - **Auction notice**" msgstr "`notice` - **Повідомлення про аукціон**" @@ -63,8 +63,8 @@ msgstr "" "Інформація про учасників, їхні документи для перевірки та будь-які " "процесуальні пільги, на які вони можуть претендувати." -msgid "Possible values for :ref:`award`" -msgstr "Можливі значення для :ref:`award`" +msgid "Possible values for :ref:`Award`" +msgstr "Можливі значення для :ref:`Award`" msgid "`winningBid` - **Winning Bid**" msgstr "`winningBid` - **Пропозиція, що перемогла**" @@ -90,8 +90,8 @@ msgstr "`contractSigned` - **Підписаний договір**" msgid "`contractAnnexe` - **Annexes to the Contract**" msgstr "`contractAnnexe` - **Додатки до договору**" -msgid "Possible values for :ref:`bid`" -msgstr "Можливі значення для :ref:`bid`" +msgid "Possible values for :ref:`Bid`" +msgstr "Можливі значення для :ref:`Bid`" msgid "`commercialProposal` - **Сommercial proposal**" msgstr "`commercialProposal` - **Цінова пропозиція**" @@ -134,8 +134,8 @@ msgstr "" msgid "|ocdsDescription| Direct link to the document or attachment." msgstr "|ocdsDescription| Пряме посилання на документ чи додаток." -msgid "string, :ref:`date`" -msgstr "рядок, :ref:`date`" +msgid "string, :ref:`Date`" +msgstr "рядок, :ref:`Date`" msgid "|ocdsDescription| The date on which the document was first published." msgstr "|ocdsDescription| Дата, коли документ був опублікований вперше." @@ -218,8 +218,8 @@ msgstr "" "що під час аукціону подав найбільшу цінову пропозицію, а при однакових " "цінових пропозиціях, того, що подав пропозицію раніше." -msgid "ID of related :ref:`item`." -msgstr "Ідентифікатор пов'язаних об'єктів :ref:`item`." +msgid "ID of related :ref:`Item`." +msgstr "Ідентифікатор пов'язаних об'єктів :ref:`Item`." msgid "`x_dgfAssetFamiliarization` - **Asset Familiarization**" msgstr "" @@ -337,5 +337,5 @@ msgstr "" #~ msgid "`lot`" #~ msgstr "`lot`" -#~ msgid "ID of related :ref:`lot` or :ref:`item`." -#~ msgstr "Ідентифікатор пов'язаних об'єктів :ref:`lot` або :ref:`item`." +#~ msgid "ID of related :ref:`Lot` or :ref:`Item`." +#~ msgstr "Ідентифікатор пов'язаних об'єктів :ref:`Lot` або :ref:`Item`." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/index.po b/docs/source/locale/uk/LC_MESSAGES/standard/index.po index 851404b..c64a3f4 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/index.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/index.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 13:34+0200\n" @@ -15,11 +15,9 @@ msgstr "" "=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/index.rst:5 msgid "Data Standard" msgstr "Стандарт даних" -#: ../../source/standard/index.rst:7 msgid "" "Data standard is modelled along the `Open Contracting Standard " "`_ with extensions in areas that were" diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/item.po b/docs/source/locale/uk/LC_MESSAGES/standard/item.po index 7abe7a3..39a58c9 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/item.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/item.po @@ -1,7 +1,7 @@ # Zoriana Zaiats , 2016. msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-10-13 17:22+0200\n" @@ -14,40 +14,30 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/item.rst:9 msgid "Item" msgstr "Item" -#: ../../source/standard/item.rst:12 ../../source/standard/item.rst:91 -#: ../../source/standard/item.rst:128 msgid "Schema" msgstr "Схема" -#: ../../source/standard/item.rst:15 msgid "string, auto-generated" msgstr "рядок, генерується автоматично" -#: ../../source/standard/item.rst:18 msgid "string, multilingual, required" msgstr "рядок, багатомовний, обов’язковий" -#: ../../source/standard/item.rst:20 msgid "|ocdsDescription| A description of the goods, services to be provided." msgstr "|ocdsDescription| Опис товарів та послуг, які повинні бути надані." -#: ../../source/standard/item.rst:26 msgid ":ref:`Classification`" msgstr ":ref:`Classification`" -#: ../../source/standard/item.rst:37 msgid "List of :ref:`Classification` objects" msgstr "Список об’єктів :ref:`Classification`" -#: ../../source/standard/item.rst:48 msgid ":ref:`Unit`" msgstr ":ref:`Unit`" -#: ../../source/standard/item.rst:50 msgid "" "|ocdsDescription| Description of the unit which the good comes in e.g. " "hours, kilograms. Made up of a unit name, and the value of a single unit." @@ -55,41 +45,30 @@ msgstr "" "|ocdsDescription| Опис одиниці виміру товару, наприклад, години, кілограми. " "Складається з назви одиниці та значення однієї одиниці." -#: ../../source/standard/item.rst:55 msgid "integer" msgstr "ціле число" -#: ../../source/standard/item.rst:57 msgid "|ocdsDescription| The number of units required" msgstr "|ocdsDescription| Кількість необхідних одиниць." -#: ../../source/standard/item.rst:61 msgid ":ref:`Address`" msgstr ":ref:`Address`" -#: ../../source/standard/item.rst:66 msgid "dictionary" msgstr "словник" -#: ../../source/standard/item.rst:71 ../../source/standard/item.rst:73 -#: ../../source/standard/item.rst:131 msgid "string, required" msgstr "рядок, обов’язковий" -#: ../../source/standard/item.rst:75 msgid "string, optional, usually not used" msgstr "рядок, не обов’язково, переважно не використовується" -#: ../../source/standard/item.rst:94 ../../source/standard/item.rst:103 -#: ../../source/standard/item.rst:109 ../../source/standard/item.rst:136 msgid "string" msgstr "рядок" -#: ../../source/standard/item.rst:88 msgid "Classification" msgstr "Classification" -#: ../../source/standard/item.rst:96 msgid "" "|ocdsDescription| A classification should be drawn from an existing scheme " "or list of codes. This field is used to indicate the scheme/codelist from " @@ -102,20 +81,16 @@ msgstr "" "значення повинно представляти відому Схему Класифікації Елементів, де це " "можливо." -#: ../../source/standard/item.rst:105 msgid "" "|ocdsDescription| The classification code drawn from the selected scheme." msgstr "|ocdsDescription| Код класифікації взятий з вибраної схеми." -#: ../../source/standard/item.rst:111 msgid "|ocdsDescription| A textual description or title for the code." msgstr "|ocdsDescription| Текстовий опис або назва коду." -#: ../../source/standard/item.rst:115 msgid "uri" msgstr "uri" -#: ../../source/standard/item.rst:117 msgid "" "|ocdsDescription| A URI to identify the code. In the event individual URIs " "are not available for items in the identifier scheme this value should be " @@ -125,19 +100,15 @@ msgstr "" "доступні для елементів у схемі ідентифікації, це значення треба залишити " "пустим." -#: ../../source/standard/item.rst:125 msgid "Unit" msgstr "Unit" -#: ../../source/standard/item.rst:133 msgid "UN/CEFACT Recommendation 20 unit code." msgstr "Код одиниці виміру в UN/CEFACT Recommendation 20." -#: ../../source/standard/item.rst:138 msgid "|ocdsDescription| Name of the unit" msgstr "|ocdsDescription| Назва одиниці виміру" -#: ../../source/standard/item.rst:63 msgid "" "Address, where the item is located. " "Classification codes (CAV-PS) for which `item.address` object is optional are given below:" @@ -145,21 +116,18 @@ msgstr "" "Адреса, де розташований елемент. " "Класифікатори (CAV-PS) для яких заповнення полів `item.address` є необов'язковим, знаходяться за посиланням нижче:" -#: ../../source/standard/item.rst:68 msgid "" "Geographical coordinates of the location. Element consists of the following " "items:" msgstr "" "Географічні координати місця розташування. Складається з таких компонентів:" -#: ../../source/standard/item.rst:77 msgid "" "`location` usually takes precedence over `address` if both are present." msgstr "" "Параметр `location` зазвичай має вищий пріоритет ніж `address`, якщо вони " "обидва вказані." -#: ../../source/standard/item.rst:28 msgid "" "|ocdsDescription| The primary classification for the item. See " "the `itemClassificationScheme` to identify preferred classification lists." @@ -167,7 +135,6 @@ msgstr "" "|ocdsDescription| Початкова класифікація елемента. Дивіться " "у `itemClassificationScheme`, щоб визначити бажані списки класифікації." -#: ../../source/standard/item.rst:32 msgid "" "Possible variants of available primary classifiers are CPV and CAV-PS. " "Additionally, there is a validation for the input of these classifiers due to which " @@ -176,7 +143,6 @@ msgstr "" "Класифікатори, що можуть використовуватись при заведенні закупівлі як основні, - CPV та CAV-PS. " "Додатково здійснюється валідація введення CAV-PS та CPV з точністю не менше класу." -#: ../../source/standard/item.rst:39 msgid "" "|ocdsDescription| An array of additional classifications for the item. See " "the `itemClassificationScheme` codelist for common options to use in OCDS." @@ -204,8 +170,8 @@ msgid "Additional classifier is CPVS. The property can be leased, when entering msgstr "Додатковим класифікатором є CPVS. Майно може бути здане в оренду, при передачі " "значення PA01-7 в полі класифікатора CPVS." -#~ msgid "ID of related :ref:`lot`." -#~ msgstr "ID пов’язаного :ref:`lot`." +#~ msgid "ID of related :ref:`Lot`." +#~ msgstr "ID пов’язаного :ref:`Lot`." #~ msgid "" #~ "|ocdsDescription| The primary classification for the item. See the " diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/organization.po b/docs/source/locale/uk/LC_MESSAGES/standard/organization.po index 81f1e8d..2ac8763 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/organization.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/organization.po @@ -2,7 +2,7 @@ # Zoriana Zaiats , 2016. msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-10-13 17:23+0200\n" @@ -16,53 +16,33 @@ msgstr "" "=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/organization.rst:9 msgid "Organization" msgstr "Organization" -#: ../../source/standard/organization.rst:12 -#: ../../source/standard/organization.rst:40 -#: ../../source/standard/organization.rst:89 -#: ../../source/standard/organization.rst:130 msgid "Schema" msgstr "Схема" -#: ../../source/standard/organization.rst:15 -#: ../../source/standard/organization.rst:64 msgid "string, multilingual" msgstr "рядок, багатомовний" -#: ../../source/standard/organization.rst:20 msgid ":ref:`Identifier`" msgstr ":ref:`Identifier`" -#: ../../source/standard/organization.rst:25 msgid "List of :ref:`identifier` objects" msgstr "Список об’єктів :ref:`identifier`" -#: ../../source/standard/organization.rst:27 msgid ":ref:`Address`, required" msgstr ":ref:`Address`, обов’язково" -#: ../../source/standard/organization.rst:29 msgid ":ref:`ContactPoint`, required" msgstr ":ref:`ContactPoint`, обов’язково" -#: ../../source/standard/organization.rst:37 msgid "Identifier" msgstr "Identifier" -#: ../../source/standard/organization.rst:43 -#: ../../source/standard/organization.rst:92 -#: ../../source/standard/organization.rst:98 -#: ../../source/standard/organization.rst:104 -#: ../../source/standard/organization.rst:110 -#: ../../source/standard/organization.rst:145 -#: ../../source/standard/organization.rst:151 msgid "string" msgstr "рядок" -#: ../../source/standard/organization.rst:45 msgid "" "|ocdsDescription| Organization identifiers be drawn from an existing " "identification scheme. This field is used to indicate the scheme or codelist" @@ -74,16 +54,13 @@ msgstr "" "ідентифікатор організації. Це значення повинно братись зі Схеми " "Ідентифікації Організацій." -#: ../../source/standard/organization.rst:52 msgid "string, required" msgstr "рядок, обов’язковий" -#: ../../source/standard/organization.rst:54 msgid "" "|ocdsDescription| The identifier of the organization in the selected scheme." msgstr "|ocdsDescription| Ідентифікатор організації у вибраній схемі." -#: ../../source/standard/organization.rst:57 msgid "" "The allowed codes are the ones found in `\"Organisation Registration " "Agency\" codelist of IATI Standard " @@ -97,15 +74,12 @@ msgstr "" "додаванням коду `UA-EDR` для організацій, зареєстрованих в Україні (ЄДРПОУ " "та ІПН)." -#: ../../source/standard/organization.rst:66 msgid "|ocdsDescription| The legally registered name of the organization." msgstr "|ocdsDescription| Легально зареєстрована назва організації." -#: ../../source/standard/organization.rst:72 msgid "uri" msgstr "uri" -#: ../../source/standard/organization.rst:74 msgid "" "|ocdsDescription| A URI to identify the organization, such as those provided" " by Open Corporates or some other relevant URI provider. This is not for " @@ -116,41 +90,31 @@ msgstr "" "надають Open Corporates або інші постачальники URI. Це не для вебсайту " "організації, його можна надати в полі url в ContactPoint організації." -#: ../../source/standard/organization.rst:86 msgid "Address" msgstr "Address" -#: ../../source/standard/organization.rst:94 msgid "" "|ocdsDescription| The street address. For example, 1600 Amphitheatre Pkwy." msgstr "|ocdsDescription| Вулиця. Наприклад, вул.Хрещатик, 22." -#: ../../source/standard/organization.rst:100 msgid "|ocdsDescription| The locality. For example, Mountain View." msgstr "|ocdsDescription| Населений пункт. Наприклад, Київ." -#: ../../source/standard/organization.rst:106 msgid "|ocdsDescription| The region. For example, CA." msgstr "|ocdsDescription| Область. Наприклад, Київська." -#: ../../source/standard/organization.rst:112 msgid "|ocdsDescription| The postal code. For example, 94043." msgstr "|ocdsDescription| Поштовий індекс, Наприклад, 78043." -#: ../../source/standard/organization.rst:116 -#: ../../source/standard/organization.rst:133 msgid "string, multilingual, required" msgstr "рядок, багатомовний, обов’язковий" -#: ../../source/standard/organization.rst:118 msgid "|ocdsDescription| The country name. For example, United States." msgstr "|ocdsDescription| Назва країни. Наприклад, Україна." -#: ../../source/standard/organization.rst:127 msgid "ContactPoint" msgstr "ContactPoint" -#: ../../source/standard/organization.rst:135 msgid "" "|ocdsDescription| The name of the contact person, department, or contact " "point, for correspondence relating to this contracting process." @@ -158,15 +122,12 @@ msgstr "" "|ocdsDescription| Ім’я контактної особи, назва відділу чи контактного пункту" " для листування, що стосується цього процесу укладання договору." -#: ../../source/standard/organization.rst:139 msgid "email" msgstr "email" -#: ../../source/standard/organization.rst:141 msgid "|ocdsDescription| The e-mail address of the contact point/person." msgstr "|ocdsDescription| Адреса електронної пошти контактної особи/пункту." -#: ../../source/standard/organization.rst:147 msgid "" "|ocdsDescription| The telephone number of the contact point/person. This " "should include the international dialling code." @@ -174,7 +135,6 @@ msgstr "" "|ocdsDescription| Номер телефону контактної особи/пункту. Повинен включати " "міжнародний телефонний код." -#: ../../source/standard/organization.rst:153 msgid "" "|ocdsDescription| The fax number of the contact point/person. This should " "include the international dialling code." @@ -182,28 +142,22 @@ msgstr "" "|ocdsDescription| Номер факсу контактної особи/пункту. Повинен включати " "міжнародний телефонний код." -#: ../../source/standard/organization.rst:159 msgid "|ocdsDescription| A web address for the contact point/person." msgstr "|ocdsDescription| Веб адреса контактної особи/пункту." -#: ../../source/standard/organization.rst:163 msgid "Either `email` or `telephone` field has to be provided." msgstr "" "Повинне бути заповнене хоча б одне з полів: або `email`, або `telephone`." -#: ../../source/standard/organization.rst:17 msgid "Name of the organization." msgstr "Назва організації." -#: ../../source/standard/organization.rst:22 msgid "The primary identifier for this organization." msgstr "Ідентифікатор цієї організації." -#: ../../source/standard/organization.rst:157 msgid "URL" msgstr "URL-адреса" -#: ../../source/standard/organization.rst:69 msgid "Full legal name (e.g. Nadra Bank)." msgstr "Повна юридична назва (наприклад - “Надра Банк”)." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/procuringentity.po b/docs/source/locale/uk/LC_MESSAGES/standard/procuringentity.po index 44ff3c3..16e5d34 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/procuringentity.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/procuringentity.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 14:36+0200\n" @@ -15,59 +15,45 @@ msgstr "" "=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/procuringentity.rst:12 msgid "Schema" msgstr "Схема" -#: ../../source/standard/procuringentity.rst:15 msgid "string, multilingual" msgstr "рядок, багатомовний" -#: ../../source/standard/procuringentity.rst:17 msgid "|ocdsDescription| The common name of the organization." msgstr "|ocdsDescription| Назва організації." -#: ../../source/standard/procuringentity.rst:21 msgid ":ref:`Identifier`" msgstr ":ref:`Identifier`" -#: ../../source/standard/procuringentity.rst:23 msgid "|ocdsDescription| The primary identifier for this organization." msgstr "|ocdsDescription| Ідентифікатор цієї організації." -#: ../../source/standard/procuringentity.rst:27 msgid "List of :ref:`identifier` objects" msgstr "Список об’єктів :ref:`identifier`" -#: ../../source/standard/procuringentity.rst:30 msgid ":ref:`Address`, required" msgstr ":ref:`Address`, обов’язково" -#: ../../source/standard/procuringentity.rst:33 msgid ":ref:`ContactPoint`, required" msgstr ":ref:`ContactPoint`, обов’язково" -#: ../../source/standard/procuringentity.rst:36 msgid "string" msgstr "рядок" -#: ../../source/standard/procuringentity.rst:43 msgid "Possible values:" msgstr "Можливі значення:" -#: ../../source/standard/procuringentity.rst:9 msgid "ProcuringEntity (Organizer)" msgstr "ProcuringEntity (Організатор)" -#: ../../source/standard/procuringentity.rst:38 msgid "Type of organizer" msgstr "Тип організатора" -#: ../../source/standard/procuringentity.rst:41 msgid "``general`` - Organizer (general)" msgstr "``general`` - Організатор (загальний)" -#: ../../source/standard/procuringentity.rst:42 msgid "" "``special`` - Organizer that operates in certain spheres of economic " "activity" @@ -75,7 +61,6 @@ msgstr "" "``special`` - Організатор, що здійснює діяльність в окремих сферах " "господарювання" -#: ../../source/standard/procuringentity.rst:43 msgid "" "``other`` - Legal persons that are not organizers in the sense of the Law, " "but are state, utility, public enterprises, economic partnerships or " diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/question.po b/docs/source/locale/uk/LC_MESSAGES/standard/question.po index 6fb64d8..cd539b5 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/question.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/question.po @@ -2,7 +2,7 @@ # Zoriana Zaiats , 2016. msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-10-13 18:08+0200\n" @@ -16,19 +16,15 @@ msgstr "" "=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/question.rst:7 msgid "Question" msgstr "Question" -#: ../../source/standard/question.rst:10 msgid "Schema" msgstr "Схема" -#: ../../source/standard/question.rst:16 msgid ":ref:`Organization`, required" msgstr ":ref:`Organization`, обов’язково" -#: ../../source/standard/question.rst:18 msgid "" "Who is asking a question (contactPoint - person, identification - " "organization that person represents)." @@ -36,57 +32,44 @@ msgstr "" "Хто задає питання (contactPoint - людина, identification - організація, яку " "ця людина представляє)." -#: ../../source/standard/question.rst:21 msgid "string, required" msgstr "рядок, обов’язковий" -#: ../../source/standard/question.rst:23 msgid "Title of the question." msgstr "Назва запитання." -#: ../../source/standard/question.rst:26 ../../source/standard/question.rst:36 -#: ../../source/standard/question.rst:41 ../../source/standard/question.rst:50 msgid "string" msgstr "рядок" -#: ../../source/standard/question.rst:28 msgid "Description of the question." msgstr "Опис запитання." -#: ../../source/standard/question.rst:31 -msgid "string, :ref:`date`, auto-generated" -msgstr "рядок, :ref:`date`, генерується автоматично" +msgid "string, :ref:`Date`, auto-generated" +msgstr "рядок, :ref:`Date`, генерується автоматично" -#: ../../source/standard/question.rst:33 msgid "Date of posting." msgstr "Дата публікації." -#: ../../source/standard/question.rst:43 msgid "Possible values are:" msgstr "Можливі значення:" -#: ../../source/standard/question.rst:45 msgid "`auction`" msgstr "`auction`" -#: ../../source/standard/question.rst:46 msgid "`item`" msgstr "`item`" -#: ../../source/standard/question.rst:13 msgid "UID, auto-generated" msgstr "UID, генерується автоматично" -#: ../../source/standard/question.rst:38 msgid "Answer for the question." msgstr "Відповідь на задане питання." -#: ../../source/standard/question.rst:52 -msgid "ID of related :ref:`item`." -msgstr "Ідентифікатор пов'язаних об'єктів :ref:`item`." +msgid "ID of related :ref:`Item`." +msgstr "Ідентифікатор пов'язаних об'єктів :ref:`Item`." #~ msgid "`lot`" #~ msgstr "`lot`" -#~ msgid "ID of related :ref:`lot` or :ref:`item`." -#~ msgstr "Ідентифікатор пов'язаних об'єктів :ref:`lot` або :ref:`item`." +#~ msgid "ID of related :ref:`Lot` or :ref:`Item`." +#~ msgstr "Ідентифікатор пов'язаних об'єктів :ref:`Lot` або :ref:`Item`." diff --git a/docs/source/locale/uk/LC_MESSAGES/standard/util.po b/docs/source/locale/uk/LC_MESSAGES/standard/util.po index 64f0b1c..2fa47db 100644 --- a/docs/source/locale/uk/LC_MESSAGES/standard/util.po +++ b/docs/source/locale/uk/LC_MESSAGES/standard/util.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 14:35+0200\n" @@ -15,85 +15,63 @@ msgstr "" "=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: ../../source/standard/util.rst:8 msgid "Period" msgstr "Period" -#: ../../source/standard/util.rst:11 ../../source/standard/util.rst:41 -#: ../../source/standard/util.rst:67 ../../source/standard/util.rst:84 msgid "Schema" msgstr "Схема" -#: ../../source/standard/util.rst:14 ../../source/standard/util.rst:20 -#: ../../source/standard/util.rst:70 -msgid "string, :ref:`date`" -msgstr "рядок, :ref:`date`" +msgid "string, :ref:`Date`" +msgstr "рядок, :ref:`Date`" -#: ../../source/standard/util.rst:16 msgid "|ocdsDescription| The start date for the period." msgstr "|ocdsDescription| Початкова дата періоду." -#: ../../source/standard/util.rst:22 msgid "|ocdsDescription| The end date for the period." msgstr "|ocdsDescription| Кінцева дата періоду." -#: ../../source/standard/util.rst:25 msgid "`startDate` should always precede `endDate`." msgstr "Значення `startDate` завжди повинно йти перед `endDate`." -#: ../../source/standard/util.rst:30 msgid "Date" msgstr "Date" -#: ../../source/standard/util.rst:32 msgid "Date/time in :ref:`date-format`." msgstr "Дата/час у :ref:`date-format`." -#: ../../source/standard/util.rst:38 msgid "Value" msgstr "Value" -#: ../../source/standard/util.rst:44 ../../source/standard/util.rst:87 msgid "float, required" msgstr "float, обов’язково" -#: ../../source/standard/util.rst:46 ../../source/standard/util.rst:89 msgid "|ocdsDescription| Amount as a number." msgstr "|ocdsDescription| Кількість як число." -#: ../../source/standard/util.rst:49 ../../source/standard/util.rst:92 msgid "Should be positive." msgstr "Повинно бути додатнім." -#: ../../source/standard/util.rst:52 msgid "string, required" msgstr "рядок, обов’язковий" -#: ../../source/standard/util.rst:54 ../../source/standard/util.rst:97 msgid "|ocdsDescription| The currency in 3-letter ISO 4217 format." msgstr "|ocdsDescription| Валюта у трибуквенному форматі ISO 4217." -#: ../../source/standard/util.rst:58 msgid "bool, required" msgstr "булеве значення, обов’язково" -#: ../../source/standard/util.rst:64 msgid "Revision" msgstr "Revision" -#: ../../source/standard/util.rst:72 msgid "Date when changes were recorded." msgstr "Дата, коли зміни були записані." -#: ../../source/standard/util.rst:75 msgid "List of `Change` objects" msgstr "Список об’єктів `Change`" -#: ../../source/standard/util.rst:81 msgid "Guarantee" msgstr "Guarantee" -#: ../../source/standard/util.rst:95 msgid "string, required, default = `UAH`" msgstr "рядок, обов’язковий, за замовчуванням = `UAH`" diff --git a/docs/source/locale/uk/LC_MESSAGES/tutorial.po b/docs/source/locale/uk/LC_MESSAGES/tutorial.po index 05ee640..958065a 100644 --- a/docs/source/locale/uk/LC_MESSAGES/tutorial.po +++ b/docs/source/locale/uk/LC_MESSAGES/tutorial.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-26 11:24+0200\n" @@ -395,11 +395,11 @@ msgstr "Та дискваліфікувати кандидата:" msgid "" "In order to specify illustration display order, `index` field can be used " -"(for details see :ref:`document`). Since this illustration should be " +"(for details see :ref:`Document`). Since this illustration should be " "displayed first, it has ``\"index\": 1``." msgstr "" "Для того, щоб вказати порядок відображення ілюстрацій, використовується поле" -" `index` (див. :ref:`document`). Оскільки ця ілюстрація повинна бути " +" `index` (див. :ref:`Document`). Оскільки ця ілюстрація повинна бути " "відображена першою, то вказується ``\"index\": 1``." msgid "" diff --git a/docs/source/locale/uk/LC_MESSAGES/upload.po b/docs/source/locale/uk/LC_MESSAGES/upload.po index f658201..3868a11 100644 --- a/docs/source/locale/uk/LC_MESSAGES/upload.po +++ b/docs/source/locale/uk/LC_MESSAGES/upload.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: openprocurement.auctions.dgf 0.1\n" +"Project-Id-Version: openprocurement.auctions.lease 1.1.1-sale\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-12 15:36+0300\n" "PO-Revision-Date: 2016-09-15 13:24+0200\n" diff --git a/docs/source/standard/auction.rst b/docs/source/standard/auction.rst index ece47dc..1c7f7b6 100644 --- a/docs/source/standard/auction.rst +++ b/docs/source/standard/auction.rst @@ -2,7 +2,7 @@ .. include:: defs.hrst .. index:: Auction, Auction -.. _auction: +.. _Auction: Auction ======= @@ -45,7 +45,7 @@ Schema :value: - :ref:`value`, required, editable during enquiryPeriod + :ref:`Value`, required, editable during enquiryPeriod Total available auction budget. Bids lower than ``value`` will be rejected. @@ -58,7 +58,7 @@ Schema Bid guarantee :items: - list of :ref:`item` objects, required, editable during enquiryPeriod + list of :ref:`Item` objects, required, editable during enquiryPeriod List that contains single item being sold. @@ -71,23 +71,23 @@ Schema Features of auction. :documents: - List of :ref:`document` objects + List of :ref:`Document` objects |ocdsDescription| All documents and attachments related to the auction. :questions: - List of :ref:`question` objects + List of :ref:`Question` objects Questions to ``procuringEntity`` and answers to them. :complaints: - List of :ref:`complaint` objects + List of :ref:`Complaint` objects Complaints to auction conditions and their resolutions. :bids: - List of :ref:`bid` objects + List of :ref:`Bid` objects A list of all bids placed in the auction with information about participants, their proposals and other qualification documentation. @@ -105,7 +105,7 @@ Schema for the procedure to be successful. Therewith the auction is omitted and that bid turns to a qualified award. :minimalStep: - :ref:`value`, required, editable during enquiryPeriod + :ref:`Value`, required, editable during enquiryPeriod The minimal step of auction. Validation rules: @@ -114,7 +114,7 @@ Schema * `valueAddedTaxIncluded` should either be absent or match `Auction.value.valueAddedTaxIncluded` :awards: - List of :ref:`award` objects + List of :ref:`Award` objects All qualifications (disqualifications and awards). @@ -122,7 +122,7 @@ Schema List of :ref:`Contract` objects :enquiryPeriod: - :ref:`period` + :ref:`Period` Period when questions are allowed. @@ -130,7 +130,7 @@ Schema The period during which enquiries may be made and will be answered. :tenderPeriod: - :ref:`period` + :ref:`Period` Period when bids can be submitted. @@ -138,7 +138,7 @@ Schema The period when the auction is open for submissions. The end date is the closing date for auction submissions. :auctionPeriod: - :ref:`period`, required + :ref:`Period`, required Period when Auction is conducted. `startDate` should be provided. @@ -148,7 +148,7 @@ Schema A web address where auction is accessible for view. :awardPeriod: - :ref:`period`, read-only + :ref:`Period`, read-only Awarding process period. @@ -189,7 +189,7 @@ Schema * ``eligibilityCriteria_en`` (English) - Only licensed financial institutions are eligible to participate. .. :lots: - List of :ref:`lot` objects. + List of :ref:`Lot` objects. Contains all auction lots. diff --git a/docs/source/standard/award.rst b/docs/source/standard/award.rst index b4d7cc7..2a93781 100644 --- a/docs/source/standard/award.rst +++ b/docs/source/standard/award.rst @@ -2,7 +2,7 @@ .. include:: defs.hrst .. index:: Award -.. _award: +.. _Award: Award ===== @@ -53,7 +53,7 @@ Schema The date of the contract award. :value: - `Value` object, auto-generated, read-only + :ref:`Value` object, auto-generated, read-only |ocdsDescription| The total value of this award. @@ -80,11 +80,11 @@ Schema List of :ref:`Complaint` objects :complaintPeriod: - :ref:`period` + :ref:`Period` The time frame when complaints can be submitted. .. :lotID: string - ID of related :ref:`lot`. + ID of related :ref:`Lot`. diff --git a/docs/source/standard/bid.rst b/docs/source/standard/bid.rst index a4a655d..5884d93 100644 --- a/docs/source/standard/bid.rst +++ b/docs/source/standard/bid.rst @@ -2,7 +2,7 @@ .. index:: Bid, Parameter, LotValue, bidder, participant, pretendent -.. _bid: +.. _Bid: Bid === @@ -14,7 +14,7 @@ Schema List of :ref:`Organization` objects :date: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date when bid has been submitted. @@ -98,10 +98,10 @@ Schema :relatedLot: string - ID of related :ref:`lot`. + ID of related :ref:`Lot`. :date: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated :participationUrl: URL diff --git a/docs/source/standard/cancellation.rst b/docs/source/standard/cancellation.rst index bc12005..09e1bac 100644 --- a/docs/source/standard/cancellation.rst +++ b/docs/source/standard/cancellation.rst @@ -2,7 +2,7 @@ .. include:: defs.hrst .. index:: Cancellation -.. _cancellation: +.. _Cancellation: Cancellation ============ @@ -34,7 +34,7 @@ Schema with decision to cancel the Auction. :date: - string, :ref:`date` + string, :ref:`Date` Cancellation date. @@ -44,9 +44,10 @@ Schema Possible values are: * `auction` + .. * `lot` .. :relatedLot: string - ID of related :ref:`lot`. + ID of related :ref:`Lot`. diff --git a/docs/source/standard/complaint.rst b/docs/source/standard/complaint.rst index d751ee9..9a2f843 100644 --- a/docs/source/standard/complaint.rst +++ b/docs/source/standard/complaint.rst @@ -3,7 +3,7 @@ .. index:: Complaint, dispute -.. _complaint: +.. _Complaint: Complaint ========= @@ -28,32 +28,32 @@ Schema Description of the issue. :date: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date of posting. :dateSubmitted: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date when claim was submitted. :dateAnswered: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date when Organizer answered the claim. :dateEscalated: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date of claim to complaint escalation. :dateDecision: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date of complaint decision. :dateCanceled: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date of cancelling. @@ -114,7 +114,7 @@ Schema .. :relatedLot: string - ID of related :ref:`lot`. + ID of related :ref:`Lot`. :auctionerAction: string @@ -122,6 +122,6 @@ Schema Participants's action. :auctionerActionDate: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date of participant's action. diff --git a/docs/source/standard/contract.rst b/docs/source/standard/contract.rst index f20aadf..180484b 100644 --- a/docs/source/standard/contract.rst +++ b/docs/source/standard/contract.rst @@ -41,7 +41,7 @@ Schema Contract description :value: - `Value` object, auto-generated, read-only + :ref:`Value` object, auto-generated, read-only |ocdsDescription| The total value of this contract. @@ -79,13 +79,13 @@ Schema The start and end date for the contract. :dateSigned: - string, :ref:`date` + string, :ref:`Date` |ocdsDescription| The date the contract was signed. In the case of multiple signatures, the date of the last signature. :date: - string, :ref:`date` + string, :ref:`Date` The date when the contract was changed or activated. diff --git a/docs/source/standard/document.rst b/docs/source/standard/document.rst index 1d1ac2e..575823b 100644 --- a/docs/source/standard/document.rst +++ b/docs/source/standard/document.rst @@ -17,7 +17,7 @@ Schema :documentType: string - Possible values for :ref:`auction` + Possible values for :ref:`Auction` * `notice` - **Auction notice** @@ -40,7 +40,7 @@ Schema Information on bidders or participants, their validation documents and any procedural exemptions for which they qualify. - * `virtualDataRoom` - **Virtual Data Room** (available only for the `dgfFinancialAssets` procedure, see :ref:`fintutorial`) + * `virtualDataRoom` - **Virtual Data Room** * `illustration` - **Illustrations** @@ -56,7 +56,7 @@ Schema A non-disclosure agreement between a participant and a bank/Deposit Guarantee Fund. - Possible values for :ref:`award` + Possible values for :ref:`Award` * `winningBid` - **Winning Bid** @@ -73,7 +73,7 @@ Schema * `contractAnnexe` - **Annexes to the Contract** - Possible values for :ref:`bid` + Possible values for :ref:`Bid` * `commercialProposal` - **Сommercial proposal** @@ -82,7 +82,7 @@ Schema * `eligibilityDocuments` - **Eligibility documents** - * `financialLicense` - **License** (available only for the `dgfFinancialAssets` procedure, see :ref:`fintutorial`) + * `financialLicense` - **License** * `auctionProtocol` - **Auction protocol** @@ -119,13 +119,13 @@ Schema Direct link to the document or attachment. :datePublished: - string, :ref:`date` + string, :ref:`Date` |ocdsDescription| The date on which the document was first published. :dateModified: - string, :ref:`date` + string, :ref:`Date` |ocdsDescription| Date that the document was last modified @@ -143,14 +143,15 @@ Schema * `auction` * `item` + .. * `lot` :relatedItem: string - ID of related :ref:`item`. + ID of related :ref:`Item`. -.. ID of related :ref:`lot` or :ref:`item`. +.. ID of related :ref:`Lot` or :ref:`Item`. * `biddingDocuments` - **Bidding Documents** diff --git a/docs/source/standard/item.rst b/docs/source/standard/item.rst index 2ac96c7..6095084 100644 --- a/docs/source/standard/item.rst +++ b/docs/source/standard/item.rst @@ -91,7 +91,7 @@ Schema .. :relatedLot: string - ID of related :ref:`lot`. + ID of related :ref:`Lot`. .. _Classification: diff --git a/docs/source/standard/question.rst b/docs/source/standard/question.rst index 0c2a539..5575ac7 100644 --- a/docs/source/standard/question.rst +++ b/docs/source/standard/question.rst @@ -1,7 +1,7 @@ .. . Kicking page rebuild 2014-10-30 17:00:08 .. index:: Question, Answer, Author -.. _question: +.. _Question: Question ======== @@ -28,7 +28,7 @@ Schema Description of the question. :date: - string, :ref:`date`, auto-generated + string, :ref:`Date`, auto-generated Date of posting. @@ -44,12 +44,13 @@ Schema * `auction` * `item` + .. * `lot` :relatedItem: string - ID of related :ref:`item`. + ID of related :ref:`Item`. -.. ID of related :ref:`lot` or :ref:`item`. +.. ID of related :ref:`Lot` or :ref:`Item`. diff --git a/docs/source/standard/util.rst b/docs/source/standard/util.rst index 39d3e17..575e340 100644 --- a/docs/source/standard/util.rst +++ b/docs/source/standard/util.rst @@ -2,7 +2,7 @@ .. include:: defs.hrst .. index:: Period, startDate, endDate -.. _period: +.. _Period: Period ====== @@ -11,13 +11,13 @@ Schema ------ :startDate: - string, :ref:`date` + string, :ref:`Date` |ocdsDescription| The start date for the period. :endDate: - string, :ref:`date` + string, :ref:`Date` |ocdsDescription| The end date for the period. @@ -32,7 +32,7 @@ Date Date/time in :ref:`date-format`. .. index:: Value, Currency, VAT -.. _value: +.. _Value: Value ===== @@ -67,7 +67,7 @@ Schema ------ :date: - string, :ref:`date` + string, :ref:`Date` Date when changes were recorded. @@ -75,7 +75,7 @@ Schema List of `Change` objects -.. _guarantee: +.. _Guarantee: Guarantee ========= diff --git a/docs/source/tutorial.rst b/docs/source/tutorial.rst index abba785..dee54d6 100644 --- a/docs/source/tutorial.rst +++ b/docs/source/tutorial.rst @@ -119,7 +119,7 @@ Organizer can edit procedure only during *enquiryPeriod*. When this period ends 403 error will be returned on editing attempt: -.. include:: tutorial/out-of-enquiryperiod-editing-denied.http +.. .. include:: tutorial/out-of-enquiryperiod-editing-denied.http :code: @@ -170,7 +170,7 @@ Uploading illustration Organizer can upload illustration files into the created auction. Uploading should follow the :ref:`upload` rules. -In order to specify illustration display order, `index` field can be used (for details see :ref:`document`). Since this illustration should be displayed first, it has ``"index": 1``. +In order to specify illustration display order, `index` field can be used (for details see :ref:`Document`). Since this illustration should be displayed first, it has ``"index": 1``. .. include:: tutorial/upload-first-auction-illustration.http :code: @@ -416,7 +416,7 @@ Only the request that has been activated (3rd step above) has power to cancel auction. I.e. you have to not only prepare cancellation request but to activate it as well. -See :ref:`cancellation` data structure for details. +See :ref:`Cancellation` data structure for details. Preparing the cancellation request ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/source/tutorial/activate-bidder.http b/docs/source/tutorial/activate-bidder.http index f5d8b82..ab6ed3d 100644 --- a/docs/source/tutorial/activate-bidder.http +++ b/docs/source/tutorial/activate-bidder.http @@ -1,7 +1,7 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4?acc_token=a94a2b6627aa46f3bbb83ff885e3beae HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 30 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4?acc_token=650aaa4270024deaac41cb856120c3c5 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 30 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,7 +12,8 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { @@ -22,7 +23,7 @@ Content-Type: application/json; charset=UTF-8 "amount": 500.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:26.821209+02:00", + "date": "2018-05-28T19:03:05.400869+03:00", "qualified": true, "tenderers": [ { @@ -47,7 +48,7 @@ Content-Type: application/json; charset=UTF-8 } ], "owner": "broker", - "id": "afaa508128da4829b9202fe300965bf4" + "id": "4ed57eda57b941399523f19f03b9ada4" } } diff --git a/docs/source/tutorial/activate-finbidder.http b/docs/source/tutorial/activate-finbidder.http deleted file mode 100644 index 6718ac9..0000000 --- a/docs/source/tutorial/activate-finbidder.http +++ /dev/null @@ -1,18 +0,0 @@ -PATCH /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/c7a52fb296b143cc87728f74b2585fca?acc_token=b6c5e3c4087848a08703ae24889033a7 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 30 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "status": "active" - } -} - - -200 OK -Content-Type: application/json; charset=UTF-8 - -null - diff --git a/docs/source/tutorial/active-cancellation.http b/docs/source/tutorial/active-cancellation.http index 0c30cd7..79b278c 100644 --- a/docs/source/tutorial/active-cancellation.http +++ b/docs/source/tutorial/active-cancellation.http @@ -1,7 +1,7 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/cancellations/3fd26d96a4454abf9a875bef110dba4e?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 30 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/cancellations/5b7b7e9fbe0340f5ad88eccc7ced1c51?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 30 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,7 +12,8 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { @@ -22,29 +23,29 @@ Content-Type: application/json; charset=UTF-8 "hash": "md5:00000000000000000000000000000000", "description": "Changed description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/02dd9977d20e4b409d307bc67ee6ca36?KeyID=8473a74a&Signature=5WtHn%252BXf4U2eKnBY5mwdZNifHaf%2FMoApsRroJSOzQBI%252BdJ5ZwCkP%252BTZmjkZ%2FDOh1M4U5JY7u1MJE8%252Bp7YQOSBw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/7fad0841b4c04a34a0781b5d9df39299?KeyID=7149c8cc&Signature=eUJfguREMN77TKqJoyrlz%2FApEeUDvgZU9XhPBnaBegBMH8jSxwBRpzwr87dhEd3bK16kfFwoUn3JVSWqae6OAA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.945693+02:00", - "dateModified": "2017-11-30T16:56:29.945720+02:00", - "id": "6aebbc98305a4847830bdc40863a4d6b" + "datePublished": "2018-05-28T19:03:07.723456+03:00", + "dateModified": "2018-05-28T19:03:07.723479+03:00", + "id": "45baf4951469459394de757f4c50b394" }, { "hash": "md5:00000000000000000000000000000000", "description": "Changed description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1981cae19a6d4577bf343cf0b7d813f5?KeyID=8473a74a&Signature=6PDYxf6GgOgkJuoH%2FR4qtBFHx%2FEcXKpV9NJ0lWVPu7IBKLdQ8%252ByiK5kIQk5YZ9aebaDik0e4JNDdJihcZVA%252BBg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/f3b6995285c4491db7d8df528e48aeb4?KeyID=7149c8cc&Signature=V21tF8lhwqSmzPprBLYz8aNyWVvyDYsRc5wzBCakSQ8y6l3iCExbaMwc954xcldHZjLdRT54YkBNR1obYBMtCw%253D%253D", "title": "Notice-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.945693+02:00", - "dateModified": "2017-11-30T16:56:30.284752+02:00", - "id": "6aebbc98305a4847830bdc40863a4d6b" + "datePublished": "2018-05-28T19:03:07.723456+03:00", + "dateModified": "2018-05-28T19:03:07.960503+03:00", + "id": "45baf4951469459394de757f4c50b394" } ], "reason": "cancellation reason", - "date": "2017-11-30T16:56:30.483484+02:00", + "date": "2018-05-28T19:03:08.092234+03:00", "cancellationOf": "tender", - "id": "3fd26d96a4454abf9a875bef110dba4e" + "id": "5b7b7e9fbe0340f5ad88eccc7ced1c51" } } diff --git a/docs/source/tutorial/add-asset-familiarization-document.http b/docs/source/tutorial/add-asset-familiarization-document.http index d23f4b7..845d056 100644 --- a/docs/source/tutorial/add-asset-familiarization-document.http +++ b/docs/source/tutorial/add-asset-familiarization-document.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 160 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 160 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -14,8 +14,9 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/b31139eea309435592a725e115dc90ed +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/f08b3a9250ab4539b492080a538da808 +X-Content-Type-Options: nosniff { "data": { @@ -23,10 +24,10 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "format": "offline/on-site-examination", "accessDetails": "Familiar with asset: days, time, address", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.520040+02:00", + "datePublished": "2018-05-28T19:03:05.169280+03:00", "documentType": "x_dgfAssetFamiliarization", - "dateModified": "2017-11-30T16:56:26.520067+02:00", - "id": "b31139eea309435592a725e115dc90ed" + "dateModified": "2018-05-28T19:03:05.169300+03:00", + "id": "f08b3a9250ab4539b492080a538da808" } } diff --git a/docs/source/tutorial/answer-question.http b/docs/source/tutorial/answer-question.http index ab98065..e193b8a 100644 --- a/docs/source/tutorial/answer-question.http +++ b/docs/source/tutorial/answer-question.http @@ -1,7 +1,7 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/questions/e966c8cdacc14655907b34713b141d18?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 162 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/questions/22c3e98b31fd4c50bab5639de0668f1c?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 162 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,15 +12,16 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "description": "Просимо додати таблицю потрібної калорійності харчування", "title": "Калорійність", - "date": "2017-11-30T16:56:26.610507+02:00", + "date": "2018-05-28T19:03:05.241690+03:00", "answer": "Таблицю додано в файлі \"Kalorijnist.xslx\"", - "id": "e966c8cdacc14655907b34713b141d18", + "id": "22c3e98b31fd4c50bab5639de0668f1c", "questionOf": "tender" } } diff --git a/docs/source/tutorial/ask-question.http b/docs/source/tutorial/ask-question.http index 0ff5ede..ad261ac 100644 --- a/docs/source/tutorial/ask-question.http +++ b/docs/source/tutorial/ask-question.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/questions HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 1506 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/questions HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 1506 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -34,8 +34,9 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/questions/e966c8cdacc14655907b34713b141d18 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/questions/22c3e98b31fd4c50bab5639de0668f1c +X-Content-Type-Options: nosniff { "data": { @@ -62,8 +63,8 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "locality": "м. Вінниця" } }, - "date": "2017-11-30T16:56:26.610507+02:00", - "id": "e966c8cdacc14655907b34713b141d18", + "date": "2018-05-28T19:03:05.241690+03:00", + "id": "22c3e98b31fd4c50bab5639de0668f1c", "questionOf": "tender" } } diff --git a/docs/source/tutorial/auction-contract-get-documents-again.http b/docs/source/tutorial/auction-contract-get-documents-again.http index 9b908eb..123af14 100644 --- a/docs/source/tutorial/auction-contract-get-documents-again.http +++ b/docs/source/tutorial/auction-contract-get-documents-again.http @@ -1,32 +1,33 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00/documents HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ { "hash": "md5:00000000000000000000000000000000", "format": "application/msword", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/5bd3f7a02ff44727b232621207f1b851?KeyID=8473a74a&Signature=JQHt0PL4w47AD3VLzHc10HkPeKF1%252BHLSabNSU66N7xOOgzeZ5ABgvszpMW%252Bf1dAvGCTqIVBaD2EYUV1iUuYZAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/896d489da9d74cc9b38e1b8acb6caf01?KeyID=7149c8cc&Signature=%2FPNXKssC1k3uSmpkRC5HNRsKm%2FqqhKJCfz7iGpg4NvXw5zpliC1cbosi9mcf5XA%252BAYoV7%2FVHlpyb1tY7n%2FS0Dw%253D%253D", "title": "contract_first_document.doc", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.913379+02:00", - "dateModified": "2017-11-30T16:56:28.913410+02:00", - "id": "1702fe06543e4c10b6f0bcb0aa694e8c" + "datePublished": "2018-05-28T19:03:06.977922+03:00", + "dateModified": "2018-05-28T19:03:06.977944+03:00", + "id": "8f222525b9e14ddcbc45f735d686ec53" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/msword", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/4d1df678191e499cbb764244f4469b22?KeyID=8473a74a&Signature=jAmAX7MaWviKJdsUEYM2RR8oXbt8vNobcDP6zqadHWj%252BoQKkUnjVwDry6HmSExDU7DJCqVN9ReLo4mMzNmibBQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/56888ce263254954812bd739c579b282?KeyID=7149c8cc&Signature=KpqYmCHeGiflvKB6J6m36no4so%2FXztSIKeEsGa2e1QwOZZVYoxXKwVuL0oIqLDmJDY1eCeM2NJ2fd5qOvgHnCw%253D%253D", "title": "contract_second_document.doc", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.118456+02:00", - "dateModified": "2017-11-30T16:56:29.118484+02:00", - "id": "5c42650d4e074aae85732d8655eec1b7" + "datePublished": "2018-05-28T19:03:07.239455+03:00", + "dateModified": "2018-05-28T19:03:07.239484+03:00", + "id": "8b9fef12b1bf4667aea993380a35f276" } ] } diff --git a/docs/source/tutorial/auction-contract-get-documents.http b/docs/source/tutorial/auction-contract-get-documents.http index 74fa6c8..5196782 100644 --- a/docs/source/tutorial/auction-contract-get-documents.http +++ b/docs/source/tutorial/auction-contract-get-documents.http @@ -1,22 +1,23 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00/documents HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ { "hash": "md5:00000000000000000000000000000000", "format": "application/msword", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/5bd3f7a02ff44727b232621207f1b851?KeyID=8473a74a&Signature=JQHt0PL4w47AD3VLzHc10HkPeKF1%252BHLSabNSU66N7xOOgzeZ5ABgvszpMW%252Bf1dAvGCTqIVBaD2EYUV1iUuYZAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/896d489da9d74cc9b38e1b8acb6caf01?KeyID=7149c8cc&Signature=%2FPNXKssC1k3uSmpkRC5HNRsKm%2FqqhKJCfz7iGpg4NvXw5zpliC1cbosi9mcf5XA%252BAYoV7%2FVHlpyb1tY7n%2FS0Dw%253D%253D", "title": "contract_first_document.doc", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.913379+02:00", - "dateModified": "2017-11-30T16:56:28.913410+02:00", - "id": "1702fe06543e4c10b6f0bcb0aa694e8c" + "datePublished": "2018-05-28T19:03:06.977922+03:00", + "dateModified": "2018-05-28T19:03:06.977944+03:00", + "id": "8f222525b9e14ddcbc45f735d686ec53" } ] } diff --git a/docs/source/tutorial/auction-contract-period.http b/docs/source/tutorial/auction-contract-period.http index 114401d..3386fda 100644 --- a/docs/source/tutorial/auction-contract-period.http +++ b/docs/source/tutorial/auction-contract-period.http @@ -1,21 +1,22 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 106 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 106 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { "period": { - "startDate": "2017-11-30T16:56:17.205813", - "endDate": "2018-11-30T16:56:17.205813" + "startDate": "2018-05-28T19:02:59.179463", + "endDate": "2019-05-28T19:02:59.179463" } } } 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { @@ -24,10 +25,17 @@ Content-Type: application/json; charset=UTF-8 { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -35,12 +43,16 @@ Content-Type: application/json; charset=UTF-8 "region": "м. Київ", "locality": "м. Київ" }, - "id": "6abd12c929084367ac08d9d9138ccab4", + "quantity": 5.001, + "id": "3b845b808a6345589d0777eeb3b79c6e", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "suppliers": [ @@ -66,18 +78,18 @@ Content-Type: application/json; charset=UTF-8 } ], "period": { - "startDate": "2017-11-30T16:56:17.205813+02:00", - "endDate": "2018-11-30T16:56:17.205813+02:00" + "startDate": "2018-05-28T19:02:59.179463+03:00", + "endDate": "2019-05-28T19:02:59.179463+03:00" }, "value": { "currency": "UAH", "amount": 501.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:28.528529+02:00", - "awardID": "add0cbb7aa114e7cb6f5e127071f8b53", - "id": "ada81c2080f143a387863faae3db1f81", - "contractID": "UA-PS-2017-11-30-000001-1" + "date": "2018-05-28T19:03:06.703749+03:00", + "awardID": "708d3fdf13ac4868b0df09cf479ceb06", + "id": "1bb4e628954a47f3a89125866c880f00", + "contractID": "UA-EA-2018-05-28-000001-1" } } diff --git a/docs/source/tutorial/auction-contract-sign.http b/docs/source/tutorial/auction-contract-sign.http index 5deddf5..2e3cbba 100644 --- a/docs/source/tutorial/auction-contract-sign.http +++ b/docs/source/tutorial/auction-contract-sign.http @@ -1,19 +1,20 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 80 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 80 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { "status": "active", - "dateSigned": "2017-11-30T16:56:29.280738+02:00" + "dateSigned": "2018-05-28T19:03:07.364097+03:00" } } 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { @@ -22,32 +23,39 @@ Content-Type: application/json; charset=UTF-8 { "hash": "md5:00000000000000000000000000000000", "format": "application/msword", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/5bd3f7a02ff44727b232621207f1b851?KeyID=8473a74a&Signature=JQHt0PL4w47AD3VLzHc10HkPeKF1%252BHLSabNSU66N7xOOgzeZ5ABgvszpMW%252Bf1dAvGCTqIVBaD2EYUV1iUuYZAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/896d489da9d74cc9b38e1b8acb6caf01?KeyID=7149c8cc&Signature=%2FPNXKssC1k3uSmpkRC5HNRsKm%2FqqhKJCfz7iGpg4NvXw5zpliC1cbosi9mcf5XA%252BAYoV7%2FVHlpyb1tY7n%2FS0Dw%253D%253D", "title": "contract_first_document.doc", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.913379+02:00", - "dateModified": "2017-11-30T16:56:28.913410+02:00", - "id": "1702fe06543e4c10b6f0bcb0aa694e8c" + "datePublished": "2018-05-28T19:03:06.977922+03:00", + "dateModified": "2018-05-28T19:03:06.977944+03:00", + "id": "8f222525b9e14ddcbc45f735d686ec53" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/msword", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/4d1df678191e499cbb764244f4469b22?KeyID=8473a74a&Signature=jAmAX7MaWviKJdsUEYM2RR8oXbt8vNobcDP6zqadHWj%252BoQKkUnjVwDry6HmSExDU7DJCqVN9ReLo4mMzNmibBQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/56888ce263254954812bd739c579b282?KeyID=7149c8cc&Signature=KpqYmCHeGiflvKB6J6m36no4so%2FXztSIKeEsGa2e1QwOZZVYoxXKwVuL0oIqLDmJDY1eCeM2NJ2fd5qOvgHnCw%253D%253D", "title": "contract_second_document.doc", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.118456+02:00", - "dateModified": "2017-11-30T16:56:29.118484+02:00", - "id": "5c42650d4e074aae85732d8655eec1b7" + "datePublished": "2018-05-28T19:03:07.239455+03:00", + "dateModified": "2018-05-28T19:03:07.239484+03:00", + "id": "8b9fef12b1bf4667aea993380a35f276" } ], "items": [ { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -55,12 +63,16 @@ Content-Type: application/json; charset=UTF-8 "region": "м. Київ", "locality": "м. Київ" }, - "id": "6abd12c929084367ac08d9d9138ccab4", + "quantity": 5.001, + "id": "3b845b808a6345589d0777eeb3b79c6e", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "suppliers": [ @@ -86,19 +98,19 @@ Content-Type: application/json; charset=UTF-8 } ], "period": { - "startDate": "2017-11-30T16:56:17.205813+02:00", - "endDate": "2018-11-30T16:56:17.205813+02:00" + "startDate": "2018-05-28T19:02:59.179463+03:00", + "endDate": "2019-05-28T19:02:59.179463+03:00" }, + "dateSigned": "2018-05-28T19:03:07.364097+03:00", "value": { "currency": "UAH", "amount": 501.0, "valueAddedTaxIncluded": true }, - "dateSigned": "2017-11-30T16:56:29.280738+02:00", - "date": "2017-11-30T16:56:29.382454+02:00", - "awardID": "add0cbb7aa114e7cb6f5e127071f8b53", - "id": "ada81c2080f143a387863faae3db1f81", - "contractID": "UA-PS-2017-11-30-000001-1" + "date": "2018-05-28T19:03:07.435336+03:00", + "awardID": "708d3fdf13ac4868b0df09cf479ceb06", + "id": "1bb4e628954a47f3a89125866c880f00", + "contractID": "UA-EA-2018-05-28-000001-1" } } diff --git a/docs/source/tutorial/auction-contract-upload-document.http b/docs/source/tutorial/auction-contract-upload-document.http index 2d57e46..d096751 100644 --- a/docs/source/tutorial/auction-contract-upload-document.http +++ b/docs/source/tutorial/auction-contract-upload-document.http @@ -1,12 +1,12 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 357 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 355 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/5bd3f7a02ff44727b232621207f1b851?KeyID=8473a74a&Signature=Ndscn5Uq%2Bs%2BeHLny6kCKT3nDq1M6MVzfBivwV%2FXJduW%2B5%2FpdvbQHPew9U9II8HSPns9p2S7vEM3CtUBL91%2B2Dg%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/896d489da9d74cc9b38e1b8acb6caf01?KeyID=7149c8cc&Signature=U6HrR84xXcKt0c2g4n9Pwdx%2FW9dJ5oqi%2F%2B9VxKgBbAJepX%2FtILhYTbvr9%2FvoPGv0pg6z83Pr2g6SYSLeU7kmCg%3D%3D", "title": "contract_first_document.doc", "hash": "md5:00000000000000000000000000000000", "format": "application/msword" @@ -15,19 +15,20 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81/documents/1702fe06543e4c10b6f0bcb0aa694e8c +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00/documents/8f222525b9e14ddcbc45f735d686ec53 +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "format": "application/msword", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/5bd3f7a02ff44727b232621207f1b851?KeyID=8473a74a&Signature=JQHt0PL4w47AD3VLzHc10HkPeKF1%252BHLSabNSU66N7xOOgzeZ5ABgvszpMW%252Bf1dAvGCTqIVBaD2EYUV1iUuYZAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/896d489da9d74cc9b38e1b8acb6caf01?KeyID=7149c8cc&Signature=%2FPNXKssC1k3uSmpkRC5HNRsKm%2FqqhKJCfz7iGpg4NvXw5zpliC1cbosi9mcf5XA%252BAYoV7%2FVHlpyb1tY7n%2FS0Dw%253D%253D", "title": "contract_first_document.doc", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.913379+02:00", - "dateModified": "2017-11-30T16:56:28.913410+02:00", - "id": "1702fe06543e4c10b6f0bcb0aa694e8c" + "datePublished": "2018-05-28T19:03:06.977922+03:00", + "dateModified": "2018-05-28T19:03:06.977944+03:00", + "id": "8f222525b9e14ddcbc45f735d686ec53" } } diff --git a/docs/source/tutorial/auction-contract-upload-second-document.http b/docs/source/tutorial/auction-contract-upload-second-document.http index 3e6ecc1..6ef17ee 100644 --- a/docs/source/tutorial/auction-contract-upload-second-document.http +++ b/docs/source/tutorial/auction-contract-upload-second-document.http @@ -1,12 +1,12 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 350 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 356 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/4d1df678191e499cbb764244f4469b22?KeyID=8473a74a&Signature=PIMLosfRw8Ru4sWIwgpHMjPorBzBQnIcamxeDNhK7vK%2F9dLDNtYYRfBrrEqaWzmb%2Bq5jApq1Pn2mUSQcS6pgAg%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/56888ce263254954812bd739c579b282?KeyID=7149c8cc&Signature=S%2FVHOWx0lc1%2BJlUgmMZkAYjacJEABqxnKKhAbUiO7Or%2BtQ7AZk7EDGW%2F8I%2FfKw869qA5Wq3ogtEQC7ZEtACFAg%3D%3D", "title": "contract_second_document.doc", "hash": "md5:00000000000000000000000000000000", "format": "application/msword" @@ -15,19 +15,20 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/contracts/ada81c2080f143a387863faae3db1f81/documents/5c42650d4e074aae85732d8655eec1b7 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/contracts/1bb4e628954a47f3a89125866c880f00/documents/8b9fef12b1bf4667aea993380a35f276 +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "format": "application/msword", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/4d1df678191e499cbb764244f4469b22?KeyID=8473a74a&Signature=jAmAX7MaWviKJdsUEYM2RR8oXbt8vNobcDP6zqadHWj%252BoQKkUnjVwDry6HmSExDU7DJCqVN9ReLo4mMzNmibBQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/56888ce263254954812bd739c579b282?KeyID=7149c8cc&Signature=KpqYmCHeGiflvKB6J6m36no4so%2FXztSIKeEsGa2e1QwOZZVYoxXKwVuL0oIqLDmJDY1eCeM2NJ2fd5qOvgHnCw%253D%253D", "title": "contract_second_document.doc", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.118456+02:00", - "dateModified": "2017-11-30T16:56:29.118484+02:00", - "id": "5c42650d4e074aae85732d8655eec1b7" + "datePublished": "2018-05-28T19:03:07.239455+03:00", + "dateModified": "2018-05-28T19:03:07.239484+03:00", + "id": "8b9fef12b1bf4667aea993380a35f276" } } diff --git a/docs/source/tutorial/auction-documents-2.http b/docs/source/tutorial/auction-documents-2.http index 5073593..a47ce18 100644 --- a/docs/source/tutorial/auction-documents-2.http +++ b/docs/source/tutorial/auction-documents-2.http @@ -1,10 +1,11 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ @@ -12,23 +13,23 @@ Content-Type: application/json; charset=UTF-8 "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/68fe48f4593a4de9844e6548344b2696?KeyID=8473a74a&Signature=QZwWxRCYJDGM8BwdJ%252Bh%2FZ7EfjK1tSuHstIWY7Phw8MUeywT2GsNNucpnf2UGZGud5EPLKF1xOz9hX%252BWHtaSeBw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/42f468f963964ac0883313db87abc294?KeyID=7149c8cc&Signature=XRuGZP2eAk2I7vRsPppBUKCGQWoWEcTdD7Cn%2FQJFqHsAzhj5y9yj75Af3iKYenLWwy01%2Fj7A4jHQR%252BZkIbI4CA%253D%253D", "title": "AwardCriteria.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.157192+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.874644+03:00", + "id": "882f19abea9041a2adc123890e947ebb" } ] } diff --git a/docs/source/tutorial/auction-documents-3.http b/docs/source/tutorial/auction-documents-3.http index d9eae88..52563c0 100644 --- a/docs/source/tutorial/auction-documents-3.http +++ b/docs/source/tutorial/auction-documents-3.http @@ -1,10 +1,11 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ @@ -12,23 +13,23 @@ Content-Type: application/json; charset=UTF-8 "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9840d23dc3194951a561e6b3d959fac0?KeyID=8473a74a&Signature=vJlSrjCYsuQhptjoPNewJOzwmvXFcLc5HA8pIMybY%252B0qd7VYuGlhFpTPnwpMtpFEnblx87Fz%252BXuJ9x%2FBELicCg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0696fd30a8441339034a0bedfeac17d?KeyID=7149c8cc&Signature=OqqMTmnanG%2FNPRbSjfZQkvve8ToxfFFA6UAJ22da%252BbRQ%2FZ7x7b5uqg5I%2FgnjqRhiC2leHG%252BT9X6W6xJbCFznCQ%253D%253D", "title": "AwardCriteria-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.221784+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.929762+03:00", + "id": "882f19abea9041a2adc123890e947ebb" } ] } diff --git a/docs/source/tutorial/auction-documents-4.http b/docs/source/tutorial/auction-documents-4.http index 3db20c7..dfc1bcd 100644 --- a/docs/source/tutorial/auction-documents-4.http +++ b/docs/source/tutorial/auction-documents-4.http @@ -1,10 +1,11 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ @@ -12,36 +13,36 @@ Content-Type: application/json; charset=UTF-8 "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9840d23dc3194951a561e6b3d959fac0?KeyID=8473a74a&Signature=vJlSrjCYsuQhptjoPNewJOzwmvXFcLc5HA8pIMybY%252B0qd7VYuGlhFpTPnwpMtpFEnblx87Fz%252BXuJ9x%2FBELicCg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0696fd30a8441339034a0bedfeac17d?KeyID=7149c8cc&Signature=OqqMTmnanG%2FNPRbSjfZQkvve8ToxfFFA6UAJ22da%252BbRQ%2FZ7x7b5uqg5I%2FgnjqRhiC2leHG%252BT9X6W6xJbCFznCQ%253D%253D", "title": "AwardCriteria-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.221784+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.929762+03:00", + "id": "882f19abea9041a2adc123890e947ebb" }, { "index": 1, "hash": "md5:00000000000000000000000000000000", "description": "First illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2840dd02387746c8882c2087e55b9f14?KeyID=8473a74a&Signature=CTN%2FyvXW3%252Bz7lGcIGWXJGAYdUUudzcpWk1%2F9TldffuMmRChRSJJsi%2F%2FHBzjXb%252B0f4DuzUiUbq8bqD%2FP70jlFAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1fcf682d16be4b55bab89065a0d9b5bb?KeyID=7149c8cc&Signature=0sMj57ikTcJbcIDCbBhHxhs6N%2Fta3ixRc1IySJnogUHEOxcw6p5%2FUSy9BxMGdvNVfdiiG2Y1W5Fhdcja%252BrqOBg%253D%253D", "title": "first_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.293411+02:00", + "datePublished": "2018-05-28T19:03:04.990914+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.293438+02:00", - "id": "f143cdc5fef246f59d11cd3bc7c72d46" + "dateModified": "2018-05-28T19:03:04.990934+03:00", + "id": "c6bd2aaef7cf42c5ba4f0dfad08285e2" } ] } diff --git a/docs/source/tutorial/auction-documents-5.http b/docs/source/tutorial/auction-documents-5.http index c779295..4326d55 100644 --- a/docs/source/tutorial/auction-documents-5.http +++ b/docs/source/tutorial/auction-documents-5.http @@ -1,10 +1,11 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ @@ -12,62 +13,62 @@ Content-Type: application/json; charset=UTF-8 "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9840d23dc3194951a561e6b3d959fac0?KeyID=8473a74a&Signature=vJlSrjCYsuQhptjoPNewJOzwmvXFcLc5HA8pIMybY%252B0qd7VYuGlhFpTPnwpMtpFEnblx87Fz%252BXuJ9x%2FBELicCg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0696fd30a8441339034a0bedfeac17d?KeyID=7149c8cc&Signature=OqqMTmnanG%2FNPRbSjfZQkvve8ToxfFFA6UAJ22da%252BbRQ%2FZ7x7b5uqg5I%2FgnjqRhiC2leHG%252BT9X6W6xJbCFznCQ%253D%253D", "title": "AwardCriteria-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.221784+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.929762+03:00", + "id": "882f19abea9041a2adc123890e947ebb" }, { "index": 1, "hash": "md5:00000000000000000000000000000000", "description": "First illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2840dd02387746c8882c2087e55b9f14?KeyID=8473a74a&Signature=CTN%2FyvXW3%252Bz7lGcIGWXJGAYdUUudzcpWk1%2F9TldffuMmRChRSJJsi%2F%2FHBzjXb%252B0f4DuzUiUbq8bqD%2FP70jlFAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1fcf682d16be4b55bab89065a0d9b5bb?KeyID=7149c8cc&Signature=0sMj57ikTcJbcIDCbBhHxhs6N%2Fta3ixRc1IySJnogUHEOxcw6p5%2FUSy9BxMGdvNVfdiiG2Y1W5Fhdcja%252BrqOBg%253D%253D", "title": "first_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.293411+02:00", + "datePublished": "2018-05-28T19:03:04.990914+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.293438+02:00", - "id": "f143cdc5fef246f59d11cd3bc7c72d46" + "dateModified": "2018-05-28T19:03:04.990934+03:00", + "id": "c6bd2aaef7cf42c5ba4f0dfad08285e2" }, { "index": 2, "hash": "md5:00000000000000000000000000000000", "description": "Second illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/bfd750de3e7b49b5a991b6cdaf2c208e?KeyID=8473a74a&Signature=nXLYMy2OkK2aIJDwV6kn7z3BkQD4wMe1ccc9%252BSvKDcUemJGUcmxtcGPn57JUQ6AJznS4IfCvaHVyDo5Aez7pDA%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/59a4408f99224306b2582176ca2bda32?KeyID=7149c8cc&Signature=VxN7Lt4LBsnxm4RQWy146688XcEKpVkJ1ofItTIRC55pCuA2oh%2FVxBZRVv%2F0lTC3LXKNmwF%2F78mt68XuuQl4AA%253D%253D", "title": "second_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.376954+02:00", + "datePublished": "2018-05-28T19:03:05.055484+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.376981+02:00", - "id": "eb64e2d0457e42c89aed5861301d3d06" + "dateModified": "2018-05-28T19:03:05.055508+03:00", + "id": "db649c26ced64a8292a91f14c2bd4b59" }, { "index": 2, "hash": "md5:00000000000000000000000000000000", "description": "Third illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2d40e8da608c4f10b9432671cf47c9aa?KeyID=8473a74a&Signature=AGnUbHWEz4OOa7kxT1%2Fj4Ml7cNOw%252BcsUiDVX9HQhwqAdi4UGtaxWqeAZ2YhsI20lzMp67Fq%252BUo6jPmWdLdWuAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/73e7a9a343f84bd9941b2900ae031137?KeyID=7149c8cc&Signature=08nEK8j1PputzfNx7Db6qC%252BheWVbyrDCG8bFpl25q0ad%252BJD7Woa48SmacTzEhvPel5L3t5%2FCHEgq7jy82bRKCQ%253D%253D", "title": "third_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.434267+02:00", + "datePublished": "2018-05-28T19:03:05.101025+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.434293+02:00", - "id": "fdafece528e54fe5a7b38f025be993c3" + "dateModified": "2018-05-28T19:03:05.101047+03:00", + "id": "2c5c4017cc7d4001864e173fc897ffd1" } ] } diff --git a/docs/source/tutorial/auction-documents-6.http b/docs/source/tutorial/auction-documents-6.http index 68ba735..61d16a6 100644 --- a/docs/source/tutorial/auction-documents-6.http +++ b/docs/source/tutorial/auction-documents-6.http @@ -1,10 +1,11 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ @@ -12,72 +13,72 @@ Content-Type: application/json; charset=UTF-8 "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9840d23dc3194951a561e6b3d959fac0?KeyID=8473a74a&Signature=vJlSrjCYsuQhptjoPNewJOzwmvXFcLc5HA8pIMybY%252B0qd7VYuGlhFpTPnwpMtpFEnblx87Fz%252BXuJ9x%2FBELicCg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0696fd30a8441339034a0bedfeac17d?KeyID=7149c8cc&Signature=OqqMTmnanG%2FNPRbSjfZQkvve8ToxfFFA6UAJ22da%252BbRQ%2FZ7x7b5uqg5I%2FgnjqRhiC2leHG%252BT9X6W6xJbCFznCQ%253D%253D", "title": "AwardCriteria-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.221784+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.929762+03:00", + "id": "882f19abea9041a2adc123890e947ebb" }, { "index": 1, "hash": "md5:00000000000000000000000000000000", "description": "First illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2840dd02387746c8882c2087e55b9f14?KeyID=8473a74a&Signature=CTN%2FyvXW3%252Bz7lGcIGWXJGAYdUUudzcpWk1%2F9TldffuMmRChRSJJsi%2F%2FHBzjXb%252B0f4DuzUiUbq8bqD%2FP70jlFAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1fcf682d16be4b55bab89065a0d9b5bb?KeyID=7149c8cc&Signature=0sMj57ikTcJbcIDCbBhHxhs6N%2Fta3ixRc1IySJnogUHEOxcw6p5%2FUSy9BxMGdvNVfdiiG2Y1W5Fhdcja%252BrqOBg%253D%253D", "title": "first_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.293411+02:00", + "datePublished": "2018-05-28T19:03:04.990914+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.293438+02:00", - "id": "f143cdc5fef246f59d11cd3bc7c72d46" + "dateModified": "2018-05-28T19:03:04.990934+03:00", + "id": "c6bd2aaef7cf42c5ba4f0dfad08285e2" }, { "index": 2, "hash": "md5:00000000000000000000000000000000", "description": "Second illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/bfd750de3e7b49b5a991b6cdaf2c208e?KeyID=8473a74a&Signature=nXLYMy2OkK2aIJDwV6kn7z3BkQD4wMe1ccc9%252BSvKDcUemJGUcmxtcGPn57JUQ6AJznS4IfCvaHVyDo5Aez7pDA%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/59a4408f99224306b2582176ca2bda32?KeyID=7149c8cc&Signature=VxN7Lt4LBsnxm4RQWy146688XcEKpVkJ1ofItTIRC55pCuA2oh%2FVxBZRVv%2F0lTC3LXKNmwF%2F78mt68XuuQl4AA%253D%253D", "title": "second_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.376954+02:00", + "datePublished": "2018-05-28T19:03:05.055484+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.376981+02:00", - "id": "eb64e2d0457e42c89aed5861301d3d06" + "dateModified": "2018-05-28T19:03:05.055508+03:00", + "id": "db649c26ced64a8292a91f14c2bd4b59" }, { "index": 2, "hash": "md5:00000000000000000000000000000000", "description": "Third illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2d40e8da608c4f10b9432671cf47c9aa?KeyID=8473a74a&Signature=AGnUbHWEz4OOa7kxT1%2Fj4Ml7cNOw%252BcsUiDVX9HQhwqAdi4UGtaxWqeAZ2YhsI20lzMp67Fq%252BUo6jPmWdLdWuAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/73e7a9a343f84bd9941b2900ae031137?KeyID=7149c8cc&Signature=08nEK8j1PputzfNx7Db6qC%252BheWVbyrDCG8bFpl25q0ad%252BJD7Woa48SmacTzEhvPel5L3t5%2FCHEgq7jy82bRKCQ%253D%253D", "title": "third_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.434267+02:00", + "datePublished": "2018-05-28T19:03:05.101025+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.434293+02:00", - "id": "fdafece528e54fe5a7b38f025be993c3" + "dateModified": "2018-05-28T19:03:05.101047+03:00", + "id": "2c5c4017cc7d4001864e173fc897ffd1" }, { "title": "Familiarization with bank asset", "format": "offline/on-site-examination", "accessDetails": "Familiar with asset: days, time, address", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.520040+02:00", + "datePublished": "2018-05-28T19:03:05.169280+03:00", "documentType": "x_dgfAssetFamiliarization", - "dateModified": "2017-11-30T16:56:26.520067+02:00", - "id": "b31139eea309435592a725e115dc90ed" + "dateModified": "2018-05-28T19:03:05.169300+03:00", + "id": "f08b3a9250ab4539b492080a538da808" } ] } diff --git a/docs/source/tutorial/auction-documents.http b/docs/source/tutorial/auction-documents.http index bfda73c..6460e21 100644 --- a/docs/source/tutorial/auction-documents.http +++ b/docs/source/tutorial/auction-documents.http @@ -1,24 +1,25 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/418d8f99150a4b92a57b81cc18cd968a HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/2bb61a55cf5b4a8386260ac1a4cad34c HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "previousVersions": [], "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" } } diff --git a/docs/source/tutorial/auction-listing-after-patch.http b/docs/source/tutorial/auction-listing-after-patch.http index 6d6b2ae..c68d758 100644 --- a/docs/source/tutorial/auction-listing-after-patch.http +++ b/docs/source/tutorial/auction-listing-after-patch.http @@ -1,24 +1,29 @@ -GET /api/2.3/auctions?opt_pretty=1 HTTP/1.0 +GET /api/2.4/auctions?opt_pretty=1 HTTP/1.0 Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "next_page": { - "path": "/api/2.3/auctions?offset=2017-11-30T16%3A56%3A25.873102%2B02%3A00", - "uri": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions?offset=2017-11-30T16%3A56%3A25.873102%2B02%3A00", - "offset": "2017-11-30T16:56:25.873102+02:00" + "path": "/api/2.4/auctions?offset=2018-05-28T19%3A03%3A04.639566%2B03%3A00", + "uri": "http://api-sandbox.ea.openprocurement.org/api/2.4/auctions?offset=2018-05-28T19%3A03%3A04.639566%2B03%3A00", + "offset": "2018-05-28T19:03:04.639566+03:00" }, "data": [ { - "id": "301d66e275cb4861ba502c1eaafa88ae", - "dateModified": "2017-11-30T16:56:25.621767+02:00" + "id": "246d20f56b0a4601bd4b5ddd3ac636e9", + "dateModified": "2018-05-28T19:03:04.492942+03:00" }, { - "id": "dbcc98fdc3f64c6aaabe25f09a2c64d1", - "dateModified": "2017-11-30T16:56:25.873102+02:00" + "id": "e589f73396de4c75bbba0ef0a3a1d971", + "dateModified": "2018-05-28T19:03:04.598947+03:00" + }, + { + "id": "d831b4e9ad7c490f8fb18ebb19a41670", + "dateModified": "2018-05-28T19:03:04.639566+03:00" } ] } diff --git a/docs/source/tutorial/auction-listing-after-procuringEntity.http b/docs/source/tutorial/auction-listing-after-procuringEntity.http index 65b7ba5..454575a 100644 --- a/docs/source/tutorial/auction-listing-after-procuringEntity.http +++ b/docs/source/tutorial/auction-listing-after-procuringEntity.http @@ -1,21 +1,22 @@ -GET /api/2.3/auctions HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "next_page": { - "path": "/api/2.3/auctions?offset=2017-11-30T16%3A56%3A25.621767%2B02%3A00", - "uri": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions?offset=2017-11-30T16%3A56%3A25.621767%2B02%3A00", - "offset": "2017-11-30T16:56:25.621767+02:00" + "path": "/api/2.4/auctions?offset=2018-05-28T19%3A03%3A04.492942%2B03%3A00", + "uri": "http://api-sandbox.ea.openprocurement.org/api/2.4/auctions?offset=2018-05-28T19%3A03%3A04.492942%2B03%3A00", + "offset": "2018-05-28T19:03:04.492942+03:00" }, "data": [ { - "id": "301d66e275cb4861ba502c1eaafa88ae", - "dateModified": "2017-11-30T16:56:25.621767+02:00" + "id": "246d20f56b0a4601bd4b5ddd3ac636e9", + "dateModified": "2018-05-28T19:03:04.492942+03:00" } ] } diff --git a/docs/source/tutorial/auction-listing.http b/docs/source/tutorial/auction-listing.http index 68c2d83..744a372 100644 --- a/docs/source/tutorial/auction-listing.http +++ b/docs/source/tutorial/auction-listing.http @@ -1,15 +1,16 @@ -GET /api/2.3/auctions HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "next_page": { - "path": "/api/2.3/auctions?offset=", - "uri": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions?offset=", + "path": "/api/2.4/auctions?offset=", + "uri": "http://api-sandbox.ea.openprocurement.org/api/2.4/auctions?offset=", "offset": "" }, "data": [] diff --git a/docs/source/tutorial/auction-patch-2pc.http b/docs/source/tutorial/auction-patch-2pc.http index 4e28b42..0a839fa 100644 --- a/docs/source/tutorial/auction-patch-2pc.http +++ b/docs/source/tutorial/auction-patch-2pc.http @@ -1,7 +1,7 @@ -PATCH /api/2.3/auctions/58ad76271332425694531cbfe1aa6723?acc_token=a3781f686544479b9060df012b8db196 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 40 -Content-Type: application/json +PATCH /api/2.4/auctions/3f49ee8f07da45a2a915dbd75ad1f475?acc_token=7b62c6525ece4347bb49f69cc79a4352 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 40 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,18 +12,19 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", + "auctionID": "UA-EA-2018-05-28-000001", "enquiryPeriod": { - "startDate": "2017-11-30T16:56:19.163266+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:01.104878+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "submissionMethod": "electronicAuction", - "next_check": "2017-12-13T23:59:50+02:00", + "next_check": "2018-06-10T20:00:00+03:00", "procuringEntity": { "contactPoint": { "name": "Державне управління справами", @@ -44,22 +45,32 @@ Content-Type: application/json; charset=UTF-8 } }, "owner": "broker", - "id": "58ad76271332425694531cbfe1aa6723", + "id": "3f49ee8f07da45a2a915dbd75ad1f475", "title": "футляри до державних нагород", "tenderAttempts": 1, - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:19.212525+02:00", + "dateModified": "2018-05-28T19:03:01.152650+03:00", "status": "active.tendering", "tenderPeriod": { - "startDate": "2017-11-30T16:56:19.163266+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:01.104878+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "auctionPeriod": { - "shouldStartAfter": "2017-12-14T00:00:00+02:00" + "shouldStartAfter": "2018-06-11T00:00:00+03:00" }, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "dgfID": "219560", - "date": "2017-11-30T16:56:19.212525+02:00", + "date": "2018-05-28T19:03:01.152650+03:00", + "rectificationPeriod": { + "startDate": "2018-05-28T19:03:01.104878+03:00", + "endDate": "2018-06-05T20:00:00+03:00", + "invalidationDate": "2018-05-28T19:03:01.151212+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "minimalStep": { "currency": "UAH", "amount": 35.0, @@ -69,10 +80,17 @@ Content-Type: application/json; charset=UTF-8 { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -80,12 +98,16 @@ Content-Type: application/json; charset=UTF-8 "region": "м. Київ", "locality": "м. Київ" }, - "id": "c2fb6cf42caf4621b4bcac1deff95286", + "quantity": 5.001, + "id": "5a3153ba0e4f494497dc66ba58adb135", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "value": { diff --git a/docs/source/tutorial/auction-post-2pc.http b/docs/source/tutorial/auction-post-2pc.http index c1fe905..18acbba 100644 --- a/docs/source/tutorial/auction-post-2pc.http +++ b/docs/source/tutorial/auction-post-2pc.http @@ -1,48 +1,64 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 1987 -Content-Type: application/json +POST /api/2.4/auctions?opt_pretty=1 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 2249 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { "status": "draft", + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "title": "футляри до державних нагород", "minimalStep": { "currency": "UAH", "amount": 35 }, - "procurementMethodDetails": "quick, accelerator=1440", + "auctionPeriod": { + "startDate": "2018-06-11" + }, "tenderAttempts": 1, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "value": { "currency": "UAH", "amount": 100 }, "dgfID": "219560", - "auctionPeriod": { - "startDate": "2017-12-14" - }, "items": [ { + "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", - "id": "66113000-5", + "scheme": "CAV-PS", + "id": "04121000-2", "description": "Земельні ділянки" }, - "quantity": 5, - "description": "Земля для військовослужбовців", - "unit": { - "code": "44617100-9", - "name": "item" - }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "countryName": "Україна", "postalCode": "79000", "region": "м. Київ", "streetAddress": "вул. Банкова 1", "locality": "м. Київ" - } + }, + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827", + "endDate": "2018-06-02T19:02:58.713827" + }, + "unit": { + "code": "44617100-9", + "name": "item" + }, + "quantity": 5.001 } ], "procuringEntity": { @@ -69,19 +85,30 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/58ad76271332425694531cbfe1aa6723 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/3f49ee8f07da45a2a915dbd75ad1f475 +X-Content-Type-Options: nosniff { "access": { - "token": "a3781f686544479b9060df012b8db196" + "token": "7b62c6525ece4347bb49f69cc79a4352" }, "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", + "auctionID": "UA-EA-2018-05-28-000001", + "rectificationPeriod": { + "startDate": "2018-05-28T19:03:01.104878+03:00", + "endDate": "2018-06-05T20:00:00+03:00" + }, "tenderPeriod": { - "startDate": "2017-11-30T16:56:19.163266+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:01.104878+03:00", + "endDate": "2018-06-10T20:00:00+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } }, "title": "футляри до державних нагород", "minimalStep": { @@ -89,16 +116,19 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/58ad7627133 "amount": 35.0, "valueAddedTaxIncluded": true }, - "procurementMethodDetails": "quick, accelerator=1440", + "enquiryPeriod": { + "startDate": "2018-05-28T19:03:01.104878+03:00", + "endDate": "2018-06-10T20:00:00+03:00" + }, "tenderAttempts": 1, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "value": { "currency": "UAH", "amount": 100.0, "valueAddedTaxIncluded": true }, "submissionMethod": "electronicAuction", - "date": "2017-11-30T16:56:19.163266+02:00", + "date": "2018-05-28T19:03:01.104878+03:00", "status": "draft", "procuringEntity": { "contactPoint": { @@ -120,20 +150,21 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/58ad7627133 } }, "dgfID": "219560", - "enquiryPeriod": { - "startDate": "2017-11-30T16:56:19.163266+02:00", - "endDate": "2017-12-13T23:59:50+02:00" - }, - "owner": "broker", - "dateModified": "2017-11-30T16:56:19.166771+02:00", "items": [ { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -141,15 +172,21 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/58ad7627133 "region": "м. Київ", "locality": "м. Київ" }, - "id": "c2fb6cf42caf4621b4bcac1deff95286", + "quantity": 5.001, + "id": "5a3153ba0e4f494497dc66ba58adb135", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], - "id": "58ad76271332425694531cbfe1aa6723", + "owner": "broker", + "dateModified": "2018-05-28T19:03:01.113778+03:00", + "id": "3f49ee8f07da45a2a915dbd75ad1f475", "awardCriteria": "highestCost" } } diff --git a/docs/source/tutorial/auction-post-acceleration.http b/docs/source/tutorial/auction-post-acceleration.http index ff6b02c..6f6f595 100644 --- a/docs/source/tutorial/auction-post-acceleration.http +++ b/docs/source/tutorial/auction-post-acceleration.http @@ -1,19 +1,27 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 2036 -Content-Type: application/json +POST /api/2.4/auctions?opt_pretty=1 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 2262 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "title": "футляри до державних нагород", "minimalStep": { "currency": "UAH", "amount": 35 }, - "procurementMethodDetails": "quick, accelerator=1440", + "auctionPeriod": { + "startDate": "2018-06-09T19:02:59.179463" + }, "tenderAttempts": 1, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "value": { "currency": "UAH", "amount": 100 @@ -37,31 +45,38 @@ Host: api-sandbox.ea.openprocurement.org "locality": "м. Київ" } }, - "submissionMethodDetails": "quick", "mode": "test", - "auctionPeriod": { - "startDate": "2017-11-30T17:01:17.205813" - }, "items": [ { + "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", - "id": "66113000-5", + "scheme": "CAV-PS", + "id": "04121000-2", "description": "Земельні ділянки" }, - "quantity": 5, - "description": "Земля для військовослужбовців", - "unit": { - "code": "44617100-9", - "name": "item" - }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "countryName": "Україна", "postalCode": "79000", "region": "м. Київ", "streetAddress": "вул. Банкова 1", "locality": "м. Київ" - } + }, + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827", + "endDate": "2018-06-02T19:02:58.713827" + }, + "unit": { + "code": "44617100-9", + "name": "item" + }, + "quantity": 5.001 } ], "dgfID": "219560" @@ -70,22 +85,23 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/731dc3a4c39a4e0fa97816efac9797d4 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/bacab87b56264568b59082d8ff724cce +X-Content-Type-Options: nosniff { "access": { - "token": "0a74311e81c84f619214161e9a0dd1ef" + "token": "8164da3243104386b02a54665528347a" }, "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", + "auctionID": "UA-EA-2018-05-28-000001", "enquiryPeriod": { - "startDate": "2017-11-30T16:56:20.188830+02:00", - "endDate": "2017-11-30T17:00:24.652197+02:00" + "startDate": "2018-05-28T19:03:01.837027+03:00", + "endDate": "2018-06-08T20:00:00+03:00" }, "submissionMethod": "electronicAuction", - "next_check": "2017-11-30T17:00:24.652197+02:00", + "next_check": "2018-06-08T20:00:00+03:00", "procuringEntity": { "contactPoint": { "name": "Державне управління справами", @@ -107,31 +123,51 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/731dc3a4c39 }, "owner": "broker", "title_en": "[TESTING] ", - "id": "731dc3a4c39a4e0fa97816efac9797d4", + "id": "bacab87b56264568b59082d8ff724cce", "title": "[ТЕСТУВАННЯ] футляри до державних нагород", "tenderAttempts": 1, - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:20.192610+02:00", + "dateModified": "2018-05-28T19:03:01.845486+03:00", "status": "active.tendering", "tenderPeriod": { - "startDate": "2017-11-30T16:56:20.188830+02:00", - "endDate": "2017-11-30T17:00:24.652197+02:00" + "startDate": "2018-05-28T19:03:01.837027+03:00", + "endDate": "2018-06-08T20:00:00+03:00" }, "auctionPeriod": { - "shouldStartAfter": "2017-11-30T17:00:24.652197+02:00" + "shouldStartAfter": "2018-06-09T00:00:00+03:00" }, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "dgfID": "219560", - "date": "2017-11-30T16:56:20.188830+02:00", - "submissionMethodDetails": "quick", + "date": "2018-05-28T19:03:01.837027+03:00", + "rectificationPeriod": { + "startDate": "2018-05-28T19:03:01.837027+03:00", + "endDate": "2018-06-03T20:00:00+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, + "minimalStep": { + "currency": "UAH", + "amount": 35.0, + "valueAddedTaxIncluded": true + }, "items": [ { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -139,12 +175,16 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/731dc3a4c39 "region": "м. Київ", "locality": "м. Київ" }, - "id": "27e42212d979407a84f6ff1a6ed55e4e", + "quantity": 5.001, + "id": "4b1b5fe3c5b34c589d56658bfef148a9", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "value": { @@ -152,11 +192,6 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/731dc3a4c39 "amount": 100.0, "valueAddedTaxIncluded": true }, - "minimalStep": { - "currency": "UAH", - "amount": 35.0, - "valueAddedTaxIncluded": true - }, "mode": "test", "title_ru": "[ТЕСТИРОВАНИЕ] ", "awardCriteria": "highestCost" diff --git a/docs/source/tutorial/auction-post-attempt-json-data.http b/docs/source/tutorial/auction-post-attempt-json-data.http index 46201e7..2ed8030 100644 --- a/docs/source/tutorial/auction-post-attempt-json-data.http +++ b/docs/source/tutorial/auction-post-attempt-json-data.http @@ -1,47 +1,63 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 1968 -Content-Type: application/json +POST /api/2.4/auctions?opt_pretty=1 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 2230 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "title": "футляри до державних нагород", "minimalStep": { "currency": "UAH", "amount": 35 }, - "procurementMethodDetails": "quick, accelerator=1440", + "auctionPeriod": { + "startDate": "2018-06-11" + }, "tenderAttempts": 1, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "value": { "currency": "UAH", "amount": 100 }, "dgfID": "219560", - "auctionPeriod": { - "startDate": "2017-12-14" - }, "items": [ { + "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", - "id": "66113000-5", + "scheme": "CAV-PS", + "id": "04121000-2", "description": "Земельні ділянки" }, - "quantity": 5, - "description": "Земля для військовослужбовців", - "unit": { - "code": "44617100-9", - "name": "item" - }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "countryName": "Україна", "postalCode": "79000", "region": "м. Київ", "streetAddress": "вул. Банкова 1", "locality": "м. Київ" - } + }, + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827", + "endDate": "2018-06-02T19:02:58.713827" + }, + "unit": { + "code": "44617100-9", + "name": "item" + }, + "quantity": 5.001 } ], "procuringEntity": { @@ -68,22 +84,23 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9 +X-Content-Type-Options: nosniff { "access": { - "token": "ccf4d45ff9524ec9ae87f38c43d7b0a3" + "token": "06bf67377235444180324a6ec7a7b41d" }, "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", + "auctionID": "UA-EA-2018-05-28-000001", "enquiryPeriod": { - "startDate": "2017-11-30T16:56:25.617199+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "submissionMethod": "electronicAuction", - "next_check": "2017-12-13T23:59:50+02:00", + "next_check": "2018-06-10T20:00:00+03:00", "procuringEntity": { "contactPoint": { "name": "Державне управління справами", @@ -104,22 +121,31 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c } }, "owner": "broker", - "id": "301d66e275cb4861ba502c1eaafa88ae", + "id": "246d20f56b0a4601bd4b5ddd3ac636e9", "title": "футляри до державних нагород", "tenderAttempts": 1, - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:25.621767+02:00", + "dateModified": "2018-05-28T19:03:04.492942+03:00", "status": "active.tendering", "tenderPeriod": { - "startDate": "2017-11-30T16:56:25.617199+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "auctionPeriod": { - "shouldStartAfter": "2017-12-14T00:00:00+02:00" + "shouldStartAfter": "2018-06-11T00:00:00+03:00" }, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "dgfID": "219560", - "date": "2017-11-30T16:56:25.617199+02:00", + "date": "2018-05-28T19:03:04.480367+03:00", + "rectificationPeriod": { + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-05T20:00:00+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "minimalStep": { "currency": "UAH", "amount": 35.0, @@ -129,10 +155,17 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -140,12 +173,16 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "region": "м. Київ", "locality": "м. Київ" }, - "id": "6abd12c929084367ac08d9d9138ccab4", + "quantity": 5.001, + "id": "3b845b808a6345589d0777eeb3b79c6e", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "value": { diff --git a/docs/source/tutorial/auction-post-attempt-json.http b/docs/source/tutorial/auction-post-attempt-json.http index 492d538..081b426 100644 --- a/docs/source/tutorial/auction-post-attempt-json.http +++ b/docs/source/tutorial/auction-post-attempt-json.http @@ -1,18 +1,19 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 4 -Content-Type: application/json +POST /api/2.4/auctions?opt_pretty=1 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 4 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org 422 Unprocessable Entity -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "status": "error", "errors": [ { - "description": "Expecting value: line 1 column 1 (char 0)", + "description": "Expecting value: line 1 column 1 (char 0)", "location": "body", "name": "data" } diff --git a/docs/source/tutorial/auction-post-attempt.http b/docs/source/tutorial/auction-post-attempt.http index 8ff9d41..cf078b4 100644 --- a/docs/source/tutorial/auction-post-attempt.http +++ b/docs/source/tutorial/auction-post-attempt.http @@ -1,12 +1,13 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 4 -Content-Type: application/x-www-form-urlencoded +POST /api/2.4/auctions?opt_pretty=1 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 4 +Content-Type: application/x-www-form-urlencoded Host: api-sandbox.ea.openprocurement.org 415 Unsupported Media Type -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "status": "error", diff --git a/docs/source/tutorial/auction-url.http b/docs/source/tutorial/auction-url.http index 9c5fb7b..d7a61df 100644 --- a/docs/source/tutorial/auction-url.http +++ b/docs/source/tutorial/auction-url.http @@ -1,22 +1,23 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9 HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", - "auctionUrl": "http://auction-sandbox.openprocurement.org/auctions/301d66e275cb4861ba502c1eaafa88ae", + "auctionID": "UA-EA-2018-05-28-000001", + "auctionUrl": "http://auction-sandbox.openprocurement.org/auctions/246d20f56b0a4601bd4b5ddd3ac636e9", "enquiryPeriod": { - "startDate": "2017-11-23T16:56:17.202736+02:00", - "endDate": "2017-11-30T16:56:17.202736+02:00" + "startDate": "2018-05-21T19:02:58.713827+03:00", + "endDate": "2018-05-28T19:02:58.713827+03:00" }, "submissionMethod": "electronicAuction", - "next_check": "2017-11-30T17:40:17.202736+02:00", + "next_check": "2018-05-28T19:46:58.713827+03:00", "procuringEntity": { "contactPoint": { "name": "Державне управління справами", @@ -40,113 +41,123 @@ Content-Type: application/json; charset=UTF-8 { "description": "Просимо додати таблицю потрібної калорійності харчування", "title": "Калорійність", - "date": "2017-11-30T16:56:26.610507+02:00", + "date": "2018-05-28T19:03:05.241690+03:00", "answer": "Таблицю додано в файлі \"Kalorijnist.xslx\"", - "id": "e966c8cdacc14655907b34713b141d18", + "id": "22c3e98b31fd4c50bab5639de0668f1c", "questionOf": "tender" } ], "owner": "broker", - "id": "301d66e275cb4861ba502c1eaafa88ae", + "id": "246d20f56b0a4601bd4b5ddd3ac636e9", "documents": [ { "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/68fe48f4593a4de9844e6548344b2696?KeyID=8473a74a&Signature=QZwWxRCYJDGM8BwdJ%252Bh%2FZ7EfjK1tSuHstIWY7Phw8MUeywT2GsNNucpnf2UGZGud5EPLKF1xOz9hX%252BWHtaSeBw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/42f468f963964ac0883313db87abc294?KeyID=7149c8cc&Signature=XRuGZP2eAk2I7vRsPppBUKCGQWoWEcTdD7Cn%2FQJFqHsAzhj5y9yj75Af3iKYenLWwy01%2Fj7A4jHQR%252BZkIbI4CA%253D%253D", "title": "AwardCriteria.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.157192+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.874644+03:00", + "id": "882f19abea9041a2adc123890e947ebb" }, { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9840d23dc3194951a561e6b3d959fac0?KeyID=8473a74a&Signature=vJlSrjCYsuQhptjoPNewJOzwmvXFcLc5HA8pIMybY%252B0qd7VYuGlhFpTPnwpMtpFEnblx87Fz%252BXuJ9x%2FBELicCg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0696fd30a8441339034a0bedfeac17d?KeyID=7149c8cc&Signature=OqqMTmnanG%2FNPRbSjfZQkvve8ToxfFFA6UAJ22da%252BbRQ%2FZ7x7b5uqg5I%2FgnjqRhiC2leHG%252BT9X6W6xJbCFznCQ%253D%253D", "title": "AwardCriteria-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.221784+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.929762+03:00", + "id": "882f19abea9041a2adc123890e947ebb" }, { "index": 1, "hash": "md5:00000000000000000000000000000000", "description": "First illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2840dd02387746c8882c2087e55b9f14?KeyID=8473a74a&Signature=CTN%2FyvXW3%252Bz7lGcIGWXJGAYdUUudzcpWk1%2F9TldffuMmRChRSJJsi%2F%2FHBzjXb%252B0f4DuzUiUbq8bqD%2FP70jlFAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1fcf682d16be4b55bab89065a0d9b5bb?KeyID=7149c8cc&Signature=0sMj57ikTcJbcIDCbBhHxhs6N%2Fta3ixRc1IySJnogUHEOxcw6p5%2FUSy9BxMGdvNVfdiiG2Y1W5Fhdcja%252BrqOBg%253D%253D", "title": "first_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.293411+02:00", + "datePublished": "2018-05-28T19:03:04.990914+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.293438+02:00", - "id": "f143cdc5fef246f59d11cd3bc7c72d46" + "dateModified": "2018-05-28T19:03:04.990934+03:00", + "id": "c6bd2aaef7cf42c5ba4f0dfad08285e2" }, { "index": 2, "hash": "md5:00000000000000000000000000000000", "description": "Second illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/bfd750de3e7b49b5a991b6cdaf2c208e?KeyID=8473a74a&Signature=nXLYMy2OkK2aIJDwV6kn7z3BkQD4wMe1ccc9%252BSvKDcUemJGUcmxtcGPn57JUQ6AJznS4IfCvaHVyDo5Aez7pDA%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/59a4408f99224306b2582176ca2bda32?KeyID=7149c8cc&Signature=VxN7Lt4LBsnxm4RQWy146688XcEKpVkJ1ofItTIRC55pCuA2oh%2FVxBZRVv%2F0lTC3LXKNmwF%2F78mt68XuuQl4AA%253D%253D", "title": "second_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.376954+02:00", + "datePublished": "2018-05-28T19:03:05.055484+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.376981+02:00", - "id": "eb64e2d0457e42c89aed5861301d3d06" + "dateModified": "2018-05-28T19:03:05.055508+03:00", + "id": "db649c26ced64a8292a91f14c2bd4b59" }, { "index": 2, "hash": "md5:00000000000000000000000000000000", "description": "Third illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2d40e8da608c4f10b9432671cf47c9aa?KeyID=8473a74a&Signature=AGnUbHWEz4OOa7kxT1%2Fj4Ml7cNOw%252BcsUiDVX9HQhwqAdi4UGtaxWqeAZ2YhsI20lzMp67Fq%252BUo6jPmWdLdWuAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/73e7a9a343f84bd9941b2900ae031137?KeyID=7149c8cc&Signature=08nEK8j1PputzfNx7Db6qC%252BheWVbyrDCG8bFpl25q0ad%252BJD7Woa48SmacTzEhvPel5L3t5%2FCHEgq7jy82bRKCQ%253D%253D", "title": "third_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.434267+02:00", + "datePublished": "2018-05-28T19:03:05.101025+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.434293+02:00", - "id": "fdafece528e54fe5a7b38f025be993c3" + "dateModified": "2018-05-28T19:03:05.101047+03:00", + "id": "2c5c4017cc7d4001864e173fc897ffd1" }, { "title": "Familiarization with bank asset", "format": "offline/on-site-examination", "accessDetails": "Familiar with asset: days, time, address", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.520040+02:00", + "datePublished": "2018-05-28T19:03:05.169280+03:00", "documentType": "x_dgfAssetFamiliarization", - "dateModified": "2017-11-30T16:56:26.520067+02:00", - "id": "b31139eea309435592a725e115dc90ed" + "dateModified": "2018-05-28T19:03:05.169300+03:00", + "id": "f08b3a9250ab4539b492080a538da808" } ], "title": "футляри до державних нагород", "tenderAttempts": 1, - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:27.371645+02:00", + "dateModified": "2018-05-28T19:03:05.823039+03:00", "status": "active.auction", "tenderPeriod": { - "startDate": "2017-11-23T16:56:17.202736+02:00", - "endDate": "2017-11-30T16:56:17.202736+02:00" + "startDate": "2018-05-21T19:02:58.713827+03:00", + "endDate": "2018-05-28T19:02:58.713827+03:00" }, "auctionPeriod": { - "startDate": "2017-11-30T16:56:17.202736+02:00", - "shouldStartAfter": "2017-12-01T00:00:00+02:00" + "startDate": "2018-05-28T19:02:58.713827+03:00", + "shouldStartAfter": "2018-05-29T00:00:00+03:00" }, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "dgfID": "219560", - "date": "2017-11-30T16:56:25.617199+02:00", + "date": "2018-05-28T19:03:04.480367+03:00", + "rectificationPeriod": { + "startDate": "2018-05-21T19:02:58.713827+03:00", + "endDate": "2018-05-22T19:02:58.713827+03:00", + "invalidationDate": "2018-05-28T19:03:05.169439+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "minimalStep": { "currency": "UAH", "amount": 35.0, @@ -156,10 +167,17 @@ Content-Type: application/json; charset=UTF-8 { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -167,12 +185,16 @@ Content-Type: application/json; charset=UTF-8 "region": "м. Київ", "locality": "м. Київ" }, - "id": "6abd12c929084367ac08d9d9138ccab4", + "quantity": 5.001, + "id": "3b845b808a6345589d0777eeb3b79c6e", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "value": { diff --git a/docs/source/tutorial/bidder-auction-protocol.http b/docs/source/tutorial/bidder-auction-protocol.http index cf6b551..5fa6d4c 100644 --- a/docs/source/tutorial/bidder-auction-protocol.http +++ b/docs/source/tutorial/bidder-auction-protocol.http @@ -1,12 +1,12 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/awards/add0cbb7aa114e7cb6f5e127071f8b53/documents?acc_token=73842c515600468a8829fea44817fce1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 385 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/awards/708d3fdf13ac4868b0df09cf479ceb06/documents?acc_token=ad29e002be7540eba7ee46592248215f HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 381 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/326d29c8df4744149f6082d061e6492e?KeyID=8473a74a&Signature=4cNJZ9v3X0JCIiaW9cFX2nbH10INN6%2B%2FLVLrM4p%2FwQQo%2FBU2JD1ryXuz6r6SxP7hcfQpgAtoL%2F2WB5QRENZvCA%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/f4402467721a4eee9ef72e70a4ff04f1?KeyID=7149c8cc&Signature=ktH7wX%2BrsWWNqI7oijR9YIgHAM7Lw%2FCjN%2FHF5muEKERp53oy9RuOaTWLxVshntmKtvp3yA81ihypWST0wdI7DA%3D%3D", "title": "SignedAuctionProtocol.pdf", "format": "application/pdf", "hash": "md5:00000000000000000000000000000000", @@ -16,21 +16,22 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/awards/add0cbb7aa114e7cb6f5e127071f8b53/documents/de5b4f4f5aa04ef6a16606d1152b061a +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/awards/708d3fdf13ac4868b0df09cf479ceb06/documents/627c441c40dd4635ac691c549cacba8c +X-Content-Type-Options: nosniff { "data": { - "dateModified": "2017-11-30T16:56:28.083997+02:00", "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/326d29c8df4744149f6082d061e6492e?KeyID=8473a74a&Signature=W07o9qqLEOV3dvjZZVzBFeolqx4QEUoFCZPnHeu4xyBsP7NJma%252BZINjCbfVSmXeRHYiAnDikplownjV%2FJE%252B6BQ%253D%253D", "author": "bid_owner", + "title": "SignedAuctionProtocol.pdf", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/f4402467721a4eee9ef72e70a4ff04f1?KeyID=7149c8cc&Signature=FWQKkrdr%2Fo95YrYaNn881fhFABAvU2yXd77Dz0R8h01tiB4%2FFX4efEmV4eK9jcB2Kmps5x0jStFNTA7Kxl4YBA%253D%253D", + "format": "application/pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.083969+02:00", + "datePublished": "2018-05-28T19:03:06.372223+03:00", "documentType": "auctionProtocol", - "title": "SignedAuctionProtocol.pdf", - "id": "de5b4f4f5aa04ef6a16606d1152b061a" + "dateModified": "2018-05-28T19:03:06.372249+03:00", + "id": "627c441c40dd4635ac691c549cacba8c" } } diff --git a/docs/source/tutorial/bidder-documents.http b/docs/source/tutorial/bidder-documents.http index e6b1c52..9ed597e 100644 --- a/docs/source/tutorial/bidder-documents.http +++ b/docs/source/tutorial/bidder-documents.http @@ -1,22 +1,23 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4/documents?acc_token=a94a2b6627aa46f3bbb83ff885e3beae HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4/documents?acc_token=650aaa4270024deaac41cb856120c3c5 HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4/documents/3bd15f6db7764b7e9651fdf15dde6316?download=4accad3bd17a4f0baa9f6a8ea96397f7", + "url": "http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4/documents/75135cb499834e5ca718f462e5d3c1e7?download=52acfea5369d48cb85f0bad1a27eaf23", "title": "Proposal.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.994147+02:00", - "dateModified": "2017-11-30T16:56:26.994175+02:00", - "id": "3bd15f6db7764b7e9651fdf15dde6316" + "datePublished": "2018-05-28T19:03:05.533715+03:00", + "dateModified": "2018-05-28T19:03:05.533744+03:00", + "id": "75135cb499834e5ca718f462e5d3c1e7" } ] } diff --git a/docs/source/tutorial/bidder-participation-url.http b/docs/source/tutorial/bidder-participation-url.http index 72e9ba4..938b6c8 100644 --- a/docs/source/tutorial/bidder-participation-url.http +++ b/docs/source/tutorial/bidder-participation-url.http @@ -1,10 +1,11 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4?acc_token=a94a2b6627aa46f3bbb83ff885e3beae HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4?acc_token=650aaa4270024deaac41cb856120c3c5 HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { @@ -13,12 +14,12 @@ Content-Type: application/json; charset=UTF-8 { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4/documents/3bd15f6db7764b7e9651fdf15dde6316?download=4accad3bd17a4f0baa9f6a8ea96397f7", + "url": "http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4/documents/75135cb499834e5ca718f462e5d3c1e7?download=52acfea5369d48cb85f0bad1a27eaf23", "title": "Proposal.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.994147+02:00", - "dateModified": "2017-11-30T16:56:26.994175+02:00", - "id": "3bd15f6db7764b7e9651fdf15dde6316" + "datePublished": "2018-05-28T19:03:05.533715+03:00", + "dateModified": "2018-05-28T19:03:05.533744+03:00", + "id": "75135cb499834e5ca718f462e5d3c1e7" } ], "value": { @@ -26,7 +27,7 @@ Content-Type: application/json; charset=UTF-8 "amount": 500.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:26.821209+02:00", + "date": "2018-05-28T19:03:05.400869+03:00", "qualified": true, "tenderers": [ { @@ -51,8 +52,8 @@ Content-Type: application/json; charset=UTF-8 } ], "owner": "broker", - "id": "afaa508128da4829b9202fe300965bf4", - "participationUrl": "http://auction-sandbox.openprocurement.org/auctions/301d66e275cb4861ba502c1eaafa88ae?key_for_bid=afaa508128da4829b9202fe300965bf4" + "id": "4ed57eda57b941399523f19f03b9ada4", + "participationUrl": "http://auction-sandbox.openprocurement.org/auctions/246d20f56b0a4601bd4b5ddd3ac636e9?key_for_bid=4ed57eda57b941399523f19f03b9ada4" } } diff --git a/docs/source/tutorial/bidder2-participation-url.http b/docs/source/tutorial/bidder2-participation-url.http index 72473e7..f08b1aa 100644 --- a/docs/source/tutorial/bidder2-participation-url.http +++ b/docs/source/tutorial/bidder2-participation-url.http @@ -1,10 +1,11 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/0d76a3f619044106b9bcdc0e57e93dad?acc_token=73842c515600468a8829fea44817fce1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/3ce3413a56584eb1a7a870e01121effb?acc_token=ad29e002be7540eba7ee46592248215f HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { @@ -14,7 +15,7 @@ Content-Type: application/json; charset=UTF-8 "amount": 501.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:27.113380+02:00", + "date": "2018-05-28T19:03:05.626934+03:00", "qualified": true, "tenderers": [ { @@ -39,8 +40,8 @@ Content-Type: application/json; charset=UTF-8 } ], "owner": "broker", - "id": "0d76a3f619044106b9bcdc0e57e93dad", - "participationUrl": "http://auction-sandbox.openprocurement.org/auctions/301d66e275cb4861ba502c1eaafa88ae?key_for_bid=0d76a3f619044106b9bcdc0e57e93dad" + "id": "3ce3413a56584eb1a7a870e01121effb", + "participationUrl": "http://auction-sandbox.openprocurement.org/auctions/246d20f56b0a4601bd4b5ddd3ac636e9?key_for_bid=3ce3413a56584eb1a7a870e01121effb" } } diff --git a/docs/source/tutorial/blank-auction-view.http b/docs/source/tutorial/blank-auction-view.http index 7c16573..a8fee41 100644 --- a/docs/source/tutorial/blank-auction-view.http +++ b/docs/source/tutorial/blank-auction-view.http @@ -1,21 +1,22 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9 HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", + "auctionID": "UA-EA-2018-05-28-000001", "enquiryPeriod": { - "startDate": "2017-11-30T16:56:25.617199+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "submissionMethod": "electronicAuction", - "next_check": "2017-12-13T23:59:50+02:00", + "next_check": "2018-06-10T20:00:00+03:00", "procuringEntity": { "contactPoint": { "name": "Державне управління справами", @@ -36,22 +37,31 @@ Content-Type: application/json; charset=UTF-8 } }, "owner": "broker", - "id": "301d66e275cb4861ba502c1eaafa88ae", + "id": "246d20f56b0a4601bd4b5ddd3ac636e9", "title": "футляри до державних нагород", "tenderAttempts": 1, - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:25.621767+02:00", + "dateModified": "2018-05-28T19:03:04.492942+03:00", "status": "active.tendering", "tenderPeriod": { - "startDate": "2017-11-30T16:56:25.617199+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "auctionPeriod": { - "shouldStartAfter": "2017-12-14T00:00:00+02:00" + "shouldStartAfter": "2018-06-11T00:00:00+03:00" }, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "dgfID": "219560", - "date": "2017-11-30T16:56:25.617199+02:00", + "date": "2018-05-28T19:03:04.480367+03:00", + "rectificationPeriod": { + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-05T20:00:00+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "minimalStep": { "currency": "UAH", "amount": 35.0, @@ -61,10 +71,17 @@ Content-Type: application/json; charset=UTF-8 { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -72,12 +89,16 @@ Content-Type: application/json; charset=UTF-8 "region": "м. Київ", "locality": "м. Київ" }, - "id": "6abd12c929084367ac08d9d9138ccab4", + "quantity": 5.001, + "id": "3b845b808a6345589d0777eeb3b79c6e", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "value": { diff --git a/docs/source/tutorial/blank-finauction-view.http b/docs/source/tutorial/blank-finauction-view.http deleted file mode 100644 index 6166dde..0000000 --- a/docs/source/tutorial/blank-finauction-view.http +++ /dev/null @@ -1,94 +0,0 @@ -GET /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Host: api-sandbox.ea.openprocurement.org - - -200 OK -Content-Type: application/json; charset=UTF-8 - -{ - "data": { - "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", - "enquiryPeriod": { - "startDate": "2017-11-30T16:56:23.942831+02:00", - "endDate": "2017-12-13T23:59:50+02:00" - }, - "submissionMethod": "electronicAuction", - "next_check": "2017-12-13T23:59:50+02:00", - "procuringEntity": { - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "address": { - "postalCode": "01220", - "countryName": "Україна", - "streetAddress": "вул. Банкова, 11, корпус 1", - "region": "м. Київ", - "locality": "м. Київ" - } - }, - "owner": "broker", - "id": "73e1598288054eb98e8153ee9e69bb28", - "eligibilityCriteria_ru": "К участию допускаются только лицензированные финансовые учреждения.", - "title": "футляри до державних нагород", - "tenderAttempts": 1, - "eligibilityCriteria_en": "Only licensed financial institutions are eligible to participate.", - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:23.946137+02:00", - "status": "active.tendering", - "eligibilityCriteria": "До участі допускаються лише ліцензовані фінансові установи.", - "tenderPeriod": { - "startDate": "2017-11-30T16:56:23.942831+02:00", - "endDate": "2017-12-13T23:59:50+02:00" - }, - "auctionPeriod": { - "shouldStartAfter": "2017-12-14T00:00:00+02:00" - }, - "procurementMethodType": "dgfFinancialAssets", - "dgfID": "219560", - "date": "2017-11-30T16:56:23.942831+02:00", - "minimalStep": { - "currency": "UAH", - "amount": 35.0, - "valueAddedTaxIncluded": true - }, - "items": [ - { - "description": "Земля для військовослужбовців", - "classification": { - "scheme": "CPV", - "description": "Земельні ділянки", - "id": "66113000-5" - }, - "address": { - "postalCode": "79000", - "countryName": "Україна", - "streetAddress": "вул. Банкова 1", - "region": "м. Київ", - "locality": "м. Київ" - }, - "id": "e16351a78632484e8756b1dea38e6201", - "unit": { - "code": "44617100-9", - "name": "item" - }, - "quantity": 5 - } - ], - "value": { - "currency": "UAH", - "amount": 100.0, - "valueAddedTaxIncluded": true - }, - "awardCriteria": "highestCost" - } -} - diff --git a/docs/source/tutorial/confirm-qualification.http b/docs/source/tutorial/confirm-qualification.http index 01d7eb8..b7dee74 100644 --- a/docs/source/tutorial/confirm-qualification.http +++ b/docs/source/tutorial/confirm-qualification.http @@ -1,7 +1,7 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/awards/add0cbb7aa114e7cb6f5e127071f8b53?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 30 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/awards/708d3fdf13ac4868b0df09cf479ceb06?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 30 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,48 +12,49 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "status": "active", "paymentPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T16:56:28.528529+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-05-28T19:03:06.703749+03:00" }, "documents": [ { - "dateModified": "2017-11-30T16:56:28.083997+02:00", "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/326d29c8df4744149f6082d061e6492e?KeyID=8473a74a&Signature=W07o9qqLEOV3dvjZZVzBFeolqx4QEUoFCZPnHeu4xyBsP7NJma%252BZINjCbfVSmXeRHYiAnDikplownjV%2FJE%252B6BQ%253D%253D", "author": "bid_owner", + "title": "SignedAuctionProtocol.pdf", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/f4402467721a4eee9ef72e70a4ff04f1?KeyID=7149c8cc&Signature=FWQKkrdr%2Fo95YrYaNn881fhFABAvU2yXd77Dz0R8h01tiB4%2FFX4efEmV4eK9jcB2Kmps5x0jStFNTA7Kxl4YBA%253D%253D", + "format": "application/pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.083969+02:00", + "datePublished": "2018-05-28T19:03:06.372223+03:00", "documentType": "auctionProtocol", - "title": "SignedAuctionProtocol.pdf", - "id": "de5b4f4f5aa04ef6a16606d1152b061a" + "dateModified": "2018-05-28T19:03:06.372249+03:00", + "id": "627c441c40dd4635ac691c549cacba8c" }, { - "dateModified": "2017-11-30T16:56:28.217417+02:00", "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/79f7d75e9ff34c1d94289241ebd04a46?KeyID=8473a74a&Signature=ZZf5dIDTAFetGGoNyGHK0TaTX%2FMo%2FTcKq%2FTatSSpuIZleTjJFvbciSiMq9MNq3mZGWRdK%2FYKfT0lkoOKYooXDA%253D%253D", "author": "auction_owner", + "title": "SignedAuctionProtocol.pdf", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1ba9a8b51cd14c05aa42fef2bb3965db?KeyID=7149c8cc&Signature=z%2Ftx0X6an%252B1mIrbwMmuknuPp%252BFVzm3Ps4I%2FXguLCJe5mLZLoqJHlVkZq%252B93cTVvvsRiGx2ASxd%2FtV762p80VBw%253D%253D", + "format": "application/pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.217384+02:00", + "datePublished": "2018-05-28T19:03:06.459190+03:00", "documentType": "auctionProtocol", - "title": "SignedAuctionProtocol.pdf", - "id": "edc7c486de494ac3bdcc0b456d006e4a" + "dateModified": "2018-05-28T19:03:06.459214+03:00", + "id": "77e9d9a7876740f1a64931dd4f96989c" } ], "verificationPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T16:56:28.375177+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-05-28T19:03:06.589568+03:00" }, "complaintPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T16:56:28.528529+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-05-28T19:03:06.703749+03:00" }, "suppliers": [ { @@ -78,17 +79,17 @@ Content-Type: application/json; charset=UTF-8 } ], "signingPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T17:16:29.509749+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-06-26T18:00:00+03:00" }, - "bid_id": "0d76a3f619044106b9bcdc0e57e93dad", + "bid_id": "3ce3413a56584eb1a7a870e01121effb", "value": { "currency": "UAH", "amount": 501.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:28.536946+02:00", - "id": "add0cbb7aa114e7cb6f5e127071f8b53" + "date": "2018-05-28T19:03:06.709267+03:00", + "id": "708d3fdf13ac4868b0df09cf479ceb06" } } diff --git a/docs/source/tutorial/create-auction-procuringEntity.http b/docs/source/tutorial/create-auction-procuringEntity.http index ea13c65..a851355 100644 --- a/docs/source/tutorial/create-auction-procuringEntity.http +++ b/docs/source/tutorial/create-auction-procuringEntity.http @@ -1,23 +1,72 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 2029 -Content-Type: application/json +POST /api/2.4/auctions?opt_pretty=1 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 3158 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { + "description_en": "Cases with state awards", + "description": "футляри до державних нагород", + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "title": "футляри до державних нагород", "minimalStep": { "currency": "UAH", "amount": 35 }, - "procurementMethodDetails": "quick, accelerator=1440", + "auctionPeriod": { + "startDate": "2018-06-11" + }, "tenderAttempts": 1, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "value": { "currency": "UAH", - "amount": 500 + "amount": 100 }, + "description_ru": "футляры к государственным наградам", + "dgfID": "219560", + "title_ru": "футляры к государственным наградам", + "items": [ + { + "description": "Земля для військовослужбовців", + "classification": { + "scheme": "CAV-PS", + "id": "04121000-2", + "description": "Земельні ділянки" + }, + "description_en": "Cases with state awards", + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], + "address": { + "countryName": "Україна", + "postalCode": "79000", + "region": "м. Київ", + "streetAddress": "вул. Банкова 1", + "locality": "м. Київ" + }, + "quantity": 5.001, + "description_ru": "футляры к государственным наградам", + "unit": { + "code": "44617100-9", + "name": "item" + }, + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827", + "endDate": "2018-06-02T19:02:58.713827" + } + } + ], + "title_en": "Cases with state awards", "procuringEntity": { "contactPoint": { "name": "Державне управління справами", @@ -29,7 +78,6 @@ Host: api-sandbox.ea.openprocurement.org "uri": "http://www.dus.gov.ua/" }, "name": "Державне управління справами", - "kind": "general", "address": { "countryName": "Україна", "postalCode": "01220", @@ -37,89 +85,60 @@ Host: api-sandbox.ea.openprocurement.org "streetAddress": "вул. Банкова, 11, корпус 1", "locality": "м. Київ" } - }, - "mode": "test", - "title_ru": "футляры к государственным наградам", - "auctionPeriod": { - "startDate": "2017-12-14T16:56:17.205813" - }, - "items": [ - { - "classification": { - "scheme": "CPV", - "id": "66113000-5", - "description": "Земельні ділянки" - }, - "description": "Земля для військовослужбовців", - "id": "aff7d0febd8847b78f31662488efd20b", - "unit": { - "code": "44617100-9", - "name": "item" - }, - "quantity": 5 - } - ], - "title_en": "Cases with state awards", - "dgfID": "219560" + } } } 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/057ecdd1ad8f45ea8151e731ac2b30f3 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/e589f73396de4c75bbba0ef0a3a1d971 +X-Content-Type-Options: nosniff { "access": { - "token": "52d7fbc91420401d908289b3cbfe71e9" + "token": "f047d95916a74118bb883896564b9a3f" }, "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000002", + "auctionID": "UA-EA-2018-05-28-000003", "enquiryPeriod": { - "startDate": "2017-11-30T16:56:25.801167+02:00", - "endDate": "2017-12-14T16:55:24.860531+02:00" + "startDate": "2018-05-28T19:03:04.589432+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "submissionMethod": "electronicAuction", - "next_check": "2017-12-14T16:55:24.860531+02:00", - "procuringEntity": { - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "kind": "general", - "address": { - "postalCode": "01220", - "countryName": "Україна", - "streetAddress": "вул. Банкова, 11, корпус 1", - "region": "м. Київ", - "locality": "м. Київ" - } - }, + "next_check": "2018-06-10T20:00:00+03:00", + "awardCriteria": "highestCost", "owner": "broker", - "title_en": "[TESTING] Cases with state awards", - "id": "057ecdd1ad8f45ea8151e731ac2b30f3", - "title": "[ТЕСТУВАННЯ] футляри до державних нагород", + "id": "e589f73396de4c75bbba0ef0a3a1d971", + "description": "футляри до державних нагород", + "title": "футляри до державних нагород", "tenderAttempts": 1, - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:25.805777+02:00", + "auctionPeriod": { + "shouldStartAfter": "2018-06-11T00:00:00+03:00" + }, + "description_ru": "футляры к государственным наградам", + "dateModified": "2018-05-28T19:03:04.598947+03:00", "status": "active.tendering", "tenderPeriod": { - "startDate": "2017-11-30T16:56:25.801167+02:00", - "endDate": "2017-12-14T16:55:24.860531+02:00" - }, - "auctionPeriod": { - "shouldStartAfter": "2017-12-15T00:00:00+02:00" + "startDate": "2018-05-28T19:03:04.589432+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, - "procurementMethodType": "dgfOtherAssets", + "title_en": "Cases with state awards", + "procurementMethodType": "propertyLease", + "description_en": "Cases with state awards", "dgfID": "219560", - "date": "2017-11-30T16:56:25.801167+02:00", + "date": "2018-05-28T19:03:04.589432+03:00", + "rectificationPeriod": { + "startDate": "2018-05-28T19:03:04.589432+03:00", + "endDate": "2018-06-05T20:00:00+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "minimalStep": { "currency": "UAH", "amount": 35.0, @@ -127,28 +146,65 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/057ecdd1ad8 }, "items": [ { - "unit": { - "code": "44617100-9", - "name": "item" - }, "description": "Земля для військовослужбовців", - "id": "aff7d0febd8847b78f31662488efd20b", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" + }, + "description_en": "Cases with state awards", + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], + "address": { + "postalCode": "79000", + "countryName": "Україна", + "streetAddress": "вул. Банкова 1", + "region": "м. Київ", + "locality": "м. Київ" }, - "quantity": 5 + "quantity": 5.001, + "description_ru": "футляры к государственным наградам", + "id": "e9e1755a5a9245b0af8fc25870a07245", + "unit": { + "code": "44617100-9", + "name": "item" + }, + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "value": { "currency": "UAH", - "amount": 500.0, + "amount": 100.0, "valueAddedTaxIncluded": true }, - "mode": "test", - "title_ru": "[ТЕСТИРОВАНИЕ] футляры к государственным наградам", - "awardCriteria": "highestCost" + "title_ru": "футляры к государственным наградам", + "procuringEntity": { + "contactPoint": { + "name": "Державне управління справами", + "telephone": "0440000000" + }, + "identifier": { + "scheme": "UA-EDR", + "id": "00037256", + "uri": "http://www.dus.gov.ua/" + }, + "name": "Державне управління справами", + "address": { + "postalCode": "01220", + "countryName": "Україна", + "streetAddress": "вул. Банкова, 11, корпус 1", + "region": "м. Київ", + "locality": "м. Київ" + } + } } } diff --git a/docs/source/tutorial/finauction-adding-vdr.http b/docs/source/tutorial/finauction-adding-vdr.http deleted file mode 100644 index d38f424..0000000 --- a/docs/source/tutorial/finauction-adding-vdr.http +++ /dev/null @@ -1,31 +0,0 @@ -POST /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents?acc_token=6c03609dd6844e42bc1318fddf20c937 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 127 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "url": "http://virtial-data-room.com/id_of_room", - "title": "VDR for auction lot", - "documentType": "virtualDataRoom" - } -} - - -201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents/4e24994ddc1c4c72b24b992f8826acf4 - -{ - "data": { - "title": "VDR for auction lot", - "url": "http://virtial-data-room.com/id_of_room", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.313920+02:00", - "documentType": "virtualDataRoom", - "dateModified": "2017-11-30T16:56:24.313948+02:00", - "id": "4e24994ddc1c4c72b24b992f8826acf4" - } -} - diff --git a/docs/source/tutorial/finauction-documents-2.http b/docs/source/tutorial/finauction-documents-2.http deleted file mode 100644 index 71351d3..0000000 --- a/docs/source/tutorial/finauction-documents-2.http +++ /dev/null @@ -1,35 +0,0 @@ -GET /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Host: api-sandbox.ea.openprocurement.org - - -200 OK -Content-Type: application/json; charset=UTF-8 - -{ - "data": [ - { - "hash": "md5:00000000000000000000000000000000", - "description": "technical specification", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1b63ae48aa3e4caf99aac3455888c7d6?KeyID=c822be4a&Signature=Cqo%2Fl%2FHX9fy29aZ4TPnu9LB6ZtHdt6tquLKAJIGPLchoAf4OTMDnRAqLTeQK8rW9jgzFQ6I9HGfJtUP8i3gKDA%253D%253D", - "title": "Notice.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.108881+02:00", - "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:24.108911+02:00", - "id": "74e4e4b7624d420b8448a6220e0a86cf" - }, - { - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0a0c1a4b083475caaa4c8fb08d18781?KeyID=c822be4a&Signature=xnYvodjAvZu8pjdlyQ4kdlC62x%252BEi2JnnuWKvRdNbne9KWdXVWSlqM%252BeGrGuJ4%252BS2e9qmZRCg9vHJvc1iz%252BMAA%253D%253D", - "title": "AwardCriteria.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.174808+02:00", - "dateModified": "2017-11-30T16:56:24.174838+02:00", - "id": "55dc8e33c47948eab4e7b327bede3959" - } - ] -} - diff --git a/docs/source/tutorial/finauction-documents-3.http b/docs/source/tutorial/finauction-documents-3.http deleted file mode 100644 index 10cb314..0000000 --- a/docs/source/tutorial/finauction-documents-3.http +++ /dev/null @@ -1,35 +0,0 @@ -GET /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Host: api-sandbox.ea.openprocurement.org - - -200 OK -Content-Type: application/json; charset=UTF-8 - -{ - "data": [ - { - "hash": "md5:00000000000000000000000000000000", - "description": "technical specification", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1b63ae48aa3e4caf99aac3455888c7d6?KeyID=c822be4a&Signature=Cqo%2Fl%2FHX9fy29aZ4TPnu9LB6ZtHdt6tquLKAJIGPLchoAf4OTMDnRAqLTeQK8rW9jgzFQ6I9HGfJtUP8i3gKDA%253D%253D", - "title": "Notice.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.108881+02:00", - "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:24.108911+02:00", - "id": "74e4e4b7624d420b8448a6220e0a86cf" - }, - { - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/3efb323d6d6a42c9817ec011d6c8898f?KeyID=c822be4a&Signature=oMIup%252BjcxK%2FooCGXGpptyKCu1slmnk3T1I8XhOKPQXsKAD3R3zPyoDvYbF%252B47ZdbzNJ8m9v3TNQdsbseMlv7CA%253D%253D", - "title": "AwardCriteria-2.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.174808+02:00", - "dateModified": "2017-11-30T16:56:24.243244+02:00", - "id": "55dc8e33c47948eab4e7b327bede3959" - } - ] -} - diff --git a/docs/source/tutorial/finauction-documents.http b/docs/source/tutorial/finauction-documents.http deleted file mode 100644 index 9113873..0000000 --- a/docs/source/tutorial/finauction-documents.http +++ /dev/null @@ -1,24 +0,0 @@ -GET /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents/74e4e4b7624d420b8448a6220e0a86cf HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Host: api-sandbox.ea.openprocurement.org - - -200 OK -Content-Type: application/json; charset=UTF-8 - -{ - "data": { - "hash": "md5:00000000000000000000000000000000", - "description": "technical specification", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1b63ae48aa3e4caf99aac3455888c7d6?KeyID=c822be4a&Signature=Cqo%2Fl%2FHX9fy29aZ4TPnu9LB6ZtHdt6tquLKAJIGPLchoAf4OTMDnRAqLTeQK8rW9jgzFQ6I9HGfJtUP8i3gKDA%253D%253D", - "title": "Notice.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.108881+02:00", - "previousVersions": [], - "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:24.108911+02:00", - "id": "74e4e4b7624d420b8448a6220e0a86cf" - } -} - diff --git a/docs/source/tutorial/finauction-post-attempt-json-data.http b/docs/source/tutorial/finauction-post-attempt-json-data.http deleted file mode 100644 index 8df0cfa..0000000 --- a/docs/source/tutorial/finauction-post-attempt-json-data.http +++ /dev/null @@ -1,162 +0,0 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 1972 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "title": "футляри до державних нагород", - "minimalStep": { - "currency": "UAH", - "amount": 35 - }, - "procurementMethodDetails": "quick, accelerator=1440", - "tenderAttempts": 1, - "procurementMethodType": "dgfFinancialAssets", - "value": { - "currency": "UAH", - "amount": 100 - }, - "dgfID": "219560", - "auctionPeriod": { - "startDate": "2017-12-14" - }, - "items": [ - { - "classification": { - "scheme": "CPV", - "id": "66113000-5", - "description": "Земельні ділянки" - }, - "quantity": 5, - "description": "Земля для військовослужбовців", - "unit": { - "code": "44617100-9", - "name": "item" - }, - "address": { - "countryName": "Україна", - "postalCode": "79000", - "region": "м. Київ", - "streetAddress": "вул. Банкова 1", - "locality": "м. Київ" - } - } - ], - "procuringEntity": { - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "address": { - "countryName": "Україна", - "postalCode": "01220", - "region": "м. Київ", - "streetAddress": "вул. Банкова, 11, корпус 1", - "locality": "м. Київ" - } - } - } -} - - -201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28 - -{ - "access": { - "token": "6c03609dd6844e42bc1318fddf20c937" - }, - "data": { - "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", - "enquiryPeriod": { - "startDate": "2017-11-30T16:56:23.942831+02:00", - "endDate": "2017-12-13T23:59:50+02:00" - }, - "submissionMethod": "electronicAuction", - "next_check": "2017-12-13T23:59:50+02:00", - "procuringEntity": { - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "address": { - "postalCode": "01220", - "countryName": "Україна", - "streetAddress": "вул. Банкова, 11, корпус 1", - "region": "м. Київ", - "locality": "м. Київ" - } - }, - "owner": "broker", - "id": "73e1598288054eb98e8153ee9e69bb28", - "eligibilityCriteria_ru": "К участию допускаются только лицензированные финансовые учреждения.", - "title": "футляри до державних нагород", - "tenderAttempts": 1, - "eligibilityCriteria_en": "Only licensed financial institutions are eligible to participate.", - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:23.946137+02:00", - "status": "active.tendering", - "eligibilityCriteria": "До участі допускаються лише ліцензовані фінансові установи.", - "tenderPeriod": { - "startDate": "2017-11-30T16:56:23.942831+02:00", - "endDate": "2017-12-13T23:59:50+02:00" - }, - "auctionPeriod": { - "shouldStartAfter": "2017-12-14T00:00:00+02:00" - }, - "procurementMethodType": "dgfFinancialAssets", - "dgfID": "219560", - "date": "2017-11-30T16:56:23.942831+02:00", - "minimalStep": { - "currency": "UAH", - "amount": 35.0, - "valueAddedTaxIncluded": true - }, - "items": [ - { - "description": "Земля для військовослужбовців", - "classification": { - "scheme": "CPV", - "description": "Земельні ділянки", - "id": "66113000-5" - }, - "address": { - "postalCode": "79000", - "countryName": "Україна", - "streetAddress": "вул. Банкова 1", - "region": "м. Київ", - "locality": "м. Київ" - }, - "id": "e16351a78632484e8756b1dea38e6201", - "unit": { - "code": "44617100-9", - "name": "item" - }, - "quantity": 5 - } - ], - "value": { - "currency": "UAH", - "amount": 100.0, - "valueAddedTaxIncluded": true - }, - "awardCriteria": "highestCost" - } -} - diff --git a/docs/source/tutorial/finauction-update-award-criteria.http b/docs/source/tutorial/finauction-update-award-criteria.http deleted file mode 100644 index 8f1f3ec..0000000 --- a/docs/source/tutorial/finauction-update-award-criteria.http +++ /dev/null @@ -1,32 +0,0 @@ -PUT /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents/55dc8e33c47948eab4e7b327bede3959?acc_token=6c03609dd6844e42bc1318fddf20c937 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 340 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/3efb323d6d6a42c9817ec011d6c8898f?KeyID=c822be4a&Signature=ihcWFQ7J6n6ycnrnh0RJKYBGr3PXLL4%2Fu39OMCUhkdXcrv9CY%2FXcFty3b%2BqTiMV6ODEMR7zAyub4CwZXgyoYBA%3D%3D", - "title": "AwardCriteria-2.pdf", - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf" - } -} - - -200 OK -Content-Type: application/json; charset=UTF-8 - -{ - "data": { - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/3efb323d6d6a42c9817ec011d6c8898f?KeyID=c822be4a&Signature=oMIup%252BjcxK%2FooCGXGpptyKCu1slmnk3T1I8XhOKPQXsKAD3R3zPyoDvYbF%252B47ZdbzNJ8m9v3TNQdsbseMlv7CA%253D%253D", - "title": "AwardCriteria-2.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.174808+02:00", - "dateModified": "2017-11-30T16:56:24.243244+02:00", - "id": "55dc8e33c47948eab4e7b327bede3959" - } -} - diff --git a/docs/source/tutorial/finauction-upload-award-criteria.http b/docs/source/tutorial/finauction-upload-award-criteria.http deleted file mode 100644 index f417008..0000000 --- a/docs/source/tutorial/finauction-upload-award-criteria.http +++ /dev/null @@ -1,33 +0,0 @@ -POST /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents?acc_token=6c03609dd6844e42bc1318fddf20c937 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 338 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0a0c1a4b083475caaa4c8fb08d18781?KeyID=c822be4a&Signature=eUjEvPipgCDUg2CRW0uqyy%2Br5C7MNpbTp26C83J4cy7H84gzepDYr%2BfNWkPzjpTqZfg%2BIfTNVj86hY07Z9mcBA%3D%3D", - "title": "AwardCriteria.pdf", - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf" - } -} - - -201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents/55dc8e33c47948eab4e7b327bede3959 - -{ - "data": { - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0a0c1a4b083475caaa4c8fb08d18781?KeyID=c822be4a&Signature=xnYvodjAvZu8pjdlyQ4kdlC62x%252BEi2JnnuWKvRdNbne9KWdXVWSlqM%252BeGrGuJ4%252BS2e9qmZRCg9vHJvc1iz%252BMAA%253D%253D", - "title": "AwardCriteria.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.174808+02:00", - "dateModified": "2017-11-30T16:56:24.174838+02:00", - "id": "55dc8e33c47948eab4e7b327bede3959" - } -} - diff --git a/docs/source/tutorial/finbidder-documents.http b/docs/source/tutorial/finbidder-documents.http deleted file mode 100644 index b073d4e..0000000 --- a/docs/source/tutorial/finbidder-documents.http +++ /dev/null @@ -1,24 +0,0 @@ -GET /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/c7a52fb296b143cc87728f74b2585fca/documents?acc_token=b6c5e3c4087848a08703ae24889033a7 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Host: api-sandbox.ea.openprocurement.org - - -200 OK -Content-Type: application/json; charset=UTF-8 - -{ - "data": [ - { - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/c7a52fb296b143cc87728f74b2585fca/documents/523bf2858a644c37bb188b696ae1ee65?download=9d26f2842ae149228d379eb98961e054", - "title": "FinancialLicense.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.486255+02:00", - "documentType": "financialLicense", - "dateModified": "2017-11-30T16:56:24.486283+02:00", - "id": "523bf2858a644c37bb188b696ae1ee65" - } - ] -} - diff --git a/docs/source/tutorial/get-answer.http b/docs/source/tutorial/get-answer.http index c43eae0..05054b5 100644 --- a/docs/source/tutorial/get-answer.http +++ b/docs/source/tutorial/get-answer.http @@ -1,18 +1,19 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/questions/e966c8cdacc14655907b34713b141d18 HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/questions/22c3e98b31fd4c50bab5639de0668f1c HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "description": "Просимо додати таблицю потрібної калорійності харчування", "title": "Калорійність", - "date": "2017-11-30T16:56:26.610507+02:00", + "date": "2018-05-28T19:03:05.241690+03:00", "answer": "Таблицю додано в файлі \"Kalorijnist.xslx\"", - "id": "e966c8cdacc14655907b34713b141d18", + "id": "22c3e98b31fd4c50bab5639de0668f1c", "questionOf": "tender" } } diff --git a/docs/source/tutorial/get-awards.http b/docs/source/tutorial/get-awards.http index fc4c2a5..87f19ea 100644 --- a/docs/source/tutorial/get-awards.http +++ b/docs/source/tutorial/get-awards.http @@ -1,26 +1,27 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/awards HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/awards HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ { "status": "pending.verification", "paymentPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T17:16:29.509749+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-06-26T18:00:00+03:00" }, "verificationPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T16:59:30.218082+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-06-06T18:00:00+03:00" }, "signingPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T17:16:29.509749+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-06-26T18:00:00+03:00" }, "suppliers": [ { @@ -45,21 +46,21 @@ Content-Type: application/json; charset=UTF-8 } ], "complaintPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00" }, - "bid_id": "0d76a3f619044106b9bcdc0e57e93dad", + "bid_id": "3ce3413a56584eb1a7a870e01121effb", "value": { "currency": "UAH", "amount": 501.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:27.695166+02:00", - "id": "add0cbb7aa114e7cb6f5e127071f8b53" + "date": "2018-05-28T19:03:06.074292+03:00", + "id": "708d3fdf13ac4868b0df09cf479ceb06" }, { "status": "pending.waiting", "complaintPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00" }, "suppliers": [ { @@ -83,14 +84,14 @@ Content-Type: application/json; charset=UTF-8 } } ], - "bid_id": "afaa508128da4829b9202fe300965bf4", + "bid_id": "4ed57eda57b941399523f19f03b9ada4", "value": { "currency": "UAH", "amount": 500.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:27.695166+02:00", - "id": "14f4c1774be847098f247565c4871574" + "date": "2018-05-28T19:03:06.074292+03:00", + "id": "623e2ec3b03a4cbf82485097b8c3cc91" } ] } diff --git a/docs/source/tutorial/initial-auction-listing.http b/docs/source/tutorial/initial-auction-listing.http index 65b7ba5..9e701e3 100644 --- a/docs/source/tutorial/initial-auction-listing.http +++ b/docs/source/tutorial/initial-auction-listing.http @@ -1,22 +1,18 @@ -GET /api/2.3/auctions HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "next_page": { - "path": "/api/2.3/auctions?offset=2017-11-30T16%3A56%3A25.621767%2B02%3A00", - "uri": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions?offset=2017-11-30T16%3A56%3A25.621767%2B02%3A00", - "offset": "2017-11-30T16:56:25.621767+02:00" + "path": "/api/2.4/auctions?offset=", + "uri": "http://api-sandbox.ea.openprocurement.org/api/2.4/auctions?offset=", + "offset": "" }, - "data": [ - { - "id": "301d66e275cb4861ba502c1eaafa88ae", - "dateModified": "2017-11-30T16:56:25.621767+02:00" - } - ] + "data": [] } diff --git a/docs/source/tutorial/initial-finauction-listing.http b/docs/source/tutorial/initial-finauction-listing.http deleted file mode 100644 index d703548..0000000 --- a/docs/source/tutorial/initial-finauction-listing.http +++ /dev/null @@ -1,22 +0,0 @@ -GET /api/2.3/auctions HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Host: api-sandbox.ea.openprocurement.org - - -200 OK -Content-Type: application/json; charset=UTF-8 - -{ - "next_page": { - "path": "/api/2.3/auctions?offset=2017-11-30T16%3A56%3A23.946137%2B02%3A00", - "uri": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions?offset=2017-11-30T16%3A56%3A23.946137%2B02%3A00", - "offset": "2017-11-30T16:56:23.946137+02:00" - }, - "data": [ - { - "id": "73e1598288054eb98e8153ee9e69bb28", - "dateModified": "2017-11-30T16:56:23.946137+02:00" - } - ] -} - diff --git a/docs/source/tutorial/list-question.http b/docs/source/tutorial/list-question.http index a43ac52..cfc2d00 100644 --- a/docs/source/tutorial/list-question.http +++ b/docs/source/tutorial/list-question.http @@ -1,19 +1,20 @@ -GET /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/questions HTTP/1.0 -Authorization: Basic YnJva2VyOg== +GET /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/questions HTTP/1.0 +Authorization: Basic YnJva2VyOg== Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": [ { "description": "Просимо додати таблицю потрібної калорійності харчування", "title": "Калорійність", - "date": "2017-11-30T16:56:26.610507+02:00", + "date": "2018-05-28T19:03:05.241690+03:00", "answer": "Таблицю додано в файлі \"Kalorijnist.xslx\"", - "id": "e966c8cdacc14655907b34713b141d18", + "id": "22c3e98b31fd4c50bab5639de0668f1c", "questionOf": "tender" } ] diff --git a/docs/source/tutorial/out-of-rectification-period-editing-denied.http b/docs/source/tutorial/out-of-rectification-period-editing-denied.http index c836775..24136f8 100644 --- a/docs/source/tutorial/out-of-rectification-period-editing-denied.http +++ b/docs/source/tutorial/out-of-rectification-period-editing-denied.http @@ -1,35 +1,47 @@ -PATCH /api/2.3/auctions/aad622eb435a443e8a7afd5432c5d4e6?acc_token=8f2c28a574a647ab8f3dfaeadbbbadb2 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 2076 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 2230 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "title": "футляри до державних нагород", "minimalStep": { "currency": "UAH", "amount": 35 }, - "procurementMethodDetails": "quick, accelerator=1440", + "auctionPeriod": { + "startDate": "2018-06-11" + }, "tenderAttempts": 1, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "value": { "currency": "UAH", "amount": 100 }, "dgfID": "219560", - "auctionPeriod": { - "startDate": "2017-12-04" - }, "items": [ { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", - "id": "66113000-5", + "scheme": "CAV-PS", + "id": "04121000-2", "description": "Земельні ділянки" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "countryName": "Україна", "postalCode": "79000", @@ -38,8 +50,8 @@ Host: api-sandbox.ea.openprocurement.org "locality": "м. Київ" }, "contractPeriod": { - "startDate": "2017-11-22T15:29:31.486546", - "endDate": "2017-11-25T15:29:31.486546" + "startDate": "2018-05-30T19:02:58.713827", + "endDate": "2018-06-02T19:02:58.713827" }, "unit": { "code": "44617100-9", @@ -72,13 +84,14 @@ Host: api-sandbox.ea.openprocurement.org 403 Forbidden -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "status": "error", "errors": [ { - "description": "Auction can be edited only during the rectification period: from (2017-11-06T15:29:31.491067+02:00) to (2017-11-20T15:28:31.491067+02:00).", + "description": "Auction can be edited only during the rectification period: from (2018-05-14T19:03:04.732774+03:00) to (2018-05-22T19:03:04.732774+03:00).", "location": "body", "name": "data" } diff --git a/docs/source/tutorial/owner-auction-protocol.http b/docs/source/tutorial/owner-auction-protocol.http index 4c32f80..7a7713e 100644 --- a/docs/source/tutorial/owner-auction-protocol.http +++ b/docs/source/tutorial/owner-auction-protocol.http @@ -1,12 +1,12 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/awards/add0cbb7aa114e7cb6f5e127071f8b53/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 383 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/awards/708d3fdf13ac4868b0df09cf479ceb06/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 385 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/79f7d75e9ff34c1d94289241ebd04a46?KeyID=8473a74a&Signature=Dw9ofeROBRO2k0vLPta83X2j28ym58QAiJ%2BKEtgsCkgGnY7vD6%2BBo%2Bdk29rxKjuVbQ%2FCyfdPWZKW8wFk8qCfAg%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1ba9a8b51cd14c05aa42fef2bb3965db?KeyID=7149c8cc&Signature=muBdxzty2PgmXY%2BAnFhgHRne8Dy7aN%2FbrbgUblS74CnzEJxu%2FKCtb1zLcQ7nh3%2Bbb4qQAaJnMxWdDwdc%2FaQKCg%3D%3D", "title": "SignedAuctionProtocol.pdf", "format": "application/pdf", "hash": "md5:00000000000000000000000000000000", @@ -16,21 +16,22 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/awards/add0cbb7aa114e7cb6f5e127071f8b53/documents/edc7c486de494ac3bdcc0b456d006e4a +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/awards/708d3fdf13ac4868b0df09cf479ceb06/documents/77e9d9a7876740f1a64931dd4f96989c +X-Content-Type-Options: nosniff { "data": { - "dateModified": "2017-11-30T16:56:28.217417+02:00", "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/79f7d75e9ff34c1d94289241ebd04a46?KeyID=8473a74a&Signature=ZZf5dIDTAFetGGoNyGHK0TaTX%2FMo%2FTcKq%2FTatSSpuIZleTjJFvbciSiMq9MNq3mZGWRdK%2FYKfT0lkoOKYooXDA%253D%253D", "author": "auction_owner", + "title": "SignedAuctionProtocol.pdf", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1ba9a8b51cd14c05aa42fef2bb3965db?KeyID=7149c8cc&Signature=z%2Ftx0X6an%252B1mIrbwMmuknuPp%252BFVzm3Ps4I%2FXguLCJe5mLZLoqJHlVkZq%252B93cTVvvsRiGx2ASxd%2FtV762p80VBw%253D%253D", + "format": "application/pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.217384+02:00", + "datePublished": "2018-05-28T19:03:06.459190+03:00", "documentType": "auctionProtocol", - "title": "SignedAuctionProtocol.pdf", - "id": "edc7c486de494ac3bdcc0b456d006e4a" + "dateModified": "2018-05-28T19:03:06.459214+03:00", + "id": "77e9d9a7876740f1a64931dd4f96989c" } } diff --git a/docs/source/tutorial/patch-cancellation.http b/docs/source/tutorial/patch-cancellation.http index fe3d8be..97c2a70 100644 --- a/docs/source/tutorial/patch-cancellation.http +++ b/docs/source/tutorial/patch-cancellation.http @@ -1,7 +1,7 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/cancellations/3fd26d96a4454abf9a875bef110dba4e/documents/6aebbc98305a4847830bdc40863a4d6b?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 48 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/cancellations/5b7b7e9fbe0340f5ad88eccc7ced1c51/documents/45baf4951469459394de757f4c50b394?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 48 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,19 +12,20 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "description": "Changed description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/02dd9977d20e4b409d307bc67ee6ca36?KeyID=8473a74a&Signature=5WtHn%252BXf4U2eKnBY5mwdZNifHaf%2FMoApsRroJSOzQBI%252BdJ5ZwCkP%252BTZmjkZ%2FDOh1M4U5JY7u1MJE8%252Bp7YQOSBw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/7fad0841b4c04a34a0781b5d9df39299?KeyID=7149c8cc&Signature=eUJfguREMN77TKqJoyrlz%2FApEeUDvgZU9XhPBnaBegBMH8jSxwBRpzwr87dhEd3bK16kfFwoUn3JVSWqae6OAA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.945693+02:00", - "dateModified": "2017-11-30T16:56:29.945720+02:00", - "id": "6aebbc98305a4847830bdc40863a4d6b" + "datePublished": "2018-05-28T19:03:07.723456+03:00", + "dateModified": "2018-05-28T19:03:07.723479+03:00", + "id": "45baf4951469459394de757f4c50b394" } } diff --git a/docs/source/tutorial/patch-items-value-periods.http b/docs/source/tutorial/patch-items-value-periods.http index 05a1093..bda254f 100644 --- a/docs/source/tutorial/patch-items-value-periods.http +++ b/docs/source/tutorial/patch-items-value-periods.http @@ -1,31 +1,32 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 75 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 75 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { "tenderPeriod": { - "endDate": "2017-12-15T16:56:35.944933+02:00" + "endDate": "2018-06-12T19:03:14.663047+03:00" } } } 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "procurementMethod": "open", - "auctionID": "UA-PS-2017-11-30-000001", + "auctionID": "UA-EA-2018-05-28-000001", "enquiryPeriod": { - "startDate": "2017-11-30T16:56:25.617199+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "submissionMethod": "electronicAuction", - "next_check": "2017-12-13T23:59:50+02:00", + "next_check": "2018-06-10T20:00:00+03:00", "procuringEntity": { "contactPoint": { "name": "Державне управління справами", @@ -46,22 +47,32 @@ Content-Type: application/json; charset=UTF-8 } }, "owner": "broker", - "id": "301d66e275cb4861ba502c1eaafa88ae", + "id": "246d20f56b0a4601bd4b5ddd3ac636e9", "title": "футляри до державних нагород", "tenderAttempts": 1, - "procurementMethodDetails": "quick, accelerator=1440", - "dateModified": "2017-11-30T16:56:25.621767+02:00", + "dateModified": "2018-05-28T19:03:04.702467+03:00", "status": "active.tendering", "tenderPeriod": { - "startDate": "2017-11-30T16:56:25.617199+02:00", - "endDate": "2017-12-13T23:59:50+02:00" + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-10T20:00:00+03:00" }, "auctionPeriod": { - "shouldStartAfter": "2017-12-14T00:00:00+02:00" + "shouldStartAfter": "2018-06-11T00:00:00+03:00" }, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "dgfID": "219560", - "date": "2017-11-30T16:56:25.617199+02:00", + "date": "2018-05-28T19:03:04.480367+03:00", + "rectificationPeriod": { + "startDate": "2018-05-28T19:03:04.480367+03:00", + "endDate": "2018-06-05T20:00:00+03:00", + "invalidationDate": "2018-05-28T19:03:04.701084+03:00" + }, + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "minimalStep": { "currency": "UAH", "amount": 35.0, @@ -71,10 +82,17 @@ Content-Type: application/json; charset=UTF-8 { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", + "scheme": "CAV-PS", "description": "Земельні ділянки", - "id": "66113000-5" + "id": "04121000-2" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "postalCode": "79000", "countryName": "Україна", @@ -82,12 +100,16 @@ Content-Type: application/json; charset=UTF-8 "region": "м. Київ", "locality": "м. Київ" }, - "id": "6abd12c929084367ac08d9d9138ccab4", + "quantity": 5.001, + "id": "3b845b808a6345589d0777eeb3b79c6e", "unit": { "code": "44617100-9", "name": "item" }, - "quantity": 5 + "contractPeriod": { + "startDate": "2018-05-30T19:02:58.713827+03:00", + "endDate": "2018-06-02T19:02:58.713827+03:00" + } } ], "value": { diff --git a/docs/source/tutorial/prepare-cancellation.http b/docs/source/tutorial/prepare-cancellation.http index c961846..066b98f 100644 --- a/docs/source/tutorial/prepare-cancellation.http +++ b/docs/source/tutorial/prepare-cancellation.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/cancellations?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 43 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/cancellations?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 43 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,16 +12,17 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/cancellations/3fd26d96a4454abf9a875bef110dba4e +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/cancellations/5b7b7e9fbe0340f5ad88eccc7ced1c51 +X-Content-Type-Options: nosniff { "data": { - "date": "2017-11-30T16:56:29.616244+02:00", + "date": "2018-05-28T19:03:07.609340+03:00", "status": "pending", "reason": "cancellation reason", "cancellationOf": "tender", - "id": "3fd26d96a4454abf9a875bef110dba4e" + "id": "5b7b7e9fbe0340f5ad88eccc7ced1c51" } } diff --git a/docs/source/tutorial/register-2nd-bidder.http b/docs/source/tutorial/register-2nd-bidder.http index f55b9c2..e1fe957 100644 --- a/docs/source/tutorial/register-2nd-bidder.http +++ b/docs/source/tutorial/register-2nd-bidder.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 723 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 723 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -37,12 +37,13 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/0d76a3f619044106b9bcdc0e57e93dad +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/3ce3413a56584eb1a7a870e01121effb +X-Content-Type-Options: nosniff { "access": { - "token": "73842c515600468a8829fea44817fce1" + "token": "ad29e002be7540eba7ee46592248215f" }, "data": { "status": "active", @@ -51,7 +52,7 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "amount": 501.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:27.113380+02:00", + "date": "2018-05-28T19:03:05.626934+03:00", "qualified": true, "tenderers": [ { @@ -76,7 +77,7 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c } ], "owner": "broker", - "id": "0d76a3f619044106b9bcdc0e57e93dad" + "id": "3ce3413a56584eb1a7a870e01121effb" } } diff --git a/docs/source/tutorial/register-2nd-finbidder.http b/docs/source/tutorial/register-2nd-finbidder.http deleted file mode 100644 index e1f70dd..0000000 --- a/docs/source/tutorial/register-2nd-finbidder.http +++ /dev/null @@ -1,96 +0,0 @@ -POST /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 1004 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "qualified": true, - "tenderers": [ - { - "additionalIdentifiers": [ - { - "scheme": "UA-FIN", - "id": "А01 457213" - } - ], - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "address": { - "countryName": "Україна", - "postalCode": "01220", - "region": "м. Київ", - "streetAddress": "вул. Банкова, 11, корпус 1", - "locality": "м. Київ" - } - } - ], - "value": { - "currency": "UAH", - "amount": 479, - "valueAddedTaxIncluded": true - }, - "eligible": true - } -} - - -201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/afc000ac87e642d8b70141957772cdb8 - -{ - "access": { - "token": "47bbd4a1e6f9460b94cea52301caca48" - }, - "data": { - "status": "active", - "eligible": true, - "value": { - "currency": "UAH", - "amount": 479.0, - "valueAddedTaxIncluded": true - }, - "date": "2017-11-30T16:56:24.588843+02:00", - "qualified": true, - "tenderers": [ - { - "additionalIdentifiers": [ - { - "scheme": "UA-FIN", - "id": "А01 457213" - } - ], - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "address": { - "postalCode": "01220", - "countryName": "Україна", - "streetAddress": "вул. Банкова, 11, корпус 1", - "region": "м. Київ", - "locality": "м. Київ" - } - } - ], - "owner": "broker", - "id": "afc000ac87e642d8b70141957772cdb8" - } -} - diff --git a/docs/source/tutorial/register-bidder.http b/docs/source/tutorial/register-bidder.http index b3bd8dc..da98f60 100644 --- a/docs/source/tutorial/register-bidder.http +++ b/docs/source/tutorial/register-bidder.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 776 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 776 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -38,12 +38,13 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4 +X-Content-Type-Options: nosniff { "access": { - "token": "a94a2b6627aa46f3bbb83ff885e3beae" + "token": "650aaa4270024deaac41cb856120c3c5" }, "data": { "status": "draft", @@ -52,7 +53,7 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "amount": 500.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:26.821209+02:00", + "date": "2018-05-28T19:03:05.400869+03:00", "qualified": true, "tenderers": [ { @@ -77,7 +78,7 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c } ], "owner": "broker", - "id": "afaa508128da4829b9202fe300965bf4" + "id": "4ed57eda57b941399523f19f03b9ada4" } } diff --git a/docs/source/tutorial/register-finbidder.http b/docs/source/tutorial/register-finbidder.http deleted file mode 100644 index d5a2999..0000000 --- a/docs/source/tutorial/register-finbidder.http +++ /dev/null @@ -1,96 +0,0 @@ -POST /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 1004 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "qualified": true, - "tenderers": [ - { - "additionalIdentifiers": [ - { - "scheme": "UA-FIN", - "id": "А01 457213" - } - ], - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "address": { - "countryName": "Україна", - "postalCode": "01220", - "region": "м. Київ", - "streetAddress": "вул. Банкова, 11, корпус 1", - "locality": "м. Київ" - } - } - ], - "value": { - "currency": "UAH", - "amount": 469, - "valueAddedTaxIncluded": true - }, - "eligible": true - } -} - - -201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/c7a52fb296b143cc87728f74b2585fca - -{ - "access": { - "token": "b6c5e3c4087848a08703ae24889033a7" - }, - "data": { - "status": "active", - "eligible": true, - "value": { - "currency": "UAH", - "amount": 469.0, - "valueAddedTaxIncluded": true - }, - "date": "2017-11-30T16:56:24.381299+02:00", - "qualified": true, - "tenderers": [ - { - "additionalIdentifiers": [ - { - "scheme": "UA-FIN", - "id": "А01 457213" - } - ], - "contactPoint": { - "name": "Державне управління справами", - "telephone": "0440000000" - }, - "identifier": { - "scheme": "UA-EDR", - "id": "00037256", - "uri": "http://www.dus.gov.ua/" - }, - "name": "Державне управління справами", - "address": { - "postalCode": "01220", - "countryName": "Україна", - "streetAddress": "вул. Банкова, 11, корпус 1", - "region": "м. Київ", - "locality": "м. Київ" - } - } - ], - "owner": "broker", - "id": "c7a52fb296b143cc87728f74b2585fca" - } -} - diff --git a/docs/source/tutorial/tenderperiod-validation-error.http b/docs/source/tutorial/tenderperiod-validation-error.http index 9595c71..f2fecfb 100644 --- a/docs/source/tutorial/tenderperiod-validation-error.http +++ b/docs/source/tutorial/tenderperiod-validation-error.http @@ -1,21 +1,27 @@ -POST /api/2.3/auctions?opt_pretty=1 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 2037 -Content-Type: application/json +POST /api/2.4/auctions?opt_pretty=1 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 2246 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { + "contractTerms": { + "contractType": "lease", + "leaseTerms": { + "leaseDuration": "P10Y" + } + }, "title": "футляри до державних нагород", "minimalStep": { "currency": "UAH", "amount": 35 }, "auctionPeriod": { - "startDate": "2017-09-02T15:56:30.045984" + "startDate": "2018-06-03T19:02:59.179463" }, "tenderAttempts": 1, - "procurementMethodType": "dgfOtherAssets", + "procurementMethodType": "propertyLease", "value": { "currency": "UAH", "amount": 100 @@ -25,10 +31,17 @@ Host: api-sandbox.ea.openprocurement.org { "description": "Земля для військовослужбовців", "classification": { - "scheme": "CPV", - "id": "66113000-5", + "scheme": "CAV-PS", + "id": "04121000-2", "description": "Земельні ділянки" }, + "additionalClassifications": [ + { + "scheme": "CPVS", + "id": "PA01-7", + "description": "Оренда" + } + ], "address": { "countryName": "Україна", "postalCode": "79000", @@ -37,8 +50,8 @@ Host: api-sandbox.ea.openprocurement.org "locality": "м. Київ" }, "contractPeriod": { - "startDate": "2017-08-30T15:56:30.043635", - "endDate": "2017-09-02T15:56:30.043635" + "startDate": "2018-05-30T19:02:58.713827", + "endDate": "2018-06-02T19:02:58.713827" }, "unit": { "code": "44617100-9", @@ -71,7 +84,8 @@ Host: api-sandbox.ea.openprocurement.org 422 Unprocessable Entity -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "status": "error", diff --git a/docs/source/tutorial/update-award-criteria.http b/docs/source/tutorial/update-award-criteria.http index f95268b..a9d5013 100644 --- a/docs/source/tutorial/update-award-criteria.http +++ b/docs/source/tutorial/update-award-criteria.http @@ -1,12 +1,12 @@ -PUT /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/3385ba24fb704db79cb8a70561e023c7?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 336 -Content-Type: application/json +PUT /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/882f19abea9041a2adc123890e947ebb?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 334 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9840d23dc3194951a561e6b3d959fac0?KeyID=8473a74a&Signature=zV0b0U6S2LivauIlHbmy3NjVsbCTyEtgWFhrVYM3rEVniUg%2FJnfwZc3BruHog0KupIa2qItySihDKH2sVU1UAQ%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0696fd30a8441339034a0bedfeac17d?KeyID=7149c8cc&Signature=uVKfsWM4KrB3drjyiQK6BqYk1l0PQH2KyPEmHERFtDC5PSJoVEmCzBtX6LKxIyRcibxBlDhHDWPc7KadrtVpCQ%3D%3D", "title": "AwardCriteria-2.pdf", "hash": "md5:00000000000000000000000000000000", "format": "application/pdf" @@ -15,18 +15,19 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9840d23dc3194951a561e6b3d959fac0?KeyID=8473a74a&Signature=vJlSrjCYsuQhptjoPNewJOzwmvXFcLc5HA8pIMybY%252B0qd7VYuGlhFpTPnwpMtpFEnblx87Fz%252BXuJ9x%2FBELicCg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/b0696fd30a8441339034a0bedfeac17d?KeyID=7149c8cc&Signature=OqqMTmnanG%2FNPRbSjfZQkvve8ToxfFFA6UAJ22da%252BbRQ%2FZ7x7b5uqg5I%2FgnjqRhiC2leHG%252BT9X6W6xJbCFznCQ%253D%253D", "title": "AwardCriteria-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.221784+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.929762+03:00", + "id": "882f19abea9041a2adc123890e947ebb" } } diff --git a/docs/source/tutorial/update-cancellation-doc.http b/docs/source/tutorial/update-cancellation-doc.http index d16730c..d903a22 100644 --- a/docs/source/tutorial/update-cancellation-doc.http +++ b/docs/source/tutorial/update-cancellation-doc.http @@ -1,12 +1,12 @@ -PUT /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/cancellations/3fd26d96a4454abf9a875bef110dba4e/documents/6aebbc98305a4847830bdc40863a4d6b?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 331 -Content-Type: application/json +PUT /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/cancellations/5b7b7e9fbe0340f5ad88eccc7ced1c51/documents/45baf4951469459394de757f4c50b394?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 335 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1981cae19a6d4577bf343cf0b7d813f5?KeyID=8473a74a&Signature=8gW%2BOhgmZJCtbnvWqrJA%2Bigktxl1Ze93F9aM6jRFkTFNYgGjSTv7UcmiLAzKivOQlJDM0rAk5VD9ORurYDjDCw%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/f3b6995285c4491db7d8df528e48aeb4?KeyID=7149c8cc&Signature=DcaUzE4kidbxF2hRrGxcVQFrH5V3WC5RtICwvXfmrgNS9L%2FUVmr8Qb%2BY4%2B%2FDReKJDQlkqTFDmvLy2BCm4w1LAA%3D%3D", "title": "Notice-2.pdf", "hash": "md5:00000000000000000000000000000000", "format": "application/pdf" @@ -15,19 +15,20 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "description": "Changed description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1981cae19a6d4577bf343cf0b7d813f5?KeyID=8473a74a&Signature=6PDYxf6GgOgkJuoH%2FR4qtBFHx%2FEcXKpV9NJ0lWVPu7IBKLdQ8%252ByiK5kIQk5YZ9aebaDik0e4JNDdJihcZVA%252BBg%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/f3b6995285c4491db7d8df528e48aeb4?KeyID=7149c8cc&Signature=V21tF8lhwqSmzPprBLYz8aNyWVvyDYsRc5wzBCakSQ8y6l3iCExbaMwc954xcldHZjLdRT54YkBNR1obYBMtCw%253D%253D", "title": "Notice-2.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.945693+02:00", - "dateModified": "2017-11-30T16:56:30.284752+02:00", - "id": "6aebbc98305a4847830bdc40863a4d6b" + "datePublished": "2018-05-28T19:03:07.723456+03:00", + "dateModified": "2018-05-28T19:03:07.960503+03:00", + "id": "45baf4951469459394de757f4c50b394" } } diff --git a/docs/source/tutorial/upload-auction-notice.http b/docs/source/tutorial/upload-auction-notice.http index 494dc4d..54cace8 100644 --- a/docs/source/tutorial/upload-auction-notice.http +++ b/docs/source/tutorial/upload-auction-notice.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 415 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 417 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -9,7 +9,7 @@ Host: api-sandbox.ea.openprocurement.org "hash": "md5:00000000000000000000000000000000", "description": "document description", "title": "Notice.pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=P1G3pRNxZchhK%2FgkOzQoI4eQtwB%2BhjrtHZpWFS4DHIsNZke%2BhlU%2Fckb5vkmRwzqcg96vsSluTsCXIfg4TWd6Bg%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=zF%2FDQ%2BwGfUxGhzdH0WUV5CQv4Gw%2BVqcLMGRtZWHXO2eL2RL%2FhsL79opqAMj6z3%2B5FzxGycrLGf79AwYPvydkCA%3D%3D", "format": "application/pdf", "documentType": "technicalSpecifications" } @@ -17,21 +17,22 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/418d8f99150a4b92a57b81cc18cd968a +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/2bb61a55cf5b4a8386260ac1a4cad34c +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "description": "document description", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/323a56de45c243bb88a568c652d9ca2b?KeyID=8473a74a&Signature=u52VVOil6Bd6RED8Jt8wIJv2ioBCOV5meDxqcLgCksUxsJeTTj2aL5xHGYGjnsDBb0N6NohsEHBoxR5WaFE8Cw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/d36b0eb738984a60905854537a960795?KeyID=7149c8cc&Signature=oYC9e9WVmL4jM%252BhzrEnL7c6Nibmk1tAHoipDXjtyT61Q3j0ce1aPr0yJIMjPWyGXS3QB3hXNxv0%252BrhQXcpTrDA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.092186+02:00", + "datePublished": "2018-05-28T19:03:04.824043+03:00", "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:26.092222+02:00", - "id": "418d8f99150a4b92a57b81cc18cd968a" + "dateModified": "2018-05-28T19:03:04.824083+03:00", + "id": "2bb61a55cf5b4a8386260ac1a4cad34c" } } diff --git a/docs/source/tutorial/upload-award-criteria.http b/docs/source/tutorial/upload-award-criteria.http index a1bcc63..4e679fa 100644 --- a/docs/source/tutorial/upload-award-criteria.http +++ b/docs/source/tutorial/upload-award-criteria.http @@ -1,12 +1,12 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 340 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 342 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/68fe48f4593a4de9844e6548344b2696?KeyID=8473a74a&Signature=20qbIlw9A9vFgmcjaagAfrYpHKp5oWHqcqZEBDuJIq%2FwysuHo4C%2BREnHEOneynezrY%2FoIQoJ8379xY%2BDJId4BQ%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/42f468f963964ac0883313db87abc294?KeyID=7149c8cc&Signature=wGBY5DfS1F7IuNqMNoDQTALBL%2Bv8FFM3Cn1vaK3o%2BT3juGBtq%2F7kErnuTwjX20%2Bj72Pk%2F8eAY5jixa45U4dXAA%3D%3D", "title": "AwardCriteria.pdf", "hash": "md5:00000000000000000000000000000000", "format": "application/pdf" @@ -15,19 +15,20 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/3385ba24fb704db79cb8a70561e023c7 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/882f19abea9041a2adc123890e947ebb +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/68fe48f4593a4de9844e6548344b2696?KeyID=8473a74a&Signature=QZwWxRCYJDGM8BwdJ%252Bh%2FZ7EfjK1tSuHstIWY7Phw8MUeywT2GsNNucpnf2UGZGud5EPLKF1xOz9hX%252BWHtaSeBw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/42f468f963964ac0883313db87abc294?KeyID=7149c8cc&Signature=XRuGZP2eAk2I7vRsPppBUKCGQWoWEcTdD7Cn%2FQJFqHsAzhj5y9yj75Af3iKYenLWwy01%2Fj7A4jHQR%252BZkIbI4CA%253D%253D", "title": "AwardCriteria.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.157156+02:00", - "dateModified": "2017-11-30T16:56:26.157192+02:00", - "id": "3385ba24fb704db79cb8a70561e023c7" + "datePublished": "2018-05-28T19:03:04.874619+03:00", + "dateModified": "2018-05-28T19:03:04.874644+03:00", + "id": "882f19abea9041a2adc123890e947ebb" } } diff --git a/docs/source/tutorial/upload-bid-proposal.http b/docs/source/tutorial/upload-bid-proposal.http index bae5573..817193c 100644 --- a/docs/source/tutorial/upload-bid-proposal.http +++ b/docs/source/tutorial/upload-bid-proposal.http @@ -1,12 +1,12 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4/documents?acc_token=a94a2b6627aa46f3bbb83ff885e3beae HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 329 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4/documents?acc_token=650aaa4270024deaac41cb856120c3c5 HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 337 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/4accad3bd17a4f0baa9f6a8ea96397f7?KeyID=8473a74a&Signature=F1ZZ8oz1qK%2B51JWibcyBu4pKvQcdApeIzqnBqPAbC9cdvKzLWXgVTNPak47HJv4BsbUhFSa9j9qb7pQ6mMOsBg%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/52acfea5369d48cb85f0bad1a27eaf23?KeyID=7149c8cc&Signature=4q1KoUcei%2F0mVUpDP%2Fp7lbItVK5MCwKtEOT3%2FOECC6UaJkfxl5Pg1xHJblSlgkIkFC%2BeSIcB9ym4bSsZhV%2FkBg%3D%3D", "title": "Proposal.pdf", "hash": "md5:00000000000000000000000000000000", "format": "application/pdf" @@ -15,19 +15,20 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4/documents/3bd15f6db7764b7e9651fdf15dde6316 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4/documents/75135cb499834e5ca718f462e5d3c1e7 +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/bids/afaa508128da4829b9202fe300965bf4/documents/3bd15f6db7764b7e9651fdf15dde6316?download=4accad3bd17a4f0baa9f6a8ea96397f7", + "url": "http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/bids/4ed57eda57b941399523f19f03b9ada4/documents/75135cb499834e5ca718f462e5d3c1e7?download=52acfea5369d48cb85f0bad1a27eaf23", "title": "Proposal.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.994147+02:00", - "dateModified": "2017-11-30T16:56:26.994175+02:00", - "id": "3bd15f6db7764b7e9651fdf15dde6316" + "datePublished": "2018-05-28T19:03:05.533715+03:00", + "dateModified": "2018-05-28T19:03:05.533744+03:00", + "id": "75135cb499834e5ca718f462e5d3c1e7" } } diff --git a/docs/source/tutorial/upload-cancellation-doc.http b/docs/source/tutorial/upload-cancellation-doc.http index 79eef40..8084ca2 100644 --- a/docs/source/tutorial/upload-cancellation-doc.http +++ b/docs/source/tutorial/upload-cancellation-doc.http @@ -1,12 +1,12 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/cancellations/3fd26d96a4454abf9a875bef110dba4e/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 333 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/cancellations/5b7b7e9fbe0340f5ad88eccc7ced1c51/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 329 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/02dd9977d20e4b409d307bc67ee6ca36?KeyID=8473a74a&Signature=WhL6NTgs5mjvzOHNCCeQke4w1%2F7zXZ7lFpc59uvGIzXOAJPb8fwjWqupDk86%2Frroe1%2B77jX624%2Bo6ZLSkbCADw%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/7fad0841b4c04a34a0781b5d9df39299?KeyID=7149c8cc&Signature=1eWteIfdxnq871lPftqepjZhSKyA890EovtDNGeh2ZMPBEIYlnITLqBLkH7oggV6etsYU%2F8JMVr9IYsyQ%2FbDAg%3D%3D", "title": "Notice.pdf", "hash": "md5:00000000000000000000000000000000", "format": "application/pdf" @@ -15,19 +15,20 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/cancellations/3fd26d96a4454abf9a875bef110dba4e/documents/6aebbc98305a4847830bdc40863a4d6b +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/cancellations/5b7b7e9fbe0340f5ad88eccc7ced1c51/documents/45baf4951469459394de757f4c50b394 +X-Content-Type-Options: nosniff { "data": { "hash": "md5:00000000000000000000000000000000", "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/02dd9977d20e4b409d307bc67ee6ca36?KeyID=8473a74a&Signature=5WtHn%252BXf4U2eKnBY5mwdZNifHaf%2FMoApsRroJSOzQBI%252BdJ5ZwCkP%252BTZmjkZ%2FDOh1M4U5JY7u1MJE8%252Bp7YQOSBw%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/7fad0841b4c04a34a0781b5d9df39299?KeyID=7149c8cc&Signature=eUJfguREMN77TKqJoyrlz%2FApEeUDvgZU9XhPBnaBegBMH8jSxwBRpzwr87dhEd3bK16kfFwoUn3JVSWqae6OAA%253D%253D", "title": "Notice.pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:29.945693+02:00", - "dateModified": "2017-11-30T16:56:29.945720+02:00", - "id": "6aebbc98305a4847830bdc40863a4d6b" + "datePublished": "2018-05-28T19:03:07.723456+03:00", + "dateModified": "2018-05-28T19:03:07.723479+03:00", + "id": "45baf4951469459394de757f4c50b394" } } diff --git a/docs/source/tutorial/upload-finauction-notice.http b/docs/source/tutorial/upload-finauction-notice.http deleted file mode 100644 index 0d78aba..0000000 --- a/docs/source/tutorial/upload-finauction-notice.http +++ /dev/null @@ -1,37 +0,0 @@ -POST /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents?acc_token=6c03609dd6844e42bc1318fddf20c937 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 412 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "hash": "md5:00000000000000000000000000000000", - "description": "technical specification", - "title": "Notice.pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1b63ae48aa3e4caf99aac3455888c7d6?KeyID=c822be4a&Signature=QCihV3O02wIHwqfKrwHkYdZ4jtSlChjb8EKFrnRDwr6fv1qdAOmQ7Id6vM0vCWQaWvv4%2FPpEwTE4DYGWUECgAQ%3D%3D", - "format": "application/pdf", - "documentType": "technicalSpecifications" - } -} - - -201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/documents/74e4e4b7624d420b8448a6220e0a86cf - -{ - "data": { - "hash": "md5:00000000000000000000000000000000", - "description": "technical specification", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1b63ae48aa3e4caf99aac3455888c7d6?KeyID=c822be4a&Signature=Cqo%2Fl%2FHX9fy29aZ4TPnu9LB6ZtHdt6tquLKAJIGPLchoAf4OTMDnRAqLTeQK8rW9jgzFQ6I9HGfJtUP8i3gKDA%253D%253D", - "title": "Notice.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.108881+02:00", - "documentType": "technicalSpecifications", - "dateModified": "2017-11-30T16:56:24.108911+02:00", - "id": "74e4e4b7624d420b8448a6220e0a86cf" - } -} - diff --git a/docs/source/tutorial/upload-finbid-financial-license.http b/docs/source/tutorial/upload-finbid-financial-license.http deleted file mode 100644 index c432e51..0000000 --- a/docs/source/tutorial/upload-finbid-financial-license.http +++ /dev/null @@ -1,35 +0,0 @@ -POST /api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/c7a52fb296b143cc87728f74b2585fca/documents?acc_token=b6c5e3c4087848a08703ae24889033a7 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 381 -Content-Type: application/json -Host: api-sandbox.ea.openprocurement.org - -{ - "data": { - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/9d26f2842ae149228d379eb98961e054?KeyID=c822be4a&Signature=GihlzLpKCv%2Fv86BLw%2Fn8wAMDJhbuncQkvQpe68VIyD15Z0MfPipOfda9ENxJNDZ3ygf%2B%2F8%2Fv6AypQlORVmLoDw%3D%3D", - "title": "FinancialLicense.pdf", - "format": "application/pdf", - "hash": "md5:00000000000000000000000000000000", - "documentType": "financialLicense" - } -} - - -201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/c7a52fb296b143cc87728f74b2585fca/documents/523bf2858a644c37bb188b696ae1ee65 - -{ - "data": { - "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/73e1598288054eb98e8153ee9e69bb28/bids/c7a52fb296b143cc87728f74b2585fca/documents/523bf2858a644c37bb188b696ae1ee65?download=9d26f2842ae149228d379eb98961e054", - "title": "FinancialLicense.pdf", - "documentOf": "tender", - "datePublished": "2017-11-30T16:56:24.486255+02:00", - "documentType": "financialLicense", - "dateModified": "2017-11-30T16:56:24.486283+02:00", - "id": "523bf2858a644c37bb188b696ae1ee65" - } -} - diff --git a/docs/source/tutorial/upload-first-auction-illustration.http b/docs/source/tutorial/upload-first-auction-illustration.http index 8fe6cb5..a1814ff 100644 --- a/docs/source/tutorial/upload-first-auction-illustration.http +++ b/docs/source/tutorial/upload-first-auction-illustration.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 436 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 430 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -10,7 +10,7 @@ Host: api-sandbox.ea.openprocurement.org "hash": "md5:00000000000000000000000000000000", "description": "First illustration description", "title": "first_illustration.jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2840dd02387746c8882c2087e55b9f14?KeyID=8473a74a&Signature=A72CeRi4%2B8fC9UG9C%2FuvfJdkbzFP52dV0xg%2B7gXZoHp3EF4HjQAR1xdz0W%2F%2BcV902JTBXbJG9ebWHwZiyU2HCg%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1fcf682d16be4b55bab89065a0d9b5bb?KeyID=7149c8cc&Signature=9ipzic9%2BgVU8FnYxrVTTaTcdzScMCkZEMWbj99tIU5oLySOsESzLg6YmlvnAr4hCGL1eFoZpK9Ln%2B0hGhMIEBQ%3D%3D", "format": "image/jpeg", "documentType": "illustration" } @@ -18,8 +18,9 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/f143cdc5fef246f59d11cd3bc7c72d46 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/c6bd2aaef7cf42c5ba4f0dfad08285e2 +X-Content-Type-Options: nosniff { "data": { @@ -27,13 +28,13 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "hash": "md5:00000000000000000000000000000000", "description": "First illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2840dd02387746c8882c2087e55b9f14?KeyID=8473a74a&Signature=CTN%2FyvXW3%252Bz7lGcIGWXJGAYdUUudzcpWk1%2F9TldffuMmRChRSJJsi%2F%2FHBzjXb%252B0f4DuzUiUbq8bqD%2FP70jlFAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1fcf682d16be4b55bab89065a0d9b5bb?KeyID=7149c8cc&Signature=0sMj57ikTcJbcIDCbBhHxhs6N%2Fta3ixRc1IySJnogUHEOxcw6p5%2FUSy9BxMGdvNVfdiiG2Y1W5Fhdcja%252BrqOBg%253D%253D", "title": "first_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.293411+02:00", + "datePublished": "2018-05-28T19:03:04.990914+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.293438+02:00", - "id": "f143cdc5fef246f59d11cd3bc7c72d46" + "dateModified": "2018-05-28T19:03:04.990934+03:00", + "id": "c6bd2aaef7cf42c5ba4f0dfad08285e2" } } diff --git a/docs/source/tutorial/upload-second-auction-illustration.http b/docs/source/tutorial/upload-second-auction-illustration.http index 7e3ea11..412648e 100644 --- a/docs/source/tutorial/upload-second-auction-illustration.http +++ b/docs/source/tutorial/upload-second-auction-illustration.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 430 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 434 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -10,7 +10,7 @@ Host: api-sandbox.ea.openprocurement.org "hash": "md5:00000000000000000000000000000000", "description": "Second illustration description", "title": "second_illustration.jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/bfd750de3e7b49b5a991b6cdaf2c208e?KeyID=8473a74a&Signature=vmvWJOCo0jvQ1wr8Czb2%2BrC8ntp51VS0BYxtlXrCiPyKuKv7d7XJoVeAMmw8bH9RE28w1cW8BECbEgScz5ISBQ%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/59a4408f99224306b2582176ca2bda32?KeyID=7149c8cc&Signature=JhDc6%2BOC2Tbf15iDLCR7WV4VP6lxh1qswnBMqDtoBUom1ycV2R9ZjLtqXh3hiZ%2BByfhOmd%2FMM9cNv3k9fLdKAg%3D%3D", "format": "image/jpeg", "documentType": "illustration" } @@ -18,8 +18,9 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/eb64e2d0457e42c89aed5861301d3d06 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/db649c26ced64a8292a91f14c2bd4b59 +X-Content-Type-Options: nosniff { "data": { @@ -27,13 +28,13 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "hash": "md5:00000000000000000000000000000000", "description": "Second illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/bfd750de3e7b49b5a991b6cdaf2c208e?KeyID=8473a74a&Signature=nXLYMy2OkK2aIJDwV6kn7z3BkQD4wMe1ccc9%252BSvKDcUemJGUcmxtcGPn57JUQ6AJznS4IfCvaHVyDo5Aez7pDA%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/59a4408f99224306b2582176ca2bda32?KeyID=7149c8cc&Signature=VxN7Lt4LBsnxm4RQWy146688XcEKpVkJ1ofItTIRC55pCuA2oh%2FVxBZRVv%2F0lTC3LXKNmwF%2F78mt68XuuQl4AA%253D%253D", "title": "second_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.376954+02:00", + "datePublished": "2018-05-28T19:03:05.055484+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.376981+02:00", - "id": "eb64e2d0457e42c89aed5861301d3d06" + "dateModified": "2018-05-28T19:03:05.055508+03:00", + "id": "db649c26ced64a8292a91f14c2bd4b59" } } diff --git a/docs/source/tutorial/upload-third-auction-illustration.http b/docs/source/tutorial/upload-third-auction-illustration.http index 91b0304..b4d0914 100644 --- a/docs/source/tutorial/upload-third-auction-illustration.http +++ b/docs/source/tutorial/upload-third-auction-illustration.http @@ -1,7 +1,7 @@ -POST /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 432 -Content-Type: application/json +POST /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 432 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -10,7 +10,7 @@ Host: api-sandbox.ea.openprocurement.org "hash": "md5:00000000000000000000000000000000", "description": "Third illustration description", "title": "third_illustration.jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2d40e8da608c4f10b9432671cf47c9aa?KeyID=8473a74a&Signature=BgTF%2BhgcDdTXB%2BMmv4Xfyl0PHorwUgDAKN7GVtlMm%2FoufbQVpM3pO11DN98KuWxwva2DIy73KKNE1hiIa53WBw%3D%3D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/73e7a9a343f84bd9941b2900ae031137?KeyID=7149c8cc&Signature=%2FjDRSZj2J2t%2FvYi7QAi4iJceqEGLXhciu%2FoxMvqzWkSmalU0nYctOeBPRZ9vmADuj2fmC7Pq3S7y7DwE7s0nDg%3D%3D", "format": "image/jpeg", "documentType": "illustration" } @@ -18,8 +18,9 @@ Host: api-sandbox.ea.openprocurement.org 201 Created -Content-Type: application/json; charset=UTF-8 -Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/documents/fdafece528e54fe5a7b38f025be993c3 +Content-Type: application/json +Location: http://api-sandbox.ea.openprocurement.org/api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/documents/2c5c4017cc7d4001864e173fc897ffd1 +X-Content-Type-Options: nosniff { "data": { @@ -27,13 +28,13 @@ Location: http://api-sandbox.ea.openprocurement.org/api/2.3/auctions/301d66e275c "hash": "md5:00000000000000000000000000000000", "description": "Third illustration description", "format": "image/jpeg", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/2d40e8da608c4f10b9432671cf47c9aa?KeyID=8473a74a&Signature=AGnUbHWEz4OOa7kxT1%2Fj4Ml7cNOw%252BcsUiDVX9HQhwqAdi4UGtaxWqeAZ2YhsI20lzMp67Fq%252BUo6jPmWdLdWuAQ%253D%253D", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/73e7a9a343f84bd9941b2900ae031137?KeyID=7149c8cc&Signature=08nEK8j1PputzfNx7Db6qC%252BheWVbyrDCG8bFpl25q0ad%252BJD7Woa48SmacTzEhvPel5L3t5%2FCHEgq7jy82bRKCQ%253D%253D", "title": "third_illustration.jpeg", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:26.434267+02:00", + "datePublished": "2018-05-28T19:03:05.101025+03:00", "documentType": "illustration", - "dateModified": "2017-11-30T16:56:26.434293+02:00", - "id": "fdafece528e54fe5a7b38f025be993c3" + "dateModified": "2018-05-28T19:03:05.101047+03:00", + "id": "2c5c4017cc7d4001864e173fc897ffd1" } } diff --git a/docs/source/tutorial/verify-protocol.http b/docs/source/tutorial/verify-protocol.http index 6eaf33e..56209c2 100644 --- a/docs/source/tutorial/verify-protocol.http +++ b/docs/source/tutorial/verify-protocol.http @@ -1,7 +1,7 @@ -PATCH /api/2.3/auctions/301d66e275cb4861ba502c1eaafa88ae/awards/add0cbb7aa114e7cb6f5e127071f8b53?acc_token=ccf4d45ff9524ec9ae87f38c43d7b0a3 HTTP/1.0 -Authorization: Basic YnJva2VyOg== -Content-Length: 39 -Content-Type: application/json +PATCH /api/2.4/auctions/246d20f56b0a4601bd4b5ddd3ac636e9/awards/708d3fdf13ac4868b0df09cf479ceb06?acc_token=06bf67377235444180324a6ec7a7b41d HTTP/1.0 +Authorization: Basic YnJva2VyOg== +Content-Length: 39 +Content-Type: application/json Host: api-sandbox.ea.openprocurement.org { @@ -12,47 +12,48 @@ Host: api-sandbox.ea.openprocurement.org 200 OK -Content-Type: application/json; charset=UTF-8 +Content-Type: application/json +X-Content-Type-Options: nosniff { "data": { "status": "pending.payment", "paymentPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T17:16:29.509749+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-06-26T18:00:00+03:00" }, "documents": [ { - "dateModified": "2017-11-30T16:56:28.083997+02:00", "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/326d29c8df4744149f6082d061e6492e?KeyID=8473a74a&Signature=W07o9qqLEOV3dvjZZVzBFeolqx4QEUoFCZPnHeu4xyBsP7NJma%252BZINjCbfVSmXeRHYiAnDikplownjV%2FJE%252B6BQ%253D%253D", "author": "bid_owner", + "title": "SignedAuctionProtocol.pdf", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/f4402467721a4eee9ef72e70a4ff04f1?KeyID=7149c8cc&Signature=FWQKkrdr%2Fo95YrYaNn881fhFABAvU2yXd77Dz0R8h01tiB4%2FFX4efEmV4eK9jcB2Kmps5x0jStFNTA7Kxl4YBA%253D%253D", + "format": "application/pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.083969+02:00", + "datePublished": "2018-05-28T19:03:06.372223+03:00", "documentType": "auctionProtocol", - "title": "SignedAuctionProtocol.pdf", - "id": "de5b4f4f5aa04ef6a16606d1152b061a" + "dateModified": "2018-05-28T19:03:06.372249+03:00", + "id": "627c441c40dd4635ac691c549cacba8c" }, { - "dateModified": "2017-11-30T16:56:28.217417+02:00", "hash": "md5:00000000000000000000000000000000", - "format": "application/pdf", - "url": "http://public.docs-sandbox.ea.openprocurement.org/get/79f7d75e9ff34c1d94289241ebd04a46?KeyID=8473a74a&Signature=ZZf5dIDTAFetGGoNyGHK0TaTX%2FMo%2FTcKq%2FTatSSpuIZleTjJFvbciSiMq9MNq3mZGWRdK%2FYKfT0lkoOKYooXDA%253D%253D", "author": "auction_owner", + "title": "SignedAuctionProtocol.pdf", + "url": "http://public.docs-sandbox.ea.openprocurement.org/get/1ba9a8b51cd14c05aa42fef2bb3965db?KeyID=7149c8cc&Signature=z%2Ftx0X6an%252B1mIrbwMmuknuPp%252BFVzm3Ps4I%2FXguLCJe5mLZLoqJHlVkZq%252B93cTVvvsRiGx2ASxd%2FtV762p80VBw%253D%253D", + "format": "application/pdf", "documentOf": "tender", - "datePublished": "2017-11-30T16:56:28.217384+02:00", + "datePublished": "2018-05-28T19:03:06.459190+03:00", "documentType": "auctionProtocol", - "title": "SignedAuctionProtocol.pdf", - "id": "edc7c486de494ac3bdcc0b456d006e4a" + "dateModified": "2018-05-28T19:03:06.459214+03:00", + "id": "77e9d9a7876740f1a64931dd4f96989c" } ], "verificationPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T16:56:28.375177+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-05-28T19:03:06.589568+03:00" }, "complaintPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00" }, "suppliers": [ { @@ -77,17 +78,17 @@ Content-Type: application/json; charset=UTF-8 } ], "signingPeriod": { - "startDate": "2017-11-30T16:56:27.695166+02:00", - "endDate": "2017-11-30T17:16:29.509749+02:00" + "startDate": "2018-05-28T19:03:06.074292+03:00", + "endDate": "2018-06-26T18:00:00+03:00" }, - "bid_id": "0d76a3f619044106b9bcdc0e57e93dad", + "bid_id": "3ce3413a56584eb1a7a870e01121effb", "value": { "currency": "UAH", "amount": 501.0, "valueAddedTaxIncluded": true }, - "date": "2017-11-30T16:56:28.382166+02:00", - "id": "add0cbb7aa114e7cb6f5e127071f8b53" + "date": "2018-05-28T19:03:06.594311+03:00", + "id": "708d3fdf13ac4868b0df09cf479ceb06" } }