kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 02:45:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix comma parsing when users search for amount:12,34

Browse Source
This commit is contained in:
James Cole
2020-12-01 12:24:23 +01:00
parent dd85b8d46a
commit c563340532
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Support/Search/OperatorQuerySearch.php
View File

@@ -498,17 +498,27 @@ class OperatorQuerySearch implements SearchInterface
// amount // amount
// //
case 'amount_exactly': case 'amount_exactly':
$amount = app('steam')->positive((string)$value);
// strip comma's, make dots.
$value = str_replace(',', '.', (string)$value);
$amount = app('steam')->positive($value);
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount)); Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
$this->collector->amountIs($amount); $this->collector->amountIs($amount);
break; break;
case 'amount_less': case 'amount_less':
$amount = app('steam')->positive((string)$value); // strip comma's, make dots.
$value = str_replace(',', '.', (string)$value);
$amount = app('steam')->positive($value);
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount)); Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
$this->collector->amountLess($amount); $this->collector->amountLess($amount);
break; break;
case 'amount_more': case 'amount_more':
$amount = app('steam')->positive((string)$value); // strip comma's, make dots.
$value = str_replace(',', '.', (string)$value);
$amount = app('steam')->positive($value);
Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount)); Log::debug(sprintf('Set "%s" using collector with value "%s"', $operator, $amount));
$this->collector->amountMore($amount); $this->collector->amountMore($amount);
break; break;