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

Fix rule order for #10938

Browse Source
This commit is contained in:
James Cole
2025-09-21 17:52:07 +02:00
parent 7e08a1f33c
commit a751218d53
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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())); 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 */ /** @var Rule $rule */
foreach ($group->rules as $rule) { foreach ($rules as $rule) {
Log::debug(sprintf('Going to fire rule #%d from group #%d', $rule->id, $group->id)); Log::debug(sprintf('Going to fire rule #%d with order #%d from group #%d', $rule->id, $rule->order, $group->id));
$result = $this->fireRule($rule); $result = $this->fireRule($rule);
if (true === $result && true === $rule->stop_processing) { 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)); Log::debug(sprintf('The rule was triggered and rule->stop_processing = true, so group #%d will stop processing further rules.', $group->id));

2
config/firefly.php
View File

@@ -81,7 +81,7 @@ return [
'version' => 'develop/2025-09-21', 'version' => 'develop/2025-09-21',
'build_time' => 1758437799, 'build_time' => 1758437799,
'api_version' => '2.1.0', // field is no longer used. 'api_version' => '2.1.0', // field is no longer used.
'db_version' => 26, 'db_version' => 27,
// generic settings // generic settings
'maxUploadSize' => 1073741824, // 1 GB 'maxUploadSize' => 1073741824, // 1 GB