From 5a0f410aa60533bc3bc10179578fada977a351fb Mon Sep 17 00:00:00 2001 From: Andrew White Date: Sat, 25 Feb 2012 08:03:00 +0000 Subject: [PATCH] Add previous price to on-sale variable product --- .../writepanel-product-type-variable.php | 26 +++++---- classes/class-wc-product.php | 54 ++++++++++++++++--- 2 files changed, 62 insertions(+), 18 deletions(-) diff --git a/admin/post-types/writepanels/writepanel-product-type-variable.php b/admin/post-types/writepanels/writepanel-product-type-variable.php index b0eeb9c8246..224465e5893 100644 --- a/admin/post-types/writepanels/writepanel-product-type-variable.php +++ b/admin/post-types/writepanels/writepanel-product-type-variable.php @@ -731,33 +731,37 @@ function process_product_meta_variable( $post_id ) { 'fields' => 'ids' )); $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); // Low price - if (!is_numeric($lowest_price) || $child_price<$lowest_price) $lowest_price = $child_price; - if (!empty($child_sale_price) && $child_sale_price<$lowest_price) $lowest_price = $child_sale_price; + if (!is_numeric($lowest_regular_price) || $child_price < $lowest_regular_price) $lowest_regular_price = $child_price; + if (!empty($child_sale_price) && (!is_numeric($lowest_sale_price) || $child_sale_price < $lowest_sale_price)) $lowest_sale_price = $child_sale_price; // High price - if (!empty($child_sale_price)) : - if ($child_sale_price>$highest_price) : - $highest_price = $child_sale_price; - endif; - else : - if ($child_price>$highest_price) : - $highest_price = $child_price; - endif; - endif; + if (!is_numeric($highest_regular_price) || @child_price > $highest_regular_price) $highest_regular_price = $child_price; + if (!empty($child_sale_price) && (!is_numeric($highest_sale_price) || $child_sale_price > $highest_sale_price)) $highest_sale_price = $child_sale_price; endforeach; + + $lowest_price = empty($lowest_sale_price) ? $lowest_regular_price : $lowest_sale_price; + $highest_price = empty($highest_sale_price) ? $highest_regular_price : $highest_sale_price; endif; update_post_meta( $post_parent, '_price', $lowest_price ); update_post_meta( $post_parent, '_min_variation_price', $lowest_price ); update_post_meta( $post_parent, '_max_variation_price', $highest_price ); + update_post_meta( $post_parent, '_min_variation_regular_price', $lowest_regular_price ); + update_post_meta( $post_parent, '_max_variation_regular_price', $highest_regular_price ); + update_post_meta( $post_parent, '_min_variation_sale_price', $lowest_sale_price ); + update_post_meta( $post_parent, '_max_variation_sale_price', $highest_sale_price ); // Update default attribute options setting $default_attributes = array(); diff --git a/classes/class-wc-product.php b/classes/class-wc-product.php index 30a64c5ec0a..732a9fd0035 100644 --- a/classes/class-wc-product.php +++ b/classes/class-wc-product.php @@ -42,6 +42,10 @@ class WC_Product { var $sale_price_dates_to; var $min_variation_price; var $max_variation_price; + var $min_variation_regular_price; + var $max_variation_regular_price; + var $min_variation_sale_price; + var $max_variation_sale_price; var $featured; var $shipping_class; var $dimensions; @@ -84,6 +88,10 @@ class WC_Product { 'sale_price_dates_to' => '', 'min_variation_price' => '', 'max_variation_price' => '', + 'min_variation_regular_price' => '', + 'max_variation_regular_price' => '', + 'min_variation_sale_price' => '', + 'max_variation_sale_price' => '', 'featured' => 'no' ); @@ -536,13 +544,45 @@ class WC_Product { $price = apply_filters('woocommerce_grouped_price_html', $price, $this); elseif ($this->is_type('variable')) : - - if ( !$this->min_variation_price || $this->min_variation_price !== $this->max_variation_price ) $price .= '' . _x('From:', 'min_price', 'woocommerce') . ' '; - - $price .= woocommerce_price($this->get_price()); - - $price = apply_filters('woocommerce_variable_price_html', $price, $this); - + if ($this->price > 0) : + if ($this->is_on_sale() && isset($this->min_variation_price)) : + + if ( !$this->min_variation_price || $this->min_variation_price !== $this->max_variation_price ) $price .= '' . _x('From:', 'min_price', 'woocommerce') . ' '; + $price .= ''.woocommerce_price( $this->min_variation_regular_price ).' '.woocommerce_price($this->get_price()).''; + + $price = apply_filters('woocommerce_variable_sale_price_html', $price, $this); + + else : + + if ( !$this->min_variation_price || $this->min_variation_price !== $this->max_variation_price ) $price .= '' . _x('From:', 'min_price', 'woocommerce') . ' '; + $price .= woocommerce_price($this->get_price()); + + $price = apply_filters('woocommerce_variable_price_html', $price, $this); + + endif; + elseif ($this->price === '' ) : + + $price = apply_filters('woocommerce_variable_empty_price_html', '', $this); + + elseif ($this->price == 0 ) : + + if ($this->is_on_sale() && isset($this->min_variation_regular_price)) : + + if ( !$this->min_variation_price || $this->min_variation_price !== $this->max_variation_price ) $price .= '' . _x('From:', 'min_price', 'woocommerce') . ' '; + $price .= ''.woocommerce_price( $this->min_variation_regular_price ).' '.__('Free!', 'woocommerce').''; + + $price = apply_filters('woocommerce_variable_free_sale_price_html', $price, $this); + + else : + + if ( !$this->min_variation_price || $this->min_variation_price !== $this->max_variation_price ) $price .= '' . _x('From:', 'min_price', 'woocommerce') . ' '; + $price = __('Free!', 'woocommerce'); + + $price = apply_filters('woocommerce_variable_free_price_html', $price, $this); + + endif; + + endif; else : if ($this->price > 0) : if ($this->is_on_sale() && isset($this->regular_price)) :