diff --git a/Makefile b/Makefile index a3c86b29ef3e75d1f7275a46d0a059aaad90f71e..df3c27fde656ca67997d3cdb8f6bc7c5f7ce61d7 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ BASE=rules_shipping BASE_ADV=rules_shipping_advanced PLUGINTYPE=vmshipment ZIPBASE=opentools_vm2 -VERSION=4.99a +VERSION=4.99b PLUGINFILES=$(BASE).php $(BASE)_base.php $(BASE).script.php $(BASE).xml index.html PLUGINFILES_ADV=$(BASE_ADV).php $(BASE)_base.php $(BASE_ADV).script.php $(BASE_ADV).xml index.html diff --git a/releases/plg_opentools_vm2_rules_shipping_advanced_v4.99b.zip b/releases/plg_opentools_vm2_rules_shipping_advanced_v4.99b.zip new file mode 100644 index 0000000000000000000000000000000000000000..4b80f10807605cbf529bc4ccb1ab43ac1271e428 Binary files /dev/null and b/releases/plg_opentools_vm2_rules_shipping_advanced_v4.99b.zip differ diff --git a/releases/plg_opentools_vm2_rules_shipping_v4.99b.zip b/releases/plg_opentools_vm2_rules_shipping_v4.99b.zip new file mode 100644 index 0000000000000000000000000000000000000000..03684906cad55e103834925af994808ea7737b1b Binary files /dev/null and b/releases/plg_opentools_vm2_rules_shipping_v4.99b.zip differ diff --git a/rules_shipping.xml b/rules_shipping.xml index e99ee3758e38684b1395f95dc19bfcffab577a9c..fab4fe0392eae400a513a3f3fc2c2b531e01cf2e 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>4.99a</version> + <version>4.99b</version> <description>VMSHIPMENT_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 4c2102871f232b9fc7d4e7e5a78b49b779deba3d..e212ba4c61c40ad5166978af01eeb45415e3f657 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>4.99a</version> + <version>4.99b</version> <description>VMSHIPMENT_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 00cbca5261eb84022af2ac2d10b1e06acd98c677..24f85cfa13b6c96efa98ad6f53c3cc70d0adba0f 100644 --- a/rules_shipping_base.php +++ b/rules_shipping_base.php @@ -465,11 +465,13 @@ class plgVmShipmentRules_Shipping_Base extends vmPSPlugin { } } } else { - if(!defined('VM_VERSION') or VM_VERSION < 3){ // VM2: + // BEGIN_RK_CHANGES: VM change in VM3! + if (is_array($calculator->_cartData)) { // VM2: $taxrules = array_merge($calculator->_cartData['VatTax'],$calculator->_cartData['taxRulesBill']); } else { // VM3: $taxrules = array_merge($cart->cartData['VatTax'],$cart->cartData['taxRulesBill']); } + // END_RK_CHANGES if(!empty($taxrules) ){ $denominator = 0.0;