ISSUE-20004: Refactoring minimum order amount including tax value in the calculate

app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml

@@ -22,6 +22,7 @@
         <element name="total" type="text" selector="//*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price']"/>
         <element name="totalAmount" type="text" selector="//*[@id='cart-totals']//tr[@class='grand totals']//td//span[@class='price' and contains(text(), '{{amount}}')]" parameterized="true"/>
         <element name="proceedToCheckout" type="button" selector=".action.primary.checkout span" timeout="30"/>
+        <element name="proceedToCheckoutDisabled" type="button" selector=".action.primary.checkout.disabled" timeout="30"/>
         <element name="discountAmount" type="text" selector="td[data-th='Discount']"/>
         <element name="shippingHeading" type="button" selector="#block-shipping-heading" timeout="10"/>
         <element name="postcode" type="input" selector="input[name='postcode']" timeout="10"/>

app/code/Magento/Checkout/view/frontend/web/js/proceed-to-checkout.js

@@ -6,8 +6,9 @@
 define([
     'jquery',
     'Magento_Customer/js/model/authentication-popup',
-    'Magento_Customer/js/customer-data'
-], function ($, authenticationPopup, customerData) {
+    'Magento_Customer/js/customer-data',
+    'Magento_Checkout/js/model/quote'
+], function ($, authenticationPopup, customerData, quote) {
     'use strict';
 
     return function (config, element) {
@@ -26,5 +27,16 @@ define([
             location.href = config.checkoutUrl;
         });
 
+        quote.totals.subscribe(function (totals) {
+            if (totals['is_minimum_order_amount']) {
+                $(element).prop('disabled', false);
+                $(element).removeClass('disabled');
+
+                return;
+            }
+
+            $(element).prop('disabled', true);
+            $(element).addClass('disabled');
+        });
     };
 });

app/code/Magento/Quote/Api/Data/TotalsInterface.php

@@ -69,6 +69,8 @@ interface TotalsInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 
     const KEY_ITEMS_QTY = 'items_qty';
 
+    const KEY_IS_MINIMUM_ORDER_AMOUNT = 'is_minimum_order_amount';
+
     /**#@-*/
 
     /**
@@ -476,6 +478,17 @@ public function getTotalSegments();
      */
     public function setTotalSegments($totals = []);
 
+    /**
+     * @return bool
+     */
+    public function getIsMinimumOrderAmount();
+
+    /**
+     * @param bool $isMinimumAmount
+     * @return mixed
+     */
+    public function setIsMinimumOrderAmount(bool $isMinimumAmount);
+
     /**
      * Retrieve existing extension attributes object or create a new one.
      *

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

@@ -117,6 +117,8 @@ public function get($cartId): QuoteTotalsInterface
         $quoteTotals->setItemsQty($quote->getItemsQty());
         $quoteTotals->setBaseCurrencyCode($quote->getBaseCurrencyCode());
         $quoteTotals->setQuoteCurrencyCode($quote->getQuoteCurrencyCode());
+        $isMinimumOrderAmount = $quote->validateMinimumAmount();
+        $quoteTotals->setIsMinimumOrderAmount($isMinimumOrderAmount);
         return $quoteTotals;
     }
 }

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

@@ -573,6 +573,22 @@ public function setTotalSegments($totals = [])
         return $this->setData(self::KEY_TOTAL_SEGMENTS, $totals);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getIsMinimumOrderAmount()
+    {
+        return $this->getData(self::KEY_IS_MINIMUM_ORDER_AMOUNT);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setIsMinimumOrderAmount(bool $isMinimumAmount)
+    {
+        return $this->setData(self::KEY_IS_MINIMUM_ORDER_AMOUNT, $isMinimumAmount);
+    }
+
     /**
      * {@inheritdoc}
      *

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

@@ -2298,6 +2298,8 @@ public function validateMinimumAmount($multishipping = false)
             $storeId
         );
 
+        $this->collectTotals()->save();
+
         $addresses = $this->getAllAddresses();
 
         if (!$multishipping) {

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

@@ -108,7 +108,8 @@ protected function setUp(): void
                     'getBillingAddress',
                     'getAllVisibleItems',
                     'getItemsQty',
-                    'collectTotals'
+                    'collectTotals',
+                    'validateMinimumAmount'
                 ]
             )
             ->disableOriginalConstructor()
@@ -138,6 +139,11 @@ protected function setUp(): void
             TotalsConverter::class
         );
 
+        $this->totalsConverterMock = $this->createMock(
+            TotalsConverter::class
+        );
+
+
         $this->model = new CartTotalRepository(
             $this->totalsFactoryMock,
             $this->quoteRepositoryMock,
@@ -247,6 +253,10 @@ public function testGetCartTotal($isVirtual, $getAddressType): void
             ->with(self::STUB_CURRENCY_CODE)
             ->willReturnSelf();
 
+        $this->quoteMock->expects($this->once())
+            ->method('validateMinimumAmount')
+            ->willReturn(true);
+
         $this->assertEquals($totalsMock, $this->model->get(self::STUB_CART_ID));
     }
 

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

@@ -40,6 +40,7 @@
 use Magento\Quote\Model\Quote\AddressFactory;
 use Magento\Quote\Model\Quote\Item;
 use Magento\Quote\Model\Quote\Item\Processor;
+use Magento\Quote\Model\Quote\TotalsCollector;
 use Magento\Quote\Model\Quote\Payment;
 use Magento\Quote\Model\Quote\PaymentFactory;
 use Magento\Quote\Model\ResourceModel\Quote\Address\Collection;
@@ -190,6 +191,11 @@ class QuoteTest extends TestCase
      */
     private $orderIncrementIdChecker;
 
