kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Add ability to move stuff around, fix spelling.

Browse Source
This commit is contained in:
James Cole
2022-09-24 17:43:49 +02:00
parent 600fa388c1
commit a9f2741282
14 changed files with 344 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@ class SearchRuleEngine implements RuleEngineInterface
$searchArray = [];
/** @var Collection $triggers */
$triggers = $rule->ruleTriggers;
$triggers = $rule->ruleTriggers()->orderBy('order', 'ASC')->get();
/** @var RuleTrigger $ruleTrigger */
foreach ($triggers as $ruleTrigger) {
@@ -409,7 +409,7 @@ 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();
$actions = $rule->ruleActions()->orderBy('order', 'ASC')->get();
/** @var RuleAction $ruleAction */
foreach ($actions as $ruleAction) {
if (false === $ruleAction->active) {