Merge remote-tracking branch 'origin/MC-33127' into 2.3-develop-pr44

Author: serhii-balko

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

@@ -6,7 +6,9 @@
 
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
+use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
@@ -39,6 +41,13 @@ class Account extends AbstractForm
      */
     protected $_extensibleDataObjectConverter;
 
+    /**
+     * Group Management
+     *
+     * @var GroupManagementInterface
+     */
+    private $groupManagement;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Model\Session\Quote $sessionQuote
@@ -50,6 +59,7 @@ class Account extends AbstractForm
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param ExtensibleDataObjectConverter $extensibleDataObjectConverter
      * @param array $data
+     * @param GroupManagementInterface|null $groupManagement
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -62,11 +72,13 @@ public function __construct(
         \Magento\Customer\Model\Metadata\FormFactory $metadataFormFactory,
         \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
         \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter,
-        array $data = []
+        array $data = [],
+        ?GroupManagementInterface $groupManagement = null
     ) {
         $this->_metadataFormFactory = $metadataFormFactory;
         $this->customerRepository = $customerRepository;
         $this->_extensibleDataObjectConverter = $extensibleDataObjectConverter;
+        $this->groupManagement = $groupManagement ?: ObjectManager::getInstance()->get(GroupManagementInterface::class);
         parent::__construct(
             $context,
             $sessionQuote,
@@ -163,6 +175,7 @@ public function getFormValues()
     {
         try {
             $customer = $this->customerRepository->getById($this->getCustomerId());
+            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
         } catch (\Exception $e) {
             /** If customer does not exist do nothing. */
         }
@@ -179,6 +192,10 @@ public function getFormValues()
             }
         }
 
+        if (array_key_exists('group_id', $data) && empty($data['group_id'])) {
+            $data['group_id'] = $this->groupManagement->getDefaultGroup($this->getQuote()->getStoreId())->getId();
+        }
+
         if ($this->getQuote()->getCustomerEmail()) {
             $data['email'] = $this->getQuote()->getCustomerEmail();
         }

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

@@ -1368,7 +1368,7 @@ protected function _setQuoteAddress(\Magento\Quote\Model\Quote\Address $address,
         $data = isset($data['region']) && is_array($data['region']) ? array_merge($data, $data['region']) : $data;
 
         $addressForm = $this->_metadataFormFactory->create(
-            
+
             AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
             'adminhtml_customer_address',
             $data,
@@ -1644,6 +1644,7 @@ public function setAccountData($accountData)
             $data,
             \Magento\Customer\Api\Data\CustomerInterface::class
         );
+        $customer->setStoreId($this->getQuote()->getStoreId());
         $this->getQuote()->updateCustomerData($customer);
         $data = [];
 

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

@@ -30,13 +30,14 @@
 use Magento\Sales\Model\Order\Item as OrderItem;
 use Magento\Sales\Model\ResourceModel\Order\Item\Collection as ItemCollection;
 use Magento\Store\Api\Data\StoreInterface;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
-class CreateTest extends \PHPUnit\Framework\TestCase
+class CreateTest extends TestCase
 {
     const CUSTOMER_ID = 1;
 
@@ -46,12 +47,12 @@ class CreateTest extends \PHPUnit\Framework\TestCase
     private $adminOrderCreate;
 
     /**
-     * @var CartRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CartRepositoryInterface|MockObject
      */
     private $quoteRepository;
 
     /**
-     * @var QuoteFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var QuoteFactory|MockObject
      */
     private $quoteFactory;
 
@@ -111,7 +112,7 @@ protected function setUp()
             ->setMethods(['getForCustomer'])
             ->getMockForAbstractClass();
 
-        $this->sessionQuote = $this->getMockBuilder(\Magento\Backend\Model\Session\Quote::class)
+        $this->sessionQuote = $this->getMockBuilder(SessionQuote::class)
             ->disableOriginalConstructor()
             ->setMethods(
                 [
@@ -227,6 +228,7 @@ public function testSetAccountData()
                 'customer_tax_class_id' => $taxClassId
             ]
         );
+        $quote->method('getStoreId')->willReturn(1);
         $this->dataObjectHelper->method('populateWithArray')
             ->with(
                 $customer,
@@ -245,6 +247,10 @@ public function testSetAccountData()
         $this->groupRepository->method('getById')
             ->willReturn($customerGroup);
 
+        $customer->expects($this->once())
+            ->method('setStoreId')
+            ->with(1);
+
         $this->adminOrderCreate->setAccountData(['group_id' => 1]);
     }
 

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

@@ -10,24 +10,28 @@
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
 use Magento\Backend\Model\Session\Quote as SessionQuote;
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\AttributeMetadataInterface;
 use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
+use Magento\Customer\Api\Data\CustomerInterface;
 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\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class for test Account
  *
  * @magentoAppArea adminhtml
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class AccountTest extends \PHPUnit\Framework\TestCase
+class AccountTest extends TestCase
 {
     /**
      * @var Account
@@ -81,9 +85,9 @@ public function testGetFormWithCustomer()
         );
 
         $fixtureCustomerId = 1;
-        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
-        $customerRepository = $this->objectManager->get(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-        /** @var \Magento\Customer\Api\Data\CustomerInterface $customer */
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->objectManager->get(CustomerRepositoryInterface::class);
+        /** @var CustomerInterface $customer */
         $customer = $customerRepository->getById($fixtureCustomerId);
         $customer->setGroupId($customerGroup);
         $customerRepository->save($customer);
@@ -125,8 +129,8 @@ public function testGetFormWithCustomer()
      */
     public function testGetFormWithUserDefinedAttribute()
     {
-        /** @var \Magento\Store\Model\StoreManagerInterface  $storeManager */
-        $storeManager = Bootstrap::getObjectManager()->get(\Magento\Store\Model\StoreManagerInterface::class);
+        /** @var StoreManagerInterface  $storeManager */
+        $storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
         $secondStore = $storeManager->getStore('secondstore');
 
         $quoteSession = $this->objectManager->get(SessionQuote::class);
@@ -159,6 +163,46 @@ public function testGetFormWithUserDefinedAttribute()
         );
     }
 
+    /**
+     * Test for get form with default customer group
+     *
+     */
+    public function testGetFormWithDefaultCustomerGroup()
+    {
+        $customerGroup = 0;
+        $quote = $this->objectManager->create(Quote::class);
+        $quote->setCustomerGroupId($customerGroup);
+
+        $this->session = $this->getMockBuilder(SessionQuote::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCustomerId', 'getQuote'])
+            ->getMock();
+        $this->session->method('getQuote')
+            ->willReturn($quote);
+        $this->session->method('getCustomerId')
+            ->willReturn(1);
+
+        $formFactory = $this->getFormFactoryMock();
+        $this->objectManager->addSharedInstance($formFactory, FormFactory::class);
+
+        /** @var LayoutInterface $layout */
+        $layout = $this->objectManager->get(LayoutInterface::class);
+        $accountBlock = $layout->createBlock(
+            Account::class,
+            'address_block' . rand(),
+            ['sessionQuote' => $this->session]
+        );
+
+        $expectedGroupId = 1;
+        $form = $accountBlock->getForm();
+
+        self::assertEquals(
+            $expectedGroupId,
+            $form->getElement('group_id')->getValue(),
+            'The Customer Group specified for the chosen customer should be selected.'
+        );
+    }
+
     /**
      * Creates a mock for Form object.
      *