diff --git a/VERSION.txt b/VERSION.txt index 6f4fe76b0940..3303dc1e62c8 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.8.8 \ No newline at end of file +5.8.9 \ No newline at end of file diff --git a/app/Import/Transformer/BaseTransformer.php b/app/Import/Transformer/BaseTransformer.php index 03928b2fa698..78de66a65ed9 100644 --- a/app/Import/Transformer/BaseTransformer.php +++ b/app/Import/Transformer/BaseTransformer.php @@ -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; diff --git a/config/ninja.php b/config/ninja.php index 92afeebfa804..5b4b6137b502 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -17,8 +17,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => env('APP_VERSION', '5.8.8'), - 'app_tag' => env('APP_TAG', '5.8.8'), + 'app_version' => env('APP_VERSION', '5.8.9'), + 'app_tag' => env('APP_TAG', '5.8.9'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false), diff --git a/tests/Unit/NumberTest.php b/tests/Unit/NumberTest.php index 8cd7f0ccaff4..cb77451996d0 100644 --- a/tests/Unit/NumberTest.php +++ b/tests/Unit/NumberTest.php @@ -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; diff --git a/tests/Unit/WithTypeHelpersTest.php b/tests/Unit/WithTypeHelpersTest.php index d5ec9faeecc2..0bbe5f6acba4 100644 --- a/tests/Unit/WithTypeHelpersTest.php +++ b/tests/Unit/WithTypeHelpersTest.php @@ -20,7 +20,6 @@ use Tests\TestCase; class WithTypeHelpersTest extends TestCase { - use DatabaseMigrations; public function testIsImageHelper(): void {