diff --git a/Makefile b/Makefile index 17a051c17a29e864778a28abe7494bc71465f31d..05a032bd94c4a2de0a9408e21bf47d08dcd6673c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BASE=shipping-by-rules PLATTFORM=woocommerce VENDOR=opentools -VERSION=1.1.1 +VERSION=1.1.2 DIR = $(shell pwd) SVNDIR=wordpress-plugin-svn diff --git a/includes/rules_shipping_framework_woocommerce_advanced.php b/includes/rules_shipping_framework_woocommerce_advanced.php index d0f467708ddbb8735b4140e25c82a16a0857aa7b..0ec927d49f2446c716bb0ba83d6f1ac19a451a01 100644 --- a/includes/rules_shipping_framework_woocommerce_advanced.php +++ b/includes/rules_shipping_framework_woocommerce_advanced.php @@ -29,6 +29,7 @@ class RulesShippingFrameworkWooCommerceAdvanced extends RulesShippingFrameworkWo } protected function getOrderAddress ($cart, $method) { $data = parent::getOrderAddress($cart, $method); + $address = $cart['destination']; $zip = isset($address['postcode'])?trim($address['postcode']):''; if (isset($zip) && $zip!='') { $data = array_merge($data, $this->getAddressZIP($zip)); diff --git a/library/rules_shipping_framework.php b/library/rules_shipping_framework.php index b34c48bb98a0d7c8a587a25a875b6c30f87b35fa..1a48ec685d9321de69d32b3696abc424243a2335 100644 --- a/library/rules_shipping_framework.php +++ b/library/rules_shipping_framework.php @@ -287,6 +287,14 @@ class RulesShippingFramework { return array(); } + protected function getDebugVariables ($cart, $products, $method) { + + return array( + 'debug_cart'=> print_r($cart,1), + 'debug_products' => print_r($products, 1), + ); + } + /** * Extract information about non-numerical zip codes (UK and Canada) from the postal code */ @@ -349,7 +357,8 @@ class RulesShippingFramework { $this->getOrderAddress ($cart, $method), // Add Total/Min/Max weight and dimension variables: $this->getOrderWeights ($cart, $products, $method), - $this->getOrderDimensions ($cart, $products, $method) + $this->getOrderDimensions ($cart, $products, $method), + $this->getDebugVariables ($cart, $products, $method) ); // Let child classes update the $cartvals array, or add new variables $this->addCustomCartValues($cart, $products, $method, $cartvals); @@ -906,8 +915,11 @@ class ShippingRule { return $varname; } elseif ($varname=='values') { return $vals; - } elseif ($varname=='values_debug') { - return print_r($vals,1); + } elseif ($varname=='values_debug' || $varname='debug_values') { + $tmpvals = $vals; + unset($tmpvals['debug_cart']); + unset($tmpvals['debug_products']); + return print_r($tmpvals,1); } else { $this->framework->warning('OTSHIPMENT_RULES_EVALUATE_UNKNOWN_VALUE', $expr, $this->rulestring); return null; diff --git a/releases/opentools-woocommerce-advanced-shipping-by-rules_v1.1.2.zip b/releases/opentools-woocommerce-advanced-shipping-by-rules_v1.1.2.zip new file mode 100644 index 0000000000000000000000000000000000000000..0c3dc653c88110219d027c8f657f1ef4724ee88d Binary files /dev/null and b/releases/opentools-woocommerce-advanced-shipping-by-rules_v1.1.2.zip differ diff --git a/releases/opentools-woocommerce-shipping-by-rules_v1.1.2.zip b/releases/opentools-woocommerce-shipping-by-rules_v1.1.2.zip new file mode 100644 index 0000000000000000000000000000000000000000..081a0f20fe1c0b6241bfe1e59a792532b35c5b59 Binary files /dev/null and b/releases/opentools-woocommerce-shipping-by-rules_v1.1.2.zip differ diff --git a/woocommerce-advanced-shipping-by-rules.php b/woocommerce-advanced-shipping-by-rules.php index d3c3051ac1370970556027e468148409b25d578e..ec9c55b28d82c7a014f69dce7aff312b3d9e090a 100644 --- a/woocommerce-advanced-shipping-by-rules.php +++ b/woocommerce-advanced-shipping-by-rules.php @@ -3,7 +3,7 @@ * Plugin Name: WooCommerce Advanced Shipping By Rules * Plugin URI: http://open-tools.net/woocommerce/advanced-shipping-by-rules-for-woocommerce.html * Description: Define Shipping cost by very general and flexible (text-based) rules. The advanced version also provides mathematical expressions and functions - * Version: 1.1.1 + * Version: 1.1.2 * Author: Open Tools, Reinhold Kainhofer * Author URI: http://open-tools.net * Text Domain: woocommerce-advanced-shipping-by-rules @@ -66,7 +66,7 @@ function otsr_addAccessCheckArg($downloadurl) { * Main Shipping by Rules class, add filters and handling all other files. * * @class WooCommerce_Shipping_By_Rules_Advanced - * @version 1.1.1 + * @version 1.1.2 * @author Reinhold Kainhofer */ class WooCommerce_Shipping_By_Rules_Advanced { @@ -76,7 +76,7 @@ class WooCommerce_Shipping_By_Rules_Advanced { * @since 1.0.0 * @var string $version Plugin version number. */ - public $version = '1.1.1'; + public $version = '1.1.2'; /** diff --git a/woocommerce-shipping-by-rules.php b/woocommerce-shipping-by-rules.php index f477f4ad00d1fa5980f1a38e45ce8a624722b67d..baefcd5210fbac759842adcd3bb1978a270b7acb 100644 --- a/woocommerce-shipping-by-rules.php +++ b/woocommerce-shipping-by-rules.php @@ -3,7 +3,7 @@ * Plugin Name: WooCommerce Shipping By Rules * Plugin URI: http://open-tools.net/woocommerce/advanced-shipping-by-rules-for-woocommerce.html * Description: Define Shipping cost by very general and flexible (text-based) rules. - * Version: 1.1.1 + * Version: 1.1.2 * Author: Open Tools, Reinhold Kainhofer * Author URI: http://open-tools.net * Text Domain: woocommerce-shipping-by-rules @@ -39,7 +39,7 @@ * Main Shipping by Rules class, add filters and handling all other files. * * @class WooCommerce_Shipping_By_Rules - * @version 1.1.1 + * @version 1.1.2 * @author Reinhold Kainhofer */ class WooCommerce_Shipping_By_Rules { @@ -49,7 +49,7 @@ class WooCommerce_Shipping_By_Rules { * @since 1.0.0 * @var string $version Plugin version number. */ - public $version = '1.1.1'; + public $version = '1.1.2'; /**