Merge branch '2.4-develop' into ACP2E-2212

Author: AnujNehra

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

@@ -85,7 +85,10 @@ public function getPriceList(Product $bundleProduct, $searchMin, $useRegularPric
                 [(int)$option->getOptionId()],
                 $bundleProduct
             );
-            $selectionsCollection->setFlag('has_stock_status_filter', true);
+
+            if ((int)$bundleProduct->getPriceType() !== Price::PRICE_TYPE_FIXED) {
+                $selectionsCollection->setFlag('has_stock_status_filter', true);
+            }
             $selectionsCollection->removeAttributeToSelect();
 
             if (!$useRegularPrice) {

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

@@ -8,6 +8,7 @@
 namespace Magento\Bundle\Test\Unit\Pricing\Adjustment;
 
 use Magento\Bundle\Model\Option;
+use Magento\Bundle\Model\Product\Price;
 use Magento\Bundle\Model\Product\Type;
 use Magento\Bundle\Model\ResourceModel\Option\Collection;
 use Magento\Bundle\Model\ResourceModel\Selection\Collection as SelectionCollection;
@@ -109,6 +110,8 @@ protected function setUp(): void
 
         $this->product = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
+            ->addMethods(['getPriceType'])
+            ->onlyMethods(['getTypeInstance', 'isSalable'])
             ->getMock();
         $this->optionsCollection = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
@@ -142,6 +145,54 @@ public function testGetPriceList(): void
     {
         $optionId = 1;
 
+        $this->typeInstance->expects($this->any())
+            ->method('getOptionsCollection')
+            ->with($this->product)
+            ->willReturn($this->optionsCollection);
+        $this->product->expects($this->any())
+            ->method('getTypeInstance')
+            ->willReturn($this->typeInstance);
+        $this->product->expects($this->once())
+            ->method('getPriceType')->willReturn(Price::PRICE_TYPE_FIXED);
+        $this->optionsCollection->expects($this->once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator([$this->option]));
+        $this->option->expects($this->once())
+            ->method('getOptionId')
+            ->willReturn($optionId);
+        $this->typeInstance->expects($this->once())
+            ->method('getSelectionsCollection')
+            ->with([$optionId], $this->product)
+            ->willReturn($this->selectionCollection);
+        $this->option->expects($this->once())
+            ->method('isMultiSelection')
+            ->willReturn(true);
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->store);
+        $this->store->expects($this->once())
+            ->method('getWebsiteId')
+            ->willReturn(0);
+        $this->websiteRepository->expects($this->once())
+            ->method('getDefault')
+            ->willReturn($this->website);
+        $this->website->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $this->selectionCollection->expects($this->once())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator([]));
+        $this->selectionCollection->expects($this->never())
+            ->method('setFlag')
+            ->with('has_stock_status_filter', true);
+
+        $this->model->getPriceList($this->product, false, false);
+    }
+
+    public function testGetPriceListForFixedPriceType(): void
+    {
+        $optionId = 1;
+
         $this->typeInstance->expects($this->any())
             ->method('getOptionsCollection')
             ->with($this->product)

app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/DefaultSelectionPriceListProviderTest.php

@@ -11,6 +11,7 @@ define([
     'underscore',
     'mage/template',
     'priceUtils',
+    'jquery/jquery.parsequery',
     'priceBox'
 ], function ($, _, mageTemplate, utils) {
     'use strict';
@@ -40,9 +41,14 @@ define([
          */
         _init: function initPriceBundle() {
             var form = this.element,
-                options = $(this.options.productBundleSelector, form);
+                options = $(this.options.productBundleSelector, form),
+                qty = $(this.options.qtyFieldSelector, form);
+
+            // Override defaults with URL query parameters and/or inputs values
+            this._overrideDefaults();
 
             options.trigger('change');
+            qty.trigger('change');
         },
 
         /**
@@ -60,6 +66,71 @@ define([
             qty.on('change', this._onQtyFieldChanged.bind(this));
         },
 
+        /**
+         * Override default options values settings with either URL query parameters or
+         * initialized inputs values.
+         * @private
+         */
+        _overrideDefaults: function () {
+            var hashIndex = window.location.href.indexOf('#');
+
+            if (hashIndex !== -1) {
+                this._parseQueryParams(window.location.href.substr(hashIndex + 1));
+            }
+        },
+
+        /**
+         * Parse query parameters from a query string and set options values based on the
+         * key value pairs of the parameters.
+         * @param {*} queryString - URL query string containing query parameters.
+         * @private
+         */
+        _parseQueryParams: function (queryString) {
+            var queryParams = $.parseQuery({
+                    query: queryString
+                }),
+                selectedValues = [],
+                form = this.element,
+                options = $(this.options.productBundleSelector, form),
+                qtys = $(this.options.qtyFieldSelector, form);
+
+            $.each(queryParams, $.proxy(function (key, value) {
+                qtys.each(function (index, qty) {
+                    if (qty.name === key) {
+                        $(qty).val(value);
+                    }
+                });
+                options.each(function (index, option) {
+                    let optionType = $(option).prop('type');
+
+                    if (option.name === key ||
+                        optionType === 'select-multiple'
+                        && key.indexOf(option.name.substr(0, option.name.length - 2)) !== false
+                    ) {
+
+                        switch (optionType) {
+                            case 'radio':
+                                $(option).val() === value ? $(option).prop('checked', true) : '';
+                                break;
+                            case 'checkbox':
+                                $(option).prop('checked', true);
+                                break;
+                            case 'hidden':
+                            case 'select-one':
+                                $(option).val(value);
+                                break;
+                            case 'select-multiple':
+                                selectedValues.push(value);
+                                break;
+                        }
+                        if (optionType === 'select-multiple' && selectedValues.length) {
+                            $(option).val(selectedValues);
+                        }
+                    }
+                });
+            }, this));
+        },
+
         /**
          * Update price box config with bundle option prices
          * @private

app/code/Magento/Bundle/view/base/web/js/price-bundle.js

@@ -181,22 +181,26 @@ protected function parseSelections($rowData, $entityId)
             return [];
         }
 
-        $rowData['bundle_values'] = str_replace(
-            self::BEFORE_OPTION_VALUE_DELIMITER,
-            $this->_entityModel->getMultipleValueSeparator(),
-            $rowData['bundle_values']
-        );
-        $selections = explode(
-            Product::PSEUDO_MULTI_LINE_SEPARATOR,
-            $rowData['bundle_values']
-        );
+        if (is_string($rowData['bundle_values'])) {
+            $rowData['bundle_values'] = str_replace(
+                self::BEFORE_OPTION_VALUE_DELIMITER,
+                $this->_entityModel->getMultipleValueSeparator(),
+                $rowData['bundle_values']
+            );
+            $selections = explode(
+                Product::PSEUDO_MULTI_LINE_SEPARATOR,
+                $rowData['bundle_values']
+            );
+        } else {
+            $selections = $rowData['bundle_values'];
+        }
+
         foreach ($selections as $selection) {
-            $values = explode($this->_entityModel->getMultipleValueSeparator(), $selection);
-            $option = $this->parseOption($values);
-            if (isset($option['sku']) && isset($option['name'])) {
-                if (!isset($this->_cachedOptions[$entityId])) {
-                    $this->_cachedOptions[$entityId] = [];
-                }
+            $option = is_string($selection)
+                ? $this->parseOption(explode($this->_entityModel->getMultipleValueSeparator(), $selection))
+                : $selection;
+
+            if (isset($option['sku'], $option['name'])) {
                 $this->_cachedSkus[] = $option['sku'];
                 if (!isset($this->_cachedOptions[$entityId][$option['name']])) {
                     $this->_cachedOptions[$entityId][$option['name']] = [];

app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php

@@ -13,6 +13,7 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery;
 
+use Magento\Catalog\Helper\Image;
 use Magento\Framework\App\ObjectManager;
 use Magento\Backend\Block\Media\Uploader;
 use Magento\Framework\Json\Helper\Data as JsonHelper;
@@ -45,7 +46,7 @@ class Content extends \Magento\Backend\Block\Widget
     protected $_jsonEncoder;
 
     /**
-     * @var \Magento\Catalog\Helper\Image
+     * @var Image
      */
     private $imageHelper;
 
@@ -67,6 +68,7 @@ class Content extends \Magento\Backend\Block\Widget
      * @param ImageUploadConfigDataProvider $imageUploadConfigDataProvider
      * @param Database $fileStorageDatabase
      * @param JsonHelper|null $jsonHelper
+     * @param Image|null $imageHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -75,7 +77,8 @@ public function __construct(
         array $data = [],
         ImageUploadConfigDataProvider $imageUploadConfigDataProvider = null,
         Database $fileStorageDatabase = null,
-        ?JsonHelper $jsonHelper = null
+        ?JsonHelper $jsonHelper = null,
+        ?Image $imageHelper = null
     ) {
         $this->_jsonEncoder = $jsonEncoder;
         $this->_mediaConfig = $mediaConfig;
@@ -85,6 +88,7 @@ public function __construct(
             ?: ObjectManager::getInstance()->get(ImageUploadConfigDataProvider::class);
         $this->fileStorageDatabase = $fileStorageDatabase
             ?: ObjectManager::getInstance()->get(Database::class);
+        $this->imageHelper = $imageHelper ?: ObjectManager::getInstance()->get(Image::class);
     }
 
     /**
@@ -191,7 +195,7 @@ public function getImagesJson()
                     $fileHandler = $mediaDir->stat($this->_mediaConfig->getMediaPath($image['file']));
                     $image['size'] = $fileHandler['size'];
                 } catch (FileSystemException $e) {
-                    $image['url'] = $this->getImageHelper()->getDefaultPlaceholderUrl('small_image');
+                    $image['url'] = $this->imageHelper->getDefaultPlaceholderUrl('small_image');
                     $image['size'] = 0;
                     $this->_logger->warning($e);
                 }
@@ -304,17 +308,14 @@ public function getImageTypesJson()
     }
 
     /**
-     * Returns image helper object.
+     * Flag if gallery content editing is enabled.
      *
-     * @return \Magento\Catalog\Helper\Image
-     * @deprecated 101.0.3
+     * Is enabled by default, exposed to interceptors to add custom logic
+     *
+     * @return bool
      */
-    private function getImageHelper()
+    public function isEditEnabled() : bool
     {
-        if ($this->imageHelper === null) {
-            $this->imageHelper = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Catalog\Helper\Image::class);
-        }
-        return $this->imageHelper;
+        return true;
     }
 }

app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php

@@ -8,7 +8,8 @@
 
 namespace Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper;
 
-use \Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 
 /**
  * Class provides functionality to check and filter data came with product form.
@@ -32,7 +33,8 @@ public function prepareProductAttributes(Product $product, array $productData, a
     {
         $attributeList = $product->getAttributes();
         foreach ($productData as $attributeCode => $attributeValue) {
-            if ($this->isAttributeShouldNotBeUpdated($product, $useDefaults, $attributeCode, $attributeValue)) {
+            if ($this->isAttributeShouldNotBeUpdated($product, $useDefaults, $attributeCode, $attributeValue) &&
+                $this->isCustomAttrEmptyValueAllowed($attributeList, $attributeCode, $productData)) {
                 unset($productData[$attributeCode]);
             }
 
@@ -63,6 +65,34 @@ private function prepareConfigData(Product $product, string $attributeCode, arra
         return $productData;
     }
 
+    /**
+     * Check if custom attribute with empty value allowed
+     *
+     * @param mixed $attributeList
+     * @param string $attributeCode
+     * @param array $productData
+     * @return bool
+     */
+    private function isCustomAttrEmptyValueAllowed(
+        $attributeList,
+        string $attributeCode,
+        array $productData
+    ): bool {
+        $isAllowed = true;
+        if ($attributeList && isset($attributeList[$attributeCode])) {
+            /** @var Attribute $attribute */
+            $attribute = $attributeList[$attributeCode];
+            $isAttributeUserDefined = (int) $attribute->getIsUserDefined();
+            $isAttributeIsRequired = (int) $attribute->getIsRequired();
+
+            if ($isAttributeUserDefined && !$isAttributeIsRequired &&
+                empty($productData[$attributeCode])) {
+                $isAllowed = false;
+            }
+        }
+        return $isAllowed;
+    }
+
     /**
      * Prepare default attribute data for product.
      *
@@ -74,13 +104,15 @@ private function prepareConfigData(Product $product, string $attributeCode, arra
     private function prepareDefaultData(array $attributeList, string $attributeCode, array $productData): array
     {
         if (isset($attributeList[$attributeCode])) {
-            /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
+            /** @var Attribute $attribute */
             $attribute = $attributeList[$attributeCode];
             $attributeType = $attribute->getBackendType();
+            $attributeIsUserDefined = (int) $attribute->getIsUserDefined();
             // For non-numeric types set the attributeValue to 'false' to trigger their removal from the db
             if ($attributeType === 'varchar' || $attributeType === 'text' || $attributeType === 'datetime') {
                 $attribute->setIsRequired(false);
-                $productData[$attributeCode] = $attribute->getDefaultValue() ?: false;
+                $productData[$attributeCode] = $attributeIsUserDefined ? false :
+                    ($attribute->getDefaultValue() ?: false);
             } else {
                 $productData[$attributeCode] = null;
             }

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php

@@ -87,7 +87,7 @@ protected function _isApplicableAttribute($object, $attribute)
     {
         $applyTo = $attribute->getApplyTo() ?: [];
         return (count($applyTo) == 0 || in_array($object->getTypeId(), $applyTo))
-            && $attribute->isInSet($object->getAttributeSetId());
+            && $attribute->isInSet($object->getAttributeSetId() ?? $this->getEntityType()->getDefaultAttributeSetId());
     }
 
     /**