+    /**
+     * @var TotalsCollector|MockObject
+     */
+    private $totalsCollector;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -311,6 +317,17 @@ protected function setUp(): void
             CustomerInterfaceFactory::class,
             ['create']
         );
+
+        /*$this->totalCollector = $this->createPartialMock(
+            TotalsCollector::class,
+            ['collect']
+        );*/
+        $this->totalsCollector = $this->getMockBuilder(TotalsCollector::class)
+                ->onlyMethods(['collect'])
+                ->disableOriginalConstructor()
+                ->getMock();
+
+
         $this->orderIncrementIdChecker = $this->createMock(OrderIncrementIdChecker::class);
         $this->quote = (new ObjectManager($this))
             ->getObject(
@@ -337,6 +354,7 @@ protected function setUp(): void
                     'customerDataFactory' => $this->customerDataFactoryMock,
                     'itemProcessor' => $this->itemProcessor,
                     'orderIncrementIdChecker' => $this->orderIncrementIdChecker,
+                    'totalsCollector' => $this->totalsCollector,
                     'data' => [
                         'reserved_order_id' => 1000001,
                     ],
@@ -1083,6 +1101,19 @@ public function testValidateMinimumAmount()
             ->method('setQuoteFilter')
             ->willReturn([$this->quoteAddressMock]);
 
+        $totalsMock = $this->getMockBuilder(DataObject::class)
+            ->onlyMethods(['getData'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $totalsMock->expects($this->once())
+            ->method('getData')
+            ->willReturn([]);
+
+        $this->totalsCollector->expects($this->once())
+            ->method('collect')
+            ->willReturn($totalsMock);
+
         $this->assertTrue($this->quote->validateMinimumAmount());
     }
 
@@ -1110,6 +1141,19 @@ public function testValidateMinimumAmountNegative()
             ->method('setQuoteFilter')
             ->willReturn([$this->quoteAddressMock]);
 
+        $totalsMock = $this->getMockBuilder(DataObject::class)
+            ->onlyMethods(['getData'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $totalsMock->expects($this->once())
+            ->method('getData')
+            ->willReturn([]);
+
+        $this->totalsCollector->expects($this->once())
+            ->method('collect')
+            ->willReturn($totalsMock);
+
         $this->assertFalse($this->quote->validateMinimumAmount());
     }
 

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

@@ -241,6 +241,7 @@ private function getData(Quote $quote, Address $shippingAddress) : array
             Totals::KEY_QUOTE_CURRENCY_CODE => $quote->getQuoteCurrencyCode(),
             Totals::KEY_ITEMS_QTY => $quote->getItemsQty(),
             Totals::KEY_ITEMS => [$this->getQuoteItemTotalsData($quote)],
+            Totals::KEY_IS_MINIMUM_ORDER_AMOUNT => $quote->validateMinimumAmount()
         ];
     }
 }

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

@@ -87,6 +87,7 @@ public function testGetTotals()
             Totals::KEY_QUOTE_CURRENCY_CODE => $quote->getQuoteCurrencyCode(),
             Totals::KEY_ITEMS_QTY => $quote->getItemsQty(),
             Totals::KEY_ITEMS => [$this->getQuoteItemTotalsData($quote)],
+            Totals::KEY_IS_MINIMUM_ORDER_AMOUNT => $quote->validateMinimumAmount()
         ];
 
         $requestData = ['cartId' => $cartId];