Fix validation when manual field is disabled

Author: wilr

src/AddressFinderField.php

@@ -467,43 +467,51 @@ public function validate($validator)
             $validator->removeRequiredField($name);
 
             $fields = $this->getManualFields();
-            $postal = $fields->dataFieldByName("{$name}[PostalLine1]");
 
-            if (!$postal->Value()) {
-                $validator->validationError(
-                    $name,
-                    _t("AddressFinderField.ENTERAVALIDADDRESS", "Please enter a valid address."),
-                    'PostalLine1',
-                    false
-                );
+            if ($this->getShowManualFields()) {
+                $postal = $fields->dataFieldByName("{$name}[PostalLine1]");
 
-                return false;
-            }
+                if (!$postal->Value()) {
+                    $validator->validationError(
+                        $name,
+                        _t("AddressFinderField.ENTERAVALIDADDRESS", "Please enter a valid address."),
+                        'PostalLine1',
+                        false
+                    );
+
+                    return false;
+                }
 
-            $city = $fields->dataFieldByName("{$name}[City]");
+                $city = $fields->dataFieldByName("{$name}[City]");
 
-            if (!$city->Value()) {
-                $validator->validationError(
-                    $name,
-                    _t("AddressFinderField.ENTERAVALIDCITY", "Please enter a valid city."),
-                    "City",
-                    false
-                );
+                if (!$city->Value()) {
+                    $validator->validationError(
+                        $name,
+                        _t("AddressFinderField.ENTERAVALIDCITY", "Please enter a valid city.")
+                    );
 
-                return false;
-            }
+                    return false;
+                }
+
+                $postcode = $fields->dataFieldByName("{$name}[Postcode]");
 
-            $postcode = $fields->dataFieldByName("{$name}[Postcode]");
+                if (!$postcode->Value()) {
+                    $validator->validationError(
+                        $name,
+                        _t("AddressFinderField.ENTERAVALIDPOSTCODE", "Please enter a valid postcode.")
+                    );
 
-            if (!$postcode->Value()) {
-                $validator->validationError(
-                    $name,
-                    _t("AddressFinderField.ENTERAVALIDPOSTCODE", "Please enter a valid postcode."),
-                    "Postcode",
-                    false
-                );
+                    return false;
+                }
+            } else {
+                if (!$this->addressField->Value()) {
+                    $validator->validationError(
+                        $name,
+                        _t("AddressFinderField.ENTERAVALIDADDRESS", "Please enter a valid address.")
+                    );
 
-                return false;
+                    return false;
+                }
             }
 
             if ($this->requireLatLngManual) {
@@ -512,9 +520,7 @@ public function validate($validator)
                 if (!$lat->Value()) {
                     $lat->validationError(
                         $name,
-                        _t("AddressFinderField.LATITUDEMISSING", "Please enter a valid Latitude."),
-                        "Latitude",
-                        false
+                        _t("AddressFinderField.LATITUDEMISSING", "Please enter a valid Latitude.")
                     );
 
                     return false;
@@ -525,9 +531,7 @@ public function validate($validator)
                 if (!$lng->Value()) {
                     $lng->validationError(
                         $name,
-                        _t("AddressFinderField.LONGTITUDEMISSING", "Please enter a valid Longitude."),
-                        "Longitude",
-                        false
+                        _t("AddressFinderField.LONGTITUDEMISSING", "Please enter a valid Longitude.")
                     );
 
                     return false;