gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-10 13:21:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #11031

Browse Source
This commit is contained in:
James Cole
2025-10-08 15:16:10 +02:00
parent 1acb5d8681
commit a3cac6fd0f
2 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -506,9 +506,22 @@ class SearchRuleEngine implements RuleEngineInterface
*/
private function fireGroup(RuleGroup $group): void
{
Log::debug(sprintf('Going to fire group #%d with %d rule(s)', $group->id, $group->rules->count()));
$rules = $group->rules()->orderBy('order', 'ASC')->get();
$rules =[];
if($group->relationLoaded('rules')) {
Log::debug('Group rules have been pre-loaded, do not reload them.');
$rules = $group->rules;
}
if(!$group->relationLoaded('rules')) {
Log::debug('Group rules have NOT been pre-loaded, load them NOW.');
$rules = $group->rules()
->orderBy('rules.order', 'ASC')
// ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id')
// ->where('rule_triggers.trigger_type', 'user_action')
// ->where('rule_triggers.trigger_value', 'store-journal')
->where('rules.active', true)
->get(['rules.*']);
}
Log::debug(sprintf('Going to fire group #%d with %d rule(s)', $group->id, $rules->count()));
/** @var Rule $rule */
foreach ($rules as $rule) {