ACP2E-182: Error while validating Store VAT Number

pradeep1819 · pradeep1819 · commit 847f217cb25c · 2021-11-30T19:32:09.000+05:30
diff --git a/app/code/Magento/Config/Helper/Country.php b/app/code/Magento/Config/Helper/Country.php
diff --git a/app/code/Magento/Config/ViewModel/CountryFilter.php b/app/code/Magento/Config/ViewModel/CountryFilter.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Config\ViewModel;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Store\Model\ScopeInterface;
+
+class CountryFilter implements ArgumentInterface
+{
+    /**
+     * Config path to UE country list
+     */
+    private const XML_PATH_EU_COUNTRIES_LIST = 'general/country/eu_countries';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Fetch EU countries list
+     *
+     * @param  Int|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;
+    }
+}
diff --git a/app/code/Magento/Config/view/adminhtml/layout/adminhtml_system_config_edit.xml b/app/code/Magento/Config/view/adminhtml/layout/adminhtml_system_config_edit.xml
@@ -8,7 +8,11 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="js">
-            <block class="Magento\Backend\Block\Template" name="js.system_config_js" template="Magento_Config::system/config/js.phtml"/>
+            <block class="Magento\Backend\Block\Template" name="js.system_config_js" template="Magento_Config::system/config/js.phtml">
+                <arguments>
+                    <argument name="countryFilter" xsi:type="object">Magento\Config\ViewModel\CountryFilter</argument>
+                </arguments>
+            </block>
             <block class="Magento\Backend\Block\Template" name="js.system_shipping_applicable_country" template="Magento_Backend::system/shipping/applicable_country.phtml"/>
         </referenceContainer>
         <referenceContainer name="page.main.actions">
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
@@ -6,6 +6,7 @@
 
 /**
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @var \Magento\Config\ViewModel\CountryFilter $countryFilter
  */
 ?>
 
@@ -86,7 +87,8 @@ originModel.prototype = {
 script;
 
 $scriptString .= 'this.regionsUrl = "' . $block->escapeJs($block->getUrl('directory/json/countryRegion')) . '";';
-$euCountries = $this->helper(\Magento\Config\Helper\Country::class)->getEuCountryList();
+$countryFilter = $block->getData('countryFilter');
+$euCountries = $countryFilter->getEuCountryList();
 $scriptString .= 'this.euCountryList = ' . json_encode($euCountries);
 
 $scriptString .= <<<script
