MAGETWO-53177: Shopping Cart estimator displays zero totals when returning from Multishipping

Author: irenelagno

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

@@ -17,11 +17,6 @@ class CartPlugin
      */
     private $checkoutSession;
 
-    /**
-     * @var \Magento\Multishipping\Model\Checkout\Type\Multishipping
-     */
-    private $typeMultishipping;
-
     /**
      * @var \Magento\Customer\Api\AddressRepositoryInterface
      */
@@ -30,18 +25,15 @@ class CartPlugin
     /**
      * @param \Magento\Quote\Api\CartRepositoryInterface $cartRepository
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Multishipping\Model\Checkout\Type\Multishipping $typeMultishipping
      * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
      */
     public function __construct(
         \Magento\Quote\Api\CartRepositoryInterface $cartRepository,
         \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Multishipping\Model\Checkout\Type\Multishipping $typeMultishipping,
         \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
     ) {
         $this->cartRepository = $cartRepository;
         $this->checkoutSession = $checkoutSession;
-        $this->typeMultishipping = $typeMultishipping;
         $this->addressRepository = $addressRepository;
     }
 
@@ -65,10 +57,13 @@ public function beforeDispatch(
             }
 
             $shippingAddress = $quote->getShippingAddress();
-            $defaultCustomerAddress = $this->addressRepository->getById(
-                $this->typeMultishipping->getCustomerDefaultShippingAddress()
-            );
-            $shippingAddress->importCustomerAddressData($defaultCustomerAddress);
+            $defaultShipping = $quote->getCustomer()->getDefaultShipping();
+            if ($defaultShipping) {
+                $defaultCustomerAddress = $this->addressRepository->getById(
+                    $defaultShipping
+                );
+                $shippingAddress->importCustomerAddressData($defaultCustomerAddress);
+            }
             $this->cartRepository->save($quote);
         }
     }

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

@@ -22,11 +22,6 @@ class CartPluginTest extends \PHPUnit_Framework_TestCase
      */
     private $checkoutSessionMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $typeMultishippingMock;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -36,18 +31,10 @@ protected function setUp()
     {
         $this->cartRepositoryMock = $this->getMock(\Magento\Quote\Api\CartRepositoryInterface::class);
         $this->checkoutSessionMock = $this->getMock(\Magento\Checkout\Model\Session::class, [], [], '', false);
-        $this->typeMultishippingMock = $this->getMock(
-            \Magento\Multishipping\Model\Checkout\Type\Multishipping::class,
-            [],
-            [],
-            '',
-            false
-        );
         $this->addressRepositoryMock = $this->getMock(\Magento\Customer\Api\AddressRepositoryInterface::class);
         $this->model = new \Magento\Multishipping\Model\Cart\Controller\CartPlugin(
             $this->cartRepositoryMock,
             $this->checkoutSessionMock,
-            $this->typeMultishippingMock,
             $this->addressRepositoryMock
         );
     }
@@ -63,8 +50,7 @@ public function testBeforeDispatch()
                 'getAllShippingAddresses',
                 'removeAddress',
                 'getShippingAddress',
-                'setIsMultiShipping',
-                'collectTotals'
+                'getCustomer'
             ],
             [],
             '',
@@ -81,10 +67,9 @@ public function testBeforeDispatch()
 
         $shippingAddressMock = $this->getMock(\Magento\Quote\Model\Quote\Address::class, [], [], '', false);
         $quoteMock->expects($this->once())->method('getShippingAddress')->willReturn($shippingAddressMock);
-
-        $this->typeMultishippingMock->expects($this->once())
-            ->method('getCustomerDefaultShippingAddress')
-            ->willReturn($customerAddressId);
+        $customerMock = $this->getMock(\Magento\Customer\Api\Data\CustomerInterface::class);
+        $quoteMock->expects($this->once())->method('getCustomer')->willReturn($customerMock);
+        $customerMock->expects($this->once())->method('getDefaultShipping')->willReturn($customerAddressId);
 
         $customerAddressMock = $this->getMock(\Magento\Customer\Api\Data\AddressInterface::class);
         $this->addressRepositoryMock->expects($this->once())