Commit 8f209521b753cfed3900e7f2b862fba9fd43a1f2
1 parent
24f2d0cf
chahge return of cancel tender/lot keywords, make cancellation unsucessfull keyword
Showing
1 changed file
with
26 additions
and
4 deletions
... | ... | @@ -771,9 +771,10 @@ Library openprocurement_client.utils |
771 | 771 | ${cancellation_id}= Set variable ${cancel_reply.data.id} |
772 | 772 | ${document_id}= openprocurement_client.Завантажити документацію до запиту на скасування ${username} ${tender_uaid} ${cancellation_id} ${document} |
773 | 773 | openprocurement_client.Змінити опис документа в скасуванні ${username} ${tender_uaid} ${cancellation_id} ${document_id} ${new_description} |
774 | - run keyword if '${procurementMethodType}' in ['belowThreshold', 'reporting', 'closeFrameworkAgreementUA'] | |
774 | + ${cancellation}= run keyword if '${procurementMethodType}' in ['belowThreshold', 'reporting', 'closeFrameworkAgreementUA'] | |
775 | 775 | ... openprocurement_client.Підтвердити скасування закупівлі ${username} ${tender_uaid} ${cancellation_id} |
776 | 776 | ... ELSE openprocurement_client.Перевести скасування закупівлі в період очікування ${username} ${tender_uaid} ${cancellation_id} |
777 | + Set To Dictionary ${USERS.users['${tender_owner}']} cancellation_data=${cancellation} | |
777 | 778 | |
778 | 779 | |
779 | 780 | Отримати інформацію з документа до лоту |
... | ... | @@ -1541,9 +1542,9 @@ Library openprocurement_client.utils |
1541 | 1542 | |
1542 | 1543 | |
1543 | 1544 | Отримати інформацію із скарги |
1544 | - [Arguments] ${username} ${tender_uaid} ${complaintID} ${field_name} ${award_index}=${None} | |
1545 | + [Arguments] ${username} ${tender_uaid} ${complaintID} ${field_name} ${object_index} ${object} | |
1545 | 1546 | openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} |
1546 | - ${complaints}= Get Variable Value ${USERS.users['${username}'].tender_data.data.awards[${award_index}].complaints} ${USERS.users['${username}'].tender_data.data.complaints} | |
1547 | + ${complaints}= Get Variable Value ${USERS.users['${username}'].tender_data.data.${object}[${object_index}].complaints} ${USERS.users['${username}'].tender_data.data.complaints} | |
1547 | 1548 | ${complaint_index}= get_complaint_index_by_complaintID ${complaints} ${complaintID} |
1548 | 1549 | ${field_value}= Get Variable Value ${complaints[${complaint_index}]['${field_name}']} |
1549 | 1550 | [Return] ${field_value} |
... | ... | @@ -1918,9 +1919,28 @@ Library openprocurement_client.utils |
1918 | 1919 | ... ${cancellation_id} |
1919 | 1920 | ... ${document_id} |
1920 | 1921 | ... ${new_description} |
1921 | - run keyword if '${procurementMethodType}' in ['belowThreshold', 'reporting', 'closeFrameworkAgreementUA'] | |
1922 | + ${cancellation}= run keyword if '${procurementMethodType}' in ['belowThreshold', 'reporting', 'closeFrameworkAgreementUA'] | |
1922 | 1923 | ... openprocurement_client.Підтвердити скасування закупівлі ${username} ${tender_uaid} ${cancellation_id} |
1923 | 1924 | ... ELSE openprocurement_client.Перевести скасування закупівлі в період очікування ${username} ${tender_uaid} ${cancellation_id} |
1925 | + Set To Dictionary ${USERS.users['${tender_owner}']} cancellation_data=${cancellation} | |
1926 | + | |
1927 | + | |
1928 | +Скасувати cancellation | |
1929 | + [Documentation] | |
1930 | + ... [Arguments] Username, tender uaid and cancellation number | |
1931 | + ... [Description] Find tender using uaid, create data dict with unsuccessful status and call patch_cancellation | |
1932 | + ... [Return] Reply of API | |
1933 | + [Arguments] ${username} ${tender_uaid} ${cancellations_index} | |
1934 | + ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} | |
1935 | + ${data}= create_data_dict data.status unsuccessful | |
1936 | + Log ${tender.data.cancellations[${cancellations_index}].id} | |
1937 | + ${cancellation_id}= set variable ${tender.data.cancellations[${cancellations_index}].id} | |
1938 | + ${reply}= Call Method ${USERS.users['${username}'].client} patch_cancellation | |
1939 | + ... ${tender.data.id} | |
1940 | + ... ${data} | |
1941 | + ... ${cancellation_id} | |
1942 | + ... access_token=${tender.access.token} | |
1943 | + Log ${reply} | |
1924 | 1944 | |
1925 | 1945 | |
1926 | 1946 | Завантажити документацію до запиту на скасування |
... | ... | @@ -1974,6 +1994,7 @@ Library openprocurement_client.utils |
1974 | 1994 | ... ${data.data.id} |
1975 | 1995 | ... access_token=${tender.access.token} |
1976 | 1996 | Log ${reply} |
1997 | + [Return] ${reply} | |
1977 | 1998 | |
1978 | 1999 | |
1979 | 2000 | Перевести скасування закупівлі в період очікування |
... | ... | @@ -1991,6 +2012,7 @@ Library openprocurement_client.utils |
1991 | 2012 | ... ${data.data.id} |
1992 | 2013 | ... access_token=${tender.access.token} |
1993 | 2014 | Log ${reply} |
2015 | + [Return] ${reply} | |
1994 | 2016 | |
1995 | 2017 | |
1996 | 2018 | Отримати інформацію із документа до скасування | ... | ... |
Please
register
or
login
to post a comment