From 3c038e613f8b1ee278b3dd7df783433f5180d360 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Tue, 6 Jan 2015 17:24:32 -0200 Subject: [PATCH 01/14] Created initial webhooks table list in settings page --- includes/admin/class-wc-admin-settings.php | 1 + .../class-wc-admin-webhooks-table-list.php | 171 ++++++++++++++++++ .../settings/class-wc-settings-webhooks.php | 87 +++++++++ includes/admin/views/html-admin-settings.php | 5 +- 4 files changed, 262 insertions(+), 2 deletions(-) create mode 100644 includes/admin/class-wc-admin-webhooks-table-list.php create mode 100644 includes/admin/settings/class-wc-settings-webhooks.php diff --git a/includes/admin/class-wc-admin-settings.php b/includes/admin/class-wc-admin-settings.php index 38663cdd355..236cfef8ffe 100644 --- a/includes/admin/class-wc-admin-settings.php +++ b/includes/admin/class-wc-admin-settings.php @@ -40,6 +40,7 @@ class WC_Admin_Settings { $settings[] = include( 'settings/class-wc-settings-accounts.php' ); $settings[] = include( 'settings/class-wc-settings-emails.php' ); $settings[] = include( 'settings/class-wc-settings-integrations.php' ); + $settings[] = include( 'settings/class-wc-settings-webhooks.php' ); self::$settings = apply_filters( 'woocommerce_get_settings_pages', $settings ); } diff --git a/includes/admin/class-wc-admin-webhooks-table-list.php b/includes/admin/class-wc-admin-webhooks-table-list.php new file mode 100644 index 00000000000..f52e780f990 --- /dev/null +++ b/includes/admin/class-wc-admin-webhooks-table-list.php @@ -0,0 +1,171 @@ + __( 'webhook', 'woocommerce' ), + 'plural' => __( 'webhooks', 'woocommerce' ), + 'ajax' => false + ) ); + } + + /** + * Get list columns + * + * @return array + */ + public function get_columns() { + $columns = array( + 'cb' => '', + 'title' => __( 'Name', 'woocommerce' ), + 'status' => __( 'Status', 'woocommerce' ), + 'topic' => __( 'Topic', 'woocommerce' ), + 'delivery_url' => __( 'Delivery URL', 'woocommerce' ), + ); + + return $columns; + } + + /** + * Column cb. + * + * @param WC_Post $webhook + * + * @return string + */ + public function column_cb( $webhook ) { + return sprintf( '', $this->_args['singular'], $webhook->ID ); + } + + /** + * Webhook columns. + * + * @param WC_Post $webhook + * @param string $column_name + * + * @return string + */ + public function column_default( $webhook, $column_name ) { + global $the_webhook; + + if ( empty( $the_webhook ) || $the_webhook->id != $webhook->ID ) { + $the_webhook = new WC_Webhook( $webhook->ID ); + } + + $output = ''; + + switch ( $column_name ) { + case 'title' : + $edit_link = get_edit_post_link( $the_webhook->id ); + $title = _draft_or_post_title( $the_webhook->post_data ); + $post_type_object = get_post_type_object( $the_webhook->post_data->post_type ); + + $output = '' . esc_html( $title ) . ''; + + // Get actions + $actions = array(); + + $actions['id'] = sprintf( __( 'ID: %d', 'woocommerce' ), $the_webhook->id ); + + if ( current_user_can( $post_type_object->cap->edit_post, $the_webhook->id ) ) { + $actions['edit'] = '' . __( 'Edit', 'woocommerce' ) . ''; + } + + if ( current_user_can( $post_type_object->cap->delete_post, $the_webhook->id ) ) { + + if ( 'trash' == $the_webhook->post_data->post_status ) { + $actions['untrash'] = '' . __( 'Restore', 'woocommerce' ) . ''; + } elseif ( EMPTY_TRASH_DAYS ) { + $actions['trash'] = '' . __( 'Trash', 'woocommerce' ) . ''; + } + + if ( 'trash' == $the_webhook->post_data->post_status || ! EMPTY_TRASH_DAYS ) { + $actions['delete'] = '' . __( 'Delete Permanently', 'woocommerce' ) . ''; + } + } + + $actions = apply_filters( 'post_row_actions', $actions, $the_webhook->post_data ); + + $output .= '
'; + + $i = 0; + $action_count = sizeof( $actions ); + + foreach ( $actions as $action => $link ) { + ++$i; + $sep = ( $i == $action_count ) ? '' : ' | '; + + $output .= '' . $link . $sep . ''; + } + + $output .= '
'; + + break; + case 'status' : + $output = $the_webhook->get_i18n_status(); + break; + case 'topic' : + $output = $the_webhook->get_topic(); + break; + case 'delivery_url' : + $output = $the_webhook->get_delivery_url(); + break; + + default : + break; + } + + return $output; + } + + /** + * Prepare table list items. + */ + public function prepare_items() { + $per_page = 5; + $columns = $this->get_columns(); + $hidden = array(); + $sortable = $this->get_sortable_columns(); + $this->_column_headers = array( $columns, $hidden, $sortable ); + + $current_page = $this->get_pagenum(); + + $webhooks = new WP_Query( array( + 'post_type' => 'shop_webhook', + 'posts_per_page' => $per_page, + 'ignore_sticky_posts' => true, + 'paged' => $current_page + ) ); + + $this->items = $webhooks->posts; + + $this->set_pagination_args( array( + 'total_items' => $webhooks->found_posts, + 'per_page' => $per_page, + 'total_pages' => $webhooks->max_num_pages + ) ); + } +} diff --git a/includes/admin/settings/class-wc-settings-webhooks.php b/includes/admin/settings/class-wc-settings-webhooks.php new file mode 100644 index 00000000000..da7dea9d9ce --- /dev/null +++ b/includes/admin/settings/class-wc-settings-webhooks.php @@ -0,0 +1,87 @@ +id = 'webhooks'; + $this->label = __( 'Webhooks', 'woocommerce' ); + + add_filter( 'woocommerce_settings_tabs_array', array( $this, 'add_settings_page' ), 20 ); + add_action( 'woocommerce_settings_' . $this->id, array( $this, 'output' ) ); + add_action( 'woocommerce_settings_form_method_tab_' . $this->id, array( $this, 'form_method' ) ); + + $this->notices(); + } + + /** + * Form method + * + * @param string $method + * + * @return string + */ + public function form_method( $method ) { + return 'get'; + } + + /** + * Notices. + */ + protected function notices() { + if ( isset( $_GET['trashed'] ) ) { + $trashed = absint( $_GET['trashed'] ); + + WC_Admin_Settings::add_message( sprintf( _n( '1 webhook moved to the Trash.', '%d webhooks moved to the Trash.', $trashed, 'woocommerce' ), $trashed ) ); + } + } + + /** + * Table list output + */ + protected function table_list_output() { + $webhooks_table_list = new WC_Admin_Webhooks_Table_List(); + $webhooks_table_list->prepare_items(); + + echo ''; + echo ''; + + $webhooks_table_list->display(); + } + + /** + * Output the settings + */ + public function output() { + global $current_section; + + // Hide the save button + $GLOBALS['hide_save_button'] = true; + + // Display the table list. + $this->table_list_output(); + } +} + +endif; + +return new WC_Settings_Webhooks(); diff --git a/includes/admin/views/html-admin-settings.php b/includes/admin/views/html-admin-settings.php index a07cef3257a..4ba2e5b8c8b 100644 --- a/includes/admin/views/html-admin-settings.php +++ b/includes/admin/views/html-admin-settings.php @@ -10,11 +10,12 @@ if ( ! defined( 'ABSPATH' ) ) { ?>
-
+

$label ) + foreach ( $tabs as $name => $label ) { echo '' . $label . ''; + } do_action( 'woocommerce_settings_tabs' ); ?> From 842d26bc24ff2b6b64b1d0510a63116c19635768 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Tue, 6 Jan 2015 17:29:49 -0200 Subject: [PATCH 02/14] Removed old webhook post type actions --- includes/admin/class-wc-admin-post-types.php | 127 ------------------- 1 file changed, 127 deletions(-) diff --git a/includes/admin/class-wc-admin-post-types.php b/includes/admin/class-wc-admin-post-types.php index 6cf6c6beaa8..4aa8773a354 100644 --- a/includes/admin/class-wc-admin-post-types.php +++ b/includes/admin/class-wc-admin-post-types.php @@ -32,23 +32,19 @@ class WC_Admin_Post_Types { add_filter( 'manage_edit-product_columns', array( $this, 'product_columns' ) ); add_filter( 'manage_edit-shop_coupon_columns', array( $this, 'shop_coupon_columns' ) ); add_filter( 'manage_edit-shop_order_columns', array( $this, 'shop_order_columns' ) ); - add_filter( 'manage_edit-shop_webhook_columns', array( $this, 'shop_webhook_columns' ) ); add_action( 'manage_product_posts_custom_column', array( $this, 'render_product_columns' ), 2 ); add_action( 'manage_shop_coupon_posts_custom_column', array( $this, 'render_shop_coupon_columns' ), 2 ); add_action( 'manage_shop_order_posts_custom_column', array( $this, 'render_shop_order_columns' ), 2 ); - add_action( 'manage_shop_webhook_posts_custom_column', array( $this, 'render_shop_webhook_columns' ), 2 ); add_filter( 'manage_edit-product_sortable_columns', array( $this, 'product_sortable_columns' ) ); add_filter( 'manage_edit-shop_coupon_sortable_columns', array( $this, 'shop_coupon_sortable_columns' ) ); add_filter( 'manage_edit-shop_order_sortable_columns', array( $this, 'shop_order_sortable_columns' ) ); - add_filter( 'manage_edit-shop_webhook_sortable_columns', array( $this, 'shop_webhook_sortable_columns' ) ); add_filter( 'bulk_actions-edit-shop_order', array( $this, 'shop_order_bulk_actions' ) ); // Views add_filter( 'views_edit-product', array( $this, 'product_sorting_link' ) ); - add_filter( 'views_edit-shop_webhook', array( $this, 'shop_webhook_links' ) ); // Bulk / quick edit add_action( 'bulk_edit_custom_box', array( $this, 'bulk_edit' ), 10, 2 ); @@ -179,22 +175,6 @@ class WC_Admin_Post_Types { return $columns; } - /** - * Define custom columns for webhooks - * @param array $existing_columns - * @return array - */ - public function shop_webhook_columns( $existing_columns ) { - $columns = array(); - $columns['cb'] = $existing_columns['cb']; - $columns['webhook_name'] = __( 'Name', 'woocommerce' ); - $columns['webhook_status'] = __( 'Status', 'woocommerce' ); - $columns['webhook_topic'] = __( 'Topic', 'woocommerce' ); - $columns['webhook_delivery_url'] = __( 'Delivery URL', 'woocommerce' ); - - return $columns; - } - /** * Ouput custom columns for products * @param string $column @@ -689,75 +669,6 @@ class WC_Admin_Post_Types { } } - /** - * Output custom columns for webhooks - * @param string $column - */ - public function render_shop_webhook_columns( $column ) { - global $post, $the_webhook; - - if ( empty( $the_webhook ) || $the_webhook->id != $post->ID ) { - $the_webhook = new WC_Webhook( $post->ID ); - } - - switch ( $column ) { - case 'webhook_name' : - $edit_link = get_edit_post_link( $the_webhook->id ); - $title = _draft_or_post_title(); - $post_type_object = get_post_type_object( $post->post_type ); - - echo '' . esc_html( $title ) . ''; - - // Get actions - $actions = array(); - - if ( current_user_can( $post_type_object->cap->edit_post, $the_webhook->id ) ) { - $actions['edit'] = '' . __( 'Edit', 'woocommerce' ) . ''; - } - - if ( current_user_can( $post_type_object->cap->delete_post, $the_webhook->id ) ) { - - if ( 'trash' == $post->post_status ) { - $actions['untrash'] = "id ) ), 'untrash-post_' . $the_webhook->id ) . "'>" . __( 'Restore', 'woocommerce' ) . ""; - } elseif ( EMPTY_TRASH_DAYS ) { - $actions['trash'] = "" . __( 'Trash', 'woocommerce' ) . ""; - } - - if ( 'trash' == $post->post_status || ! EMPTY_TRASH_DAYS ) { - $actions['delete'] = "" . __( 'Delete Permanently', 'woocommerce' ) . ""; - } - } - - $actions = apply_filters( 'post_row_actions', $actions, $post ); - - echo '
'; - - $i = 0; - $action_count = sizeof( $actions ); - - foreach ( $actions as $action => $link ) { - ++$i; - ( $i == $action_count ) ? $sep = '' : $sep = ' | '; - echo "$link$sep"; - } - echo '
'; - - break; - case 'webhook_status' : - echo $the_webhook->get_i18n_status(); - break; - case 'webhook_topic' : - echo $the_webhook->get_topic(); - break; - case 'webhook_delivery_url' : - echo $the_webhook->get_delivery_url(); - break; - - default : - break; - } - } - /** * Make columns sortable - https://gist.github.com/906872 * @@ -801,20 +712,6 @@ class WC_Admin_Post_Types { return wp_parse_args( $custom, $columns ); } - /** - * Make columns sortable - https://gist.github.com/906872 - * - * @param array $columns - * @return array - */ - public function shop_webhook_sortable_columns( $columns ) { - $custom = array( - 'webhook_name' => 'title' - ); - - return $custom; - } - /** * Remove edit from the bulk actions. * @@ -854,30 +751,6 @@ class WC_Admin_Post_Types { return $views; } - /** - * Webhooks links - * - * @param array $views - * @return array - */ - public function shop_webhook_links( $views ) { - $pattern = '/(shop_webhook\'>| class="current">)(.*?)( Date: Tue, 6 Jan 2015 17:39:34 -0200 Subject: [PATCH 03/14] Removed not useful global vars --- includes/admin/class-wc-admin-webhooks-table-list.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/includes/admin/class-wc-admin-webhooks-table-list.php b/includes/admin/class-wc-admin-webhooks-table-list.php index f52e780f990..3dc6fd4b413 100644 --- a/includes/admin/class-wc-admin-webhooks-table-list.php +++ b/includes/admin/class-wc-admin-webhooks-table-list.php @@ -22,9 +22,6 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table { * Initialize the webhook table list */ public function __construct() { - global $status, $page; - - // Set parent defaults parent::__construct( array( 'singular' => __( 'webhook', 'woocommerce' ), 'plural' => __( 'webhooks', 'woocommerce' ), From baca07f9d236c5fc349c1cff625a030c1e0c1c55 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Tue, 6 Jan 2015 22:02:33 -0200 Subject: [PATCH 04/14] Added webhooks table list views --- .../class-wc-admin-webhooks-table-list.php | 104 +++++++++++++++++- .../settings/class-wc-settings-webhooks.php | 13 +++ 2 files changed, 114 insertions(+), 3 deletions(-) diff --git a/includes/admin/class-wc-admin-webhooks-table-list.php b/includes/admin/class-wc-admin-webhooks-table-list.php index 3dc6fd4b413..e7d318dd50c 100644 --- a/includes/admin/class-wc-admin-webhooks-table-list.php +++ b/includes/admin/class-wc-admin-webhooks-table-list.php @@ -138,27 +138,125 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table { return $output; } + /** + * Get the status label for webhooks + * + * @param string $status_name + * @param stdClass $status + * + * @return array + */ + private function get_status_label( $status_name, $status ) { + switch ( $status_name ) { + case 'publish' : + $label = array( + 'singular' => __( 'Actived (%s)', 'woocommerce' ), + 'plural' => __( 'Actived (%s)', 'woocommerce' ), + 'context' => '', + 'domain' => 'woocommerce', + ); + break; + case 'draft' : + $label = array( + 'singular' => __( 'Paused (%s)', 'woocommerce' ), + 'plural' => __( 'Paused (%s)', 'woocommerce' ), + 'context' => '', + 'domain' => 'woocommerce', + ); + break; + case 'pending' : + $label = array( + 'singular' => __( 'Disabled (%s)', 'woocommerce' ), + 'plural' => __( 'Disabled (%s)', 'woocommerce' ), + 'context' => '', + 'domain' => 'woocommerce', + ); + break; + + default: + $label = $status->label_count; + break; + } + + return $label; + } + + /** + * Table list views + * + * @return array + */ + protected function get_views() { + $status_links = array(); + $num_posts = wp_count_posts( 'shop_webhook', 'readable' ); + $class = ''; + $total_posts = array_sum( (array) $num_posts ); + $current_user_id = get_current_user_id(); + + // Subtract post types that are not included in the admin all list. + foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) { + $total_posts -= $num_posts->$state; + } + + $class = empty( $class ) && empty( $_REQUEST['status'] ) ? ' class="current"' : ''; + $status_links['all'] = "" . sprintf( _nx( 'All (%s)', 'All (%s)', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . ''; + + foreach ( get_post_stati( array( 'show_in_admin_status_list' => true ), 'objects' ) as $status ) { + $class = ''; + $status_name = $status->name; + + if ( ! in_array( $status_name, array( 'publish', 'draft', 'pending', 'trash', 'future', 'private', 'auto-draft' ) ) ) { + continue; + } + + if ( empty( $num_posts->$status_name ) ) { + continue; + } + + if ( isset( $_REQUEST['status'] ) && $status_name == $_REQUEST['status'] ) { + $class = ' class="current"'; + } + + $label = $this->get_status_label( $status_name, $status ); + + $status_links[ $status_name ] = "" . sprintf( translate_nooped_plural( $label, $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . ''; + } + + return $status_links; + } + /** * Prepare table list items. */ public function prepare_items() { - $per_page = 5; + $per_page = 10; $columns = $this->get_columns(); $hidden = array(); $sortable = $this->get_sortable_columns(); + + // Column headers $this->_column_headers = array( $columns, $hidden, $sortable ); $current_page = $this->get_pagenum(); - $webhooks = new WP_Query( array( + // Query args + $args = array( 'post_type' => 'shop_webhook', 'posts_per_page' => $per_page, 'ignore_sticky_posts' => true, 'paged' => $current_page - ) ); + ); + // Handle the status query + if ( ! empty( $_REQUEST['status'] ) ) { + $args['post_status'] = sanitize_text_field( $_REQUEST['status'] ); + } + + // Get the webhooks + $webhooks = new WP_Query( $args ); $this->items = $webhooks->posts; + // Set the pagination $this->set_pagination_args( array( 'total_items' => $webhooks->found_posts, 'per_page' => $per_page, diff --git a/includes/admin/settings/class-wc-settings-webhooks.php b/includes/admin/settings/class-wc-settings-webhooks.php index da7dea9d9ce..9240aa0ef48 100644 --- a/includes/admin/settings/class-wc-settings-webhooks.php +++ b/includes/admin/settings/class-wc-settings-webhooks.php @@ -53,6 +53,18 @@ class WC_Settings_Webhooks extends WC_Settings_Page { WC_Admin_Settings::add_message( sprintf( _n( '1 webhook moved to the Trash.', '%d webhooks moved to the Trash.', $trashed, 'woocommerce' ), $trashed ) ); } + + if ( isset( $_GET['untrashed'] ) ) { + $untrashed = absint( $_GET['untrashed'] ); + + WC_Admin_Settings::add_message( sprintf( _n( '1 webhook restored from the Trash.', '%d webhooks restored from the Trash.', $untrashed, 'woocommerce' ), $untrashed ) ); + } + + if ( isset( $_GET['deleted'] ) ) { + $deleted = absint( $_GET['deleted'] ); + + WC_Admin_Settings::add_message( sprintf( _n( '1 webhook permanently deleted.', '%d webhooks permanently deleted.', $deleted, 'woocommerce' ), $deleted ) ); + } } /** @@ -65,6 +77,7 @@ class WC_Settings_Webhooks extends WC_Settings_Page { echo ''; echo ''; + $webhooks_table_list->views(); $webhooks_table_list->display(); } From a4dcc9261eb52e2918bda858d81d2506514916e2 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Tue, 6 Jan 2015 22:08:24 -0200 Subject: [PATCH 05/14] Hide the old webhooks menu --- includes/admin/class-wc-admin-menus.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/includes/admin/class-wc-admin-menus.php b/includes/admin/class-wc-admin-menus.php index f8b81083220..622cb3e90d5 100644 --- a/includes/admin/class-wc-admin-menus.php +++ b/includes/admin/class-wc-admin-menus.php @@ -27,7 +27,6 @@ class WC_Admin_Menus { add_action( 'admin_menu', array( $this, 'admin_menu' ), 9 ); add_action( 'admin_menu', array( $this, 'reports_menu' ), 20 ); add_action( 'admin_menu', array( $this, 'settings_menu' ), 50 ); - add_action( 'admin_menu', array( $this, 'webhooks_menu' ), 55 ); add_action( 'admin_menu', array( $this, 'status_menu' ), 60 ); if ( apply_filters( 'woocommerce_show_addons_page', true ) ) { @@ -75,15 +74,6 @@ class WC_Admin_Menus { add_action( 'load-' . $settings_page, array( $this, 'settings_page_init' ) ); } - /** - * Add webhook item - */ - public function webhooks_menu() { - if ( apply_filters( 'woocommerce_show_webhooks_menu', 'yes' == get_option( 'woocommerce_api_enabled' ) ) ) { - add_submenu_page( 'woocommerce', __( 'Webhooks', 'woocommerce' ), __( 'Webhooks', 'woocommerce' ), 'manage_woocommerce', 'edit.php?post_type=shop_webhook' ); - } - } - /** * Loads gateways and shipping methods into memory for use within settings. */ @@ -113,7 +103,7 @@ class WC_Admin_Menus { public function menu_highlight() { global $menu, $submenu, $parent_file, $submenu_file, $self, $post_type, $taxonomy; - $to_highlight_types = array( 'shop_order', 'shop_coupon', 'shop_webhook' ); + $to_highlight_types = array( 'shop_order', 'shop_coupon' ); if ( isset( $post_type ) ) { if ( in_array( $post_type, $to_highlight_types ) ) { From 03193b867b552c401867ce43641e6963e60e8151 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Thu, 8 Jan 2015 16:34:30 -0200 Subject: [PATCH 06/14] Creted new webhooks edit interface --- assets/js/admin/meta-boxes-webhook.js | 16 - assets/js/admin/meta-boxes-webhook.min.js | 1 - includes/admin/class-wc-admin-assets.php | 3 - includes/admin/class-wc-admin-meta-boxes.php | 13 +- includes/admin/class-wc-admin-post-types.php | 14 - .../class-wc-admin-webhooks-table-list.php | 4 +- .../class-wc-meta-box-webhook-actions.php | 75 ----- .../class-wc-meta-box-webhook-data.php | 297 ------------------ .../class-wc-meta-box-webhook-logs.php | 97 ------ .../admin/settings/class-wc-settings-tax.php | 4 +- .../settings/class-wc-settings-webhooks.php | 213 ++++++++++++- .../{ => views}/html-settings-tax.php | 0 .../views/html-webhook-log.php | 0 .../views/html-webhook-logs.php | 6 +- .../settings/views/html-webhooks-edit.php | 175 +++++++++++ .../settings/{ => views}/settings-tax.php | 0 includes/admin/wc-admin-functions.php | 4 +- 17 files changed, 393 insertions(+), 529 deletions(-) delete mode 100644 assets/js/admin/meta-boxes-webhook.js delete mode 100644 assets/js/admin/meta-boxes-webhook.min.js delete mode 100644 includes/admin/meta-boxes/class-wc-meta-box-webhook-actions.php delete mode 100644 includes/admin/meta-boxes/class-wc-meta-box-webhook-data.php delete mode 100644 includes/admin/meta-boxes/class-wc-meta-box-webhook-logs.php rename includes/admin/settings/{ => views}/html-settings-tax.php (100%) rename includes/admin/{meta-boxes => settings}/views/html-webhook-log.php (100%) rename includes/admin/{meta-boxes => settings}/views/html-webhook-logs.php (82%) create mode 100644 includes/admin/settings/views/html-webhooks-edit.php rename includes/admin/settings/{ => views}/settings-tax.php (100%) diff --git a/assets/js/admin/meta-boxes-webhook.js b/assets/js/admin/meta-boxes-webhook.js deleted file mode 100644 index bd2748ebe18..00000000000 --- a/assets/js/admin/meta-boxes-webhook.js +++ /dev/null @@ -1,16 +0,0 @@ -jQuery( function ( $ ) { - $( '#webhook-options #topic' ).on( 'change', function() { - var current = $( this ).val(), - action_event_field = $( '#webhook-options .action_event_field' ), - custom_topic_field = $( '#webhook-options .custom_topic_field' ); - - action_event_field.hide(); - custom_topic_field.hide(); - - if ( 'action' === current ) { - action_event_field.show(); - } else if ( 'custom' === current ) { - custom_topic_field.show(); - } - }).change(); -}); diff --git a/assets/js/admin/meta-boxes-webhook.min.js b/assets/js/admin/meta-boxes-webhook.min.js deleted file mode 100644 index a09261dd0fc..00000000000 --- a/assets/js/admin/meta-boxes-webhook.min.js +++ /dev/null @@ -1 +0,0 @@ -jQuery(function(a){a("#webhook-options #topic").on("change",function(){var b=a(this).val(),c=a("#webhook-options .action_event_field"),d=a("#webhook-options .custom_topic_field");c.hide(),d.hide(),"action"===b?c.show():"custom"===b&&d.show()}).change()}); \ No newline at end of file diff --git a/includes/admin/class-wc-admin-assets.php b/includes/admin/class-wc-admin-assets.php index a4463ccd717..6e1dea0727f 100644 --- a/includes/admin/class-wc-admin-assets.php +++ b/includes/admin/class-wc-admin-assets.php @@ -196,9 +196,6 @@ class WC_Admin_Assets { if ( in_array( $screen->id, array( 'shop_coupon', 'edit-shop_coupon' ) ) ) { wp_enqueue_script( 'wc-admin-coupon-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-coupon' . $suffix . '.js', array( 'wc-admin-meta-boxes' ), WC_VERSION ); } - if ( 'shop_webhook' == $screen->id ) { - wp_enqueue_script( 'wc-admin-webhook-meta-boxes', WC()->plugin_url() . '/assets/js/admin/meta-boxes-webhook' . $suffix . '.js', array( 'jquery' ), WC_VERSION, true ); - } if ( in_array( str_replace( 'edit-', '', $screen->id ), array_merge( array( 'shop_coupon', 'product' ), wc_get_order_types( 'order-meta-boxes' ) ) ) ) { $params = array( 'remove_item_notice' => __( 'Are you sure you want to remove the selected items? If you have previously reduced this item\'s stock, or this order was submitted by a customer, you will need to manually restore the item\'s stock.', 'woocommerce' ), diff --git a/includes/admin/class-wc-admin-meta-boxes.php b/includes/admin/class-wc-admin-meta-boxes.php index 01cd6e77b5a..7b8e3992e76 100644 --- a/includes/admin/class-wc-admin-meta-boxes.php +++ b/includes/admin/class-wc-admin-meta-boxes.php @@ -55,9 +55,6 @@ class WC_Admin_Meta_Boxes { // Save Rating Meta Boxes add_action( 'comment_edit_redirect', 'WC_Meta_Box_Order_Reviews::save', 1, 2 ); - // Save Webhook Meta Boxes - add_action( 'woocommerce_process_shop_webhook_meta', 'WC_Meta_Box_Webhook_Data::save', 10 ); - // Error handling (for showing errors from meta boxes on next page load) add_action( 'admin_notices', array( $this, 'output_errors' ) ); add_action( 'shutdown', array( $this, 'save_errors' ) ); @@ -127,11 +124,6 @@ class WC_Admin_Meta_Boxes { add_meta_box( 'woocommerce-rating', __( 'Rating', 'woocommerce' ), 'WC_Meta_Box_Order_Reviews::output', 'comment', 'normal', 'high' ); } } - - // Webhook - add_meta_box( 'woocommerce-webhook-data', __( 'Webhook Data', 'woocommerce' ), 'WC_Meta_Box_Webhook_Data::output', 'shop_webhook', 'normal', 'high' ); - add_meta_box( 'woocommerce-webhook-actions', __( 'Webhook Actions', 'woocommerce' ), 'WC_Meta_Box_Webhook_Actions::output', 'shop_webhook', 'side', 'high' ); - add_meta_box( 'woocommerce-webhook-logs', __( 'Webhook Logs', 'woocommerce' ), 'WC_Meta_Box_Webhook_Logs::output', 'shop_webhook', 'normal', 'low' ); } /** @@ -146,9 +138,6 @@ class WC_Admin_Meta_Boxes { remove_meta_box( 'woothemes-settings', 'shop_coupon' , 'normal' ); remove_meta_box( 'commentstatusdiv', 'shop_coupon' , 'normal' ); remove_meta_box( 'slugdiv', 'shop_coupon' , 'normal' ); - remove_meta_box( 'submitdiv', 'shop_webhook' , 'side' ); - remove_meta_box( 'slugdiv', 'shop_webhook' , 'normal' ); - remove_meta_box( 'commentstatusdiv', 'shop_webhook' , 'normal' ); foreach ( wc_get_order_types( 'order-meta-boxes' ) as $type ) { remove_meta_box( 'commentsdiv', $type, 'normal' ); @@ -207,7 +196,7 @@ class WC_Admin_Meta_Boxes { // Check the post type if ( in_array( $post->post_type, wc_get_order_types( 'order-meta-boxes' ) ) ) { do_action( 'woocommerce_process_shop_order_meta', $post_id, $post ); - } elseif ( in_array( $post->post_type, array( 'product', 'shop_coupon', 'shop_webhook' ) ) ) { + } elseif ( in_array( $post->post_type, array( 'product', 'shop_coupon' ) ) ) { do_action( 'woocommerce_process_' . $post->post_type . '_meta', $post_id, $post ); } } diff --git a/includes/admin/class-wc-admin-post-types.php b/includes/admin/class-wc-admin-post-types.php index 4aa8773a354..3d4f34192dc 100644 --- a/includes/admin/class-wc-admin-post-types.php +++ b/includes/admin/class-wc-admin-post-types.php @@ -1753,20 +1753,6 @@ class WC_Admin_Post_Types { 10 => __( 'Coupon draft updated.', 'woocommerce' ) ); - $messages['shop_webhook'] = array( - 0 => '', // Unused. Messages start at index 1. - 1 => __( 'Webhook saved.', 'woocommerce' ), - 2 => __( 'Custom field updated.', 'woocommerce' ), - 3 => __( 'Custom field deleted.', 'woocommerce' ), - 4 => __( 'Webhook saved.', 'woocommerce' ), - 5 => '', - 6 => __( 'Webhook saved.', 'woocommerce' ), - 7 => __( 'Webhook saved.', 'woocommerce' ), - 8 => __( 'Webhook saved.', 'woocommerce' ), - 9 => '', - 10 => __( 'Webhook saved.', 'woocommerce' ) - ); - return $messages; } diff --git a/includes/admin/class-wc-admin-webhooks-table-list.php b/includes/admin/class-wc-admin-webhooks-table-list.php index e7d318dd50c..56a5314fc2d 100644 --- a/includes/admin/class-wc-admin-webhooks-table-list.php +++ b/includes/admin/class-wc-admin-webhooks-table-list.php @@ -76,7 +76,7 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table { switch ( $column_name ) { case 'title' : - $edit_link = get_edit_post_link( $the_webhook->id ); + $edit_link = admin_url( 'admin.php?page=wc-settings&tab=webhooks&edit-webhook=' . $the_webhook->id ); $title = _draft_or_post_title( $the_webhook->post_data ); $post_type_object = get_post_type_object( $the_webhook->post_data->post_type ); @@ -88,7 +88,7 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table { $actions['id'] = sprintf( __( 'ID: %d', 'woocommerce' ), $the_webhook->id ); if ( current_user_can( $post_type_object->cap->edit_post, $the_webhook->id ) ) { - $actions['edit'] = '' . __( 'Edit', 'woocommerce' ) . ''; + $actions['edit'] = '' . __( 'Edit', 'woocommerce' ) . ''; } if ( current_user_can( $post_type_object->cap->delete_post, $the_webhook->id ) ) { diff --git a/includes/admin/meta-boxes/class-wc-meta-box-webhook-actions.php b/includes/admin/meta-boxes/class-wc-meta-box-webhook-actions.php deleted file mode 100644 index 79035a31b66..00000000000 --- a/includes/admin/meta-boxes/class-wc-meta-box-webhook-actions.php +++ /dev/null @@ -1,75 +0,0 @@ - - - - post_modified_gmt ) : ?> -
    - post_date_gmt ) : ?> -
  • - : post_modified_gmt ); ?> -
    • - -
  • - : post_date_gmt ); ?> -
    • -
  • - : post_modified_gmt ); ?> -
    • - -
