Merge branch '2.4-develop' into bugfix-24070

Author: engcom-Dash

app/code/Magento/Sales/Model/Order/Webapi/ChangeOutputArray.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -10,6 +10,7 @@
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn;
 use Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer;
+use Magento\Bundle\Model\Product\Type;
 
 /**
  * Class for changing row total in response.
@@ -62,7 +63,7 @@ public function execute(
             + $dataObject->getBaseWeeeTaxAppliedAmount()
             - $dataObject->getBaseDiscountAmount());
 
-        return $result;
+        return $this->getBundleProductPrice($result);
     }
 
     /**
@@ -75,4 +76,24 @@ private function round(float $value): float
     {
         return (float) max($value, 0);
     }
+
+    /**
+     * Get bundle product price if miss in child item
+     *
+     * @param array $result
+     * @return array
+     */
+    private function getBundleProductPrice(array $result): array
+    {
+        if (isset($result[OrderItemInterface::PRICE], $result[OrderItemInterface::PARENT_ITEM]) &&
+            $result[OrderItemInterface::PRICE] == 0
+        ) {
+            if ($result[OrderItemInterface::PARENT_ITEM][OrderItemInterface::PRODUCT_TYPE] == Type::TYPE_CODE) {
+                $result[OrderItemInterface::PRICE] =
+                    $result[OrderItemInterface::PARENT_ITEM][OrderItemInterface::PRICE];
+            }
+        }
+
+        return $result;
+    }
 }

dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt

@@ -18,6 +18,9 @@ lib/web/prototype/**/*.js
 lib/web/jquery/jstree/jquery.jstree.js
 lib/web/jquery/colorpicker/js/colorpicker.js
 lib/web/chartjs/chartjs-adapter-moment.js
+lib/web/moment-timezone-with-data.js
+lib/web/less/less.min.js
+lib/web/underscore.js
 
 // MINIFIED FILES
 app/code/**/*.min.js