Merge pull request #194 from magento-sparta/MDVA-126

[Support] Backport MAGETWO-49716 to 2.0.x branch

Author: slavvka

app/code/Magento/Multishipping/Model/Cart/Controller/CartPlugin.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Multishipping\Model\Cart\Controller;
+
+class CartPlugin
+{
+    /**
+     * @var \Magento\Quote\Api\CartRepositoryInterface
+     */
+    private $cartRepository;
+
+    /**
+     * @var \Magento\Checkout\Model\Session
+     */
+    private $checkoutSession;
+
+    /**
+     * @param \Magento\Quote\Api\CartRepositoryInterface $cartRepository
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     */
+    public function __construct(
+        \Magento\Quote\Api\CartRepositoryInterface $cartRepository,
+        \Magento\Checkout\Model\Session $checkoutSession
+    ) {
+        $this->cartRepository = $cartRepository;
+        $this->checkoutSession = $checkoutSession;
+    }
+
+    /**
+     * @param \Magento\Checkout\Controller\Cart $subject
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeDispatch(
+        \Magento\Checkout\Controller\Cart $subject,
+        \Magento\Framework\App\RequestInterface $request
+    ) {
+        /** @var \Magento\Quote\Model\Quote $quote */
+        $quote = $this->checkoutSession->getQuote();
+
+        // Clear shipping addresses and item assignments after Multishipping flow
+        if ($quote->isMultipleShippingAddresses()) {
+            foreach ($quote->getAllShippingAddresses() as $address) {
+                $quote->removeAddress($address->getId());
+            }
+            $quote->getShippingAddress();
+            $quote->setIsMultiShipping(false);
+            $quote->collectTotals();
+
+            $this->cartRepository->save($quote);
+        }
+    }
+}

app/code/Magento/Multishipping/Test/Unit/Model/Cart/Controller/CartPluginTest.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Multishipping\Test\Unit\Model\Cart\Controller;
+
+class CartPluginTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Multishipping\Model\Cart\Controller\CartPlugin
+     */
+    private $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $cartRepositoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $checkoutSessionMock;
+
+    protected function setUp()
+    {
+        $this->cartRepositoryMock = $this->getMock('\Magento\Quote\Api\CartRepositoryInterface');
+        $this->checkoutSessionMock = $this->getMock('\Magento\Checkout\Model\Session', [], [], '', false);
+        $this->model = new \Magento\Multishipping\Model\Cart\Controller\CartPlugin(
+            $this->cartRepositoryMock,
+            $this->checkoutSessionMock
+        );
+    }
+
+    public function testBeforeDispatch()
+    {
+        $addressId = 100;
+        $quoteMock = $this->getMock(
+            '\Magento\Quote\Model\Quote',
+            [
+                'isMultipleShippingAddresses',
+                'getAllShippingAddresses',
+                'removeAddress',
+                'getShippingAddress',
+                'setIsMultiShipping',
+                'collectTotals'
+            ],
+            [],
+            '',
+            false
+        );
+        $this->checkoutSessionMock->expects($this->once())->method('getQuote')->willReturn($quoteMock);
+
+        $addressMock = $this->getMock('\Magento\Quote\Model\Quote\Address', [], [], '', false);
+        $addressMock->expects($this->once())->method('getId')->willReturn($addressId);
+
+        $quoteMock->expects($this->once())->method('isMultipleShippingAddresses')->willReturn(true);
+        $quoteMock->expects($this->once())->method('getAllShippingAddresses')->willReturn([$addressMock]);
+        $quoteMock->expects($this->once())->method('removeAddress')->with($addressId)->willReturnSelf();
+        $quoteMock->expects($this->once())->method('getShippingAddress');
+        $quoteMock->expects($this->once())->method('setIsMultiShipping')->with(false)->willReturnSelf();
+        $quoteMock->expects($this->once())->method('collectTotals')->willReturnSelf();
+
+        $this->cartRepositoryMock->expects($this->once())->method('save')->with($quoteMock);
+
+        $this->model->beforeDispatch(
+            $this->getMock('\Magento\Checkout\Controller\Cart', [], [], '', false),
+            $this->getMock('\Magento\Framework\App\RequestInterface')
+        );
+    }
+}

app/code/Magento/Multishipping/etc/frontend/di.xml

@@ -42,4 +42,7 @@
     <type name="Magento\Checkout\Model\Cart">
         <plugin name="multishipping_session_mapper" type="Magento\Multishipping\Model\Checkout\Type\Multishipping\Plugin" sortOrder="50" />
     </type>
+    <type name="Magento\Checkout\Controller\Cart">
+        <plugin name="multishipping_clear_addresses" type="Magento\Multishipping\Model\Cart\Controller\CartPlugin" />
+    </type>
 </config>