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

Ordering tweaks/improvements and variation prices. Closes #1097.

This commit is contained in:
Mike Jolley 2012-06-10 18:15:02 +01:00
parent 7036acf989
commit f9f1bb9ddd
8 changed files with 84 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/post-types/writepanels/writepanel-product-type-variable.php
View File

@ -853,13 +853,14 @@ function process_product_meta_variable( $post_id ) {
'posts_per_page'=> -1,
'post_type' => 'product_variation',
'fields' => 'ids',
'post_status' => 'any'
'post_status' => 'publish'
));
$lowest_price = $lowest_regular_price = $lowest_sale_price = $highest_price = $highest_regular_price = $highest_sale_price = '';
if ($children) {
foreach ($children as $child) {
$child_price = get_post_meta($child, '_price', true);
$child_sale_price = get_post_meta($child, '_sale_price', true);

3
admin/post-types/writepanels/writepanel-product_data.php
View File

@ -503,9 +503,6 @@ function woocommerce_product_data_box() {
woocommerce_wp_select( array( 'id' => 'parent_id', 'label' => __('Grouping', 'woocommerce'), 'value' => $post->post_parent, 'options' => $post_parents ) );
// Ordering - removed due to adding page-attributes panel (same field)
//woocommerce_wp_text_input( array( 'id' => 'menu_order', 'label' => _x('Sort Order', 'ordering', 'woocommerce'), 'value' => $post->menu_order ) );
do_action('woocommerce_product_options_grouping');
echo '</div>';

6
admin/woocommerce-admin-init.php
View File

@ -297,13 +297,13 @@ function woocommerce_admin_scripts() {
endif;
// Term ordering - only when sorting by menu_order (our custom meta)
if (($screen->id=='edit-product_cat' || strstr($screen->id, 'edit-pa_')) && !isset($_GET['orderby'])) :
// Term ordering - only when sorting by term_order
if ( ( $screen->id == 'edit-product_cat' || strstr( $screen->id, 'edit-pa_' ) ) && ! isset( $_GET['orderby'] ) ) :
wp_register_script( 'woocommerce_term_ordering', $woocommerce->plugin_url() . '/assets/js/admin/term-ordering.js', array('jquery-ui-sortable') );
wp_enqueue_script( 'woocommerce_term_ordering' );
$taxonomy = (isset($_GET['taxonomy'])) ? $_GET['taxonomy'] : '';
$taxonomy = isset( $_GET['taxonomy'] ) ? $_GET['taxonomy'] : '';
$woocommerce_term_order_params = array(
'taxonomy' => $taxonomy

32
classes/class-wc-product.php
View File

@ -849,34 +849,21 @@ class WC_Product {
$attr = sanitize_title( $attr );
if (isset($attributes[$attr]) || isset($attributes['pa_' . $attr])) :
if ( isset( $attributes[ $attr ] ) || isset( $attributes[ 'pa_' . $attr ] ) ) {
$attribute = isset($attributes[$attr]) ? $attributes[$attr] : $attributes['pa_' . $attr];
$attribute = isset( $attributes[ $attr ] ) ? $attributes[ $attr ] : $attributes[ 'pa_' . $attr ];
if ($attribute['is_taxonomy']) :
if ( $attribute['is_taxonomy'] ) {
// Get string with terms
$terms = get_the_terms( $this->id, $attribute['name'] );
return implode( ', ', woocommerce_get_product_terms( $this->id, $attribute['name'], 'names' ) );
if ( $terms && ! is_wp_error( $terms ) ) :
$terms_array = array();
foreach ( $terms as $term ) :
$terms_array[] = $term->name;
endforeach;
return implode( ', ', $terms_array );
endif;
else :
} else {
return $attribute['value'];
endif;
}
endif;
}
return false;
}
@ -1193,13 +1180,14 @@ class WC_Product {
'posts_per_page'=> -1,
'post_type' => 'product_variation',
'fields' => 'ids',
'post_status' => 'any'
'post_status' => 'publish'
));
$this->min_variation_price = $this->min_variation_regular_price = $this->min_variation_sale_price = $this->max_variation_price = $this->max_variation_regular_price = $this->max_variation_sale_price = '';
if ($children) {
foreach ($children as $child) {
foreach ( $children as $child ) {
$child_price = get_post_meta($child, '_price', true);
$child_sale_price = get_post_meta($child, '_sale_price', true);

2
readme.txt
View File

@ -153,6 +153,8 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
* Feature - Menu count for orders requiring admin action
* Feature - 'supports' function for gateways.
* Feature - Ajax powered coupon form on checkout.
* Tweak - woocommerce_get_product_terms for getting terms in the user defined order.
* Tweak - Variations that are disabled are not taken into consideration when displaying parent price.
* Tweak - Variations maintain selections after adding to cart.
* Tweak - Improvements to the order tracking code, including better error messages
* Tweak - EU states for tax

37
templates/single-product/add-to-cart/variable.php
View File

@ -14,38 +14,37 @@ global $woocommerce, $product, $post;
<form action="<?php echo esc_url( $product->add_to_cart_url() ); ?>" class="variations_form cart" method="post" enctype='multipart/form-data'>
<table class="variations" cellspacing="0">
<tbody>
<?php $loop = 0; foreach ($attributes as $name => $options) : $loop++; ?>
<?php $loop = 0; foreach ( $attributes as $name => $options ) : $loop++; ?>
<tr>
<td><label for="<?php echo sanitize_title($name); ?>"><?php echo $woocommerce->attribute_label($name); ?></label></td>
<td><select id="<?php echo esc_attr( sanitize_title($name) ); ?>" name="attribute_<?php echo sanitize_title($name); ?>">
<option value=""><?php echo __('Choose an option', 'woocommerce') ?>&hellip;</option>
<?php if(is_array($options)) : ?>
<?php
<?php
if ( is_array( $options ) ) {
if ( empty( $_POST ) )
$selected_value = ( isset( $selected_attributes[ sanitize_title( $name ) ] ) ) ? $selected_attributes[ sanitize_title( $name ) ] : '';
else
$selected_value = isset( $_POST[ 'attribute_' . sanitize_title( $name ) ] ) ? $_POST[ 'attribute_' . sanitize_title( $name ) ] : '';
// Get terms if this is a taxonomy - ordered
if (taxonomy_exists(sanitize_title($name))) :
$args = array('menu_order' => 'ASC');
$terms = get_terms( sanitize_title($name), $args );
if ( taxonomy_exists( sanitize_title( $name ) ) ) {
foreach ($terms as $term) :
if (!in_array($term->slug, $options)) continue;
echo '<option value="'.$term->slug.'" '.selected($selected_value, $term->slug).'>'.$term->name.'</option>';
endforeach;
else :
foreach ($options as $option) :
echo '<option value="'.$option.'" '.selected($selected_value, $option).'>'.$option.'</option>';
endforeach;
endif;
?>
<?php endif;?>
$terms = get_terms( sanitize_title($name), array('menu_order' => 'ASC') );
foreach ( $terms as $term ) {
if ( ! in_array( $term->slug, $options ) ) continue;
echo '<option value="' . $term->slug . '" ' . selected( $selected_value, $term->slug ) . '>' . $term->name . '</option>';
}
} else {
foreach ($options as $option)
echo '<option value="' . $option . '" ' . selected( $selected_value, $option ) . '>' . $option . '</option>';
}
}
?>
</select> <?php
if ( sizeof($attributes) == $loop ) {
if ( sizeof($attributes) == $loop )
echo '<a class="reset_variations" href="#reset">'.__('Clear selection', 'woocommerce').'</a>';
}
?></td>
</tr>
<?php endforeach;?>

17
templates/single-product/product-attributes.php
View File

@ -41,19 +41,18 @@ if ( empty( $attributes ) && ( ! $product->enable_dimensions_display() || ( ! $p
<tr class="<?php if ( $alt == 1 ) echo 'alt'; ?>">
<th><?php echo $woocommerce->attribute_label( $attribute['name'] ); ?></th>
<td><?php
if ( $attribute['is_taxonomy'] ) :
$post_terms = wp_get_post_terms( $product->id, $attribute['name'] );
$values = array();
foreach ( $post_terms as $term )
if ( ! empty( $term->name ) )
$values[] = $term->name;
echo implode( ', ', $values );
else :
if ( $attribute['is_taxonomy'] ) {
echo implode( ', ', woocommerce_get_product_terms( $product->id, $attribute['name'], 'names' ) );
} else {
// Convert pipes to commas
$value = explode( '|', $attribute['value'] );
$value = implode( ', ', $value );
echo wpautop( wptexturize( $value ) );
endif;
}
?></td>
</tr>

41
woocommerce-core-functions.php
View File

@ -800,6 +800,47 @@ function woocommerce_terms_clauses($clauses, $taxonomies, $args ) {
return $clauses;
}
/**
* woocommerce_get_product_terms function.
*
* Gets product terms in the order they are defined in the backend.
*
* @access public
* @param mixed $object_id
* @param mixed $taxonomy
* @param mixed $fields ids, names, slugs, all
* @return array
*/
function woocommerce_get_product_terms( $object_id, $taxonomy, $fields = 'all' ) {
$terms = array();
$object_terms = wp_get_object_terms( $object_id, $taxonomy );
$all_terms = array_flip( get_terms( $taxonomy, array( 'menu_order' => 'ASC', 'fields' => 'ids' ) ) );
switch ( $fields ) {
case 'names' :
foreach ( $object_terms as $term )
$terms[ $all_terms[ $term->term_id ] ] = $term->name;
break;
case 'ids' :
foreach ( $object_terms as $term )
$terms[ $all_terms[ $term->term_id ] ] = $term->term_id;
break;
case 'slugs' :
foreach ( $object_terms as $term )
$terms[ $all_terms[ $term->term_id ] ] = $term->slug;
break;
case 'all' :
foreach ( $object_terms as $term )
$terms[ $all_terms[ $term->term_id ] ] = $term;
break;
}
ksort( $terms );
return $terms;
}
/**
* WooCommerce Dropdown categories
*