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

Merge branch 'hotfix/4.7.3.1'

Browse Source
This commit is contained in:
James Cole 2018-05-14 19:24:53 +02:00
commit a826b0e0fb
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/RuleController.php
View File

@ -541,6 +541,7 @@ class RuleController extends Controller
'title' => trans('firefly.default_rule_name'), 'title' => trans('firefly.default_rule_name'),
'description' => trans('firefly.default_rule_description'), 'description' => trans('firefly.default_rule_description'),
'trigger' => 'store-journal', 'trigger' => 'store-journal',
'strict' => true,
'rule-trigger-values' => [ 'rule-trigger-values' => [
trans('firefly.default_rule_trigger_description'), trans('firefly.default_rule_trigger_description'),
trans('firefly.default_rule_trigger_from_account'), trans('firefly.default_rule_trigger_from_account'),

6
app/TransactionRules/Processor.php
View File

@ -31,6 +31,7 @@ use FireflyIII\TransactionRules\Actions\ActionInterface;
use FireflyIII\TransactionRules\Factory\ActionFactory; use FireflyIII\TransactionRules\Factory\ActionFactory;
use FireflyIII\TransactionRules\Factory\TriggerFactory; use FireflyIII\TransactionRules\Factory\TriggerFactory;
use FireflyIII\TransactionRules\Triggers\AbstractTrigger; use FireflyIII\TransactionRules\Triggers\AbstractTrigger;
use FireflyIII\TransactionRules\Triggers\UserAction;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;
@ -279,11 +280,14 @@ final class Processor
Log::debug('Is a match!'); Log::debug('Is a match!');
++$hitTriggers; ++$hitTriggers;
// is non-strict? then return true! // is non-strict? then return true!
if (!$this->strict) { if (!$this->strict && UserAction::class !== \get_class($trigger)) {
Log::debug('Rule is set as non-strict, return true!'); Log::debug('Rule is set as non-strict, return true!');
return true; return true;
} }
if (!$this->strict && UserAction::class === \get_class($trigger)) {
Log::debug('Rule is set as non-strict, but action was "user-action". Will not return true.');
}
} }
if ($trigger->stopProcessing) { if ($trigger->stopProcessing) {
Log::debug('Stop processing this trigger and break.'); Log::debug('Stop processing this trigger and break.');