Merge pull request #910 from magento-tsg/MC-37666

Incorrect Customer TAX Class saved with Quote when VAT Validation used on Guest orders

Author: engcom-Kilo

app/code/Magento/Quote/Model/QuoteManagement.php

@@ -8,6 +8,7 @@
 namespace Magento\Quote\Model;
 
 use Magento\Authorization\Model\UserContextInterface;
+use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Framework\Exception\CouldNotSaveException;
@@ -396,7 +397,8 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
                 }
             }
             $quote->setCustomerIsGuest(true);
-            $quote->setCustomerGroupId(\Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID);
+            $groupId = $quote->getCustomer()->getGroupId() ?: GroupInterface::NOT_LOGGED_IN_ID;
+            $quote->setCustomerGroupId($groupId);
         }
 
         $remoteAddress = $this->remoteAddress->getRemoteAddress();

app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php

@@ -247,6 +247,7 @@ protected function setUp(): void
                     'getPayment',
                     'setCheckoutMethod',
                     'setCustomerIsGuest',
+                    'getCustomer',
                     'getId'
                 ]
             )
@@ -799,6 +800,12 @@ public function testPlaceOrderIfCustomerIsGuest()
         $this->quoteMock->expects($this->once())
             ->method('getCheckoutMethod')
             ->willReturn(Onepage::METHOD_GUEST);
+        $customerMock = $this->getMockBuilder(Customer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->quoteMock->expects($this->once())
+            ->method('getCustomer')
+            ->willReturn($customerMock);
         $this->quoteMock->expects($this->once())->method('setCustomerId')->with(null)->willReturnSelf();
         $this->quoteMock->expects($this->once())->method('setCustomerEmail')->with($email)->willReturnSelf();
 
@@ -866,6 +873,9 @@ public function testPlaceOrderIfCustomerIsGuest()
         $this->assertEquals($orderId, $service->placeOrder($cartId));
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function testPlaceOrder()
     {
         $cartId = 323;

dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php

@@ -10,17 +10,23 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Type;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Vat;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Observer\Frontend\Quote\Address\CollectTotalsObserver;
+use Magento\Quote\Observer\Frontend\Quote\Address\VatValidator;
 use Magento\Sales\Api\OrderManagementInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class for testing QuoteManagement model
@@ -106,6 +112,28 @@ public function testSubmit(): void
         }
     }
 
+    /**
+     * Verify guest customer place order with auto-group assigment.
+     *
+     * @magentoDataFixture Magento/Sales/_files/guest_quote_with_addresses.php
+     *
+     * @magentoConfigFixture default_store customer/create_account/auto_group_assign 1
+     * @magentoConfigFixture default_store customer/create_account/tax_calculation_address_type shipping
+     * @magentoConfigFixture default_store customer/create_account/viv_intra_union_group 2
+     * @magentoConfigFixture default_store customer/create_account/viv_on_each_transaction 1
+     *
+     * @return void
+     */
+    public function testSubmitGuestCustomer(): void
+    {
+        $this->mockVatValidation();
+        $quote = $this->getQuoteByReservedOrderId->execute('guest_quote');
+        $this->cartManagement->placeOrder($quote->getId());
+        $quoteAfterOrderPlaced = $this->getQuoteByReservedOrderId->execute('guest_quote');
+        self::assertEquals(2, $quoteAfterOrderPlaced->getCustomerGroupId());
+        self::assertEquals(3, $quoteAfterOrderPlaced->getCustomerTaxClassId());
+    }
+
     /**
      * Tries to create order with product that has child items and one of them was deleted.
      *
@@ -231,4 +259,33 @@ private function makeProductOutOfStock(string $sku): void
         $stockItem->setIsInStock(false);
         $this->productRepository->save($product);
     }
+
+    /**
+     * Makes customer vat validator 'check vat number' response successful.
+     *
+     * @return void
+     */
+    private function mockVatValidation(): void
+    {
+        $vatMock = $this->getMockBuilder(Vat::class)
+            ->setConstructorArgs(
+                [
+                    'scopeConfig' => $this->objectManager->get(ScopeConfigInterface::class),
+                    'logger' => $this->objectManager->get(LoggerInterface::class),
+                ]
+            )
+            ->onlyMethods(['checkVatNumber'])
+            ->getMock();
+        $gatewayResponse = new DataObject([
+            'is_valid' => true,
+            'request_date' => 'testData',
+            'request_identifier' => 'testRequestIdentifier',
+            'request_success' => true,
+        ]);
+        $vatMock->method('checkVatNumber')->willReturn($gatewayResponse);
+        $this->objectManager->removeSharedInstance(CollectTotalsObserver::class);
+        $this->objectManager->removeSharedInstance(VatValidator::class);
+        $this->objectManager->removeSharedInstance(Vat::class);
+        $this->objectManager->addSharedInstance($vatMock, Vat::class);
+    }
 }

dev/tests/integration/testsuite/Magento/Sales/_files/guest_quote_with_addresses.php

@@ -40,14 +40,14 @@
 $addressData = [
     'telephone' => 3234676,
     'postcode' => 47676,
-    'country_id' => 'US',
+    'country_id' => 'DE',
     'city' => 'CityX',
     'street' => ['Black str, 48'],
     'lastname' => 'Smith',
     'firstname' => 'John',
+    'vat_id' => 12345,
     'address_type' => 'shipping',
     'email' => 'some_email@mail.com',
-    'region_id' => 1,
 ];
 
 $billingAddress = $objectManager->create(
@@ -66,6 +66,7 @@
 $quote->setCustomerIsGuest(true)
     ->setStoreId($store->getId())
     ->setReservedOrderId('guest_quote')
+    ->setCheckoutMethod('guest')
     ->setBillingAddress($billingAddress)
     ->setShippingAddress($shippingAddress)
     ->addProduct($product);