[TIX] Fixed return message on error

Empty array response is not allowed even if an error occurs
CopeX · Dec 3, 2018 · ae37ce1 · ae37ce1
1 parent 683c120
commit ae37ce1
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/Plugin/UidPlugin.php b/Plugin/UidPlugin.php
@@ -52,18 +52,17 @@ public function beforeCheckVatNumber(
         $countryCodeFromVAT = $this->helper->getCountryCodeFromVAT($vatNumber);
         if (!empty($vatNumber) && !is_numeric($countryCodeFromVAT) && $countryCode != $countryCodeFromVAT) {
             $this->addErrorMessage(__('Your selected country does not match the countrycode in VAT.'));
-            return [];
-        }
-        $newVatNumber = $vatNumber;
-        $newRequesterVatNumber = $requesterVatNumber;
-        if ($requesterVatNumber !== '' && $this->helper->isCountryCodeInVAT($requesterVatNumber)) {
-            $newRequesterVatNumber = substr(str_replace(' ', '', trim($requesterVatNumber)), 2);
         }
+        else {
+            if ($requesterVatNumber !== '' && $this->helper->isCountryCodeInVAT($requesterVatNumber)) {
+                $requesterVatNumber = substr(str_replace(' ', '', trim($requesterVatNumber)), 2);
+            }
 
-        if ($this->helper->isCountryCodeInVAT($newVatNumber)) {
-            $newVatNumber = substr(str_replace(' ', '', trim($vatNumber)), 2);
+            if ($this->helper->isCountryCodeInVAT($vatNumber)) {
+                $vatNumber = substr(str_replace(' ', '', trim($vatNumber)), 2);
+            }
         }
-        return [$countryCode, $newVatNumber, $requesterCountryCode, $newRequesterVatNumber];
+        return [$countryCode, $vatNumber, $requesterCountryCode, $requesterVatNumber];
     }
 
     /**