diff --git a/Makefile b/Makefile index 1550bed833c5c580576ca9effad3dd1118389dc0..299f1810720ee12abaff47b1425603c7e496a879 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BASE=rules_shipping BASE_ADV=rules_shipping_advanced PLUGINTYPE=vmshipment -VERSION=2.1 +VERSION=2.1.1 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_vmshipment_rules_shipping_advanced_v2.1.1.zip b/releases/plg_vmshipment_rules_shipping_advanced_v2.1.1.zip new file mode 100644 index 0000000000000000000000000000000000000000..9f51e1b5400a64df3c4c784bbc2d01d1c4819eba Binary files /dev/null and b/releases/plg_vmshipment_rules_shipping_advanced_v2.1.1.zip differ diff --git a/releases/plg_vmshipment_rules_shipping_v2.1.1.zip b/releases/plg_vmshipment_rules_shipping_v2.1.1.zip new file mode 100644 index 0000000000000000000000000000000000000000..310bcce9abc16fa237e244ece5b1bad3c0b6e429 Binary files /dev/null and b/releases/plg_vmshipment_rules_shipping_v2.1.1.zip differ diff --git a/rules_shipping.xml b/rules_shipping.xml index 7d1d634efa5f806b99ff8cc5ed55dc25e2752531..e200b3c4dc92ec5fa00407effb9456a25c09e1ee 100644 --- a/rules_shipping.xml +++ b/rules_shipping.xml @@ -6,7 +6,7 @@ <authorUrl>http://www.kainhofer.com</authorUrl> <copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright> <license>GPL v3+</license> - <version>2.1</version> + <version>2.1.1</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 628641b5f6557c848526e914806f48a54ebd2c0c..6ae7a918e0eaae618ae5287bf87297a1107bf6c5 100644 --- a/rules_shipping_advanced.xml +++ b/rules_shipping_advanced.xml @@ -6,7 +6,7 @@ <authorUrl>http://www.kainhofer.com</authorUrl> <copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright> <license>GPL v3+</license> - <version>2.1</version> + <version>2.1.1</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 94f84e49f9067b4cf3e6def9b013300f784455c0..2c2bbe577639c298bc1e5357a67b4ba9fb00c48f 100644 --- a/rules_shipping_base.php +++ b/rules_shipping_base.php @@ -284,6 +284,7 @@ class plgVmShipmentRules_Shipping_Base extends vmPSPlugin { $cart_prices[$this->_psType . 'Tax'] = 0; $cart_prices[$this->_psType . '_calc_id'] = 0; } + return $cart_prices['salesPrice' . $_psType]; } protected function createMethodRule ($r, $countries, $tax) { return new ShippingRule($r, $countries, $tax);