diff --git a/includes/admin/assets/js/um-admin-forms.js b/includes/admin/assets/js/um-admin-forms.js index 1bf28ef2..314d6d24 100644 --- a/includes/admin/assets/js/um-admin-forms.js +++ b/includes/admin/assets/js/um-admin-forms.js @@ -46,6 +46,30 @@ function um_admin_init_users_select() { } +/** + * + * @param field_key + * @param line + */ +function um_add_same_page_log( field_key, line ) { + var log_field = jQuery( '.um-same-page-update-' + field_key ).find( '.upgrade_log' ); + var previous_html = log_field.html(); + log_field.html( previous_html + line + "
" ); +} + + +function um_same_page_wrong_ajax( field_key ) { + um_add_same_page_log( field_key, wp.i18n.__( 'Wrong AJAX response...', 'ultimate-member' ) ); + um_add_same_page_log( field_key, wp.i18n.__( 'Your upgrade was crashed, please contact with support', 'ultimate-member' ) ); +} + + +function um_same_page_something_wrong( field_key ) { + um_add_same_page_log( field_key, wp.i18n.__( 'Something went wrong with AJAX request...', 'ultimate-member' ) ); + um_add_same_page_log( field_key, wp.i18n.__( 'Your upgrade was crashed, please contact with support', 'ultimate-member' ) ); +} + + jQuery(document).ready( function() { um_admin_init_users_select(); @@ -62,7 +86,6 @@ jQuery(document).ready( function() { }); - jQuery( document.body ).on( 'click', '.um-admin-form-same-page-update', function() { var field_key = jQuery(this).data('upgrade_cb'); jQuery(this).prop( 'disabled', true ); @@ -159,34 +182,12 @@ jQuery(document).ready( function() { window.location = um_forms_data.successfully_redirect; } } + } else { + wp.hooks.doAction( 'um_same_page_upgrade', field_key ); } }); - - /** - * - * @param field_key - * @param line - */ - function um_add_same_page_log( field_key, line ) { - var log_field = jQuery( '.um-same-page-update-' + field_key ).find( '.upgrade_log' ); - var previous_html = log_field.html(); - log_field.html( previous_html + line + "
" ); - } - - - function um_same_page_wrong_ajax( field_key ) { - um_add_same_page_log( field_key, wp.i18n.__( 'Wrong AJAX response...', 'ultimate-member' ) ); - um_add_same_page_log( field_key, wp.i18n.__( 'Your upgrade was crashed, please contact with support', 'ultimate-member' ) ); - } - - - function um_same_page_something_wrong( field_key ) { - um_add_same_page_log( field_key, wp.i18n.__( 'Something went wrong with AJAX request...', 'ultimate-member' ) ); - um_add_same_page_log( field_key, wp.i18n.__( 'Your upgrade was crashed, please contact with support', 'ultimate-member' ) ); - } - /** * Sortable items */ diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php index 92824b72..34d3d515 100644 --- a/includes/admin/core/class-admin-settings.php +++ b/includes/admin/core/class-admin-settings.php @@ -234,6 +234,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) { $to = absint( $_POST['page'] ) * $per_page; wp_send_json_success( array( 'message' => sprintf( __( 'Metadata from %1$s to %2$s was upgraded successfully...', 'ultimate-member' ), $from, $to ) ) ); + } else { + do_action( 'um_same_page_update_ajax_action', $cb_func ); } }