Merge remote-tracking branch 'origin/ACP2E-4072' into PR_2025_09_19_flowers

Author: thiaramus

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Customer\Model;
 
@@ -139,14 +139,14 @@ public function getCustomerGroupIdBasedOnVatNumber($customerCountryCode, $vatVal
         ];
 
         if (isset($vatClassToGroupXmlPathMap[$vatClass])) {
-            $groupId = (int)$this->scopeConfig->getValue(
+            $groupId = $this->scopeConfig->getValue(
                 $vatClassToGroupXmlPathMap[$vatClass],
                 ScopeInterface::SCOPE_STORE,
                 $store
             );
         }
 
-        return $groupId;
+        return $groupId ? (int)$groupId : null;
     }
 
     /**

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

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model;
+
+use Magento\Framework\DataObject;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
+
+/**
+ * Storage for validated VAT data
+ */
+class VatValidationResultStorage extends DataObject implements ResetAfterRequestInterface
+{
+    /**
+     * Store VAT validated data by key
+     *
+     * @param string|int $vatNumber
+     * @param string $countryCode
+     * @param DataObject $vatValidationResult
+     * @return void
+     */
+    public function set(string|int $vatNumber, string $countryCode, DataObject $vatValidationResult): void
+    {
+        $this->setData($vatNumber . $countryCode, $vatValidationResult);
+    }
+
+    /**
+     * Retrieve VAT validated data by key
+     *
+     * @param string|int $vatNumber
+     * @param string $countryCode
+     * @return DataObject|null
+     */
+    public function get(string|int $vatNumber, string $countryCode): ?DataObject
+    {
+        return $this->getData($vatNumber . $countryCode);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->setData([]);
+    }
+}

app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -159,7 +159,10 @@ public function execute(Observer $observer)
                     $customer->getStore()
                 );
 
-                if (!$customer->getDisableAutoGroupChange() && $customer->getGroupId() != $newGroupId) {
+                if (!$customer->getDisableAutoGroupChange() &&
+                    $newGroupId !== null &&
+                    $customer->getGroupId() != $newGroupId
+                ) {
                     $customer->setGroupId($newGroupId);
                     $customer->save();
                     $this->customerSession->setCustomerGroupId($newGroupId);

app/code/Magento/Customer/Plugin/Model/VatPlugin.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Plugin\Model;
+
+use Magento\Customer\Model\Vat;
+use Magento\Customer\Model\VatValidationResultStorage;
+
+/**
+ * Plugin to cache the VAT number validation result based on provided VAT number and country code
+ */
+class VatPlugin
+{
+    /**
+     * @param VatValidationResultStorage $vatValidationResultStorage
+     */
+    public function __construct(
+        private readonly VatValidationResultStorage $vatValidationResultStorage
+    ) {
+    }
+
+    /**
+     * Cache VAT number validation result
+     *
+     * @param Vat $subject
+     * @param \Closure $proceed
+     * @param string $countryCode
+     * @param string $vatNumber
+     * @param string $requesterCountryCode
+     * @param string $requesterVatNumber
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundCheckVatNumber(
+        Vat $subject,
+        \Closure $proceed,
+        $countryCode,
+        $vatNumber,
+        $requesterCountryCode = '',
+        $requesterVatNumber = ''
+    ) {
+        $storedValidationResult = $this->vatValidationResultStorage->get($vatNumber, $countryCode);
+
+        if ($storedValidationResult) {
+            return $storedValidationResult;
+        }
+        $validationResult = $proceed($countryCode, $vatNumber, $requesterCountryCode, $requesterVatNumber);
+
+        if ($validationResult->getRequestSuccess()) {
+            $this->vatValidationResultStorage->set($vatNumber, $countryCode, $validationResult);
+        }
+
+        return $validationResult;
+    }
+}

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

@@ -133,4 +133,7 @@
     <type name="Magento\Customer\Api\CustomerRepositoryInterface">
         <plugin name="customer_dobvalidation_plugin" type="Magento\Customer\Plugin\ValidateDobOnSave" sortOrder="10"/>
     </type>
+    <type name="Magento\Customer\Model\Vat">
+        <plugin name="cache_vat_validation_result" type="Magento\Customer\Plugin\Model\VatPlugin"/>
+    </type>
 </config>

app/code/Magento/Quote/Observer/Frontend/Quote/Address/VatValidator.php

@@ -1,33 +1,32 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Quote\Observer\Frontend\Quote\Address;
 
+use Magento\Customer\Helper\Address;
+use Magento\Customer\Model\Vat;
+
 class VatValidator
 {
     /**
-     * Customer address
-     *
-     * @var \Magento\Customer\Helper\Address
+     * @var Address
      */
     protected $customerAddress;
 
     /**
-     * Customer VAT
-     *
-     * @var \Magento\Customer\Model\Vat
+     * @var Vat
      */
     protected $customerVat;
 
     /**
-     * @param \Magento\Customer\Helper\Address $customerAddress
-     * @param \Magento\Customer\Model\Vat $customerVat
+     * @param Address $customerAddress
+     * @param Vat $customerVat
      */
     public function __construct(
-        \Magento\Customer\Helper\Address $customerAddress,
-        \Magento\Customer\Model\Vat $customerVat
+        Address $customerAddress,
+        Vat $customerVat
     ) {
         $this->customerVat = $customerVat;
         $this->customerAddress = $customerAddress;