IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-16 18:25:00 -06:00
Code Issues Packages 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
No known key found for this signature in database
GPG Key ID: BDE6667570EADBD5
3 changed files with 7 additions and 2 deletions
Show Stats 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.expected_source_types',
'firefly.credit_card_types',
'firefly.languages',
'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
{
Log::debug(sprintf('SearchRuleEngine:: Will now execute actions on transaction journal #%d', $transaction['transaction_journal_id']));
$actions = $rule->ruleActions()->get();
/** @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);
if (true === $break) {
break;

2
config/firefly.php
View File

@ -168,7 +168,7 @@ return [
// 'lt_LT' => ['name_locale' => 'Lietuvių', 'name_english' => 'Lithuanian'],
'nb_NO' => ['name_locale' => 'Norsk', 'name_english' => 'Norwegian'],
'nl_NL' => ['name_locale' => 'Nederlands', 'name_english' => 'Dutch'],
'pl_PL' => ['name_locale' => 'Polski', 'name_english' => 'Polish '],
'pl_PL' => ['name_locale' => 'Polski', 'name_english' => 'Polish'],
'pt_BR' => ['name_locale' => 'Português do Brasil', 'name_english' => 'Portuguese (Brazil)'],
'pt_PT' => ['name_locale' => 'Português', 'name_english' => 'Portuguese'],
'ro_RO' => ['name_locale' => 'Română', 'name_english' => 'Romanian'],