Merge branch 'magento-commerce:2.4-develop' into AC-9141

Author: nishant04412

app/code/Magento/Backend/Block/Widget/Grid/Extended.php

@@ -1022,6 +1022,7 @@ public function getCsvFile()
         $stream = $this->_directory->openFile($file, 'w+');
 
         $stream->lock();
+        $stream->write(pack('CCC', 0xef, 0xbb, 0xbf));
         $stream->writeCsv($this->_getExportHeaders());
         $this->_exportIterateCollection('_exportCsvItem', [$stream]);
 

app/code/Magento/Backend/Test/Unit/Model/Menu/Config/_files/invalidMenuXmlArray.php

@@ -17,6 +17,8 @@ define([
     $.widget('mage.dashboardChart', {
         options: {
             updateUrl: '',
+            responsive: true,
+            maintainAspectRatio: false,
             periodSelect: null,
             periodUnits: [],
             precision: 0,

app/code/Magento/Backend/view/adminhtml/web/js/dashboard/chart.js

@@ -29,8 +29,6 @@ class Collection extends \Magento\Framework\Data\Collection\Filesystem
     protected $_path = 'backups';
 
     /**
-     * Backup data
-     *
      * @var \Magento\Backup\Helper\Data
      */
     protected $_backupData = null;
@@ -46,7 +44,9 @@ class Collection extends \Magento\Framework\Data\Collection\Filesystem
      * @var \Magento\Framework\Filesystem
      */
     private $_filesystem;
+
     /**
+     *
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Magento\Backup\Helper\Data $backupData
      * @param \Magento\Framework\Filesystem $filesystem
@@ -61,21 +61,26 @@ public function __construct(
     ) {
         $this->_backupData = $backupData;
         parent::__construct($entityFactory, $filesystem);
-
         $this->_filesystem = $filesystem;
         $this->_backup = $backup;
         $this->_varDirectory = $filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
-
         $this->_hideBackupsForApache();
+        $this->initialize();
+    }
 
+    /**
+     * Initialize collection
+     *
+     * @return void
+     */
+    private function initialize()
+    {
         // set collection specific params
         $extensions = $this->_backupData->getExtensions();
-
         foreach ($extensions as $value) {
             $extensions[] = '(' . preg_quote($value, '/') . ')';
         }
         $extensions = implode('|', $extensions);
-
         $this->_varDirectory->create($this->_path);
         $path = rtrim($this->_varDirectory->getAbsolutePath($this->_path), '/') . '/';
         $this->setOrder(
@@ -90,6 +95,15 @@ public function __construct(
         );
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->initialize();
+    }
+
     /**
      * Create .htaccess file and deny backups directory access from web
      *

app/code/Magento/Backup/Model/Fs/Collection.php

@@ -6,18 +6,18 @@
 namespace Magento\Bundle\Model\ResourceModel\Indexer;
 
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BasePriceModifier;
-use Magento\Framework\DB\Select;
-use Magento\Framework\Indexer\DimensionalIndexerInterface;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
-use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BasePriceModifier;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Query\JoinAttributeProcessor;
+use Magento\CatalogInventory\Model\Stock;
 use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Framework\DB\Select;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Indexer\DimensionalIndexerInterface;
 use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
-use Magento\Catalog\Model\Product\Attribute\Source\Status;
-use Magento\CatalogInventory\Model\Stock;
 
 /**
  * Bundle products Price indexer resource model
@@ -671,10 +671,9 @@ private function calculateFixedBundleSelectionPrice()
      * @return void
      * @throws \Exception
      */
-    private function calculateDynamicBundleSelectionPrice($dimensions)
+    private function calculateDynamicBundleSelectionPrice(array $dimensions): void
     {
         $connection = $this->getConnection();
-
         $price = 'idx.min_price * bs.selection_qty';
         $specialExpr = $connection->getCheckSql(
             'i.special_price > 0 AND i.special_price < 100',
@@ -716,8 +715,32 @@ private function calculateDynamicBundleSelectionPrice($dimensions)
             []
         );
         $select->where('si.stock_status = ?', Stock::STOCK_IN_STOCK);
+        $query = str_replace('AS `idx`', 'AS `idx` USE INDEX (PRIMARY)', (string) $select);
+        $insertColumns = [
+            'entity_id',
+            'customer_group_id',
+            'website_id',
+            'option_id',
+            'selection_id',
+            'group_type',
+            'is_required',
+            'price',
+            'tier_price'
+        ];
+        $insertColumns = array_map(function ($item) use ($connection) {
+            return $connection->quoteIdentifier($item);
+        }, $insertColumns);
+        $updateValues = [];
+        foreach ($insertColumns as $column) {
+            $updateValues[] = sprintf("%s = VALUES(%s)", $column, $column);
+        }
 
-        $this->tableMaintainer->insertFromSelect($select, $this->getBundleSelectionTable(), []);
+        $connection->query(sprintf(
+            "INSERT INTO `" . $this->getBundleSelectionTable() . "` (%s) %s ON DUPLICATE KEY UPDATE %s",
+            implode(",", $insertColumns),
+            $query,
+            implode(",", $updateValues)
+        ));
     }
 
     /**

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

@@ -255,6 +255,6 @@ private function getBundleOptions(Product $saleableItem)
      */
     public function _resetState(): void
     {
-        $this->priceList = [];
+        $this->priceList = null;
     }
 }

app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php

@@ -16,6 +16,8 @@
         <element name="asLowAsFinalPrice" type="text" selector="div.price-box.price-final_price p.minimal-price > span.price-final_price span.price"/>
         <element name="fixedFinalPrice" type="text" selector="div.price-box.price-final_price > span.price-final_price span.price"/>
         <element name="productBundleOptionsCheckbox" type="checkbox" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/../input" parameterized="true" timeout="30"/>
+        <element name="productBundleOneOptionInput" type="input" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/..//input[contains(@class, 'option')]" parameterized="true" timeout="30"/>
+        <element name="productBundleOptionQty" type="input" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/..//input[contains(@class, 'qty')]" parameterized="true" timeout="30"/>
         <element name="includingTaxPrice" type="text" selector=".//*[@class='price-wrapper price-including-tax']/span"/>
         <element name="excludingTaxPrice" type="text" selector=".//*[@class='price-wrapper price-excluding-tax']/span"/>
     </section>

app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml

@@ -14,6 +14,7 @@
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Query\JoinAttributeProcessor;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Module\Manager;
@@ -22,6 +23,8 @@
 
 /**
  * Class to test Bundle products Price indexer resource model
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PriceTest extends TestCase
 {
@@ -45,6 +48,11 @@ class PriceTest extends TestCase
      */
     private $priceModel;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @inheritdoc
      */
@@ -64,7 +72,7 @@ protected function setUp(): void
         /** @var TableMaintainer|MockObject $tableMaintainer */
         $tableMaintainer = $this->createMock(TableMaintainer::class);
         /** @var MetadataPool|MockObject $metadataPool */
-        $metadataPool = $this->createMock(MetadataPool::class);
+        $this->metadataPool = $this->createMock(MetadataPool::class);
         /** @var BasePriceModifier|MockObject $basePriceModifier */
         $basePriceModifier = $this->createMock(BasePriceModifier::class);
         /** @var JoinAttributeProcessor|MockObject $joinAttributeProcessor */
@@ -78,7 +86,7 @@ protected function setUp(): void
         $this->priceModel = new Price(
             $indexTableStructureFactory,
             $tableMaintainer,
-            $metadataPool,
+            $this->metadataPool,
             $this->resourceMock,
             $basePriceModifier,
             $joinAttributeProcessor,
@@ -89,6 +97,124 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * @throws \ReflectionException
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testCalculateDynamicBundleSelectionPrice(): void
+    {
+        $entity = 'entity_id';
+        $price = 'idx.min_price * bs.selection_qty';
+        //@codingStandardsIgnoreStart
+        $selectQuery = "SELECT `i`.`entity_id`,
+       `i`.`customer_group_id`,
+       `i`.`website_id`,
+       `bo`.`option_id`,
+       `bs`.`selection_id`,
+       IF(bo.type = 'select' OR bo.type = 'radio', 0, 1) AS `group_type`,
+       `bo`.`required`                                   AS `is_required`,
+       LEAST(IF(i.special_price > 0 AND i.special_price < 100,
+            ROUND(idx.min_price * bs.selection_qty * (i.special_price / 100), 4), idx.min_price * bs.selection_qty),
+            IFNULL((IF(i.tier_percent IS NOT NULL,
+            ROUND((1 - i.tier_percent / 100) * idx.min_price * bs.selection_qty, 4), NULL)), idx.min_price *
+                                                                                    bs.selection_qty)) AS `price`,
+       IF(i.tier_percent IS NOT NULL, ROUND((1 - i.tier_percent / 100) * idx.min_price * bs.selection_qty, 4),
+          NULL)  AS `tier_price`
+        FROM `catalog_product_index_price_bundle_temp` AS `i`
+         INNER JOIN `catalog_product_entity` AS `parent_product` ON parent_product.entity_id = i.entity_id AND
+                                                (parent_product.created_in <= 1 AND parent_product.updated_in > 1)
+         INNER JOIN `catalog_product_bundle_option` AS `bo` ON bo.parent_id = parent_product.row_id
+         INNER JOIN `catalog_product_bundle_selection` AS `bs` ON bs.option_id = bo.option_id
+         INNER JOIN `catalog_product_index_price_replica` AS `idx`
+                    ON bs.product_id = idx.entity_id AND i.customer_group_id = idx.customer_group_id AND
+                       i.website_id = idx.website_id
+         INNER JOIN `cataloginventory_stock_status` AS `si` ON si.product_id = bs.product_id
+        WHERE (i.price_type = 0)
+            AND (si.stock_status = 1)
+        ON DUPLICATE KEY UPDATE `entity_id`         = VALUES(`entity_id`),
+                        `customer_group_id` = VALUES(`customer_group_id`),
+                        `website_id`        = VALUES(`website_id`),
+                        `option_id`         = VALUES(`option_id`),
+                        `selection_id`      = VALUES(`selection_id`),
+                        `group_type`        = VALUES(`group_type`),
+                        `is_required`       = VALUES(`is_required`),
+                        `price`             = VALUES(`price`),
+                        `tier_price`        = VALUES(`tier_price`)";
+        $processedQuery = "INSERT INTO `catalog_product_index_price_bundle_sel_temp` (,,,,,,,,) SELECT `i`.`entity_id`,
+       `i`.`customer_group_id`,
+       `i`.`website_id`,
+       `bo`.`option_id`,
+       `bs`.`selection_id`,
+       IF(bo.type = 'select' OR bo.type = 'radio', 0, 1) AS `group_type`,
+       `bo`.`required`                                   AS `is_required`,
+       LEAST(IF(i.special_price > 0 AND i.special_price < 100,
+            ROUND(idx.min_price * bs.selection_qty * (i.special_price / 100), 4), idx.min_price * bs.selection_qty),
+            IFNULL((IF(i.tier_percent IS NOT NULL,
+            ROUND((1 - i.tier_percent / 100) * idx.min_price * bs.selection_qty, 4), NULL)), idx.min_price *
+                                                                                    bs.selection_qty)) AS `price`,
+       IF(i.tier_percent IS NOT NULL, ROUND((1 - i.tier_percent / 100) * idx.min_price * bs.selection_qty, 4),
+          NULL)  AS `tier_price`
+        FROM `catalog_product_index_price_bundle_temp` AS `i`
+         INNER JOIN `catalog_product_entity` AS `parent_product` ON parent_product.entity_id = i.entity_id AND
+                                                (parent_product.created_in <= 1 AND parent_product.updated_in > 1)
+         INNER JOIN `catalog_product_bundle_option` AS `bo` ON bo.parent_id = parent_product.row_id
+         INNER JOIN `catalog_product_bundle_selection` AS `bs` ON bs.option_id = bo.option_id
+         INNER JOIN `catalog_product_index_price_replica` AS `idx` USE INDEX (PRIMARY)
+                    ON bs.product_id = idx.entity_id AND i.customer_group_id = idx.customer_group_id AND
+                       i.website_id = idx.website_id
+         INNER JOIN `cataloginventory_stock_status` AS `si` ON si.product_id = bs.product_id
+        WHERE (i.price_type = 0)
+            AND (si.stock_status = 1)
+        ON DUPLICATE KEY UPDATE `entity_id`         = VALUES(`entity_id`),
+                        `customer_group_id` = VALUES(`customer_group_id`),
+                        `website_id`        = VALUES(`website_id`),
+                        `option_id`         = VALUES(`option_id`),
+                        `selection_id`      = VALUES(`selection_id`),
+                        `group_type`        = VALUES(`group_type`),
+                        `is_required`       = VALUES(`is_required`),
+                        `price`             = VALUES(`price`),
+                        `tier_price`        = VALUES(`tier_price`) ON DUPLICATE KEY UPDATE  = VALUES(), = VALUES(), = VALUES(), = VALUES(), = VALUES(), = VALUES(), = VALUES(), = VALUES(), = VALUES()";
+        //@codingStandardsIgnoreEnd
+        $this->connectionMock->expects($this->exactly(3))
+            ->method('getCheckSql')
+            ->withConsecutive(
+                [
+                    'i.special_price > 0 AND i.special_price < 100',
+                    'ROUND(' . $price . ' * (i.special_price / 100), 4)',
+                    $price
+                ],
+                [
+                    'i.tier_percent IS NOT NULL',
+                    'ROUND((1 - i.tier_percent / 100) * ' . $price . ', 4)',
+                    'NULL'
+                ],
+                ["bo.type = 'select' OR bo.type = 'radio'", '0', '1']
+            );
+
+        $select = $this->createMock(\Magento\Framework\DB\Select::class);
+        $select->expects($this->once())->method('from')->willReturn($select);
+        $select->expects($this->exactly(5))->method('join')->willReturn($select);
+        $select->expects($this->exactly(2))->method('where')->willReturn($select);
+        $select->expects($this->once())->method('columns')->willReturn($select);
+        $select->expects($this->any())->method('__toString')->willReturn($selectQuery);
+
+        $this->connectionMock->expects($this->once())->method('getIfNullSql');
+        $this->connectionMock->expects($this->once())->method('getLeastSql');
+        $this->connectionMock->expects($this->any())
+            ->method('select')
+            ->willReturn($select);
+        $this->connectionMock->expects($this->exactly(9))->method('quoteIdentifier');
+        $this->connectionMock->expects($this->once())->method('query')->with($processedQuery);
+
+        $pool = $this->createMock(EntityMetadataInterface::class);
+        $pool->expects($this->once())->method('getLinkField')->willReturn($entity);
+        $this->metadataPool->expects($this->once())
+            ->method('getMetadata')
+            ->willReturn($pool);
+
+        $this->invokeMethodViaReflection('calculateDynamicBundleSelectionPrice', []);
+    }
+
     /**
      * Tests create Bundle Price temporary table
      */
@@ -147,16 +273,18 @@ public function testGetBundleOptionTable(): void
      * Invoke private method via reflection
      *
      * @param string $methodName
+     * @param array $args
      * @return string
+     * @throws \ReflectionException
      */
-    private function invokeMethodViaReflection(string $methodName): string
+    private function invokeMethodViaReflection(string $methodName, array $args = []): string
     {
         $method = new \ReflectionMethod(
             Price::class,
             $methodName
         );
         $method->setAccessible(true);
 
-        return (string)$method->invoke($this->priceModel);
+        return (string)$method->invoke($this->priceModel, $args);
     }
 }