- - -
-
- ID ) ) : ?> -
-
- - -
- - -
-
-
-
- get_topic(); - $event = ''; - $resource = ''; - - if ( $topic ) { - list( $resource, $event ) = explode( '.', $topic ); - - if ( 'action' === $resource ) { - $topic = 'action'; - } else if ( ! in_array( $resource, array( 'coupon', 'customer', 'order', 'product' ) ) ) { - $topic = 'custom'; - } - } - - return array( - 'topic' => $topic, - 'event' => $event, - 'resource' => $resource - ); - } - - /** - * Output the metabox - */ - public static function output( $post ) { - wp_nonce_field( 'woocommerce_save_data', 'woocommerce_meta_nonce' ); - $webhook = new WC_Webhook( $post->ID ); - ?> - - -
-
- 'name', - 'label' => __( 'Name', 'woocommerce' ), - 'description' => sprintf( __( 'Friendly name for identifying this webhook, defaults to Webhook created on %s.', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) ), - 'desc_tip' => true, - 'value' => ( 'auto-draft' == $post->post_status ) ? '' : $webhook->get_name() - ) ); - ?> -
- -
- 'status', - 'label' => __( 'Status', 'woocommerce' ), - 'description' => __( 'The options are "Active" (delivers payload), "Paused" (does not deliver), or "Disabled" (does not deliver due delivery failures).', 'woocommerce' ), - 'desc_tip' => true, - 'options' => wc_get_webhook_statuses(), - 'value' => $webhook->get_status() - ) ); - ?> -
- -
- 'topic', - 'label' => __( 'Topic', 'woocommerce' ), - 'description' => __( 'Select when the webhook will fire.', 'woocommerce' ), - 'desc_tip' => true, - 'options' => array( - '' => __( 'Select an option…', 'woocommerce' ), - 'coupon.created' => __( 'Coupon Created', 'woocommerce' ), - 'coupon.updated' => __( 'Coupon Updated', 'woocommerce' ), - 'coupon.deleted' => __( 'Coupon Deleted', 'woocommerce' ), - 'customer.created' => __( 'Customer Created', 'woocommerce' ), - 'customer.updated' => __( 'Customer Updated', 'woocommerce' ), - 'customer.deleted' => __( 'Customer Deleted', 'woocommerce' ), - 'order.created' => __( 'Order Created', 'woocommerce' ), - 'order.updated' => __( 'Order Updated', 'woocommerce' ), - 'order.deleted' => __( 'Order Deleted', 'woocommerce' ), - 'product.created' => __( 'Product Created', 'woocommerce' ), - 'product.updated' => __( 'Product Updated', 'woocommerce' ), - 'product.deleted' => __( 'Product Deleted', 'woocommerce' ), - 'action' => __( 'Action', 'woocommerce' ), - 'custom' => __( 'Custom', 'woocommerce' ) - ), - 'value' => $topic_data['topic'] - ) ); - - // Action - woocommerce_wp_text_input( array( - 'id' => 'action_event', - 'label' => __( 'Action Event', 'woocommerce' ), - 'description' => __( 'Enter the Action that will trigger this webhook.', 'woocommerce' ), - 'desc_tip' => true, - 'value' => $topic_data['event'] - ) ); - - // Custom Topic - woocommerce_wp_text_input( array( - 'id' => 'custom_topic', - 'label' => __( 'Custom Topic', 'woocommerce' ), - 'description' => __( 'Enter the Custom Topic that will trigger this webhook.', 'woocommerce' ), - 'desc_tip' => true, - 'value' => $webhook->get_topic() - ) ); - ?> -
- -
- 'delivery_url', - 'label' => __( 'Delivery URL', 'woocommerce' ), - 'description' => __( 'URL where the webhook payload is delivered.', 'woocommerce' ), - 'data_type' => 'url', - 'desc_tip' => true, - 'value' => $webhook->get_delivery_url() - ) ); - ?> -
- -
- 'secret', - 'label' => __( 'Secret', 'woocommerce' ), - 'description' => __( 'The a Secret Key is used to generate a hash of the delivered webhook and provided in the request headers. This will default to the current API user\'s consumer secret if not provided.', 'woocommerce' ), - 'desc_tip' => true, - 'value' => $webhook->get_secret() - ) ); - ?> -
- - - -
-
- update( $wpdb->posts, array( 'post_title' => $name ), array( 'ID' => $post_id ) ); - } - - /** - * Updated the Webhook status - * - * @param WC_Webhook $webhook - */ - private static function update_status( $webhook ) { - $status = ! empty( $_POST['status'] ) ? wc_clean( $_POST['status'] ) : ''; - - $webhook->update_status( $status ); - } - - /** - * Updated the Webhook delivery URL - * - * @param WC_Webhook $webhook - */ - private static function update_delivery_url( $webhook ) { - $delivery_url = ! empty( $_POST['delivery_url'] ) ? $_POST['delivery_url'] : ''; - - if ( wc_is_valid_url( $delivery_url ) ) { - $webhook->set_delivery_url( $delivery_url ); - } - } - - /** - * Updated the Webhook secret - * - * @param WC_Webhook $webhook - */ - private static function update_secret( $webhook ) { - $secret = ! empty( $_POST['secret'] ) ? $_POST['secret'] : get_user_meta( get_current_user_id(), 'woocommerce_api_consumer_secret', true ); - - $webhook->set_secret( $secret ); - } - - /** - * Updated the Webhook topic - * - * @param WC_Webhook $webhook - */ - private static function update_topic( $webhook ) { - if ( ! empty( $_POST['topic'] ) ) { - list( $resource, $event ) = explode( '.', wc_clean( $_POST['topic'] ) ); - - if ( 'action' === $resource ) { - $event = ! empty( $_POST['action_event'] ) ? wc_clean( $_POST['action_event'] ) : ''; - } else if ( ! in_array( $resource, array( 'coupon', 'customer', 'order', 'product' ) ) && ! empty( $_POST['custom_topic'] ) ) { - list( $resource, $event ) = explode( '.', wc_clean( $_POST['custom_topic'] ) ); - } - - $topic = $resource . '.' . $event; - - if ( wc_is_webhook_valid_topic( $topic ) ) { - $webhook->set_topic( $topic ); - } - } - } - - /** - * Set Webhook post data. - * - * @param int $post_id - */ - private static function set_post_data( $post_id ) { - global $wpdb; - - $password = uniqid( 'webhook_' ); - $password = strlen( $password ) > 20 ? substr( $password, 0, 20 ) : $password; - - $wpdb->update( - $wpdb->posts, - array( - 'post_password' => $password, - 'ping_status' => 'closed', - 'comment_status' => 'open' - ), - array( 'ID' => $post_id ) - ); - } - - /** - * Save meta box data - */ - public static function save( $post_id ) { - $webhook = new WC_Webhook( $post_id ); - - // Name - self::update_name( $post_id ); - - // Status - self::update_status( $webhook ); - - // Delivery URL - self::update_delivery_url( $webhook ); - - // Secret - self::update_secret( $webhook ); - - // Topic - self::update_topic( $webhook ); - - // Webhook Created - if ( isset( $_POST['original_post_status'] ) && 'auto-draft' === $_POST['original_post_status'] ) { - // Set Post data like ping status and password - self::set_post_data( $post_id ); - - // Ping webhook - $webhook->deliver_ping(); - } - - do_action( 'woocommerce_webhook_options_save', $post_id ); - } -} diff --git a/includes/admin/meta-boxes/class-wc-meta-box-webhook-logs.php b/includes/admin/meta-boxes/class-wc-meta-box-webhook-logs.php deleted file mode 100644 index 27cc771d849..00000000000 --- a/includes/admin/meta-boxes/class-wc-meta-box-webhook-logs.php +++ /dev/null @@ -1,97 +0,0 @@ -ID ); - - $current = isset( $_GET['log_page'] ) ? absint( $_GET['log_page'] ) : 1; - $args = array( - 'post_id' => $webhook->id, - 'status' => 'approve', - 'type' => 'webhook_delivery', - 'number' => self::$quantity - ); - - if ( 1 < $current ) { - $args['offset'] = ( $current - 1 ) * self::$quantity; - } - - remove_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_webhook_comments' ), 10, 1 ); - - $logs = get_comments( $args ); - - add_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_webhook_comments' ), 10, 1 ); - - if ( $logs ) { - include_once( 'views/html-webhook-logs.php' ); - } else { - echo '

' . __( 'This Webhook has no log yet.', 'woocommerce' ) . '

'; - } - } - - /** - * Get the logs navigation. - * - * @param int $total - * - * @return string - */ - public static function get_navigation( $total ) { - global $post; - - $pages = ceil( $total / self::$quantity ); - $current = isset( $_GET['log_page'] ) ? absint( $_GET['log_page'] ) : 1; - - $html = '
'; - - $html .= '

'; - $html .= sprintf( '%s – Page %d of %d', _n( '1 item', sprintf( '%d items', $total ), $total, 'woocommerce' ), $current, $pages ); - $html .= '

'; - - if ( 1 < $pages ) { - $html .= '

'; - if ( 1 == $current ) { - $html .= ' '; - } else { - $html .= '' . __( '‹ Previous', 'woocommerce' ) . ' '; - } - - if ( $pages == $current ) { - $html .= ''; - } else { - $html .= '' . __( 'Next ›', 'woocommerce' ) . ''; - } - $html .= '

'; - } - - $html .= '
'; - - return $html; - } -} diff --git a/includes/admin/settings/class-wc-settings-tax.php b/includes/admin/settings/class-wc-settings-tax.php index 371d6a0352c..9af4e6359a8 100644 --- a/includes/admin/settings/class-wc-settings-tax.php +++ b/includes/admin/settings/class-wc-settings-tax.php @@ -63,7 +63,7 @@ class WC_Settings_Tax extends WC_Settings_Page { $classes_options[ sanitize_title( $class ) ] = esc_html( $class ); } - return apply_filters( 'woocommerce_get_settings_' . $this->id, include( 'settings-tax.php' ) ); + return apply_filters( 'woocommerce_get_settings_' . $this->id, include( 'views/settings-tax.php' ) ); } /** @@ -110,7 +110,7 @@ class WC_Settings_Tax extends WC_Settings_Page { $limit = 100; $current_class = $this->get_current_tax_class(); - include( 'html-settings-tax.php' ); + include( 'views/html-settings-tax.php' ); } /** diff --git a/includes/admin/settings/class-wc-settings-webhooks.php b/includes/admin/settings/class-wc-settings-webhooks.php index 9240aa0ef48..c28cf78956b 100644 --- a/includes/admin/settings/class-wc-settings-webhooks.php +++ b/includes/admin/settings/class-wc-settings-webhooks.php @@ -41,13 +41,17 @@ class WC_Settings_Webhooks extends WC_Settings_Page { * @return string */ public function form_method( $method ) { + if ( isset( $_GET['edit-webhook'] ) ) { + return 'post'; + } + return 'get'; } /** * Notices. */ - protected function notices() { + private function notices() { if ( isset( $_GET['trashed'] ) ) { $trashed = absint( $_GET['trashed'] ); @@ -70,7 +74,7 @@ class WC_Settings_Webhooks extends WC_Settings_Page { /** * Table list output */ - protected function table_list_output() { + private function table_list_output() { $webhooks_table_list = new WC_Admin_Webhooks_Table_List(); $webhooks_table_list->prepare_items(); @@ -81,6 +85,47 @@ class WC_Settings_Webhooks extends WC_Settings_Page { $webhooks_table_list->display(); } + /** + * Edit webhook output + */ + private function edit_output() { + $webhook_id = absint( $_GET['edit-webhook'] ); + $webhook = new WC_Webhook( $webhook_id ); + + include_once( 'views/html-webhooks-edit.php' ); + } + + /** + * Logs output + * + * @param WC_Webhook $webhook + */ + private function logs_output( $webhook ) { + $current = isset( $_GET['log_page'] ) ? absint( $_GET['log_page'] ) : 1; + $args = array( + 'post_id' => $webhook->id, + 'status' => 'approve', + 'type' => 'webhook_delivery', + 'number' => 10 + ); + + if ( 1 < $current ) { + $args['offset'] = ( $current - 1 ) * 10; + } + + remove_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_webhook_comments' ), 10, 1 ); + + $logs = get_comments( $args ); + + add_filter( 'comments_clauses', array( 'WC_Comments', 'exclude_webhook_comments' ), 10, 1 ); + + if ( $logs ) { + include_once( 'views/html-webhook-logs.php' ); + } else { + echo '

' . __( 'This Webhook has no log yet.', 'woocommerce' ) . '

'; + } + } + /** * Output the settings */ @@ -90,8 +135,168 @@ class WC_Settings_Webhooks extends WC_Settings_Page { // Hide the save button $GLOBALS['hide_save_button'] = true; - // Display the table list. - $this->table_list_output(); + if ( isset( $_GET['edit-webhook'] ) ) { + $this->edit_output(); + } else { + $this->table_list_output(); + } + } + + /** + * Get the webhook topic data + * + * @return array + */ + private function get_topic_data( $webhook ) { + $topic = $webhook->get_topic(); + $event = ''; + $resource = ''; + + if ( $topic ) { + list( $resource, $event ) = explode( '.', $topic ); + + if ( 'action' === $resource ) { + $topic = 'action'; + } else if ( ! in_array( $resource, array( 'coupon', 'customer', 'order', 'product' ) ) ) { + $topic = 'custom'; + } + } + + return array( + 'topic' => $topic, + 'event' => $event, + 'resource' => $resource + ); + } + + /** + * Updated the Webhook name + * + * @param int $webhook_id + */ + private function update_name( $webhook_id ) { + global $wpdb; + + $name = ! empty( $_POST['webhook_name'] ) ? $_POST['webhook_name'] : sprintf( __( 'Webhook created on %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) ); + $wpdb->update( $wpdb->posts, array( 'post_title' => $name ), array( 'ID' => $webhook_id ) ); + } + + /** + * Updated the Webhook status + * + * @param WC_Webhook $webhook + */ + private function update_status( $webhook ) { + $status = ! empty( $_POST['webhook_status'] ) ? wc_clean( $_POST['webhook_status'] ) : ''; + + $webhook->update_status( $status ); + } + + /** + * Updated the Webhook delivery URL + * + * @param WC_Webhook $webhook + */ + private function update_delivery_url( $webhook ) { + $delivery_url = ! empty( $_POST['webhook_delivery_url'] ) ? $_POST['webhook_delivery_url'] : ''; + + if ( wc_is_valid_url( $delivery_url ) ) { + $webhook->set_delivery_url( $delivery_url ); + } + } + + /** + * Updated the Webhook secret + * + * @param WC_Webhook $webhook + */ + private function update_secret( $webhook ) { + $secret = ! empty( $_POST['webhook_secret'] ) ? $_POST['webhook_secret'] : get_user_meta( get_current_user_id(), 'woocommerce_api_consumer_secret', true ); + + $webhook->set_secret( $secret ); + } + + /** + * Updated the Webhook topic + * + * @param WC_Webhook $webhook + */ + private function update_topic( $webhook ) { + if ( ! empty( $_POST['webhook_topic'] ) ) { + list( $resource, $event ) = explode( '.', wc_clean( $_POST['webhook_topic'] ) ); + + if ( 'action' === $resource ) { + $event = ! empty( $_POST['webhook_action_event'] ) ? wc_clean( $_POST['webhook_action_event'] ) : ''; + } else if ( ! in_array( $resource, array( 'coupon', 'customer', 'order', 'product' ) ) && ! empty( $_POST['webhook_custom_topic'] ) ) { + list( $resource, $event ) = explode( '.', wc_clean( $_POST['webhook_custom_topic'] ) ); + } + + $topic = $resource . '.' . $event; + + if ( wc_is_webhook_valid_topic( $topic ) ) { + $webhook->set_topic( $topic ); + } + } + } + + /** + * Set Webhook post data. + * + * @param int $webhook_id + */ + private function set_post_data( $webhook_id ) { + global $wpdb; + + $password = uniqid( 'webhook_' ); + $password = strlen( $password ) > 20 ? substr( $password, 0, 20 ) : $password; + + $wpdb->update( + $wpdb->posts, + array( + 'post_password' => $password, + 'ping_status' => 'closed', + 'comment_status' => 'open' + ), + array( 'ID' => $webhook_id ) + ); + } + + /** + * Get the logs navigation. + * + * @param int $total + * + * @return string + */ + private function get_logs_navigation( $total, $webhook ) { + $pages = ceil( $total / 10 ); + $current = isset( $_GET['log_page'] ) ? absint( $_GET['log_page'] ) : 1; + + $html = '
'; + + $html .= '

'; + $html .= sprintf( '%s – Page %d of %d', _n( '1 item', sprintf( '%d items', $total ), $total, 'woocommerce' ), $current, $pages ); + $html .= '

'; + + if ( 1 < $pages ) { + $html .= '

'; + if ( 1 == $current ) { + $html .= ' '; + } else { + $html .= '' . __( '‹ Previous', 'woocommerce' ) . ' '; + } + + if ( $pages == $current ) { + $html .= ''; + } else { + $html .= '' . __( 'Next ›', 'woocommerce' ) . ''; + } + $html .= '

'; + } + + $html .= '
'; + + return $html; } } diff --git a/includes/admin/settings/html-settings-tax.php b/includes/admin/settings/views/html-settings-tax.php similarity index 100% rename from includes/admin/settings/html-settings-tax.php rename to includes/admin/settings/views/html-settings-tax.php diff --git a/includes/admin/meta-boxes/views/html-webhook-log.php b/includes/admin/settings/views/html-webhook-log.php similarity index 100% rename from includes/admin/meta-boxes/views/html-webhook-log.php rename to includes/admin/settings/views/html-webhook-log.php diff --git a/includes/admin/meta-boxes/views/html-webhook-logs.php b/includes/admin/settings/views/html-webhook-logs.php similarity index 82% rename from includes/admin/meta-boxes/views/html-webhook-logs.php rename to includes/admin/settings/views/html-webhook-logs.php index ff9a7580a77..7884c23843e 100644 --- a/includes/admin/meta-boxes/views/html-webhook-logs.php +++ b/includes/admin/settings/views/html-webhook-logs.php @@ -9,9 +9,9 @@ $total = $count_comments->approved; ?> - +get_logs_navigation( $total, $webhook ); ?> - +
@@ -39,4 +39,4 @@ $total = $count_comments->approved;
- +get_logs_navigation( $total, $webhook ); ?> diff --git a/includes/admin/settings/views/html-webhooks-edit.php b/includes/admin/settings/views/html-webhooks-edit.php new file mode 100644 index 00000000000..e5d69789fd2 --- /dev/null +++ b/includes/admin/settings/views/html-webhooks-edit.php @@ -0,0 +1,175 @@ + + + + +
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ + " src="plugin_url(); ?>/assets/images/help.png" height="16" width="16" /> + + +
+ + + + +
+ + + + +
+ + + + +
+ + + + +
+ + + + +
+ + +
+ +
+

+ + + post_data->post_modified_gmt ) : ?> + post_data->post_date_gmt ) : ?> + + + + + + + + + + + + + + + + +
+ + + post_data->post_modified_gmt ) ); ?> +
+ + + post_data->post_date_gmt ) ); ?> +
+ + + post_data->post_modified_gmt ) ); ?> +
+
+ +
+

