Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into 2.4-develop

Author: aplapana

app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Model\ResourceModel\Indexer;
+
+use Zend_Db_Expr;
+
+class OptionQtyExpressionProvider
+{
+    /**
+     * Get expression for calculating available quantity for bundle option.
+     *
+     * @return Zend_Db_Expr
+     */
+    public function getExpression(): Zend_Db_Expr
+    {
+        return new Zend_Db_Expr('i.qty - cisi.min_qty');
+    }
+}

app/code/Magento/Bundle/Model/ResourceModel/Indexer/OptionQtyExpressionProvider.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Bundle\Model\ResourceModel\Indexer;
 
+use Magento\Bundle\Model\Product\Type;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
 use Magento\CatalogInventory\Model\Indexer\Stock\Action\Full;
 use Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock;
@@ -45,6 +46,7 @@ class Stock extends DefaultStock
      * @param ActiveTableSwitcher $activeTableSwitcher
      * @param StockStatusSelectBuilder $stockStatusSelectBuilder
      * @param BundleOptionStockDataSelectBuilder $bundleOptionStockDataSelectBuilder
+     * @param OptionQtyExpressionProvider $optionQtyExpressionProvider
      * @param string $connectionName
      */
     public function __construct(
@@ -55,10 +57,14 @@ public function __construct(
         ActiveTableSwitcher $activeTableSwitcher,
         StockStatusSelectBuilder $stockStatusSelectBuilder,
         BundleOptionStockDataSelectBuilder $bundleOptionStockDataSelectBuilder,
+        private readonly OptionQtyExpressionProvider $optionQtyExpressionProvider,
         $connectionName = null
     ) {
         parent::__construct($context, $tableStrategy, $eavConfig, $scopeConfig, $connectionName);
 
+        $this->_typeId = Type::TYPE_CODE;
+        $this->_isComposite = true;
+
         $this->activeTableSwitcher = $activeTableSwitcher;
         $this->stockStatusSelectBuilder = $stockStatusSelectBuilder;
         $this->bundleOptionStockDataSelectBuilder = $bundleOptionStockDataSelectBuilder;
@@ -198,11 +204,14 @@ protected function _cleanBundleOptionStockData()
     private function getOptionsStatusExpression(): \Zend_Db_Expr
     {
         $connection = $this->getConnection();
+
+        $qtyExpr = $this->optionQtyExpressionProvider->getExpression();
         $isAvailableExpr = $connection->getCheckSql(
-            'bs.selection_can_change_qty = 0 AND bs.selection_qty > i.qty',
+            'bs.selection_can_change_qty = 0 AND bs.selection_qty > ' . $qtyExpr,
             '0',
             'i.stock_status'
         );
+
         if ($this->stockConfiguration->getBackorders()) {
             $backordersExpr = $connection->getCheckSql(
                 'cisi.use_config_backorders = 0 AND cisi.backorders = 0',
@@ -216,6 +225,7 @@ private function getOptionsStatusExpression(): \Zend_Db_Expr
                 $isAvailableExpr
             );
         }
+
         if ($this->stockConfiguration->getManageStock()) {
             $statusExpr = $connection->getCheckSql(
                 'cisi.use_config_manage_stock = 0 AND cisi.manage_stock = 0',