Merge remote-tracking branch 'borg/MC-13875' into MC-13852

Author: rganin

app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab;
 
-use Magento\Customer\Api\Data\GroupInterface;
-
 /**
  * Products mass update inventory tab
  *
@@ -31,29 +29,20 @@ class Inventory extends \Magento\Backend\Block\Widget implements \Magento\Backen
      */
     protected $disabledFields = [];
 
-    /**
-     * @var \Magento\Framework\Serialize\SerializerInterface
-     */
-    private $serializer;
-
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\CatalogInventory\Model\Source\Backorders $backorders
      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
      * @param array $data
-     * @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\CatalogInventory\Model\Source\Backorders $backorders,
         \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
-        array $data = [],
-        \Magento\Framework\Serialize\SerializerInterface $serializer = null
+        array $data = []
     ) {
         $this->_backorders = $backorders;
         $this->stockConfiguration = $stockConfiguration;
-        $this->serializer = $serializer ?? \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Serialize\SerializerInterface::class);
         parent::__construct($context, $data);
     }
 
@@ -85,9 +74,7 @@ public function getFieldSuffix()
      */
     public function getStoreId()
     {
-        $storeId = (int)$this->getRequest()->getParam('store');
-
-        return $storeId;
+        return (int)$this->getRequest()->getParam('store');
     }
 
     /**
@@ -101,22 +88,6 @@ public function getDefaultConfigValue($field)
         return $this->stockConfiguration->getDefaultConfigValue($field);
     }
 
-    /**
-     * Returns min_sale_qty configuration for the ALL Customer Group
-     *
-     * @return float
-     */
-    public function getDefaultMinSaleQty()
-    {
-        $default = $this->stockConfiguration->getDefaultConfigValue('min_sale_qty');
-        if (!is_numeric($default)) {
-            $default = $this->serializer->unserialize($default);
-            $default = $default[GroupInterface::CUST_GROUP_ALL] ?? 1;
-        }
-
-        return (float) $default;
-    }
-
     /**
      * Tab settings
      *

app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/InventoryTest.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Test\Unit\Block\Adminhtml\Product\Edit\Action\Attribute\Tab;
 
-use Magento\Customer\Api\Data\GroupInterface;
-
 /**
  * Class InventoryTest
  */
@@ -70,8 +68,7 @@ protected function setUp()
             [
                 'context' => $this->contextMock,
                 'backorders' => $this->backordersMock,
-                'stockConfiguration' => $this->stockConfigurationMock,
-                'serializer' => new \Magento\Framework\Serialize\Serializer\Json(),
+                'stockConfiguration' => $this->stockConfigurationMock
             ]
         );
     }
@@ -129,32 +126,6 @@ public function testGetDefaultConfigValue()
         $this->assertEquals('return-value', $this->inventory->getDefaultConfigValue('field-name'));
     }
 
-    /**
-     * @dataProvider getDefaultMinSaleQtyDataProvider
-     * @param string $expected
-     * @param string $default
-     */
-    public function testGetDefaultMinSaleQty($expected, $default)
-    {
-        $this->stockConfigurationMock->method('getDefaultConfigValue')->willReturn($default);
-        $this->assertEquals($expected, $this->inventory->getDefaultMinSaleQty());
-    }
-
-    public function getDefaultMinSaleQtyDataProvider()
-    {
-        return [
-            'single-default-value' => [
-                22, '22'
-            ],
-            'no-default-for-all-group' => [
-                1, json_encode(['12' => '111'])
-            ],
-            'default-for-all-group' => [
-                5, json_encode(['12' => '111', GroupInterface::CUST_GROUP_ALL => '5'])
-            ]
-        ];
-    }
-
     /**
      * Run test getTabLabel method
      *

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml

@@ -30,6 +30,13 @@
     });
 </script>
 
+<?php
+$defaultMinSaleQty = $block->getDefaultConfigValue('min_sale_qty');
+if (!is_numeric($defaultMinSaleQty)) {
+    $defaultMinSaleQty = json_decode($defaultMinSaleQty, true);
+    $defaultMinSaleQty = (float) $defaultMinSaleQty[\Magento\Customer\Api\Data\GroupInterface::CUST_GROUP_ALL] ?? 1;
+}
+?>
 <div class="fieldset-wrapper form-inline advanced-inventory-edit">
     <div class="fieldset-wrapper-title">
         <strong class="title">
@@ -132,7 +139,7 @@
                     <div class="field">
                         <input type="text" class="input-text validate-number" id="inventory_min_sale_qty"
                                name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[min_sale_qty]"
-                               value="<?= /* @escapeNotVerified */ $block->getDefaultMinSaleQty() * 1 ?>"
+                               value="<?= /* @escapeNotVerified */ $defaultMinSaleQty ?>"
                                disabled="disabled"/>
                     </div>
                     <div class="field choice">