diff --git a/Makefile b/Makefile index b6b40d1cdaedc750f7e6e3c36332fe83fd2038f4..bded0bce815150f31516ef3476054cf22f51bc75 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ BASE=rules_shipping BASE_ADV=rules_shipping_advanced PLUGINTYPE=vmshipment ZIPBASE=opentools_vm -VERSION=6.1.4 +VERSION=6.1.5 PLUGINFILES=$(BASE).php $(BASE)_base.php $(BASE)_framework_joomla.php $(BASE).script.php $(BASE).xml index.html PLUGINFILES_ADV=$(BASE_ADV).php $(BASE)_base.php $(BASE)_framework_joomla.php $(BASE_ADV).script.php $(BASE_ADV).xml index.html diff --git a/library/rules_shipping_framework.php b/library/rules_shipping_framework.php index 73e9b6e49c110dd04d36a6f5158845208de7d40c..4e8c7c408b906d491084ae1b3d7130a19431d9d8 100644 --- a/library/rules_shipping_framework.php +++ b/library/rules_shipping_framework.php @@ -916,7 +916,7 @@ class ShippingRule { return $varname; } elseif ($varname=='values') { return $vals; - } elseif ($varname=='values_debug' || $varname='debug_values') { + } elseif ($varname=='values_debug' || $varname=='debug_values') { $tmpvals = $vals; unset($tmpvals['debug_cart']); unset($tmpvals['debug_products']); diff --git a/releases/plg_opentools_vm_rules_shipping_advanced_v6.1.5.zip b/releases/plg_opentools_vm_rules_shipping_advanced_v6.1.5.zip new file mode 100644 index 0000000000000000000000000000000000000000..f34121235951a98e90b8fad9146d2e3a3190fa29 Binary files /dev/null and b/releases/plg_opentools_vm_rules_shipping_advanced_v6.1.5.zip differ diff --git a/releases/plg_opentools_vm_rules_shipping_v6.1.5.zip b/releases/plg_opentools_vm_rules_shipping_v6.1.5.zip new file mode 100644 index 0000000000000000000000000000000000000000..c9c55eae1ceeb36e411bc068b09639c113c80a3f Binary files /dev/null and b/releases/plg_opentools_vm_rules_shipping_v6.1.5.zip differ diff --git a/rules_shipping.xml b/rules_shipping.xml index aefcae1df7ce3124e4157c977bccbe879c6c0b1b..97a8f0e352fed1c2b4eb786ca4bf4bcff9227dc5 100644 --- a/rules_shipping.xml +++ b/rules_shipping.xml @@ -6,7 +6,7 @@ <authorUrl>http://www.open-tools.net</authorUrl> <copyright>Copyright (C) 2013-2014, Reinhold Kainhofer</copyright> <license>GPL v3+</license> - <version>6.1.4</version> + <version>6.1.5</version> <description>OTSHIPMENT_RULES_DESC</description> <files> <filename plugin="rules_shipping">rules_shipping.php</filename> diff --git a/rules_shipping_advanced.xml b/rules_shipping_advanced.xml index 32f1c5b1582d49d857f0016fd7e50a01673a835c..16d6fab234e427267ebf286af6a801c6c90a71a8 100644 --- a/rules_shipping_advanced.xml +++ b/rules_shipping_advanced.xml @@ -6,7 +6,7 @@ <authorUrl>http://www.open-tools.net</authorUrl> <copyright>Copyright (C) 2013-2014, Reinhold Kainhofer</copyright> <license>GPL v3+</license> - <version>6.1.4</version> + <version>6.1.5</version> <description>OTSHIPMENT_RULES_ADV_DESC</description> <files> <filename plugin="rules_shipping_advanced">rules_shipping_advanced.php</filename> diff --git a/rules_shipping_base.php b/rules_shipping_base.php index f7a32b86b3e1a2ff7fa8565bb2e846b011d79100..3602734b14fd10fb1a8592446452a99723e56091 100644 --- a/rules_shipping_base.php +++ b/rules_shipping_base.php @@ -370,8 +370,6 @@ class plgVmShipmentRules_Shipping_Base extends vmPSPlugin { if(!empty($taxrules) ){ foreach($taxrules as &$rule){ -$this->helper->warning("<pre>inside taxrules, includes_tax=$includes_tax</pre>"); -$this->helper->warning("<pre>cartPrices: ".print_r($cart->cartPrices,1).", rules: ".print_r($rule,1). "</pre>"); //Quickn dirty if(!isset($rule['calc_kind'])) $rule = (array)VmModel::getModel('calc')->getCalc($rule['virtuemart_calc_id']);