Merge remote-tracking branch 'tango-ce/MAGETWO-52701' into MAGETWO-52779

Author: magicbunneh

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

@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Ui\DataProvider\Modifier\ModifierInterface;
-use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
  * Class AbstractModifier
@@ -195,13 +195,24 @@ protected function getGroupCodeByField(array $meta, $field)
     }
 
     /**
-     * Format number to have only two decimals after delimiter
+     * Format price to have only two decimals after delimiter
      *
      * @param mixed $value
      * @return string
      */
-    protected function formatFloat($value)
+    protected function formatPrice($value)
     {
-        return $value !== null ? number_format((float)$value, 2, '.', '') : '';
+        return $value !== null ? number_format((float)$value, PriceCurrencyInterface::DEFAULT_PRECISION, '.', '') : '';
+    }
+
+    /**
+     * Strip excessive decimal digits from weight number
+     *
+     * @param mixed $value
+     * @return string
+     */
+    protected function formatWeight($value)
+    {
+        return (float)$value;
     }
 }

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

@@ -156,12 +156,12 @@ public function modifyData(array $data)
 
         /** @var \Magento\Catalog\Model\Product\Option $option */
         foreach ($productOptions as $index => $option) {
-            $options[$index] = $this->formatFloatByPath(static::FIELD_PRICE_NAME, $option->getData());
+            $options[$index] = $this->formatPriceByPath(static::FIELD_PRICE_NAME, $option->getData());
             $values = $option->getValues() ?: [];
 
             /** @var \Magento\Catalog\Model\Product\Option $value */
             foreach ($values as $value) {
-                $options[$index][static::GRID_TYPE_SELECT_NAME][] = $this->formatFloatByPath(
+                $options[$index][static::GRID_TYPE_SELECT_NAME][] = $this->formatPriceByPath(
                     static::FIELD_PRICE_NAME,
                     $value->getData()
                 );
@@ -188,12 +188,12 @@ public function modifyData(array $data)
      * @param array $data
      * @return array
      */
-    protected function formatFloatByPath($path, array $data)
+    protected function formatPriceByPath($path, array $data)
     {
         $value = $this->arrayManager->get($path, $data);
 
         if (is_numeric($value)) {
-            $data = $this->arrayManager->replace($path, $data, $this->formatFloat($value));
+            $data = $this->arrayManager->replace($path, $data, $this->formatPrice($value));
         }
 
         return $data;

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

@@ -354,7 +354,7 @@ public function modifyData(array $data)
             foreach ($attributes as $attribute) {
                 if (null !== ($attributeValue = $this->setupAttributeData($attribute))) {
                     if ($attribute->getFrontendInput() === 'price' && is_scalar($attributeValue)) {
-                        $attributeValue = $this->formatFloat($attributeValue);
+                        $attributeValue = $this->formatPrice($attributeValue);
                     }
                     $data[$productId][self::DATA_SOURCE_DEFAULT][$attribute->getAttributeCode()] = $attributeValue;
                 }

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

@@ -42,7 +42,7 @@ public function __construct(
      */
     public function modifyData(array $data)
     {
-        $data = $this->customizeNumberFormat($data);
+        $data = $this->customizeWeightFormat($data);
         $data = $this->customizeAdvancedPriceFormat($data);
         $modelId = $this->locator->getProduct()->getId();
 
@@ -54,42 +54,29 @@ public function modifyData(array $data)
     }
 
     /**
-     * Customizing number fields
+     * Customizing weight fields
      *
      * @param array $data
      * @return array
      */
-    protected function customizeNumberFormat(array $data)
+    protected function customizeWeightFormat(array $data)
     {
         $model = $this->locator->getProduct();
         $modelId = $model->getId();
-        $numberFields = [ProductAttributeInterface::CODE_WEIGHT];
+        $weightFields = [ProductAttributeInterface::CODE_WEIGHT];
 
-        foreach ($numberFields as $fieldCode) {
+        foreach ($weightFields as $fieldCode) {
             $path = $modelId . '/' . self::DATA_SOURCE_DEFAULT . '/' . $fieldCode;
-            $number = (float)$this->arrayManager->get($path, $data);
             $data = $this->arrayManager->replace(
                 $path,
                 $data,
-                $this->formatNumber($number)
+                $this->formatWeight($this->arrayManager->get($path, $data))
             );
         }
 
         return $data;
     }
 
-    /**
-     * Formatting numeric field
-     *
-     * @param float $number
-     * @param int $decimals
-     * @return string
-     */
-    protected function formatNumber($number, $decimals = 2)
-    {
-        return number_format($number, $decimals);
-    }
-
     /**
      * Customizing number fields for advanced price
      *
@@ -104,7 +91,7 @@ protected function customizeAdvancedPriceFormat(array $data)
         if (isset($data[$modelId][self::DATA_SOURCE_DEFAULT][$fieldCode])) {
             foreach ($data[$modelId][self::DATA_SOURCE_DEFAULT][$fieldCode] as &$value) {
                 $value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE] =
-                    $this->formatNumber($value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE]);
+                    $this->formatPrice($value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE]);
                 $value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY] =
                     (int)$value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY];
             }