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

Merge branch 'master' of https://github.com/woothemes/woocommerce

This commit is contained in:
Frederik Svarre 2012-04-07 18:23:54 +02:00
parent 75db488a4f 86c8da6189
commit 8998f7b58d
9 changed files with 238 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/post-types/writepanels/writepanel-order_data.php
View File

@ -217,7 +217,7 @@ function woocommerce_order_data_meta_box($post) {
if ($order->get_formatted_shipping_address()) echo '<p><strong>'.__('Address', 'woocommerce').':</strong><br/> ' .$order->get_formatted_shipping_address().'</p>'; else echo '<p class="none_set"><strong>'.__('Address', 'woocommerce').':</strong> ' . __('No shipping address set.', 'woocommerce') . '</p>';
foreach ( $shipping_data as $key => $field ) : if (isset($field['show']) && !$field['show']) continue;
if ( $shipping_data ) foreach ( $shipping_data as $key => $field ) : if (isset($field['show']) && !$field['show']) continue;
$field_name = 'shipping_'.$key;
if ( $order->$field_name ) echo '<p><strong>'.$field['label'].':</strong> '.$order->$field_name.'</p>';
endforeach;
@ -227,7 +227,7 @@ function woocommerce_order_data_meta_box($post) {
// Display form
echo '<div class="edit_address"><p><button class="button load_customer_shipping">'.__('Load customer shipping address', 'woocommerce').'</button></p>';
foreach ( $shipping_data as $key => $field ) :
if ( $shipping_data ) foreach ( $shipping_data as $key => $field ) :
if (!isset($field['type'])) $field['type'] = 'text';
switch ($field['type']) {
case "select" :

2
classes/shipping/class-wc-shipping.php
View File

@ -87,7 +87,7 @@ class WC_Shipping {
endforeach;
return $_available_methods;
return apply_filters( 'woocommerce_available_shipping_methods', $_available_methods );
endif;
}

39
classes/walkers/class-product-cat-dropdown-walker.php Normal file
View File

@ -0,0 +1,39 @@
<?php
/**
* WC_Product_Cat_Dropdown_Walker class.
*
* @extends Walker
*/
class WC_Product_Cat_Dropdown_Walker extends Walker {
var $tree_type = 'category';
var $db_fields = array ('parent' => 'parent', 'id' => 'term_id', 'slug' => 'slug' );
/**
* @see Walker::start_el()
* @since 2.1.0
*
* @param string $output Passed by reference. Used to append additional content.
* @param object $category Category data object.
* @param int $depth Depth of category in reference to parents.
* @param array $args
*/
function start_el(&$output, $cat, $depth, $args) {
$pad = str_repeat('&nbsp;', $depth * 3);
$cat_name = apply_filters( 'list_product_cats', $cat->name, $cat );
$output .= "\t<option class=\"level-$depth\" value=\"" . $cat->slug . "\"";
if ( $cat->slug == $args['selected'] )
$output .= ' selected="selected"';
$output .= '>';
$output .= $pad . $cat_name;
if ( $args['show_count'] )
$output .= '&nbsp;(' . $cat->count . ')';
$output .= "</option>\n";
}
}

151
classes/walkers/class-product-cat-list-walker.php Normal file
View File

@ -0,0 +1,151 @@
<?php
/**
* WC_Product_Cat_List_Walker class.
*
* @extends Walker
*/
class WC_Product_Cat_List_Walker extends Walker {
var $tree_type = 'product_cat';
var $db_fields = array ( 'parent' => 'parent', 'id' => 'term_id', 'slug' => 'slug' );
/**
* @see Walker::start_lvl()
* @since 2.1.0
*
* @param string $output Passed by reference. Used to append additional content.
* @param int $depth Depth of category. Used for tab indentation.
* @param array $args Will only append content if style argument value is 'list'.
*/
function start_lvl( &$output, $depth, $args ) {
if ( 'list' != $args['style'] )
return;
$indent = str_repeat("\t", $depth);
$output .= "$indent<ul class='children'>\n";
}
/**
* @see Walker::end_lvl()
* @since 2.1.0
*
* @param string $output Passed by reference. Used to append additional content.
* @param int $depth Depth of category. Used for tab indentation.
* @param array $args Will only append content if style argument value is 'list'.
*/
function end_lvl( &$output, $depth, $args ) {
if ( 'list' != $args['style'] )
return;
$indent = str_repeat("\t", $depth);
$output .= "$indent</ul>\n";
}
/**
* @see Walker::start_el()
* @since 2.1.0
*
* @param string $output Passed by reference. Used to append additional content.
* @param object $category Category data object.
* @param int $depth Depth of category in reference to parents.
* @param array $args
*/
function start_el( &$output, $cat, $depth, $args ) {
$output .= '<li class="cat-item cat-item-' . $cat->term_id;
if ( $args['current_category'] == $cat->term_id )
$output .= ' current-cat';
if ( $args['current_category_ancestors'] && $args['current_category'] && in_array( $cat->term_id, $args['current_category_ancestors'] ) )
$output .= ' current-cat-parent';
$output .= '"><a href="' . get_term_link( $cat->slug, 'product_cat' ) . '">' . $cat->name . '</a>';
if ( $args['show_count'] )
$output .= ' <span class="count">(' . $cat->count . ')</span>';
}
/**
* @see Walker::end_el()
* @since 2.1.0
*
* @param string $output Passed by reference. Used to append additional content.
* @param object $page Not used.
* @param int $depth Depth of category. Not used.
* @param array $args Only uses 'list' for whether should append to output.
*/
function end_el( &$output, $cat, $depth, $args ) {
$output .= "</li>\n";
}
/**
* Traverse elements to create list from elements.
*
* Display one element if the element doesn't have any children otherwise,
* display the element and its children. Will only traverse up to the max
* depth and no ignore elements under that depth. It is possible to set the
* max depth to include all depths, see walk() method.
*
* This method shouldn't be called directly, use the walk() method instead.
*
* @since 2.5.0
*
* @param object $element Data object
* @param array $children_elements List of elements to continue traversing.
* @param int $max_depth Max depth to traverse.
* @param int $depth Depth of current element.
* @param array $args
* @param string $output Passed by reference. Used to append additional content.
* @return null Null on failure with no changes to parameters.
*/
function display_element( $element, &$children_elements, $max_depth, $depth=0, $args, &$output ) {
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
if ( is_array( $args[0] ) )
$args[0]['has_children'] = ! empty( $children_elements[$element->$id_field] );
$cb_args = array_merge( array(&$output, $element, $depth), $args);
call_user_func_array(array(&$this, 'start_el'), $cb_args);
$id = $element->$id_field;
// descend only when the depth is right and there are childrens for this element
if ( ($max_depth == 0 || $max_depth > $depth+1 ) && isset( $children_elements[$id]) ) {
foreach( $children_elements[ $id ] as $child ){
if ( !isset($newlevel) ) {
$newlevel = true;
//start the child delimiter
$cb_args = array_merge( array(&$output, $depth), $args);
call_user_func_array(array(&$this, 'start_lvl'), $cb_args);
}
$this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output );
}
unset( $children_elements[ $id ] );
}
if ( isset($newlevel) && $newlevel ){
//end the child delimiter
$cb_args = array_merge( array(&$output, $depth), $args);
call_user_func_array(array(&$this, 'end_lvl'), $cb_args);
}
//end this element
$cb_args = array_merge( array(&$output, $element, $depth), $args);
call_user_func_array(array(&$this, 'end_el'), $cb_args);
}
}
}

4
readme.txt
View File

@ -145,10 +145,12 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
= 1.5.4 =
* Feature - Allow external products to be a part of a grouped product. Button titles will be respected when displayed.
* Tweaked - For the short description, removed the_content filter and used woocommerce_short_description
* Tweak - For the short description, removed the_content filter and used woocommerce_short_description
* Tweak - Don't send password in new account email (some customers complained/privacy concerns)
* Tweak - Don't show unused tabs on the frontend (description and reviews)
* Tweak - Rename comments meta box to reviews
* Tweak - Rewritten widgets to use category walkers
* Fix - Do not show the Additional Information tab on product single page if contents are hidden or not existing.
* Localization - Canada post code locale
* Localization - RMB paypal
* Localization - Bundled translation updates

9
templates/single-product/tabs/attributes.php
View File

@ -5,7 +5,10 @@
global $woocommerce, $post, $product;
if ($product->has_attributes() || $product->has_dimensions() || $product->has_weight()) : ?>
$show_attr = ( get_option( 'woocommerce_enable_dimension_product_attributes' ) == 'yes' ? true : false );
if ( $product->has_attributes() || ( $show_attr && $product->has_dimensions() ) || ( $show_attr && $product->has_weight() ) ) {
?>
<div class="panel" id="tab-attributes">
<?php $heading = apply_filters('woocommerce_product_additional_information_heading', __('Additional Information', 'woocommerce')); ?>
@ -15,4 +18,6 @@ if ($product->has_attributes() || $product->has_dimensions() || $product->has_we
<?php $product->list_attributes(); ?>
</div>
<?php endif; ?>
<?php
}
?>

9
templates/single-product/tabs/tab-attributes.php
View File

@ -1,5 +1,10 @@
<?php global $product;
if ($product->has_attributes() || $product->has_dimensions() || $product->has_weight()) : ?>
$show_attr = ( get_option( 'woocommerce_enable_dimension_product_attributes' ) == 'yes' ? true : false );
if ( $product->has_attributes() || ( $show_attr && $product->has_dimensions() ) || ( $show_attr && $product->has_weight() ) ) {
?>
<li><a href="#tab-attributes"><?php _e('Additional Information', 'woocommerce'); ?></a></li>
<?php endif; ?>
<?php
}
?>

109
widgets/widget-product_categories.php
View File

@ -78,26 +78,19 @@ class WooCommerce_Widget_Product_Categories extends WP_Widget {
</script>
<?php
} elseif ( $s ) {
} else {
global $wp_query, $post;
$cat_args['title_li'] = '';
$cat_args['hierarchical'] = true;
$cat_args['child_of'] = 0;
$cat_args['pad_counts'] = 1;
$cats = get_terms( 'product_cat', apply_filters('woocommerce_product_categories_widget_args', $cat_args) );
global $wp_query, $post, $woocommerce;
$this->current_cat = false;
$this->cat_ancestors = array();
if (is_tax('product_cat')) :
if ( is_tax('product_cat') ) :
$this->current_cat = $wp_query->queried_object;
$this->cat_ancestors = get_ancestors( $this->current_cat->term_id, 'product_cat' );
elseif (is_singular('product')) :
elseif ( is_singular('product') ) :
$product_category = wp_get_post_terms( $post->ID, 'product_cat' );
@ -107,97 +100,27 @@ class WooCommerce_Widget_Product_Categories extends WP_Widget {
endif;
endif;
include_once( $woocommerce->plugin_path() . '/classes/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'] = ( $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 : '';
$cat_args['current_category_ancestors'] = $this->cat_ancestors;
echo '<ul>';
foreach ($cats as $cat) :
// Only show top level for now
if ($cat->parent) continue;
echo '<li class="cat-item cat-item-'.$cat->term_id;
if ( ($this->current_cat && $this->current_cat->term_id == $cat->term_id) || is_tax('product_cat', $cat->slug) ) echo ' current-cat';
if (
$this->current_cat
&& in_array( $cat->term_id, $this->cat_ancestors )
) echo ' current-cat-parent';
echo '"><a href="'.get_term_link( $cat->slug, 'product_cat' ).'">'.$cat->name.'</a>';
if ($c) echo ' <span class="count">('.$cat->count.')</span>';
if ( is_tax('product_cat', $cat->slug) || (in_array( $cat->term_id, $this->cat_ancestors ))) :
$children = $this->get_children_cats( $cat->term_id );
$this->output_children_cats( $children, $c );
endif;
echo '</li>';
endforeach;
wp_list_categories( apply_filters( 'woocommerce_product_categories_widget_args', $cat_args ) );
echo '</ul>';
} else {
echo '<ul>';
$cat_args['title_li'] = '';
wp_list_categories( apply_filters('woocommerce_product_categories_widget_args', $cat_args) );
echo '</ul>';
}
echo $after_widget;
}
function get_children_cats( $parent ) {
$cat_args = array();
$cat_args['title_li'] = '';
$cat_args['hierarchical'] = true;
$cat_args['child_of'] = 0;
$cat_args['pad_counts'] = 1;
$cat_args['parent'] = $parent;
return get_terms( 'product_cat', apply_filters('woocommerce_product_categories_widget_subcat_args', $cat_args) );
}
function output_children_cats( $children, $c ) {
echo '<ul class="children">';
foreach ($children as $child) {
echo '<li class="cat-item cat-item-'.$child->term_id;
if ($this->current_cat->term_id == $child->term_id || is_tax('product_cat', $child->slug)) echo ' current-cat';
if (
$this->current_cat
&& in_array( $child->term_id, $this->cat_ancestors )
) echo ' current-cat-parent';
echo '"><a href="'.get_term_link( $child->slug, 'product_cat' ).'">'.$child->name.'</a>';
if ($c) echo ' <span class="count">('.$child->count.')</span>';
if ( is_tax('product_cat', $child->slug) || (in_array( $child->term_id, $this->cat_ancestors ))) {
$children_children = $this->get_children_cats( $child->term_id );
if ($children_children) $this->output_children_cats( $children_children, $c );
}
echo '</li>';
}
echo '</ul>';
}
/** @see WP_Widget->update */
function update( $new_instance, $old_instance ) {

43
woocommerce-core-functions.php
View File

@ -642,19 +642,22 @@ function woocommerce_terms_clauses($clauses, $taxonomies, $args ) {
* WooCommerce Dropdown categories
*
* Stuck with this until a fix for http://core.trac.wordpress.org/ticket/13258
* We use a custom walker, just like WordPress does it
* We use a custom walker, just like WordPress does
*/
function woocommerce_product_dropdown_categories( $show_counts = 1, $hierarchal = 1 ) {
global $wp_query;
global $wp_query, $woocommerce;
include_once( $woocommerce->plugin_path() . '/classes/walkers/class-product-cat-dropdown-walker.php' );
$r = array();
$r['pad_counts'] = 1;
$r['hierarchal'] = $hierarchal;
$r['hide_empty'] = 1;
$r['show_count'] = 1;
$r['selected'] = (isset($wp_query->query['product_cat'])) ? $wp_query->query['product_cat'] : '';
$r['pad_counts'] = 1;
$r['hierarchal'] = $hierarchal;
$r['hide_empty'] = 1;
$r['show_count'] = 1;
$r['selected'] = ( isset( $wp_query->query['product_cat'] ) ) ? $wp_query->query['product_cat'] : '';
$terms = get_terms( 'product_cat', $r );
if (!$terms) return;
$output = "<select name='product_cat' id='dropdown_product_cat'>";
@ -670,38 +673,16 @@ function woocommerce_product_dropdown_categories( $show_counts = 1, $hierarchal
*/
function woocommerce_walk_category_dropdown_tree() {
$args = func_get_args();
// the user's options are the third parameter
if ( empty($args[2]['walker']) || !is_a($args[2]['walker'], 'Walker') )
$walker = new WC_Walker_CategoryDropdown;
$walker = new WC_Product_Cat_Dropdown_Walker;
else
$walker = $args[2]['walker'];
return call_user_func_array(array( &$walker, 'walk' ), $args );
}
/**
* Create HTML dropdown list of Product Categories.
*/
class WC_Walker_CategoryDropdown extends Walker {
var $tree_type = 'category';
var $db_fields = array ('parent' => 'parent', 'id' => 'term_id', 'slug' => 'slug' );
function start_el(&$output, $category, $depth, $args) {
$pad = str_repeat('&nbsp;', $depth * 3);
$cat_name = apply_filters('list_product_cats', $category->name, $category);
$output .= "\t<option class=\"level-$depth\" value=\"".$category->slug."\"";
if ( $category->slug == $args['selected'] )
$output .= ' selected="selected"';
$output .= '>';
$output .= $pad.$cat_name;
if ( $args['show_count'] )
$output .= '&nbsp;('. $category->count .')';
$output .= "</option>\n";
}
}
/**
* WooCommerce Term Meta API
*