Merge pull request #33 from norgeindian/patch-1

Fixed country setting for shipping address
integer-net · Nov 26, 2019 · 1a73769 · 1a73769
2 parents 1f47cfc + d60ad97
commit 1a73769
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/code/community/IntegerNet/Autoshipping/Model/Observer.php b/app/code/community/IntegerNet/Autoshipping/Model/Observer.php
@@ -40,8 +40,10 @@ public function prepareShippingAddress(Varien_Event_Observer $observer)
         }
 
         $shippingAddress = $quote->getShippingAddress();
-        $shippingAddress->setCountryId($country);
-
+        if (!$shippingAddress->getCountryId()) {
+            $shippingAddress->setCountryId($country);
+        }
+
         if (!$shippingAddress->getFreeMethodWeight()) {
             $shippingAddress->setFreeMethodWeight($shippingAddress->getWeight());
         }