Merge remote-tracking branch 'spank/multishipping-address-totals' into AC-8795

Author: glo17720

app/code/Magento/OfflineShipping/Model/Carrier/Freeshipping.php

@@ -136,11 +136,10 @@ public function collectRates(RateRequest $request)
     protected function _updateFreeMethodQuote($request)
     {
         $freeShipping = false;
-        $items = $request->getAllItems();
-        $c = count($items);
-        for ($i = 0; $i < $c; $i++) {
-            if ($items[$i]->getProduct() instanceof \Magento\Catalog\Model\Product) {
-                if ($items[$i]->getFreeShipping()) {
+        $items = $request->getAllItems() ?: [];
+        foreach ($items as $item) {
+            if ($item->getProduct() instanceof \Magento\Catalog\Model\Product) {
+                if ($item->getFreeShipping()) {
                     $freeShipping = true;
                 } else {
                     return;

app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php

@@ -38,6 +38,7 @@ public function collect(
             return $this;
         }
 
+        $shippingAddress = $shippingAssignment->getShipping()->getAddress();
         $quoteDetails = $this->prepareQuoteDetails($shippingAssignment, [$shippingDataObject]);
         $taxDetails = $this->taxCalculationService
             ->calculateTax($quoteDetails, $storeId);
@@ -48,10 +49,8 @@ public function collect(
             ->calculateTax($baseQuoteDetails, $storeId);
         $baseTaxDetailsItems = $baseTaxDetails->getItems()[self::ITEM_CODE_SHIPPING];
 
-        $quote->getShippingAddress()
-            ->setShippingAmount($taxDetailsItems->getRowTotal());
-        $quote->getShippingAddress()
-            ->setBaseShippingAmount($baseTaxDetailsItems->getRowTotal());
+        $shippingAddress->setShippingAmount($taxDetailsItems->getRowTotal());
+        $shippingAddress->setBaseShippingAmount($baseTaxDetailsItems->getRowTotal());
 
         $this->processShippingTaxInfo(
             $shippingAssignment,
@@ -64,6 +63,8 @@ public function collect(
     }
 
     /**
+     * Fetch shipping including tax
+     *
      * @param \Magento\Quote\Model\Quote $quote
      * @param Address\Total $total
      * @return array|null

app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php

@@ -108,6 +108,7 @@ public function testCollectDoesNotCalculateTaxIfThereIsNoItemsRelatedToGivenAddr
     {
         $storeId = 1;
         $this->quoteMock->expects($this->once())->method('getStoreId')->willReturn($storeId);
+        $this->quoteMock->expects($this->never())->method('getShippingAddress');
 
         $addressMock = $this->getMockObject(Address::class, [
             'all_items' => [],
@@ -168,6 +169,7 @@ private function getMockObject($className, array $objectState)
 
     public function testFetch()
     {
+        $this->quoteMock->expects($this->never())->method('getShippingAddress');
         $value = 42;
         $total = new Total();
         $total->setShippingInclTax($value);
@@ -181,6 +183,8 @@ public function testFetch()
 
     public function testFetchWithZeroShipping()
     {
+        $this->quoteMock->expects($this->never())->method('getShippingAddress');
+
         $value = 0;
         $total = new Total();
         $total->setShippingInclTax($value);