Merge pull request #2594 from magento-tango/MAGETWO-87872

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

Author: dhorytskyi

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;
         }
 
         /**

dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php

@@ -5,18 +5,19 @@
  */
 namespace Magento\Ups\Model;
 
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Quote\Model\Quote\Address\RateRequestFactory;
+
 class CarrierTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Ups\Model\Carrier
+     * @var Carrier
      */
     private $carrier;
 
     protected function setUp()
     {
-        $this->carrier = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Ups\Model\Carrier::class
-        );
+        $this->carrier = Bootstrap::getObjectManager()->create(Carrier::class);
     }
 
     public function testGetShipAcceptUrl()
@@ -51,4 +52,27 @@ public function testGetShipConfirmUrlLive()
             $this->carrier->getShipConfirmUrl()
         );
     }
+
+    /**
+     * @magentoConfigFixture current_store carriers/ups/active 1
+     * @magentoConfigFixture current_store carriers/ups/allowed_methods 1DA,GND
+     * @magentoConfigFixture current_store carriers/ups/free_method GND
+     */
+    public function testCollectRates()
+    {
+        $rateRequest = Bootstrap::getObjectManager()->get(RateRequestFactory::class)->create();
+        $rateRequest->setDestCountryId('US');
+        $rateRequest->setDestRegionId('CA');
+        $rateRequest->setDestPostcode('90001');
+        $rateRequest->setPackageQty(1);
+        $rateRequest->setPackageWeight(1);
+        $rateRequest->setFreeMethodWeight(0);
+        $rateRequest->setLimitCarrier($this->carrier::CODE);
+
+        $rateResult = $this->carrier->collectRates($rateRequest);
+        $result = $rateResult->asArray();
+        $methods = $result[$this->carrier::CODE]['methods'];
+        $this->assertEquals(0, $methods['GND']['price']);
+        $this->assertNotEquals(0, $methods['1DA']['price']);
+    }
 }