ACP2E-182: Error while validating Store VAT Number

Author: pradeep1819

app/code/Magento/Config/Helper/Country.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Config\Helper;
+
+use Magento\Framework\App\Helper\AbstractHelper;
+use Magento\Store\Model\ScopeInterface;
+
+class Country extends AbstractHelper
+{
+    /**
+     * Config path to UE country list
+     */
+    const XML_PATH_EU_COUNTRIES_LIST = 'general/country/eu_countries';
+
+    /**
+     * Fetch EU countries list
+     *
+     * @param  null $storeId
+     * @return false|string[]
+     */
+    public function getEuCountryList($storeId=null)
+    {
+        $euCountries = explode(
+            ',',
+            $this->scopeConfig->getValue(
+                self::XML_PATH_EU_COUNTRIES_LIST,
+                ScopeInterface::SCOPE_STORE,
+                $storeId
+            )
+        );
+
+        return $euCountries;
+    }
+}

app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml

@@ -14,6 +14,16 @@ require([
     'prototype'
 ], function () {
 
+function inArray(arr, value)
+{
+    for (var i = 0; i < arr.length; i++) {
+        if (arr[i] === value) {
+            return true;
+        }
+    }
+    return false;
+}
+
 var freeModel = Class.create();
 freeModel.prototype = {
     initialize : function()
@@ -76,7 +86,9 @@ originModel.prototype = {
 script;
 
 $scriptString .= 'this.regionsUrl = "' . $block->escapeJs($block->getUrl('directory/json/countryRegion')) . '";';
-$scriptString .= 'this.euCountryUrl = "' . $block->escapeJs($block->getUrl('directory/json/isEuCountry')) . '";';
+$euCountries = $this->helper(\Magento\Config\Helper\Country::class)->getEuCountryList();
+$scriptString .= 'this.euCountryList = ' . json_encode($euCountries);
+
 $scriptString .= <<<script
 
         this.bindCountryRegionRelation();
@@ -137,11 +149,12 @@ $scriptString .= <<<script
             if (regionElement) {
                 this.regionElement = regionElement;
                 if (countryElement.value.length) {
-                    var objThis = this;
-                    setTimeout(function(){
-                        var euUrl = objThis.euCountryUrl+'countryCode/'+countryElement.value;
-                        objThis.loader.load(euUrl, {}, objThis.validateVatNumber.bind(objThis));
-                    }, 1000);
+                    var isEUCountry = false;
+                    if ( inArray(this.euCountryList, countryElement.value)) {
+                        isEUCountry = true;
+                    }
+                    this.validateVatNumber(isEUCountry);
+
                     var url = this.regionsUrl+'parent/'+countryElement.value;
                     this.loader.load(url, {}, this.refreshRegionField.bind(this));
                 } else {
@@ -209,7 +222,7 @@ $scriptString .= <<<script
         var resultElement = document.getElementById("validation_result");
         var btnVatNumber  = document.getElementById(this.regionElement.id.replace(/region_id/, 'validate_vat_number'));
 
-        if (serverResponse === 'true') {
+        if (serverResponse === true) {
             btnVatNumber.classList.remove('disabled');
             if (resultElement) {
                 resultElement.style.display = "block";

app/code/Magento/Customer/Model/EuCountryProvider.php

@@ -65,7 +65,6 @@
     <preference for="Magento\Customer\Api\SessionCleanerInterface" type="Magento\Customer\Model\Session\SessionCleaner"/>
     <preference for="Magento\Customer\Api\GroupExcludedWebsiteRepositoryInterface"
                 type="Magento\Customer\Model\ResourceModel\GroupExcludedWebsiteRepository" />
-    <preference for="Magento\Directory\Controller\Adminhtml\Json\EuCountryProviderInterface" type="Magento\Customer\Model\EuCountryProvider" />
     <virtualType name="SessionValidator" type="Magento\Framework\Session\CompositeValidator">
         <arguments>
             <argument name="validators" xsi:type="array">

app/code/Magento/Customer/etc/di.xml

@@ -47,7 +47,6 @@
     <preference for="Magento\Directory\Api\CountryInformationAcquirerInterface" type="Magento\Directory\Model\CountryInformationAcquirer" />
     <preference for="Magento\Directory\Api\Data\CountryInformationInterface" type="Magento\Directory\Model\Data\CountryInformation" />
     <preference for="Magento\Directory\Api\Data\RegionInformationInterface" type="Magento\Directory\Model\Data\RegionInformation" />
-    <preference for="Magento\Directory\Controller\Adminhtml\Json\EuCountryProviderInterface" type="Magento\Directory\Model\EuCountryProvider" />
     <type name="Magento\Config\Model\Config\TypePool">
         <arguments>
             <argument name="sensitive" xsi:type="array">