+ + logs_output( $webhook ); ?> +
+ + diff --git a/includes/admin/settings/settings-tax.php b/includes/admin/settings/views/settings-tax.php similarity index 100% rename from includes/admin/settings/settings-tax.php rename to includes/admin/settings/views/settings-tax.php diff --git a/includes/admin/wc-admin-functions.php b/includes/admin/wc-admin-functions.php index fbcee3ec605..c33ebedea6c 100644 --- a/includes/admin/wc-admin-functions.php +++ b/includes/admin/wc-admin-functions.php @@ -34,9 +34,7 @@ function wc_get_screen_ids() { 'edit-product_cat', 'edit-product_tag', 'edit-product_shipping_class', - 'profile', - 'shop_webhook', - 'edit-shop_webhook' + 'profile' ); foreach ( wc_get_order_types() as $type ) { From ba538ec36c412d9c48ba5b62790d92e496b09e03 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Thu, 8 Jan 2015 16:38:30 -0200 Subject: [PATCH 07/14] Disabled the shop_webhook show_ui option --- includes/class-wc-post-types.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/class-wc-post-types.php b/includes/class-wc-post-types.php index 1a58596743a..8110fc3083d 100644 --- a/includes/class-wc-post-types.php +++ b/includes/class-wc-post-types.php @@ -386,7 +386,7 @@ class WC_Post_types { 'parent' => __( 'Parent Webhook', 'woocommerce' ) ), 'public' => false, - 'show_ui' => true, + 'show_ui' => false, 'capability_type' => 'shop_webhook', 'map_meta_cap' => true, 'publicly_queryable' => false, From 262627578252ea80a66f73974c0aca0ff90d5c25 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Fri, 9 Jan 2015 15:42:01 -0200 Subject: [PATCH 08/14] Edit and deleted webhooks --- .../class-wc-admin-webhooks-table-list.php | 2 +- includes/admin/class-wc-admin-webhooks.php | 171 ++++++++++++++++++ includes/admin/class-wc-admin.php | 1 + .../settings/class-wc-settings-webhooks.php | 124 +++---------- .../settings/views/html-webhooks-edit.php | 14 +- 5 files changed, 209 insertions(+), 103 deletions(-) create mode 100644 includes/admin/class-wc-admin-webhooks.php diff --git a/includes/admin/class-wc-admin-webhooks-table-list.php b/includes/admin/class-wc-admin-webhooks-table-list.php index 56a5314fc2d..ce62dfb9ebe 100644 --- a/includes/admin/class-wc-admin-webhooks-table-list.php +++ b/includes/admin/class-wc-admin-webhooks-table-list.php @@ -87,7 +87,7 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table { $actions['id'] = sprintf( __( 'ID: %d', 'woocommerce' ), $the_webhook->id ); - if ( current_user_can( $post_type_object->cap->edit_post, $the_webhook->id ) ) { + if ( current_user_can( $post_type_object->cap->edit_post, $the_webhook->id ) && 'trash' !== $the_webhook->post_data->post_status ) { $actions['edit'] = '' . __( 'Edit', 'woocommerce' ) . ''; } diff --git a/includes/admin/class-wc-admin-webhooks.php b/includes/admin/class-wc-admin-webhooks.php new file mode 100644 index 00000000000..3fae092f889 --- /dev/null +++ b/includes/admin/class-wc-admin-webhooks.php @@ -0,0 +1,171 @@ +update( $wpdb->posts, array( 'post_title' => $name ), array( 'ID' => $webhook_id ) ); + } + + /** + * Updated the Webhook status + * + * @param WC_Webhook $webhook + */ + private function update_status( $webhook ) { + $status = ! empty( $_POST['webhook_status'] ) ? wc_clean( $_POST['webhook_status'] ) : ''; + + $webhook->update_status( $status ); + } + + /** + * Updated the Webhook delivery URL + * + * @param WC_Webhook $webhook + */ + private function update_delivery_url( $webhook ) { + $delivery_url = ! empty( $_POST['webhook_delivery_url'] ) ? $_POST['webhook_delivery_url'] : ''; + + if ( wc_is_valid_url( $delivery_url ) ) { + $webhook->set_delivery_url( $delivery_url ); + } + } + + /** + * Updated the Webhook secret + * + * @param WC_Webhook $webhook + */ + private function update_secret( $webhook ) { + $secret = ! empty( $_POST['webhook_secret'] ) ? $_POST['webhook_secret'] : get_user_meta( get_current_user_id(), 'woocommerce_api_consumer_secret', true ); + + $webhook->set_secret( $secret ); + } + + /** + * Updated the Webhook topic + * + * @param WC_Webhook $webhook + */ + private function update_topic( $webhook ) { + if ( ! empty( $_POST['webhook_topic'] ) ) { + list( $resource, $event ) = explode( '.', wc_clean( $_POST['webhook_topic'] ) ); + + if ( 'action' === $resource ) { + $event = ! empty( $_POST['webhook_action_event'] ) ? wc_clean( $_POST['webhook_action_event'] ) : ''; + } else if ( ! in_array( $resource, array( 'coupon', 'customer', 'order', 'product' ) ) && ! empty( $_POST['webhook_custom_topic'] ) ) { + list( $resource, $event ) = explode( '.', wc_clean( $_POST['webhook_custom_topic'] ) ); + } + + $topic = $resource . '.' . $event; + + if ( wc_is_webhook_valid_topic( $topic ) ) { + $webhook->set_topic( $topic ); + } + } + } + + /** + * Set Webhook post data. + * + * @param int $webhook_id + */ + private function set_post_data( $webhook_id ) { + global $wpdb; + + $password = uniqid( 'webhook_' ); + $password = strlen( $password ) > 20 ? substr( $password, 0, 20 ) : $password; + + $wpdb->update( + $wpdb->posts, + array( + 'post_password' => $password, + 'ping_status' => 'closed', + 'comment_status' => 'open' + ), + array( 'ID' => $webhook_id ) + ); + } + + /** + * Save method + */ + public function save() { + if ( isset( $_GET['page'] ) && 'wc-settings' == $_GET['page'] && isset( $_GET['tab'] ) && 'webhooks' == $_GET['tab'] && isset( $_POST['save'] ) && isset( $_POST['webhook_id'] ) ) { + + if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'woocommerce-settings' ) ) { + die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) ); + } + + $webhook_id = absint( $_POST['webhook_id'] ); + + if ( ! current_user_can( 'edit_shop_webhook', $webhook_id ) ) { + return; + } + + $webhook = new WC_Webhook( $webhook_id ); + + // Name + $this->update_name( $webhook->id ); + + // Status + $this->update_status( $webhook ); + + // Delivery URL + $this->update_delivery_url( $webhook ); + + // Secret + $this->update_secret( $webhook ); + + // Topic + $this->update_topic( $webhook ); + + // Webhook Created + if ( isset( $_POST['original_post_status'] ) && 'auto-draft' === $_POST['original_post_status'] ) { + // Set Post data like ping status and password + $this->set_post_data( $webhook->id ); + + // Ping webhook + $webhook->deliver_ping(); + } + + do_action( 'woocommerce_webhook_options_save', $webhook->id ); + + // Redirect to webhook edit page to avoid settings save actions + wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=webhooks&edit-webhook=' . $webhook->id . '&updated=1' ) ); + exit(); + } + } +} + +new WC_Admin_Webhooks(); diff --git a/includes/admin/class-wc-admin.php b/includes/admin/class-wc-admin.php index fed4d57db39..13c6c46a768 100644 --- a/includes/admin/class-wc-admin.php +++ b/includes/admin/class-wc-admin.php @@ -47,6 +47,7 @@ class WC_Admin { include( 'class-wc-admin-welcome.php' ); include( 'class-wc-admin-notices.php' ); include( 'class-wc-admin-assets.php' ); + include( 'class-wc-admin-webhooks.php' ); // Help if ( apply_filters( 'woocommerce_enable_admin_help_tab', true ) ) { diff --git a/includes/admin/settings/class-wc-settings-webhooks.php b/includes/admin/settings/class-wc-settings-webhooks.php index c28cf78956b..40464e3f985 100644 --- a/includes/admin/settings/class-wc-settings-webhooks.php +++ b/includes/admin/settings/class-wc-settings-webhooks.php @@ -42,7 +42,12 @@ class WC_Settings_Webhooks extends WC_Settings_Page { */ public function form_method( $method ) { if ( isset( $_GET['edit-webhook'] ) ) { - return 'post'; + $webhook_id = absint( $_GET['edit-webhook'] ); + $webhook = new WC_Webhook( $webhook_id ); + + if ( 'trash' != $webhook->post_data->post_status ) { + return 'post'; + } } return 'get'; @@ -69,6 +74,12 @@ class WC_Settings_Webhooks extends WC_Settings_Page { WC_Admin_Settings::add_message( sprintf( _n( '1 webhook permanently deleted.', '%d webhooks permanently deleted.', $deleted, 'woocommerce' ), $deleted ) ); } + + if ( isset( $_GET['updated'] ) ) { + $updated = absint( $_GET['updated'] ); + + WC_Admin_Settings::add_message( __( 'Webhook saved successfully.', 'woocommerce' ) ); + } } /** @@ -87,11 +98,10 @@ class WC_Settings_Webhooks extends WC_Settings_Page { /** * Edit webhook output + * + * @param WC_Webhook $webhook */ - private function edit_output() { - $webhook_id = absint( $_GET['edit-webhook'] ); - $webhook = new WC_Webhook( $webhook_id ); - + private function edit_output( $webhook ) { include_once( 'views/html-webhooks-edit.php' ); } @@ -136,10 +146,16 @@ class WC_Settings_Webhooks extends WC_Settings_Page { $GLOBALS['hide_save_button'] = true; if ( isset( $_GET['edit-webhook'] ) ) { - $this->edit_output(); - } else { - $this->table_list_output(); + $webhook_id = absint( $_GET['edit-webhook'] ); + $webhook = new WC_Webhook( $webhook_id ); + + if ( 'trash' != $webhook->post_data->post_status ) { + $this->edit_output( $webhook ); + return; + } } + + $this->table_list_output(); } /** @@ -169,98 +185,6 @@ class WC_Settings_Webhooks extends WC_Settings_Page { ); } - /** - * Updated the Webhook name - * - * @param int $webhook_id - */ - private function update_name( $webhook_id ) { - global $wpdb; - - $name = ! empty( $_POST['webhook_name'] ) ? $_POST['webhook_name'] : sprintf( __( 'Webhook created on %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) ); - $wpdb->update( $wpdb->posts, array( 'post_title' => $name ), array( 'ID' => $webhook_id ) ); - } - - /** - * Updated the Webhook status - * - * @param WC_Webhook $webhook - */ - private function update_status( $webhook ) { - $status = ! empty( $_POST['webhook_status'] ) ? wc_clean( $_POST['webhook_status'] ) : ''; - - $webhook->update_status( $status ); - } - - /** - * Updated the Webhook delivery URL - * - * @param WC_Webhook $webhook - */ - private function update_delivery_url( $webhook ) { - $delivery_url = ! empty( $_POST['webhook_delivery_url'] ) ? $_POST['webhook_delivery_url'] : ''; - - if ( wc_is_valid_url( $delivery_url ) ) { - $webhook->set_delivery_url( $delivery_url ); - } - } - - /** - * Updated the Webhook secret - * - * @param WC_Webhook $webhook - */ - private function update_secret( $webhook ) { - $secret = ! empty( $_POST['webhook_secret'] ) ? $_POST['webhook_secret'] : get_user_meta( get_current_user_id(), 'woocommerce_api_consumer_secret', true ); - - $webhook->set_secret( $secret ); - } - - /** - * Updated the Webhook topic - * - * @param WC_Webhook $webhook - */ - private function update_topic( $webhook ) { - if ( ! empty( $_POST['webhook_topic'] ) ) { - list( $resource, $event ) = explode( '.', wc_clean( $_POST['webhook_topic'] ) ); - - if ( 'action' === $resource ) { - $event = ! empty( $_POST['webhook_action_event'] ) ? wc_clean( $_POST['webhook_action_event'] ) : ''; - } else if ( ! in_array( $resource, array( 'coupon', 'customer', 'order', 'product' ) ) && ! empty( $_POST['webhook_custom_topic'] ) ) { - list( $resource, $event ) = explode( '.', wc_clean( $_POST['webhook_custom_topic'] ) ); - } - - $topic = $resource . '.' . $event; - - if ( wc_is_webhook_valid_topic( $topic ) ) { - $webhook->set_topic( $topic ); - } - } - } - - /** - * Set Webhook post data. - * - * @param int $webhook_id - */ - private function set_post_data( $webhook_id ) { - global $wpdb; - - $password = uniqid( 'webhook_' ); - $password = strlen( $password ) > 20 ? substr( $password, 0, 20 ) : $password; - - $wpdb->update( - $wpdb->posts, - array( - 'post_password' => $password, - 'ping_status' => 'closed', - 'comment_status' => 'open' - ), - array( 'ID' => $webhook_id ) - ); - } - /** * Get the logs navigation. * diff --git a/includes/admin/settings/views/html-webhooks-edit.php b/includes/admin/settings/views/html-webhooks-edit.php index e5d69789fd2..72c093a923a 100644 --- a/includes/admin/settings/views/html-webhooks-edit.php +++ b/includes/admin/settings/views/html-webhooks-edit.php @@ -112,8 +112,8 @@ if ( ! defined( 'ABSPATH' ) ) {

