🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #21802: [Backport] #13612 Fixed-Quantity_and_stock_status when visibility set to storefront throwing exception (by @amol2jcommerce)
 - #21051: Fix broken admin order after emptying order and readding items (by @driskell)
 - #21698: [Backport] 20818 - prevent cache drop for frontend caches on sitemap generation (by @david-fuehr)
 - #21662: [Backport] Fixed: #21278, Add sort order on downloadable links (by @mage2pratik)
 - #20412: Remove sku from operators to validate condition (by @igor-imaginemage)
 - #21800: [Backport] Disable dropdown in JavaScript and CSS Settings in developer configur� (by @ananth-iyer)
 - #21793: [Backport] Fixed wrong proxing in the inventory observer (by @VitaliyBoyko)
 - #21759: [Backport] Wishlist review summary (by @amol2jcommerce)
 - #21433: [Backport] Make it possible to generate sales PDF's using the API (by @amol2jcommerce)


Fixed GitHub Issues:
 - #13612: 1 exception(s): Exception #0 (Exception): Warning: Illegal offset type in isset or empty in /home/jewelrynest2/public_html/magento/vendor/magento/module-eav/Model/Entity/Attribute/Source/AbstractSource.php on line 76 (reported by @kamal3294) has been fixed in #21802 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. e7fb7fe
     2. dcf808e

 - #21278: Sort order missing on Downloadable Product Links and Sample Columns (reported by @maheshWebkul721) has been fixed in #21662 by @mage2pratik in 2.2-develop branch
   Related commits:
     1. f80d382
     2. b7ad075
     3. a9016e9

 - #21384: JS minify field is not disabled in developer configuration (reported by @DanielRuf) has been fixed in #21800 by @ananth-iyer in 2.2-develop branch
   Related commits:
     1. 095b9f4

 - #167: Fatal error: Class 'Mage' not found (reported by @clockworkgeek) has been fixed in #21793 by @VitaliyBoyko in 2.2-develop branch
   Related commits:
     1. 27d113f

 - #21419: Wishlist is missing review summary (reported by @Den4ik) has been fixed in #21759 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. 2aed503
     2. f0b3b92
     3. d9b01e3
     4. 9661291
     5. 3dea8d0

Author: magento-engcom-team

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -153,27 +153,27 @@
             </group>
             <group id="js" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>JavaScript Settings</label>
-                <field id="merge_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="merge_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Merge JavaScript Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="enable_js_bundling" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="enable_js_bundling" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Enable JavaScript Bundling</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Minify JavaScript Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Minification is not applied in developer mode.</comment>
                 </field>
             </group>
             <group id="css" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>CSS Settings</label>
-                <field id="merge_css_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="merge_css_files" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Merge CSS Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Minify CSS Files</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Minification is not applied in developer mode.</comment>

app/code/Magento/CatalogInventory/etc/di.xml

@@ -44,7 +44,7 @@
     </type>
     <type name="Magento\CatalogInventory\Observer\UpdateItemsStockUponConfigChangeObserver">
         <arguments>
-            <argument name="resourceStock" xsi:type="object">Magento\CatalogInventory\Model\ResourceModel\Stock\Proxy</argument>
+            <argument name="resourceStockItem" xsi:type="object">Magento\CatalogInventory\Model\ResourceModel\Stock\Item\Proxy</argument>
         </arguments>
     </type>
     <type name="Magento\Catalog\Model\Layer">

app/code/Magento/CatalogWidget/Setup/UpgradeData.php

