Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

Improve parseFloat function

Browse Source
This commit is contained in:
David Bomba 2024-02-20 13:29:30 +11:00
parent 25df7eacad
commit 328d00e235
3 changed files with 92 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/ClientPortal/PrePaymentController.php
View File

@ -12,16 +12,17 @@
namespace App\Http\Controllers\ClientPortal;
use App\Utils\Number;
use App\Utils\HtmlEngine;
use Illuminate\View\View;
use App\DataMapper\InvoiceItem;
use App\Factory\InvoiceFactory;
use App\Http\Controllers\Controller;
use App\Http\Requests\ClientPortal\PrePayments\StorePrePaymentRequest;
use App\Repositories\InvoiceRepository;
use App\Utils\Number;
use App\Utils\Traits\MakesDates;
use App\Utils\Traits\MakesHash;
use App\Utils\Traits\MakesDates;
use App\Http\Controllers\Controller;
use Illuminate\Contracts\View\Factory;
use Illuminate\View\View;
use App\Repositories\InvoiceRepository;
use App\Http\Requests\ClientPortal\PrePayments\StorePrePaymentRequest;
/**
* Class PrePaymentController.

53
app/Utils/Number.php
View File

@ -98,28 +98,49 @@ class Number
if(!$value)
return 0;
$multiplier = false;
//remove everything except for numbers, decimals, commas and hyphens
$value = preg_replace('/[^0-9.,-]+/', '', $value);
if(substr($value, 0,1) == '-')
$multiplier = -1;
$decimal = strpos($value, '.');
$comma = strpos($value, ',');
if(!$comma) //no comma must be a decimal number already
return (float) $value;
// convert "," to "."
$s = str_replace(',', '.', $value);
// remove everything except numbers and dot "."
$s = preg_replace("/[^0-9\.]/", '', $s);
if ($s < 1) {
return (float) $s;
if($decimal < $comma){ //decimal before a comma = euro
$value = str_replace(['.',','], ['','.'], $value);
// $value = str_replace(',', '.', $value);
return (float) $value;
}
// remove all separators from first part and keep the end
$s = str_replace('.', '', substr($s, 0, -3)).substr($s, -3);
//comma first = traditional thousan separator
$value = str_replace(',', '', $value);
return (float)$value;
// if(!$value)
// return 0;
if($multiplier)
$s = floatval($s)*-1;
// $multiplier = false;
return (float) $s;
// if(substr($value, 0,1) == '-')
// $multiplier = -1;
// $s = str_replace(',', '.', $value);
// $s = preg_replace("/[^0-9\.]/", '', $s);
// if ($s < 1) {
// return (float) $s;
// }
// $s = str_replace('.', '', substr($s, 0, -3)).substr($s, -3);
// if($multiplier)
// $s = floatval($s)*-1;
// return (float) $s;
}
public static function parseStringFloat($value)

48
tests/Unit/NumberTest.php
View File

@ -20,6 +20,36 @@ use Tests\TestCase;
*/
class NumberTest extends TestCase
{
public function testNegativeFloatParse()
{
$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 = '-2200,00';
$res = Number::parseFloat($value);
$this->assertEquals(-2200.0, $res);
$value = '-2.200,00';
$res = Number::parseFloat($value);
$this->assertEquals(-2200.0, $res);
$this->assertEquals(-2200, $res);
}
public function testConvertDecimalCommaFloats()
{
@ -123,4 +153,22 @@ class NumberTest extends TestCase
$this->assertEquals(7.99, $converted_amount);
}
public function testMultiCommaNumber()
{
$amount = '100,100.00';
$converted_amount = Number::parseFloat($amount);
$this->assertEquals(100100, $converted_amount);
}
public function testMultiDecimalNumber()
{
$amount = '100.1000.000,00';
$converted_amount = Number::parseFloat($amount);
$this->assertEquals(1001000000, $converted_amount);
}
}