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

Merge pull request #4853 from scottbasgaard/master 

Use 'include' parameter to show siblings/children of current category. Fixes #891
This commit is contained in:
Coen Jacobs 2014-02-19 17:09:21 +01:00
parent f1f7b84db9 39b83a3039
commit 8fdf4d94cf
2 changed files with 79 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
includes/walkers/class-product-cat-list-walker.php
View File

@ -117,8 +117,6 @@ class WC_Product_Cat_List_Walker extends Walker {
if ( !$element )
return;
if ( ! $args[0]['show_children_only'] || ( $args[0]['show_children_only'] && ( $element->parent == 0 || $args[0]['current_category'] == $element->parent || in_array( $element->parent, $args[0]['current_category_ancestors'] ) ) ) ) {
$id_field = $this->db_fields['id'];
//display this element
@ -156,6 +154,5 @@ class WC_Product_Cat_List_Walker extends Walker {
call_user_func_array(array(&$this, 'end_el'), $cb_args);
}
}
}

87
includes/widgets/class-wc-widget-product-categories.php
View File

@ -75,6 +75,8 @@ class WC_Widget_Product_Categories extends WC_Widget {
public function widget( $args, $instance ) {
extract( $args );
global $wp_query, $post, $woocommerce;
$title = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
$c = ( isset( $instance['count'] ) && $instance['count'] ) ? '1' : '0';
$h = $instance['hierarchical'] ? true : false;
@ -87,47 +89,18 @@ class WC_Widget_Product_Categories extends WC_Widget {
if ( $title )
echo $before_title . $title . $after_title;
$dropdown_args = array();
$cat_args = array( 'show_count' => $c, 'hierarchical' => $h, 'taxonomy' => 'product_cat' );
// Menu Order
$cat_args['menu_order'] = false;
if ( $o == 'order' ) {
$cat_args['menu_order'] = 'asc';
} else {
$cat_args['orderby'] = 'title';
}
if ( $d ) {
// Stuck with this until a fix for http://core.trac.wordpress.org/ticket/13258
wc_product_dropdown_categories( array(
'show_counts' => $c,
'hierarchical' => $h,
'show_uncategorized' => 0,
'orderby' => $o
) );
?>
<script type='text/javascript'>
/* <![CDATA[ */
var product_cat_dropdown = document.getElementById("dropdown_product_cat");
function onProductCatChange() {
if ( product_cat_dropdown.options[product_cat_dropdown.selectedIndex].value !=='' ) {
location.href = "<?php echo home_url(); ?>/?product_cat="+product_cat_dropdown.options[product_cat_dropdown.selectedIndex].value;
}
}
product_cat_dropdown.onchange = onProductCatChange;
/* ]]> */
</script>
<?php
} else {
global $wp_query, $post, $woocommerce;
// Setup Current Category
$this->current_cat = false;
$this->cat_ancestors = array();
@ -147,11 +120,59 @@ class WC_Widget_Product_Categories extends WC_Widget {
}
// Show Siblings and Children Only
if ( $s && $this->current_cat ) {
if ( $this->current_cat->parent == 0 ) {
$category_children = $this->current_cat->term_id;
} else {
$category_children = $this->current_cat->parent;
}
$current_category_children = get_term_children( $category_children, 'product_cat' );
if ( $current_category_children ) {
$current_category_children = implode ( ", ", $current_category_children );
$dropdown_args['include'] = $current_category_children;
$cat_args['include'] = $current_category_children;
}
}
// Dropdown
if ( $d ) {
$dropdown_defaults = array(
'show_counts' => $c,
'hierarchical' => $h,
'show_uncategorized' => 0,
'orderby' => $o
);
$dropdown_args = wp_parse_args( $dropdown_args, $dropdown_defaults );
// Stuck with this until a fix for http://core.trac.wordpress.org/ticket/13258
wc_product_dropdown_categories( $dropdown_args );
?>
<script type='text/javascript'>
/* <![CDATA[ */
var product_cat_dropdown = document.getElementById("dropdown_product_cat");
function onProductCatChange() {
if ( product_cat_dropdown.options[product_cat_dropdown.selectedIndex].value !=='' ) {
location.href = "<?php echo home_url(); ?>/?product_cat="+product_cat_dropdown.options[product_cat_dropdown.selectedIndex].value;
}
}
product_cat_dropdown.onchange = onProductCatChange;
/* ]]> */
</script>
<?php
// List
} else {
include_once( WC()->plugin_path() . '/includes/walkers/class-product-cat-list-walker.php' );
$cat_args['walker'] = new WC_Product_Cat_List_Walker;
$cat_args['title_li'] = '';
$cat_args['show_children_only'] = ( isset( $instance['show_children_only'] ) && $instance['show_children_only'] ) ? 1 : 0;
$cat_args['pad_counts'] = 1;
$cat_args['show_option_none'] = __('No product categories exist.', 'woocommerce' );
$cat_args['current_category'] = ( $this->current_cat ) ? $this->current_cat->term_id : '';