Merge remote-tracking branch 'origin/master'

Administrator
2 parents f5b3baf1 49bb0055
Showing 2 changed files with 19 additions and 1 deletions Show diff stats
backend/controllers/RgGrupController.php
common/components/parsers/CustomConverter.php
@@ -174,7 +174,8 @@ class RgGrupController extends BaseController
                     $row['importer_id'] = trim($importer_id);
                     $row['margin_id'] = ltrim($key, '!');
-                    $row['koef'] = \Yii::$app->converter->convertTo('float', $value);
+                    $row['koef'] = \Yii::$app->converter->convertTo('float', $value, ['precision' => 6]);
+
                     $arr_values[] = $row;
@@ -15,6 +15,8 @@ class CustomConverter extends Converter
     public static $importer_id;
     public static $brand;
     public static $begin_of_the_day = true;
+    // точность для округления десятичных чисел
+    public static $precision = 2;
     public static function convertToDetails(array $row)
     {
@@ -145,5 +147,20 @@ class CustomConverter extends Converter
         return $res;
     }
+    public static function convertToFloat( $value )
+    {
+        if ($value == '') {
+            $value = 0;
+        }
+        $value = trim(str_replace(",", ".", $value));
+        $value = preg_replace("/[^0-9.]+/", "", strtoupper($value));
+
+        if ($value == '') {
+            return '';
+        }
+        $value = round( (float)$value, self::$precision );
+
+        return $value;
+    }
 }
 \ No newline at end of file