kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1059

Browse Source
This commit is contained in:
James Cole
2017-12-19 21:54:15 +01:00
parent e8f9796fc5
commit 46f894c09b
2 changed files with 115 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,18 @@ class Amount implements ConverterInterface
Log::debug(sprintf('Alternate search resulted in "%s" for decimal sign.', $decimal));
}
// decimal character still null? Search from the left for '.',',' or ' '.
if (is_null($decimal)) {
Log::debug('Decimal is still NULL, probably number with >2 decimals. Search for a dot.');
$res = strrpos($value, '.');
if (!($res === false)) {
// blandly assume this is the one.
Log::debug(sprintf('Searched from the left for "." in amount "%s", assume this is the decimal sign.', $value));
$decimal = '.';
}
unset($options, $res, $candidate);
}
// if decimal is dot, replace all comma's and spaces with nothing. then parse as float (round to 4 pos)
if ('.' === $decimal) {
$search = [',', ' '];