Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Е-Контракт #41

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
43965a1
Added document types.
Mar 27, 2020
a999c44
remove redundant.
May 13, 2020
8f26bf6
Added documentOf field.
Mar 27, 2020
52c9b20
Added document of document validations.
May 11, 2020
ed21fcc
Update .gitignore
VDigitall May 13, 2020
ddbd84a
Add templateId field to Document model for tenders
VDigitall May 14, 2020
dd657b5
Add validation for documents on Tender model
VDigitall May 15, 2020
3394c51
Update tests for tender documents
VDigitall May 15, 2020
24185ad
Allow update documents contractProforma by rBot
VDigitall May 18, 2020
631e57d
Update tender.documents validator
VDigitall May 18, 2020
78b0327
Add tests for e-contracting flow with tender documents
VDigitall May 18, 2020
e822024
Add tests for contractData bid documents
VDigitall May 19, 2020
c550ea5
Remove trailing whitespaces
VDigitall May 19, 2020
c11fed8
Add `upload_contract_documents` permission for renderer_bots group
VDigitall May 19, 2020
9556dd6
Extend documentType choices by `contract`
VDigitall May 19, 2020
d68f6c1
Update validation for contract documents uploading
VDigitall May 19, 2020
6fb6dc2
Add tests for e-contracting flow with contract documents
VDigitall May 19, 2020
ea19c98
Add tests for contractData award documents
VDigitall May 19, 2020
d571a87
Improve tender document validations
VDigitall May 21, 2020
17c856b
Disable fix_url if url missing and documentType contractProforma
VDigitall May 25, 2020
2071c1e
Update award documents tests
VDigitall Jun 23, 2020
fd19a58
Updated tutorial.
May 27, 2020
7763873
Added tutorial.rst file.
May 27, 2020
5bc7cf7
Improve e-contracting flow tests
VDigitall Jul 29, 2020
4e99f3e
Apply e-contracting feature to pricequotation
VDigitall Jul 29, 2020
e789240
Allow upload e-contract related docs to contract by owner
VDigitall Jul 30, 2020
4bfbcaf
Deny linking documents with the same documentType
VDigitall Aug 4, 2020
5d82724
Extend choices for documentOf in contract.documents
VDigitall Aug 17, 2020
28ab69f
Change relatedItem for contractData in contract object
VDigitall Aug 17, 2020
f27aca3
Update tutorial with uploading e-contract related documents
hexponent Jul 2, 2020
ea91c51
Add missed step
VDigitall Jul 15, 2020
f3ef9ec
Add E-Contract Flow to tutorial.rst
VDigitall Jul 15, 2020
548773c
Fix typo in tests and add new request for e-contracting
VDigitall Jul 31, 2020
25c23f8
Move uploading fixed contractData from award.documents to contract.do…
VDigitall Oct 6, 2020
0148ad5
Update e-Contracting documentation
OHelesh Oct 9, 2020
07442a4
Show contract structure after upload generated docs by rBot
VDigitall Oct 9, 2020
af5fa22
Update tutorial with translations
OHelesh Oct 12, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ lib64/
parts/
sdist/
var/
.venv/
*.egg-info/
.installed.cfg
*.egg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: openprocurement.api 2.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-10-05 15:44+0300\n"
"POT-Creation-Date: 2020-10-07 17:55+0300\n"
"PO-Revision-Date: 2020-09-14 17:38+0200\n"
"Last-Translator: Oleh Helesh <[email protected]>\n"
"Language-Team: English <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
"Generated-By: Babel 2.8.0\n"

