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

New code for double transfer routine. #797

Browse Source
This commit is contained in:
James Cole 2017-09-05 06:43:33 +02:00
parent a942313f85
commit 068b9e388f
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/Import/Storage/ImportStorage.php
View File

@ -210,24 +210,29 @@ class ImportStorage
$amount = app('steam')->positive($parameters['amount']); $amount = app('steam')->positive($parameters['amount']);
$names = [$parameters['asset'], $parameters['opposing']]; $names = [$parameters['asset'], $parameters['opposing']];
$transfer = []; $transfer = [];
$hit = false;
sort($names); sort($names);
foreach ($this->transfers as $transfer) { foreach ($this->transfers as $transfer) {
if ($parameters['description'] !== $transfer['description']) { if ($parameters['description'] === $transfer['description']) {
return false; $hit = true;
} }
if ($names !== $transfer['names']) { if ($names === $transfer['names']) {
return false; $hit = true;
} }
if (bccomp($amount, $transfer['amount']) !== 0) { if (bccomp($amount, $transfer['amount']) === 0) {
return false; $hit = true;
} }
if ($parameters['date'] !== $transfer['date']) { if ($parameters['date'] === $transfer['date']) {
return false; $hit = true;
} }
} }
Log::error('There already is a transfer imported with these properties. Compare existing with new. ', ['existing' => $transfer, 'new' => $parameters]); if ($hit === true) {
Log::error(
'There already is a transfer imported with these properties. Compare existing with new. ', ['existing' => $transfer, 'new' => $parameters]
);
}
return true; return $hit;
} }
} }