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

bubasuma · bubasuma · commit 0768a9f73e77 · 2022-03-23T17:13:18.000-05:00
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/Save.php
@@ -7,11 +7,16 @@
 namespace Magento\Customer\Controller\Adminhtml\Address;
 
 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\HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -62,6 +67,21 @@ class Save extends Action implements HttpPostActionInterface
      */
     private $resultJsonFactory;
 
+    /**
+     * @var Share
+     */
+    private $shareConfig;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var CustomerRegistry
+     */
+    private $customerRegistry;
+
     /**
      * @param Action\Context $context
      * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
@@ -71,6 +91,10 @@ class Save extends Action implements HttpPostActionInterface
      * @param \Magento\Customer\Api\Data\AddressInterfaceFactory $addressDataFactory
      * @param LoggerInterface $logger
      * @param JsonFactory $resultJsonFactory
+     * @param Share|null $shareConfig
+     * @param StoreManagerInterface|null $storeManager
+     * @param CustomerRegistry|null $customerRegistry
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         Action\Context $context,
@@ -80,7 +104,10 @@ public function __construct(
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         \Magento\Customer\Api\Data\AddressInterfaceFactory $addressDataFactory,
         LoggerInterface $logger,
-        JsonFactory $resultJsonFactory
+        JsonFactory $resultJsonFactory,
+        ?Share $shareConfig = null,
+        ?StoreManagerInterface $storeManager = null,
+        ?CustomerRegistry $customerRegistry = null
     ) {
         parent::__construct($context);
         $this->addressRepository = $addressRepository;
@@ -90,6 +117,12 @@ public function __construct(
         $this->addressDataFactory = $addressDataFactory;
         $this->logger = $logger;
         $this->resultJsonFactory = $resultJsonFactory;
+        $this->shareConfig = $shareConfig
+            ?? ObjectManager::getInstance()->get(Share::class);
+        $this->storeManager = $storeManager
+            ?? ObjectManager::getInstance()->get(StoreManagerInterface::class);
+        $this->customerRegistry = $customerRegistry
+            ?? ObjectManager::getInstance()->get(CustomerRegistry::class);
     }
 
     /**
@@ -104,6 +137,10 @@ public function execute(): Json
 
         $error = false;
         try {
+            $customerModel = $this->customerRegistry->retrieve($customerId);
+            if (!$this->shareConfig->isGlobalScope() && $customerModel->getStoreId()) {
+                $this->storeManager->setCurrentStore($customerModel->getStoreId());
+            }
             /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
             $customer = $this->customerRepository->getById($customerId);
 
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Address/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/Address/Validate.php
@@ -7,10 +7,14 @@
 namespace Magento\Customer\Controller\Adminhtml\Address;
 
 use Magento\Backend\App\Action;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Config\Share;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\DataObject;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class for validation of customer address form on admin.
@@ -34,19 +38,46 @@ class Validate extends Action implements HttpPostActionInterface, HttpGetActionI
      */
     private $formFactory;
 
+    /**
+     * @var Share
+     */
+    private $shareConfig;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @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
      */
     public function __construct(
         Action\Context $context,
         \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-        \Magento\Customer\Model\Metadata\FormFactory $formFactory
+        \Magento\Customer\Model\Metadata\FormFactory $formFactory,
+        ?Share $shareConfig = null,
+        ?CustomerRepositoryInterface $customerRepository = null,
+        ?StoreManagerInterface $storeManager = 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);
     }
 
     /**
@@ -82,8 +113,13 @@ 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) {
             $messages = $response->hasMessages() ? $response->getMessages() : [];
diff --git a/app/code/Magento/Customer/Model/Address/DataProvider.php b/app/code/Magento/Customer/Model/Address/DataProvider.php
@@ -7,10 +7,12 @@
 namespace Magento\Customer\Model\Address;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Config\Share;
 use Magento\Customer\Model\ResourceModel\Address\CollectionFactory;
 use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Type;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Customer\Model\Address;
 use Magento\Customer\Model\FileUploaderDataResolver;
@@ -41,7 +43,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      */
     private $allowToShowHiddenAttributes;
 
-    /*
+    /**
      * @var ContextInterface
      */
     private $context;
@@ -72,6 +74,11 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      */
     private $attributeMetadataResolver;
 
+    /**
+     * @var Share|null
+     */
+    private $shareConfig;
+
     /**
      * DataProvider constructor.
      * @param string $name
@@ -86,6 +93,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * @param array $meta
      * @param array $data
      * @param bool $allowToShowHiddenAttributes
+     * @param Share|null $shareConfig
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -101,7 +109,8 @@ public function __construct(
         AttributeMetadataResolver $attributeMetadataResolver,
         array $meta = [],
         array $data = [],
-        $allowToShowHiddenAttributes = true
+        $allowToShowHiddenAttributes = true,
+        ?Share $shareConfig = null
     ) {
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
         $this->collection = $addressCollectionFactory->create();
@@ -111,6 +120,7 @@ public function __construct(
         $this->context = $context;
         $this->fileUploaderDataResolver = $fileUploaderDataResolver;
         $this->attributeMetadataResolver = $attributeMetadataResolver;
+        $this->shareConfig = $shareConfig ?? ObjectManager::getInstance()->get(Share::class);
         $this->meta['general']['children'] = $this->getAttributesMeta(
             $eavConfig->getEntityType('customer_address')
         );
@@ -210,9 +220,17 @@ private function getDefaultData(): array
     private function getAttributesMeta(Type $entityType): array
     {
         $meta = [];
-        $attributes = $entityType->getAttributeCollection();
+        $parentId = $this->context->getRequestParam('parent_id');
+        $customer = $this->customerRepository->getById($parentId);
+        /** @var \Magento\Customer\Model\ResourceModel\Address\Attribute\Collection $sharedCollection */
+        $sharedCollection = $entityType->getAttributeCollection();
+        $collection = clone $sharedCollection;
+        if (!$this->shareConfig->isGlobalScope()) {
+            $collection->setWebsite($customer->getWebsiteId());
+        }
+
         /* @var AbstractAttribute $attribute */
-        foreach ($attributes as $attribute) {
+        foreach ($collection as $attribute) {
             if (\in_array($attribute->getFrontendInput(), $this->bannedInputTypes, true)) {
                 continue;
             }
diff --git a/app/code/Magento/Eav/Model/Config.php b/app/code/Magento/Eav/Model/Config.php
@@ -954,7 +954,9 @@ private function setAttributeData($attribute, $entityType): AbstractAttribute
     private function initAttributesFromCache(Type $entityType)
     {
         $entityTypeCode = $entityType->getEntityTypeCode();
-        $cacheKey = self::ATTRIBUTES_CACHE_ID . $entityTypeCode;
+        $attributeCollection = $this->_universalFactory->create($entityType->getEntityAttributeCollection());
+        $websiteId = $attributeCollection instanceof Collection ? $this->getWebsiteId($attributeCollection) : 0;
+        $cacheKey = self::ATTRIBUTES_CACHE_ID . '-' . $entityTypeCode . '-' . $websiteId ;
         if ($this->isCacheEnabled() && ($attributes = $this->_cache->load($cacheKey))) {
             $attributes = $this->serializer->unserialize($attributes);
             if ($attributes) {
