Merge remote-tracking branch 'origin/imported-magento-magento2-30963' into 2.4-develop-pr112

Author: zakdma

app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
 use Magento\Backend\App\Action\Context;
@@ -40,6 +41,7 @@
 use Magento\Framework\Math\Random;
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\Registry;
+use Magento\Framework\Validator\Exception;
 use Magento\Framework\View\Result\LayoutFactory;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Newsletter\Model\SubscriberFactory;
@@ -243,10 +245,10 @@ protected function _extractData(
     /**
      * Saves default_billing and default_shipping flags for customer address
      *
-     * @deprecated 102.0.1 must be removed because addresses are save separately for now
      * @param array $addressIdList
      * @param array $extractedCustomerData
      * @return array
+     * @deprecated 102.0.1 must be removed because addresses are save separately for now
      */
     protected function saveDefaultFlags(array $addressIdList, array &$extractedCustomerData)
     {
@@ -286,9 +288,9 @@ protected function saveDefaultFlags(array $addressIdList, array &$extractedCusto
     /**
      * Reformat customer addresses data to be compatible with customer service interface
      *
-     * @deprecated 102.0.1 addresses are saved separately for now
      * @param array $extractedCustomerData
      * @return array
+     * @deprecated 102.0.1 addresses are saved separately for now
      */
     protected function _extractCustomerAddressData(array &$extractedCustomerData)
     {
@@ -318,6 +320,7 @@ public function execute()
     {
         $returnToEdit = false;
         $customerId = $this->getCurrentCustomerId();
+        $customer = $this->customerDataFactory->create();
 
         if ($this->getRequest()->getPostValue()) {
             try {
@@ -335,8 +338,6 @@ public function execute()
                     $customerData['id'] = $customerId;
                 }
 
-                /** @var CustomerInterface $customer */
-                $customer = $this->customerDataFactory->create();
                 $this->dataObjectHelper->populateWithArray(
                     $customer,
                     $customerData,
@@ -353,15 +354,14 @@ public function execute()
                     try {
                         $this->customerAccountManagement->validateCustomerStoreIdByWebsiteId($customer);
                     } catch (LocalizedException $exception) {
-                        throw new LocalizedException(__("The Store View selected for sending Welcome email from".
+                        throw new LocalizedException(__("The Store View selected for sending Welcome email from" .
                             " is not related to the customer's associated website."));
                     }
                 }
 
                 // Save customer
                 if ($customerId) {
                     $this->_customerRepository->save($customer);
-
                     $this->getEmailNotification()->credentialsChanged($customer, $currentCustomer->getEmail());
                 } else {
                     $customer = $this->customerAccountManagement->createAccount($customer);
@@ -386,13 +386,13 @@ public function execute()
                     __('Something went wrong while saving the customer.')
                 );
                 $returnToEdit = false;
-            } catch (\Magento\Framework\Validator\Exception $exception) {
+            } catch (Exception $exception) {
                 $messages = $exception->getMessages();
                 if (empty($messages)) {
                     $messages = $exception->getMessage();
                 }
                 $this->_addSessionErrorMessages($messages);
-                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData());
+                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData($customer));
                 $returnToEdit = true;
             } catch (AbstractAggregateException $exception) {
                 $errors = $exception->getErrors();
@@ -401,18 +401,18 @@ public function execute()
                     $messages[] = $error->getMessage();
                 }
                 $this->_addSessionErrorMessages($messages);
-                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData());
+                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData($customer));
                 $returnToEdit = true;
             } catch (LocalizedException $exception) {
                 $this->_addSessionErrorMessages($exception->getMessage());
-                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData());
+                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData($customer));
                 $returnToEdit = true;
             } catch (\Exception $exception) {
                 $this->messageManager->addExceptionMessage(
                     $exception,
                     __('Something went wrong while saving the customer.')
                 );
-                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData());
+                $this->_getSession()->setCustomerFormData($this->retrieveFormattedFormData($customer));
                 $returnToEdit = true;
             }
         }
@@ -553,21 +553,16 @@ private function disableAddressValidation($customer)
     /**
      * Retrieve formatted form data
      *
+     * @param CustomerInterface $customer
      * @return array
      */
-    private function retrieveFormattedFormData(): array
+    private function retrieveFormattedFormData(CustomerInterface $customer): array
     {
         $originalRequestData = $this->getRequest()->getPostValue();
+        $customerData = $this->customerMapper->toFlatArray($customer);
 
         /* Customer data filtration */
         if (isset($originalRequestData['customer'])) {
-            $customerData = $this->_extractData(
-                'adminhtml_customer',
-                CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER,
-                [],
-                'customer'
-            );
-
             $customerData = array_intersect_key($customerData, $originalRequestData['customer']);
             $originalRequestData['customer'] = array_merge($originalRequestData['customer'], $customerData);
         }

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

@@ -8,11 +8,13 @@
 
 use Magento\Customer\Model\Address;
 use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\CustomerFactory;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory as CustomerCollectionFactory;
 use Magento\Directory\Model\CountryFactory;
 use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Eav\Model\Entity\Type;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Customer\Model\FileUploaderDataResolver;
@@ -66,6 +68,11 @@ class DataProviderWithDefaultAddresses extends AbstractDataProvider
      */
     private $attributeMetadataResolver;
 
+    /**
+     * @var CustomerFactory
+     */
+    private $customerFactory;
+
     /**
      * @param string $name
      * @param string $primaryFieldName
@@ -79,6 +86,7 @@ class DataProviderWithDefaultAddresses extends AbstractDataProvider
      * @param bool $allowToShowHiddenAttributes
      * @param array $meta
      * @param array $data
+     * @param CustomerFactory $customerFactory
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -94,7 +102,8 @@ public function __construct(
         AttributeMetadataResolver $attributeMetadataResolver,
         $allowToShowHiddenAttributes = true,
         array $meta = [],
-        array $data = []
+        array $data = [],
+        CustomerFactory $customerFactory = null
     ) {
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
         $this->collection = $customerCollectionFactory->create();
@@ -107,6 +116,7 @@ public function __construct(
         $this->meta['customer']['children'] = $this->getAttributesMeta(
             $eavConfig->getEntityType('customer')
         );
+        $this->customerFactory = $customerFactory ?: ObjectManager::getInstance()->get(CustomerFactory::class);
     }
 
     /**
@@ -142,9 +152,10 @@ public function getData(): array
 
             $this->loadedData[$customer->getId()] = $result;
         }
-
         $data = $this->session->getCustomerFormData();
         if (!empty($data)) {
+            $customer = $this->customerFactory->create();
+            $this->fileUploaderDataResolver->overrideFileUploaderData($customer, $data['customer']);
             $customerId = $data['customer']['entity_id'] ?? null;
             $this->loadedData[$customerId] = $data;
             $this->session->unsCustomerFormData();