Merge remote-tracking branch 'owls/MAGETWO-94308-multiship-min-order' into BugFixPR

Author: Joan He

app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php

@@ -876,7 +876,7 @@ private function logExceptions(array $exceptionList)
      */
     public function save()
     {
-        $this->getQuote()->collectTotals();
+        $this->getQuote()->setTotalsCollectedFlag(false)->collectTotals();
         $this->quoteRepository->save($this->getQuote());
         return $this;
     }
@@ -899,13 +899,23 @@ public function reset()
      */
     public function validateMinimumAmount()
     {
-        return !($this->_scopeConfig->isSetFlag(
+        $minimumOrderActive = $this->_scopeConfig->isSetFlag(
             'sales/minimum_order/active',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) && $this->_scopeConfig->isSetFlag(
+        );
+
+        $minimumOrderMultiFlag = $this->_scopeConfig->isSetFlag(
             'sales/minimum_order/multi_address',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) && !$this->getQuote()->validateMinimumAmount());
+        );
+
+        if ($minimumOrderMultiFlag) {
+            $result = !($minimumOrderActive && !$this->getQuote()->validateMinimumAmount());
+        } else {
+            $result = !($minimumOrderActive && !$this->validateMinimumAmountForAddressItems());
+        }
+
+        return $result;
     }
 
     /**
@@ -1123,6 +1133,44 @@ private function getShippingAssignmentProcessor()
         return $this->shippingAssignmentProcessor;
     }
 
+    /**
+     * Validate minimum amount for "Checkout with Multiple Addresses" when
+     * "Validate Each Address Separately in Multi-address Checkout" is No.
+     *
+     * @return bool
+     */
+    private function validateMinimumAmountForAddressItems()
+    {
+        $result = true;
+        $storeId = $this->getQuote()->getStoreId();
+
+        $minAmount = $this->_scopeConfig->getValue(
+            'sales/minimum_order/amount',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+        $taxInclude = $this->_scopeConfig->getValue(
+            'sales/minimum_order/tax_including',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+
+        $this->getQuote()->collectTotals();
+        $addresses = $this->getQuote()->getAllAddresses();
+
+        $baseTotal = 0;
+        foreach ($addresses as $address) {
+            $taxes = $taxInclude ? $address->getBaseTaxAmount() : 0;
+            $baseTotal += $address->getBaseSubtotalWithDiscount() + $taxes;
+        }
+
+        if ($baseTotal < $minAmount) {
+            $result = false;
+        }
+
+        return $result;
+    }
+
     /**
      * Remove successfully placed items from quote.
      *

app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php

@@ -167,13 +167,18 @@ class MultishippingTest extends \PHPUnit\Framework\TestCase
      */
     private $sessionMock;
 
+    /**
+     * @var PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeConfigMock;
+
     protected function setUp()
     {
         $this->checkoutSessionMock = $this->createSimpleMock(Session::class);
         $this->customerSessionMock = $this->createSimpleMock(CustomerSession::class);
         $this->orderFactoryMock = $this->createSimpleMock(OrderFactory::class);
         $eventManagerMock = $this->createSimpleMock(ManagerInterface::class);
-        $scopeConfigMock = $this->createSimpleMock(ScopeConfigInterface::class);
+        $this->scopeConfigMock = $this->createSimpleMock(ScopeConfigInterface::class);
         $this->sessionMock = $this->createSimpleMock(Generic::class);
         $addressFactoryMock = $this->createSimpleMock(AddressFactory::class);
         $this->toOrderMock = $this->createSimpleMock(ToOrder::class);
@@ -224,7 +229,7 @@ protected function setUp()
             $this->orderFactoryMock,
             $this->addressRepositoryMock,
             $eventManagerMock,
-            $scopeConfigMock,
+            $this->scopeConfigMock,
             $this->sessionMock,
             $addressFactoryMock,
             $this->toOrderMock,
@@ -277,6 +282,10 @@ public function testSetShippingItemsInformation()
             ->willReturn(null);
 
         $this->quoteMock->expects($this->atLeastOnce())->method('getAllItems')->willReturn([]);
+        $this->quoteMock->expects($this->once())
+            ->method('__call')
+            ->with('setTotalsCollectedFlag', [false])
+            ->willReturnSelf();
 
         $this->filterBuilderMock->expects($this->atLeastOnce())->method('setField')->willReturnSelf();
         $this->filterBuilderMock->expects($this->atLeastOnce())->method('setValue')->willReturnSelf();
@@ -416,6 +425,10 @@ public function testSetShippingMethods()
         $addressMock->expects($this->once())->method('getId')->willReturn($addressId);
         $this->quoteMock->expects($this->once())->method('getAllShippingAddresses')->willReturn([$addressMock]);
         $addressMock->expects($this->once())->method('setShippingMethod')->with($methodsArray[$addressId]);
+        $this->quoteMock->expects($this->once())
+            ->method('__call')
+            ->with('setTotalsCollectedFlag', [false])
+            ->willReturnSelf();
 
         $this->mockShippingAssignment();
 
@@ -809,4 +822,37 @@ private function createSimpleMock($className)
             ->disableOriginalConstructor()
             ->getMock();
     }
+
+    public function testValidateMinimumAmountMultiAddressTrue()
+    {
+        $this->scopeConfigMock->expects($this->exactly(2))->method('isSetFlag')->withConsecutive(
+            ['sales/minimum_order/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE],
+            ['sales/minimum_order/multi_address', \Magento\Store\Model\ScopeInterface::SCOPE_STORE]
+        )->willReturnOnConsecutiveCalls(true, true);
+
+        $this->checkoutSessionMock->expects($this->atLeastOnce())->method('getQuote')->willReturn($this->quoteMock);
+        $this->quoteMock->expects($this->once())->method('validateMinimumAmount')->willReturn(false);
+        $this->assertFalse($this->model->validateMinimumAmount());
+    }
+
+    public function testValidateMinimumAmountMultiAddressFalse()
+    {
+        $addressMock = $this->createMock(\Magento\Quote\Model\Quote\Address::class);
+        $this->scopeConfigMock->expects($this->exactly(2))->method('isSetFlag')->withConsecutive(
+            ['sales/minimum_order/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE],
+            ['sales/minimum_order/multi_address', \Magento\Store\Model\ScopeInterface::SCOPE_STORE]
+        )->willReturnOnConsecutiveCalls(true, false);
+
+        $this->scopeConfigMock->expects($this->exactly(2))->method('getValue')->withConsecutive(
+            ['sales/minimum_order/amount', \Magento\Store\Model\ScopeInterface::SCOPE_STORE],
+            ['sales/minimum_order/tax_including', \Magento\Store\Model\ScopeInterface::SCOPE_STORE]
+        )->willReturnOnConsecutiveCalls(100, false);
+
+        $this->checkoutSessionMock->expects($this->atLeastOnce())->method('getQuote')->willReturn($this->quoteMock);
+        $this->quoteMock->expects($this->once())->method('getStoreId')->willReturn(1);
+        $this->quoteMock->expects($this->once())->method('getAllAddresses')->willReturn([$addressMock]);
+        $addressMock->expects($this->once())->method('getBaseSubtotalWithDiscount')->willReturn(101);
+
+        $this->assertTrue($this->model->validateMinimumAmount());
+    }
 }

app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml

@@ -14,17 +14,6 @@
  * @var $block \Magento\Multishipping\Block\Checkout\Addresses
  */
 ?>
-<form id="checkout_multishipping_form"
-      data-mage-init='{
-          "multiShipping":{},
-          "validation":{},
-          "cartUpdate": {
-               "validationURL": "/multishipping/checkout/checkItems",
-               "eventName": "updateMulticartItemQty"
-          }}'
-      action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>"
-      method="post"
-      class="multicheckout address form">
 <form id="checkout_multishipping_form"
       data-mage-init='{
           "multiShipping":{},