ENGCOM-4241: Fixed #21144 Can't change customer group when placing an admin order #21145

sidolov · web-flow · commit a41c3ea26259 · 2019-02-14T12:04:24.000-06:00
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -203,7 +203,7 @@ private function extractValuesFromAttributes(array $attributes, int $storeId): a
             if (isset($defaultValue) && !isset($formValues[$code])) {
                 $formValues[$code] = $defaultValue;
             }
-            if ($code === 'group_id' && empty($defaultValue)) {
+            if ($code === 'group_id' && empty($formValues[$code])) {
                 $formValues[$code] = $this->getDefaultCustomerGroup($storeId);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ private function extractValuesFromAttributes(array $attributes, int $storeId): a`
`203`	`203`	`if (isset($defaultValue) && !isset($formValues[$code])) {`
`204`	`204`	`$formValues[$code] = $defaultValue;`
`205`	`205`	`}`
`206`		`- if ($code === 'group_id' && empty($defaultValue)) {`
	`206`	`+ if ($code === 'group_id' && empty($formValues[$code])) {`
`207`	`207`	`$formValues[$code] = $this->getDefaultCustomerGroup($storeId);`
`208`	`208`	`}`
`209`	`209`	`}`