esko in tender + contract

@@ -8,8 +8,10 @@ ${contract_contractform_date_start_input_locator} =                 jquery=#cont
 ${contract_contractform_date_end_input_locator} =                   jquery=#contractform-date_end
 ${contract_contractform_submit_btn_locator} =                       jquery=.fancybox-is-open .fancybox-content button.btn.btn-success
 ${contract_contractform_submit_success_msg} =                       Контракт успішно завантажений
+${contract_contractform_amount_input_locator} =                     jquery=#contractform-value_amount-disp
+${contract_contractform_amount_net_input_locator} =                 jquery=#contractform-value_amount_net-disp
 ${contract_contractform_amount_input_locator} =                     jquery=#contractform-value_amount
-${contract_contractform_amount_net_input_locator} =                 jquery=#contractform-value_amount_net
+#${contract_contractform_amount_net_input_locator} =                 jquery=#contractform-value_amount_net
 ${contract_contractform_active_submit_success_msg} =                Контракт успішно активовано, дочекайтесь опублікування на сайті уповноваженого органу.
 ${contract_contractform_value_added_tax_included_locator} =         jquery=#contractform-value_added_tax_included
 

@@ -159,6 +159,15 @@ fill tender general info
     ${nbu_discount_rate} =                                      Run keyword If  '${nbu_discount_rate}' != '${None}'      set_value_minimalStepPercentage  ${nbu_discount_rate}
     ${nbu_discount_rate} =                                      Run keyword If  '${nbu_discount_rate}' != '${None}'      convert_esco__float_to_string  ${nbu_discount_rate}
     run keyword and ignore error                                run keyword if condition is not none                        ${nbu_discount_rate}  input number to exist visible input  ${tender_form_general_nbu_discount_rate_input_locator}  ${nbu_discount_rate}
+#esco
+    ${yearly_payments_percentage_range} =                       get from dictionary by keys  ${data}  yearlyPaymentsPercentageRange
+    ${yearly_payments_percentage_range} =                       Run keyword If  '${yearly_payments_percentage_range}' != '${None}'      set_value_minimalStepPercentage  ${yearly_payments_percentage_range}
+    ${yearly_payments_percentage_range} =                       Run keyword If  '${yearly_payments_percentage_range}' != '${None}'      convert_esco__float_to_string  ${yearly_payments_percentage_range}
+    run keyword if condition is not none                        ${yearly_payments_percentage_range}  input number to exist visible input  ${tender_form_general_yearly_payments_percentage_range_input_locator}  ${yearly_payments_percentage_range}
+    ${minimal_step_percentage} =                                get from dictionary by keys  ${data}  minimalStepPercentage
+    ${minimal_step_percentage} =                                Run keyword If  '${minimal_step_percentage}' != '${None}'      set_value_minimalStepPercentage  ${minimal_step_percentage}
+    ${minimal_step_percentage} =                                Run keyword If  '${minimal_step_percentage}' != '${None}'      convert_esco__float_to_string  ${minimal_step_percentage}
+    run keyword if condition is not none                        ${minimal_step_percentage}  input number to exist visible input  ${tender_form_general_minimal_step_percentage_input_locator}  ${minimal_step_percentage}
 #closeframework
     ${max_awards_count} =                                       get from dictionary by keys  ${data}  maxAwardsCount
     run keyword if condition is not none                        ${max_awards_count}  input text to exist visible input  ${tender_form_general_max_awards_count_input_locator}  ${max_awards_count}

@@ -92,6 +92,8 @@ ${tender_cpv_js_submit_btn_locator} =                               $('.animated
 #esco
 ${tender_form_general_funding_kind_input_locator} =                 id=tenderescoform-funding_kind
 ${tender_form_general_nbu_discount_rate_input_locator} =            id=tenderescoform-nbu_discount_rate
+#${tender_form_lot_minimal_step_percentage_input_locator} =      jquery=.fancybox-content [id$="-min_step_percentage"]
+#${tender_form_lot_yearly_payments_percentage_range_input_locator} =  jquery=.fancybox-content [id$="-yearly_payments_percentage_range"]
 ${tender_form_general_minimal_step_percentage_input_locator} =      jquery=.fancybox-content [id$="-min_step_percentage"]
 ${tender_form_general_yearly_payments_percentage_range_input_locator} =  jquery=.fancybox-content [id$="-yearly_payments_percentage_range"]
 #closeframework