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

Fixes for #1747

Browse Source
This commit is contained in:
James Cole
2018-10-14 16:40:12 +02:00
parent 20bebeb7de
commit d624f20107
2 changed files with 82 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Jobs/ExecuteRuleGroupOnExistingTransactions.php
View File

@@ -154,15 +154,15 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue
$processors = $this->collectProcessors();
// Execute the rules for each transaction
foreach ($transactions as $transaction) {
/** @var Processor $processor */
foreach ($processors as $processor) {
foreach ($processors as $processor) {
foreach ($transactions as $transaction) {
/** @var Processor $processor */
$processor->handleTransaction($transaction);
// Stop processing this group if the rule specifies 'stop_processing'
if ($processor->getRule()->stop_processing) {
break;
}
}
// Stop processing this group if the rule specifies 'stop_processing'
if ($processor->getRule()->stop_processing) {
break;
}
}
}
@@ -203,6 +203,7 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue
/** @var Processor $processor */
$processor = app(Processor::class);
$processor->make($rule);
return $processor;
},
$rules->all()