MAGETWO-57078: [GITHUB] Can't set customer group when creating a new order in the admin. #6162

Author: omiroshnichenko

app/code/Magento/Sales/Model/AdminOrder/Create.php

@@ -1287,7 +1287,7 @@ protected function _createCustomerForm(\Magento\Customer\Api\Data\CustomerInterf
             'adminhtml_checkout',
             $this->customerMapper->toFlatArray($customer),
             false,
-            CustomerForm::DONT_IGNORE_INVISIBLE
+            CustomerForm::IGNORE_INVISIBLE
         );
 
         return $customerForm;
@@ -1568,13 +1568,11 @@ public function setAccountData($accountData)
     {
         $customer = $this->getQuote()->getCustomer();
         $form = $this->_createCustomerForm($customer);
-        $customerData = $this->customerMapper->toFlatArray($customer);
 
         // emulate request
         $request = $form->prepareRequest($accountData);
         $data = $form->extractData($request);
         $data = $form->restoreData($data);
-        $data = array_merge($customerData, array_filter($data));
         $customer = $this->customerFactory->create();
         $this->dataObjectHelper->populateWithArray(
             $customer,
@@ -1583,6 +1581,7 @@ public function setAccountData($accountData)
         $this->getQuote()->updateCustomerData($customer);
         $data = [];
 
+        $customerData = $this->customerMapper->toFlatArray($customer);
         foreach ($form->getAttributes() as $attribute) {
             $code = sprintf('customer_%s', $attribute->getAttributeCode());
             $data[$code] = isset($customerData[$attribute->getAttributeCode()])

app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php

@@ -100,14 +100,14 @@ protected function setUp()
         $loggerMock = $this->getMock(\Psr\Log\LoggerInterface::class);
         $copyMock = $this->getMock(\Magento\Framework\DataObject\Copy::class, [], [], '', false);
         $messageManagerMock = $this->getMock(\Magento\Framework\Message\ManagerInterface::class);
-        $this->formFactoryMock = $this->getMock(
+        $this->formFactoryMock = $this->getMock(
             \Magento\Customer\Model\Metadata\FormFactory::class,
             ['create'],
             [],
             '',
             false
         );
-        $this->customerFactoryMock = $this->getMock(
+        $this->customerFactoryMock = $this->getMock(
             \Magento\Customer\Api\Data\CustomerInterfaceFactory::class,
             ['create'],
             [],
@@ -122,56 +122,56 @@ protected function setUp()
             ->setMethods(['create'])
             ->getMock();
 
-        $this->customerMapper = $this->getMockBuilder(
+        $this->customerMapper = $this->getMockBuilder(
             \Magento\Customer\Model\Customer\Mapper::class
         )->setMethods(['toFlatArray'])->disableOriginalConstructor()->getMock();
 
-        $this->quoteInitializerMock = $this->getMock(
+        $this->quoteInitializerMock = $this->getMock(
             \Magento\Sales\Model\AdminOrder\Product\Quote\Initializer::class,
             [],
             [],
             '',
             false
         );
-        $this->customerRepositoryMock = $this->getMockForAbstractClass(
+        $this->customerRepositoryMock = $this->getMockForAbstractClass(
             \Magento\Customer\Api\CustomerRepositoryInterface::class,
             [],
             '',
             false
         );
-        $this->addressRepositoryMock = $this->getMockForAbstractClass(
+        $this->addressRepositoryMock = $this->getMockForAbstractClass(
             \Magento\Customer\Api\AddressRepositoryInterface::class,
             [],
             '',
             false
         );
-        $this->addressFactoryMock = $this->getMock(
+        $this->addressFactoryMock = $this->getMock(
             \Magento\Customer\Api\Data\AddressInterfaceFactory::class,
             [],
             [],
             '',
             false
         );
-        $this->groupRepositoryMock = $this->getMockForAbstractClass(
+        $this->groupRepositoryMock = $this->getMockForAbstractClass(
             \Magento\Customer\Api\GroupRepositoryInterface::class,
             [],
             '',
             false
         );
-        $this->scopeConfigMock = $this->getMockForAbstractClass(
+        $this->scopeConfigMock = $this->getMockForAbstractClass(
             \Magento\Framework\App\Config\ScopeConfigInterface::class,
             [],
             '',
             false
         );
-        $this->emailSenderMock = $this->getMock(
+        $this->emailSenderMock = $this->getMock(
             \Magento\Sales\Model\AdminOrder\EmailSender::class,
             [],
             [],
             '',
             false
         );
-        $this->accountManagementMock = $this->getMockForAbstractClass(
+        $this->accountManagementMock = $this->getMockForAbstractClass(
             \Magento\Customer\Api\AccountManagementInterface::class,
             [],
             '',
@@ -182,7 +182,7 @@ protected function setUp()
             ->getMock();
 
         $objectManagerHelper = new ObjectManagerHelper($this);
-        $this->adminOrderCreate = $objectManagerHelper->getObject(
+        $this->adminOrderCreate = $objectManagerHelper->getObject(
             \Magento\Sales\Model\AdminOrder\Create::class,
             [
                 'objectManager' => $objectManagerMock,
@@ -219,7 +219,7 @@ public function testSetAccountData()
         $attributeMocks = [];
 
         foreach ($attributes as $attribute) {
-            $attributeMock = $this->getMock(
+            $attributeMock = $this->getMock(
                 \Magento\Customer\Api\Data\AttributeMetadataInterface::class,
                 [],
                 [],
@@ -232,7 +232,7 @@ public function testSetAccountData()
             $attributeMocks[] = $attributeMock;
         }
 
-        $customerGroupMock = $this->getMockForAbstractClass(
+        $customerGroupMock = $this->getMockForAbstractClass(
             \Magento\Customer\Api\Data\GroupInterface::class,
             [],
             '',
@@ -243,9 +243,9 @@ public function testSetAccountData()
         );
         $customerGroupMock->expects($this->once())->method('getTaxClassId')->will($this->returnValue($taxClassId));
         $customerFormMock = $this->getMock(\Magento\Customer\Model\Metadata\Form::class, [], [], '', false);
-        $customerFormMock->expects($this->any())->method('getAttributes')->will($this->returnValue($attributeMocks));
+        $customerFormMock->expects($this->any())->method('getAttributes')->will($this->returnValue([$attributeMocks[1]]));
         $customerFormMock->expects($this->any())->method('extractData')->will($this->returnValue([]));
-        $customerFormMock->expects($this->any())->method('restoreData')->will($this->returnValue([]));
+        $customerFormMock->expects($this->any())->method('restoreData')->will($this->returnValue(['group_id' => 1]));
 
         $customerFormMock->expects($this->any())
             ->method('prepareRequest')
@@ -254,7 +254,7 @@ public function testSetAccountData()
         $customerMock = $this->getMock(\Magento\Customer\Api\Data\CustomerInterface::class, [], [], '', false);
         $this->customerMapper->expects($this->atLeastOnce())
             ->method('toFlatArray')
-            ->willReturn(['email' => '[email protected]', 'group_id' => 1, 'gender' => 1]);
+            ->willReturn(['group_id' => 1]);
 
 
         $quoteMock = $this->getMock(\Magento\Quote\Model\Quote::class, [], [], '', false);
@@ -263,7 +263,6 @@ public function testSetAccountData()
             ->method('addData')
             ->with(
             [
-                'customer_email' => $attributes[0][1],
                 'customer_group_id' => $attributes[1][1],
                 'customer_tax_class_id' => $taxClassId
             ]
@@ -272,7 +271,7 @@ public function testSetAccountData()
             ->method('populateWithArray')
             ->with(
                 $customerMock,
-                ['email' => '[email protected]', 'group_id' => 1, 'gender' => 1], \Magento\Customer\Api\Data\CustomerInterface::class
+                ['group_id' => 1], \Magento\Customer\Api\Data\CustomerInterface::class
             );
 
         $this->formFactoryMock->expects($this->any())->method('create')->will($this->returnValue($customerFormMock));
@@ -283,7 +282,7 @@ public function testSetAccountData()
             ->method('getById')
             ->will($this->returnValue($customerGroupMock));
 
-        $this->adminOrderCreate->setAccountData([]);
+        $this->adminOrderCreate->setAccountData(['group_id' => 1]);
     }
 
     public function testUpdateQuoteItemsNotArray()