From 847a773d7011431827a5dd4edc3487e7ae093a37 Mon Sep 17 00:00:00 2001
From: Denis Baranov <dbaranov.work@gmail.com>
Date: Mon, 2 Jul 2018 15:59:49 +0300
Subject: [PATCH 1/3] solved problem with condition field saving

---
 includes/admin/assets/js/um-admin-field.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/includes/admin/assets/js/um-admin-field.js b/includes/admin/assets/js/um-admin-field.js
index 2bb0c7f9..9b03e609 100644
--- a/includes/admin/assets/js/um-admin-field.js
+++ b/includes/admin/assets/js/um-admin-field.js
@@ -29,7 +29,9 @@ jQuery(document).ready(function() {
 
 	/* Add a Field */
 	jQuery(document).on('submit', 'form.um_add_field', function(e){
-		
+
+		console.log(um_admin_field_data.ajax_url);
+
 		e.preventDefault();
 		
 		var form = jQuery(this);
@@ -49,6 +51,7 @@ jQuery(document).ready(function() {
 				form.css({'opacity': 1});
 			},
 			success: function(data){
+                console.log(data);
 				if (data.error){
 
 					c = 0;
@@ -76,7 +79,7 @@ jQuery(document).ready(function() {
 				
 			},
 			error: function(data){
-
+				console.log(data);
 			}
 		});
 		

From c57459bba83a6b60950cda49c5d3e76ef7ca561b Mon Sep 17 00:00:00 2001
From: Denis Baranov <dbaranov.work@gmail.com>
Date: Mon, 2 Jul 2018 17:53:33 +0300
Subject: [PATCH 2/3] code refactor

---
 includes/admin/assets/js/um-admin-field.js  |  2 +-
 includes/admin/core/class-admin-builder.php | 26 ++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/includes/admin/assets/js/um-admin-field.js b/includes/admin/assets/js/um-admin-field.js
index 007c8965..b06a1f81 100644
--- a/includes/admin/assets/js/um-admin-field.js
+++ b/includes/admin/assets/js/um-admin-field.js
@@ -35,7 +35,7 @@ jQuery(document).ready(function() {
 	
 	/* Add a Field */
 	jQuery(document).on('submit', 'form.um_add_field', function(e){
-		
+
 		e.preventDefault();
 		
 		var form = jQuery(this);
diff --git a/includes/admin/core/class-admin-builder.php b/includes/admin/core/class-admin-builder.php
index 3f61932c..e7ff8725 100644
--- a/includes/admin/core/class-admin-builder.php
+++ b/includes/admin/core/class-admin-builder.php
@@ -230,7 +230,17 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
 				<?php } ?>
 
 				<div class="um-admin-btn-content">
+                    <div class="um-admin-cur-condition-template">
 
+						<?php $metabox->field_input( '_conditional_action', $form_id ); ?>
+						<?php $metabox->field_input( '_conditional_field', $form_id ); ?>
+						<?php $metabox->field_input( '_conditional_operator', $form_id ); ?>
+						<?php $metabox->field_input( '_conditional_value', $form_id ); ?>
+
+                        <p><a href="#" class="um-admin-remove-condition button um-admin-tipsy-n" title="Remove condition"><i class="um-icon-close" style="margin-right:0!important"></i></a></p>
+
+                        <div class="um-admin-clear"></div>
+                    </div>
                     <p><a href="#" class="um-admin-new-condition button button-primary um-admin-tipsy-n" title="Add new condition"><?php _e( 'Add new rule', 'ultimate-member' ); ?></a></p>
                     <p class="um-admin-reset-conditions"><a href="#" class="button"><?php _e( 'Reset all rules', 'ultimate-member' ); ?></a></p>
 					<div class="um-admin-clear"></div>
@@ -265,25 +275,13 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
 							<?php $metabox->field_input( '_conditional_operator', $form_id ); ?>
 							<?php $metabox->field_input( '_conditional_value', $form_id ); ?>
 
-							<p><a href="#" class="um-admin-new-condition button um-admin-tipsy-n" title="Add new condition"><i class="um-icon-plus" style="margin-right:0!important"></i></a></p>
+                            <p><a href="#" class="um-admin-remove-condition button um-admin-tipsy-n" title="Remove condition"><i class="um-icon-close" style="margin-right:0!important"></i></a></p>
 
 							<div class="um-admin-clear"></div>
 						</div>
 
 					<?php } ?>
-                    <div class="um-admin-cur-condition-template">
-
-						<?php $metabox->field_input( '_conditional_action', $form_id ); ?>
-						<?php $metabox->field_input( '_conditional_field', $form_id ); ?>
-						<?php $metabox->field_input( '_conditional_operator', $form_id ); ?>
-						<?php $metabox->field_input( '_conditional_value', $form_id ); ?>
-
-                        <p><a href="#" class="um-admin-remove-condition button um-admin-tipsy-n" title="Remove condition"><i class="um-icon-close" style="margin-right:0!important"></i></a></p>
-
-                        <div class="um-admin-clear"></div>
-                    </div>
 				</div>
-
 			</div>
 
 			<?php
@@ -608,6 +606,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
 		 *
 		 */
 		function update_field() {
+//            var_dump($_POST);
+//            die;
 			if ( ! is_user_logged_in() || ! current_user_can( 'manage_options' ) )
 				die( __('Please login as administrator','ultimate-member') );
 

From c1badd0bca37203e420a7b8013eaca959c8a991f Mon Sep 17 00:00:00 2001
From: Denis Baranov <dbaranov.work@gmail.com>
Date: Mon, 2 Jul 2018 18:14:25 +0300
Subject: [PATCH 3/3] code refactor

---
 includes/admin/assets/js/um-admin-field.js |  5 -----
 includes/core/class-fields.php             | 10 +++++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/includes/admin/assets/js/um-admin-field.js b/includes/admin/assets/js/um-admin-field.js
index edefd3d7..d8843d2c 100644
--- a/includes/admin/assets/js/um-admin-field.js
+++ b/includes/admin/assets/js/um-admin-field.js
@@ -30,11 +30,6 @@ jQuery(document).ready(function() {
 	/* Add a Field */
 	jQuery(document).on('submit', 'form.um_add_field', function(e){
 
-<<<<<<< HEAD
-=======
-		console.log(um_admin_field_data.ajax_url);
-
->>>>>>> 847a773d7011431827a5dd4edc3487e7ae093a37
 		e.preventDefault();
 		
 		var form = jQuery(this);
diff --git a/includes/core/class-fields.php b/includes/core/class-fields.php
index 74f59624..80a1a6a3 100644
--- a/includes/core/class-fields.php
+++ b/includes/core/class-fields.php
@@ -4040,23 +4040,23 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
 			switch ($act_id) {
 
 				case 'um_admin_duplicate_field':
-					$this->duplicate_field( $arg1, $arg2 );
+					UM()->fields()->duplicate_field( $arg1, $arg2 );
 					break;
 
 				case 'um_admin_remove_field_global':
-					$this->delete_field_from_db( $arg1 );
+					UM()->fields()->delete_field_from_db( $arg1 );
 					break;
 
 				case 'um_admin_remove_field':
-					$this->delete_field_from_form( $arg1, $arg2 );
+					UM()->fields()->delete_field_from_form( $arg1, $arg2 );
 					break;
 
 				case 'um_admin_add_field_from_predefined':
-					$this->add_field_from_predefined( $arg1, $arg2, $position );
+					UM()->fields()->add_field_from_predefined( $arg1, $arg2, $position );
 					break;
 
 				case 'um_admin_add_field_from_list':
-					$this->add_field_from_list( $arg1, $arg2, $position );
+					UM()->fields()->add_field_from_list( $arg1, $arg2, $position );
 					break;
 
 			}