Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Excluded children categories from WP_Query in product shortcode if cat_operator=AND.

This commit is contained in:
Peter Fabian 2018-05-24 16:12:48 +01:00
parent 216dce4fab
commit 082c1dfaf3
2 changed files with 77 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
includes/shortcodes/class-wc-shortcode-products.php
View File

@ -323,10 +323,16 @@ class WC_Shortcode_Products {
} }
$query_args['tax_query'][] = array( $query_args['tax_query'][] = array(
'taxonomy' => 'product_cat', 'taxonomy' => 'product_cat',
'terms' => $categories, 'terms' => $categories,
'field' => $field, 'field' => $field,
'operator' => $this->attributes['cat_operator'], 'operator' => $this->attributes['cat_operator'],
/*
* When cat_operator is AND, the children categories should be excluded,
* as only products belonging to all the children categories would be selected.
*/
'include_children' => 'AND' === $this->attributes['cat_operator'] ? false : true,
); );
} }
} }

75
tests/unit-tests/shortcodes/products.php
View File

@ -150,10 +150,11 @@ class WC_Test_Shortcode_Products extends WC_Unit_Test_Case {
'fields' => 'ids', 'fields' => 'ids',
); );
$expected4['tax_query'][] = array( $expected4['tax_query'][] = array(
'taxonomy' => 'product_cat', 'taxonomy' => 'product_cat',
'terms' => array( 'clothing' ), 'terms' => array( 'clothing' ),
'field' => 'slug', 'field' => 'slug',
'operator' => 'IN', 'operator' => 'IN',
'include_children' => true,
); );
$this->assertEquals( $expected4, $shortcode4->get_query_args() ); $this->assertEquals( $expected4, $shortcode4->get_query_args() );
@ -180,10 +181,11 @@ class WC_Test_Shortcode_Products extends WC_Unit_Test_Case {
'fields' => 'ids', 'fields' => 'ids',
); );
$expected4_id['tax_query'][] = array( $expected4_id['tax_query'][] = array(
'taxonomy' => 'product_cat', 'taxonomy' => 'product_cat',
'terms' => array( 123 ), 'terms' => array( 123 ),
'field' => 'term_id', 'field' => 'term_id',
'operator' => 'IN', 'operator' => 'IN',
'include_children' => true,
); );
$this->assertEquals( $expected4_id, $shortcode4_id->get_query_args() ); $this->assertEquals( $expected4_id, $shortcode4_id->get_query_args() );
@ -492,6 +494,63 @@ class WC_Test_Shortcode_Products extends WC_Unit_Test_Case {
); );
$this->assertEquals( $expected14, $shortcode14->get_query_args() ); $this->assertEquals( $expected14, $shortcode14->get_query_args() );
// products shortcode -- select multiple categories using AND operator.
$shortcode15 = new WC_Shortcode_Products( array(
'category' => 'cat1,cat2',
'cat_operator' => 'AND',
) );
$expected15 = array(
'post_type' => 'product',
'post_status' => 'publish',
'ignore_sticky_posts' => true,
'no_found_rows' => true,
'orderby' => 'title',
'order' => 'ASC',
'posts_per_page' => -1,
'meta_query' => $meta_query,
'tax_query' => array_merge( $tax_query, array(
array(
'taxonomy' => 'product_cat',
'terms' => array( 'cat1', 'cat2' ),
'field' => 'slug',
'operator' => 'AND',
'include_children' => false,
),
) ),
'fields' => 'ids',
);
$this->assertEquals( $expected15, $shortcode15->get_query_args() );
// products shortcode -- exclude multiple categories using NOT IN operator.
$shortcode16 = new WC_Shortcode_Products( array(
'category' => 'cat1,cat2',
'cat_operator' => 'NOT IN',
) );
$expected16 = array(
'post_type' => 'product',
'post_status' => 'publish',
'ignore_sticky_posts' => true,
'no_found_rows' => true,
'orderby' => 'title',
'order' => 'ASC',
'posts_per_page' => -1,
'meta_query' => $meta_query,
'tax_query' => array_merge( $tax_query, array(
array(
'taxonomy' => 'product_cat',
'terms' => array( 'cat1', 'cat2' ),
'field' => 'slug',
'operator' => 'NOT IN',
'include_children' => true,
),
) ),
'fields' => 'ids',
);
$this->assertEquals( $expected16, $shortcode16->get_query_args() );
} }
/** /**