ACP2E-675: Telephone required on all websites when set to be optional on some

Author: bubasuma

app/code/Magento/Customer/Controller/Adminhtml/Address/Validate.php

@@ -9,6 +9,7 @@
 use Magento\Backend\App\Action;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\Config\Share;
+use Magento\Customer\Model\CustomerRegistry;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\App\ObjectManager;
@@ -44,40 +45,40 @@ class Validate extends Action implements HttpPostActionInterface, HttpGetActionI
     private $shareConfig;
 
     /**
-     * @var CustomerRepositoryInterface
+     * @var StoreManagerInterface
      */
-    private $customerRepository;
+    private $storeManager;
 
     /**
-     * @var StoreManagerInterface
+     * @var CustomerRegistry
      */
-    private $storeManager;
+    private $customerRegistry;
 
     /**
      * @param Action\Context $context
      * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
      * @param \Magento\Customer\Model\Metadata\FormFactory $formFactory
      * @param Share|null $shareConfig
-     * @param CustomerRepositoryInterface|null $customerRepository
      * @param StoreManagerInterface|null $storeManager
+     * @param CustomerRegistry|null $customerRegistry
      */
     public function __construct(
         Action\Context $context,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
         \Magento\Customer\Model\Metadata\FormFactory $formFactory,
         ?Share $shareConfig = null,
-        ?CustomerRepositoryInterface $customerRepository = null,
-        ?StoreManagerInterface $storeManager = null
+        ?StoreManagerInterface $storeManager = null,
+        ?CustomerRegistry $customerRegistry = null
     ) {
         parent::__construct($context);
         $this->resultJsonFactory = $resultJsonFactory;
         $this->formFactory = $formFactory;
         $this->shareConfig = $shareConfig
             ?? ObjectManager::getInstance()->get(Share::class);
-        $this->customerRepository = $customerRepository
-            ?? ObjectManager::getInstance()->get(CustomerRepositoryInterface::class);
         $this->storeManager = $storeManager
             ?? ObjectManager::getInstance()->get(StoreManagerInterface::class);
+        $this->customerRegistry = $customerRegistry
+            ?? ObjectManager::getInstance()->get(CustomerRegistry::class);
     }
 
     /**
@@ -87,6 +88,13 @@ public function __construct(
      */
     public function execute(): Json
     {
+        $customerId = $this->getRequest()->getParam('parent_id');
+        if ($customerId) {
+            $customerModel = $this->customerRegistry->retrieve($customerId);
+            if (!$this->shareConfig->isGlobalScope() && $customerModel->getStoreId()) {
+                $this->storeManager->setCurrentStore($customerModel->getStoreId());
+            }
+        }
         /** @var \Magento\Framework\DataObject $response */
         $response = new \Magento\Framework\DataObject();
         $response->setError(false);
@@ -113,12 +121,6 @@ public function execute(): Json
     private function validateCustomerAddress(DataObject $response): DataObject
     {
         $addressForm = $this->formFactory->create('customer_address', 'adminhtml_customer_address');
-        if ($this->getRequest()->getParam('parent_id')) {
-            $customer = $this->customerRepository->getById($this->getRequest()->getParam('parent_id'));
-            if (!$this->shareConfig->isGlobalScope() && $customer->getStoreId()) {
-                $this->storeManager->setCurrentStore($customer->getStoreId());
-            }
-        }
         $formData = $addressForm->extractData($this->getRequest());
         $errors = $addressForm->validateData($formData);
         if ($errors !== true) {