Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for float parsing for csv importrs

Browse Source
This commit is contained in:
David Bomba 2024-01-11 00:18:40 +11:00
parent caa5b4b430
commit a52025dabd
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Import/Transformer/BaseTransformer.php
View File

@ -316,7 +316,7 @@ class BaseTransformer
{
if (array_key_exists($field, $data)) {
//$number = preg_replace('/[^0-9-.]+/', '', $data[$field]);
return Number::parseStringFloat($data[$field]);
return Number::parseFloat($data[$field]);
} else {
//$number = 0;
return 0;
@ -334,7 +334,7 @@ class BaseTransformer
public function getFloatOrOne($data, $field)
{
if (array_key_exists($field, $data)) {
return Number::parseStringFloat($data[$field]) > 0 ? Number::parseStringFloat($data[$field]) : 1;
return Number::parseFloat($data[$field]) > 0 ? Number::parseFloat($data[$field]) : 1;
}
return 1;

28
tests/Unit/NumberTest.php
View File

@ -20,6 +20,34 @@ use Tests\TestCase;
*/
class NumberTest extends TestCase
{
public function testConvertDecimalCommaFloats()
{
$value = '22,00';
$res = Number::parseFloat($value);
$this->assertEquals(22.0, $res);
$value = '22.00';
$res = Number::parseFloat($value);
$this->assertEquals(22.0, $res);
$value = '1,000.00';
$res = Number::parseFloat($value);
$this->assertEquals(1000.0, $res);
$value = '1.000,00';
$res = Number::parseFloat($value);
$this->assertEquals(1000.0, $res);
}
public function testFloatPrecision()
{
$value = 1.1;

1
tests/Unit/WithTypeHelpersTest.php
View File

@ -20,7 +20,6 @@ use Tests\TestCase;
class WithTypeHelpersTest extends TestCase
{
use DatabaseMigrations;
public function testIsImageHelper(): void
{