diff --git a/Makefile b/Makefile index dd38653deaa05670e29c73948c95cdd309b8dcbd..fd2d3e0d6b3002a10dc634ad6beaeb6b57922977 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BASE=rules_shipping BASE_ADV=rules_shipping_advanced PLUGINTYPE=vmshipment -VERSION=2.4.6 +VERSION=2.4.7 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.7.zip b/releases/plg_vmshipment_rules_shipping_advanced_v2.4.7.zip new file mode 100644 index 0000000000000000000000000000000000000000..ad1d19a82fcffcff3aa48ffd33dd2eda88ffe168 Binary files /dev/null and b/releases/plg_vmshipment_rules_shipping_advanced_v2.4.7.zip differ diff --git a/releases/plg_vmshipment_rules_shipping_v2.4.7.zip b/releases/plg_vmshipment_rules_shipping_v2.4.7.zip new file mode 100644 index 0000000000000000000000000000000000000000..9e401187ba2f73255ef73ef27374677333e6f72f Binary files /dev/null and b/releases/plg_vmshipment_rules_shipping_v2.4.7.zip differ diff --git a/rules_shipping.xml b/rules_shipping.xml index 03be1739a4d7ecd1caeef6fb6d46b2b61ef3a701..99b6a951478b751e12925d0c97fbc2df1fc04278 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.6</version> + <version>2.4.7</version> <description>VMSHIPMENT_RULES_DESC</description> <files> <filename plugin="rules_shipping">rules_shipping.php</filename> diff --git a/rules_shipping_advanced.php b/rules_shipping_advanced.php index b21e4a8c2232c900c0113d37c695aa7a004c3936..293296ba687d40338e6f7bda5be420a2916bf886 100644 --- a/rules_shipping_advanced.php +++ b/rules_shipping_advanced.php @@ -42,10 +42,11 @@ class plgVmShipmentRules_Shipping_Advanced extends plgVmShipmentRules_Shipping_B */ protected function addCustomCartValues (VirtueMartCart $cart, $cart_prices, &$values) { $values['coupon'] = $cart->couponCode; + $zip=strtoupper($values['zip']); // 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 ($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*$/', $zip, $match)) { $values['uk_outward'] = $match[1]; $values['uk_area'] = $match[2]; $values['uk_district'] = $match[3]; @@ -59,7 +60,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 ($zip and preg_match('/^\s*(([A-Za-z])(\d)([A-Za-z]))\s*(\d[A-Za-z]\d)\s*$/', $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 4b27e368f17522f93dc2ac9019b2a35376cff696..2ea204bf090a66be3d4f53cff059b5cf8d434a70 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.6</version> + <version>2.4.7</version> <description>VMSHIPMENT_RULES_ADV_DESC</description> <files> <filename plugin="rules_shipping_advanced">rules_shipping_advanced.php</filename>