diff --git a/Makefile b/Makefile index fd2d3e0d6b3002a10dc634ad6beaeb6b57922977..adf4eb2229962d3b70e2b4fd00190acad7154af5 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ BASE=rules_shipping BASE_ADV=rules_shipping_advanced PLUGINTYPE=vmshipment -VERSION=2.4.7 +ZIPBASE=opentools_vm2 +VERSION=3.0.0 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 @@ -10,8 +11,8 @@ TRANSLATIONS=$(call wildcard,language/en*/*.plg_$(PLUGINTYPE)_$(BASE).*ini) TRANSLATIONS_ADV=$(subst $(BASE),$(BASE_ADV),$(TRANSLATIONS)) INDEXFILES=language/index.html $(call wildcard,language/**/index.html) $(call wildcard,elements/*.html) ELEMENTS=$(call wildcard,elements/*.php) -ZIPFILE=plg_$(PLUGINTYPE)_$(BASE)_v$(VERSION).zip -ZIPFILE_ADV=plg_$(PLUGINTYPE)_$(BASE_ADV)_v$(VERSION).zip +ZIPFILE=plg_$(ZIPBASE)_$(BASE)_v$(VERSION).zip +ZIPFILE_ADV=plg_$(ZIPBASE)_$(BASE_ADV)_v$(VERSION).zip ADVANCEDFILES=$(call wildcard,$(BASE)_advanced.*) diff --git a/releases/plg_opentools_vm2_rules_shipping_advanced_v3.0.0.zip b/releases/plg_opentools_vm2_rules_shipping_advanced_v3.0.0.zip new file mode 100644 index 0000000000000000000000000000000000000000..de7afcf8a114bfeed960fdd21ac9964cb377339b Binary files /dev/null and b/releases/plg_opentools_vm2_rules_shipping_advanced_v3.0.0.zip differ diff --git a/releases/plg_opentools_vm2_rules_shipping_v3.0.0.zip b/releases/plg_opentools_vm2_rules_shipping_v3.0.0.zip new file mode 100644 index 0000000000000000000000000000000000000000..fa08e74ed7bb344f6a4b191b5ce5c1f7325e521d Binary files /dev/null and b/releases/plg_opentools_vm2_rules_shipping_v3.0.0.zip differ diff --git a/rules_shipping.xml b/rules_shipping.xml index 99b6a951478b751e12925d0c97fbc2df1fc04278..173b8a59694065edc347701964829bddec1c9f01 100644 --- a/rules_shipping.xml +++ b/rules_shipping.xml @@ -6,7 +6,7 @@ <authorUrl>http://www.open-tools.net</authorUrl> <copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright> <license>GPL v3+</license> - <version>2.4.7</version> + <version>3.0.0</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 2ea204bf090a66be3d4f53cff059b5cf8d434a70..590dd483daef3427cfdc97333e70242e418d09e5 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, Reinhold Kainhofer</copyright> <license>GPL v3+</license> - <version>2.4.7</version> + <version>3.0.0</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 5014e82e332aa50deb2e9a93d0b2f7f96540e86c..6e72ed26c788be8776496993af88f2e1593a9325 100644 --- a/rules_shipping_base.php +++ b/rules_shipping_base.php @@ -853,8 +853,9 @@ class ShippingRule { preg_match_all('/{([A-Za-z0-9_]+)}/', $name, $matches); foreach ($matches[1] as $m) { - if (isset($vals[$m])) { - $name = str_replace("{".$m."}", strval($vals[$m]), $name); + $var=strtolower($m); + if (isset($vals[$var])) { + $name = str_replace("{".$m."}", strval($vals[$var]), $name); } } return $name;