MAGETWO-87872: Free Shipping Cart Price Rule not working when UPS shipping method is enabled

dhorytskyi · dhorytskyi · commit 6a95dbacfe6f · 2018-05-21T17:55:41.000+03:00
diff --git a/app/code/Magento/OfflineShipping/Model/SalesRule/Calculator.php b/app/code/Magento/OfflineShipping/Model/SalesRule/Calculator.php
@@ -49,6 +49,7 @@ public function processFreeShipping(\Magento\Quote\Model\Quote\Item\AbstractItem
 
                 case Rule::FREE_SHIPPING_ADDRESS:
                     $address->setFreeShipping(true);
+                    $item->setFreeShipping(true);
                     break;
             }
             if ($rule->getStopRulesProcessing()) {
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
@@ -436,6 +436,12 @@ protected function _updateFreeMethodQuote($request)
                     }
                 }
             }
+        } else {
+            /**
+             * if we can apply free shipping for all order we should force price
+             * to $0.00 for shipping with out sending second request to carrier
+             */
+            $price = 0;
         }
 
         /**

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ public function processFreeShipping(\Magento\Quote\Model\Quote\Item\AbstractItem`
`49`	`49`
`50`	`50`	`case Rule::FREE_SHIPPING_ADDRESS:`
`51`	`51`	`$address->setFreeShipping(true);`
	`52`	`+ $item->setFreeShipping(true);`
`52`	`53`	`break;`
`53`	`54`	`}`
`54`	`55`	`if ($rule->getStopRulesProcessing()) {`
Original file line number	Diff line number	Diff line change
`@@ -436,6 +436,12 @@ protected function _updateFreeMethodQuote($request)`
`436`	`436`	`}`
`437`	`437`	`}`
`438`	`438`	`}`
	`439`	`+ } else {`
	`440`	`+ /**`
	`441`	`+ * if we can apply free shipping for all order we should force price`
	`442`	`+ * to $0.00 for shipping with out sending second request to carrier`
	`443`	`+ */`
	`444`	`+ $price = 0;`
`439`	`445`	`}`
`440`	`446`
`441`	`447`	`/**`