- Fixed bug on default country and hide country setting not getting c…

…orrect behavior. #63
barrelstrength · Sep 12, 2018 · 28e9aac · 28e9aac
1 parent cd29360
commit 28e9aac
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/fields/Address.php b/src/fields/Address.php
@@ -116,7 +116,7 @@ public function getInputHtml($value, ElementInterface $element = null): string
 
         $addressInfoModel = SproutBase::$app->addressField->getAddressById($addressId);
 
-        $countryCode = $addressInfoModel->countryCode;
+        $countryCode = $addressInfoModel->countryCode ?? $defaultCountryCode;
 
         $this->addressHelper->setParams($countryCode, $name, $addressInfoModel);
 
@@ -125,7 +125,7 @@ public function getInputHtml($value, ElementInterface $element = null): string
             $addressFormat = $this->addressHelper->getAddressWithFormat($addressInfoModel);
         }
 
-        $countryInput = $this->addressHelper->countryInput();
+        $countryInput = $this->addressHelper->countryInput($hideCountryDropdown);
         $addressForm = $this->addressHelper->getAddressFormHtml();
 
         return Craft::$app->getView()->renderTemplate(