disabled signed delivery for Australia on retail only

joolswills · Aug 11, 2016 · 21137b2 · 21137b2
1 parent e8c6713
commit 21137b2
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail.php b/app/code/community/Meanbee/Royalmail/Model/Shipping/Carrier/Royalmail.php
@@ -129,8 +129,8 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request)
                         unset($calculatedMethods[$key]);
                     }
 
-                    // no signed delivery to Australia, USA and New Zealand
-                    if (in_array($country, array('AU','US', 'NZ')) &&
+                    // no signed delivery to USA and New Zealand
+                    if (in_array($country, array('US', 'NZ')) &&
                         strpos($value->shippingMethodName, "TRACKED") === false &&
                         strpos($value->shippingMethodName, "SIGNED") !== false) {
                         unset($calculatedMethods[$key]);
@@ -150,6 +150,13 @@ public function collectRates(Mage_Shipping_Model_Rate_Request $request)
                             unset($calculatedMethods[$key]);
                         }
 
+                        // no signed delivery to Australia
+                        if (in_array($country, array('AU')) &&
+                            strpos($value->shippingMethodName, "TRACKED") === false &&
+                            strpos($value->shippingMethodName, "SIGNED") !== false) {
+                            unset($calculatedMethods[$key]);
+                        }
+
                         // only allow international standard to certain countries
                         if (! in_array($country, array('AU', 'AR', 'CA', 'IL', 'RE', 'US', 'ZA')) &&
                             strpos($value->shippingMethodName, "STANDARD") !== false) {