Commit a3e52ebbb95d81796ccd1c2ae8bd34565557273d

Authored by Playtenders
1 parent 2bc81317

active agreement contract

... ... @@ -1034,6 +1034,8 @@ Resource playtender_contr
1034 1034 [Documentation] Зареєструвати угоду для користувача username для тендера tender_uaid,
1035 1035 ... для поля Дата початку дії угоди задати значення startDate, для дати завершення - endDate.
1036 1036
  1037 + open tender page by uaid ${tender_uaid}
  1038 + active agreement contract ${startDate} ${endDate}
1037 1039
1038 1040 ########################################################################################################################
1039 1041 ################################################### END CONTRACTS KEYWORDS ####################################
... ...
... ... @@ -64,34 +64,37 @@ edit unitprices
64 64 [Documentation] Встановити ціну за одиницю для контракту для користувача username для тендера ${tender_uaid},
65 65 ... використовуючи значення з ${contract_data}.
66 66
67   - Run Keyword If '${TEST_NAME}' == 'Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону' and '${mode}' not in 'open_esco' Fail Amount should be less or equal to awarded amount
68   - Run Keyword If '${TEST_NAME}' == 'Неможливість вказати ціну договору з ПДВ більше ніж результат проведення аукціону' and '${mode}' in 'open_esco' Fail Can't update amount for contract value
69   - Run Keyword If '${TEST_NAME}' == 'Неможливість зменшити ціну договору без ПДВ на суму більшу за 20% від ціни договору з ПДВ (закупівля з ПДВ)' Fail Amount should be greater than amountNet and differ by no more than 20.0%
70   - click visible element ${contract_form_0_open_btn_locator}
71   - Run Keyword And Ignore Error Wait Until Page Contains ${contract_contractform_contract_number_input_locator} 10
72   - run keyword and ignore error wait until element is visible ${tender_status_active_qualification_value_locator} 5
73   - wait until element is visible ${contract_contractform_contract_number_input_locator} 10
  67 +# Run Keyword If '${TEST_NAME}' == 'Можливість встановити ціну за одиницю для першого контракту' open popup by btn locator ${contract_active_form_agreement_open_btn_locator}
  68 + Run Keyword If '${TEST_NAME}' == 'Можливість встановити ціну за одиницю для другого контракту' click visible element ${contract_next_form_agreement_open_btn_locator}
  69 +# Run Keyword If '${TEST_NAME}' == 'Можливість встановити ціну за одиницю для другого контракту' open popup by btn locator ${contract_active_form_agreement_open_btn_locator}
  70 + Run Keyword If '${TEST_NAME}' == 'Можливість встановити ціну за одиницю для третього контракту' click visible element ${contract_next_form_agreement_open_btn_locator}
  71 + open popup by btn locator ${contract_active_form_agreement_open_btn_locator}
  72 + input number to exist visible input ${contract_agreement_unit_prices_input_locator} ${contract_data.data.unitPrices.value.amount}
  73 +
  74 + submit form and check result ${contract_contractform_submit_btn_locator} ${contract_agreement_active_submit_success_msg}
  75 + capture page screenshot
  76 +
  77 +active agreement contract
  78 + [Arguments] ${startDate} ${endDate}
  79 + [Documentation] Зареєструвати угоду для користувача username для тендера tender_uaid,
  80 + ... для поля Початок строку, на який укладається угода задати значення startDate, для Кінець строку, на який укладається угода - endDate.
  81 +
  82 + open popup by btn locator ${contract_active_agreement_form_open_btn_locator}
