ENGCOM-4272: [Backport] Fixed #21144 Can't change customer group when placing an admin order #21239

sivaschenko · web-flow · commit 474140183ef6 · 2019-02-15T12:20:52.000Z
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
@@ -199,7 +199,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
`@@ -199,7 +199,7 @@ private function extractValuesFromAttributes(array $attributes, int $storeId): a`
`199`	`199`	`if (isset($defaultValue) && !isset($formValues[$code])) {`
`200`	`200`	`$formValues[$code] = $defaultValue;`
`201`	`201`	`}`
`202`		`- if ($code === 'group_id' && empty($defaultValue)) {`
	`202`	`+ if ($code === 'group_id' && empty($formValues[$code])) {`
`203`	`203`	`$formValues[$code] = $this->getDefaultCustomerGroup($storeId);`
`204`	`204`	`}`
`205`	`205`	`}`