ACP2E-670: Free Shipping Cart Rule for matching items only on Fedex

Author: viktym

app/code/Magento/Fedex/Model/Carrier.php

@@ -743,6 +743,7 @@ protected function _setFreeMethodRequest($freeMethod)
         $r = $this->_rawRequest;
         $weight = $this->getTotalNumOfBoxes($r->getFreeMethodWeight());
         $r->setWeight($weight);
+        $r->setPackages($this->createPackages((float)$r->getFreeMethodWeight(), []));
         $r->setService($freeMethod);
     }
 

app/code/Magento/Ups/Model/Carrier.php

@@ -523,6 +523,9 @@ protected function _setFreeMethodRequest($freeMethod)
         $weight = $this->getTotalNumOfBoxes($r->getFreeMethodWeight());
         $weight = $this->_getCorrectWeight($weight);
         $r->setWeight($weight);
+        $r->setPackages(
+            $this->createPackages((float)$r->getFreeMethodWeight(), [])
+        );
         $r->setAction($this->configHelper->getCode('action', 'single'));
         $r->setProduct($freeMethod);
     }

app/code/Magento/Usps/Model/Carrier.php

@@ -474,6 +474,7 @@ protected function _setFreeMethodRequest($freeMethod)
         $r->setWeightPounds(floor($weight));
         $ounces = ($weight - floor($weight)) * self::OUNCES_POUND;
         $r->setWeightOunces(sprintf('%.' . self::$weightPrecision . 'f', $ounces));
+        $r->setPackages($this->createPackages((float)$r->getFreeMethodWeight(), []));
         $r->setService($freeMethod);
     }
 

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

@@ -341,7 +341,7 @@ public function testPartialFreeShippingWithCoupon(): void
         $this->assertEquals('ALL', $firstRequest->Package->Service);
         $this->assertEquals('20', $firstRequest->Package->Pounds);
         $this->assertEquals('Priority', $secondRequest->Package->Service);
-        $this->assertEquals('20', $secondRequest->Package->Pounds);
+        $this->assertEquals('10', $secondRequest->Package->Pounds);
         $price = $this->getShippingMethodAmount($methods, 'usps', '1');
         $this->assertEquals(6.70, $price);
     }