diff --git a/Makefile b/Makefile index cd106175af413e2a347c61ce17786c9298ff4bbe..d221014ad8a3cdefc25665c323fc8c0d63c8d77a 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ BASE=rules_shipping BASE_ADV=rules_shipping_advanced PLUGINTYPE=vmshipment ZIPBASE=opentools_vm2 -VERSION=4.0.1 +VERSION=4.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_opentools_vm2_rules_shipping_advanced_v4.1.zip b/releases/plg_opentools_vm2_rules_shipping_advanced_v4.1.zip new file mode 100644 index 0000000000000000000000000000000000000000..468d6ca883f2d1ac4d7a9504d0474d7d3e331e4d Binary files /dev/null and b/releases/plg_opentools_vm2_rules_shipping_advanced_v4.1.zip differ diff --git a/releases/plg_opentools_vm2_rules_shipping_v4.1.zip b/releases/plg_opentools_vm2_rules_shipping_v4.1.zip new file mode 100644 index 0000000000000000000000000000000000000000..30d3d3029d7191658b7cb1a4caadfe8fdd4641fc Binary files /dev/null and b/releases/plg_opentools_vm2_rules_shipping_v4.1.zip differ diff --git a/rules_shipping.xml b/rules_shipping.xml index eb8b28c6ea5261405b8ff49bcb54fb0fab5e1c41..f283adf5339962a78217cce323d19f00a5a79445 100644 --- a/rules_shipping.xml +++ b/rules_shipping.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> <install version="1.5" type="plugin" group="vmshipment" method="upgrade"> <name>VMSHIPMENT_RULES</name> - <creationDate>2014-01-14</creationDate> + <creationDate>2014-01-15</creationDate> <author>Reinhold Kainhofer</author> <authorUrl>http://www.open-tools.net</authorUrl> - <copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright> + <copyright>Copyright (C) 2013-2014, Reinhold Kainhofer</copyright> <license>GPL v3+</license> - <version>4.0.1</version> + <version>4.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 6d31caabbe281bd64db1af1ec94665464f509094..a724f15ba7240d798d06407fe12d32f6ebb5a5ef 100644 --- a/rules_shipping_advanced.xml +++ b/rules_shipping_advanced.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8" ?> <install version="1.5" type="plugin" group="vmshipment" method="upgrade"> <name>VMSHIPMENT_RULES_ADV</name> - <creationDate>2014-01-14</creationDate> + <creationDate>2014-01-15</creationDate> <author>Reinhold Kainhofer</author> <authorUrl>http://www.open-tools.net</authorUrl> - <copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright> + <copyright>Copyright (C) 2013-2014, Reinhold Kainhofer</copyright> <license>GPL v3+</license> - <version>4.0.1</version> + <version>4.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 cbaed53f3fd38222a345a47df8e8c539526e5eb2..e63a4bfc0242a3d9b6748ab546ac31d016babb72 100644 --- a/rules_shipping_base.php +++ b/rules_shipping_base.php @@ -262,8 +262,10 @@ class plgVmShipmentRules_Shipping_Base extends vmPSPlugin { $method->matched_rule = $match["rule"]; $method->rule_name = $match["rule_name"]; // If NoShipping is set, this method should NOT offer any shipping at all, so return FALSE, otherwise TRUE + // If the rule has a name, print it as warning (otherwise don't print anything) if ($method->matched_rule->isNoShipping()) { - $this->printWarning(JText::sprintf('VMSHIPMENT_RULES_NOSHIPPING_MESSAGE', $method->rule_name)); + if (!empty($method->rule_name)) + $this->printWarning(JText::sprintf('VMSHIPMENT_RULES_NOSHIPPING_MESSAGE', $method->rule_name)); vmdebug('checkConditions '.$method->shipment_name.' indicates NoShipping for rule "'.$method->rule_name.'" ('.$method->matched_rule->rulestring.').'); return FALSE; } else {