Add additional vat validation rule

Author: leganz

CHANGELOG.md

@@ -7,10 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [0.3.0] - 2020-12-16
-
 ### Added
 - Support for vat_eu_if:field,compare_value
-
+- Support for vat_eu_address_and_if:countryfield,field,compare_value
 ## [0.2.2] - 2020-10-04
 ### Fixed
 - Remove composer.lock from source code.

src/Classes/VatValidator.php

@@ -1,72 +1,66 @@
-<?php 
+<?php
 
 namespace AMBERSIVE\VatValidator\Classes;
 
+use AMBERSIVE\VatValidator\Classes\VatCompany;
 use App;
+use Illuminate\Validation\ValidationException;
 use SoapClient;
 use SoapFault;
 
-use Illuminate\Validation\ValidationException;
-
-use AMBERSIVE\VatValidator\Classes\VatCompany;
-
-class VatValidator {
-
+class VatValidator
+{
     public SoapClient $client;
 
-    public function __construct(SoapClient $client = null) {
+    public function __construct(SoapClient $client = null)
+    {
         $client = null;
-        $this->client = $client === null ? new SoapClient(config('vat-validator.wsdl', "http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl")) : $client;
+        $this->client = $client === null ? new SoapClient(config('vat-validator.wsdl', 'http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl')) : $client;
     }
-    
-    
+
     /**
-     * Returns a VatCompany data object if the vat id is not invalid at all
+     * Returns a VatCompany data object if the vat id is not invalid at all.
      *
      * @param  mixed $vatId
      * @return VatCompany
      */
-    public function check(String $vatId): VatCompany {
-
-
-
-        $vatId = str_replace(array(' ', '.', '-', ',', ', '), '', trim($vatId));
+    public function check(String $vatId): VatCompany
+    {
+        $vatId = str_replace([' ', '.', '-', ',', ', '], '', trim($vatId));
 
         $requestParams = [
-            'countryCode' => $this->getCountryCode($vatId), 
-            'vatNumber' => $this->getVatNumber($vatId)
+            'countryCode' => $this->getCountryCode($vatId),
+            'vatNumber' => $this->getVatNumber($vatId),
         ];
 
         try {
-
             $result = $this->client->checkVat($requestParams);
-
         } catch (SoapFault $e) {
             abort(400, $e->getMessage());
         }
 
         return new VatCompany($result);
-
     }
-    
+
     /**
-     * Return the country code of the vat id
+     * Return the country code of the vat id.
      *
      * @param  mixed $vatId
-     * @return String
+     * @return string
      */
-    protected function getCountryCode(String $vatId): String {
-        return substr($vatId, 0, 2);       
+    protected function getCountryCode(String $vatId): String
+    {
+        return substr($vatId, 0, 2);
     }
-    
+
     /**
-     * Returs the vat number
+     * Returs the vat number.
      *
      * @param  mixed $vatId
-     * @return String
+     * @return string
      */
-    protected function getVatNumber(String $vatId): String {
-        return substr($vatId, 2);       
+    protected function getVatNumber(String $vatId): String
+    {
+        return substr($vatId, 2);
     }
-
-}
+}

src/VatValidatorServiceProvider.php

@@ -9,6 +9,35 @@
 
 class VatValidatorServiceProvider extends ServiceProvider
 {
+    public static $countries = [
+        'be',
+        'bg',
+        'cz',
+        'dk',
+        'de',
+        'ee',
+        'ie',
+        'el',
+        'es',
+        'fr',
+        'hr',
+        'it',
+        'cy',
+        'lv',
+        'lt',
+        'lu',
+        'hu',
+        'mt',
+        'nl',
+        'at',
+        'pt',
+        'ro',
+        'si',
+        'sk',
+        'fi',
+        'se',
+    ];
+
     /**
      * Register services.
      *
@@ -68,5 +97,33 @@ public function boot()
                 return false;
             }
         });
+
+        Validator::extend('vat_eu_address_and_if', function ($attribute, $value, $parameters, $validator) {
+            try {
+                $data = $validator->getData();
+
+                if (isset($data[$parameters[0]]) === false || isset($data[$parameters[1]]) === false) {
+                    // Required fields does not exists in the provided input
+                    return false;
+                }
+
+                if (in_array($data[$parameters[0]], static::$countries) === false) {
+                    // Cannot find the country in the list of european countries
+                    // This validator cannot check if the id is correct so mark it as true
+                    return true;
+                }
+
+                if ($data[$parameters[1]] != $parameters[2]) {
+                    return true;
+                }
+
+                $instance = new \AMBERSIVE\VatValidator\Classes\VatValidator();
+                $result = $instance->check($value);
+
+                return $result->isValid();
+            } catch (\Symfony\Component\HttpKernel\Exception\HttpException $ex) {
+                return false;
+            }
+        });
     }
 }

tests/Units/VatValidatorTest.php

@@ -188,4 +188,25 @@ public function testIfValidadtionExtensionsIsValidIfRequiredIfIsFalse():void
         // Test
         $this->assertFalse($validator->fails());
     }
+
+    public function testIfValidationExtentionsVatEuAddressAndIfFailsIfCountryIsNotFromEU():void
+    {
+
+        // Prepare
+        $data = [
+            'vatid' => 'XXX',
+            'company' => false,
+            'country' => 'at',
+        ];
+
+        $rules = [
+            'vatid' => 'vat_eu_address_and_if:country,company,true',
+        ];
+
+        // Execute
+        $validator = Validator::make($data, $rules);
+
+        // Test
+        $this->assertFalse($validator->fails());
+    }
 }