kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-06 04:34:00 +00:00
Code Issues Projects Releases Wiki Activity

Various new code.

Browse Source
This commit is contained in:
James Cole
2022-01-30 16:53:57 +01:00
parent d26e847d54
commit 30fc0fbf54
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Support/Binder/EitherConfigKey.php
View File

@@ -46,6 +46,7 @@ class EitherConfigKey
'firefly.enable_external_map', 'firefly.enable_external_map',
'firefly.expected_source_types', 'firefly.expected_source_types',
'firefly.credit_card_types', 'firefly.credit_card_types',
'firefly.languages',
'app.timezone', 'app.timezone',
]; ];

6
app/TransactionRules/Engine/SearchRuleEngine.php
View File

@@ -457,8 +457,12 @@ class SearchRuleEngine implements RuleEngineInterface
private function processTransactionJournal(Rule $rule, array $transaction): void private function processTransactionJournal(Rule $rule, array $transaction): void
{ {
Log::debug(sprintf('SearchRuleEngine:: Will now execute actions on transaction journal #%d', $transaction['transaction_journal_id'])); Log::debug(sprintf('SearchRuleEngine:: Will now execute actions on transaction journal #%d', $transaction['transaction_journal_id']));
$actions = $rule->ruleActions()->get();
/** @var RuleAction $ruleAction */ /** @var RuleAction $ruleAction */
foreach ($rule->ruleActions()->where('active', true)->get() as $ruleAction) { foreach ($actions as $ruleAction) {
if(false === $ruleAction->active) {
continue;
}
$break = $this->processRuleAction($ruleAction, $transaction); $break = $this->processRuleAction($ruleAction, $transaction);
if (true === $break) { if (true === $break) {
break; break;