ACP2E-356: Cannot create a new customer from Admin if Customer Sharing setting is set to Global

- Implemented new solution as per request from Viktor to show all the store views for all websites.
- Also, selected default store view of selected website.

Author: Mohan Ahuja

app/code/Magento/Customer/ViewModel/Customer/Store.php

@@ -109,28 +109,22 @@ private function getStoreOptions(): array
     private function getStoreOptionsWithCurrentWebsiteId(): array
     {
         $options = $this->systemStore->getStoreValuesForForm();
-
-        if (!empty($this->dataPersistor->get('customer')['account'])) {
-            $currentWebsiteId = (string)$this->dataPersistor->get('customer')['account']['website_id'];
-        } else {
-            $defaultStore = $this->storeManager->getDefaultStoreView();
-            if (!$defaultStore) {
-                $stores = $this->storeManager->getStores();
-                $defaultStore = array_shift($stores);
-            }
-            $currentWebsiteId = $defaultStore->getWebsiteId();
-        }
-
-        foreach ($options as $key => $option) {
-            $options[$key]['website_id'] = $currentWebsiteId;
-            if (is_array($option['value']) && !empty($option['value'])) {
-                foreach ($option['value'] as $storeViewKey => $storeView) {
-                    $storeView['website_id'] = $currentWebsiteId;
-                    $options[$key]['value'][$storeViewKey] = $storeView;
+        $websites = $this->systemStore->getWebsiteCollection();
+        $allOptions = [];
+
+        foreach ($websites as $website) {
+            foreach ($options as $key => $option) {
+                $options[$key]['website_id'] = $website->getId();
+                if (is_array($option['value']) && !empty($option['value'])) {
+                    foreach ($option['value'] as $storeViewKey => $storeView) {
+                        $storeView['website_id'] = $website->getId();
+                        $options[$key]['value'][$storeViewKey] = $storeView;
+                    }
                 }
+                $allOptions[] = $options[$key];
             }
         }
 
-        return $options;
+        return $allOptions;
     }
 }

app/code/Magento/Customer/ViewModel/Customer/Website.php

@@ -67,8 +67,34 @@ private function getWebsiteOptions(): array
                 $websiteId
             );
             $options[$key]['group_id'] = $groupId;
+            $options[$key]['default_store_view_id'] = $this->getWebsiteDefaultStoreViewId($websiteId);
         }
 
         return $options;
     }
+
+    /**
+     * Get Default store view id by Website id
+     *
+     * @param $websiteId
+     * @return mixed
+     */
+    private function getWebsiteDefaultStoreViewId($websiteId)
+    {
+        $defaultStoreViewId = null;
+        $websites = $this->systemStore->getWebsiteCollection();
+
+        foreach ($websites as $website) {
+            if ($website->getId() === $websiteId) {
+                $defaultStore = $website->getDefaultStore();
+                // Check if the default store exist
+                if ($defaultStore) {
+                    $defaultStoreViewId = $defaultStore->getId();
+                }
+                break;
+            }
+        }
+
+        return $defaultStoreViewId;
+    }
 }

app/code/Magento/Customer/view/adminhtml/web/js/form/element/website.js

@@ -24,6 +24,9 @@ define([
                 groupId.value(option[groupIdFieldKey]);
             }
 
+            if (option['default_store_view_id']) {
+                document.getElementsByName("customer[sendemail_store_id]")[0].value = option['default_store_view_id'];
+            }
             return this._super();
         }
     });