bid status

@@ -216,21 +216,26 @@ get bid information
     ...                                                         username для тендера tender_uaid.
 
     capture page screenshot
-    open popup by btn locator                                   ${bid_form_open_btn_locator}  ${bid_popup_locator}
+    Run Keyword If  'status' == '${field}'                      submit form and check result   ${bid_form_refresh_btn_locator}  ${bid_form_refresh_success_msg}  ${tender_created_checker_element_locator}  ${true}
+    Run Keyword If  'status' != '${field}'                      open popup by btn locator   ${bid_form_open_btn_locator}  ${bid_popup_locator}
 #    click visible element                                       ${bid_form_open_btn_locator}
     capture page screenshot
-    wait until popup is visible
+    Run Keyword If  'status' != '${field}'                      wait until popup is visible
 #    ${question_open_form_answer_locator} =                      replace string  ${question_open_form_answer_btn_locator_tpl}  %title%  ${question_id}
 #    wait until page contains element with reloading             ${question_open_form_answer_locator}
     capture page screenshot
     Run Keyword If  'status' == '${field}'                      submit form and check result     ${bid_form_refresh_btn_locator}  ${bid_form_refresh_success_msg}  ${tender_created_checker_element_locator}  ${true}
     #${return_value} =                                           Run Keyword If  'lotValues[0].value.amount' == '${field}'         get value by locator on opened page  ${bid_lotValues_0_value_amount_value_locator}
-    ${return_value} =                                           Run Keyword If  'lotValues[0].value.amount' == '${field}'         get value by locator on opened page  ${bid_lotValues_0_value_amount_value_locator}
-    ...  ELSE                                                   Run Keyword If  'status' == '${field}'        get_text  ${bid_form_bid_status_btn_locator}
-    ...  ELSE                                                   Run Keyword If  'value.amount' == '${field}'   get value by locator on opened page  ${bid_form_value_amount_input_locator}
+    ${return_value} =                                           Run Keyword If  'lotValues[0].value.amount' == '${field}'         get bid value  ${bid_lotValues_0_value_amount_value_locator}
+    ...  ELSE                                                   Run Keyword If  'status' == '${field}'        get value by locator on opened page  ${bid_form_bid_status_btn_locator}
+    ...  ELSE                                                   Run Keyword If  'value.amount' == '${field}'   get bid value  ${bid_form_value_amount_input_locator}
+##    ${return_value} =                                           Run Keyword If  'lotValues[0].value.amount' == '${field}'         get value by locator on opened page  ${bid_lotValues_0_value_amount_value_locator}
+#    ...  ELSE                                                   Run Keyword If  'status' == '${field}'        get_text  ${bid_form_bid_status_btn_locator}
+##    ...  ELSE                                                   Run Keyword If  'status' == '${field}'        get value by locator on opened page  ${bid_form_bid_status_btn_locator}
+##    ...  ELSE                                                   Run Keyword If  'value.amount' == '${field}'   get value by locator on opened page  ${bid_form_value_amount_input_locator}
 #    submit current visible popup
-    ${return_value} =                                           Run Keyword If  'lotValues[0].value.amount' == '${field}' or 'value.amount' == '${field}'   playtender_service.split_joinvalue  ${return_value}
-    ${return_value} =                                           Run Keyword If  'lotValues[0].value.amount' == '${field}' or 'value.amount' == '${field}'   Convert To Number  ${return_value}
+##    ${return_value} =                                           Run Keyword If  'lotValues[0].value.amount' == '${field}' or 'value.amount' == '${field}'   playtender_service.split_joinvalue  ${return_value}
+##    ${return_value} =                                           Run Keyword If  'lotValues[0].value.amount' == '${field}' or 'value.amount' == '${field}'   Convert To Number  ${return_value}
     [Return]                                                    ${return_value}
 
 fill bid form remove
@@ -240,3 +245,13 @@ fill bid form remove
     click visible element                                       ${bid_form_remove_btn_locator}
     submit form and check result                                ${alert_opened_close_bid_btn_locator}  ${bid_form_submit_remove_success_msg}  ${tender_created_checker_element_locator}  ${true}
 
+get bid value
+    [Arguments]                                                 ${field}
+    [Documentation]                                             Отримати значення поля field пропозиції користувача
+    ...                                                         username для тендера tender_uaid.
+
+    ${return_value} =                                           get value by locator on opened page  ${field}
+    ${return_value} =                                           playtender_service.split_joinvalue  ${return_value}
+    ${return_value} =                                           Convert To Number  ${return_value}
+    [Return]                                                    ${return_value}
+