MC-15289: Customer account group cannot be selected while creating a new customer in order

Author: nathanjosiah

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php

@@ -133,8 +133,7 @@ protected function _prepareForm()
         $this->_addAttributesToForm($attributes, $fieldset);
 
         $this->_form->addFieldNameSuffix('order[account]');
-        $storeId = (int)$this->_sessionQuote->getStoreId();
-        $this->_form->setValues($this->extractValuesFromAttributes($attributes, $storeId));
+        $this->_form->setValues($this->extractValuesFromAttributes($attributes));
 
         return $this;
     }
@@ -192,37 +191,18 @@ public function getFormValues()
      * Extract the form values from attributes.
      *
      * @param array $attributes
-     * @param int $storeId
      * @return array
      */
-    private function extractValuesFromAttributes(array $attributes, int $storeId): array
+    private function extractValuesFromAttributes(array $attributes): array
     {
         $formValues = $this->getFormValues();
         foreach ($attributes as $code => $attribute) {
             $defaultValue = $attribute->getDefaultValue();
             if (isset($defaultValue) && !isset($formValues[$code])) {
                 $formValues[$code] = $defaultValue;
             }
-            if ($code === 'group_id' && empty($defaultValue)) {
-                $formValues[$code] = $this->getDefaultCustomerGroup($storeId);
-            }
         }
 
         return $formValues;
     }
-
-    /**
-     * Gets default customer group.
-     *
-     * @param int $storeId
-     * @return string|null
-     */
-    private function getDefaultCustomerGroup(int $storeId): ?string
-    {
-        return $this->_scopeConfig->getValue(
-            'customer/create_account/default_group',
-            ScopeInterface::SCOPE_STORE,
-            $storeId
-        );
-    }
 }