msgid "Tutorial"
msgstr "Туторіал"
Expand Down
499 changes: 428 additions & 71 deletions docs/source/locale/uk/LC_MESSAGES/tendering/tutorial.po

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions docs/source/tendering/http/tutorial/active-cancellation.http
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@ Content-Type: application/json; charset=UTF-8
{
"hash": "md5:00000000000000000000000000000000",
"description": "Changed description",
"title": "Notice.pdf",
"url": "http://public-docs-sandbox.prozorro.gov.ua/get/888a378eb7764d1693a1fec763cb806f?KeyID=a8968c46&Signature=66iYlHWRzl%252BEJRqmPqx781kVoy2WJlTVVKmZsNxrbNcxI0ib35aJ507wHARZ0lNebq9cfxuwi161lXFPn2NEAw%253D%253D",
"format": "application/pdf",
"url": "http://public-docs-sandbox.prozorro.gov.ua/get/888a378eb7764d1693a1fec763cb806f?KeyID=a8968c46&Signature=66iYlHWRzl%252BEJRqmPqx781kVoy2WJlTVVKmZsNxrbNcxI0ib35aJ507wHARZ0lNebq9cfxuwi161lXFPn2NEAw%253D%253D",
"title": "Notice.pdf",
"documentOf": "tender",
"datePublished": "2020-05-15T01:00:03+03:00",
"id": "ada2083ffec749c5ae3c8fc110e1fb3b",
"dateModified": "2020-05-15T01:00:03+03:00"
"dateModified": "2020-05-15T01:00:03+03:00",
"id": "ada2083ffec749c5ae3c8fc110e1fb3b"
},
{
"hash": "md5:00000000000000000000000000000000",
"description": "Changed description",
"title": "Notice-2.pdf",
"url": "http://public-docs-sandbox.prozorro.gov.ua/get/c9f250e2f74e4e8e95a882add5b4401a?KeyID=a8968c46&Signature=zr1a4Vd8WIGqoGAskp1DDf5%252BQzA6WJ5nV1uzXJIgIc3nK%2FJFCw%252BGK4aIT7vCv8qv8WTHWJ4%252BN%2Fb5gGIWIzYKAQ%253D%253D",
"format": "application/pdf",
"url": "http://public-docs-sandbox.prozorro.gov.ua/get/c9f250e2f74e4e8e95a882add5b4401a?KeyID=a8968c46&Signature=zr1a4Vd8WIGqoGAskp1DDf5%252BQzA6WJ5nV1uzXJIgIc3nK%2FJFCw%252BGK4aIT7vCv8qv8WTHWJ4%252BN%2Fb5gGIWIzYKAQ%253D%253D",
"title": "Notice-2.pdf",
"documentOf": "tender",
"datePublished": "2020-05-15T01:00:03+03:00",
"id": "ada2083ffec749c5ae3c8fc110e1fb3b",
"dateModified": "2020-05-15T01:00:03+03:00"
"dateModified": "2020-05-15T01:00:03+03:00",
"id": "ada2083ffec749c5ae3c8fc110e1fb3b"
}
],
"reason": "cancellation reason",
Expand Down
88 changes: 82 additions & 6 deletions docs/source/tendering/http/tutorial/auction-url.http
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,28 @@ Content-Type: application/json; charset=UTF-8
"amount": 8.0
},
"documents": [
{
"title": "contractProforma",
"url": null,
"author": "tender_owner",
"documentOf": "tender",
"datePublished": "2020-05-15T01:00:00+03:00",
"documentType": "contractProforma",
"dateModified": "2020-05-15T01:00:00+03:00",
"id": "f77c2444fc6f47e1bb441a284cd344e6",
"templateId": "paper0000001"
},
{
"hash": "md5:00000000000000000000000000000000",
"description": "document description modified",
"title": "Notice.pdf",
"author": "tender_owner",
"url": "http://public-docs-sandbox.prozorro.gov.ua/get/4d52879c11df4aa7ae80d3b6c4a274ce?KeyID=a8968c46&Signature=BiR23Y26fUFdAaBBqxSqN2Lv29UkW8VjpoZA0NLoVj2cgKeSq3J%2FiuGzva%252Bl0R6wpgLbA2zfat9mNkErf3HjAg%253D%253D",
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2020-05-15T01:00:01+03:00",
"author": "tender_owner",
"documentType": "technicalSpecifications",
"id": "8924acf921d645b7bce35748c4f9e237",
"title": "Notice.pdf",
"dateModified": "2020-05-15T01:00:01+03:00"
},
{
Expand All @@ -99,8 +110,8 @@ Content-Type: application/json; charset=UTF-8
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2020-05-15T01:00:01+03:00",
"id": "f05f28fd104147beb09d8b4f7bbcbd2b",
"dateModified": "2020-05-15T01:00:01+03:00"
"dateModified": "2020-05-15T01:00:01+03:00",
"id": "f05f28fd104147beb09d8b4f7bbcbd2b"
},
{
"hash": "md5:00000000000000000000000000000000",
Expand All @@ -110,8 +121,73 @@ Content-Type: application/json; charset=UTF-8
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2020-05-15T01:00:01+03:00",
"id": "f05f28fd104147beb09d8b4f7bbcbd2b",
"dateModified": "2020-05-15T01:00:01+03:00"
"dateModified": "2020-05-15T01:00:01+03:00",
"id": "f05f28fd104147beb09d8b4f7bbcbd2b"
},
{
"dateModified": "2020-05-15T01:00:01+03:00",
"hash": "md5:00000000000000000000000000000000",
"format": "application/json",
"url": "http://public-docs-sandbox.prozorro.gov.ua/get/4f1b9f5a45364f0cbb725e846b662238?KeyID=a8968c46&Signature=CVe5P9Wl2XZzgeb%2F2VXizVGxoyZ5PZmcSZPdZzb58LZXQ48PfznXpmJcGAzC65u3BgNoBfLxlwaAsU5oNDG%252BBg%253D%253D",
"author": "template_registry_bots",
"documentOf": "document",
"datePublished": "2020-05-15T01:00:01+03:00",
"documentType": "contractForm",
"title": "paper0000001-form.json",
"relatedItem": "f77c2444fc6f47e1bb441a284cd344e6",
"id": "e1d5e08ba83b4566bcea7e5cb75eae49"
},
{
"dateModified": "2020-05-15T01:00:01+03:00",
"hash": "md5:00000000000000000000000000000000",
"format": "application/json",
"url": "http://public-docs-sandbox.prozorro.gov.ua/get/13a0c52811684b1c90e594fb5fb765b4?KeyID=a8968c46&Signature=H1uYxm2tSuPt1Sb%252BZn%2Ffzuu0rGGiNPPRYpE1PIpYlAnObArIskamOTmUyerpQZZm0PXZvOHjmCbkreYkWN4GAA%253D%253D",
"author": "template_registry_bots",
"documentOf": "document",
"datePublished": "2020-05-15T01:00:01+03:00",
"documentType": "contractSchema",
"title": "paper0000001-schema.json",
"relatedItem": "f77c2444fc6f47e1bb441a284cd344e6",
"id": "4def4093a1af4480859c5785d8675c1b"
},
{
"dateModified": "2020-05-15T01:00:01+03:00",
"hash": "md5:00000000000000000000000000000000",
"format": "application/msword",
"url": "http://public-docs-sandbox.prozorro.gov.ua/get/30738d06643940d784e148efc196ddbd?KeyID=a8968c46&Signature=WR5EaLBJS1niKVihmLH2zMHNwq%252B5q3fQLDD%252BKDDUZzG5hUZVaCcjxx8RCbSlxzCjB1I9%2F4kIKll%252BUQ%252B80qzQDg%253D%253D",
"author": "template_registry_bots",
"documentOf": "document",
"datePublished": "2020-05-15T01:00:01+03:00",
"documentType": "contractTemplate",
"title": "paper0000001.docx",
"relatedItem": "f77c2444fc6f47e1bb441a284cd344e6",
"id": "2f9c9e234bfc48d98a61dd50fcd2f5d8"
},
{
"dateModified": "2020-05-15T01:00:01+03:00",
"hash": "md5:00000000000000000000000000000000",
"format": "application/json",
"url": "http://public-docs-sandbox.prozorro.gov.ua/get/95a5ac5af56648dea6e6a944b29a05de?KeyID=a8968c46&Signature=NI2C%252BycIDWp7qpDUP3C1lKe05wyd1Y%2FSc3vVk2NDQPwzUlzmdbkvoEXAzxNx00S%252Bw%252BHPMLNCbSlWdY1oPSkxAg%253D%253D",
"author": "tender_owner",
"documentOf": "document",
"datePublished": "2020-05-15T01:00:01+03:00",
"documentType": "contractData",
"title": "ownerContractData.json",
"relatedItem": "f77c2444fc6f47e1bb441a284cd344e6",
"id": "e6282176a09042e98da8914ea70c5880"
},
{
"dateModified": "2020-05-15T01:00:01+03:00",
"hash": "md5:00000000000000000000000000000000",
"format": "application/pdf",
"url": "http://public-docs-sandbox.prozorro.gov.ua/get/3f003255450240f1b322c644a1d57a67?KeyID=a8968c46&Signature=1oskI3DnUz5JDXg9rrJGpqFU806VMd6KGjV0OHDecyw2ahKkac3M3O4OhVkzceIlW3qFqm%252BK4g5EJMeEm2FkAA%253D%253D",
"author": "tender_owner",
"documentOf": "tender",
"datePublished": "2020-05-15T01:00:00+03:00",
"documentType": "contractProforma",
"title": "contractProforma.pdf",
"id": "f77c2444fc6f47e1bb441a284cd344e6",
"templateId": "paper0000001"
}
],
"title": "футляри до державних нагород",
Expand Down
4 changes: 2 additions & 2 deletions docs/source/tendering/http/tutorial/bidder-documents.http
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Content-Type: application/json; charset=UTF-8
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2020-05-15T01:00:01+03:00",
"id": "a37bf33d76374160ba0da18168a744ca",
"dateModified": "2020-05-15T01:00:01+03:00"
"dateModified": "2020-05-15T01:00:01+03:00",
"id": "a37bf33d76374160ba0da18168a744ca"
}
]
}
Expand Down
16 changes: 14 additions & 2 deletions docs/source/tendering/http/tutorial/bidder-participation-url.http
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,20 @@ Content-Type: application/json; charset=UTF-8
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2020-05-15T01:00:01+03:00",
"id": "a37bf33d76374160ba0da18168a744ca",
"dateModified": "2020-05-15T01:00:01+03:00"
"dateModified": "2020-05-15T01:00:01+03:00",
"id": "a37bf33d76374160ba0da18168a744ca"
},
{
"hash": "md5:00000000000000000000000000000000",
"format": "application/json",
"url": "http://lb-api-sandbox.prozorro.gov.ua/api/2.5/tenders/bc3a9016b29d4fed894cc62d3ff59680/bids/74c272933f3046b0a4cdcc7036b67323/documents/5a44b2133c51497e81a71d6d58dbbc67?download=d313b550714947df99d96f17e0a9bad0",
"title": "bidderContractData.json",
"documentOf": "document",
"datePublished": "2020-05-15T01:00:01+03:00",
"documentType": "contractData",
"dateModified": "2020-05-15T01:00:01+03:00",
"relatedItem": "f77c2444fc6f47e1bb441a284cd344e6",
"id": "5a44b2133c51497e81a71d6d58dbbc67"
}
],
"value": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Content-Type: application/json; charset=UTF-8
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2020-05-15T01:00:01+03:00",
"id": "22691d63a4694ac18fa7317ebd185da1",
"dateModified": "2020-05-15T01:00:01+03:00"
"dateModified": "2020-05-15T01:00:01+03:00",
"id": "22691d63a4694ac18fa7317ebd185da1"
},
{
"hash": "md5:00000000000000000000000000000000",
Expand All @@ -25,8 +25,8 @@ Content-Type: application/json; charset=UTF-8
"format": "application/pdf",
"documentOf": "tender",
"datePublished": "2020-05-15T01:00:01+03:00",
"id": "7c11a21581814a23ae4a7e83dd30ae10",
"dateModified": "2020-05-15T01:00:01+03:00"
"dateModified": "2020-05-15T01:00:01+03:00",
"id": "7c11a21581814a23ae4a7e83dd30ae10"
}
],
"value": {
Expand Down
59 changes: 36 additions & 23 deletions docs/source/tendering/http/tutorial/blank-tender-view.http
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,17 @@ Content-Type: application/json; charset=UTF-8
"data": {
"procurementMethod": "open",
"status": "active.enquiries",
"milestones": [
{
"code": "prepayment",
"sequenceNumber": 0,
"title": "signingTheContract",
"duration": {
"type": "banking",
"days": 2
},
"percentage": 45.55,
"type": "financing",
"id": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
},
"documents": [
{
"code": "postpayment",
"sequenceNumber": 0,
"title": "deliveryOfGoods",
"duration": {
"type": "calendar",
"days": 900
},
"percentage": 54.45,
"type": "financing",
"id": "af069a25c8f94e74a8b2428b51bcd1a7"
"title": "contractProforma",
"url": null,
"author": "tender_owner",
"documentOf": "tender",
"datePublished": "2020-05-15T01:00:00+03:00",
"documentType": "contractProforma",
"dateModified": "2020-05-15T01:00:00+03:00",
"id": "f77c2444fc6f47e1bb441a284cd344e6",
"templateId": "paper0000001"
}
],
"mainProcurementCategory": "goods",
Expand Down Expand Up @@ -87,6 +74,32 @@ Content-Type: application/json; charset=UTF-8
},
"submissionMethod": "electronicAuction",
"date": "2020-05-15T01:00:00+03:00",
"milestones": [
{
"code": "prepayment",
"sequenceNumber": 0,
"title": "signingTheContract",
"duration": {
"type": "banking",
"days": 2
},
"percentage": 45.55,
"type": "financing",
"id": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
},
{
"code": "postpayment",
"sequenceNumber": 0,
"title": "deliveryOfGoods",
"duration": {
"type": "calendar",
"days": 900
},
"percentage": 54.45,
"type": "financing",
"id": "af069a25c8f94e74a8b2428b51bcd1a7"
}
],
"next_check": "2020-05-22T01:00:00+03:00",
"procuringEntity": {
"contactPoint": {
Expand Down
Loading