Merge remote-tracking branch 'origin/MC-29579' into 2.4-develop-pr11

serhii-balko · serhii-balko · commit 61482bdf5b06 · 2020-02-04T09:45:19.000+02:00
diff --git a/app/code/Magento/Customer/etc/fieldset.xml b/app/code/Magento/Customer/etc/fieldset.xml
@@ -57,23 +57,6 @@
                 <aspect name="update" />
             </field>
         </fieldset>
-        <fieldset id="customer_address">
-            <field name="vat_id">
-                <aspect name="to_quote_address" />
-            </field>
-            <field name="vat_is_valid">
-                <aspect name="to_quote_address" />
-            </field>
-            <field name="vat_request_id">
-                <aspect name="to_quote_address" />
-            </field>
-            <field name="vat_request_date">
-                <aspect name="to_quote_address" />
-            </field>
-            <field name="vat_request_success">
-                <aspect name="to_quote_address" />
-            </field>
-        </fieldset>
         <fieldset id="sales_convert_order_address">
             <field name="vat_id">
                 <aspect name="to_quote_address" />
diff --git a/app/code/Magento/Quote/Model/ShippingMethodManagement.php b/app/code/Magento/Quote/Model/ShippingMethodManagement.php
@@ -7,6 +7,7 @@
 namespace Magento\Quote\Model;
 
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
@@ -22,6 +23,7 @@
  * Shipping method read service
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class ShippingMethodManagement implements
     \Magento\Quote\Api\ShippingMethodManagementInterface,
@@ -69,6 +71,11 @@ class ShippingMethodManagement implements
      */
     private $quoteAddressResource;
 
