Merge remote-tracking branch 'magento-l3/ACP2E-2515' into Tier4-Kings-PR-12-18-2023

Author: devarul

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

@@ -132,7 +132,7 @@ public function collectRates(RateRequest $request)
                 if ($item->getHasChildren() && $item->isShipSeparately()) {
                     foreach ($item->getChildren() as $child) {
                         if ($child->getFreeShipping() && !$child->getProduct()->isVirtual()) {
-                            $freeShipping = is_numeric($child->getFreeShipping()) ? $child->getFreeShipping() : 0;
+                            $freeShipping = (int)$child->getFreeShipping();
                             $freeQty += $item->getQty() * ($child->getQty() - $freeShipping);
                         }
                     }

app/code/Magento/OfflineShipping/Test/Unit/Model/Carrier/TablerateTest.php

@@ -118,10 +118,11 @@ protected function setUp(): void
 
     /**
      * @param bool $freeshipping
+     * @param bool $isShipSeparately
      * @dataProvider collectRatesWithGlobalFreeShippingDataProvider
      * @return void
      */
-    public function testCollectRatesWithGlobalFreeShipping($freeshipping)
+    public function testCollectRatesWithGlobalFreeShipping($freeshipping, $isShipSeparately)
     {
         $rate = [
             'price' => 15,
@@ -177,11 +178,17 @@ public function testCollectRatesWithGlobalFreeShipping($freeshipping)
         $this->resultFactoryMock->expects($this->once())->method('create')->willReturn($result);
 
         $product->expects($this->any())->method('isVirtual')->willReturn(false);
-
         $item->expects($this->any())->method('getProduct')->willReturn($product);
-        $item->expects($this->any())->method('getFreeShipping')->willReturn(1);
         $item->expects($this->any())->method('getQty')->willReturn(1);
-
+        if ($isShipSeparately) {
+            $freeShippingReturnValue = true;
+            $item->expects($this->any())->method('getHasChildren')->willReturn(1);
+            $item->expects($this->any())->method('isShipSeparately')->willReturn(1);
+            $item->expects($this->any())->method('getChildren')->willReturn([$item]);
+        } else {
+            $freeShippingReturnValue = "1";
+        }
+        $item->expects($this->any())->method('getFreeShipping')->willReturn($freeShippingReturnValue);
         $request->expects($this->any())->method('getAllItems')->willReturn([$item]);
         $request->expects($this->any())->method('getPackageQty')->willReturn(1);
 
@@ -225,8 +232,9 @@ private function captureArg(&$captureVar)
     public function collectRatesWithGlobalFreeShippingDataProvider()
     {
         return [
-            ['freeshipping' => true],
-            ['freeshipping' => false]
+            ['freeshipping' => true, 'isShipSeparately' => false],
+            ['freeshipping' => false, 'isShipSeparately' => false],
+            ['freeshipping' => true, 'isShipSeparately' => true]
         ];
     }
 }