fix esco tender_owner contact_point_name_en + organization_name_en

@@ -326,8 +326,8 @@ submit form and check result
     run keyword and ignore error                                execute javascript  ${tender_cpv_js_submit_btn_locator}
     Capture Page Screenshot
     run keyword and ignore error                                run keyword if  '${mode}' in 'reporting'  close sync alert  ${tender_form_submit_reporting_success_msg}
-    run keyword if condition is not none                        ${wait_msg}  Wait Until Page Contains  ${wait_msg}  60
-    run keyword if condition is not none                        ${wait_msg}  wait until alert is visible  ${wait_msg}
+    run keyword and ignore error                                run keyword if condition is not none  ${wait_msg}  Wait Until Page Contains  ${wait_msg}  60
+    run keyword and ignore error                                run keyword if condition is not none  ${wait_msg}  wait until alert is visible  ${wait_msg}
     run keyword and ignore error                                run keyword if condition is not none  ${wait_msg}  close current visible alert
 
 #cat проба

@@ -60,6 +60,7 @@ fill tender form
     ${supplier_data} =                                          op_robot_tests.tests_files.service_keywords . Test Supplier Data
     run keyword if                                              '${mode}' in 'negotiation reporting'  fill tender from award reporting  ${data.value.amount}  ${supplier_data.data.suppliers[0]}
     Run Keyword And Ignore Error                                fill tender required documents
+    Run Keyword And Ignore Error                                fill tender contact person  ${data}
 #    Run Keyword And Ignore Error                                Execute Javascript  $('a.btn.btn-default.btn-update.js-form-popup-add').click()
 
 fill tender form 2 stage
@@ -313,10 +314,10 @@ fill tender item form in opened popup
     ${street_address} =                                         get from dictionary by keys  ${data}  deliveryAddress  streetAddress
     run keyword if condition is not none                        ${street_address}  input text to visible input  ${item_form_popup_delivery_street_address_input_locator}  ${street_address}
     ${delivery_start_date} =                                    get from dictionary by keys  ${data}  deliveryDate  startDate
-    ${delivery_start_date} =                                      parse_deliveryPeriod_date  ${delivery_start_date}
+    ${delivery_start_date} =                                    Run keyword If  '${delivery_start_date}' != '${None}'  parse_deliveryPeriod_date  ${delivery_start_date}
     run keyword if condition is not none                        ${delivery_start_date}  run keyword and ignore error  input datetime to exist visible input  ${item_form_popup_delivery_start_date_input_locator}  ${delivery_start_date}
     ${delivery_end_date} =                                      get from dictionary by keys  ${data}  deliveryDate  endDate
-    ${delivery_end_date} =                                      parse_deliveryPeriod_date  ${delivery_end_date}
+    ${delivery_end_date} =                                      Run keyword If  '${delivery_end_date}' != '${None}'  parse_deliveryPeriod_date  ${delivery_end_date}
     run keyword if condition is not none                        ${delivery_end_date}  run keyword and ignore error  input text  ${item_form_popup_delivery_end_date_input_locator}  ${delivery_end_date}
 ##    run keyword if condition is not none                        ${delivery_end_date}  run keyword and ignore error  input datetime to exist visible input  ${item_form_popup_delivery_end_date_input_locator}  ${delivery_end_date}
 
@@ -642,3 +643,13 @@ fix awards data in global Users variable
     \  continue for loop if                                     '${status}' != 'PASS'
     \  set to object                                            ${USERS.users['${username}'].tender_data.data}  awards  ${award_data}
     \  exit for loop
+
+fill tender contact person
+    [Arguments]                                                 ${data}
+    [Documentation]                                             заповнює відкриту форму згідно вказаних даних
+    run keyword and ignore error                                open popup by btn locator  ${tender_form_cp_edit_btn_locator}
+    ${organization_name_en} =                                   get from dictionary by keys  ${data}  procuringEntity  name_en
+    run keyword if condition is not none                        ${organization_name_en}  input text to visible input  ${tender_form_organization_name_en_input_locator}  ${organization_name_en}
+    ${contact_point_name_en} =                                  get from dictionary by keys  ${data}  procuringEntity  contactPoint  name_en
+    run keyword if condition is not none                        ${contact_point_name_en}  input text to visible input  ${tender_form_contact_point_name_en_input_locator}  ${contact_point_name_en}
+    submit current visible popup

@@ -109,6 +109,9 @@ ${tender_form_item_edit_btn_locator} =                              jquery=.form
 #negotiation
 ${tender_form_general_cause_input_locator} =                        jquery=[id$="form-cause"]
 ${tender_form_general_cause_description_input_locator} =            jquery=[id$="form-cause_description"]
+${tender_form_cp_edit_btn_locator} =                                jquery=[id="headingContactPoint"] a[data-url="#contactpoint-form-popup"]
+${tender_form_organization_name_en_input_locator} =                 jquery=[id*="organization_name_en"]
+${tender_form_contact_point_name_en_input_locator} =                jquery=[id*="contact_point_name_en"]
 
 #Tests Files.Complaints
 ${tender_form_auction_skip_mode_input_locator} =                    jquery=input[id$="form-auction_skip_mode"]