ACP2E-964: grand_total and base_grand_total have different values, although we have only ONE currency

- moved total without tax calculated back to the js, from where it was transferred long time ago as a part of large improvement, which led to the current issue

Author: veloraven

app/code/Magento/Quote/Model/Cart/CartTotalRepository.php

@@ -32,8 +32,6 @@ class CartTotalRepository implements CartTotalRepositoryInterface
     private $totalsFactory;
 
     /**
-     * Quote repository.
-     *
      * @var \Magento\Quote\Api\CartRepositoryInterface
      */
     private $quoteRepository;
@@ -109,11 +107,7 @@ public function get($cartId): QuoteTotalsInterface
         $items = array_map([$this->itemConverter, 'modelToDataObject'], $quote->getAllVisibleItems());
         $calculatedTotals = $this->totalsConverter->process($addressTotals);
         $quoteTotals->setTotalSegments($calculatedTotals);
-
-        $amount = $quoteTotals->getGrandTotal() - $quoteTotals->getTaxAmount();
-        $amount = $amount > 0 ? $amount : 0;
         $quoteTotals->setCouponCode($this->couponService->get($cartId));
-        $quoteTotals->setGrandTotal($amount);
         $quoteTotals->setItems($items);
         $quoteTotals->setItemsQty($quote->getItemsQty());
         $quoteTotals->setBaseCurrencyCode($quote->getBaseCurrencyCode());

app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalRepositoryTest.php

@@ -231,7 +231,7 @@ public function testGetCartTotal($isVirtual, $getAddressType): void
             ->method('setCouponCode')
             ->with(self::STUB_COUPON)
             ->willReturnSelf();
-        $totalsMock->expects($this->once())
+        $totalsMock->expects($this->never())
             ->method('setGrandTotal')
             ->willReturnSelf();
         $totalsMock->expects($this->once())

app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/grand-total.js

@@ -60,13 +60,20 @@ define([
          * @return {*}
          */
         getGrandTotalExclTax: function () {
-            var total = this.totals();
+            var total = this.totals(),
+                amount;
 
             if (!total) {
                 return 0;
             }
 
-            return this.getFormattedPrice(total['grand_total']);
+            amount = this.getFormattedPrice(total['grand_total'] - total['tax_amount']);
+
+            if (amount < 0) {
+                return 0;
+            }
+
+            return amount;
         },
 
         /**

dev/tests/api-functional/testsuite/Magento/Quote/Api/CartTotalRepositoryTest.php

@@ -6,10 +6,23 @@
  */
 namespace Magento\Quote\Api;
 
+use Magento\Catalog\Model\Indexer\Product\Category\Processor;
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
+use Magento\Checkout\Test\Fixture\SetBillingAddress as SetBillingAddressFixture;
+use Magento\Checkout\Test\Fixture\SetDeliveryMethod as SetDeliveryMethodFixture;
+use Magento\Checkout\Test\Fixture\SetGuestEmail as SetGuestEmailFixture;
+use Magento\Checkout\Test\Fixture\SetPaymentMethod as SetPaymentMethodFixture;
+use Magento\Checkout\Test\Fixture\SetShippingAddress as SetShippingAddressFixture;
+use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Model\Cart\Totals;
 use Magento\Quote\Model\Cart\Totals\Item as ItemTotals;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Quote\Test\Fixture\AddProductToCart as AddProductToCartFixture;
+use Magento\Quote\Test\Fixture\GuestCart as GuestCartFixture;
+use Magento\Tax\Test\Fixture\TaxRule as TaxRule;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 use Magento\Quote\Model\Quote;
@@ -22,6 +35,11 @@ class CartTotalRepositoryTest extends WebapiAbstract
      */
     private $objectManager;
 
+    /**
+     * @var Processor
+     */
+    private $indexer;
+
     /**
      * @var SearchCriteriaBuilder
      */
@@ -41,6 +59,7 @@ protected function setUp(): void
         $this->filterBuilder = $this->objectManager->create(
             \Magento\Framework\Api\FilterBuilder::class
         );
+        $this->fixtures = $this->objectManager->get(DataFixtureStorageManager::class)->getStorage();
     }
 
     /**
@@ -73,6 +92,32 @@ public function testGetTotals()
         $this->assertEquals($data, $actual);
     }
 
+    /**
+     * @magentoConfigFixture default_store tax/defaults/region 43
+     * @magentoConfigFixture default_store tax/defaults/postcode 10036
+     * @magentoConfigFixture default_store shipping/origin/region_id 43
+     * @magentoConfigFixture default_store shipping/origin/postcode 10011
+     */
+    #[
+        DataFixture(TaxRule::class, ['tax_rate_ids' => [2], 'product_tax_class_ids' => [2], 'customer_tax_class_ids' => [3], 'code' => 'TaxRule1'], 'tax_rule'),
+        DataFixture(ProductFixture::class, ['price'=>5], 'product'),
+        DataFixture(GuestCartFixture::class, as: 'cart'),
+        DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart.id$', 'product_id' => '$product.id$']),
+        DataFixture(SetBillingAddressFixture::class, ['cart_id' => '$cart.id$', 'address' => [AddressInterface::KEY_POSTCODE => 10036, AddressInterface::KEY_CITY => 'New York', AddressInterface::KEY_REGION_ID => 43] ]),
+        DataFixture(SetShippingAddressFixture::class, ['cart_id' => '$cart.id$', 'address' => [AddressInterface::KEY_POSTCODE => 10036, AddressInterface::KEY_CITY => 'New York', AddressInterface::KEY_REGION_ID => 43] ]),
+        DataFixture(SetGuestEmailFixture::class, ['cart_id' => '$cart.id$']),
+        DataFixture(SetDeliveryMethodFixture::class, ['cart_id' => '$cart.id$']),
+        DataFixture(SetPaymentMethodFixture::class, ['cart_id' => '$cart.id$']),
+    ]
+    public function testGetGrandTotalsWithIncludedTaxAndSameCurrency()
+    {
+        $cart = $this->fixtures->get('cart');
+        $cartId = $cart->getid();
+        $requestData = ['cartId' => $cartId];
+        $actual = $this->_webApiCall($this->getServiceInfoForTotalsService($cartId), $requestData);
+        $this->assertEquals($actual['base_grand_total'], $actual['grand_total']);
+    }
+
     /**
      */
     public function testGetTotalsWithAbsentQuote()