74 83 capture page screenshot
75 84 ${file_path} ${file_name} ${file_content} = create_fake_doc
76   - ${value_added_tax_included} = Run Keyword If '${mode}' == 'negotiation' run keyword and return status Checkbox Should Not Be Selected ${contract_contractform_value_added_tax_included_locator}
77   - run keyword if '${mode}' == 'negotiation' and ${value_added_tax_included} click visible element ${contract_contractform_value_added_tax_included_locator}
78   - ${contract_number} = get value by locator on opened page ${contract_contractform_contract_number_input_locator}
79   - Run Keyword If '${contract_number}' == '' input text to exist visible input ${contract_contractform_contract_number_input_locator} 1234567890
  85 + ${contract_number} = get value by locator on opened page ${contract_agreement_agreement_number_input_locator}
  86 + Run Keyword If '${contract_number}' == '' input text to exist visible input ${contract_agreement_agreement_number_input_locator} 1234567890
80 87 capture page screenshot
81 88 ${date_signed} = Get Current Date result_format=%d.%m.%Y %H:%M
82   - ${contract_date_signed} = get value by locator on opened page ${contract_contractform_date_signed_input_locator}
83   - Run Keyword If '${contract_date_signed}' == '' input text to exist visible input ${contract_contractform_date_signed_input_locator} ${date_signed}
  89 + ${contract_date_signed} = get value by locator on opened page ${contract_agreement_date_signed_input_locator}
  90 + Run Keyword If '${contract_date_signed}' == '' input text to exist visible input ${contract_agreement_date_signed_input_locator} ${date_signed}
84 91 ${date_start} = Get Current Date increment=02:00:00 result_format=%d.%m.%Y %H:%M
85   - ${contract_date_start} = get value by locator on opened page ${contract_contractform_date_start_input_locator}
86   - Run Keyword If '${contract_date_start}' == '' input text to exist visible input ${contract_contractform_date_start_input_locator} ${date_start}
  92 + ${contract_date_start} = get value by locator on opened page ${contract_agreement_date_start_input_locator}
  93 + Run Keyword If '${contract_date_start}' == '' input text to exist visible input ${contract_agreement_date_start_input_locator} ${date_start}
87 94 ${date_end} = Get Current Date increment=04:00:00 result_format=%d.%m.%Y %H:%M
88   - ${contract_date_end} = get value by locator on opened page ${contract_contractform_date_end_input_locator}
89   - Run Keyword If '${contract_date_end}' == '' input text to exist visible input ${contract_contractform_date_end_input_locator} ${date_end}
  95 + ${contract_date_end} = get value by locator on opened page ${contract_agreement_date_end_input_locator}
  96 + Run Keyword If '${contract_date_end}' == '' input text to exist visible input ${contract_agreement_date_end_input_locator} ${date_end}
90 97
91   - Run Keyword If '${field_name}' == 'value.amount' input number to exist visible input ${contract_contractform_amount_input_locator} ${amount}
92   -# ${budget} = Run Keyword If '${field_name}' == 'value.amount' and '${mode}' == 'negotiation' Set Variable ${amount/0.85}
93   -# Run Keyword If '${field_name}' == 'value.amount' and '${mode}' == 'negotiation' input number to exist visible input ${contract_contractform_amount_input_locator} ${budget}
94   - Run Keyword If '${field_name}' == 'value.amountNet' input number to exist visible input ${contract_contractform_amount_net_input_locator} ${amount}
95 98 capture page screenshot
96 99 choose file ${add_file_to_contract_contractform_locator} ${file_path}
97 100 wait until page does not contain element ${popup_dynamic_form_loading_element_locator} 60
... ... @@ -107,7 +110,13 @@ edit unitprices
107 110 click visible element ${contract_contractform_add_document_close_description_btn_locator}
108 111 capture page screenshot
109 112
110   - submit form and check result ${contract_contractform_submit_btn_locator} ${contract_contractform_submit_success_msg} ${contract_active_form_open_btn_locator}
111   -# run keyword and ignore error submit form and check result ${contract_contractform_submit_btn_locator} ${contract_contractform_submit_success_msg} ${contract_active_form_open_btn_locator}
  113 + submit form and check result ${contract_contractform_submit_btn_locator} ${contract_agreement_submit_success_msg}
  114 + capture page screenshot
  115 + open popup by btn locator ${contract_active_agreement_active_form_open_btn_locator}
  116 + Execute Javascript $('.fancybox-is-open .fancybox-content button.btn.btn-success').click()
  117 + capture page screenshot
  118 + run keyword and ignore error Load Sign
  119 + capture page screenshot
  120 + submit form and check result ${qualification_form_submit_btn_locator} ${contract_agreement_active_submit_success_msg} ${None}
