kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-03 11:08:28 +00:00
Code Issues Projects Releases Wiki Activity

Bug fixes in recurring transaction matching.

Browse Source
This commit is contained in:
Sander Dorigo
2014-10-12 09:31:25 +02:00
parent 637a5579ec
commit d9ac681a68
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/Firefly/Trigger/Journals/EloquentJournalTrigger.php
View File

@@ -40,7 +40,7 @@ class EloquentJournalTrigger
*/ */
$count = 0; $count = 0;
foreach ($matches as $word) { foreach ($matches as $word) {
if (!(strpos($description, $word) === false)) { if (!(strpos($description, strtolower($word)) === false)) {
$count++; $count++;
\Log::debug('Recurring transaction #' . $recurring->id . ': word "' . $word . '" found in "' . $description . '".'); \Log::debug('Recurring transaction #' . $recurring->id . ': word "' . $word . '" found in "' . $description . '".');
} }

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

@@ -30,8 +30,13 @@ class EloquentRecurringTrigger
public function createReminders() public function createReminders()
{ {
} }
/**
* @param \RecurringTransaction $recurring
* @param \TransactionJournal $journal
*/
public function rescan(\RecurringTransaction $recurring, \TransactionJournal $journal) public function rescan(\RecurringTransaction $recurring, \TransactionJournal $journal)
{ {
/* /*
@@ -42,7 +47,7 @@ class EloquentRecurringTrigger
$description = strtolower($journal->description); $description = strtolower($journal->description);
$count = 0; $count = 0;
foreach ($matches as $word) { foreach ($matches as $word) {
if (!(strpos($description, $word) === false)) { if (!(strpos($description, strtolower($word)) === false)) {
$count++; $count++;
} }
} }