MAGETWO-69940: Free shipping coupon not working with Table Rates shipping

Oleksandr Iegorov · Oleksandr Iegorov · commit ac9146051aad · 2018-05-24T13:31:39.000+03:00
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php b/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();
                 }

Original file line number	Diff line number	Diff line change
`@@ -128,8 +128,10 @@ public function collectRates(RateRequest $request)`
`128`	`128`	`$freeQty += $item->getQty() * ($child->getQty() - $freeShipping);`
`129`	`129`	`}`
`130`	`130`	`}`
`131`		`- } elseif ($item->getFreeShipping()) {`
`132`		`- $freeShipping = is_numeric($item->getFreeShipping()) ? $item->getFreeShipping() : 0;`
	`131`	`+ } elseif ($item->getFreeShipping() \|\| $item->getAddress()->getFreeShipping()) {`
	`132`	`+ $freeShipping = $item->getFreeShipping() ?`
	`133`	`+ $item->getFreeShipping() : $item->getAddress()->getFreeShipping();`
	`134`	`+ $freeShipping = is_numeric($freeShipping) ? $freeShipping : 0;`
`133`	`135`	`$freeQty += $item->getQty() - $freeShipping;`
`134`	`136`	`$freePackageValue += $item->getBaseRowTotal();`
`135`	`137`	`}`