diff --git a/Makefile b/Makefile index e3325493ee19fe9526954279b126b83d9caa0f9b..4c7eec093c5dec2d333557de3b9b7d096afb25e1 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BASE=rules_shipping BASE_ADV=rules_shipping_advanced PLUGINTYPE=vmshipment -VERSION=2.4.2 +VERSION=2.4.3 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.4.3.zip b/releases/plg_vmshipment_rules_shipping_advanced_v2.4.3.zip new file mode 100644 index 0000000000000000000000000000000000000000..56f0c824d86e2e1b47fcdea37362442c8e9195ab Binary files /dev/null and b/releases/plg_vmshipment_rules_shipping_advanced_v2.4.3.zip differ diff --git a/rules_shipping_advanced.php b/rules_shipping_advanced.php index d8a5eb8be0f6ee9c6a5966de7ae9423d2da01698..b21e4a8c2232c900c0113d37c695aa7a004c3936 100644 --- a/rules_shipping_advanced.php +++ b/rules_shipping_advanced.php @@ -45,7 +45,7 @@ class plgVmShipmentRules_Shipping_Advanced extends plgVmShipmentRules_Shipping_B // Postal code Check for UK postal codes: Use regexp to determine if ZIP structure matches and also to extract the parts. // Also handle UK overseas areas/islands that use four-letter outward codes rather than "A{1,2}0{1,2}A{0,1} 0AA" - if ($values['zip'] and preg_match('/^\s*(([A-Za-z]{1,2})(\d{1,2})([A-Za-z]?)|[A-Za-z]{4})\s+(\d[A-Za-z]{2})\s*$/', $values['zip'], $match)) { + if ($values['zip'] and preg_match('/^\s*(([A-Za-z]{1,2})(\d{1,2})([A-Za-z]?)|[A-Za-z]{4})\s*(\d[A-Za-z]{2})\s*$/', $values['zip'], $match)) { $values['uk_outward'] = $match[1]; $values['uk_area'] = $match[2]; $values['uk_district'] = $match[3]; @@ -59,7 +59,7 @@ class plgVmShipmentRules_Shipping_Advanced extends plgVmShipmentRules_Shipping_B $values['uk_inward'] = NULL; } // Postal code Check for Canadian postal codes: Use regexp to determine if ZIP structure matches and also to extract the parts. - if ($values['zip'] and preg_match('/^\s*(([A-Za-z])(\d)([A-Za-z]))\s+(\d[A-Za-z]\d)\s*$/', $values['zip'], $match)) { + if ($values['zip'] and preg_match('/^\s*(([A-Za-z])(\d)([A-Za-z]))\s*(\d[A-Za-z]\d)\s*$/', $values['zip'], $match)) { $values['canada_fsa'] = $match[1]; $values['canada_area'] = $match[2]; $values['canada_urban'] = $match[3]; diff --git a/rules_shipping_advanced.xml b/rules_shipping_advanced.xml index fb9d43bb9132b95ea344413c24cf52c196dfd3d7..7a1bb88c4e323a968beb6739430b88591435de50 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.2</version> + <version>2.4.3</version> <description>VMSHIPMENT_RULES_ADV_DESC</description> <files> <filename plugin="rules_shipping_advanced">rules_shipping_advanced.php</filename>