fixed setting counrty correctly

TonisOrmisson · Sep 29, 2023 · d191672 · d191672
1 parent 628ddd5
commit d191672
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/AddressForm.php b/src/AddressForm.php
@@ -133,6 +133,7 @@ public function getCountries() : array
 
     private function setDefaults()
     {
+
         if (empty($this->address)) {
             $params = [];
             if (!empty($this->disabledFields)) {
@@ -146,11 +147,17 @@ private function setDefaults()
             $this->country = country($this->allowedCountries[0]);
             $this->address->country = $this->country->getIsoAlpha2();
         }
-        if(!empty($this->defaultCountry)) {
-          if(!in_array($this->defaultCountry, $this->allowedCountries) && !empty($this->allowedCountries))  {
-              throw new ErrorException("the set defaultCounty '{$this->defaultCountry}' must be one of the configured allowedCountries");
-          }
-          $this->country = country($this->defaultCountry);
+
+
+        if(!empty($this->address->country)){
+            $this->country = country($this->address->country);
+        }
+
+        if(empty($this->address->country) && !empty($this->defaultCountry)) {
+            if(!in_array($this->defaultCountry, $this->allowedCountries) && !empty($this->allowedCountries))  {
+                throw new ErrorException("the set defaultCounty '{$this->defaultCountry}' must be one of the configured allowedCountries");
+            }
+            $this->country = country($this->defaultCountry);
         }
 
         if (empty($this->submitText)) {