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

Update Processor with new situation.

Browse Source
This commit is contained in:
James Cole
2016-02-17 19:08:27 +01:00
parent 12b6791e8b
commit 5f9c61c4b4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Rules/Processor.php
View File

@@ -85,7 +85,7 @@ class Processor
* @var int $index
* @var RuleAction $action
*/
foreach ($this->rule->ruleActions()->orderBy('order', 'ASC')->get() as $action) {
foreach ($this->actions as $action) {
/** @var ActionInterface $actionClass */
$actionClass = ActionFactory::getAction($action, $this->journal);
$actionClass->act();
@@ -114,7 +114,8 @@ class Processor
/** @var TriggerInterface $triggerObject */
$triggerObject = TriggerFactory::getTrigger($trigger);
if ($triggerObject->triggered()) {
// no need to keep pushing the journal around!
if ($triggerObject->triggered($this->journal)) {
$hitTriggers++;
}
if ($trigger->stop_processing) {