-
-

+
+

post_data->post_modified_gmt ) : ?> @@ -145,6 +145,16 @@ if ( ! defined( 'ABSPATH' ) ) { + + +
+

+ id ) ) : ?> + + + +

+
From c71869cd6ee03ebf06a3fd651d7d371a2298dc52 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Fri, 9 Jan 2015 16:21:19 -0200 Subject: [PATCH 09/14] Added method to create webhooks on settings page --- includes/admin/class-wc-admin-webhooks.php | 63 ++++++++++--------- .../settings/class-wc-settings-webhooks.php | 8 ++- 2 files changed, 41 insertions(+), 30 deletions(-) diff --git a/includes/admin/class-wc-admin-webhooks.php b/includes/admin/class-wc-admin-webhooks.php index 3fae092f889..57d93f9ee73 100644 --- a/includes/admin/class-wc-admin-webhooks.php +++ b/includes/admin/class-wc-admin-webhooks.php @@ -23,6 +23,7 @@ class WC_Admin_Webhooks { public function __construct() { // Save webhooks add_action( 'admin_init', array( $this, 'save' ) ); + add_action( 'admin_init', array( $this, 'create' ) ); } /** @@ -95,28 +96,6 @@ class WC_Admin_Webhooks { } } - /** - * Set Webhook post data. - * - * @param int $webhook_id - */ - private function set_post_data( $webhook_id ) { - global $wpdb; - - $password = uniqid( 'webhook_' ); - $password = strlen( $password ) > 20 ? substr( $password, 0, 20 ) : $password; - - $wpdb->update( - $wpdb->posts, - array( - 'post_password' => $password, - 'ping_status' => 'closed', - 'comment_status' => 'open' - ), - array( 'ID' => $webhook_id ) - ); - } - /** * Save method */ @@ -150,12 +129,9 @@ class WC_Admin_Webhooks { // Topic $this->update_topic( $webhook ); - // Webhook Created - if ( isset( $_POST['original_post_status'] ) && 'auto-draft' === $_POST['original_post_status'] ) { - // Set Post data like ping status and password - $this->set_post_data( $webhook->id ); - - // Ping webhook + // Ping the webhook at the first time that is activated + $peding_delivery = get_post_meta( $webhook->id, '_webhook_pending_delivery', true ); + if ( isset( $_POST['webhook_status'] ) && 'active' === $_POST['webhook_status'] && $peding_delivery ) { $webhook->deliver_ping(); } @@ -166,6 +142,37 @@ class WC_Admin_Webhooks { exit(); } } + + /** + * Create Webhook + */ + public function create() { + if ( isset( $_GET['page'] ) && 'wc-settings' == $_GET['page'] && isset( $_GET['tab'] ) && 'webhooks' == $_GET['tab'] && isset( $_GET['create-webhook'] ) ) { + if ( ! current_user_can( 'publish_shop_webhooks' ) ) { + wp_die( __( 'You don\'t have permissions to create Webhooks!', 'woocommerce' ) ); + } + + $webhook_id = wp_insert_post( array( + 'post_type' => 'shop_webhook', + 'post_status' => 'pending', + 'ping_status' => 'closed', + 'post_author' => get_current_user_id(), + 'post_password' => strlen( ( $password = uniqid( 'webhook_' ) ) ) > 20 ? substr( $password, 0, 20 ) : $password, + 'post_title' => sprintf( __( 'Webhook created on %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) ), + 'comment_status' => 'open' + ) ); + + if ( is_wp_error( $webhook_id ) ) { + wp_die( $webhook_id->get_error_messages() ); + } + + update_post_meta( $webhook_id, '_webhook_pending_delivery', true ); + + // Redirect to edit page + wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=webhooks&edit-webhook=' . $webhook_id . '&created=1' ) ); + exit(); + } + } } new WC_Admin_Webhooks(); diff --git a/includes/admin/settings/class-wc-settings-webhooks.php b/includes/admin/settings/class-wc-settings-webhooks.php index 40464e3f985..8a2442adf2e 100644 --- a/includes/admin/settings/class-wc-settings-webhooks.php +++ b/includes/admin/settings/class-wc-settings-webhooks.php @@ -76,9 +76,11 @@ class WC_Settings_Webhooks extends WC_Settings_Page { } if ( isset( $_GET['updated'] ) ) { - $updated = absint( $_GET['updated'] ); + WC_Admin_Settings::add_message( __( 'Webhook updated successfully.', 'woocommerce' ) ); + } - WC_Admin_Settings::add_message( __( 'Webhook saved successfully.', 'woocommerce' ) ); + if ( isset( $_GET['created'] ) ) { + WC_Admin_Settings::add_message( __( 'Webhook created successfully.', 'woocommerce' ) ); } } @@ -86,6 +88,8 @@ class WC_Settings_Webhooks extends WC_Settings_Page { * Table list output */ private function table_list_output() { + echo '

' . __( 'Webhooks', 'woocommerce' ) . ' ' . __( 'Add Webhook', 'woocommerce' ) . '

'; + $webhooks_table_list = new WC_Admin_Webhooks_Table_List(); $webhooks_table_list->prepare_items(); From 572d451aa61cf6acb4759ebbe6954d1110c011a7 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Fri, 9 Jan 2015 22:08:45 -0200 Subject: [PATCH 10/14] Created webhooks bulk actions --- .../class-wc-admin-webhooks-table-list.php | 36 ++- includes/admin/class-wc-admin-webhooks.php | 222 +++++++++++++----- 2 files changed, 188 insertions(+), 70 deletions(-) diff --git a/includes/admin/class-wc-admin-webhooks-table-list.php b/includes/admin/class-wc-admin-webhooks-table-list.php index ce62dfb9ebe..07630c43a4e 100644 --- a/includes/admin/class-wc-admin-webhooks-table-list.php +++ b/includes/admin/class-wc-admin-webhooks-table-list.php @@ -79,27 +79,35 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table { $edit_link = admin_url( 'admin.php?page=wc-settings&tab=webhooks&edit-webhook=' . $the_webhook->id ); $title = _draft_or_post_title( $the_webhook->post_data ); $post_type_object = get_post_type_object( $the_webhook->post_data->post_type ); + $post_status = $the_webhook->post_data->post_status; - $output = '' . esc_html( $title ) . ''; + // Title + $output = ''; + if ( 'trash' == $post_status ) { + $output .= esc_html( $title ); + } else { + $output .= '' . esc_html( $title ) . ''; + } + $output .= ''; // Get actions $actions = array(); $actions['id'] = sprintf( __( 'ID: %d', 'woocommerce' ), $the_webhook->id ); - if ( current_user_can( $post_type_object->cap->edit_post, $the_webhook->id ) && 'trash' !== $the_webhook->post_data->post_status ) { + if ( current_user_can( $post_type_object->cap->edit_post, $the_webhook->id ) && 'trash' !== $post_status ) { $actions['edit'] = '' . __( 'Edit', 'woocommerce' ) . ''; } if ( current_user_can( $post_type_object->cap->delete_post, $the_webhook->id ) ) { - if ( 'trash' == $the_webhook->post_data->post_status ) { + if ( 'trash' == $post_status ) { $actions['untrash'] = '' . __( 'Restore', 'woocommerce' ) . ''; } elseif ( EMPTY_TRASH_DAYS ) { $actions['trash'] = '' . __( 'Trash', 'woocommerce' ) . ''; } - if ( 'trash' == $the_webhook->post_data->post_status || ! EMPTY_TRASH_DAYS ) { + if ( 'trash' == $post_status || ! EMPTY_TRASH_DAYS ) { $actions['delete'] = '' . __( 'Delete Permanently', 'woocommerce' ) . ''; } } @@ -225,11 +233,29 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table { return $status_links; } + /** + * Get bulk actions + * + * @return array + */ + protected function get_bulk_actions() { + if ( isset( $_GET['status'] ) && 'trash' == $_GET['status'] ) { + return array( + 'untrash' => __( 'Restore', 'woocommerce' ), + 'delete' => __( 'Delete Permanently', 'woocommerce' ) + ); + } + + return array( + 'trash' => __( 'Move to Trash', 'woocommerce' ) + ); + } + /** * Prepare table list items. */ public function prepare_items() { - $per_page = 10; + $per_page = apply_filters( 'woocommerce_webhooks_settings_posts_per_page', 10 ); $columns = $this->get_columns(); $hidden = array(); $sortable = $this->get_sortable_columns(); diff --git a/includes/admin/class-wc-admin-webhooks.php b/includes/admin/class-wc-admin-webhooks.php index 57d93f9ee73..292c6b261ba 100644 --- a/includes/admin/class-wc-admin-webhooks.php +++ b/includes/admin/class-wc-admin-webhooks.php @@ -21,9 +21,16 @@ class WC_Admin_Webhooks { * Initialize the webhooks admin actions */ public function __construct() { - // Save webhooks - add_action( 'admin_init', array( $this, 'save' ) ); - add_action( 'admin_init', array( $this, 'create' ) ); + add_action( 'admin_init', array( $this, 'actions' ) ); + } + + /** + * Check if is webhook settings page + * + * @return bool + */ + private function is_webhook_settigs_page() { + return isset( $_GET['page'] ) && 'wc-settings' == $_GET['page'] && isset( $_GET['tab'] ) && 'webhooks' == $_GET['tab']; } /** @@ -99,78 +106,163 @@ class WC_Admin_Webhooks { /** * Save method */ - public function save() { - if ( isset( $_GET['page'] ) && 'wc-settings' == $_GET['page'] && isset( $_GET['tab'] ) && 'webhooks' == $_GET['tab'] && isset( $_POST['save'] ) && isset( $_POST['webhook_id'] ) ) { - - if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'woocommerce-settings' ) ) { - die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) ); - } - - $webhook_id = absint( $_POST['webhook_id'] ); - - if ( ! current_user_can( 'edit_shop_webhook', $webhook_id ) ) { - return; - } - - $webhook = new WC_Webhook( $webhook_id ); - - // Name - $this->update_name( $webhook->id ); - - // Status - $this->update_status( $webhook ); - - // Delivery URL - $this->update_delivery_url( $webhook ); - - // Secret - $this->update_secret( $webhook ); - - // Topic - $this->update_topic( $webhook ); - - // Ping the webhook at the first time that is activated - $peding_delivery = get_post_meta( $webhook->id, '_webhook_pending_delivery', true ); - if ( isset( $_POST['webhook_status'] ) && 'active' === $_POST['webhook_status'] && $peding_delivery ) { - $webhook->deliver_ping(); - } - - do_action( 'woocommerce_webhook_options_save', $webhook->id ); - - // Redirect to webhook edit page to avoid settings save actions - wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=webhooks&edit-webhook=' . $webhook->id . '&updated=1' ) ); - exit(); + private function save() { + if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'woocommerce-settings' ) ) { + die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) ); } + + $webhook_id = absint( $_POST['webhook_id'] ); + + if ( ! current_user_can( 'edit_shop_webhook', $webhook_id ) ) { + return; + } + + $webhook = new WC_Webhook( $webhook_id ); + + // Name + $this->update_name( $webhook->id ); + + // Status + $this->update_status( $webhook ); + + // Delivery URL + $this->update_delivery_url( $webhook ); + + // Secret + $this->update_secret( $webhook ); + + // Topic + $this->update_topic( $webhook ); + + // Ping the webhook at the first time that is activated + $peding_delivery = get_post_meta( $webhook->id, '_webhook_pending_delivery', true ); + if ( isset( $_POST['webhook_status'] ) && 'active' === $_POST['webhook_status'] && $peding_delivery ) { + $webhook->deliver_ping(); + } + + do_action( 'woocommerce_webhook_options_save', $webhook->id ); + + // Redirect to webhook edit page to avoid settings save actions + wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=webhooks&edit-webhook=' . $webhook->id . '&updated=1' ) ); + exit(); } /** * Create Webhook */ - public function create() { - if ( isset( $_GET['page'] ) && 'wc-settings' == $_GET['page'] && isset( $_GET['tab'] ) && 'webhooks' == $_GET['tab'] && isset( $_GET['create-webhook'] ) ) { - if ( ! current_user_can( 'publish_shop_webhooks' ) ) { - wp_die( __( 'You don\'t have permissions to create Webhooks!', 'woocommerce' ) ); + private function create() { + if ( ! current_user_can( 'publish_shop_webhooks' ) ) { + wp_die( __( 'You don\'t have permissions to create Webhooks!', 'woocommerce' ) ); + } + + $webhook_id = wp_insert_post( array( + 'post_type' => 'shop_webhook', + 'post_status' => 'pending', + 'ping_status' => 'closed', + 'post_author' => get_current_user_id(), + 'post_password' => strlen( ( $password = uniqid( 'webhook_' ) ) ) > 20 ? substr( $password, 0, 20 ) : $password, + 'post_title' => sprintf( __( 'Webhook created on %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) ), + 'comment_status' => 'open' + ) ); + + if ( is_wp_error( $webhook_id ) ) { + wp_die( $webhook_id->get_error_messages() ); + } + + update_post_meta( $webhook_id, '_webhook_pending_delivery', true ); + + // Redirect to edit page + wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=webhooks&edit-webhook=' . $webhook_id . '&created=1' ) ); + exit(); + } + + /** + * Bulk trash/delete + * + * @param array $webhooks + * @param bool $delete + */ + private function bulk_trash( $webhooks, $delete = false ) { + foreach ( $webhooks as $webhook_id ) { + if ( $delete ) { + wp_delete_post( $webhook_id, true ); + } else { + wp_trash_post( $webhook_id ); + } + } + + $type = ! EMPTY_TRASH_DAYS || $delete ? 'deleted' : 'trashed'; + $qty = count( $webhooks ); + $status = isset( $_GET['status'] ) ? '&status=' . sanitize_text_field( $_GET['status'] ) : ''; + + // Redirect to webhooks page + wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=webhooks' . $status . '&' . $type . '=' . $qty ) ); + exit(); + } + + /** + * Bulk untrash + * + * @param array $webhooks + */ + private function bulk_untrash( $webhooks ) { + foreach ( $webhooks as $webhook_id ) { + wp_untrash_post( $webhook_id ); + } + + $qty = count( $webhooks ); + + // Redirect to webhooks page + wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=webhooks&status=trash&untrashed=' . $qty ) ); + exit(); + } + + /** + * Webhook bulk actions + */ + private function bulk_actions() { + if ( ! current_user_can( 'edit_shop_webhooks' ) ) { + wp_die( __( 'You don\'t have permissions to edit Webhooks!', 'woocommerce' ) ); + } + + $webhooks = array_map( 'absint', (array) $_GET['webhook'] ); + + switch ( $_GET['action'] ) { + case 'trash' : + $this->bulk_trash( $webhooks ); + break; + case 'untrash' : + $this->bulk_untrash( $webhooks ); + break; + case 'delete' : + $this->bulk_trash( $webhooks, true ); + break; + + default : + break; + } + } + + /** + * Webhooks admin actions + */ + public function actions() { + if ( $this->is_webhook_settigs_page() ) { + + // Save + if ( isset( $_POST['save'] ) && isset( $_POST['webhook_id'] ) ) { + $this->save(); } - $webhook_id = wp_insert_post( array( - 'post_type' => 'shop_webhook', - 'post_status' => 'pending', - 'ping_status' => 'closed', - 'post_author' => get_current_user_id(), - 'post_password' => strlen( ( $password = uniqid( 'webhook_' ) ) ) > 20 ? substr( $password, 0, 20 ) : $password, - 'post_title' => sprintf( __( 'Webhook created on %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) ), - 'comment_status' => 'open' - ) ); - - if ( is_wp_error( $webhook_id ) ) { - wp_die( $webhook_id->get_error_messages() ); + // Create + if ( isset( $_GET['create-webhook'] ) ) { + $this->create(); } - update_post_meta( $webhook_id, '_webhook_pending_delivery', true ); - - // Redirect to edit page - wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=webhooks&edit-webhook=' . $webhook_id . '&created=1' ) ); - exit(); + // Create + if ( isset( $_GET['action'] ) && isset( $_GET['webhook'] ) ) { + $this->bulk_actions(); + } } } } From 9fa5ad756e2428af82a3fe4bae9281a07a395925 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Fri, 9 Jan 2015 22:25:04 -0200 Subject: [PATCH 11/14] Fixed a typo --- includes/admin/class-wc-admin-webhooks.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/admin/class-wc-admin-webhooks.php b/includes/admin/class-wc-admin-webhooks.php index 292c6b261ba..ba62891aa8e 100644 --- a/includes/admin/class-wc-admin-webhooks.php +++ b/includes/admin/class-wc-admin-webhooks.php @@ -29,7 +29,7 @@ class WC_Admin_Webhooks { * * @return bool */ - private function is_webhook_settigs_page() { + private function is_webhook_settings_page() { return isset( $_GET['page'] ) && 'wc-settings' == $_GET['page'] && isset( $_GET['tab'] ) && 'webhooks' == $_GET['tab']; } @@ -247,7 +247,7 @@ class WC_Admin_Webhooks { * Webhooks admin actions */ public function actions() { - if ( $this->is_webhook_settigs_page() ) { + if ( $this->is_webhook_settings_page() ) { // Save if ( isset( $_POST['save'] ) && isset( $_POST['webhook_id'] ) ) { From 052380e1912cc5257f3bd69e6348c2990a321dd8 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Fri, 9 Jan 2015 22:41:33 -0200 Subject: [PATCH 12/14] Added webhooks search field --- includes/admin/class-wc-admin-webhooks-table-list.php | 4 ++++ includes/admin/settings/class-wc-settings-webhooks.php | 1 + 2 files changed, 5 insertions(+) diff --git a/includes/admin/class-wc-admin-webhooks-table-list.php b/includes/admin/class-wc-admin-webhooks-table-list.php index 07630c43a4e..d55a9cd98dd 100644 --- a/includes/admin/class-wc-admin-webhooks-table-list.php +++ b/includes/admin/class-wc-admin-webhooks-table-list.php @@ -278,6 +278,10 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table { $args['post_status'] = sanitize_text_field( $_REQUEST['status'] ); } + if ( ! empty( $_REQUEST['s'] ) ) { + $args['s'] = sanitize_text_field( $_REQUEST['s'] ); + } + // Get the webhooks $webhooks = new WP_Query( $args ); $this->items = $webhooks->posts; diff --git a/includes/admin/settings/class-wc-settings-webhooks.php b/includes/admin/settings/class-wc-settings-webhooks.php index 8a2442adf2e..56cdccde9fa 100644 --- a/includes/admin/settings/class-wc-settings-webhooks.php +++ b/includes/admin/settings/class-wc-settings-webhooks.php @@ -97,6 +97,7 @@ class WC_Settings_Webhooks extends WC_Settings_Page { echo ''; $webhooks_table_list->views(); + $webhooks_table_list->search_box( __( 'Search Webhooks', 'woocommerce' ), 'webhook' ); $webhooks_table_list->display(); } From 56c49daea83c6ed9aa303231fca84b8d7f7c0d43 Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Fri, 9 Jan 2015 23:03:22 -0200 Subject: [PATCH 13/14] Added empty trash action --- .../class-wc-admin-webhooks-table-list.php | 11 ++++++ includes/admin/class-wc-admin-webhooks.php | 34 ++++++++++++++++++- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/includes/admin/class-wc-admin-webhooks-table-list.php b/includes/admin/class-wc-admin-webhooks-table-list.php index d55a9cd98dd..b62fe3fab0f 100644 --- a/includes/admin/class-wc-admin-webhooks-table-list.php +++ b/includes/admin/class-wc-admin-webhooks-table-list.php @@ -251,6 +251,17 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table { ); } + /** + * Extra controls to be displayed between bulk actions and pagination + * + * @param string $which + */ + protected function extra_tablenav( $which ) { + if ( 'top' == $which && isset( $_GET['status'] ) && 'trash' == $_GET['status'] && current_user_can( 'delete_shop_webhooks' ) ) { + echo '
' . __( 'Empty Trash' ) . '
'; + } + } + /** * Prepare table list items. */ diff --git a/includes/admin/class-wc-admin-webhooks.php b/includes/admin/class-wc-admin-webhooks.php index ba62891aa8e..33e287cb4a5 100644 --- a/includes/admin/class-wc-admin-webhooks.php +++ b/includes/admin/class-wc-admin-webhooks.php @@ -243,6 +243,33 @@ class WC_Admin_Webhooks { } } + /** + * Empty Trash + */ + public function empty_trash() { + if ( ! current_user_can( 'delete_shop_webhooks' ) ) { + wp_die( __( 'You don\'t have permissions to delete Webhooks!', 'woocommerce' ) ); + } + + $webhooks = get_posts( array( + 'post_type' => 'shop_webhook', + 'ignore_sticky_posts' => true, + 'nopaging' => true, + 'post_status' => 'trash', + 'fields' => 'ids' + ) ); + + foreach ( $webhooks as $webhook_id ) { + wp_delete_post( $webhook_id, true ); + } + + $qty = count( $webhooks ); + + // Redirect to webhooks page + wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=webhooks&deleted=' . $qty ) ); + exit(); + } + /** * Webhooks admin actions */ @@ -259,10 +286,15 @@ class WC_Admin_Webhooks { $this->create(); } - // Create + // Bulk actions if ( isset( $_GET['action'] ) && isset( $_GET['webhook'] ) ) { $this->bulk_actions(); } + + // Bulk actions + if ( isset( $_GET['empty_trash'] ) ) { + $this->empty_trash(); + } } } } From f3e5c03b38ca5d54343160c419301bd7f752b4fe Mon Sep 17 00:00:00 2001 From: Claudio Sanches Date: Mon, 12 Jan 2015 09:27:09 -0200 Subject: [PATCH 14/14] Repositioned the "move to trash" and "save" buttons --- includes/admin/settings/views/html-webhooks-edit.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/admin/settings/views/html-webhooks-edit.php b/includes/admin/settings/views/html-webhooks-edit.php index 72c093a923a..374e16cca16 100644 --- a/includes/admin/settings/views/html-webhooks-edit.php +++ b/includes/admin/settings/views/html-webhooks-edit.php @@ -148,10 +148,10 @@ if ( ! defined( 'ABSPATH' ) ) {

- id ) ) : ?> - - + id ) ) : ?> + +