ACP2E-2791: Not able to Save Customer attribute information in Admin Edit customer section;

Author: pradeep1819

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

@@ -335,6 +335,8 @@ public function execute()
 
         if ($this->getRequest()->getPostValue()) {
             try {
+                $this->setCurrentCustomerStore();
+
                 // optional fields might be set in request for future processing by observers in other modules
                 $customerData = $this->_extractCustomerData();
 
@@ -551,6 +553,24 @@ private function getCurrentCustomerId()
         return $customerId;
     }
 
+    /**
+     * Set store ID for the current customer.
+     *
+     * @return void
+     */
+    private function setCurrentCustomerStore(): void
+    {
+        $originalRequestData = $this->getRequest()->getPostValue(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
+
+        $storeId = $originalRequestData['store_id'] ?? null;
+        if (!$storeId) {
+            $websiteId = $originalRequestData['website_id'] ?? null;
+            $website = $this->storeManager->getWebsite($websiteId);
+            $storeId = current($website->getStoreIds());
+        }
+        $this->storeManager->setCurrentStore($storeId);
+    }
+
     /**
      * Disable Customer Address Validation
      *

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

@@ -7,6 +7,7 @@
 
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
@@ -145,6 +146,7 @@ protected function _validateCustomer($response)
             );
             $customerForm->setInvisibleIgnored(true);
 
+            $this->setCurrentCustomerStore();
             $data = $customerForm->extractData($this->getRequest(), 'customer');
 
             if ($customer->getWebsiteId()) {
@@ -161,11 +163,11 @@ protected function _validateCustomer($response)
                 $entity_id = $submittedData['entity_id'];
                 $customer->setId($entity_id);
             }
-            if (isset($data['website_id']) && is_numeric($data['website_id'])) {
-                $website = $this->storeManager->getWebsite($data['website_id']);
-                $storeId = current($website->getStoreIds());
-                $this->storeManager->setCurrentStore($storeId);
-            }
+            /* if (isset($data['website_id']) && is_numeric($data['website_id'])) {
+                 $website = $this->storeManager->getWebsite($data['website_id']);
+                 $storeId = current($website->getStoreIds());
+                 $this->storeManager->setCurrentStore($storeId);
+             }*/
             $errors = $this->customerAccountManagement->validate($customer)->getMessages();
         } catch (\Magento\Framework\Validator\Exception $exception) {
             /* @var $error Error */
@@ -206,4 +208,22 @@ public function execute()
         $resultJson->setData($response);
         return $resultJson;
     }
+
+    /**
+     * Set store ID for the current customer.
+     *
+     * @return void
+     */
+    private function setCurrentCustomerStore(): void
+    {
+        $requestData = $this->getRequest()->getParam(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
+
+        $storeId = $requestData['store_id'] ?? null;
+        if (!$storeId) {
+            $websiteId = $requestData['website_id'] ?? null;
+            $website = $this->storeManager->getWebsite($websiteId);
+            $storeId = current($website->getStoreIds());
+        }
+        $this->storeManager->setCurrentStore($storeId);
+    }
 }