-
-
' . esc_html( $the_product->get_sku() ) . '
-
' . esc_html( $the_product->get_regular_price() ) . '
-
' . esc_html( $the_product->get_sale_price() ) . '
-
' . esc_html( $the_product->get_weight() ) . '
-
' . esc_html( $the_product->get_length() ) . '
-
' . esc_html( $the_product->get_width() ) . '
-
' . esc_html( $the_product->get_height() ) . '
-
' . esc_html( $the_product->get_shipping_class() ) . '
-
' . esc_html( $the_product->get_catalog_visibility() ) . '
-
' . esc_html( $the_product->get_stock_status() ) . '
-
' . esc_html( $the_product->get_stock_quantity() ) . '
-
' . esc_html( wc_bool_to_string( $the_product->get_manage_stock() ) ) . '
-
' . esc_html( wc_bool_to_string( $the_product->get_featured() ) ) . '
-
' . esc_html( $the_product->get_type() ) . '
-
' . esc_html( wc_bool_to_string( $the_product->get_virtual() ) ) . '
-
' . esc_html( $the_product->get_tax_status() ) . '
-
' . esc_html( $the_product->get_tax_class() ) . '
-
' . esc_html( $the_product->get_backorders() ) . '
-
#i', ', ', $address ) );
- } else {
- echo '–';
- }
-
- if ( $the_order->get_billing_phone() ) {
- echo '' . esc_html__( 'Phone:', 'woocommerce' ) . ' ' . esc_html( $the_order->get_billing_phone() ) . ' ';
- }
-
- break;
- case 'shipping_address':
- $address = $the_order->get_formatted_shipping_address();
- if ( $address ) {
- echo '' . esc_html( preg_replace( '##i', ', ', $address ) ) . ' ';
- } else {
- echo '–';
- }
-
- if ( $the_order->get_shipping_method() ) {
- echo '' . esc_html__( 'Via', 'woocommerce' ) . ' ' . esc_html( $the_order->get_shipping_method() ) . ' ';
- }
- break;
- case 'order_notes':
- if ( $post->comment_count ) {
- $latest_notes = wc_get_order_notes( array(
- 'order_id' => $post->ID,
- 'limit' => 1,
- 'orderby' => 'date_created_gmt',
- ) );
-
- $latest_note = current( $latest_notes );
-
- if ( isset( $latest_note->content ) && 1 === intval( $post->comment_count ) ) {
- echo '' . esc_html__( 'Yes', 'woocommerce' ) . ' ';
- } elseif ( isset( $latest_note->content ) ) {
- /* translators: %d: notes count */
- echo '' . sprintf( _n( 'Plus %d other note', 'Plus %d other notes', ( $post->comment_count - 1 ), 'woocommerce' ), $post->comment_count - 1 ) . '' ) . '">' . esc_html__( 'Yes', 'woocommerce' ) . ' ';
- } else {
- /* translators: %d: notes count */
- echo '' . esc_html__( 'Yes', 'woocommerce' ) . ' ';
- }
- } else {
- echo '– ';
- }
- break;
- case 'order_total':
- echo $the_order->get_formatted_order_total(); // WPCS: XSS ok.
-
- if ( $the_order->get_payment_method_title() ) {
- echo '' . esc_html__( 'Via', 'woocommerce' ) . ' ' . esc_html( $the_order->get_payment_method_title() ) . ' ';
- }
- break;
- case 'order_title':
- if ( $the_order->get_customer_id() ) {
- $user = get_user_by( 'id', $the_order->get_customer_id() );
- $username = '';
- $username .= ucwords( $user->display_name );
- $username .= ' ';
- } elseif ( $the_order->get_billing_first_name() || $the_order->get_billing_last_name() ) {
- /* translators: 1: first name 2: last name */
- $username = trim( sprintf( _x( '%1$s %2$s', 'full name', 'woocommerce' ), $the_order->get_billing_first_name(), $the_order->get_billing_last_name() ) );
- } elseif ( $the_order->get_billing_company() ) {
- $username = trim( $the_order->get_billing_company() );
- } else {
- $username = __( 'Guest', 'woocommerce' );
- }
-
- echo sprintf(
- /* translators: 1: order and number (i.e. Order #13) 2: user name */
- esc_html__( '%1$s by %2$s', 'woocommerce' ),
- '#' . esc_attr( $the_order->get_order_number() ) . ' ' . esc_html( $the_order->get_billing_email() ) . ' ' . esc_html__( 'Show more details', 'woocommerce' ) . ' ';
- do_action( 'woocommerce_admin_order_actions_start', $the_order );
-
- $actions = array();
-
- if ( $the_order->has_status( array( 'pending', 'on-hold' ) ) ) {
- $actions['processing'] = array(
- 'url' => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=processing&order_id=' . $post->ID ), 'woocommerce-mark-order-status' ),
- 'name' => __( 'Processing', 'woocommerce' ),
- 'action' => 'processing',
- );
- }
-
- if ( $the_order->has_status( array( 'pending', 'on-hold', 'processing' ) ) ) {
- $actions['complete'] = array(
- 'url' => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=completed&order_id=' . $post->ID ), 'woocommerce-mark-order-status' ),
- 'name' => __( 'Complete', 'woocommerce' ),
- 'action' => 'complete',
- );
- }
-
- $actions['view'] = array(
- 'url' => admin_url( 'post.php?post=' . $post->ID . '&action=edit' ),
- 'name' => __( 'View', 'woocommerce' ),
- 'action' => 'view',
- );
-
- $actions = apply_filters( 'woocommerce_admin_order_actions', $actions, $the_order );
-
- foreach ( $actions as $action ) {
- printf( '%s ', esc_attr( $action['action'] ), esc_url( $action['url'] ), esc_attr( $action['name'] ), esc_attr( $action['name'] ) );
- }
-
- do_action( 'woocommerce_admin_order_actions_end', $the_order );
- echo '
';
- break;
- }
- }
-
- /**
- * Make columns sortable - https://gist.github.com/906872.
- *
- * @param array $columns Columns.
- * @return array
- */
- public function product_sortable_columns( $columns ) {
- $custom = array(
- 'price' => 'price',
- 'sku' => 'sku',
- 'name' => 'title',
- );
- return wp_parse_args( $custom, $columns );
- }
-
- /**
- * Make columns sortable - https://gist.github.com/906872.
- *
- * @param array $columns Columns.
- * @return array
- */
- public function shop_coupon_sortable_columns( $columns ) {
- return $columns;
- }
-
- /**
- * Make columns sortable - https://gist.github.com/906872.
- *
- * @param array $columns Columns.
- * @return array
- */
- public function shop_order_sortable_columns( $columns ) {
- $custom = array(
- 'order_title' => 'ID',
- 'order_total' => 'order_total',
- 'order_date' => 'date',
- );
- unset( $columns['comments'] );
-
- return wp_parse_args( $custom, $columns );
- }
-
- /**
- * Set list table primary column for products and orders.
- * Support for WordPress 4.3.
- *
- * @param string $default Default value.
- * @param string $screen_id Screen ID.
- *
- * @return string
- */
- public function list_table_primary_column( $default, $screen_id ) {
- if ( 'edit-product' === $screen_id ) {
- return 'name';
- }
-
- if ( 'edit-shop_order' === $screen_id ) {
- return 'order_title';
- }
-
- if ( 'edit-shop_coupon' === $screen_id ) {
- return 'coupon_code';
- }
-
- return $default;
- }
-
- /**
- * Set row actions for products and orders.
- *
- * @param array $actions Row actions list.
- * @param WP_Post $post Post instance.
- *
- * @return array
- */
- public function row_actions( $actions, $post ) {
- if ( 'product' === $post->post_type ) {
- return array_merge( array(
- 'id' => 'ID: ' . $post->ID,
- ), $actions );
- }
-
- if ( in_array( $post->post_type, array( 'shop_order', 'shop_coupon' ), true ) ) {
- if ( isset( $actions['inline hide-if-no-js'] ) ) {
- unset( $actions['inline hide-if-no-js'] );
- }
- }
-
- return $actions;
- }
-
- /**
- * Change views on the edit product screen.
- *
- * @param array $views Default views.
- * @return array
- */
- public function product_views( $views ) {
- global $wp_query;
-
- // Products do not have authors.
- unset( $views['mine'] );
-
- // Add sorting link.
- if ( current_user_can( 'edit_others_pages' ) ) {
- $class = ( isset( $wp_query->query['orderby'] ) && 'menu_order title' === $wp_query->query['orderby'] ) ? 'current' : '';
- $query_string = remove_query_arg( array( 'orderby', 'order' ) );
- $query_string = add_query_arg( 'orderby', rawurlencode( 'menu_order title' ), $query_string );
- $query_string = add_query_arg( 'order', rawurlencode( 'ASC' ), $query_string );
- $views['byorder'] = '' . __( 'Sorting', 'woocommerce' ) . ' ';
- }
-
- return $views;
- }
-
- /**
- * Product sorting link.
- *
- * @deprecated 3.1
- * @param array $views Default views.
- * @return array
- */
- public function product_sorting_link( $views ) {
- return $this->product_views( $views );
- }
-
- /**
- * Disable months dropdown on product screen.
- *
- * @param bool $bool Disable or enable dropdown.
- * @param string $post_type Post type.
- * @return bool
- */
- public function disable_months_dropdown( $bool, $post_type ) {
- return 'product' === $post_type ? true : $bool;
- }
-
/**
* Custom bulk edit - form.
*
- * @param string $column_name Column name.
- * @param string $post_type Post type.
+ * @param string $column_name Column being shown.
+ * @param string $post_type Post type being shown.
*/
public function bulk_edit( $column_name, $post_type ) {
if ( 'price' !== $column_name || 'product' !== $post_type ) {
@@ -851,11 +241,10 @@ class WC_Admin_Post_Types {
/**
* Custom quick edit - form.
*
- * @param string $column_name Column name.
- * @param string $post_type Post type.
+ * @param string $column_name Column being shown.
+ * @param string $post_type Post type being shown.
*/
public function quick_edit( $column_name, $post_type ) {
-
if ( 'price' !== $column_name || 'product' !== $post_type ) {
return;
}
@@ -872,8 +261,8 @@ class WC_Admin_Post_Types {
* when quick/bulk saving product info.
*
* @since 3.0.0
- * @param int $post_id Post ID.
- * @param WP_Post $post Post instance.
+ * @param int $post_id Post ID being saved.
+ * @param object $post Post object being saved.
*/
public function bulk_and_quick_edit_hook( $post_id, $post ) {
remove_action( 'save_post', array( $this, 'bulk_and_quick_edit_hook' ) );
@@ -884,8 +273,8 @@ class WC_Admin_Post_Types {
/**
* Quick and bulk edit saving.
*
- * @param int $post_id Post ID.
- * @param WP_Post $post Post instance.
+ * @param int $post_id Post ID being saved.
+ * @param object $post Post object being saved.
* @return int
*/
public function bulk_and_quick_edit_save_post( $post_id, $post ) {
@@ -895,28 +284,12 @@ class WC_Admin_Post_Types {
}
// Don't save revisions and autosaves.
- if ( wp_is_post_revision( $post_id ) || wp_is_post_autosave( $post_id ) ) {
+ if ( wp_is_post_revision( $post_id ) || wp_is_post_autosave( $post_id ) || 'product' !== $post->post_type || ! current_user_can( 'edit_post', $post_id ) ) {
return $post_id;
}
- // Check post type is product.
- if ( 'product' !== $post->post_type ) {
- return $post_id;
- }
-
- // Check user permission.
- if ( ! current_user_can( 'edit_post', $post_id ) ) {
- return $post_id;
- }
-
- // Check nonces.
- if ( ! isset( $_REQUEST['woocommerce_quick_edit_nonce'] ) && ! isset( $_REQUEST['woocommerce_bulk_edit_nonce'] ) ) { // WPCS: input var ok, CSRF ok.
- return $post_id;
- }
- if ( isset( $_REQUEST['woocommerce_quick_edit_nonce'] ) && ! wp_verify_nonce( sanitize_key( wp_unslash( $_REQUEST['woocommerce_quick_edit_nonce'] ) ), 'woocommerce_quick_edit_nonce' ) ) { // WPCS: input var ok.
- return $post_id;
- }
- if ( isset( $_REQUEST['woocommerce_bulk_edit_nonce'] ) && ! wp_verify_nonce( sanitize_key( wp_unslash( $_REQUEST['woocommerce_bulk_edit_nonce'] ) ), 'woocommerce_bulk_edit_nonce' ) ) { // WPCS: input var ok.
+ // Check nonce.
+ if ( ! isset( $_REQUEST['woocommerce_quick_edit_nonce'] ) || ! wp_verify_nonce( $_REQUEST['woocommerce_quick_edit_nonce'], 'woocommerce_quick_edit_nonce' ) ) { // WPCS: input var ok, sanitization ok.
return $post_id;
}
@@ -935,19 +308,32 @@ class WC_Admin_Post_Types {
/**
* Quick edit.
*
- * @param int $post_id Post ID.
- * @param WC_Product $product Product instance.
+ * @param int $post_id Post ID being saved.
+ * @param WC_Product $product Product object.
*/
private function quick_edit_save( $post_id, $product ) {
$data_store = $product->get_data_store();
$old_regular_price = $product->get_regular_price();
$old_sale_price = $product->get_sale_price();
- $data = wp_unslash( $_REQUEST ); // WPCS: input var ok, CSRF ok.
+ $input_to_props = array(
+ '_weight' => 'weight',
+ '_length' => 'length',
+ '_width' => 'width',
+ '_height' => 'height',
+ '_visibility' => 'catalog_visibility',
+ '_tax_class' => 'tax_class',
+ '_tax_status' => 'tax_status',
+ );
- // Save fields.
- if ( isset( $data['_sku'] ) ) {
+ foreach ( $input_to_props as $input_var => $prop ) {
+ if ( isset( $_REQUEST[ $input_var ] ) ) { // WPCS: input var ok, sanitization ok.
+ $product->{"set_{$prop}"}( wc_clean( wp_unslash( $_REQUEST[ $input_var ] ) ) ); // WPCS: input var ok, sanitization ok.
+ }
+ }
+
+ if ( isset( $_REQUEST['_sku'] ) ) { // WPCS: input var ok, sanitization ok.
$sku = $product->get_sku();
- $new_sku = (string) wc_clean( $data['_sku'] );
+ $new_sku = (string) wc_clean( $_REQUEST['_sku'] ); // WPCS: input var ok, sanitization ok.
if ( $new_sku !== $sku ) {
if ( ! empty( $new_sku ) ) {
@@ -961,58 +347,27 @@ class WC_Admin_Post_Types {
}
}
- if ( isset( $data['_weight'] ) ) {
- $product->set_weight( wc_clean( $data['_weight'] ) );
- }
-
- if ( isset( $data['_length'] ) ) {
- $product->set_length( wc_clean( $data['_length'] ) );
- }
-
- if ( isset( $data['_width'] ) ) {
- $product->set_width( wc_clean( $data['_width'] ) );
- }
-
- if ( isset( $data['_height'] ) ) {
- $product->set_height( wc_clean( $data['_height'] ) );
- }
-
- if ( ! empty( $data['_shipping_class'] ) ) {
- if ( '_no_shipping_class' === $data['_shipping_class'] ) {
+ if ( ! empty( $_REQUEST['_shipping_class'] ) ) { // WPCS: input var ok, sanitization ok.
+ if ( '_no_shipping_class' === $_REQUEST['_shipping_class'] ) { // WPCS: input var ok, sanitization ok.
$product->set_shipping_class_id( 0 );
} else {
- $shipping_class_id = $data_store->get_shipping_class_id_by_slug( wc_clean( $data['_shipping_class'] ) );
+ $shipping_class_id = $data_store->get_shipping_class_id_by_slug( wc_clean( $_REQUEST['_shipping_class'] ) ); // WPCS: input var ok, sanitization ok.
$product->set_shipping_class_id( $shipping_class_id );
}
}
- if ( isset( $data['_visibility'] ) ) {
- $product->set_catalog_visibility( wc_clean( $data['_visibility'] ) );
- }
-
- if ( isset( $data['_featured'] ) ) {
- $product->set_featured( true );
- } else {
- $product->set_featured( false );
- }
-
- if ( isset( $data['_tax_status'] ) ) {
- $product->set_tax_status( wc_clean( $data['_tax_status'] ) );
- }
-
- if ( isset( $data['_tax_class'] ) ) {
- $product->set_tax_class( wc_clean( $data['_tax_class'] ) );
- }
+ $product->set_featured( isset( $_REQUEST['_featured'] ) ); // WPCS: input var ok, sanitization ok.
if ( $product->is_type( 'simple' ) || $product->is_type( 'external' ) ) {
- if ( isset( $data['_regular_price'] ) ) {
- $new_regular_price = ( '' === $data['_regular_price'] ) ? '' : wc_format_decimal( $data['_regular_price'] );
+
+ if ( isset( $_REQUEST['_regular_price'] ) ) { // WPCS: input var ok, sanitization ok.
+ $new_regular_price = ( '' === $_REQUEST['_regular_price'] ) ? '' : wc_format_decimal( $_REQUEST['_regular_price'] ); // WPCS: input var ok, sanitization ok.
$product->set_regular_price( $new_regular_price );
} else {
$new_regular_price = null;
}
- if ( isset( $data['_sale_price'] ) ) {
- $new_sale_price = ( '' === $data['_sale_price'] ) ? '' : wc_format_decimal( $data['_sale_price'] );
+ if ( isset( $_REQUEST['_sale_price'] ) ) { // WPCS: input var ok, sanitization ok.
+ $new_sale_price = ( '' === $_REQUEST['_sale_price'] ) ? '' : wc_format_decimal( $_REQUEST['_sale_price'] ); // WPCS: input var ok, sanitization ok.
$product->set_sale_price( $new_sale_price );
} else {
$new_sale_price = null;
@@ -1034,10 +389,10 @@ class WC_Admin_Post_Types {
}
// Handle Stock Data.
- $manage_stock = ! empty( $data['_manage_stock'] ) && 'grouped' !== $product->get_type() ? 'yes' : 'no';
- $backorders = ! empty( $data['_backorders'] ) ? wc_clean( $data['_backorders'] ) : 'no';
- $stock_status = ! empty( $data['_stock_status'] ) ? wc_clean( $data['_stock_status'] ) : 'instock';
- $stock_amount = 'yes' === $manage_stock && isset( $data['_stock'] ) ? wc_stock_amount( $data['_stock'] ) : '';
+ $manage_stock = ! empty( $_REQUEST['_manage_stock'] ) && 'grouped' !== $product->get_type() ? 'yes' : 'no'; // WPCS: input var ok, sanitization ok.
+ $backorders = ! empty( $_REQUEST['_backorders'] ) ? wc_clean( $_REQUEST['_backorders'] ) : 'no'; // WPCS: input var ok, sanitization ok.
+ $stock_status = ! empty( $_REQUEST['_stock_status'] ) ? wc_clean( $_REQUEST['_stock_status'] ) : 'instock'; // WPCS: input var ok, sanitization ok.
+ $stock_amount = 'yes' === $manage_stock && ! empty( $_REQUEST['_stock'] ) ? wc_stock_amount( $_REQUEST['_stock'] ) : ''; // WPCS: input var ok, sanitization ok.
$product->set_manage_stock( $manage_stock );
$product->set_backorders( $backorders );
@@ -1072,8 +427,8 @@ class WC_Admin_Post_Types {
/**
* Bulk edit.
*
- * @param int $post_id Post ID.
- * @param WC_Product $product Product instance.
+ * @param int $post_id Post ID being saved.
+ * @param WC_Product $product Product object.
*/
public function bulk_edit_save( $post_id, $product ) {
$data_store = $product->get_data_store();
@@ -1081,55 +436,53 @@ class WC_Admin_Post_Types {
$old_sale_price = $product->get_sale_price();
$data = wp_unslash( $_REQUEST ); // WPCS: input var ok, CSRF ok.
- // Save fields.
- if ( ! empty( $data['change_weight'] ) && isset( $data['_weight'] ) ) {
- $product->set_weight( wc_clean( $data['_weight'] ) );
+ if ( ! empty( $_REQUEST['change_weight'] ) && isset( $_REQUEST['_weight'] ) ) { // WPCS: input var ok, sanitization ok.
+ $product->set_weight( wc_clean( wp_unslash( $_REQUEST['_weight'] ) ) ); // WPCS: input var ok, sanitization ok.
}
- if ( ! empty( $data['change_dimensions'] ) ) {
- if ( isset( $data['_length'] ) ) {
- $product->set_length( wc_clean( $data['_length'] ) );
+ if ( ! empty( $_REQUEST['change_dimensions'] ) ) { // WPCS: input var ok, sanitization ok.
+ if ( isset( $_REQUEST['_length'] ) ) { // WPCS: input var ok, sanitization ok.
+ $product->set_length( wc_clean( wp_unslash( $_REQUEST['_length'] ) ) ); // WPCS: input var ok, sanitization ok.
}
- if ( isset( $data['_width'] ) ) {
- $product->set_width( wc_clean( $data['_width'] ) );
+ if ( isset( $_REQUEST['_width'] ) ) { // WPCS: input var ok, sanitization ok.
+ $product->set_width( wc_clean( wp_unslash( $_REQUEST['_width'] ) ) ); // WPCS: input var ok, sanitization ok.
}
- if ( isset( $data['_height'] ) ) {
- $product->set_height( wc_clean( $data['_height'] ) );
+ if ( isset( $_REQUEST['_height'] ) ) { // WPCS: input var ok, sanitization ok.
+ $product->set_height( wc_clean( wp_unslash( $_REQUEST['_height'] ) ) ); // WPCS: input var ok, sanitization ok.
}
}
- if ( ! empty( $data['_tax_status'] ) ) {
- $product->set_tax_status( wc_clean( $data['_tax_status'] ) );
+ if ( ! empty( $_REQUEST['_tax_status'] ) ) { // WPCS: input var ok, sanitization ok.
+ $product->set_tax_status( wc_clean( $_REQUEST['_tax_status'] ) ); // WPCS: input var ok, sanitization ok.
}
- if ( ! empty( $data['_tax_class'] ) ) {
- $tax_class = wc_clean( $data['_tax_class'] );
+ if ( ! empty( $_REQUEST['_tax_class'] ) ) { // WPCS: input var ok, sanitization ok.
+ $tax_class = wc_clean( wp_unslash( $_REQUEST['_tax_class'] ) ); // WPCS: input var ok, sanitization ok.
if ( 'standard' === $tax_class ) {
$tax_class = '';
}
$product->set_tax_class( $tax_class );
}
- if ( ! empty( $data['_shipping_class'] ) ) {
- if ( '_no_shipping_class' === $data['_shipping_class'] ) {
+ if ( ! empty( $_REQUEST['_shipping_class'] ) ) { // WPCS: input var ok, sanitization ok.
+ if ( '_no_shipping_class' === $_REQUEST['_shipping_class'] ) { // WPCS: input var ok, sanitization ok.
$product->set_shipping_class_id( 0 );
} else {
- $shipping_class_id = $data_store->get_shipping_class_id_by_slug( wc_clean( $data['_shipping_class'] ) );
+ $shipping_class_id = $data_store->get_shipping_class_id_by_slug( wc_clean( $_REQUEST['_shipping_class'] ) ); // WPCS: input var ok, sanitization ok.
$product->set_shipping_class_id( $shipping_class_id );
}
}
- if ( ! empty( $data['_visibility'] ) ) {
- $product->set_catalog_visibility( wc_clean( $data['_visibility'] ) );
+ if ( ! empty( $_REQUEST['_visibility'] ) ) { // WPCS: input var ok, sanitization ok.
+ $product->set_catalog_visibility( wc_clean( $_REQUEST['_visibility'] ) ); // WPCS: input var ok, sanitization ok.
}
- if ( ! empty( $data['_featured'] ) ) {
- $product->set_featured( wc_clean( $data['_featured'] ) );
+ if ( ! empty( $_REQUEST['_featured'] ) ) { // WPCS: input var ok, sanitization ok.
+ $product->set_featured( wp_unslash( $_REQUEST['_featured'] ) ); // WPCS: input var ok, sanitization ok.
}
- // Sold Individually.
- if ( ! empty( $data['_sold_individually'] ) ) {
- if ( 'yes' === $data['_sold_individually'] ) {
+ if ( ! empty( $_REQUEST['_sold_individually'] ) ) { // WPCS: input var ok, sanitization ok.
+ if ( 'yes' === $_REQUEST['_sold_individually'] ) { // WPCS: input var ok, sanitization ok.
$product->set_sold_individually( 'yes' );
} else {
$product->set_sold_individually( '' );
@@ -1148,9 +501,10 @@ class WC_Admin_Post_Types {
if ( $can_product_type_change_price ) {
$price_changed = false;
- if ( ! empty( $data['change_regular_price'] ) && isset( $data['_regular_price'] ) ) {
- $change_regular_price = absint( $data['change_regular_price'] );
- $regular_price = wc_clean( $data['_regular_price'] );
+
+ if ( ! empty( $_REQUEST['change_regular_price'] ) && isset( $_REQUEST['_regular_price'] ) ) { // WPCS: input var ok, sanitization ok.
+ $change_regular_price = absint( $_REQUEST['change_regular_price'] ); // WPCS: input var ok, sanitization ok.
+ $regular_price = wc_clean( wp_unslash( $_REQUEST['_regular_price'] ) ); // WPCS: input var ok, sanitization ok.
switch ( $change_regular_price ) {
case 1:
@@ -1184,9 +538,9 @@ class WC_Admin_Post_Types {
}
}
- if ( ! empty( $data['change_sale_price'] ) && isset( $data['_sale_price'] ) ) {
- $change_sale_price = absint( $data['change_sale_price'] );
- $sale_price = wc_clean( $data['_sale_price'] );
+ if ( ! empty( $_REQUEST['change_sale_price'] ) && isset( $_REQUEST['_sale_price'] ) ) { // WPCS: input var ok, sanitization ok.
+ $change_sale_price = absint( $_REQUEST['change_sale_price'] ); // WPCS: input var ok, sanitization ok.
+ $sale_price = esc_attr( wp_unslash( $_REQUEST['_sale_price'] ) ); // WPCS: input var ok, sanitization ok.
switch ( $change_sale_price ) {
case 1:
@@ -1242,16 +596,16 @@ class WC_Admin_Post_Types {
$was_managing_stock = $product->get_manage_stock() ? 'yes' : 'no';
$stock_status = $product->get_stock_status();
$backorders = $product->get_backorders();
- $backorders = ! empty( $data['_backorders'] ) ? wc_clean( $data['_backorders'] ) : $backorders;
- $stock_status = ! empty( $data['_stock_status'] ) ? wc_clean( $data['_stock_status'] ) : $stock_status;
+ $backorders = ! empty( $_REQUEST['_backorders'] ) ? wc_clean( $_REQUEST['_backorders'] ) : $backorders; // WPCS: input var ok, sanitization ok.
+ $stock_status = ! empty( $_REQUEST['_stock_status'] ) ? wc_clean( $_REQUEST['_stock_status'] ) : $stock_status; // WPCS: input var ok, sanitization ok.
- if ( ! empty( $data['_manage_stock'] ) ) {
- $manage_stock = 'yes' === $data['_manage_stock'] && 'grouped' !== $product->get_type() ? 'yes' : 'no';
+ if ( ! empty( $_REQUEST['_manage_stock'] ) ) { // WPCS: input var ok, sanitization ok.
+ $manage_stock = 'yes' === wc_clean( $_REQUEST['_manage_stock'] ) && 'grouped' !== $product->get_type() ? 'yes' : 'no'; // WPCS: input var ok, sanitization ok.
} else {
$manage_stock = $was_managing_stock;
}
- $stock_amount = 'yes' === $manage_stock && ! empty( $data['change_stock'] ) && isset( $data['_stock'] ) ? wc_stock_amount( $data['_stock'] ) : $product->get_stock_quantity();
+ $stock_amount = 'yes' === $manage_stock && ! empty( $_REQUEST['change_stock'] ) && isset( $_REQUEST['_stock'] ) ? wc_stock_amount( $_REQUEST['_stock'] ) : $product->get_stock_quantity(); // WPCS: input var ok, sanitization ok.
$product->set_manage_stock( $manage_stock );
$product->set_backorders( $backorders );
@@ -1283,450 +637,6 @@ class WC_Admin_Post_Types {
do_action( 'woocommerce_product_bulk_edit_save', $product );
}
- /**
- * Manipulate shop order bulk actions.
- *
- * @param array $actions List of actions.
- * @return array
- */
- public function shop_order_bulk_actions( $actions ) {
- if ( isset( $actions['edit'] ) ) {
- unset( $actions['edit'] );
- }
-
- $actions['mark_processing'] = __( 'Mark processing', 'woocommerce' );
- $actions['mark_on-hold'] = __( 'Mark on-hold', 'woocommerce' );
- $actions['mark_completed'] = __( 'Mark complete', 'woocommerce' );
-
- return $actions;
- }
-
- /**
- * Handle shop order bulk actions.
- *
- * @since 3.0.0
- * @param string $redirect_to URL to redirect to.
- * @param string $action Action name.
- * @param array $ids List of ids.
- * @return string
- */
- public function handle_shop_order_bulk_actions( $redirect_to, $action, $ids ) {
- // Bail out if this is not a status-changing action.
- if ( false === strpos( $action, 'mark_' ) ) {
- return $redirect_to;
- }
-
- $order_statuses = wc_get_order_statuses();
- $new_status = substr( $action, 5 ); // Get the status name from action.
- $report_action = 'marked_' . $new_status;
-
- // Sanity check: bail out if this is actually not a status, or is
- // not a registered status.
- if ( ! isset( $order_statuses[ 'wc-' . $new_status ] ) ) {
- return $redirect_to;
- }
-
- $changed = 0;
- $ids = array_map( 'absint', $ids );
-
- foreach ( $ids as $id ) {
- $order = wc_get_order( $id );
- $order->update_status( $new_status, __( 'Order status changed by bulk edit:', 'woocommerce' ), true );
- do_action( 'woocommerce_order_edit_status', $id, $new_status );
- $changed++;
- }
-
- $redirect_to = add_query_arg( array(
- 'post_type' => 'shop_order',
- $report_action => true,
- 'changed' => $changed,
- 'ids' => join( ',', $ids ),
- ), $redirect_to );
-
- return esc_url_raw( $redirect_to );
- }
-
- /**
- * Show confirmation message that order status changed for number of orders.
- */
- public function bulk_admin_notices() {
- global $post_type, $pagenow;
-
- // Bail out if not on shop order list page.
- if ( 'edit.php' !== $pagenow || 'shop_order' !== $post_type ) {
- return;
- }
-
- $order_statuses = wc_get_order_statuses();
-
- // Check if any status changes happened.
- foreach ( $order_statuses as $slug => $name ) {
- if ( isset( $_REQUEST[ 'marked_' . str_replace( 'wc-', '', $slug ) ] ) ) { // WPCS: input var ok, CSRF ok.
-
- $number = isset( $_REQUEST['changed'] ) ? absint( $_REQUEST['changed'] ) : 0; // WPCS: input var ok, CSRF ok.
- /* translators: %s: orders count */
- echo '' . esc_html( sprintf( _n( '%s order status changed.', '%s order statuses changed.', $number, 'woocommerce' ), number_format_i18n( $number ) ) ) . '
-
- name ); ?>
-
-
- ';
- $output .= '' . __( 'Filter by product type', 'woocommerce' ) . ' ';
-
- foreach ( $terms as $term ) {
- $output .= 'query['product_type'] ) ) {
- $output .= selected( $term->slug, $wp_query->query['product_type'], false );
- }
-
- $output .= '>';
-
- switch ( $term->name ) {
- case 'grouped':
- $output .= esc_html__( 'Grouped product', 'woocommerce' );
- break;
- case 'external':
- $output .= esc_html__( 'External/Affiliate product', 'woocommerce' );
- break;
- case 'variable':
- $output .= esc_html__( 'Variable product', 'woocommerce' );
- break;
- case 'simple':
- $output .= esc_html__( 'Simple product', 'woocommerce' );
- break;
- default:
- // Assuming that we have other types in future.
- $output .= esc_html( ucfirst( $term->name ) );
- break;
- }
-
- $output .= ' ';
-
- if ( 'simple' === $term->name ) {
- $output .= 'query['product_type'] ) ) {
- $output .= selected( 'downloadable', $wp_query->query['product_type'], false );
- }
-
- $output .= '> ' . ( is_rtl() ? '←' : '→' ) . ' ' . __( 'Downloadable', 'woocommerce' ) . ' ';
-
- $output .= 'query['product_type'] ) ) {
- $output .= selected( 'virtual', $wp_query->query['product_type'], false );
- }
-
- $output .= '> ' . ( is_rtl() ? '←' : '→' ) . ' ' . __( 'Virtual', 'woocommerce' ) . ' ';
- }
- }
-
- $output .= '';
-
- echo apply_filters( 'woocommerce_product_filters', $output ); // WPCS: XSS ok.
- }
-
- /**
- * Show custom filters to filter coupons by type.
- */
- public function shop_coupon_filters() {
- $coupon_type = '';
-
- if ( isset( $_GET['coupon_type'] ) ) { // WPCS: input var ok, CSRF ok.
- $coupon_type = wc_clean( wp_unslash( $_GET['coupon_type'] ) ); // WPCS: input var ok, CSRF ok.
- }
-
- $types = wc_get_coupon_types();
-
- echo '';
- echo '' . esc_html__( 'Show all types', 'woocommerce' ) . ' ';
- foreach ( $types as $name => $type ) {
- echo '' . esc_html( $type ) . ' ';
- }
- echo ' ';
- }
-
- /**
- * Show custom filters to filter orders by status/customer.
- */
- public function shop_order_filters() {
- $user_string = '';
- $user_id = '';
- if ( ! empty( $_GET['_customer_user'] ) ) { // WPCS: input var ok, CSRF ok.
- $user_id = absint( $_GET['_customer_user'] ); // WPCS: input var ok, CSRF ok.
- $user = get_user_by( 'id', $user_id );
- $user_string = sprintf(
- /* translators: 1: user display name 2: user ID 3: user email */
- __( '%1$s (#%2$s – %3$s)', 'woocommerce' ),
- $user->display_name,
- absint( $user->ID ),
- $user->user_email
- );
- }
- ?>
-
-
-
- '_price', // WPCS: slow query ok.
- 'orderby' => 'meta_value_num',
- ) );
- }
- if ( 'sku' === $vars['orderby'] ) {
- $vars = array_merge( $vars, array(
- 'meta_key' => '_sku', // WPCS: slow query ok.
- 'orderby' => 'meta_value',
- ) );
- }
- }
- } elseif ( 'shop_coupon' === $typenow ) {
-
- if ( ! empty( $_GET['coupon_type'] ) ) { // WPCS: input var ok, CSRF ok.
- $vars['meta_key'] = 'discount_type'; // WPCS: slow query ok.
- $vars['meta_value'] = wc_clean( wp_unslash( $_GET['coupon_type'] ) ); // WPCS: input var ok, CSRF ok, slow query ok.
- }
- } elseif ( in_array( $typenow, wc_get_order_types( 'order-meta-boxes' ), true ) ) {
-
- // Filter the orders by the posted customer.
- if ( isset( $_GET['_customer_user'] ) && $_GET['_customer_user'] > 0 ) { // WPCS: input var ok, CSRF ok.
- $vars['meta_query'] = array( // WPCS: slow query ok.
- array(
- 'key' => '_customer_user',
- 'value' => (int) $_GET['_customer_user'], // WPCS: input var ok, CSRF ok.
- 'compare' => '=',
- ),
- );
- }
-
- // .
- if ( isset( $vars['orderby'] ) ) {
- if ( 'order_total' === $vars['orderby'] ) {
- $vars = array_merge( $vars, array(
- 'meta_key' => '_order_total', // WPCS: slow query ok.
- 'orderby' => 'meta_value_num',
- ) );
- }
- }
-
- // Status.
- if ( ! isset( $vars['post_status'] ) ) {
- $post_statuses = wc_get_order_statuses();
-
- foreach ( $post_statuses as $status => $value ) {
- if ( isset( $wp_post_statuses[ $status ] ) && false === $wp_post_statuses[ $status ]->show_in_admin_all_list ) {
- unset( $post_statuses[ $status ] );
- }
- }
-
- $vars['post_status'] = array_keys( $post_statuses );
- }
- }
-
- return $vars;
- }
-
- /**
- * Filter the products in admin based on options.
- *
- * @param WP_Query $query The WP_Query instance.
- */
- public function product_filters_query( $query ) {
- global $typenow, $wp_query;
-
- if ( 'product' === $typenow ) {
-
- if ( isset( $query->query_vars['product_type'] ) ) {
- // Subtypes.
- if ( 'downloadable' === $query->query_vars['product_type'] ) {
- $query->query_vars['product_type'] = '';
- $query->is_tax = false;
- $query->query_vars['meta_value'] = 'yes'; // WPCS: slow query ok.
- $query->query_vars['meta_key'] = '_downloadable'; // WPCS: slow query ok.
- } elseif ( 'virtual' === $query->query_vars['product_type'] ) {
- $query->query_vars['product_type'] = '';
- $query->is_tax = false;
- $query->query_vars['meta_value'] = 'yes'; // WPCS: slow query ok.
- $query->query_vars['meta_key'] = '_virtual'; // WPCS: slow query ok.
- }
- }
-
- // Shipping classes.
- if ( isset( $_GET['product_shipping_class'] ) && '0' === $_GET['product_shipping_class'] ) { // WPCS: input var okay, CSRF ok.
- $query->query_vars['tax_query'][] = array(
- 'taxonomy' => 'product_shipping_class',
- 'field' => 'id',
- 'terms' => get_terms( 'product_shipping_class', array(
- 'fields' => 'ids',
- ) ),
- 'operator' => 'NOT IN',
- );
- }
- }
- }
-
- /**
- * Search by SKU or ID for products.
- *
- * @param string $where Where to search.
- * @return string
- */
- public function product_search( $where ) {
- global $pagenow, $wpdb, $wp;
-
- if ( 'edit.php' !== $pagenow || ! is_search() || ! isset( $wp->query_vars['s'] ) || 'product' !== $wp->query_vars['post_type'] ) {
- return $where;
- }
-
- $search_ids = array();
- $terms = explode( ',', $wp->query_vars['s'] );
-
- foreach ( $terms as $term ) {
- if ( is_numeric( $term ) ) {
- $search_ids[] = $term;
- }
-
- // Attempt to get a SKU.
- $sku_to_id = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_parent FROM {$wpdb->posts} LEFT JOIN {$wpdb->postmeta} ON {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id WHERE meta_key='_sku' AND meta_value LIKE %s;", '%' . $wpdb->esc_like( wc_clean( $term ) ) . '%' ) ); // WPCS: DB call ok, cache ok.
- $sku_to_id = array_merge( wp_list_pluck( $sku_to_id, 'ID' ), wp_list_pluck( $sku_to_id, 'post_parent' ) );
-
- if ( 0 < count( $sku_to_id ) ) {
- $search_ids = array_merge( $search_ids, $sku_to_id );
- }
- }
-
- $search_ids = array_filter( array_unique( array_map( 'absint', $search_ids ) ) );
-
- if ( 0 < count( $search_ids ) ) {
- $where = str_replace( 'AND (((', "AND ( ({$wpdb->posts}.ID IN (" . implode( ',', $search_ids ) . ')) OR ((', $where );
- }
-
- return $where;
- }
-
/**
* Disable the auto-save functionality for Orders.
*/
@@ -1741,7 +651,7 @@ class WC_Admin_Post_Types {
/**
* Output extra data on post forms.
*
- * @param WP_Post $post Post instance.
+ * @param WP_Post $post Current post object.
*/
public function edit_form_top( $post ) {
echo '
+
';
- esc_html_e( 'Catalog visibility:', 'woocommerce' );
- echo ' ';
- echo isset( $visibility_options[ $current_visibility ] ) ? esc_html( $visibility_options[ $current_visibility ] ) : esc_html( $current_visibility );
- if ( 'yes' === $current_featured ) {
- echo ', ' . esc_html__( 'Featured', 'woocommerce' );
- }
- echo ' ';
+ echo isset( $visibility_options[ $current_visibility ] ) ? esc_html( $visibility_options[ $current_visibility ] ) : esc_html( $current_visibility );
- echo '' . esc_html__( 'Edit', 'woocommerce' ) . ' ';
- echo '';
- echo '
';
- echo '
';
- echo '
' . esc_html__( 'This setting determines which shop pages products will be listed on.', 'woocommerce' ) . '
';
+ if ( 'yes' === $current_featured ) {
+ echo ', ' . esc_html__( 'Featured', 'woocommerce' );
+ }
+ ?>
- foreach ( $visibility_options as $name => $label ) {
- echo '
' . esc_html( $label ) . ' ';
- }
+
- echo '
' . esc_html__( 'This is a featured product', 'woocommerce' ) . ' ';
- echo '
';
- echo '' . esc_html__( 'OK', 'woocommerce' ) . ' ';
- echo '' . esc_html__( 'Cancel', 'woocommerce' ) . ' ';
- echo '
';
- echo '
+
+
+
+
+ ' . esc_html__( 'This setting determines which shop pages products will be listed on.', 'woocommerce' ) . '';
+
+ foreach ( $visibility_options as $name => $label ) {
+ echo '
' . esc_html( $label ) . ' ';
+ }
+
+ echo '
' . esc_html_e( 'This is a featured product', 'woocommerce' ) . ' ';
+ ?>
+
+
+
';
-
- switch ( $post_type ) {
- case 'shop_order':
- ?>
-
-
-
-
-
-
-
-
-
- #posts-filter .wp-list-table, #posts-filter .tablenav.top, .tablenav.bottom .actions, .wrap .subsubsub { display: none; }
-
- You can read more about this here.', 'woocommerce' ), 'https://docs.woocommerce.com/document/woocommerce-pages/#section-4' );
- ?>
-
-
' . sprintf( wp_kses_post( __( 'This is the WooCommerce shop page. The shop page is a special archive that lists your products. You can read more about this here .', 'woocommerce' ), 'https://docs.woocommerce.com/document/woocommerce-pages/#section-4' ) ) . '
';
+ echo '';
}
}
@@ -2025,3 +862,5 @@ class WC_Admin_Post_Types {
return $post_states;
}
}
+
+new WC_Admin_Post_Types();
diff --git a/includes/admin/class-wc-admin-settings.php b/includes/admin/class-wc-admin-settings.php
index 861784851bc..1189c2cadde 100644
--- a/includes/admin/class-wc-admin-settings.php
+++ b/includes/admin/class-wc-admin-settings.php
@@ -2,10 +2,10 @@
/**
* WooCommerce Admin Settings Class
*
- * @author WooThemes
+ * @author Automattic
* @category Admin
* @package WooCommerce/Admin
- * @version 2.5.0
+ * @version 3.3.0
*/
if ( ! defined( 'ABSPATH' ) ) {
@@ -14,866 +14,885 @@ if ( ! defined( 'ABSPATH' ) ) {
if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
-/**
- * WC_Admin_Settings Class.
- */
-class WC_Admin_Settings {
-
/**
- * Setting pages.
- *
- * @var array
+ * WC_Admin_Settings Class.
*/
- private static $settings = array();
+ class WC_Admin_Settings {
- /**
- * Error messages.
- *
- * @var array
- */
- private static $errors = array();
+ /**
+ * Setting pages.
+ *
+ * @var array
+ */
+ private static $settings = array();
- /**
- * Update messages.
- *
- * @var array
- */
- private static $messages = array();
+ /**
+ * Error messages.
+ *
+ * @var array
+ */
+ private static $errors = array();
- /**
- * Include the settings page classes.
- */
- public static function get_settings_pages() {
- if ( empty( self::$settings ) ) {
- $settings = array();
+ /**
+ * Update messages.
+ *
+ * @var array
+ */
+ private static $messages = array();
- include_once( dirname( __FILE__ ) . '/settings/class-wc-settings-page.php' );
+ /**
+ * Include the settings page classes.
+ */
+ public static function get_settings_pages() {
+ if ( empty( self::$settings ) ) {
+ $settings = array();
- $settings[] = include( 'settings/class-wc-settings-general.php' );
- $settings[] = include( 'settings/class-wc-settings-products.php' );
- $settings[] = include( 'settings/class-wc-settings-tax.php' );
- $settings[] = include( 'settings/class-wc-settings-shipping.php' );
- $settings[] = include( 'settings/class-wc-settings-checkout.php' );
- $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-api.php' );
+ include_once( dirname( __FILE__ ) . '/settings/class-wc-settings-page.php' );
- self::$settings = apply_filters( 'woocommerce_get_settings_pages', $settings );
+ $settings[] = include( 'settings/class-wc-settings-general.php' );
+ $settings[] = include( 'settings/class-wc-settings-products.php' );
+ $settings[] = include( 'settings/class-wc-settings-tax.php' );
+ $settings[] = include( 'settings/class-wc-settings-shipping.php' );
+ $settings[] = include( 'settings/class-wc-settings-checkout.php' );
+ $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-rest-api.php' );
+
+ self::$settings = apply_filters( 'woocommerce_get_settings_pages', $settings );
+ }
+
+ return self::$settings;
}
- return self::$settings;
- }
+ /**
+ * Save the settings.
+ */
+ public static function save() {
+ global $current_tab;
- /**
- * Save the settings.
- */
- public static function save() {
- global $current_tab;
+ check_admin_referer( 'woocommerce-settings' );
- if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'woocommerce-settings' ) ) {
- die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
+ // Trigger actions.
+ do_action( 'woocommerce_settings_save_' . $current_tab );
+ do_action( 'woocommerce_update_options_' . $current_tab );
+ do_action( 'woocommerce_update_options' );
+
+ self::add_message( __( 'Your settings have been saved.', 'woocommerce' ) );
+ self::check_download_folder_protection();
+
+ // Clear any unwanted data and flush rules.
+ delete_transient( 'woocommerce_cache_excluded_uris' );
+ WC()->query->init_query_vars();
+ WC()->query->add_endpoints();
+ wp_schedule_single_event( time(), 'woocommerce_flush_rewrite_rules' );
+
+ do_action( 'woocommerce_settings_saved' );
}
- // Trigger actions
- do_action( 'woocommerce_settings_save_' . $current_tab );
- do_action( 'woocommerce_update_options_' . $current_tab );
- do_action( 'woocommerce_update_options' );
-
- self::add_message( __( 'Your settings have been saved.', 'woocommerce' ) );
- self::check_download_folder_protection();
-
- // Clear any unwanted data and flush rules
- delete_transient( 'woocommerce_cache_excluded_uris' );
- WC()->query->init_query_vars();
- WC()->query->add_endpoints();
- wp_schedule_single_event( time(), 'woocommerce_flush_rewrite_rules' );
-
- do_action( 'woocommerce_settings_saved' );
- }
-
- /**
- * Add a message.
- * @param string $text
- */
- public static function add_message( $text ) {
- self::$messages[] = $text;
- }
-
- /**
- * Add an error.
- * @param string $text
- */
- public static function add_error( $text ) {
- self::$errors[] = $text;
- }
-
- /**
- * Output messages + errors.
- */
- public static function show_messages() {
- if ( sizeof( self::$errors ) > 0 ) {
- foreach ( self::$errors as $error ) {
- echo '' . esc_html( $error ) . '
' . esc_html( $message ) . '
' . esc_html( $error ) . '
' . esc_html( $message ) . '
' . esc_html( $value['title'] ) . ' ';
+ do_action( 'woocommerce_settings_start' );
+
+ wp_enqueue_script( 'woocommerce_settings', WC()->plugin_url() . '/assets/js/admin/settings' . $suffix . '.js', array( 'jquery', 'jquery-ui-datepicker', 'jquery-ui-sortable', 'iris', 'selectWoo' ), WC()->version, true );
+
+ wp_localize_script( 'woocommerce_settings', 'woocommerce_settings_params', array(
+ 'i18n_nav_warning' => __( 'The changes you made will be lost if you navigate away from this page.', 'woocommerce' ),
+ ) );
+
+ // Get tabs for the settings page.
+ $tabs = apply_filters( 'woocommerce_settings_tabs_array', array() );
+
+ include( dirname( __FILE__ ) . '/views/html-admin-settings.php' );
+ }
+
+ /**
+ * Get a setting from the settings API.
+ *
+ * @param string $option_name Option name.
+ * @param mixed $default Default value.
+ * @return mixed
+ */
+ public static function get_option( $option_name, $default = '' ) {
+ // Array value.
+ if ( strstr( $option_name, '[' ) ) {
+
+ parse_str( $option_name, $option_array );
+
+ // Option name is first key.
+ $option_name = current( array_keys( $option_array ) );
+
+ // Get value.
+ $option_values = get_option( $option_name, '' );
+
+ $key = key( $option_array[ $option_name ] );
+
+ if ( isset( $option_values[ $key ] ) ) {
+ $option_value = $option_values[ $key ];
+ } else {
+ $option_value = null;
+ }
+ } else {
+ // Single value.
+ $option_value = get_option( $option_name, null );
+ }
+
+ if ( is_array( $option_value ) ) {
+ $option_value = array_map( 'stripslashes', $option_value );
+ } elseif ( ! is_null( $option_value ) ) {
+ $option_value = stripslashes( $option_value );
+ }
+
+ return ( null === $option_value ) ? $default : $option_value;
+ }
+
+ /**
+ * Output admin fields.
+ *
+ * Loops though the woocommerce options array and outputs each field.
+ *
+ * @param array $options Opens array to output.
+ */
+ public static function output_fields( $options ) {
+ foreach ( $options as $value ) {
+ if ( ! isset( $value['type'] ) ) {
+ continue;
+ }
+ if ( ! isset( $value['id'] ) ) {
+ $value['id'] = '';
+ }
+ if ( ! isset( $value['title'] ) ) {
+ $value['title'] = isset( $value['name'] ) ? $value['name'] : '';
+ }
+ if ( ! isset( $value['class'] ) ) {
+ $value['class'] = '';
+ }
+ if ( ! isset( $value['css'] ) ) {
+ $value['css'] = '';
+ }
+ if ( ! isset( $value['default'] ) ) {
+ $value['default'] = '';
+ }
+ if ( ! isset( $value['desc'] ) ) {
+ $value['desc'] = '';
+ }
+ if ( ! isset( $value['desc_tip'] ) ) {
+ $value['desc_tip'] = false;
+ }
+ if ( ! isset( $value['placeholder'] ) ) {
+ $value['placeholder'] = '';
+ }
+ if ( ! isset( $value['suffix'] ) ) {
+ $value['suffix'] = '';
+ }
+
+ // Custom attribute handling.
+ $custom_attributes = array();
+
+ if ( ! empty( $value['custom_attributes'] ) && is_array( $value['custom_attributes'] ) ) {
+ foreach ( $value['custom_attributes'] as $attribute => $attribute_value ) {
+ $custom_attributes[] = esc_attr( $attribute ) . '="' . esc_attr( $attribute_value ) . '"';
}
- if ( ! empty( $value['desc'] ) ) {
- echo wpautop( wptexturize( wp_kses_post( $value['desc'] ) ) );
- }
- echo '';
- if ( ! empty( $value['id'] ) ) {
- do_action( 'woocommerce_settings_' . sanitize_title( $value['id'] ) . '_after' );
- }
- break;
+ // Description handling.
+ $field_description = self::get_field_description( $value );
+ $description = $field_description['description'];
+ $tooltip_html = $field_description['tooltip_html'];
- // Standard text inputs and subtypes like 'number'
- case 'text':
- case 'email':
- case 'number':
- case 'password' :
- $option_value = self::get_option( $value['id'], $value['default'] );
+ // Switch based on type.
+ switch ( $value['type'] ) {
- ?>
-
-
-
-
- ' . esc_html( $value['title'] ) . '';
+ }
+ if ( ! empty( $value['desc'] ) ) {
+ echo wp_kses_post( wpautop( wptexturize( $value['desc'] ) ) );
+ }
+ echo '';
+ if ( ! empty( $value['id'] ) ) {
+ do_action( 'woocommerce_settings_' . sanitize_title( $value['id'] ) . '_after' );
+ }
+ break;
- ?>
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+ ?>
+
+
+
+
+
+
+
+ "
- id=""
- style=""
- class=""
- placeholder=""
-
- >
-
-
+
+
+
+
+
- $option_value = self::get_option( $value['id'], $value['default'] );
+
+
+
+
-
-
-
-
-
- >
-
+
+
+
+
+
+
+ >
+ $val ) {
?>
- >
+ ?>
+ >
+
-
-
-
+
+
+
+
-
-
-
-
-
-
- " . __( 'The settings of this image size have been disabled because its values are being overwritten by a filter.', 'woocommerce' ) . " ";
- }
-
- ?>
-
-
-
-
-
+
-
-
-
-
+ $value['id'],
+ 'id' => $value['id'],
+ 'sort_column' => 'menu_order',
+ 'sort_order' => 'ASC',
+ 'show_option_none' => ' ',
+ 'class' => $value['class'],
+ 'echo' => false,
+ 'selected' => absint( self::get_option( $value['id'] ) ),
+ );
- $args = array(
- 'name' => $value['id'],
- 'id' => $value['id'],
- 'sort_column' => 'menu_order',
- 'sort_order' => 'ASC',
- 'show_option_none' => ' ',
- 'class' => $value['class'],
- 'echo' => false,
- 'selected' => absint( self::get_option( $value['id'] ) ),
- );
+ if ( isset( $value['args'] ) ) {
+ $args = wp_parse_args( $value['args'], $args );
+ }
- if ( isset( $value['args'] ) ) {
- $args = wp_parse_args( $value['args'], $args );
- }
+ ?>
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+ countries->country_dropdown_options( $country, $state ); ?>
+
+
+
-
-
-
- countries->country_dropdown_options( $country, $state ); ?>
-
- countries->countries;
+ }
- $selections = (array) self::get_option( $value['id'] );
-
- if ( ! empty( $value['options'] ) ) {
- $countries = $value['options'];
- } else {
- $countries = WC()->countries->countries;
- }
-
- asort( $countries );
- ?>
-
-
-
-
-
+
+
+
+
+
+ $val ) {
- echo '' . $val . ' ';
+ echo '' . esc_html( $val ) . ' ';
}
}
- ?>
-
- ' . wp_kses_post( $description ) . '';
- } elseif ( $description && in_array( $value['type'], array( 'checkbox' ) ) ) {
- $description = wp_kses_post( $description );
- } elseif ( $description ) {
- $description = '' . wp_kses_post( $description ) . ' ';
- }
-
- if ( $tooltip_html && in_array( $value['type'], array( 'checkbox' ) ) ) {
- $tooltip_html = '' . $tooltip_html . '
';
- } elseif ( $tooltip_html ) {
- $tooltip_html = wc_help_tip( $tooltip_html );
- }
-
- return array(
- 'description' => $description,
- 'tooltip_html' => $tooltip_html,
- );
- }
-
- /**
- * Save admin fields.
- *
- * Loops though the woocommerce options array and outputs each field.
- *
- * @param array $options Options array to output
- * @param array $data Optional. Data to use for saving. Defaults to $_POST.
- * @return bool
- */
- public static function save_fields( $options, $data = null ) {
- if ( is_null( $data ) ) {
- $data = $_POST;
- }
- if ( empty( $data ) ) {
- return false;
- }
-
- // Options to update will be stored here and saved later.
- $update_options = array();
-
- // Loop options and get values to save.
- foreach ( $options as $option ) {
- if ( ! isset( $option['id'] ) || ! isset( $option['type'] ) ) {
- continue;
- }
-
- // Get posted value.
- if ( strstr( $option['id'], '[' ) ) {
- parse_str( $option['id'], $option_name_array );
- $option_name = current( array_keys( $option_name_array ) );
- $setting_name = key( $option_name_array[ $option_name ] );
- $raw_value = isset( $data[ $option_name ][ $setting_name ] ) ? wp_unslash( $data[ $option_name ][ $setting_name ] ) : null;
- } else {
- $option_name = $option['id'];
- $setting_name = '';
- $raw_value = isset( $data[ $option['id'] ] ) ? wp_unslash( $data[ $option['id'] ] ) : null;
- }
-
- // Format the value based on option type.
- switch ( $option['type'] ) {
- case 'checkbox' :
- $value = '1' === $raw_value || 'yes' === $raw_value ? 'yes' : 'no';
- break;
- case 'textarea' :
- $value = wp_kses_post( trim( $raw_value ) );
- break;
- case 'multiselect' :
- case 'multi_select_countries' :
- $value = array_filter( array_map( 'wc_clean', (array) $raw_value ) );
- break;
- case 'image_width' :
- $value = array();
- if ( isset( $raw_value['width'] ) ) {
- $value['width'] = wc_clean( $raw_value['width'] );
- $value['height'] = wc_clean( $raw_value['height'] );
- $value['crop'] = isset( $raw_value['crop'] ) ? 1 : 0;
- } else {
- $value['width'] = $option['default']['width'];
- $value['height'] = $option['default']['height'];
- $value['crop'] = $option['default']['crop'];
- }
- break;
- case 'thumbnail_cropping' :
- $value = wc_clean( $raw_value );
-
- if ( 'custom' === $value ) {
- $width_ratio = wc_clean( wp_unslash( $_POST['thumbnail_cropping_aspect_ratio_width'] ) );
- $height_ratio = wc_clean( wp_unslash( $_POST['thumbnail_cropping_aspect_ratio_height'] ) );
- $value = $width_ratio . ':' . $height_ratio;
- }
- break;
- case 'select':
- $allowed_values = empty( $option['options'] ) ? array() : array_keys( $option['options'] );
- if ( empty( $option['default'] ) && empty( $allowed_values ) ) {
- $value = null;
+ ?>
+
+
+ ' . wp_kses_post( $description ) . '';
+ } elseif ( $description && in_array( $value['type'], array( 'checkbox' ), true ) ) {
+ $description = wp_kses_post( $description );
+ } elseif ( $description ) {
+ $description = '' . wp_kses_post( $description ) . ' ';
+ }
+
+ if ( $tooltip_html && in_array( $value['type'], array( 'checkbox' ), true ) ) {
+ $tooltip_html = '' . $tooltip_html . '
';
+ } elseif ( $tooltip_html ) {
+ $tooltip_html = wc_help_tip( $tooltip_html );
+ }
+
+ return array(
+ 'description' => $description,
+ 'tooltip_html' => $tooltip_html,
+ );
+ }
+
+ /**
+ * Save admin fields.
+ *
+ * Loops though the woocommerce options array and outputs each field.
+ *
+ * @param array $options Options array to output.
+ * @param array $data Optional. Data to use for saving. Defaults to $_POST.
+ * @return bool
+ */
+ public static function save_fields( $options, $data = null ) {
+ if ( is_null( $data ) ) {
+ $data = $_POST; // WPCS: input var okay, CSRF ok.
+ }
+ if ( empty( $data ) ) {
+ return false;
+ }
+
+ // Options to update will be stored here and saved later.
+ $update_options = array();
+
+ // Loop options and get values to save.
+ foreach ( $options as $option ) {
+ if ( ! isset( $option['id'] ) || ! isset( $option['type'] ) ) {
+ continue;
+ }
+
+ // Get posted value.
+ if ( strstr( $option['id'], '[' ) ) {
+ parse_str( $option['id'], $option_name_array );
+ $option_name = current( array_keys( $option_name_array ) );
+ $setting_name = key( $option_name_array[ $option_name ] );
+ $raw_value = isset( $data[ $option_name ][ $setting_name ] ) ? wp_unslash( $data[ $option_name ][ $setting_name ] ) : null;
+ } else {
+ $option_name = $option['id'];
+ $setting_name = '';
+ $raw_value = isset( $data[ $option['id'] ] ) ? wp_unslash( $data[ $option['id'] ] ) : null;
+ }
+
+ // Format the value based on option type.
+ switch ( $option['type'] ) {
+ case 'checkbox':
+ $value = '1' === $raw_value || 'yes' === $raw_value ? 'yes' : 'no';
+ break;
+ case 'textarea':
+ $value = wp_kses_post( trim( $raw_value ) );
+ break;
+ case 'multiselect':
+ case 'multi_select_countries':
+ $value = array_filter( array_map( 'wc_clean', (array) $raw_value ) );
+ break;
+ case 'image_width':
+ $value = array();
+ if ( isset( $raw_value['width'] ) ) {
+ $value['width'] = wc_clean( $raw_value['width'] );
+ $value['height'] = wc_clean( $raw_value['height'] );
+ $value['crop'] = isset( $raw_value['crop'] ) ? 1 : 0;
+ } else {
+ $value['width'] = $option['default']['width'];
+ $value['height'] = $option['default']['height'];
+ $value['crop'] = $option['default']['crop'];
+ }
+ break;
+ case 'thumbnail_cropping':
+ $value = wc_clean( $raw_value );
+
+ if ( 'custom' === $value ) {
+ $width_ratio = isset( $_POST['thumbnail_cropping_aspect_ratio_width'] ) ? wc_clean( wp_unslash( $_POST['thumbnail_cropping_aspect_ratio_width'] ) ) : '1'; // WPCS: input var ok, CSRF ok.
+ $height_ratio = isset( $_POST['thumbnail_cropping_aspect_ratio_height'] ) ? wc_clean( wp_unslash( $_POST['thumbnail_cropping_aspect_ratio_height'] ) ) : '1'; // WPCS: input var ok, CSRF ok.
+ $value = $width_ratio . ':' . $height_ratio;
+ }
+ break;
+ case 'select':
+ $allowed_values = empty( $option['options'] ) ? array() : array_keys( $option['options'] );
+ if ( empty( $option['default'] ) && empty( $allowed_values ) ) {
+ $value = null;
+ break;
+ }
+ $default = ( empty( $option['default'] ) ? $allowed_values[0] : $option['default'] );
+ $value = in_array( $raw_value, $allowed_values, true ) ? $raw_value : $default;
+ break;
+ default:
+ $value = wc_clean( $raw_value );
+ break;
+ }
+
+ /**
+ * Fire an action when a certain 'type' of field is being saved.
+ *
+ * @deprecated 2.4.0 - doesn't allow manipulation of values!
+ */
+ if ( has_action( 'woocommerce_update_option_' . sanitize_title( $option['type'] ) ) ) {
+ wc_deprecated_function( 'The woocommerce_update_option_X action', '2.4.0', 'woocommerce_admin_settings_sanitize_option filter' );
+ do_action( 'woocommerce_update_option_' . sanitize_title( $option['type'] ), $option );
+ continue;
+ }
+
+ /**
+ * Sanitize the value of an option.
+ *
+ * @since 2.4.0
+ */
+ $value = apply_filters( 'woocommerce_admin_settings_sanitize_option', $value, $option, $raw_value );
+
+ /**
+ * Sanitize the value of an option by option name.
+ *
+ * @since 2.4.0
+ */
+ $value = apply_filters( "woocommerce_admin_settings_sanitize_option_$option_name", $value, $option, $raw_value );
+
+ if ( is_null( $value ) ) {
+ continue;
+ }
+
+ // Check if option is an array and handle that differently to single values.
+ if ( $option_name && $setting_name ) {
+ if ( ! isset( $update_options[ $option_name ] ) ) {
+ $update_options[ $option_name ] = get_option( $option_name, array() );
}
- $default = ( empty( $option['default'] ) ? $allowed_values[0] : $option['default'] );
- $value = in_array( $raw_value, $allowed_values ) ? $raw_value : $default;
- break;
- default :
- $value = wc_clean( $raw_value );
- break;
- }
-
- /**
- * Fire an action when a certain 'type' of field is being saved.
- * @deprecated 2.4.0 - doesn't allow manipulation of values!
- */
- if ( has_action( 'woocommerce_update_option_' . sanitize_title( $option['type'] ) ) ) {
- wc_deprecated_function( 'The woocommerce_update_option_X action', '2.4.0', 'woocommerce_admin_settings_sanitize_option filter' );
- do_action( 'woocommerce_update_option_' . sanitize_title( $option['type'] ), $option );
- continue;
- }
-
- /**
- * Sanitize the value of an option.
- * @since 2.4.0
- */
- $value = apply_filters( 'woocommerce_admin_settings_sanitize_option', $value, $option, $raw_value );
-
- /**
- * Sanitize the value of an option by option name.
- * @since 2.4.0
- */
- $value = apply_filters( "woocommerce_admin_settings_sanitize_option_$option_name", $value, $option, $raw_value );
-
- if ( is_null( $value ) ) {
- continue;
- }
-
- // Check if option is an array and handle that differently to single values.
- if ( $option_name && $setting_name ) {
- if ( ! isset( $update_options[ $option_name ] ) ) {
- $update_options[ $option_name ] = get_option( $option_name, array() );
+ if ( ! is_array( $update_options[ $option_name ] ) ) {
+ $update_options[ $option_name ] = array();
+ }
+ $update_options[ $option_name ][ $setting_name ] = $value;
+ } else {
+ $update_options[ $option_name ] = $value;
}
- if ( ! is_array( $update_options[ $option_name ] ) ) {
- $update_options[ $option_name ] = array();
+
+ /**
+ * Fire an action before saved.
+ *
+ * @deprecated 2.4.0 - doesn't allow manipulation of values!
+ */
+ do_action( 'woocommerce_update_option', $option );
+ }
+
+ // Save all options in our array.
+ foreach ( $update_options as $name => $value ) {
+ update_option( $name, $value );
+ }
+
+ return true;
+ }
+
+ /**
+ * Checks which method we're using to serve downloads.
+ *
+ * If using force or x-sendfile, this ensures the .htaccess is in place.
+ */
+ public static function check_download_folder_protection() {
+ $upload_dir = wp_upload_dir();
+ $downloads_url = $upload_dir['basedir'] . '/woocommerce_uploads';
+ $download_method = get_option( 'woocommerce_file_download_method' );
+
+ if ( 'redirect' === $download_method ) {
+
+ // Redirect method - don't protect.
+ if ( file_exists( $downloads_url . '/.htaccess' ) ) {
+ unlink( $downloads_url . '/.htaccess' ); // @codingStandardsIgnoreLine
}
- $update_options[ $option_name ][ $setting_name ] = $value;
} else {
- $update_options[ $option_name ] = $value;
- }
- /**
- * Fire an action before saved.
- * @deprecated 2.4.0 - doesn't allow manipulation of values!
- */
- do_action( 'woocommerce_update_option', $option );
- }
-
- // Save all options in our array.
- foreach ( $update_options as $name => $value ) {
- update_option( $name, $value );
- }
-
- return true;
- }
-
- /**
- * Checks which method we're using to serve downloads.
- *
- * If using force or x-sendfile, this ensures the .htaccess is in place.
- */
- public static function check_download_folder_protection() {
- $upload_dir = wp_upload_dir();
- $downloads_url = $upload_dir['basedir'] . '/woocommerce_uploads';
- $download_method = get_option( 'woocommerce_file_download_method' );
-
- if ( 'redirect' == $download_method ) {
-
- // Redirect method - don't protect
- if ( file_exists( $downloads_url . '/.htaccess' ) ) {
- unlink( $downloads_url . '/.htaccess' );
- }
- } else {
-
- // Force method - protect, add rules to the htaccess file
- if ( ! file_exists( $downloads_url . '/.htaccess' ) ) {
- if ( $file_handle = @fopen( $downloads_url . '/.htaccess', 'w' ) ) {
- fwrite( $file_handle, 'deny from all' );
- fclose( $file_handle );
+ // Force method - protect, add rules to the htaccess file.
+ if ( ! file_exists( $downloads_url . '/.htaccess' ) ) {
+ $file_handle = @fopen( $downloads_url . '/.htaccess', 'w' ); // @codingStandardsIgnoreLine
+ if ( $file_handle ) {
+ fwrite( $file_handle, 'deny from all' ); // @codingStandardsIgnoreLine
+ fclose( $file_handle ); // @codingStandardsIgnoreLine
+ }
}
}
}
}
-}
endif;
diff --git a/includes/admin/class-wc-admin-webhooks-table-list.php b/includes/admin/class-wc-admin-webhooks-table-list.php
index 8a6b54e6b70..7a960a6add9 100644
--- a/includes/admin/class-wc-admin-webhooks-table-list.php
+++ b/includes/admin/class-wc-admin-webhooks-table-list.php
@@ -2,20 +2,23 @@
/**
* WooCommerce Webhooks Table List
*
- * @author WooThemes
+ * @author Automattic
* @category Admin
* @package WooCommerce/Admin
- * @version 2.4.0
+ * @version 3.3.0
*/
if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
+ exit; // Exit if accessed directly.
}
if ( ! class_exists( 'WP_List_Table' ) ) {
require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
}
+/**
+ * Webooks table list class.
+ */
class WC_Admin_Webhooks_Table_List extends WP_List_Table {
/**
@@ -47,70 +50,38 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
/**
* Column cb.
*
- * @param WC_Post $webhook
+ * @param WC_Webhook $webhook Webhook instance.
* @return string
*/
public function column_cb( $webhook ) {
- return sprintf( '';
- if ( 'trash' == $post_status ) {
- $output .= esc_html( $title );
- } else {
- $output .= '' . esc_html( $title ) . ' ';
- }
- $output .= ' ';
+ // Title.
+ $output .= '' . esc_html( $webhook->get_name() ) . ' ' . esc_html__( 'Edit', 'woocommerce' ) . ' ',
+ /* translators: %s: webhook name */
+ 'delete' => 'get_name() ) ) . '" href="' . esc_url( wp_nonce_url( add_query_arg( array(
+ 'delete' => $webhook->get_id(),
+ ), admin_url( 'admin.php?page=wc-settings&tab=api§ion=webhooks' ) ), 'delete-webhook' ) ) . '">' . esc_html__( 'Delete permanently', 'woocommerce' ) . ' ',
);
- 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' == $post_status ) {
- $actions['untrash'] = '' . esc_html__( 'Restore', 'woocommerce' ) . ' ';
- } elseif ( EMPTY_TRASH_DAYS ) {
- $actions['trash'] = '' . esc_html__( 'Trash', 'woocommerce' ) . ' ';
- }
- if ( 'trash' == $post_status || ! EMPTY_TRASH_DAYS ) {
- $actions['delete'] = '' . esc_html__( 'Delete permanently', 'woocommerce' ) . ' ';
- }
- }
-
- $actions = apply_filters( 'post_row_actions', $actions, $the_webhook->get_post_data() );
+ $actions = apply_filters( 'webhook_row_actions', $actions, $webhook );
$row_actions = array();
foreach ( $actions as $action => $link ) {
@@ -124,75 +95,59 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
/**
* Return status column.
- * @param object $webhook
+ *
+ * @param WC_Webhook $webhook Webhook instance.
* @return string
*/
public function column_status( $webhook ) {
- return $this->get_webbook_object( $webhook )->get_i18n_status();
+ return $webhook->get_i18n_status();
}
/**
* Return topic column.
- * @param object $webhook
+ *
+ * @param WC_Webhook $webhook Webhook instance.
* @return string
*/
public function column_topic( $webhook ) {
- return $this->get_webbook_object( $webhook )->get_topic();
+ return $webhook->get_topic();
}
/**
* Return delivery URL column.
- * @param object $webhook
+ *
+ * @param WC_Webhook $webhook Webhook instance.
* @return string
*/
public function column_delivery_url( $webhook ) {
- return $this->get_webbook_object( $webhook )->get_delivery_url();
+ return $webhook->get_delivery_url();
}
/**
* Get the status label for webhooks.
*
- * @param string $status_name
- * @param stdClass $status
- *
+ * @param string $status_name Status name.
+ * @param int $amount Amount of webhooks.
* @return array
*/
- private function get_status_label( $status_name, $status ) {
- switch ( $status_name ) {
- case 'publish' :
- /* translators: %s: count */
- $label = array(
- 'singular' => __( 'Activated (%s) ', 'woocommerce' ),
- 'plural' => __( 'Activated (%s) ', 'woocommerce' ),
- 'context' => '',
- 'domain' => 'woocommerce',
- );
- break;
- case 'draft' :
- /* translators: %s: count */
- $label = array(
- 'singular' => __( 'Paused (%s) ', 'woocommerce' ),
- 'plural' => __( 'Paused (%s) ', 'woocommerce' ),
- 'context' => '',
- 'domain' => 'woocommerce',
- );
- break;
- case 'pending' :
- /* translators: %s: count */
- $label = array(
- 'singular' => __( 'Disabled (%s) ', 'woocommerce' ),
- 'plural' => __( 'Disabled (%s) ', 'woocommerce' ),
- 'context' => '',
- 'domain' => 'woocommerce',
- );
- break;
+ private function get_status_label( $status_name, $amount ) {
+ $statuses = wc_get_webhook_statuses();
- default:
- $label = $status->label_count;
- break;
+ if ( isset( $statuses[ $status_name ] ) ) {
+ return array(
+ 'singular' => sprintf( '%s (%s) ', esc_html( $statuses[ $status_name ] ), $amount ),
+ 'plural' => sprintf( '%s (%s) ', esc_html( $statuses[ $status_name ] ), $amount ),
+ 'context' => '',
+ 'domain' => 'woocommerce',
+ );
}
- return $label;
+ return array(
+ 'singular' => sprintf( '%s (%s) ', esc_html( $status_name ), $amount ),
+ 'plural' => sprintf( '%s (%s) ', esc_html( $status_name ), $amount ),
+ 'context' => '',
+ 'domain' => 'woocommerce',
+ );
}
/**
@@ -201,39 +156,30 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
* @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 );
+ $status_links = array();
+ $data_store = WC_Data_Store::load( 'webhook' );
+ $num_webhooks = $data_store->get_count_webhooks_by_status();
+ $total_webhooks = array_sum( (array) $num_webhooks );
+ $statuses = array_keys( wc_get_webhook_statuses() );
+ $class = empty( $_REQUEST['status'] ) ? ' class="current"' : ''; // WPCS: input var okay. CSRF ok.
- // 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"' : '';
/* translators: %s: count */
- $status_links['all'] = "" . sprintf( _nx( 'All (%s) ', 'All (%s) ', $total_posts, 'posts', 'woocommerce' ), number_format_i18n( $total_posts ) ) . ' ';
+ $status_links['all'] = "" . sprintf( _nx( 'All (%s) ', 'All (%s) ', $total_webhooks, 'posts', 'woocommerce' ), number_format_i18n( $total_webhooks ) ) . ' ';
- foreach ( get_post_stati( array( 'show_in_admin_status_list' => true ), 'objects' ) as $status ) {
+ foreach ( $statuses as $status_name ) {
$class = '';
- $status_name = $status->name;
- if ( ! in_array( $status_name, array( 'publish', 'draft', 'pending', 'trash', 'future', 'private', 'auto-draft' ) ) ) {
+ if ( empty( $num_webhooks[ $status_name ] ) ) {
continue;
}
- if ( empty( $num_posts->$status_name ) ) {
- continue;
- }
-
- if ( isset( $_REQUEST['status'] ) && $status_name == $_REQUEST['status'] ) {
+ if ( isset( $_REQUEST['status'] ) && sanitize_key( wp_unslash( $_REQUEST['status'] ) ) === $status_name ) { // WPCS: input var okay, CSRF ok.
$class = ' class="current"';
}
- $label = $this->get_status_label( $status_name, $status );
+ $label = $this->get_status_label( $status_name, $num_webhooks[ $status_name ] );
- $status_links[ $status_name ] = "" . sprintf( translate_nooped_plural( $label, $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . ' ';
+ $status_links[ $status_name ] = "" . sprintf( translate_nooped_plural( $label, $num_webhooks[ $status_name ] ), number_format_i18n( $num_webhooks[ $status_name ] ) ) . ' ';
}
return $status_links;
@@ -245,69 +191,96 @@ class WC_Admin_Webhooks_Table_List extends WP_List_Table {
* @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' ),
+ 'delete' => __( 'Delete permanently', 'woocommerce' ),
);
}
/**
- * Extra controls to be displayed between bulk actions and pagination.
+ * Generate the table navigation above or below the table.
+ * Included to remove extra nonce input.
*
- * @param string $which
+ * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
*/
- protected function extra_tablenav( $which ) {
- if ( 'top' == $which && isset( $_GET['status'] ) && 'trash' == $_GET['status'] && current_user_can( 'delete_shop_webhooks' ) ) {
- echo '';
+ protected function display_tablenav( $which ) {
+ echo '';
+
+ if ( $this->has_items() ) {
+ echo '
';
+ $this->bulk_actions( $which );
+ echo '
';
}
+
+ $this->extra_tablenav( $which );
+ $this->pagination( $which );
+ echo '
';
+ echo '
';
+ echo '' . esc_html( $text ) . ': ';
+ echo '
';
}
/**
* Prepare table list items.
*/
public function prepare_items() {
- $per_page = apply_filters( 'woocommerce_webhooks_settings_posts_per_page', 10 );
+ $per_page = absint( apply_filters( 'woocommerce_webhooks_settings_posts_per_page', 10 ) );
+ $per_page = 0 === $per_page ? 10 : $per_page;
$columns = $this->get_columns();
$hidden = array();
$sortable = $this->get_sortable_columns();
- // Column headers
+ // Column headers.
$this->_column_headers = array( $columns, $hidden, $sortable );
$current_page = $this->get_pagenum();
- // Query args
+ // Query args.
$args = array(
- 'post_type' => 'shop_webhook',
- 'posts_per_page' => $per_page,
- 'ignore_sticky_posts' => true,
- 'paged' => $current_page,
+ 'limit' => $per_page,
+ 'offset' => $per_page * ( $current_page - 1 ),
);
- // Handle the status query
- if ( ! empty( $_REQUEST['status'] ) ) {
- $args['post_status'] = sanitize_text_field( $_REQUEST['status'] );
+ // Handle the status query.
+ if ( ! empty( $_REQUEST['status'] ) ) { // WPCS: input var okay, CSRF ok.
+ $args['status'] = sanitize_key( wp_unslash( $_REQUEST['status'] ) ); // WPCS: input var okay, CSRF ok.
}
- if ( ! empty( $_REQUEST['s'] ) ) {
- $args['s'] = sanitize_text_field( $_REQUEST['s'] );
+ if ( ! empty( $_REQUEST['s'] ) ) { // WPCS: input var okay, CSRF ok.
+ $args['search'] = sanitize_text_field( wp_unslash( $_REQUEST['s'] ) ); // WPCS: input var okay, CSRF ok.
}
- // Get the webhooks
- $webhooks = new WP_Query( $args );
- $this->items = $webhooks->posts;
+ // Get the webhooks.
+ $data_store = WC_Data_Store::load( 'webhook' );
+ $webhooks = $data_store->search_webhooks( $args );
+ $this->items = array_map( 'wc_get_webhook', $webhooks );
+ $total_items = count( $data_store->get_webhooks_ids() );
- // Set the pagination
+ // Set the pagination.
$this->set_pagination_args( array(
- 'total_items' => $webhooks->found_posts,
+ 'total_items' => $total_items,
'per_page' => $per_page,
- 'total_pages' => $webhooks->max_num_pages,
+ 'total_pages' => ceil( $total_items / $per_page ),
) );
}
}
diff --git a/includes/admin/class-wc-admin-webhooks.php b/includes/admin/class-wc-admin-webhooks.php
index 9caaee7ebf9..c4fd62657ee 100644
--- a/includes/admin/class-wc-admin-webhooks.php
+++ b/includes/admin/class-wc-admin-webhooks.php
@@ -2,14 +2,14 @@
/**
* WooCommerce Admin Webhooks Class
*
- * @author WooThemes
+ * @author Automattic
* @category Admin
* @package WooCommerce/Admin
- * @version 2.4.0
+ * @version 3.3.0
*/
if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
+ exit; // Exit if accessed directly.
}
/**
@@ -21,95 +21,94 @@ class WC_Admin_Webhooks {
* Initialize the webhooks admin actions.
*/
public function __construct() {
+ add_action( 'woocommerce_save_settings_api_webhooks', array( $this, 'allow_save_settings' ) );
add_action( 'admin_init', array( $this, 'actions' ) );
}
+ /**
+ * Check if should allow save settings.
+ * This prevents "Your settings have been saved." notices on the table list.
+ *
+ * @param bool $allow If allow save settings.
+ * @return bool
+ */
+ public function allow_save_settings( $allow ) {
+ if ( ! isset( $_GET['edit-webhook'] ) ) {// WPCS: input var okay, CSRF ok.
+ return false;
+ }
+
+ return $allow;
+ }
+
/**
* Check if is webhook settings page.
*
* @return bool
*/
private function is_webhook_settings_page() {
- return isset( $_GET['page'], $_GET['tab'], $_GET['section'] )
- && 'wc-settings' === $_GET['page']
- && 'api' === $_GET['tab']
- && 'webhooks' === $_GET['section'];
+ return isset( $_GET['page'], $_GET['tab'], $_GET['section'] ) && 'wc-settings' === $_GET['page'] && 'api' === $_GET['tab'] && 'webhooks' === $_GET['section']; // WPCS: input var okay, CSRF ok.
}
/**
- * Updated the Webhook name.
- *
- * @param int $webhook_id
+ * Save method.
*/
- private function update_name( $webhook_id ) {
- global $wpdb;
+ private function save() {
+ check_admin_referer( 'woocommerce-settings' );
- // @codingStandardsIgnoreStart
- /* translators: %s: date` */
- $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' ) ) );
- // @codingStandardsIgnoreEnd
- $wpdb->update( $wpdb->posts, array( 'post_title' => $name ), array( 'ID' => $webhook_id ) );
- }
+ if ( ! current_user_can( 'manage_woocommerce' ) ) {
+ wp_die( esc_html__( 'You do not have permission to update Webhooks', 'woocommerce' ) );
+ }
- /**
- * Updated the Webhook status.
- *
- * @param WC_Webhook $webhook
- */
- private function update_status( $webhook ) {
- $status = ! empty( $_POST['webhook_status'] ) ? wc_clean( $_POST['webhook_status'] ) : '';
+ $webhook_id = isset( $_POST['webhook_id'] ) ? absint( $_POST['webhook_id'] ) : 0; // WPCS: input var okay, CSRF ok.
+ $webhook = new WC_Webhook( $webhook_id );
- $webhook->update_status( $status );
- }
+ // Name.
+ if ( ! empty( $_POST['webhook_name'] ) ) { // WPCS: input var okay, CSRF ok.
+ $name = sanitize_text_field( wp_unslash( $_POST['webhook_name'] ) ); // WPCS: input var okay, CSRF ok.
+ } else {
+ $name = sprintf(
+ /* translators: %s: date */
+ __( 'Webhook created on %s', 'woocommerce' ),
+ // @codingStandardsIgnoreStart
+ strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) )
+ // @codingStandardsIgnoreEnd
+ );
+ }
- /**
- * 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'] : '';
+ $webhook->set_name( $name );
+
+ // Status.
+ $webhook->set_status( ! empty( $_POST['webhook_status'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_status'] ) ) : 'disabled' ); // WPCS: input var okay, CSRF ok.
+
+ // Delivery URL.
+ $delivery_url = ! empty( $_POST['webhook_delivery_url'] ) ? esc_url_raw( wp_unslash( $_POST['webhook_delivery_url'] ) ) : ''; // WPCS: input var okay, CSRF ok.
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'] : wp_generate_password( 50, true, true );
+ // Secret.
+ $secret = ! empty( $_POST['webhook_secret'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_secret'] ) ) : wp_generate_password( 50, true, true ); // WPCS: input var okay, CSRF ok.
$webhook->set_secret( $secret );
- }
-
- /**
- * Updated the Webhook topic.
- *
- * @param WC_Webhook $webhook
- */
- private function update_topic( $webhook ) {
- if ( ! empty( $_POST['webhook_topic'] ) ) {
+ // Topic.
+ if ( ! empty( $_POST['webhook_topic'] ) ) { // WPCS: input var okay, CSRF ok.
$resource = '';
$event = '';
- switch ( $_POST['webhook_topic'] ) {
- case 'custom' :
- if ( ! empty( $_POST['webhook_custom_topic'] ) ) {
- list( $resource, $event ) = explode( '.', wc_clean( $_POST['webhook_custom_topic'] ) );
+ switch ( $_POST['webhook_topic'] ) { // WPCS: input var okay, CSRF ok.
+ case 'custom':
+ if ( ! empty( $_POST['webhook_custom_topic'] ) ) { // WPCS: input var okay, CSRF ok.
+ list( $resource, $event ) = explode( '.', sanitize_text_field( wp_unslash( $_POST['webhook_custom_topic'] ) ) ); // WPCS: input var okay, CSRF ok.
}
break;
- case 'action' :
+ case 'action':
$resource = 'action';
- $event = ! empty( $_POST['webhook_action_event'] ) ? wc_clean( $_POST['webhook_action_event'] ) : '';
+ $event = ! empty( $_POST['webhook_action_event'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_action_event'] ) ) : ''; // WPCS: input var okay, CSRF ok.
break;
- default :
- list( $resource, $event ) = explode( '.', wc_clean( $_POST['webhook_topic'] ) );
+ default:
+ list( $resource, $event ) = explode( '.', sanitize_text_field( wp_unslash( $_POST['webhook_topic'] ) ) ); // WPCS: input var okay, CSRF ok.
break;
}
@@ -119,222 +118,84 @@ class WC_Admin_Webhooks {
$webhook->set_topic( $topic );
}
}
- }
-
- /**
- * Update webhook api version.
- *
- * @param WC_Webhook $webhook Webhook instance.
- */
- private function update_api_version( $webhook ) {
- $version = ! empty( $_POST['webhook_api_version'] ) ? wc_clean( $_POST['webhook_api_version'] ) : 'wp_api_v2';
-
- $webhook->set_api_version( $version );
- }
-
- /**
- * Save method.
- */
- private function save() {
- if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'woocommerce-settings' ) ) {
- wp_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 );
// API version.
- $this->update_api_version( $webhook );
+ $webhook->set_api_version( ! empty( $_POST['webhook_api_version'] ) ? sanitize_text_field( wp_unslash( $_POST['webhook_api_version'] ) ) : 'wp_api_v2' ); // WPCS: input var okay, CSRF ok.
- // Update date.
- wp_update_post( array( 'ID' => $webhook->id, 'post_modified' => current_time( 'mysql' ) ) );
+ $webhook->save();
- // Run actions
- do_action( 'woocommerce_webhook_options_save', $webhook->id );
+ // Run actions.
+ do_action( 'woocommerce_webhook_options_save', $webhook->get_id() );
- delete_transient( 'woocommerce_webhook_ids' );
-
- // Ping the webhook at the first time that is activated
- $pending_delivery = get_post_meta( $webhook->id, '_webhook_pending_delivery', true );
-
- if ( isset( $_POST['webhook_status'] ) && 'active' === $_POST['webhook_status'] && $pending_delivery ) {
+ // Ping the webhook at the first time that is activated.
+ if ( isset( $_POST['webhook_status'] ) && 'active' === $_POST['webhook_status'] && $webhook->get_pending_delivery() ) { // WPCS: input var okay, CSRF ok.
$result = $webhook->deliver_ping();
if ( is_wp_error( $result ) ) {
- // Redirect to webhook edit page to avoid settings save actions
- wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=api§ion=webhooks&edit-webhook=' . $webhook->id . '&error=' . urlencode( $result->get_error_message() ) ) );
+ // Redirect to webhook edit page to avoid settings save actions.
+ wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=api§ion=webhooks&edit-webhook=' . $webhook->get_id() . '&error=' . rawurlencode( $result->get_error_message() ) ) );
exit();
}
}
- // Redirect to webhook edit page to avoid settings save actions
- wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=api§ion=webhooks&edit-webhook=' . $webhook->id . '&updated=1' ) );
+ // Redirect to webhook edit page to avoid settings save actions.
+ wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=api§ion=webhooks&edit-webhook=' . $webhook->get_id() . '&updated=1' ) );
exit();
}
/**
- * Create Webhook.
- */
- private function create() {
- if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'create-webhook' ) ) {
- wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
- }
-
- if ( ! current_user_can( 'publish_shop_webhooks' ) ) {
- wp_die( __( 'You do not have permission 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,
- // @codingStandardsIgnoreStart
- /* translators: %s: date */
- 'post_title' => sprintf( __( 'Webhook created on %s', 'woocommerce' ), strftime( _x( '%b %d, %Y @ %I:%M %p', 'Webhook created on date parsed by strftime', 'woocommerce' ) ) ),
- // @codingStandardsIgnoreEnd
- 'comment_status' => 'closed',
- ) );
-
- if ( is_wp_error( $webhook_id ) ) {
- wp_die( $webhook_id->get_error_messages() );
- }
-
- update_post_meta( $webhook_id, '_webhook_pending_delivery', true );
- $webhook = new WC_Webhook( $webhook_id );
- $webhook->set_api_version( 'wp_api_v2' );
-
- delete_transient( 'woocommerce_webhook_ids' );
-
- // Redirect to edit page
- wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=api§ion=webhooks&edit-webhook=' . $webhook_id . '&created=1' ) );
- exit();
- }
-
- /**
- * Bulk trash/delete.
+ * Bulk delete.
*
- * @param array $webhooks
- * @param bool $delete
+ * @param array $webhooks List of webhooks IDs.
*/
- private function bulk_trash( $webhooks, $delete = false ) {
+ private function bulk_delete( $webhooks ) {
foreach ( $webhooks as $webhook_id ) {
- if ( $delete ) {
- wp_delete_post( $webhook_id, true );
- } else {
- wp_trash_post( $webhook_id );
+ $webhook = new WC_Webhook( (int) $webhook_id );
+ $webhook->delete( true );
+ }
+
+ $qty = count( $webhooks );
+ $status = isset( $_GET['status'] ) ? '&status=' . sanitize_text_field( wp_unslash( $_GET['status'] ) ) : ''; // WPCS: input var okay, CSRF ok.
+
+ // Redirect to webhooks page.
+ wp_safe_redirect( admin_url( 'admin.php?page=wc-settings&tab=api§ion=webhooks' . $status . '&deleted=' . $qty ) );
+ exit();
+ }
+
+ /**
+ * Delete webhook.
+ */
+ private function delete() {
+ check_admin_referer( 'delete-webhook' );
+
+ if ( isset( $_GET['delete'] ) ) { // WPCS: input var okay, CSRF ok.
+ $webhook_id = absint( $_GET['delete'] ); // WPCS: input var okay, CSRF ok.
+
+ if ( $webhook_id ) {
+ $this->bulk_delete( array( $webhook_id ) );
}
}
-
- $type = ! EMPTY_TRASH_DAYS || $delete ? 'deleted' : 'trashed';
- $qty = count( $webhooks );
- $status = isset( $_GET['status'] ) ? '&status=' . sanitize_text_field( $_GET['status'] ) : '';
-
- delete_transient( 'woocommerce_webhook_ids' );
-
- // Redirect to webhooks page
- wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=api§ion=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 );
-
- delete_transient( 'woocommerce_webhook_ids' );
-
- // Redirect to webhooks page
- wp_redirect( admin_url( 'admin.php?page=wc-settings&tab=api§ion=webhooks&status=trash&untrashed=' . $qty ) );
- exit();
}
/**
* Bulk actions.
*/
private function bulk_actions() {
- if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'woocommerce-settings' ) ) {
- wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
+ check_admin_referer( 'woocommerce-settings' );
+
+ if ( ! current_user_can( 'manage_woocommerce' ) ) {
+ wp_die( esc_html__( 'You do not have permission to edit Webhooks', 'woocommerce' ) );
}
- if ( ! current_user_can( 'edit_shop_webhooks' ) ) {
- wp_die( __( 'You do not have permission to edit Webhooks', 'woocommerce' ) );
+ if ( isset( $_REQUEST['action'] ) ) { // WPCS: input var okay, CSRF ok.
+ $webhooks = isset( $_REQUEST['webhook'] ) ? array_map( 'absint', (array) $_REQUEST['webhook'] ) : array(); // WPCS: input var okay, CSRF ok.
+
+ $action = sanitize_text_field( wp_unslash( $_REQUEST['action'] ) ); // WPCS: input var okay, CSRF ok.
+
+ if ( 'delete' === $action ) {
+ $this->bulk_delete( $webhooks );
+ }
}
-
- $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;
- }
- }
-
- /**
- * Empty Trash.
- */
- private function empty_trash() {
- if ( empty( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'empty_trash' ) ) {
- wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce' ) );
- }
-
- if ( ! current_user_can( 'delete_shop_webhooks' ) ) {
- wp_die( __( 'You do not have permission 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=api§ion=webhooks&deleted=' . $qty ) );
- exit();
}
/**
@@ -342,24 +203,19 @@ class WC_Admin_Webhooks {
*/
public function actions() {
if ( $this->is_webhook_settings_page() ) {
- // Save
- if ( isset( $_POST['save'] ) && isset( $_POST['webhook_id'] ) ) {
+ // Save.
+ if ( isset( $_POST['save'] ) && isset( $_POST['webhook_id'] ) ) { // WPCS: input var okay, CSRF ok.
$this->save();
}
- // Create
- if ( isset( $_GET['create-webhook'] ) ) {
- $this->create();
- }
-
- // Bulk actions
- if ( isset( $_GET['action'] ) && isset( $_GET['webhook'] ) ) {
+ // Bulk actions.
+ if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['webhook'] ) ) { // WPCS: input var okay, CSRF ok.
$this->bulk_actions();
}
- // Empty trash
- if ( isset( $_GET['empty_trash'] ) ) {
- $this->empty_trash();
+ // Delete webhook.
+ if ( isset( $_GET['delete'] ) ) { // WPCS: input var okay, CSRF ok.
+ $this->delete();
}
}
}
@@ -368,17 +224,15 @@ class WC_Admin_Webhooks {
* Page output.
*/
public static function page_output() {
- // Hide the save button
+ // Hide the save button.
$GLOBALS['hide_save_button'] = true;
- if ( isset( $_GET['edit-webhook'] ) ) {
- $webhook_id = absint( $_GET['edit-webhook'] );
+ if ( isset( $_GET['edit-webhook'] ) ) { // WPCS: input var okay, CSRF ok.
+ $webhook_id = absint( $_GET['edit-webhook'] ); // WPCS: input var okay, CSRF ok.
$webhook = new WC_Webhook( $webhook_id );
- if ( 'trash' != $webhook->post_data->post_status ) {
- include( 'settings/views/html-webhooks-edit.php' );
- return;
- }
+ include( 'settings/views/html-webhooks-edit.php' );
+ return;
}
self::table_list_output();
@@ -388,37 +242,23 @@ class WC_Admin_Webhooks {
* Notices.
*/
public static function notices() {
- if ( isset( $_GET['trashed'] ) ) {
- $trashed = absint( $_GET['trashed'] );
-
- /* translators: %d: count */
- WC_Admin_Settings::add_message( sprintf( _n( '%d webhook moved to the Trash.', '%d webhooks moved to the Trash.', $trashed, 'woocommerce' ), $trashed ) );
- }
-
- if ( isset( $_GET['untrashed'] ) ) {
- $untrashed = absint( $_GET['untrashed'] );
-
- /* translators: %d: count */
- WC_Admin_Settings::add_message( sprintf( _n( '%d webhook restored from the Trash.', '%d webhooks restored from the Trash.', $untrashed, 'woocommerce' ), $untrashed ) );
- }
-
- if ( isset( $_GET['deleted'] ) ) {
- $deleted = absint( $_GET['deleted'] );
+ if ( isset( $_GET['deleted'] ) ) { // WPCS: input var okay, CSRF ok.
+ $deleted = absint( $_GET['deleted'] ); // WPCS: input var okay, CSRF ok.
/* translators: %d: count */
WC_Admin_Settings::add_message( sprintf( _n( '%d webhook permanently deleted.', '%d webhooks permanently deleted.', $deleted, 'woocommerce' ), $deleted ) );
}
- if ( isset( $_GET['updated'] ) ) {
+ if ( isset( $_GET['updated'] ) ) { // WPCS: input var okay, CSRF ok.
WC_Admin_Settings::add_message( __( 'Webhook updated successfully.', 'woocommerce' ) );
}
- if ( isset( $_GET['created'] ) ) {
+ if ( isset( $_GET['created'] ) ) { // WPCS: input var okay, CSRF ok.
WC_Admin_Settings::add_message( __( 'Webhook created successfully.', 'woocommerce' ) );
}
- if ( isset( $_GET['error'] ) ) {
- WC_Admin_Settings::add_error( wc_clean( $_GET['error'] ) );
+ if ( isset( $_GET['error'] ) ) { // WPCS: input var okay, CSRF ok.
+ WC_Admin_Settings::add_error( sanitize_text_field( wp_unslash( $_GET['error'] ) ) ); // WPCS: input var okay, CSRF ok.
}
}
@@ -426,12 +266,13 @@ class WC_Admin_Webhooks {
* Table list output.
*/
private static function table_list_output() {
- echo '';
+ echo '';
- // Get the webhooks count
- $count = array_sum( (array) wp_count_posts( 'shop_webhook', 'readable' ) );
+ // Get the webhooks count.
+ $data_store = WC_Data_Store::load( 'webhook' );
+ $count = count( $data_store->get_webhooks_ids() );
- if ( absint( $count ) && $count > 0 ) {
+ if ( 0 < $count ) {
$webhooks_table_list = new WC_Admin_Webhooks_Table_List();
$webhooks_table_list->prepare_items();
@@ -445,10 +286,11 @@ class WC_Admin_Webhooks {
} else {
echo '';
?>
-
-
+
+
- #posts-filter .wp-list-table, #posts-filter .tablenav.top, .tablenav.bottom .actions { display: none; }
' . esc_html__( 'Coupons are a great way to offer discounts and rewards to your customers. They will appear here once created.', 'woocommerce' ) . ' ';
+ echo '' . esc_html__( 'Learn more about coupons', 'woocommerce' ) . ' ';
+ echo '';
+ }
+
+ /**
+ * Define primary column.
+ *
+ * @return array
+ */
+ protected function get_primary_column() {
+ return 'coupon_code';
+ }
+
+ /**
+ * Get row actions to show in the list table.
+ *
+ * @param array $actions Array of actions.
+ * @param WP_Post $post Current post object.
+ * @return array
+ */
+ protected function get_row_actions( $actions, $post ) {
+ unset( $actions['inline hide-if-no-js'] );
+ return $actions;
+ }
+
+ /**
+ * Define which columns to show on this screen.
+ *
+ * @param array $columns Existing columns.
+ * @return array
+ */
+ public function define_columns( $columns ) {
+ $show_columns = array();
+ $show_columns['cb'] = $columns['cb'];
+ $show_columns['coupon_code'] = __( 'Code', 'woocommerce' );
+ $show_columns['type'] = __( 'Coupon type', 'woocommerce' );
+ $show_columns['amount'] = __( 'Coupon amount', 'woocommerce' );
+ $show_columns['description'] = __( 'Description', 'woocommerce' );
+ $show_columns['products'] = __( 'Product IDs', 'woocommerce' );
+ $show_columns['usage'] = __( 'Usage / Limit', 'woocommerce' );
+ $show_columns['expiry_date'] = __( 'Expiry date', 'woocommerce' );
+
+ return $show_columns;
+ }
+
+ /**
+ * Pre-fetch any data for the row each column has access to it. the_coupon global is there for bw compat.
+ *
+ * @param int $post_id Post ID being shown.
+ */
+ protected function prepare_row_data( $post_id ) {
+ global $the_coupon;
+
+ if ( empty( $this->object ) || $this->object->get_id() !== $post_id ) {
+ $this->object = $the_coupon = new WC_Coupon( $post_id );
+ }
+ }
+
+ /**
+ * Render columm: coupon_code.
+ */
+ protected function render_coupon_code_column() {
+ global $post;
+
+ $edit_link = get_edit_post_link( $this->object->get_id() );
+ $title = $this->object->get_code();
+
+ echo '' . esc_html( $title ) . ' ';
+ _post_states( $post );
+ echo '
+ ' . esc_html( $type ) . ' ';
+ }
+ ?>
+
+ ';
+ echo '' . esc_html__( 'When you receive a new order, it will appear here.', 'woocommerce' ) . ' ';
+ echo '' . esc_html__( 'Learn more about orders', 'woocommerce' ) . ' ';
+ echo '';
+ }
+
+ /**
+ * Define primary column.
+ *
+ * @return array
+ */
+ protected function get_primary_column() {
+ return 'order_number';
+ }
+
+ /**
+ * Get row actions to show in the list table.
+ *
+ * @param array $actions Array of actions.
+ * @param WP_Post $post Current post object.
+ * @return array
+ */
+ protected function get_row_actions( $actions, $post ) {
+ return array();
+ }
+
+ /**
+ * Define hidden columns.
+ *
+ * @return array
+ */
+ protected function define_hidden_columns() {
+ return array(
+ 'shipping_address',
+ 'billing_address',
+ );
+ }
+
+ /**
+ * Define which columns are sortable.
+ *
+ * @param array $columns Existing columns.
+ * @return array
+ */
+ public function define_sortable_columns( $columns ) {
+ $custom = array(
+ 'order_number' => 'ID',
+ 'order_total' => 'order_total',
+ 'order_date' => 'date',
+ );
+ unset( $columns['comments'] );
+
+ return wp_parse_args( $custom, $columns );
+ }
+
+ /**
+ * Define which columns to show on this screen.
+ *
+ * @param array $columns Existing columns.
+ * @return array
+ */
+ public function define_columns( $columns ) {
+ $show_columns = array();
+ $show_columns['cb'] = $columns['cb'];
+ $show_columns['order_number'] = __( 'Order', 'woocommerce' );
+ $show_columns['billing_address'] = __( 'Billing', 'woocommerce' );
+ $show_columns['shipping_address'] = __( 'Ship to', 'woocommerce' );
+ $show_columns['order_date'] = __( 'Date', 'woocommerce' );
+ $show_columns['order_status'] = __( 'Status', 'woocommerce' );
+ $show_columns['order_total'] = __( 'Total', 'woocommerce' );
+
+ if ( has_action( 'woocommerce_admin_order_actions_start' ) || has_action( 'woocommerce_admin_order_actions_end' ) || has_filter( 'woocommerce_admin_order_actions' ) ) {
+ $show_columns['order_actions'] = __( 'Actions', 'woocommerce' );
+ }
+
+ wp_enqueue_script( 'wc-orders' );
+
+ return $show_columns;
+ }
+
+ /**
+ * Define bulk actions.
+ *
+ * @param array $actions Existing actions.
+ * @return array
+ */
+ public function define_bulk_actions( $actions ) {
+ if ( isset( $actions['edit'] ) ) {
+ unset( $actions['edit'] );
+ }
+
+ $actions['mark_processing'] = __( 'Mark processing', 'woocommerce' );
+ $actions['mark_on-hold'] = __( 'Mark on-hold', 'woocommerce' );
+ $actions['mark_completed'] = __( 'Mark complete', 'woocommerce' );
+
+ return $actions;
+ }
+
+ /**
+ * Pre-fetch any data for the row each column has access to it. the_order global is there for bw compat.
+ *
+ * @param int $post_id Post ID being shown.
+ */
+ protected function prepare_row_data( $post_id ) {
+ global $the_order;
+
+ if ( empty( $this->object ) || $this->object->get_id() !== $post_id ) {
+ $this->object = $the_order = wc_get_order( $post_id );
+ }
+ }
+
+ /**
+ * Render columm: order_number.
+ */
+ protected function render_order_number_column() {
+ $buyer = '';
+
+ if ( $this->object->get_billing_first_name() || $this->object->get_billing_last_name() ) {
+ /* translators: 1: first name 2: last name */
+ $buyer = trim( sprintf( _x( '%1$s %2$s', 'full name', 'woocommerce' ), $this->object->get_billing_first_name(), $this->object->get_billing_last_name() ) );
+ } elseif ( $this->object->get_billing_company() ) {
+ $buyer = trim( $this->object->get_billing_company() );
+ } elseif ( $this->object->get_customer_id() ) {
+ $user = get_user_by( 'id', $this->object->get_customer_id() );
+ $buyer = ucwords( $user->display_name );
+ }
+
+ if ( $this->object->get_status() === 'trash' ) {
+ echo '#' . esc_attr( $this->object->get_order_number() ) . ' ' . esc_html( $buyer ) . ' ';
+ } else {
+ echo '' . esc_html( __( 'Preview', 'woocommerce' ) ) . ' ';
+ echo '#' . esc_attr( $this->object->get_order_number() ) . ' ' . esc_html( $buyer ) . ' ' . sprintf( _n( 'Plus %d other note', 'Plus %d other notes', ( $comment_count - 1 ), 'woocommerce' ), $comment_count - 1 ) . ' ' );
+ } else {
+ /* translators: %d: notes count */
+ $tooltip = wc_sanitize_tooltip( sprintf( _n( '%d note', '%d notes', $comment_count, 'woocommerce' ), $comment_count ) );
+ }
+ }
+
+ if ( $tooltip ) {
+ printf( '%s %s %3$s ',
+ esc_attr( $this->object->get_date_created()->date( 'c' ) ),
+ esc_html( $this->object->get_date_created()->date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ) ) ),
+ esc_html( $show_date )
+ );
+ }
+
+ /**
+ * Render columm: order_total.
+ */
+ protected function render_order_total_column() {
+ if ( $this->object->get_payment_method_title() ) {
+ /* translators: %s: method */
+ echo '' . wp_kses_post( $this->object->get_formatted_order_total() ) . ' ';
+ } else {
+ echo wp_kses_post( $this->object->get_formatted_order_total() );
+ }
+ }
+
+ /**
+ * Render columm: order_actions.
+ */
+ protected function render_order_actions_column() {
+ echo '';
+
+ do_action( 'woocommerce_admin_order_actions_start', $this->object );
+
+ $actions = array();
+
+ if ( $this->object->has_status( array( 'pending', 'on-hold' ) ) ) {
+ $actions['processing'] = array(
+ 'url' => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=processing&order_id=' . $this->object->get_id() ), 'woocommerce-mark-order-status' ),
+ 'name' => __( 'Processing', 'woocommerce' ),
+ 'action' => 'processing',
+ );
+ }
+
+ if ( $this->object->has_status( array( 'pending', 'on-hold', 'processing' ) ) ) {
+ $actions['complete'] = array(
+ 'url' => wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_mark_order_status&status=completed&order_id=' . $this->object->get_id() ), 'woocommerce-mark-order-status' ),
+ 'name' => __( 'Complete', 'woocommerce' ),
+ 'action' => 'complete',
+ );
+ }
+
+ $actions = apply_filters( 'woocommerce_admin_order_actions', $actions, $this->object );
+
+ foreach ( $actions as $action ) {
+ printf( '%s ', esc_attr( $action['action'] ), esc_url( $action['url'] ), esc_attr( $action['name'] ), esc_attr( $action['name'] ) );
+ }
+
+ do_action( 'woocommerce_admin_order_actions_end', $this->object );
+
+ echo '
';
+ }
+
+ /**
+ * Render columm: billing_address.
+ */
+ protected function render_billing_address_column() {
+ if ( $address = $this->object->get_formatted_billing_address() ) {
+ echo esc_html( preg_replace( '##i', ', ', $address ) );
+ } else {
+ echo '–';
+ }
+ }
+
+ /**
+ * Render columm: shipping_address.
+ */
+ protected function render_shipping_address_column() {
+ if ( $address = $this->object->get_formatted_shipping_address() ) {
+ echo '' . esc_html( preg_replace( '##i', ', ', $address ) ) . ' ';
+ } else {
+ echo '–';
+ }
+ }
+
+ /**
+ * Template for order preview.
+ *
+ * @since 3.3.0
+ */
+ public function order_preview_template() {
+ ?>
+
+ update_status( $new_status, __( 'Order status changed by bulk edit:', 'woocommerce' ), true );
+ do_action( 'woocommerce_order_edit_status', $id, $new_status );
+ $changed++;
+ }
+
+ $redirect_to = add_query_arg( array(
+ 'post_type' => $this->list_table_type,
+ $report_action => true,
+ 'changed' => $changed,
+ 'ids' => join( ',', $ids ),
+ ), $redirect_to );
+
+ return esc_url_raw( $redirect_to );
+ }
+
+ /**
+ * Show confirmation message that order status changed for number of orders.
+ */
+ public function bulk_admin_notices() {
+ global $post_type, $pagenow;
+
+ // Bail out if not on shop order list page.
+ if ( 'edit.php' !== $pagenow || 'shop_order' !== $post_type ) {
+ return;
+ }
+
+ $order_statuses = wc_get_order_statuses();
+
+ // Check if any status changes happened.
+ foreach ( $order_statuses as $slug => $name ) {
+ if ( isset( $_REQUEST[ 'marked_' . str_replace( 'wc-', '', $slug ) ] ) ) { // WPCS: input var ok.
+
+ $number = isset( $_REQUEST['changed'] ) ? absint( $_REQUEST['changed'] ) : 0; // WPCS: input var ok.
+ /* translators: %s: orders count */
+ $message = sprintf( _n( '%d order status changed.', '%d order statuses changed.', $number, 'woocommerce' ), number_format_i18n( $number ) );
+ echo '' . esc_html( $message ) . '
+
+
+ query_filters( $query_vars );
+ }
+
+ return $query_vars;
+ }
+
+ /**
+ * Handle any custom filters.
+ *
+ * @param array $query_vars Query vars.
+ * @return array
+ */
+ protected function query_filters( $query_vars ) {
+ global $wp_post_statuses;
+
+ // Filter the orders by the posted customer.
+ if ( ! empty( $_GET['_customer_user'] ) ) { // WPCS: input var ok.
+ // @codingStandardsIgnoreStart
+ $query_vars['meta_query'] = array(
+ array(
+ 'key' => '_customer_user',
+ 'value' => (int) $_GET['_customer_user'], // WPCS: input var ok, sanitization ok.
+ 'compare' => '=',
+ ),
+ );
+ // @codingStandardsIgnoreEnd
+ }
+
+ // Sorting.
+ if ( isset( $query_vars['orderby'] ) ) {
+ if ( 'order_total' === $query_vars['orderby'] ) {
+ // @codingStandardsIgnoreStart
+ $query_vars = array_merge( $query_vars, array(
+ 'meta_key' => '_order_total',
+ 'orderby' => 'meta_value_num',
+ ) );
+ // @codingStandardsIgnoreEnd
+ }
+ }
+
+ // Status.
+ if ( ! isset( $query_vars['post_status'] ) ) {
+ $post_statuses = wc_get_order_statuses();
+
+ foreach ( $post_statuses as $status => $value ) {
+ if ( isset( $wp_post_statuses[ $status ] ) && false === $wp_post_statuses[ $status ]->show_in_admin_all_list ) {
+ unset( $post_statuses[ $status ] );
+ }
+ }
+
+ $query_vars['post_status'] = array_keys( $post_statuses );
+ }
+ return $query_vars;
+ }
+
+ /**
+ * Change the label when searching orders.
+ *
+ * @param mixed $query Current search query.
+ * @return string
+ */
+ public function search_label( $query ) {
+ global $pagenow, $typenow;
+
+ if ( 'edit.php' !== $pagenow || 'shop_order' !== $typenow || ! get_query_var( 'shop_order_search' ) || ! isset( $_GET['s'] ) ) { // WPCS: input var ok.
+ return $query;
+ }
+
+ return wc_clean( wp_unslash( $_GET['s'] ) ); // WPCS: input var ok, sanitization ok.
+ }
+
+ /**
+ * Query vars for custom searches.
+ *
+ * @param mixed $public_query_vars Array of query vars.
+ * @return array
+ */
+ public function add_custom_query_var( $public_query_vars ) {
+ $public_query_vars[] = 'shop_order_search';
+ return $public_query_vars;
+ }
+
+ /**
+ * Search custom fields as well as content.
+ *
+ * @param WP_Query $wp Query object.
+ */
+ public function search_custom_fields( $wp ) {
+ global $pagenow;
+
+ if ( 'edit.php' !== $pagenow || empty( $wp->query_vars['s'] ) || 'shop_order' !== $wp->query_vars['post_type'] || ! isset( $_GET['s'] ) ) { // WPCS: input var ok.
+ return;
+ }
+
+ $post_ids = wc_order_search( wc_clean( wp_unslash( $_GET['s'] ) ) ); // WPCS: input var ok, sanitization ok.
+
+ if ( ! empty( $post_ids ) ) {
+ // Remove "s" - we don't want to search order name.
+ unset( $wp->query_vars['s'] );
+
+ // so we know we're doing this.
+ $wp->query_vars['shop_order_search'] = true;
+
+ // Search by found posts.
+ $wp->query_vars['post__in'] = array_merge( $post_ids, array( 0 ) );
+ }
+ }
+}
+
+new WC_Admin_List_Table_Orders();
diff --git a/includes/admin/list-tables/class-wc-admin-list-table-products.php b/includes/admin/list-tables/class-wc-admin-list-table-products.php
new file mode 100644
index 00000000000..dcd44e706fb
--- /dev/null
+++ b/includes/admin/list-tables/class-wc-admin-list-table-products.php
@@ -0,0 +1,482 @@
+';
+ echo '' . esc_html__( 'Ready to start selling something awesome?', 'woocommerce' ) . ' ';
+ echo '' . esc_html__( 'Create your first product!', 'woocommerce' ) . ' ';
+ echo '' . esc_html__( 'Import products from a CSV file', 'woocommerce' ) . ' ';
+ echo '';
+ }
+
+ /**
+ * Define primary column.
+ *
+ * @return array
+ */
+ protected function get_primary_column() {
+ return 'name';
+ }
+
+ /**
+ * Define which columns are sortable.
+ *
+ * @param array $columns Existing columns.
+ * @return array
+ */
+ public function define_sortable_columns( $columns ) {
+ $custom = array(
+ 'price' => 'price',
+ 'sku' => 'sku',
+ 'name' => 'title',
+ );
+ return wp_parse_args( $custom, $columns );
+ }
+
+ /**
+ * Define which columns to show on this screen.
+ *
+ * @param array $columns Existing columns.
+ * @return array
+ */
+ public function define_columns( $columns ) {
+ if ( empty( $columns ) && ! is_array( $columns ) ) {
+ $columns = array();
+ }
+
+ unset( $columns['title'], $columns['comments'], $columns['date'] );
+
+ $show_columns = array();
+ $show_columns['cb'] = '' . __( 'Image', 'woocommerce' ) . ' ';
+ $show_columns['name'] = __( 'Name', 'woocommerce' );
+
+ if ( wc_product_sku_enabled() ) {
+ $show_columns['sku'] = __( 'SKU', 'woocommerce' );
+ }
+
+ if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) {
+ $show_columns['is_in_stock'] = __( 'Stock', 'woocommerce' );
+ }
+
+ $show_columns['price'] = __( 'Price', 'woocommerce' );
+ $show_columns['product_cat'] = __( 'Categories', 'woocommerce' );
+ $show_columns['product_tag'] = __( 'Tags', 'woocommerce' );
+ $show_columns['featured'] = '' . __( 'Featured', 'woocommerce' ) . ' ';
+ $show_columns['product_type'] = '' . __( 'Type', 'woocommerce' ) . ' ';
+ $show_columns['date'] = __( 'Date', 'woocommerce' );
+
+ return array_merge( $show_columns, $columns );
+ }
+
+ /**
+ * Pre-fetch any data for the row each column has access to it. the_product global is there for bw compat.
+ *
+ * @param int $post_id Post ID being shown.
+ */
+ protected function prepare_row_data( $post_id ) {
+ global $the_product;
+
+ if ( empty( $this->object ) || $this->object->get_id() !== $post_id ) {
+ $this->object = $the_product = wc_get_product( $post_id );
+ }
+ }
+
+ /**
+ * Render columm: thumb.
+ */
+ protected function render_thumb_column() {
+ echo '' . $this->object->get_image( 'thumbnail' ) . ' ';
+ }
+
+ /**
+ * Render columm: name.
+ */
+ protected function render_name_column() {
+ global $post;
+
+ $edit_link = get_edit_post_link( $this->object->get_id() );
+ $title = _draft_or_post_title();
+
+ echo '' . esc_html( $title ) . ' ';
+
+ _post_states( $post );
+
+ echo '' . get_the_title( $this->object->get_parent_id() ) . ' ';
+ }
+
+ get_inline_data( $post );
+
+ /* Custom inline data for woocommerce. */
+ echo '
+
+
+
' . esc_html( $this->object->get_sku() ) . '
+
' . esc_html( $this->object->get_regular_price() ) . '
+
' . esc_html( $this->object->get_sale_price() ) . '
+
' . esc_html( $this->object->get_weight() ) . '
+
' . esc_html( $this->object->get_length() ) . '
+
' . esc_html( $this->object->get_width() ) . '
+
' . esc_html( $this->object->get_height() ) . '
+
' . esc_html( $this->object->get_shipping_class() ) . '
+
' . esc_html( $this->object->get_catalog_visibility() ) . '
+
' . esc_html( $this->object->get_stock_status() ) . '
+
' . esc_html( $this->object->get_stock_quantity() ) . '
+
' . esc_html( wc_bool_to_string( $this->object->get_manage_stock() ) ) . '
+
' . esc_html( wc_bool_to_string( $this->object->get_featured() ) ) . '
+
' . esc_html( $this->object->get_type() ) . '
+
' . esc_html( wc_bool_to_string( $this->object->get_virtual() ) ) . '
+
' . esc_html( $this->object->get_tax_status() ) . '
+
' . esc_html( $this->object->get_tax_class() ) . '
+
' . esc_html( $this->object->get_backorders() ) . '
+
– ';
+ }
+
+ /**
+ * Render columm: product_type.
+ */
+ protected function render_product_type_column() {
+ if ( $this->object->is_type( 'grouped' ) ) {
+ echo '– ';
+ }
+
+ /**
+ * Render columm: product_cat.
+ */
+ protected function render_product_cat_column() {
+ if ( ! $terms = get_the_terms( $this->object->get_id(), 'product_cat' ) ) {
+ echo '– ';
+ } else {
+ $termlist = array();
+ foreach ( $terms as $term ) {
+ $termlist[] = '' . esc_html( $term->name ) . ' ';
+ }
+
+ echo implode( ', ', $termlist ); // WPCS: XSS ok.
+ }
+ }
+
+ /**
+ * Render columm: product_tag.
+ */
+ protected function render_product_tag_column() {
+ if ( ! $terms = get_the_terms( $this->object->get_id(), 'product_tag' ) ) {
+ echo '– ';
+ } else {
+ $termlist = array();
+ foreach ( $terms as $term ) {
+ $termlist[] = '' . esc_html( $term->name ) . ' ';
+ }
+
+ echo implode( ', ', $termlist ); // WPCS: XSS ok.
+ }
+ }
+
+ /**
+ * Render columm: featured.
+ */
+ protected function render_featured_column() {
+ $url = wp_nonce_url( admin_url( 'admin-ajax.php?action=woocommerce_feature_product&product_id=' . $this->object->get_id() ), 'woocommerce-feature-product' );
+ echo '';
+ if ( $this->object->is_featured() ) {
+ echo '' . esc_html__( 'Yes', 'woocommerce' ) . ' ';
+ } else {
+ echo '' . esc_html__( 'No', 'woocommerce' ) . ' ';
+ }
+ echo ' ';
+ }
+
+ /**
+ * Render columm: is_in_stock.
+ */
+ protected function render_is_in_stock_column() {
+ if ( $this->object->is_in_stock() ) {
+ $stock_html = '' . __( 'In stock', 'woocommerce' ) . ' ';
+ } else {
+ $stock_html = '' . __( 'Out of stock', 'woocommerce' ) . ' ';
+ }
+
+ if ( $this->object->managing_stock() ) {
+ $stock_html .= ' (' . wc_stock_amount( $this->object->get_stock_quantity() ) . ')';
+ }
+
+ echo wp_kses_post( apply_filters( 'woocommerce_admin_stock_html', $stock_html, $this->object ) );
+ }
+
+ /**
+ * Query vars for custom searches.
+ *
+ * @param mixed $public_query_vars Array of query vars.
+ * @return array
+ */
+ public function add_custom_query_var( $public_query_vars ) {
+ $public_query_vars[] = 'sku';
+ return $public_query_vars;
+ }
+
+ /**
+ * Render any custom filters and search inputs for the list table.
+ */
+ protected function render_filters() {
+ $current_category_slug = isset( $_REQUEST['product_cat'] ) ? wc_clean( wp_unslash( $_REQUEST['product_cat'] ) ) : false; // WPCS: input var ok, sanitization ok.
+ $current_product_type = isset( $_REQUEST['product_type'] ) ? wc_clean( wp_unslash( $_REQUEST['product_type'] ) ) : false; // WPCS: input var ok, sanitization ok.
+ // @codingStandardsIgnoreStart
+ $current_category = $current_category_slug ? get_term_by( 'slug', $current_category_slug, 'product_cat' ): false;
+ // @codingStandardsIgnoreEnd
+ ?>
+
+
+ name ); ?>
+
+
+ ';
+ $output .= '' . __( 'Filter by product type', 'woocommerce' ) . ' ';
+
+ foreach ( $terms as $term ) {
+ $output .= 'slug, $current_product_type, false );
+ $output .= '>';
+
+ switch ( $term->name ) {
+ case 'grouped' :
+ $output .= __( 'Grouped product', 'woocommerce' );
+ break;
+ case 'external' :
+ $output .= __( 'External/Affiliate product', 'woocommerce' );
+ break;
+ case 'variable' :
+ $output .= __( 'Variable product', 'woocommerce' );
+ break;
+ case 'simple' :
+ $output .= __( 'Simple product', 'woocommerce' );
+ break;
+ default :
+ // Assuming that we have other types in future.
+ $output .= ucfirst( $term->name );
+ break;
+ }
+
+ $output .= ' ';
+
+ if ( 'simple' === $term->name ) {
+
+ $output .= 'query['product_type'] ) ) {
+ $output .= selected( 'downloadable', $current_product_type, false );
+ }
+
+ $output .= '> ' . ( is_rtl() ? '←' : '→' ) . ' ' . __( 'Downloadable', 'woocommerce' ) . ' ';
+
+ $output .= '';
+ }
+ }
+
+ $output .= '';
+
+ echo apply_filters( 'woocommerce_product_filters', $output ); // WPCS: XSS ok.
+ }
+
+ /**
+ * Handle any custom filters.
+ *
+ * @param array $query_vars Query vars.
+ * @return array
+ */
+ protected function query_filters( $query_vars ) {
+ if ( isset( $query_vars['orderby'] ) ) {
+ if ( 'price' === $vars['orderby'] ) {
+ // @codingStandardsIgnoreStart
+ $query_vars = array_merge( $query_vars, array(
+ 'meta_key' => '_price',
+ 'orderby' => 'meta_value_num',
+ ) );
+ // @codingStandardsIgnoreEnd
+ }
+ if ( 'sku' === $query_vars['orderby'] ) {
+ // @codingStandardsIgnoreStart
+ $query_vars = array_merge( $query_vars, array(
+ 'meta_key' => '_sku',
+ 'orderby' => 'meta_value',
+ ) );
+ // @codingStandardsIgnoreEnd
+ }
+ }
+
+ if ( isset( $query_vars['product_type'] ) ) {
+ // @codingStandardsIgnoreStart
+ if ( 'downloadable' === $query_vars['product_type'] ) {
+ $query_vars['product_type'] = '';
+ $query_vars['meta_value'] = 'yes';
+ $query_vars['meta_key'] = '_downloadable';
+ } elseif ( 'virtual' === $query_vars['product_type'] ) {
+ $query_vars['product_type'] = '';
+ $query_vars['meta_value'] = 'yes';
+ $query_vars['meta_key'] = '_virtual';
+ }
+ // @codingStandardsIgnoreEnd
+ }
+
+ if ( isset( $_GET['product_shipping_class'] ) && '0' === $_GET['product_shipping_class'] ) { // WPCS: input var ok.
+ $query_vars['tax_query'][] = array(
+ 'taxonomy' => 'product_shipping_class',
+ 'field' => 'id',
+ 'terms' => get_terms( 'product_shipping_class', array( 'fields' => 'ids' ) ),
+ 'operator' => 'NOT IN',
+ );
+ }
+
+ return $query_vars;
+ }
+
+ /**
+ * Search by SKU or ID for products.
+ *
+ * @param string $where Where clause SQL.
+ * @return string
+ */
+ public function sku_search( $where ) {
+ global $pagenow, $wpdb, $wp;
+
+ if ( 'edit.php' !== $pagenow || ! is_search() || ! isset( $wp->query_vars['s'] ) || 'product' !== $wp->query_vars['post_type'] ) {
+ return $where;
+ }
+
+ $search_ids = array();
+ $terms = explode( ',', $wp->query_vars['s'] );
+
+ foreach ( $terms as $term ) {
+ if ( is_numeric( $term ) ) {
+ $search_ids[] = absint( $term );
+ } else {
+ $id_from_sku = wc_get_product_id_by_sku( wc_clean( $term ) );
+
+ if ( $id_from_sku ) {
+ $search_ids[] = absint( $id_from_sku );
+ }
+ }
+ }
+
+ $search_ids = array_filter( array_unique( array_map( 'absint', $search_ids ) ) );
+
+ if ( count( $search_ids ) > 0 ) {
+ $where = str_replace( 'AND (((', "AND ( ({$wpdb->posts}.ID IN (" . implode( ',', $search_ids ) . ')) OR ((', $where );
+ }
+
+ return $where;
+ }
+
+ /**
+ * Change views on the edit product screen.
+ *
+ * @param array $views Array of views.
+ * @return array
+ */
+ public function product_views( $views ) {
+ global $wp_query;
+
+ // Products do not have authors.
+ unset( $views['mine'] );
+
+ // Add sorting link.
+ if ( current_user_can( 'edit_others_pages' ) ) {
+ $class = ( isset( $wp_query->query['orderby'] ) && 'menu_order title' === $wp_query->query['orderby'] ) ? 'current' : '';
+ $query_string = remove_query_arg( array( 'orderby', 'order' ) );
+ $query_string = add_query_arg( 'orderby', rawurlencode( 'menu_order title' ), $query_string );
+ $query_string = add_query_arg( 'order', rawurlencode( 'ASC' ), $query_string );
+ $views['byorder'] = '' . __( 'Sorting', 'woocommerce' ) . ' ';
+ }
+
+ return $views;
+ }
+}
+
+new WC_Admin_List_Table_Products();
diff --git a/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php b/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
index ca47d2ecbba..52161ed8314 100644
--- a/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
@@ -117,7 +117,7 @@ class WC_Meta_Box_Coupon_Data {
'id' => 'minimum_amount',
'label' => __( 'Minimum spend', 'woocommerce' ),
'placeholder' => __( 'No minimum', 'woocommerce' ),
- 'description' => __( 'This field allows you to set the minimum spend (subtotal, including taxes) allowed to use the coupon.', 'woocommerce' ),
+ 'description' => __( 'This field allows you to set the minimum spend (subtotal) allowed to use the coupon.', 'woocommerce' ),
'data_type' => 'price',
'desc_tip' => true,
) );
@@ -127,7 +127,7 @@ class WC_Meta_Box_Coupon_Data {
'id' => 'maximum_amount',
'label' => __( 'Maximum spend', 'woocommerce' ),
'placeholder' => __( 'No maximum', 'woocommerce' ),
- 'description' => __( 'This field allows you to set the maximum spend (subtotal, including taxes) allowed when using the coupon.', 'woocommerce' ),
+ 'description' => __( 'This field allows you to set the maximum spend (subtotal) allowed when using the coupon.', 'woocommerce' ),
'data_type' => 'price',
'desc_tip' => true,
) );
diff --git a/includes/admin/settings/class-wc-settings-api.php b/includes/admin/settings/class-wc-settings-rest-api.php
similarity index 77%
rename from includes/admin/settings/class-wc-settings-api.php
rename to includes/admin/settings/class-wc-settings-rest-api.php
index 48bc94d301a..91972b6164a 100644
--- a/includes/admin/settings/class-wc-settings-api.php
+++ b/includes/admin/settings/class-wc-settings-rest-api.php
@@ -2,17 +2,22 @@
/**
* WooCommerce API Settings
*
- * @author WooThemes
+ * @author Automattic
* @category Admin
* @package WooCommerce/Admin
- * @version 2.4.0
+ * @version 3.3.0
*/
if ( ! defined( 'ABSPATH' ) ) {
- exit; // Exit if accessed directly
+ exit; // Exit if accessed directly.
}
-if ( ! class_exists( 'WC_Settings_Rest_API', false ) ) :
+/**
+ * Settings for API.
+ */
+if ( class_exists( 'WC_Settings_Rest_API', false ) ) {
+ return new WC_Settings_Rest_API();
+}
/**
* WC_Settings_Rest_API.
@@ -50,7 +55,7 @@ class WC_Settings_Rest_API extends WC_Settings_Page {
/**
* Get settings array.
*
- * @param string $current_section
+ * @param string $current_section Current section slug.
* @return array
*/
public function get_settings( $current_section = '' ) {
@@ -86,28 +91,15 @@ class WC_Settings_Rest_API extends WC_Settings_Page {
/**
* Form method.
*
- * @param string $method
+ * @param string $method Method name.
*
* @return string
*/
public function form_method( $method ) {
global $current_section;
- if ( 'webhooks' == $current_section ) {
- if ( isset( $_GET['edit-webhook'] ) ) {
- $webhook_id = absint( $_GET['edit-webhook'] );
- $webhook = new WC_Webhook( $webhook_id );
-
- if ( 'trash' != $webhook->post_data->post_status ) {
- return 'post';
- }
- }
-
- return 'get';
- }
-
- if ( 'keys' == $current_section ) {
- if ( isset( $_GET['create-key'] ) || isset( $_GET['edit-key'] ) ) {
+ if ( 'keys' === $current_section ) {
+ if ( isset( $_GET['create-key'] ) || isset( $_GET['edit-key'] ) ) { // WPCS: input var okay, CSRF ok.
return 'post';
}
@@ -121,10 +113,10 @@ class WC_Settings_Rest_API extends WC_Settings_Page {
* Notices.
*/
private function notices() {
- if ( isset( $_GET['section'] ) && 'webhooks' == $_GET['section'] ) {
+ if ( isset( $_GET['section'] ) && 'webhooks' === $_GET['section'] ) { // WPCS: input var okay, CSRF ok.
WC_Admin_Webhooks::notices();
}
- if ( isset( $_GET['section'] ) && 'keys' == $_GET['section'] ) {
+ if ( isset( $_GET['section'] ) && 'keys' === $_GET['section'] ) { // WPCS: input var okay, CSRF ok.
WC_Admin_API_Keys::notices();
}
}
@@ -135,7 +127,7 @@ class WC_Settings_Rest_API extends WC_Settings_Page {
public function output() {
global $current_section;
- if ( 'webhooks' == $current_section ) {
+ if ( 'webhooks' === $current_section ) {
WC_Admin_Webhooks::page_output();
} elseif ( 'keys' === $current_section ) {
WC_Admin_API_Keys::page_output();
@@ -151,13 +143,11 @@ class WC_Settings_Rest_API extends WC_Settings_Page {
public function save() {
global $current_section;
- if ( apply_filters( 'woocommerce_rest_api_valid_to_save', ! in_array( $current_section, array( 'keys', 'webhooks' ) ) ) ) {
+ if ( apply_filters( 'woocommerce_rest_api_valid_to_save', ! in_array( $current_section, array( 'keys', 'webhooks' ), true ) ) ) {
$settings = $this->get_settings();
WC_Admin_Settings::save_fields( $settings );
}
}
}
-endif;
-
return new WC_Settings_Rest_API();
diff --git a/includes/admin/settings/views/html-webhooks-edit.php b/includes/admin/settings/views/html-webhooks-edit.php
index 50f766e892c..c022cfbf3d6 100644
--- a/includes/admin/settings/views/html-webhooks-edit.php
+++ b/includes/admin/settings/views/html-webhooks-edit.php
@@ -1,8 +1,8 @@
-
@@ -20,9 +20,8 @@ if ( ! defined( 'ABSPATH' ) ) {
@@ -40,7 +39,8 @@ if ( ! defined( 'ABSPATH' ) ) {
$statuses = wc_get_webhook_statuses();
$current_status = $webhook->get_status();
- foreach ( $statuses as $status_slug => $status_name ) : ?>
+ foreach ( $statuses as $status_slug => $status_name ) :
+ ?>
>
@@ -49,7 +49,7 @@ if ( ! defined( 'ABSPATH' ) ) {
@@ -77,7 +77,8 @@ if ( ! defined( 'ABSPATH' ) ) {
'custom' => __( 'Custom', 'woocommerce' ),
) );
- foreach ( $topics as $topic_slug => $topic_name ) : ?>
+ foreach ( $topics as $topic_slug => $topic_name ) :
+ ?>
>
@@ -86,7 +87,7 @@ if ( ! defined( 'ABSPATH' ) ) {
@@ -142,14 +143,14 @@ if ( ! defined( 'ABSPATH' ) ) {
-