diff --git a/includes/abstracts/abstract-wc-product.php b/includes/abstracts/abstract-wc-product.php index b53f2a3bacb..8317b50c808 100644 --- a/includes/abstracts/abstract-wc-product.php +++ b/includes/abstracts/abstract-wc-product.php @@ -1083,29 +1083,12 @@ class WC_Product { * @return string */ public function get_average_rating() { - global $wpdb; - - // No meta date? Do the calculation + // No meta data? Do the calculation if ( ! metadata_exists( 'post', $this->id, '_wc_average_rating' ) ) { - if ( $count = $this->get_rating_count() ) { - $ratings = $wpdb->get_var( $wpdb->prepare(" - SELECT SUM(meta_value) FROM $wpdb->commentmeta - LEFT JOIN $wpdb->comments ON $wpdb->commentmeta.comment_id = $wpdb->comments.comment_ID - WHERE meta_key = 'rating' - AND comment_post_ID = %d - AND comment_approved = '1' - AND meta_value > 0 - ", $this->id ) ); - $average = number_format( $ratings / $count, 2, '.', '' ); - } else { - $average = 0; - } - update_post_meta( $this->id, '_wc_average_rating', $average ); - } else { - $average = get_post_meta( $this->id, '_wc_average_rating', true ); + $this->sync_average_rating( $this->id ); } - return (string) floatval( $average ); + return (string) floatval( get_post_meta( $this->id, '_wc_average_rating', true ) ); } /** @@ -1114,30 +1097,13 @@ class WC_Product { * @return int */ public function get_rating_count( $value = null ) { - global $wpdb; - - // No meta date? Do the calculation + // No meta data? Do the calculation if ( ! metadata_exists( 'post', $this->id, '_wc_rating_count' ) ) { - $counts = array(); - $raw_counts = $wpdb->get_results( $wpdb->prepare(" - SELECT meta_value, COUNT( * ) as meta_value_count FROM $wpdb->commentmeta - LEFT JOIN $wpdb->comments ON $wpdb->commentmeta.comment_id = $wpdb->comments.comment_ID - WHERE meta_key = 'rating' - AND comment_post_ID = %d - AND comment_approved = '1' - AND meta_value > 0 - GROUP BY meta_value - ", $this->id ) ); - - foreach ( $raw_counts as $count ) { - $counts[ $count->meta_value ] = $count->meta_value_count; - } - - update_post_meta( $this->id, '_wc_rating_count', $counts ); - } else { - $counts = get_post_meta( $this->id, '_wc_rating_count', true ); + $this->sync_rating_count( $this->id ); } + $counts = get_post_meta( $this->id, '_wc_rating_count', true ); + if ( is_null( $value ) ) { return array_sum( $counts ); } else { @@ -1145,6 +1111,60 @@ class WC_Product { } } + /** + * Sync product rating. Can be called statically. + * @param int $post_id + */ + public static function sync_average_rating( $post_id ) { + if ( ! metadata_exists( 'post', $post_id, '_wc_rating_count' ) ) { + self::sync_rating_count( $post_id ); + } + + $count = array_sum( (array) get_post_meta( $post_id, '_wc_rating_count', true ) ); + + if ( $count ) { + global $wpdb; + + $ratings = $wpdb->get_var( $wpdb->prepare(" + SELECT SUM(meta_value) FROM $wpdb->commentmeta + LEFT JOIN $wpdb->comments ON $wpdb->commentmeta.comment_id = $wpdb->comments.comment_ID + WHERE meta_key = 'rating' + AND comment_post_ID = %d + AND comment_approved = '1' + AND meta_value > 0 + ", $post_id ) ); + $average = number_format( $ratings / $count, 2, '.', '' ); + } else { + $average = 0; + } + update_post_meta( $post_id, '_wc_average_rating', $average ); + } + + /** + * Sync product rating count. Can be called statically. + * @param int $post_id + */ + public static function sync_rating_count( $post_id ) { + global $wpdb; + + $counts = array(); + $raw_counts = $wpdb->get_results( $wpdb->prepare(" + SELECT meta_value, COUNT( * ) as meta_value_count FROM $wpdb->commentmeta + LEFT JOIN $wpdb->comments ON $wpdb->commentmeta.comment_id = $wpdb->comments.comment_ID + WHERE meta_key = 'rating' + AND comment_post_ID = %d + AND comment_approved = '1' + AND meta_value > 0 + GROUP BY meta_value + ", $post_id ) ); + + foreach ( $raw_counts as $count ) { + $counts[ $count->meta_value ] = $count->meta_value_count; + } + + update_post_meta( $post_id, '_wc_rating_count', $counts ); + } + /** * Returns the product rating in html format. * diff --git a/includes/admin/settings/class-wc-settings-checkout.php b/includes/admin/settings/class-wc-settings-checkout.php index b1ca8883c2c..ae812f79f19 100644 --- a/includes/admin/settings/class-wc-settings-checkout.php +++ b/includes/admin/settings/class-wc-settings-checkout.php @@ -79,7 +79,6 @@ class WC_Settings_Payment_Gateways extends WC_Settings_Page { 'type' => 'checkbox', 'checkboxgroup' => 'start', 'desc_tip' => __( 'Coupons can be applied from the cart and checkout pages.', 'woocommerce' ), - 'autoload' => false, ), array( diff --git a/includes/admin/settings/class-wc-settings-products.php b/includes/admin/settings/class-wc-settings-products.php index c965a261c5d..1afd3f002e1 100644 --- a/includes/admin/settings/class-wc-settings-products.php +++ b/includes/admin/settings/class-wc-settings-products.php @@ -323,8 +323,7 @@ class WC_Settings_Products extends WC_Settings_Page { 'min' => 0, 'step' => 1 ), - 'default' => '0', - 'autoload' => false + 'default' => '0' ), array( @@ -456,14 +455,14 @@ class WC_Settings_Products extends WC_Settings_Page { array( 'type' => 'sectionend', - 'id' => 'product_measurement_options' + 'id' => 'product_measurement_options', ), array( 'title' => __( 'Reviews', 'woocommerce' ), 'type' => 'title', 'desc' => '', - 'id' => 'product_rating_options' + 'id' => 'product_rating_options', ), array( @@ -474,7 +473,6 @@ class WC_Settings_Products extends WC_Settings_Page { 'type' => 'checkbox', 'checkboxgroup' => 'start', 'show_if_checked' => 'option', - 'autoload' => false ), array( @@ -484,7 +482,7 @@ class WC_Settings_Products extends WC_Settings_Page { 'type' => 'checkbox', 'checkboxgroup' => '', 'show_if_checked' => 'yes', - 'autoload' => false + 'autoload' => false, ), array( @@ -494,7 +492,7 @@ class WC_Settings_Products extends WC_Settings_Page { 'type' => 'checkbox', 'checkboxgroup' => '', 'show_if_checked' => 'yes', - 'autoload' => false + 'autoload' => false, ), array( @@ -504,7 +502,7 @@ class WC_Settings_Products extends WC_Settings_Page { 'type' => 'checkbox', 'checkboxgroup' => 'end', 'show_if_checked' => 'yes', - 'autoload' => false + 'autoload' => false, ), array( diff --git a/includes/class-wc-cart.php b/includes/class-wc-cart.php index 42f7d0df63b..0f36786f10b 100644 --- a/includes/class-wc-cart.php +++ b/includes/class-wc-cart.php @@ -101,59 +101,10 @@ class WC_Cart { */ public $fees = array(); - /** - * Prices include tax. - * - * @var bool - */ - public $prices_include_tax; - - /** - * Round at subtotal. - * - * @var bool - */ - public $round_at_subtotal; - - /** - * Tax display cart. - * - * @var string - */ - public $tax_display_cart; - - /** - * Prices inc tax. - * - * @var int - */ - public $dp; - - /** - * Display totals excluding tax. - * - * @var bool - */ - public $display_totals_ex_tax; - - /** - * Display cart excluding tax. - * - * @var bool - */ - public $display_cart_ex_tax; - /** * Constructor for the cart class. Loads options and hooks in the init method. */ public function __construct() { - $this->prices_include_tax = wc_prices_include_tax(); - $this->round_at_subtotal = get_option( 'woocommerce_tax_round_at_subtotal' ) == 'yes'; - $this->tax_display_cart = get_option( 'woocommerce_tax_display_cart' ); - $this->dp = wc_get_price_decimals(); - $this->display_totals_ex_tax = $this->tax_display_cart == 'excl'; - $this->display_cart_ex_tax = $this->tax_display_cart == 'excl'; - add_action( 'wp_loaded', array( $this, 'init' ) ); // Get cart after WP and plugins are loaded. add_action( 'wp', array( $this, 'maybe_set_cart_cookies' ), 99 ); // Set cookies add_action( 'shutdown', array( $this, 'maybe_set_cart_cookies' ), 0 ); // Set cookies before shutdown and ob flushing @@ -169,6 +120,22 @@ class WC_Cart { */ public function __get( $key ) { switch ( $key ) { + case 'prices_include_tax' : + return wc_prices_include_tax(); + break; + case 'round_at_subtotal' : + return 'yes' === get_option( 'woocommerce_tax_round_at_subtotal' ); + break; + case 'tax_display_cart' : + return get_option( 'woocommerce_tax_display_cart' ); + break; + case 'dp' : + return wc_get_price_decimals(); + break; + case 'display_totals_ex_tax' : + case 'display_cart_ex_tax' : + return $this->tax_display_cart === 'excl'; + break; case 'cart_contents_weight' : return $this->get_cart_contents_weight(); break; @@ -256,6 +223,9 @@ class WC_Cart { } if ( is_array( $cart ) ) { + // Prime meta cache to reduce future queries + update_meta_cache( 'post', wp_list_pluck( $cart, 'product_id' ) ); + foreach ( $cart as $key => $values ) { $_product = wc_get_product( $values['variation_id'] ? $values['variation_id'] : $values['product_id'] ); diff --git a/includes/class-wc-comments.php b/includes/class-wc-comments.php index 08ec1a73c30..8fed8984f32 100644 --- a/includes/class-wc-comments.php +++ b/includes/class-wc-comments.php @@ -235,6 +235,7 @@ class WC_Comments { delete_post_meta( $post_id, '_wc_average_rating' ); delete_post_meta( $post_id, '_wc_rating_count' ); delete_post_meta( $post_id, '_wc_review_count' ); + WC_Product::sync_average_rating( $post_id ); } /** diff --git a/includes/class-wc-product-factory.php b/includes/class-wc-product-factory.php index 8a2241e8772..d4f067ab772 100644 --- a/includes/class-wc-product-factory.php +++ b/includes/class-wc-product-factory.php @@ -63,7 +63,7 @@ class WC_Product_Factory { if ( isset( $args['product_type'] ) ) { $product_type = $args['product_type']; } else { - $terms = get_the_terms( $product_id, 'product_type' ); + $terms = get_the_terms( $the_product, 'product_type' ); $product_type = ! empty( $terms ) ? sanitize_title( current( $terms )->name ) : 'simple'; } } elseif( 'product_variation' === $post_type ) { diff --git a/includes/class-wc-product-variable.php b/includes/class-wc-product-variable.php index 8595ddfdf6b..c8c09b7b07d 100644 --- a/includes/class-wc-product-variable.php +++ b/includes/class-wc-product-variable.php @@ -824,8 +824,10 @@ class WC_Product_Variable extends WC_Product { update_post_meta( $product_id, '_max_' . $price_type . '_variation_id', ${"max_{$price_type}_id"} ); } - // The VARIABLE PRODUCT price should equal the min price of any type - update_post_meta( $product_id, '_price', $min_price ); + // Sync _price meta + delete_post_meta( $product_id, '_price' ); + add_post_meta( $product_id, '_price', $min_price, false ); + add_post_meta( $product_id, '_price', $max_price, false ); delete_transient( 'wc_products_onsale' ); // Sync attributes diff --git a/includes/class-wc-query.php b/includes/class-wc-query.php index 53e3de5b698..c57f96fc599 100644 --- a/includes/class-wc-query.php +++ b/includes/class-wc-query.php @@ -3,7 +3,7 @@ * Contains the query functions for WooCommerce which alter the front-end post queries and loops * * @class WC_Query - * @version 2.3.0 + * @version 2.6.0 * @package WooCommerce/Classes * @category Class * @author WooThemes @@ -23,26 +23,11 @@ class WC_Query { /** @public array Query vars to add to wp */ public $query_vars = array(); - /** @public array Unfiltered product ids (before layered nav etc) */ - public $unfiltered_product_ids = array(); - - /** @public array Filtered product ids (after layered nav) */ - public $filtered_product_ids = array(); - - /** @public array Filtered product ids (after layered nav, per taxonomy) */ - public $filtered_product_ids_for_taxonomy = array(); - - /** @public array Product IDs that match the layered nav + price filter */ - public $post__in = array(); - - /** @public array|string The meta query for the page */ - public $meta_query = ''; - - /** @public array Post IDs matching layered nav only */ - public $layered_nav_post__in = array(); - - /** @public array Stores post IDs matching layered nav, so price filter can find max price in view */ - public $layered_nav_product_ids = array(); + /** + * Stores chosen attributes + * @var array + */ + private static $_chosen_attributes; /** * Constructor for the query class. Hooks in methods. @@ -51,20 +36,14 @@ class WC_Query { */ public function __construct() { add_action( 'init', array( $this, 'add_endpoints' ) ); - add_action( 'init', array( $this, 'layered_nav_init' ) ); - add_action( 'init', array( $this, 'price_filter_init' ) ); - add_action( 'init', array( $this, 'rating_filter_init' ) ); - if ( ! is_admin() ) { add_action( 'wp_loaded', array( $this, 'get_errors' ), 20 ); add_filter( 'query_vars', array( $this, 'add_query_vars'), 0 ); add_action( 'parse_request', array( $this, 'parse_request'), 0 ); add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ) ); - add_filter( 'the_posts', array( $this, 'the_posts' ), 11, 2 ); add_action( 'wp', array( $this, 'remove_product_query' ) ); add_action( 'wp', array( $this, 'remove_ordering_args' ) ); } - $this->init_query_vars(); } @@ -155,7 +134,6 @@ class WC_Query { foreach ( $this->query_vars as $key => $var ) { $vars[] = $key; } - return $vars; } @@ -301,9 +279,6 @@ class WC_Query { add_filter( 'wp', array( $this, 'remove_posts_where' ) ); } - // We're on a shop page so queue the woocommerce_get_products_in_view function - add_action( 'wp', array( $this, 'get_products_in_view' ), 2); - // And remove the pre_get_posts hook $this->remove_product_query(); } @@ -338,7 +313,7 @@ class WC_Query { * @return string */ public function wpseo_metadesc() { - return WPSEO_Meta::get_value( 'metadesc', wc_get_page_id('shop') ); + return WPSEO_Meta::get_value( 'metadesc', wc_get_page_id( 'shop' ) ); } /** @@ -350,82 +325,17 @@ class WC_Query { * @return string */ public function wpseo_metakey() { - return WPSEO_Meta::get_value( 'metakey', wc_get_page_id('shop') ); + return WPSEO_Meta::get_value( 'metakey', wc_get_page_id( 'shop' ) ); } - /** - * Hook into the_posts to do the main product query if needed - relevanssi compatibility. - * - * @access public - * @param array $posts - * @param WP_Query|bool $query (default: false) - * @return array - */ - public function the_posts( $posts, $query = false ) { - // Abort if there's no query - if ( ! $query ) - return $posts; - - // Abort if we're not filtering posts - if ( empty( $this->post__in ) ) - return $posts; - - // Abort if this query has already been done - if ( ! empty( $query->wc_query ) ) - return $posts; - - // Abort if this isn't a search query - if ( empty( $query->query_vars["s"] ) ) - return $posts; - - // Abort if we're not on a post type archive/product taxonomy - if ( ! $query->is_post_type_archive( 'product' ) && ! $query->is_tax( get_object_taxonomies( 'product' ) ) ) - return $posts; - - $filtered_posts = array(); - $queried_post_ids = array(); - - foreach ( $posts as $post ) { - if ( in_array( $post->ID, $this->post__in ) ) { - $filtered_posts[] = $post; - $queried_post_ids[] = $post->ID; - } - } - - $query->posts = $filtered_posts; - $query->post_count = count( $filtered_posts ); - - // Ensure filters are set - $this->unfiltered_product_ids = $queried_post_ids; - $this->filtered_product_ids = $queried_post_ids; - - if ( sizeof( $this->layered_nav_post__in ) > 0 ) { - $this->layered_nav_product_ids = array_intersect( $this->unfiltered_product_ids, $this->layered_nav_post__in ); - } else { - $this->layered_nav_product_ids = $this->unfiltered_product_ids; - } - - return $filtered_posts; - } - - /** * Query the products, applying sorting/ordering etc. This applies to the main wordpress loop. * * @param mixed $q */ public function product_query( $q ) { - - // Meta query - $meta_query = $this->get_meta_query( $q->get( 'meta_query' ) ); - - // Ordering - $ordering = $this->get_catalog_ordering_args(); - - // Get a list of post id's which match the current filters set (in the layered nav and price filter) - $post__in = array_unique( apply_filters( 'loop_shop_post_in', array() ) ); - // Ordering query vars + $ordering = $this->get_catalog_ordering_args(); $q->set( 'orderby', $ordering['orderby'] ); $q->set( 'order', $ordering['order'] ); if ( isset( $ordering['meta_key'] ) ) { @@ -433,16 +343,11 @@ class WC_Query { } // Query vars that affect posts shown - $q->set( 'meta_query', $meta_query ); - $q->set( 'post__in', $post__in ); + $q->set( 'meta_query', $this->get_meta_query( $q->get( 'meta_query' ) ) ); + $q->set( 'tax_query', $this->get_tax_query( $q->get( 'tax_query' ) ) ); $q->set( 'posts_per_page', $q->get( 'posts_per_page' ) ? $q->get( 'posts_per_page' ) : apply_filters( 'loop_shop_per_page', get_option( 'posts_per_page' ) ) ); - - // Set a special variable $q->set( 'wc_query', 'product_query' ); - - // Store variables - $this->post__in = $post__in; - $this->meta_query = $meta_query; + $q->set( 'post__in', array_unique( apply_filters( 'loop_shop_post_in', array() ) ) ); do_action( 'woocommerce_product_query', $q, $this ); } @@ -470,66 +375,6 @@ class WC_Query { remove_filter( 'posts_where', array( $this, 'search_post_excerpt' ) ); } - - /** - * Get an unpaginated list all product ID's (both filtered and unfiltered). Makes use of transients. - */ - public function get_products_in_view() { - global $wp_the_query; - - // Get main query - $current_wp_query = $wp_the_query->query; - - // Get WP Query for current page (without 'paged') - unset( $current_wp_query['paged'] ); - - // Generate a transient name based on current query - $transient_name = 'wc_uf_pid_' . md5( http_build_query( $current_wp_query ) . WC_Cache_Helper::get_transient_version( 'product_query' ) ); - $transient_name = ( is_search() ) ? $transient_name . '_s' : $transient_name; - - if ( false === ( $unfiltered_product_ids = get_transient( $transient_name ) ) ) { - - // Get all visible posts, regardless of filters - $unfiltered_args = array_merge( - $current_wp_query, - array( - 'post_type' => 'product', - 'numberposts' => -1, - 'post_status' => 'publish', - 'meta_query' => $this->meta_query, - 'fields' => 'ids', - 'no_found_rows' => true, - 'update_post_meta_cache' => false, - 'update_post_term_cache' => false, - 'pagename' => '', - 'wc_query' => 'get_products_in_view' - ) - ); - - $unfiltered_product_ids = apply_filters( 'woocommerce_unfiltered_product_ids', get_posts( $unfiltered_args ), $unfiltered_args ); - - set_transient( $transient_name, $unfiltered_product_ids, DAY_IN_SECONDS * 30 ); - } - - // Store the variable - $this->unfiltered_product_ids = $unfiltered_product_ids; - - // Also store filtered posts ids... - if ( sizeof( $this->post__in ) > 0 ) { - $this->filtered_product_ids = array_intersect( $this->unfiltered_product_ids, $this->post__in ); - } else { - $this->filtered_product_ids = $this->unfiltered_product_ids; - } - - // And filtered post ids which just take layered nav into consideration (to find max price in the price widget) - if ( sizeof( $this->layered_nav_post__in ) > 0 ) { - $this->layered_nav_product_ids = array_intersect( $this->unfiltered_product_ids, $this->layered_nav_post__in ); - } else { - $this->layered_nav_product_ids = $this->unfiltered_product_ids; - } - } - - /** * Returns an array of arguments for ordering products based on the selected values. * @@ -601,9 +446,7 @@ class WC_Query { */ public function order_by_popularity_post_clauses( $args ) { global $wpdb; - $args['orderby'] = "$wpdb->postmeta.meta_value+0 DESC, $wpdb->posts.post_date DESC"; - return $args; } @@ -618,16 +461,12 @@ class WC_Query { global $wpdb; $args['fields'] .= ", AVG( $wpdb->commentmeta.meta_value ) as average_rating "; - - $args['where'] .= " AND ( $wpdb->commentmeta.meta_key = 'rating' OR $wpdb->commentmeta.meta_key IS null ) "; - - $args['join'] .= " + $args['where'] .= " AND ( $wpdb->commentmeta.meta_key = 'rating' OR $wpdb->commentmeta.meta_key IS null ) "; + $args['join'] .= " LEFT OUTER JOIN $wpdb->comments ON($wpdb->posts.ID = $wpdb->comments.comment_post_ID) LEFT JOIN $wpdb->commentmeta ON($wpdb->comments.comment_ID = $wpdb->commentmeta.comment_id) "; - $args['orderby'] = "average_rating DESC, $wpdb->posts.post_date DESC"; - $args['groupby'] = "$wpdb->posts.ID"; return $args; @@ -640,35 +479,80 @@ class WC_Query { * @return array */ public function get_meta_query( $meta_query = array() ) { - if ( ! is_array( $meta_query ) ) + if ( ! is_array( $meta_query ) ) { $meta_query = array(); + } $meta_query[] = $this->visibility_meta_query(); $meta_query[] = $this->stock_status_meta_query(); + $meta_query[] = $this->price_filter_meta_query(); + $meta_query[] = $this->rating_filter_meta_query(); - return array_filter( $meta_query ); + return array_filter( apply_filters( 'woocommerce_product_query_meta_query', $meta_query, $this ) ); + } + + /** + * Return a meta query for filtering by price. + * @return array + */ + private function price_filter_meta_query() { + if ( isset( $_GET['max_price'] ) || isset( $_GET['min_price'] ) ) { + $min = isset( $_GET['min_price'] ) ? floatval( $_GET['min_price'] ) : 0; + $max = isset( $_GET['max_price'] ) ? floatval( $_GET['max_price'] ) : 9999999999; + + // If displaying prices in the shop including taxes, but prices don't include taxes.. + if ( wc_tax_enabled() && 'incl' === get_option( 'woocommerce_tax_display_shop' ) && ! wc_prices_include_tax() ) { + $tax_classes = array_merge( array( '' ), WC_Tax::get_tax_classes() ); + + foreach ( $tax_classes as $tax_class ) { + $tax_rates = WC_Tax::get_rates( $tax_class ); + $class_min = $min - WC_Tax::get_tax_total( WC_Tax::calc_inclusive_tax( $min, $tax_rates ) ); + $class_max = $max - WC_Tax::get_tax_total( WC_Tax::calc_inclusive_tax( $max, $tax_rates ) ); + if ( $class_min < $min ) { + $min = $class_min; + } + if ( $class_max > $max ) { + $max = $class_max; + } + } + } + + return array( + 'key' => '_price', + 'value' => array( $min, $max ), + 'compare' => 'BETWEEN', + 'type' => 'DECIMAL', + 'price_filter' => true, + ); + } + return array(); + } + + /** + * Return a meta query for filtering by rating. + * @return array + */ + public function rating_filter_meta_query() { + return isset( $_GET['min_rating'] ) ? array( + 'key' => '_wc_average_rating', + 'value' => isset( $_GET['min_rating'] ) ? floatval( $_GET['min_rating'] ) : 0, + 'compare' => '>=', + 'type' => 'DECIMAL', + 'rating_filter' => true, + ) : array(); } /** * Returns a meta query to handle product visibility. - * - * @access public * @param string $compare (default: 'IN') * @return array */ public function visibility_meta_query( $compare = 'IN' ) { - if ( is_search() ) - $in = array( 'visible', 'search' ); - else - $in = array( 'visible', 'catalog' ); - - $meta_query = array( + return array( 'key' => '_visibility', - 'value' => $in, - 'compare' => $compare + 'value' => is_search() ? array( 'visible', 'search' ) : array( 'visible', 'catalog' ), + 'compare' => $compare, ); - - return $meta_query; } /** @@ -679,299 +563,121 @@ class WC_Query { * @return array */ public function stock_status_meta_query( $status = 'instock' ) { - $meta_query = array(); - if ( get_option( 'woocommerce_hide_out_of_stock_items' ) == 'yes' ) { - $meta_query = array( - 'key' => '_stock_status', - 'value' => $status, - 'compare' => '=' + return 'yes' === get_option( 'woocommerce_hide_out_of_stock_items' ) ? array( + 'key' => '_stock_status', + 'value' => $status, + 'compare' => '=', + ) : array(); + } + + /** + * Appends tax queries to an array. + * @param array $tax_query + * @return array + */ + public function get_tax_query( $tax_query = array() ) { + if ( ! is_array( $tax_query ) ) { + $tax_query = array(); + } + + // Layered nav filters on terms + if ( $_chosen_attributes = $this->get_layered_nav_chosen_attributes() ) { + foreach ( $_chosen_attributes as $taxonomy => $data ) { + $tax_query[] = array( + 'taxonomy' => $taxonomy, + 'field' => 'slug', + 'terms' => $data['terms'], + 'operator' => 'and' === $data['query_type'] ? 'AND' : 'IN', + 'include_children' => false, + ); + } + } + + return array_filter( apply_filters( 'woocommerce_product_query_tax_query', $tax_query, $this ) ); + } + + /** + * Get the tax query which was used by the main query. + * @return array + */ + public static function get_main_tax_query() { + global $wp_the_query; + + $args = $wp_the_query->query_vars; + $tax_query = isset( $args['tax_query'] ) ? $args['tax_query'] : array(); + + if ( ! empty( $args['taxonomy'] ) && ! empty( $args['term'] ) ) { + $tax_query[] = array( + 'taxonomy' => $args['taxonomy'], + 'terms' => array( $args['term'] ), + 'field' => 'slug', ); } + + return $tax_query; + } + + /** + * Get the meta query which was used by the main query. + * @return array + */ + public static function get_main_meta_query() { + global $wp_the_query; + + $args = $wp_the_query->query_vars; + $meta_query = isset( $args['meta_query'] ) ? $args['meta_query'] : array(); + return $meta_query; } /** * Layered Nav Init. */ - public function layered_nav_init( ) { - if ( apply_filters( 'woocommerce_is_layered_nav_active', is_active_widget( false, false, 'woocommerce_layered_nav', true ) ) && ! is_admin() ) { - - global $_chosen_attributes; - - $_chosen_attributes = array(); + public static function get_layered_nav_chosen_attributes() { + if ( ! is_array( self::$_chosen_attributes ) ) { + self::$_chosen_attributes = array(); if ( $attribute_taxonomies = wc_get_attribute_taxonomies() ) { foreach ( $attribute_taxonomies as $tax ) { $attribute = wc_sanitize_taxonomy_name( $tax->attribute_name ); $taxonomy = wc_attribute_taxonomy_name( $attribute ); - $name = 'filter_' . $attribute; $filter_terms = ! empty( $_GET[ 'filter_' . $attribute ] ) ? explode( ',', wc_clean( $_GET[ 'filter_' . $attribute ] ) ) : array(); - $query_type = ! empty( $_GET[ 'query_type_' . $attribute ] ) && in_array( $_GET[ 'query_type_' . $attribute ], array( 'and', 'or' ) ) ? wc_clean( $_GET[ 'query_type_' . $attribute ] ) : ''; - if ( ! $query_type ) { - $query_type = apply_filters( 'woocommerce_layered_nav_default_query_type', 'and' ); + if ( empty( $filter_terms ) || ! taxonomy_exists( $taxonomy ) ) { + continue; } - if ( ! empty( $filter_terms ) && taxonomy_exists( $taxonomy ) ) { - $_chosen_attributes[ $taxonomy ]['terms'] = array_map( 'sanitize_title', $filter_terms ); // Ensures correct encoding - $_chosen_attributes[ $taxonomy ]['query_type'] = $query_type; - } + $query_type = ! empty( $_GET[ 'query_type_' . $attribute ] ) && in_array( $_GET[ 'query_type_' . $attribute ], array( 'and', 'or' ) ) ? wc_clean( $_GET[ 'query_type_' . $attribute ] ) : ''; + self::$_chosen_attributes[ $taxonomy ]['terms'] = array_map( 'sanitize_title', $filter_terms ); // Ensures correct encoding + self::$_chosen_attributes[ $taxonomy ]['query_type'] = $query_type ? $query_type : apply_filters( 'woocommerce_layered_nav_default_query_type', 'and' ); } } - - add_filter( 'loop_shop_post_in', array( $this, 'layered_nav_query' ) ); } + return self::$_chosen_attributes; + } + + /** + * @deprecated 2.6.0 + */ + public function layered_nav_init() { + _deprecated_function( 'layered_nav_init', '2.6', '' ); + } + + /** + * Get an unpaginated list all product ID's (both filtered and unfiltered). Makes use of transients. + * @deprecated 2.6.0 due to performance concerns + */ + public function get_products_in_view() { + _deprecated_function( 'get_products_in_view', '2.6', '' ); } /** * Layered Nav post filter. - * - * @param array $filtered_posts - * @return array + * @deprecated 2.6.0 due to performance concerns */ public function layered_nav_query( $filtered_posts ) { - global $_chosen_attributes; - - if ( sizeof( $_chosen_attributes ) > 0 ) { - - $matched_products = array( - 'and' => array(), - 'or' => array() - ); - $filtered_attribute = array( - 'and' => false, - 'or' => false - ); - - foreach ( $_chosen_attributes as $attribute => $data ) { - $matched_products_from_attribute = array(); - $filtered = false; - - if ( sizeof( $data['terms'] ) > 0 ) { - foreach ( $data['terms'] as $value ) { - - $args = array( - 'post_type' => 'product', - 'numberposts' => -1, - 'post_status' => 'publish', - 'fields' => 'ids', - 'no_found_rows' => true, - 'tax_query' => array( - array( - 'taxonomy' => $attribute, - 'terms' => $value, - 'field' => 'slug' - ) - ) - ); - - $post_ids = apply_filters( 'woocommerce_layered_nav_query_post_ids', get_posts( $args ), $args, $attribute, $value ); - - if ( ! is_wp_error( $post_ids ) ) { - - if ( sizeof( $matched_products_from_attribute ) > 0 || $filtered ) { - $matched_products_from_attribute = $data['query_type'] == 'or' ? array_merge( $post_ids, $matched_products_from_attribute ) : array_intersect( $post_ids, $matched_products_from_attribute ); - } else { - $matched_products_from_attribute = $post_ids; - } - - $filtered = true; - } - } - } - - if ( sizeof( $matched_products[ $data['query_type'] ] ) > 0 || $filtered_attribute[ $data['query_type'] ] === true ) { - $matched_products[ $data['query_type'] ] = ( $data['query_type'] == 'or' ) ? array_merge( $matched_products_from_attribute, $matched_products[ $data['query_type'] ] ) : array_intersect( $matched_products_from_attribute, $matched_products[ $data['query_type'] ] ); - } else { - $matched_products[ $data['query_type'] ] = $matched_products_from_attribute; - } - - $filtered_attribute[ $data['query_type'] ] = true; - - $this->filtered_product_ids_for_taxonomy[ $attribute ] = $matched_products_from_attribute; - } - - // Combine our AND and OR result sets - if ( $filtered_attribute['and'] && $filtered_attribute['or'] ) - $results = array_intersect( $matched_products[ 'and' ], $matched_products[ 'or' ] ); - else - $results = array_merge( $matched_products[ 'and' ], $matched_products[ 'or' ] ); - - if ( $filtered ) { - - WC()->query->layered_nav_post__in = $results; - WC()->query->layered_nav_post__in[] = 0; - - if ( sizeof( $filtered_posts ) == 0 ) { - $filtered_posts = $results; - $filtered_posts[] = 0; - } else { - $filtered_posts = array_intersect( $filtered_posts, $results ); - $filtered_posts[] = 0; - } - - } - } - return (array) $filtered_posts; + _deprecated_function( 'layered_nav_query', '2.6', '' ); } - - /** - * Price filter Init. - */ - public function price_filter_init() { - if ( apply_filters( 'woocommerce_is_price_filter_active', is_active_widget( false, false, 'woocommerce_price_filter', true ) ) && ! is_admin() ) { - - $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; - - wp_register_script( 'wc-jquery-ui-touchpunch', WC()->plugin_url() . '/assets/js/jquery-ui-touch-punch/jquery-ui-touch-punch' . $suffix . '.js', array( 'jquery-ui-slider' ), WC_VERSION, true ); - wp_register_script( 'wc-price-slider', WC()->plugin_url() . '/assets/js/frontend/price-slider' . $suffix . '.js', array( 'jquery-ui-slider', 'wc-jquery-ui-touchpunch' ), WC_VERSION, true ); - - wp_localize_script( 'wc-price-slider', 'woocommerce_price_slider_params', array( - 'currency_symbol' => get_woocommerce_currency_symbol(), - 'currency_pos' => get_option( 'woocommerce_currency_pos' ), - 'min_price' => isset( $_GET['min_price'] ) ? esc_attr( $_GET['min_price'] ) : '', - 'max_price' => isset( $_GET['max_price'] ) ? esc_attr( $_GET['max_price'] ) : '' - ) ); - - add_filter( 'loop_shop_post_in', array( $this, 'price_filter' ) ); - } - } - - /** - * Price Filter post filter. - * - * @param array $filtered_posts - * @return array - */ - public function price_filter( $filtered_posts = array() ) { - global $wpdb; - - if ( isset( $_GET['max_price'] ) || isset( $_GET['min_price'] ) ) { - - $matched_products = array(); - $min = isset( $_GET['min_price'] ) ? floatval( $_GET['min_price'] ) : 0; - $max = isset( $_GET['max_price'] ) ? floatval( $_GET['max_price'] ) : 9999999999; - - // If displaying prices in the shop including taxes, but prices don't include taxes.. - if ( wc_tax_enabled() && 'incl' === get_option( 'woocommerce_tax_display_shop' ) && ! wc_prices_include_tax() ) { - $tax_classes = array_merge( array( '' ), WC_Tax::get_tax_classes() ); - - foreach ( $tax_classes as $tax_class ) { - $tax_rates = WC_Tax::get_rates( $tax_class ); - $min_class = $min - WC_Tax::get_tax_total( WC_Tax::calc_inclusive_tax( $min, $tax_rates ) ); - $max_class = $max - WC_Tax::get_tax_total( WC_Tax::calc_inclusive_tax( $max, $tax_rates ) ); - - $matched_products_query = apply_filters( 'woocommerce_price_filter_results', $wpdb->get_results( $wpdb->prepare( " - SELECT DISTINCT ID, post_parent, post_type FROM {$wpdb->posts} - INNER JOIN {$wpdb->postmeta} pm1 ON ID = pm1.post_id - INNER JOIN {$wpdb->postmeta} pm2 ON ID = pm2.post_id - WHERE post_type IN ( 'product', 'product_variation' ) - AND post_status = 'publish' - AND pm1.meta_key IN ('" . implode( "','", array_map( 'esc_sql', apply_filters( 'woocommerce_price_filter_meta_keys', array( '_price' ) ) ) ) . "') - AND pm1.meta_value BETWEEN %f AND %f - AND pm2.meta_key = '_tax_class' - AND pm2.meta_value = %s - ", $min_class, $max_class, sanitize_title( $tax_class ) ), OBJECT_K ), $min_class, $max_class ); - - if ( $matched_products_query ) { - foreach ( $matched_products_query as $product ) { - if ( $product->post_type == 'product' ) { - $matched_products[] = $product->ID; - } - if ( $product->post_parent > 0 ) { - $matched_products[] = $product->post_parent; - } - } - } - } - } else { - $matched_products_query = apply_filters( 'woocommerce_price_filter_results', $wpdb->get_results( $wpdb->prepare( " - SELECT DISTINCT ID, post_parent, post_type FROM {$wpdb->posts} - INNER JOIN {$wpdb->postmeta} pm1 ON ID = pm1.post_id - WHERE post_type IN ( 'product', 'product_variation' ) - AND post_status = 'publish' - AND pm1.meta_key IN ('" . implode( "','", array_map( 'esc_sql', apply_filters( 'woocommerce_price_filter_meta_keys', array( '_price' ) ) ) ) . "') - AND pm1.meta_value BETWEEN %f AND %f - ", $min, $max ), OBJECT_K ), $min, $max ); - - if ( $matched_products_query ) { - foreach ( $matched_products_query as $product ) { - if ( $product->post_type == 'product' ) { - $matched_products[] = $product->ID; - } - if ( $product->post_parent > 0 ) { - $matched_products[] = $product->post_parent; - } - } - } - } - - $matched_products = array_unique( $matched_products ); - - // Filter the id's - if ( 0 === sizeof( $filtered_posts ) ) { - $filtered_posts = $matched_products; - } else { - $filtered_posts = array_intersect( $filtered_posts, $matched_products ); - } - $filtered_posts[] = 0; - } - - return (array) $filtered_posts; - } - - /** - * Rating filter Init. - */ - public function rating_filter_init() { - if ( apply_filters( 'woocommerce_is_rating_filter_active', is_active_widget( false, false, 'woocommerce_rating_filter', true ) ) && ! is_admin() ) { - add_filter( 'loop_shop_post_in', array( $this, 'rating_filter' ) ); - } - } - - /** - * Rating Filter post filter. - * - * @param array $filtered_posts - * @return array - */ - public function rating_filter( $filtered_posts = array() ) { - global $wpdb; - - if( isset( $_GET['min_rating'] ) ) { - $matched_products = array(); - $min = isset( $_GET['min_rating'] ) ? floatval( $_GET['min_rating'] ) : 0; - - $matched_products_query = apply_filters( 'woocommerce_rating_filter_results', $wpdb->get_results( $wpdb->prepare( " - SELECT comment_post_ID, ROUND( AVG( meta_value ), 2 ) as average_rating FROM {$wpdb->commentmeta} - LEFT JOIN $wpdb->comments ON $wpdb->commentmeta.comment_id = $wpdb->comments.comment_ID - WHERE meta_key = 'rating' - AND comment_approved = '1' - AND meta_value > 0 - GROUP BY comment_post_ID - HAVING ROUND( AVG( meta_value ), 2 ) >= %d - ", $min ), OBJECT_K ), $min ); - - if ( $matched_products_query ) { - foreach ( $matched_products_query as $commentmeta ) { - $matched_products[] = $commentmeta->comment_post_ID; - } - } - - $matched_products = array_unique( $matched_products ); - - // Filter the id's - if ( 0 === sizeof( $filtered_posts ) ) { - $filtered_posts = $matched_products; - } else { - $filtered_posts = array_intersect( $filtered_posts, $matched_products ); - } - $filtered_posts[] = 0; - } - - return (array) $filtered_posts; - } - } endif; diff --git a/includes/wc-attribute-functions.php b/includes/wc-attribute-functions.php index 4bc58c5eb80..8e2b025d157 100644 --- a/includes/wc-attribute-functions.php +++ b/includes/wc-attribute-functions.php @@ -107,11 +107,15 @@ function wc_attribute_label( $name, $product = '' ) { * @return string */ function wc_attribute_orderby( $name ) { - global $wpdb; + global $wc_product_attributes, $wpdb; $name = str_replace( 'pa_', '', sanitize_title( $name ) ); - $orderby = $wpdb->get_var( $wpdb->prepare( "SELECT attribute_orderby FROM " . $wpdb->prefix . "woocommerce_attribute_taxonomies WHERE attribute_name = %s;", $name ) ); + if ( isset( $wc_product_attributes[ 'pa_' . $name ] ) ) { + $orderby = $wc_product_attributes[ 'pa_' . $name ]->attribute_orderby; + } else { + $orderby = $wpdb->get_var( $wpdb->prepare( "SELECT attribute_orderby FROM " . $wpdb->prefix . "woocommerce_attribute_taxonomies WHERE attribute_name = %s;", $name ) ); + } return apply_filters( 'woocommerce_attribute_orderby', $orderby, $name ); } diff --git a/includes/wc-conditional-functions.php b/includes/wc-conditional-functions.php index 42fd1d611e0..330f5159007 100644 --- a/includes/wc-conditional-functions.php +++ b/includes/wc-conditional-functions.php @@ -254,9 +254,7 @@ if ( ! function_exists( 'is_filtered' ) ) { * @return bool */ function is_filtered() { - global $_chosen_attributes; - - return apply_filters( 'woocommerce_is_filtered', ( sizeof( $_chosen_attributes ) > 0 || isset( $_GET['max_price'] ) || isset( $_GET['min_price'] ) ) ); + return apply_filters( 'woocommerce_is_filtered', ( sizeof( WC_Query::get_layered_nav_chosen_attributes() ) > 0 || isset( $_GET['max_price'] ) || isset( $_GET['min_price'] ) || isset( $_GET['min_rating'] ) ) ); } } diff --git a/includes/widgets/class-wc-widget-layered-nav-filters.php b/includes/widgets/class-wc-widget-layered-nav-filters.php index ea5d5bd38da..197f667a1cb 100644 --- a/includes/widgets/class-wc-widget-layered-nav-filters.php +++ b/includes/widgets/class-wc-widget-layered-nav-filters.php @@ -43,18 +43,14 @@ class WC_Widget_Layered_Nav_Filters extends WC_Widget { * @param array $instance */ public function widget( $args, $instance ) { - global $_chosen_attributes; - if ( ! is_post_type_archive( 'product' ) && ! is_tax( get_object_taxonomies( 'product' ) ) ) { return; } - // Price - $min_price = isset( $_GET['min_price'] ) ? wc_clean( $_GET['min_price'] ) : 0; - $max_price = isset( $_GET['max_price'] ) ? wc_clean( $_GET['max_price'] ) : 0; - - // Rating - $min_rating = isset( $_GET['min_rating'] ) ? wc_clean( $_GET['min_rating'] ) : 0; + $_chosen_attributes = WC_Query::get_layered_nav_chosen_attributes(); + $min_price = isset( $_GET['min_price'] ) ? wc_clean( $_GET['min_price'] ) : 0; + $max_price = isset( $_GET['max_price'] ) ? wc_clean( $_GET['max_price'] ) : 0; + $min_rating = isset( $_GET['min_rating'] ) ? absint( $_GET['min_rating'] ) : 0; if ( 0 < count( $_chosen_attributes ) || 0 < $min_price || 0 < $max_price || 0 < $min_rating ) { @@ -63,7 +59,7 @@ class WC_Widget_Layered_Nav_Filters extends WC_Widget { echo '