@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogWidget\Setup;
+
+use Magento\CatalogWidget\Block\Product\ProductsList;
+use Magento\CatalogWidget\Model\Rule\Condition\Product as ConditionProduct;
+use Magento\Framework\Serialize\Serializer\Json as Serializer;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
+
+/**
+ * Upgrade data for CatalogWidget module.
+ */
+class UpgradeData implements UpgradeDataInterface
+{
+    /**
+     * @var Serializer
+     */
+    private $serializer;
+
+    /**
+     * @param Serializer $serializer
+     */
+    public function __construct(
+        Serializer $serializer
+    ) {
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    {
+        if (version_compare($context->getVersion(), '2.0.1', '<')) {
+            $this->replaceIsWithIsOneOf($setup);
+        }
+    }
+
+    /**
+     *  Replace 'is' condition with 'is one of' in database.
+     *
+     * If 'is' product list condition is used with multiple skus it should be replaced by 'is one of' condition.
+     *
+     * @param ModuleDataSetupInterface $setup
+     */
+    private function replaceIsWithIsOneOf(ModuleDataSetupInterface $setup)
+    {
+        $tableName = $setup->getTable('widget_instance');
+        $connection = $setup->getConnection();
+        $select = $connection->select()
+            ->from(
+                $tableName,
+                [
+                    'instance_id',
+                    'widget_parameters',
+                ]
+            )->where('instance_type = ? ', ProductsList::class);
+
+        $result = $setup->getConnection()->fetchAll($select);
+
+        if ($result) {
+            $updatedData = $this->updateWidgetData($result);
+
+            $connection->insertOnDuplicate(
+                $tableName,
+                $updatedData
+            );
+        }
+    }
+
+    /**
+     * Replace 'is' condition with 'is one of' in widget parameters.
+     *
+     * @param array $result
+     * @return array
+     */
+    private function updateWidgetData(array $result): array
+    {
+        return array_map(
+            function ($widgetData) {
+                $widgetParameters = $this->serializer->unserialize($widgetData['widget_parameters']);
+                foreach ($widgetParameters['conditions'] as &$condition) {
+                    if (ConditionProduct::class === $condition['type'] &&
+                        'sku' === $condition['attribute'] &&
+                        '==' === $condition['operator']) {
+                        $condition['operator'] = '()';
+                    }
+                }
+                $widgetData['widget_parameters'] = $this->serializer->serialize($widgetParameters);
+
+                return $widgetData;
+            },
+            $result
+        );
+    }
+}

app/code/Magento/CatalogWidget/etc/module.xml

@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CatalogWidget" setup_version="2.0.0">
+    <module name="Magento_CatalogWidget" setup_version="2.0.1">
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_Widget"/>

app/code/Magento/Checkout/etc/di.xml

@@ -49,7 +49,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Quote\Model\Quote">
-        <plugin name="clear_addresses_after_product_delete" type="Magento\Checkout\Plugin\Model\Quote\ResetQuoteAddresses"/>
-    </type>
 </config>

app/code/Magento/Checkout/etc/frontend/di.xml

@@ -96,4 +96,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Model\Quote">
+        <plugin name="clear_addresses_after_product_delete" type="Magento\Checkout\Plugin\Model\Quote\ResetQuoteAddresses"/>
+    </type>
 </config>

app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php

@@ -3,22 +3,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Downloadable\Model\Product\Type;
-use Magento\Downloadable\Model\Source\TypeUpload;
 use Magento\Downloadable\Model\Source\Shareable;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Downloadable\Model\Source\TypeUpload;
 use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Ui\Component\DynamicRows;
 use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Container;
+use Magento\Ui\Component\DynamicRows;
 use Magento\Ui\Component\Form;
 
 /**
- * Class adds a grid with links
+ * Class adds a grid with links.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Links extends AbstractModifier
@@ -86,7 +88,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyData(array $data)
     {
@@ -101,7 +103,7 @@ public function modifyData(array $data)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function modifyMeta(array $meta)
@@ -160,6 +162,8 @@ public function modifyMeta(array $meta)
     }
 
     /**
+     * Get dynamic rows meta.
+     *
      * @return array
      */
     protected function getDynamicRows()
@@ -180,6 +184,8 @@ protected function getDynamicRows()
     }
 
     /**
+     * Get single link record meta.
+     *
      * @return array
      */
     protected function getRecord()
@@ -221,6 +227,8 @@ protected function getRecord()
     }
 
     /**
+     * Get link title meta.
+     *
      * @return array
      */
     protected function getTitleColumn()
@@ -232,6 +240,7 @@ protected function getTitleColumn()
             'label' => __('Title'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 10,
         ];
         $titleField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Input::NAME,
@@ -247,6 +256,8 @@ protected function getTitleColumn()
     }
 
     /**
+     * Get link price meta.
+     *
      * @return array
      */
     protected function getPriceColumn()
@@ -258,6 +269,7 @@ protected function getPriceColumn()
             'label' => __('Price'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 20,
         ];
         $priceField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Input::NAME,
@@ -281,6 +293,8 @@ protected function getPriceColumn()
     }
 
     /**
+     * Get link file element meta.
+     *
      * @return array
      */
     protected function getFileColumn()
@@ -292,6 +306,7 @@ protected function getFileColumn()
             'label' => __('File'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 30,
         ];
         $fileTypeField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Select::NAME,
@@ -344,6 +359,8 @@ protected function getFileColumn()
     }
 
     /**
+     * Get sample container meta.
+     *
      * @return array
      */
     protected function getSampleColumn()
@@ -355,6 +372,7 @@ protected function getSampleColumn()
             'label' => __('Sample'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 40,
         ];
         $sampleTypeField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Select::NAME,
@@ -403,6 +421,8 @@ protected function getSampleColumn()
     }
 
     /**
+     * Get link "is sharable" element meta.
+     *
      * @return array
      */
     protected function getShareableColumn()
@@ -413,13 +433,16 @@ protected function getShareableColumn()
             'componentType' => Form\Field::NAME,
             'dataType' => Form\Element\DataType\Number::NAME,
             'dataScope' => 'is_shareable',
+            'sortOrder' => 50,
             'options' => $this->shareable->toOptionArray(),
         ];
 
         return $shareableField;
     }
 
     /**
+     * Get link "max downloads" element meta.
+     *
      * @return array
      */
     protected function getMaxDownloadsColumn()
@@ -431,6 +454,7 @@ protected function getMaxDownloadsColumn()
             'label' => __('Max. Downloads'),
             'showLabel' => false,
             'dataScope' => '',
+            'sortOrder' => 60,
         ];
         $numberOfDownloadsField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Input::NAME,