Merge pull request #2625 from magento-tango/MAGETWO-69940

MAGETWO-69940: [GITHUB] Free shipping coupon not working with Table Rates shipping #8172 / #8089

Author: dhorytskyi

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

@@ -128,8 +128,10 @@ public function collectRates(RateRequest $request)
                             $freeQty += $item->getQty() * ($child->getQty() - $freeShipping);
                         }
                     }
-                } elseif ($item->getFreeShipping()) {
-                    $freeShipping = is_numeric($item->getFreeShipping()) ? $item->getFreeShipping() : 0;
+                } elseif ($item->getFreeShipping() || $item->getAddress()->getFreeShipping()) {
+                    $freeShipping = $item->getFreeShipping() ?
+                        $item->getFreeShipping() : $item->getAddress()->getFreeShipping();
+                    $freeShipping = is_numeric($freeShipping) ? $freeShipping : 0;
                     $freeQty += $item->getQty() - $freeShipping;
                     $freePackageValue += $item->getBaseRowTotal();
                 }

dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php

@@ -30,6 +30,57 @@ public function testRateAppliedToShipping()
         $this->assertEquals(0, $customerQuote->getBaseGrandTotal());
     }
 
+    /**
+     * @magentoConfigFixture current_store carriers/tablerate/active 1
+     * @magentoConfigFixture current_store carriers/flatrate/active 0
+     * @magentoConfigFixture current_store carriers/freeshipping/active 0
+     * @magentoConfigFixture current_store carriers/tablerate/condition_name package_qty
+     * @magentoDataFixture Magento/SalesRule/_files/cart_rule_free_shipping_by_cart.php
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @magentoDataFixture Magento/OfflineShipping/_files/tablerates.php
+     * @return void
+     */
+    public function testTableRateFreeShipping()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var \Magento\Quote\Model\Quote $quote */
+        $quote = $objectManager->get(\Magento\Quote\Model\Quote::class);
+        $quote->load('test01', 'reserved_order_id');
+        $cartId = $quote->getId();
+        if (!$cartId) {
+            $this->fail('quote fixture failed');
+        }
+        /** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+        $quoteIdMask = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
+            ->create();
+        $quoteIdMask->load($cartId, 'quote_id');
+        //Use masked cart Id
+        $cartId = $quoteIdMask->getMaskedId();
+        $data = [
+            'data' => [
+                'country_id' => "US",
+                'postcode' => null,
+                'region' => null,
+                'region_id' => null
+            ]
+        ];
+        /** @var \Magento\Quote\Api\Data\EstimateAddressInterface $address */
+        $address = $objectManager->create(\Magento\Quote\Api\Data\EstimateAddressInterface::class, $data);
+        /** @var  \Magento\Quote\Api\GuestShippingMethodManagementInterface $shippingEstimation */
+        $shippingEstimation = $objectManager->get(\Magento\Quote\Api\GuestShippingMethodManagementInterface::class);
+        $result = $shippingEstimation->estimateByAddress($cartId, $address);
+        $this->assertNotEmpty($result);
+        $expectedResult = [
+            'method_code' => 'bestway',
+            'amount' => 0
+        ];
+        foreach ($result as $rate) {
+            $this->assertEquals($expectedResult['amount'], $rate->getAmount());
+            $this->assertEquals($expectedResult['method_code'], $rate->getMethodCode());
+        }
+    }
+
     /**
      * @magentoConfigFixture current_store carriers/tablerate/active 1
      * @magentoConfigFixture current_store carriers/tablerate/condition_name package_qty
@@ -53,6 +104,7 @@ public function testEstimateByAddressWithCartPriceRuleByItem()
      */
     public function testEstimateByAddressWithCartPriceRuleByShipment()
     {
+        $this->markTestSkipped('According to MAGETWO-69940 it is an incorrect behavior');
         // Rule applied to entire shipment should not overwrite flat or table rate shipping prices
         // Only rules applied to specific items should modify those prices (MAGETWO-63844)
         $this->executeTestFlow(5, 10);