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

Improved various tests.

Browse Source
This commit is contained in:
James Cole
2017-03-04 15:29:20 +01:00
parent 8b4ef4e2da
commit c206a95d55
9 changed files with 167 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Transaction/MassController.php
View File

@@ -144,7 +144,7 @@ class MassController extends Controller
$filtered->push($journal);
}
if (count($messages)) {
if (count($messages) > 0) {
Session::flash('info', $messages);
}

5
app/Rules/Factory/TriggerFactory.php
View File

@@ -45,8 +45,9 @@ class TriggerFactory
$triggerType = $trigger->trigger_type;
/** @var AbstractTrigger $class */
$class = self::getTriggerClass($triggerType);
$obj = $class::makeFromTriggerValue($trigger->trigger_value);
$class = self::getTriggerClass($triggerType);
$obj = $class::makeFromTriggerValue($trigger->trigger_value);
$obj->stopProcessing = $trigger->stop_processing;
Log::debug(sprintf('self::getTriggerClass("%s") = "%s"', $triggerType, $class));
Log::debug(sprintf('%s::makeFromTriggerValue(%s) = object of class "%s"', $class, $trigger->trigger_value, get_class($obj)));

1
app/Rules/Processor.php
View File

@@ -69,6 +69,7 @@ final class Processor
$triggerSet = $rule->ruleTriggers()->orderBy('order', 'ASC')->get();
/** @var RuleTrigger $trigger */
foreach ($triggerSet as $trigger) {
Log::debug(sprintf('Push trigger %d', $trigger->id));
$self->triggers->push(TriggerFactory::getTrigger($trigger));
}
$self->actions = $rule->ruleActions()->orderBy('order', 'ASC')->get();

2
app/Support/Models/TransactionJournalTrait.php
View File

@@ -158,6 +158,7 @@ trait TransactionJournalTrait
foreach ($transactions as $t) {
$list->push($t->account);
}
$list = $list->unique('id');
$cache->store($list);
return $list;
@@ -232,6 +233,7 @@ trait TransactionJournalTrait
foreach ($transactions as $t) {
$list->push($t->account);
}
$list = $list->unique('id');
$cache->store($list);
return $list;