112 121 capture page screenshot
113 122
... ...
... ... @@ -6,10 +6,6 @@ ${contract_contractform_contract_number_input_locator} = jquery=#cont
6 6 ${contract_contractform_date_signed_input_locator} = jquery=#contractform-date_signed
7 7 ${contract_contractform_date_start_input_locator} = jquery=#contractform-date_start
8 8 ${contract_contractform_date_end_input_locator} = jquery=#contractform-date_end
9   -${contract_contractform_date_start_input_locator} = jquery=#contractform-date_start
10   -${contract_contractform_date_end_input_locator} = jquery=#contractform-date_end
11   -${contract_contractform_date_start_input_locator} = jquery=#contractform-date_start
12   -${contract_contractform_date_end_input_locator} = jquery=#contractform-date_end
13 9 ${contract_contractform_submit_btn_locator} = jquery=.fancybox-is-open .fancybox-content button.btn.btn-success
14 10 ${contract_contractform_submit_success_msg} = Контракт успішно завантажений
15 11 ${contract_contractform_amount_input_locator} = jquery=#contractform-value_amount
... ... @@ -25,3 +21,15 @@ ${contract_contractform_add_document_description_input_locator} = jquery=.js-d
25 21 ${contract_contractform_add_document_close_description_btn_locator} = jquery=.js-dynamic-form-content-item:last .popover.fade.top.in [href$="#close"]
26 22
27 23 ${contract_active_form_open_btn_locator} = jquery=#contracts-pjax a[href*="/tender/contract-activate"]
  24 +${contract_active_form_agreement_open_btn_locator} = jquery=#agreement-contracts-list .tabs__pane.tabs__pane--visible a[href*="/tender/agreement-contract?"]
  25 +${contract_next_form_agreement_open_btn_locator} = jquery=#agreement-contracts-list .tabs__item.tabs__item--active_next-child a[id*="tab-agreement-contract"]
  26 +${contract_agreement_unit_prices_input_locator} = jquery=.fancybox-is-open input[id$="agreementcontractform-unit_prices"]
  27 +${contract_agreement_active_submit_success_msg} = Постачальник успішно підтверджений, триває синхронізація з сайтом уповноваженого органу.
  28 +${contract_active_agreement_form_open_btn_locator} = jquery=.aside__inner a[href*="/tender/agreement?"]
  29 +${contract_agreement_agreement_number_input_locator} = jquery=#agreementform-agreement_number
  30 +${contract_agreement_date_signed_input_locator} = jquery=#agreementform-date_signed
  31 +${contract_agreement_date_start_input_locator} = jquery=#agreementform-date_start
  32 +${contract_agreement_date_end_input_locator} = jquery=#agreementform-date_end
  33 +${contract_agreement_submit_success_msg} = Угода завантажена, наступний крок - її активація.
  34 +${contract_active_agreement_active_form_open_btn_locator} = jquery=.aside__inner a[href*="/tender/agreement-activate?"]
  35 +${contract_agreement_active_submit_success_msg} = Угода успішно активована!
... ...
... ... @@ -310,7 +310,7 @@ confirm awards
310 310 [Documentation] Перевести постачальників для тендера tender_uaid
311 311 ... в статус active.
312 312
313   - wait until page contains element with reloading ${qualification_agreement_form_approve_submit_btn_locator}
  313 + wait until page contains element with reloading ${qualification_agreement_form_approve_submit_btn_locator} 720 30
314 314 click visible element ${qualification_agreement_form_approve_submit_btn_locator}
315 315 wait until page contains ${qualification_agreement_form_approve_question_msg}
316 316 Execute Javascript ${qualification_form_approve_js_submit_btn_locator}
... ...
Please register or login to post a comment