IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added support for multiple decimal places

Browse Source
This commit is contained in:
Matthew Peck 2016-09-19 23:53:51 +01:00
parent b9e2ee7af3
commit 8cd901b57b
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Import/Converter/Amount.php
View File

@ -23,6 +23,18 @@ class Amount extends BasicConverter implements ConverterInterface
* Some people, when confronted with a problem, think "I know, I'll use regular expressions." Now they have two problems.
* - Jamie Zawinski
*
* 0.01 4 1
* 0.10 4 1
* 0.1 3 0
* 1.00 4 1
* 1.0 3 0
* 1 1 -3
* 1.01 4 1
* 1.10 4 1
* 1.1 3 0
* 1.11 4 1
*
*
* @param $value
*
* @return float
@ -33,12 +45,11 @@ class Amount extends BasicConverter implements ConverterInterface
$decimalPosition = $len - 3;
$decimal = null;
if ($len > 2 && $value{$decimalPosition} == '.') {
if (($len > 2 && $value{$decimalPosition} == '.') || ($len > 2 && strpos($value, '.') > $decimalPosition)) {
$decimal = '.';
}
if ($len > 2 && $value{$decimalPosition} == ',') {
} else if ($len > 2 && $value{$decimalPosition} == ',') {
$decimal = ',';
}
}
// if decimal is dot, replace all comma's and spaces with nothing. then parse as float (round to 4 pos)
if ($decimal === '.') {