MAGETWO-97397: A new customer created via an admin order has their Customer Group set to the Default customer group on the default website scope

  - Set default customer group as selected in the dropdown

Author: YevSent

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

@@ -9,6 +9,7 @@
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Create order account form
@@ -132,15 +133,8 @@ protected function _prepareForm()
         $this->_addAttributesToForm($attributes, $fieldset);
 
         $this->_form->addFieldNameSuffix('order[account]');
-
-        $formValues = $this->getFormValues();
-        foreach ($attributes as $code => $attribute) {
-            $defaultValue = $attribute->getDefaultValue();
-            if (isset($defaultValue) && !isset($formValues[$code])) {
-                $formValues[$code] = $defaultValue;
-            }
-        }
-        $this->_form->setValues($formValues);
+        $storeId = (int)$this->_sessionQuote->getStoreId();
+        $this->_form->setValues($this->extractValuesFromAttributes($attributes, $storeId));
 
         return $this;
     }
@@ -193,4 +187,42 @@ public function getFormValues()
 
         return $data;
     }
+
+    /**
+     * Extract the form values from attributes.
+     *
+     * @param array $attributes
+     * @param int $storeId
+     * @return array
+     */
+    private function extractValuesFromAttributes(array $attributes, int $storeId): 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
+        );
+    }
 }

dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php

@@ -11,46 +11,61 @@
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
 use Magento\Backend\Model\Session\Quote as SessionQuote;
+use Magento\Customer\Api\Data\AttributeMetadataInterface;
 use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
+use Magento\Customer\Model\Data\Option;
 use Magento\Customer\Model\Metadata\Form;
 use Magento\Customer\Model\Metadata\FormFactory;
 use Magento\Framework\View\LayoutInterface;
 use Magento\Quote\Model\Quote;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * @magentoAppArea adminhtml
  */
 class AccountTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var Account */
+    /**
+     * @var Account
+     */
     private $accountBlock;
 
     /**
-     * @var Bootstrap
+     * @var ObjectManager
      */
     private $objectManager;
 
+    /**
+     * @var SessionQuote|MockObject
+     */
+    private $session;
+
     /**
      * @magentoDataFixture Magento/Sales/_files/quote.php
      */
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $quote = $this->objectManager->create(Quote::class)->load(1);
-        $sessionQuoteMock = $this->getMockBuilder(
-            SessionQuote::class
-        )->disableOriginalConstructor()->setMethods(
-            ['getCustomerId', 'getStore', 'getStoreId', 'getQuote']
-        )->getMock();
-        $sessionQuoteMock->expects($this->any())->method('getCustomerId')->will($this->returnValue(1));
-        $sessionQuoteMock->expects($this->any())->method('getQuote')->will($this->returnValue($quote));
+
+        $this->session = $this->getMockBuilder(SessionQuote::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCustomerId', 'getStore', 'getStoreId', 'getQuote', 'getQuoteId'])
+            ->getMock();
+        $this->session->method('getCustomerId')
+            ->willReturn(1);
+        $this->session->method('getQuote')
+            ->willReturn($quote);
+        $this->session->method('getQuoteId')
+            ->willReturn($quote->getId());
         /** @var LayoutInterface $layout */
         $layout = $this->objectManager->get(LayoutInterface::class);
         $this->accountBlock = $layout->createBlock(
             Account::class,
             'address_block' . rand(),
-            ['sessionQuote' => $sessionQuoteMock]
+            ['sessionQuote' => $this->session]
         );
         parent::setUp();
     }
@@ -62,13 +77,13 @@ public function testGetForm()
     {
         $expectedFields = ['group_id', 'email'];
         $form = $this->accountBlock->getForm();
-        $this->assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
+        self::assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
         $fieldset = $form->getElements()[0];
 
-        $this->assertEquals(count($expectedFields), $fieldset->getElements()->count());
+        self::assertEquals(count($expectedFields), $fieldset->getElements()->count());
 
         foreach ($fieldset->getElements() as $element) {
-            $this->assertTrue(
+            self::assertTrue(
                 in_array($element->getId(), $expectedFields),
                 sprintf('Unexpected field "%s" in form.', $element->getId())
             );
@@ -79,6 +94,7 @@ public function testGetForm()
      * Tests a case when user defined custom attribute has default value.
      *
      * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoConfigFixture current_store customer/create_account/default_group 3
      */
     public function testGetFormWithUserDefinedAttribute()
     {
@@ -91,18 +107,27 @@ public function testGetFormWithUserDefinedAttribute()
 
         $form = $accountBlock->getForm();
         $form->setUseContainer(true);
+        $content = $form->toHtml();
 
-        $this->assertContains(
+        self::assertContains(
             '<option value="1" selected="selected">Yes</option>',
-            $form->toHtml(),
-            'Default value for user defined custom attribute should be selected'
+            $content,
+            'Default value for user defined custom attribute should be selected.'
+        );
+
+        self::assertContains(
+            '<option value="3" selected="selected">Customer Group 1</option>',
+            $content,
+            'The Customer Group specified for the chosen store should be selected.'
         );
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * Creates a mock for Form object.
+     *
+     * @return MockObject
      */
-    private function getFormFactoryMock(): \PHPUnit_Framework_MockObject_MockObject
+    private function getFormFactoryMock(): MockObject
     {
         /** @var AttributeMetadataInterfaceFactory $attributeMetadataFactory */
         $attributeMetadataFactory = $this->objectManager->create(AttributeMetadataInterfaceFactory::class);
@@ -113,11 +138,12 @@ private function getFormFactoryMock(): \PHPUnit_Framework_MockObject_MockObject
             ->setDefaultValue('1')
             ->setFrontendLabel('Yes/No');
 
+        /** @var Form|MockObject $form */
         $form = $this->getMockBuilder(Form::class)
             ->disableOriginalConstructor()
             ->getMock();
         $form->method('getUserAttributes')->willReturn([$booleanAttribute]);
-        $form->method('getSystemAttributes')->willReturn([]);
+        $form->method('getSystemAttributes')->willReturn([$this->createCustomerGroupAttribute()]);
 
         $formFactory = $this->getMockBuilder(FormFactory::class)
             ->disableOriginalConstructor()
@@ -126,4 +152,33 @@ private function getFormFactoryMock(): \PHPUnit_Framework_MockObject_MockObject
 
         return $formFactory;
     }
+
+    /**
+     * Creates a customer group attribute object.
+     *
+     * @return AttributeMetadataInterface
+     */
+    private function createCustomerGroupAttribute(): AttributeMetadataInterface
+    {
+        /** @var Option $option1 */
+        $option1 = $this->objectManager->create(Option::class);
+        $option1->setValue(3);
+        $option1->setLabel('Customer Group 1');
+
+        /** @var Option $option2 */
+        $option2 = $this->objectManager->create(Option::class);
+        $option2->setValue(4);
+        $option2->setLabel('Customer Group 2');
+
+        /** @var AttributeMetadataInterfaceFactory $attributeMetadataFactory */
+        $attributeMetadataFactory = $this->objectManager->create(AttributeMetadataInterfaceFactory::class);
+        $attribute = $attributeMetadataFactory->create()
+            ->setAttributeCode('group_id')
+            ->setBackendType('static')
+            ->setFrontendInput('select')
+            ->setOptions([$option1, $option2])
+            ->setIsRequired(true);
+
+        return $attribute;
+    }
 }