Merge remote-tracking branch 'mpi/MC-38915' into PR17november

Author: Oleksandr Dubovyk

app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php

@@ -141,7 +141,8 @@ public function execute(Observer $observer)
             if ($customerAddress->getVatId() == ''
                 || !$this->_customerVat->isCountryInEU($customerAddress->getCountry())
             ) {
-                $defaultGroupId = $this->_groupManagement->getDefaultGroup($customer->getStore())->getId();
+                $defaultGroupId = $customer->getGroupId() ? $customer->getGroupId() :
+                    $this->_groupManagement->getDefaultGroup($customer->getStore())->getId();
                 if (!$customer->getDisableAutoGroupChange() && $customer->getGroupId() != $defaultGroupId) {
                     $customer->setGroupId($defaultGroupId);
                     $customer->save();
@@ -216,8 +217,8 @@ protected function _canProcessAddress($address)
     protected function _isDefaultBilling($address)
     {
         return $address->getId() && $address->getId() == $address->getCustomer()->getDefaultBilling()
-        || $address->getIsPrimaryBilling()
-        || $address->getIsDefaultBilling();
+            || $address->getIsPrimaryBilling()
+            || $address->getIsDefaultBilling();
     }
 
     /**
@@ -229,8 +230,8 @@ protected function _isDefaultBilling($address)
     protected function _isDefaultShipping($address)
     {
         return $address->getId() && $address->getId() == $address->getCustomer()->getDefaultShipping()
-        || $address->getIsPrimaryShipping()
-        || $address->getIsDefaultShipping();
+            || $address->getIsPrimaryShipping()
+            || $address->getIsDefaultShipping();
     }
 
     /**

app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php

@@ -341,7 +341,7 @@ public function testAfterAddressSaveDefaultGroup(
         $customer->expects($this->once())
             ->method('getDisableAutoGroupChange')
             ->willReturn(false);
-        $customer->expects($this->once())
+        $customer->expects($this->exactly(2))
             ->method('getGroupId')
             ->willReturn(null);
         $customer->expects($this->once())

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

@@ -6,11 +6,24 @@
 
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
+use Magento\Backend\Block\Template\Context;
+use Magento\Backend\Model\Session\Quote;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Customer\Model\Metadata\Form;
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\FormFactory;
+use Magento\Customer\Model\Metadata\FormFactory as MetadataFormFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Phrase;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\Sales\Model\AdminOrder\Create;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Create order account form
@@ -25,46 +38,48 @@ class Account extends AbstractForm
     /**
      * Metadata form factory
      *
-     * @var \Magento\Customer\Model\Metadata\FormFactory
+     * @var MetadataFormFactory
      */
     protected $_metadataFormFactory;
 
     /**
      * Customer repository
      *
-     * @var \Magento\Customer\Api\CustomerRepositoryInterface
+     * @var CustomerRepositoryInterface
      */
     protected $customerRepository;
 
     /**
-     * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
+     * @var ExtensibleDataObjectConverter
      */
     protected $_extensibleDataObjectConverter;
+
     private const XML_PATH_EMAIL_REQUIRED_CREATE_ORDER = 'customer/create_account/email_required_create_order';
+
     /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Backend\Model\Session\Quote $sessionQuote
-     * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
+     * @param Context $context
+     * @param Quote $sessionQuote
+     * @param Create $orderCreate
      * @param PriceCurrencyInterface $priceCurrency
-     * @param \Magento\Framework\Data\FormFactory $formFactory
-     * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
-     * @param \Magento\Customer\Model\Metadata\FormFactory $metadataFormFactory
-     * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
+     * @param FormFactory $formFactory
+     * @param DataObjectProcessor $dataObjectProcessor
+     * @param MetadataFormFactory $metadataFormFactory
+     * @param CustomerRepositoryInterface $customerRepository
      * @param ExtensibleDataObjectConverter $extensibleDataObjectConverter
      * @param array $data
      * @param GroupManagementInterface|null $groupManagement
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Backend\Model\Session\Quote $sessionQuote,
-        \Magento\Sales\Model\AdminOrder\Create $orderCreate,
+        Context $context,
+        Quote $sessionQuote,
+        Create $orderCreate,
         PriceCurrencyInterface $priceCurrency,
-        \Magento\Framework\Data\FormFactory $formFactory,
-        \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor,
-        \Magento\Customer\Model\Metadata\FormFactory $metadataFormFactory,
-        \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
-        \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter,
+        FormFactory $formFactory,
+        DataObjectProcessor $dataObjectProcessor,
+        MetadataFormFactory $metadataFormFactory,
+        CustomerRepositoryInterface $customerRepository,
+        ExtensibleDataObjectConverter $extensibleDataObjectConverter,
         array $data = [],
         ?GroupManagementInterface $groupManagement = null
     ) {
@@ -103,7 +118,7 @@ public function getHeaderCssClass()
     /**
      * Return header text
      *
-     * @return \Magento\Framework\Phrase
+     * @return Phrase
      */
     public function getHeaderText()
     {
@@ -114,10 +129,12 @@ public function getHeaderText()
      * Prepare Form and add elements to form
      *
      * @return $this
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     protected function _prepareForm()
     {
-        /** @var \Magento\Customer\Model\Metadata\Form $customerForm */
+        /** @var Form $customerForm */
         $customerForm = $this->_metadataFormFactory->create('customer', 'adminhtml_checkout');
 
         // prepare customer attributes to show
@@ -170,6 +187,8 @@ protected function _addAdditionalFormElementData(AbstractElement $element)
      * Return Form Elements values
      *
      * @return array
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function getFormValues()
     {
@@ -183,7 +202,7 @@ public function getFormValues()
             ? $this->_extensibleDataObjectConverter->toFlatArray(
                 $customer,
                 [],
-                \Magento\Customer\Api\Data\CustomerInterface::class
+                CustomerInterface::class
             )
             : [];
         foreach ($this->getQuote()->getData() as $key => $value) {
@@ -193,7 +212,7 @@ public function getFormValues()
         }
 
         if (array_key_exists('group_id', $data) && empty($data['group_id'])) {
-            $data['group_id'] = $this->groupManagement->getDefaultGroup($this->getQuote()->getStoreId())->getId();
+            $data['group_id'] = $this->getSelectedGroupId();
         }
 
         if ($this->getQuote()->getCustomerEmail()) {
@@ -208,6 +227,8 @@ public function getFormValues()
      *
      * @param array $attributes
      * @return array
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     private function extractValuesFromAttributes(array $attributes): array
     {
@@ -231,7 +252,24 @@ private function isEmailRequiredToCreateOrder()
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_EMAIL_REQUIRED_CREATE_ORDER,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
     }
+
+    /**
+     * Retrieve selected group id
+     *
+     * @return string
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    private function getSelectedGroupId(): string
+    {
+        $selectedGroupId = $this->groupManagement->getDefaultGroup($this->getQuote()->getStoreId())->getId();
+        $orderDetails = $this->getRequest()->getParam('order');
+        if (!empty($orderDetails) && !empty($orderDetails['account']['group_id'])) {
+            $selectedGroupId = $orderDetails['account']['group_id'];
+        }
+        return $selectedGroupId;
+    }
 }

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

@@ -9,6 +9,7 @@
 
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
+use Magento\Backend\Block\Template\Context;
 use Magento\Backend\Model\Session\Quote as SessionQuote;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\AttributeMetadataInterface;
@@ -17,6 +18,7 @@
 use Magento\Customer\Model\Data\Option;
 use Magento\Customer\Model\Metadata\Form;
 use Magento\Customer\Model\Metadata\FormFactory;
+use Magento\Framework\App\RequestInterface as Request;
 use Magento\Framework\View\LayoutInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Store\Model\StoreManagerInterface;
@@ -107,7 +109,7 @@ public function testGetFormWithCustomer()
             );
         }
 
-        self::assertRegExp(
+        self::assertMatchesRegularExpression(
             '/<option value="'.$customerGroup.'".*?selected="selected"\>Wholesale\<\/option\>/is',
             $content,
             'The Customer Group specified for the chosen customer should be selected.'
@@ -150,13 +152,13 @@ public function testGetFormWithUserDefinedAttribute()
         $form->setUseContainer(true);
         $content = $form->toHtml();
 
-        self::assertRegExp(
+        self::assertMatchesRegularExpression(
             '/\<option value="1".*?selected="selected"\>Yes\<\/option\>/is',
             $content,
             'Default value for user defined custom attribute should be selected.'
         );
 
-        self::assertRegExp(
+        self::assertMatchesRegularExpression(
             '/<option value="3".*?selected="selected"\>Retailer\<\/option\>/is',
             $content,
             'The Customer Group specified for the chosen store should be selected.'
@@ -203,6 +205,135 @@ public function testGetFormWithDefaultCustomerGroup()
         );
     }
 
+    /**
+     * Test for get form with customer group based on vat id validation
+     *
+     * @dataProvider getDataForVatValidatedCustomer
+     * @param int $defaultCustomerGroupId
+     * @param int $vatValidatedCustomerGroupId
+     * @param array $customerDetails
+     * @param array $orderDetails
+     * @return void
+     */
+    public function testGetFormWithVatValidatedCustomerGroup(
+        int $defaultCustomerGroupId,
+        int $vatValidatedCustomerGroupId,
+        array $customerDetails,
+        array $orderDetails
+    ): void {
+        $contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->getMock();
+        $requestMock = $this->getMockBuilder(Request::class)
+            ->getMockForAbstractClass();
+        $contextMock->expects($this->once())
+            ->method('getRequest')
+            ->willReturn($requestMock);
+        $requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturn($orderDetails);
+
+        $quote = $this->objectManager->create(Quote::class);
+        $quote->setCustomerGroupId($defaultCustomerGroupId);
+        $quote->setData($customerDetails);
+
+        $this->session = $this->getMockBuilder(SessionQuote::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCustomerId', 'getQuote'])
+            ->getMock();
+        $this->session->method('getQuote')
+            ->willReturn($quote);
+        $this->session->method('getCustomerId')
+            ->willReturn($customerDetails['customer_id']);
+
+        $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(),
+            [
+                'context' => $contextMock,
+                'sessionQuote' => $this->session
+            ]
+        );
+
+        $form = $accountBlock->getForm();
+
+        self::assertEquals(
+            $vatValidatedCustomerGroupId,
+            $form->getElement('group_id')->getValue(),
+            'The Customer Group specified for the chosen customer should be selected.'
+        );
+    }
+
+    /**
+     * Data provider for vat validated customer group id
+     *
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function getDataForVatValidatedCustomer(): array
+    {
+        return [
+            'Validated customer group id when its set in quote' => [
+                'defaultCustomerGroupId' => 0,
+                'vatValidatedCustomerGroupId' => 3,
+                'customerDetails' => [
+                    'entity_id' => '35',
+                    'store_id' => 1,
+                    'created_at' => '2020-11-09 01:03:35',
+                    'updated_at' => '2020-11-09 05:44:07',
+                    'customer_id' => 1,
+                    'customer_tax_class_id' => '3',
+                    'customer_group_id' => 3,
+                    'customer_email' => 'test@test.com',
+                    'customer_prefix' => null,
+                    'customer_firstname' => null,
+                    'customer_middlename' => null,
+                    'customer_lastname' => null,
+                    'customer_suffix' => null,
+                    'customer_dob' => null,
+                ],
+                'orderDetails' => [
+                    'account' => [
+                        'group_id' => 3,
+                        'email' => 'test@test.com'
+                    ]
+                ]
+            ],
+            'Validated customer group id when its set in request' => [
+                'defaultCustomerGroupId' => 0,
+                'vatValidatedCustomerGroupId' => 3,
+                'customerDetails' => [
+                    'entity_id' => '35',
+                    'store_id' => 1,
+                    'created_at' => '2020-11-09 01:03:35',
+                    'updated_at' => '2020-11-09 05:44:07',
+                    'customer_id' => 1,
+                    'customer_tax_class_id' => '3',
+                    'customer_group_id' => null,
+                    'customer_email' => 'test@test.com',
+                    'customer_prefix' => null,
+                    'customer_firstname' => null,
+                    'customer_middlename' => null,
+                    'customer_lastname' => null,
+                    'customer_suffix' => null,
+                    'customer_dob' => null,
+                ],
+                'orderDetails' => [
+                    'account' => [
+                        'group_id' => 3,
+                        'email' => 'test@test.com'
+                    ]
+                ]
+            ]
+        ];
+    }
+
     /**
      * Creates a mock for Form object.
      *