+    /**
+     * @var CustomerSession
+     */
+    private $customerSession;
+
     /**
      * Constructor
      *
@@ -78,14 +85,16 @@ class ShippingMethodManagement implements
      * @param Quote\TotalsCollector $totalsCollector
      * @param AddressInterfaceFactory|null $addressFactory
      * @param QuoteAddressResource|null $quoteAddressResource
+     * @param CustomerSession|null $customerSession
      */
     public function __construct(
         \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
         Cart\ShippingMethodConverter $converter,
         \Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
         \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector,
         AddressInterfaceFactory $addressFactory = null,
-        QuoteAddressResource $quoteAddressResource = null
+        QuoteAddressResource $quoteAddressResource = null,
+        CustomerSession $customerSession = null
     ) {
         $this->quoteRepository = $quoteRepository;
         $this->converter = $converter;
@@ -95,10 +104,11 @@ public function __construct(
             ->get(AddressInterfaceFactory::class);
         $this->quoteAddressResource = $quoteAddressResource ?: ObjectManager::getInstance()
             ->get(QuoteAddressResource::class);
+        $this->customerSession = $customerSession ?? ObjectManager::getInstance()->get(CustomerSession::class);
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function get($cartId)
     {
@@ -126,7 +136,7 @@ public function get($cartId)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function getList($cartId)
     {
@@ -155,7 +165,7 @@ public function getList($cartId)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function set($cartId, $carrierCode, $methodCode)
     {
@@ -176,6 +186,8 @@ public function set($cartId, $carrierCode, $methodCode)
     }
 
     /**
+     * Apply carrier code.
+     *
      * @param int $cartId The shopping cart ID.
      * @param string $carrierCode The carrier code.
      * @param string $methodCode The shipping method code.
@@ -209,7 +221,7 @@ public function apply($cartId, $carrierCode, $methodCode)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function estimateByAddress($cartId, \Magento\Quote\Api\Data\EstimateAddressInterface $address)
     {
@@ -240,7 +252,7 @@ public function estimateByExtendedAddress($cartId, AddressInterface $address)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function estimateByAddressId($cartId, $addressId)
     {
@@ -266,6 +278,7 @@ public function estimateByAddressId($cartId, $addressId)
      * @param string $region
      * @param \Magento\Framework\Api\ExtensibleDataInterface|null $address
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods.
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @deprecated 100.2.0
      */
     protected function getEstimatedRates(
@@ -277,11 +290,10 @@ protected function getEstimatedRates(
         $address = null
     ) {
         if (!$address) {
-            $address = $this->getAddressFactory()->create()
+            $address = $this->addressFactory->create()
                 ->setCountryId($country)
                 ->setPostcode($postcode)
-                ->setRegionId($regionId)
-                ->setRegion($region);
+                ->setRegionId($regionId);
         }
         return $this->getShippingMethods($quote, $address);
     }
@@ -301,12 +313,21 @@ private function getShippingMethods(Quote $quote, $address)
         $shippingAddress->setCollectShippingRates(true);
 
         $this->totalsCollector->collectAddressTotals($quote, $shippingAddress);
+        $quoteCustomerGroupId = $quote->getCustomerGroupId();
+        $customerGroupId = $this->customerSession->getCustomerGroupId();
+        $isCustomerGroupChanged = $quoteCustomerGroupId !== $customerGroupId;
+        if ($isCustomerGroupChanged) {
+            $quote->setCustomerGroupId($customerGroupId);
+        }
         $shippingRates = $shippingAddress->getGroupedAllShippingRates();
         foreach ($shippingRates as $carrierRates) {
             foreach ($carrierRates as $rate) {
                 $output[] = $this->converter->modelToDataObject($rate, $quote->getQuoteCurrencyCode());
             }
         }
+        if ($isCustomerGroupChanged) {
+            $quote->setCustomerGroupId($quoteCustomerGroupId);
+        }
         return $output;
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_group_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_group_rollback.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Customer\Api\Data\GroupInterface;
+
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+$groupRepository = $objectManager->get(GroupRepositoryInterface::class);
+/** @var SearchCriteriaBuilder $searchBuilder */
+$searchBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchBuilder->addFilter(GroupInterface::CODE, 'custom_group')
+    ->create();
+$groups = $groupRepository->getList($searchCriteria)
+    ->getItems();
+foreach ($groups as $group) {
+    try {
+        $groupRepository->delete($group);
+    } catch (NoSuchEntityException $exception) {
+        //Group already removed
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php
@@ -6,13 +6,52 @@
 
 namespace Magento\Quote\Model;
 
+use Magento\Customer\Model\Vat;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Tax\Model\Config as TaxConfig;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Customer\Api\Data\GroupInterface;
+use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Tax\Model\ClassModel;
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Quote\Api\ShippingMethodManagementInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Tax\Api\TaxClassRepositoryInterface;
+use Magento\Tax\Api\Data\TaxClassInterface;
+
 /**
- * Class ShippingMethodManagementTest
+ * Test for shipping methods management
  *
  * @magentoDbIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ShippingMethodManagementTest extends \PHPUnit\Framework\TestCase
 {
+    /** @var ObjectManagerInterface $objectManager */
+    private $objectManager;
+
+    /** @var GroupRepositoryInterface $groupRepository */
+    private $groupRepository;
+
+    /** @var TaxClassRepositoryInterface $taxClassRepository */
+    private $taxClassRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->groupRepository = $this->objectManager->get(GroupRepositoryInterface::class);
+        $this->taxClassRepository = $this->objectManager->get(TaxClassRepositoryInterface::class);
+    }
+
     /**
      * @magentoDataFixture Magento/SalesRule/_files/cart_rule_100_percent_off.php
      * @magentoDataFixture Magento/Sales/_files/quote_with_customer.php
@@ -173,4 +212,130 @@ private function executeTestFlow($flatRateAmount, $tableRateAmount)
             $this->assertEquals($expectedResult[$rate->getCarrierCode()]['method_code'], $rate->getMethodCode());
         }
     }
+
+    /**
+     * Test for estimate shipping with tax and changed VAT customer group
+     *
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Tax/_files/tax_classes_de.php
+     * @magentoDataFixture Magento/Sales/_files/quote_with_customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_group.php
+     * @magentoDataFixture Magento/Customer/_files/customer_address.php
+     * @magentoConfigFixture current_store customer/create_account/tax_calculation_address_type shipping
+     * @magentoConfigFixture current_store customer/create_account/default_group 1
+     * @magentoConfigFixture current_store customer/create_account/auto_group_assign 1
+     * @magentoConfigFixture current_store tax/calculation/price_includes_tax 1
+     * @magentoConfigFixture current_store tax/calculation/shipping_includes_tax 1
+     */
+    public function testEstimateByAddressWithInclExclTaxAndVATGroup()
+    {
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->objectManager->get(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get('customer@example.com');
+
+        /** @var GroupInterface $customerGroup */
+        $customerGroup = $this->findCustomerGroupByCode('custom_group');
+        $customerGroup->setTaxClassId($this->getTaxClass('CustomerTaxClass')->getClassId());
+        $this->groupRepository->save($customerGroup);
+
+        $customer->setGroupId($customerGroup->getId());
+        $customer->setTaxvat('12');
+        $customerRepository->save($customer);
+        $this->setConfig($customerGroup->getId(), $this->getTaxClass('ProductTaxClass')->getClassId());
+        $this->changeCustomerAddress($customer->getDefaultShipping());
+
+        $quote = $this->objectManager->get(GetQuoteByReservedOrderId::class)->execute('test01');
+
+        /** @var ShippingMethodManagementInterface $shippingEstimation */
+        $shippingEstimation = $this->objectManager->get(ShippingMethodManagementInterface::class);
+        $result = $shippingEstimation->estimateByAddressId($quote->getId(), $customer->getDefaultShipping());
+
+        $this->assertEquals(6.05, $result[0]->getPriceInclTax());
+        $this->assertEquals(5.0, $result[0]->getPriceExclTax());
+    }
+
+    /**
+     * Find the group with a given code.
+     *
+     * @param string $code
+     *
+     * @return GroupInterface
+     */
+    protected function findCustomerGroupByCode(string $code): ?GroupInterface
+    {
+        /** @var SearchCriteriaBuilder $searchBuilder */
+        $searchBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchBuilder->addFilter('code', $code)
+            ->create();
+        $groups = $this->groupRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_shift($groups);
+    }
+
+    /**
+     * Change customer address
+     *
+     * @param int $customerAddressId
+     *
+     * @return AddressInterface
+     */
+    private function changeCustomerAddress(int $customerAddressId): AddressInterface
+    {
+        $addressRepository = $this->objectManager->get(AddressRepositoryInterface::class);
+        $address = $addressRepository->getById($customerAddressId);
+        $address->setVatId(12345);
+        $address->setCountryId('DE');
+        $address->setRegionId(0);
+        $address->setPostcode(10178);
+
+        return $addressRepository->save($address);
+    }
+
+    /**
+     * Get tax class.
+     *
+     * @param string $name
+     *
+     * @return TaxClassInterface
+     */
+    private function getTaxClass(string $name): ?TaxClassInterface
+    {
+        /** @var SearchCriteriaBuilder $searchBuilder */
+        $searchBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchBuilder->addFilter(ClassModel::KEY_NAME, $name)
+            ->create();
+        $searchResults = $this->taxClassRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_shift($searchResults);
+    }
+
+    /**
+     * Set the configuration.
+     *
+     * @param int $customerGroupId
+     * @param int $productTaxClassId
+     *
+     * @return void
+     */
+    private function setConfig(int $customerGroupId, int $productTaxClassId): void
+    {
+        $configData = [
+            [
+                'path' => Vat::XML_PATH_CUSTOMER_VIV_INVALID_GROUP,
+                'value' => $customerGroupId,
+                'scope' => ScopeInterface::SCOPE_STORE,
+            ],
+            [
+                'path' => TaxConfig::CONFIG_XML_PATH_SHIPPING_TAX_CLASS,
+                'value' => $productTaxClassId,
+                'scope' => ScopeInterface::SCOPE_STORE,
+            ],
+        ];
+        $config = $this->objectManager->get(MutableScopeConfigInterface::class);
+        foreach ($configData as $data) {
+            $config->setValue($data['path'], $data['value'], $data['scope']);
+        }
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_classes_de.php b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_classes_de.php
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_classes_de_rollback.php b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_classes_de_rollback.php
