From a751218d53ddd65ad423e6ad5d5f0eb0f21479bd Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 21 Sep 2025 17:52:07 +0200 Subject: [PATCH] Fix rule order for #10938 --- app/TransactionRules/Engine/SearchRuleEngine.php | 5 +++-- config/firefly.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/TransactionRules/Engine/SearchRuleEngine.php b/app/TransactionRules/Engine/SearchRuleEngine.php index c4b4822ba4..a2164cf2fe 100644 --- a/app/TransactionRules/Engine/SearchRuleEngine.php +++ b/app/TransactionRules/Engine/SearchRuleEngine.php @@ -508,9 +508,10 @@ class SearchRuleEngine implements RuleEngineInterface { Log::debug(sprintf('Going to fire group #%d with %d rule(s)', $group->id, $group->rules->count())); + $rules = $group->rules()->orderBy('order', 'ASC')->get(); /** @var Rule $rule */ - foreach ($group->rules as $rule) { - Log::debug(sprintf('Going to fire rule #%d from group #%d', $rule->id, $group->id)); + foreach ($rules as $rule) { + Log::debug(sprintf('Going to fire rule #%d with order #%d from group #%d', $rule->id, $rule->order, $group->id)); $result = $this->fireRule($rule); if (true === $result && true === $rule->stop_processing) { Log::debug(sprintf('The rule was triggered and rule->stop_processing = true, so group #%d will stop processing further rules.', $group->id)); diff --git a/config/firefly.php b/config/firefly.php index c1c9db8f92..8f26b11816 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -81,7 +81,7 @@ return [ 'version' => 'develop/2025-09-21', 'build_time' => 1758437799, 'api_version' => '2.1.0', // field is no longer used. - 'db_version' => 26, + 'db_version' => 27, // generic settings 'maxUploadSize' => 1073741824, // 1 GB