From 955bda040d262aae46c9e0538e32eca0a70b5333 Mon Sep 17 00:00:00 2001 From: Mike Jolley Date: Mon, 25 Jun 2012 15:31:58 +0100 Subject: [PATCH 1/3] PLN fix --- admin/woocommerce-admin-settings.php | 2 +- assets/css/activation.css | 81 +++++++++++++++++++++++++++- readme.txt | 2 + woocommerce-core-functions.php | 2 +- 4 files changed, 84 insertions(+), 3 deletions(-) diff --git a/admin/woocommerce-admin-settings.php b/admin/woocommerce-admin-settings.php index 701ac594200..1f38aa39b0d 100644 --- a/admin/woocommerce-admin-settings.php +++ b/admin/woocommerce-admin-settings.php @@ -176,7 +176,7 @@ if ( ! function_exists( 'woocommerce_settings' ) ) { } ?>
-
+

Date: Mon, 25 Jun 2012 22:53:15 +0100 Subject: [PATCH 2/3] widget conflict --- readme.txt | 1 + widgets/widget-layered_nav.php | 67 ++++++++++++++++++--------------- widgets/widget-price_filter.php | 28 +++++++------- 3 files changed, 51 insertions(+), 45 deletions(-) diff --git a/readme.txt b/readme.txt index 700ad87ca85..77ab06739a1 100644 --- a/readme.txt +++ b/readme.txt @@ -150,6 +150,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc == Changelog == +* Fix - Widget init function conflict with widget logic * Fix - PLN currency code = 1.5.8 - 21/06/2012 = diff --git a/widgets/widget-layered_nav.php b/widgets/widget-layered_nav.php index a82602b6f31..557b050a690 100644 --- a/widgets/widget-layered_nav.php +++ b/widgets/widget-layered_nav.php @@ -6,44 +6,49 @@ * @category Widgets * @author WooThemes */ -if (is_active_widget( false, false, 'woocommerce_layered_nav', 'true' ) && !is_admin()) : - add_action('init', 'woocommerce_layered_nav_init', 1); - add_filter('loop_shop_post_in', 'woocommerce_layered_nav_query'); -endif; - /** * Layered Nav Init */ +add_action( 'init', 'woocommerce_layered_nav_init', 1 ); + function woocommerce_layered_nav_init( ) { - global $_chosen_attributes, $woocommerce, $_attributes_array; - $_chosen_attributes = array(); - $_attributes_array = array(); + if ( is_active_widget( false, false, 'woocommerce_layered_nav', true ) && ! is_admin() ) { - $attribute_taxonomies = $woocommerce->attribute_taxonomies; - if ( $attribute_taxonomies ) : - foreach ($attribute_taxonomies as $tax) : - - $attribute = strtolower(sanitize_title($tax->attribute_name)); - $taxonomy = $woocommerce->attribute_taxonomy_name($attribute); - - // create an array of product attribute taxonomies - $_attributes_array[] = $taxonomy; - - $name = 'filter_' . $attribute; - $query_type_name = 'query_type_' . $attribute; - - if (isset($_GET[$name]) && $_GET[$name] && taxonomy_exists($taxonomy)) : - $_chosen_attributes[$taxonomy]['terms'] = explode(',', $_GET[$name] ); - if (isset($_GET[$query_type_name]) && $_GET[$query_type_name]=='or') : - $_chosen_attributes[$taxonomy]['query_type'] = 'or'; - else : - $_chosen_attributes[$taxonomy]['query_type'] = 'and'; - endif; - endif; - endforeach; - endif; + global $_chosen_attributes, $woocommerce, $_attributes_array; + + $_chosen_attributes = array(); + $_attributes_array = array(); + + $attribute_taxonomies = $woocommerce->attribute_taxonomies; + if ( $attribute_taxonomies ) { + foreach ( $attribute_taxonomies as $tax ) { + + $attribute = strtolower(sanitize_title($tax->attribute_name)); + $taxonomy = $woocommerce->attribute_taxonomy_name($attribute); + + // create an array of product attribute taxonomies + $_attributes_array[] = $taxonomy; + + $name = 'filter_' . $attribute; + $query_type_name = 'query_type_' . $attribute; + + if ( ! empty( $_GET[$name] ) && taxonomy_exists( $taxonomy ) ) { + + $_chosen_attributes[$taxonomy]['terms'] = explode( ',', $_GET[ $name ] ); + + if ( ! empty( $_GET[$query_type_name] ) && $_GET[ $query_type_name ] == 'or' ) + $_chosen_attributes[$taxonomy]['query_type'] = 'or'; + else + $_chosen_attributes[$taxonomy]['query_type'] = 'and'; + + } + } + } + + add_filter('loop_shop_post_in', 'woocommerce_layered_nav_query'); + } } /** diff --git a/widgets/widget-price_filter.php b/widgets/widget-price_filter.php index 1c6fd67af9c..23f41fc01a5 100644 --- a/widgets/widget-price_filter.php +++ b/widgets/widget-price_filter.php @@ -9,26 +9,26 @@ * @author WooThemes */ -if (is_active_widget( false, false, 'price_filter', 'true' ) && !is_admin()) : - add_action('init', 'woocommerce_price_filter_init'); - add_filter('loop_shop_post_in', 'woocommerce_price_filter'); -endif; - /** * Price filter Init */ +add_action( 'init', 'woocommerce_price_filter_init' ); + function woocommerce_price_filter_init() { - unset($_SESSION['min_price']); - unset($_SESSION['max_price']); - - if (isset($_GET['min_price'])) : - $_SESSION['min_price'] = $_GET['min_price']; - endif; - if (isset($_GET['max_price'])) : - $_SESSION['max_price'] = $_GET['max_price']; - endif; + if ( is_active_widget( false, false, 'price_filter', true ) && ! is_admin() ) { + unset( $_SESSION['min_price'] ); + unset( $_SESSION['max_price'] ); + + if ( isset( $_GET['min_price'] ) ) + $_SESSION['min_price'] = $_GET['min_price']; + + if ( isset( $_GET['max_price'] ) ) + $_SESSION['max_price'] = $_GET['max_price']; + + add_filter( 'loop_shop_post_in', 'woocommerce_price_filter' ); + } } /** From 57bf97230d393da6ea0c10483252b6963b9c1f76 Mon Sep 17 00:00:00 2001 From: Mike Jolley Date: Tue, 26 Jun 2012 13:17:08 +0100 Subject: [PATCH 3/3] Fix get shipping class id --- classes/class-wc-product-variation.php | 16 ++++++++++++++++ readme.txt | 1 + 2 files changed, 17 insertions(+) diff --git a/classes/class-wc-product-variation.php b/classes/class-wc-product-variation.php index c8f0d50f365..ae2a1e3bb49 100644 --- a/classes/class-wc-product-variation.php +++ b/classes/class-wc-product-variation.php @@ -22,6 +22,7 @@ class WC_Product_Variation extends WC_Product { var $variation_has_stock; var $variation_has_sku; var $variation_shipping_class; + var $variation_shipping_class_id; var $variation_has_tax_class; /** @@ -280,6 +281,21 @@ class WC_Product_Variation extends WC_Product { endif; return $this->variation_shipping_class; } + + /** Returns the product shipping class ID */ + function get_shipping_class_id() { + if ( ! $this->variation_shipping_class_id ) { + + $classes = get_the_terms( $this->variation_id, 'product_shipping_class' ); + + if ( $classes && ! is_wp_error( $classes ) ) + $this->variation_shipping_class_id = current( $classes )->term_id; + else + $this->variation_shipping_class_id = parent::get_shipping_class_id(); + + } + return (int) $this->variation_shipping_class_id; + } } diff --git a/readme.txt b/readme.txt index 77ab06739a1..2815361ca9c 100644 --- a/readme.txt +++ b/readme.txt @@ -152,6 +152,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc * Fix - Widget init function conflict with widget logic * Fix - PLN currency code +* Fix - Variation get shipping class ID = 1.5.8 - 21/06/2012 = * Tweak - Textarea for notes and enabled HTML