MAGETWO-88504: Tiered pricing and quantity Increments do not work with decimal inventory

Author: dhorytskyi

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php

@@ -24,8 +24,6 @@
 use Magento\Ui\Component\Form\Element\Select;
 use Magento\Ui\Component\Form\Field;
 use Magento\Ui\Component\Modal;
-use Magento\CatalogInventory\Api\StockRegistryInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Class AdvancedPricing
@@ -102,11 +100,6 @@ class AdvancedPricing extends AbstractModifier
      */
     private $customerGroupSource;
 
-    /**
-     * @var StockRegistryInterface
-     */
-    private $stockRegistry;
-
     /**
      * @param LocatorInterface $locator
      * @param StoreManagerInterface $storeManager
@@ -118,7 +111,6 @@ class AdvancedPricing extends AbstractModifier
      * @param ArrayManager $arrayManager
      * @param string $scopeName
      * @param GroupSourceInterface $customerGroupSource
-     * @param StockRegistryInterface $stockRegistry
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -131,8 +123,7 @@ public function __construct(
         Data $directoryHelper,
         ArrayManager $arrayManager,
         $scopeName = '',
-        GroupSourceInterface $customerGroupSource = null,
-        StockRegistryInterface $stockRegistry = null
+        GroupSourceInterface $customerGroupSource = null
     ) {
         $this->locator = $locator;
         $this->storeManager = $storeManager;
@@ -145,8 +136,6 @@ public function __construct(
         $this->scopeName = $scopeName;
         $this->customerGroupSource = $customerGroupSource
             ?: ObjectManager::getInstance()->get(GroupSourceInterface::class);
-        $this->stockRegistry = $stockRegistry
-            ?: ObjectManager::getInstance()->get(StockRegistryInterface::class);
     }
 
     /**
@@ -511,8 +500,8 @@ private function getTierPriceStructure($tierPricePath)
                                         'validation' => [
                                             'required-entry' => true,
                                             'validate-greater-than-zero' => true,
+                                            'validate-digits' => false,
                                             'validate-number' => true,
-                                            'validate-digits' => $this->hasPriceQtyDigitsValidationPassed(),
                                         ],
                                     ],
                                 ],
@@ -686,25 +675,4 @@ private function getStore()
     {
         return $this->locator->getStore();
     }
-
-    /**
-     * Get Price Qty digits validation
-     *
-     * @return bool
-     */
-    private function hasPriceQtyDigitsValidationPassed(): bool
-    {
-        $productId = $this->locator->getProduct()->getId();
-        if ($productId) {
-            try {
-                $result = $this->stockRegistry->getStockItem($productId)->getIsQtyDecimal();
-            } catch (NoSuchEntityException $e) {
-                $result = false;
-            }
-        } else {
-            $result = false;
-        }
-
-        return $result;
-    }
 }

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php

@@ -9,8 +9,6 @@
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Ui\Component\Form;
 use Magento\Framework\Stdlib\ArrayManager;
-use Magento\CatalogInventory\Api\StockRegistryInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Data provider for main panel of product page
@@ -37,25 +35,16 @@ class General extends AbstractModifier
      */
     private $localeCurrency;
 
-    /**
-     * @var StockRegistryInterface
-     */
-    private $stockRegistry;
-
     /**
      * @param LocatorInterface $locator
      * @param ArrayManager $arrayManager
-     * @param StockRegistryInterface $stockRegistry
      */
     public function __construct(
         LocatorInterface $locator,
-        ArrayManager $arrayManager,
-        StockRegistryInterface $stockRegistry = null
+        ArrayManager $arrayManager
     ) {
         $this->locator = $locator;
         $this->arrayManager = $arrayManager;
-        $this->stockRegistry = $stockRegistry
-            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(StockRegistryInterface::class);
     }
 
     /**
@@ -117,7 +106,7 @@ protected function customizeAdvancedPriceFormat(array $data)
                 $value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE] =
                     $this->formatPrice($value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE]);
                 $value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY] =
-                    $this->formatPriceQty($value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY]);
+                    (float) $value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY];
             }
         }
 
@@ -419,24 +408,6 @@ protected function formatPrice($value)
         return $value;
     }
 
-    /**
-     * Make price qty even int or decimal
-     *
-     * @param int|float|string $priceQty
-     * @return int|float
-     */
-    private function formatPriceQty($priceQty)
-    {
-        $productId = $this->locator->getProduct()->getId();
-        try {
-            $isQtyDecimal = $this->stockRegistry->getStockItem($productId)->getIsQtyDecimal();
-        } catch (NoSuchEntityException $e) {
-            $isQtyDecimal = false;
-        }
-
-        return ($isQtyDecimal ? (float) $priceQty : (int) $priceQty);
-    }
-
     /**
      * Format number according to the locale of the currency and precision of input
      *