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

Expand match to include expense account.

Browse Source
This commit is contained in:
Sander Dorigo 2014-10-14 07:24:59 +02:00
parent 849b711b79
commit b7517b49ed
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/lib/Firefly/Trigger/Recurring/EloquentRecurringTrigger.php
View File

@ -41,21 +41,37 @@ class EloquentRecurringTrigger
$wordMatch = false; $wordMatch = false;
$matches = explode(' ', $recurring->match); $matches = explode(' ', $recurring->match);
$description = strtolower($journal->description); $description = strtolower($journal->description);
$count = 0;
/*
* Attach expense account to description for more narrow matching.
*/
$transactions = $journal->transactions()->get();
/** @var \Transaction $transaction */
foreach ($transactions as $transaction) {
/** @var \Account $account */
$account = $transaction->account()->first();
/** @var \AccountType $type */
$type = $account->accountType()->first();
if ($type->type == 'Expense account' || $type->type == 'Beneficiary account') {
$description .= ' ' . strtolower($account->name);
}
}
$count = 0;
foreach ($matches as $word) { foreach ($matches as $word) {
if (!(strpos($description, strtolower($word)) === false)) { if (!(strpos($description, strtolower($word)) === false)) {
$count++; $count++;
} }
} }
if ($count > 0) { if ($count >= count($matches)) {
$wordMatch = true; $wordMatch = true;
} }
/* /*
* Match amount. * Match amount.
*/ */
$transactions = $journal->transactions()->get();
$amountMatch = false; $amountMatch = false;
if (count($transactions) > 1) { if (count($transactions) > 1) {
$amount = max(floatval($transactions[0]->amount), floatval($transactions[1]->amount)); $amount = max(floatval($transactions[0]->amount), floatval($transactions[1]->amount));
@ -73,6 +89,7 @@ class EloquentRecurringTrigger
$journal->recurringTransaction()->associate($recurring); $journal->recurringTransaction()->associate($recurring);
$journal->save(); $journal->save();
} }
} }
/** /**