Merge pull request #10946 from firefly-iii/release-1758511378

🤖 Automatically merge the PR into the develop branch.

app/Http/Controllers/Admin/NotificationController.php

@@ -122,6 +122,11 @@ class NotificationController extends Controller
 
     public function testNotification(Request $request): RedirectResponse
     {
+        if (true === auth()->user()->hasRole('demo')) {
+            session()->flash('error', (string) trans('firefly.not_available_demo_user'));
+
+            return redirect(route('settings.notification.index'));
+        }
 
         $all     = $request->all();
         $channel = $all['test_submit'] ?? '';

app/TransactionRules/Engine/SearchRuleEngine.php

@@ -508,9 +508,11 @@ 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));

config/firefly.php

@@ -78,10 +78,10 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2025-09-21',
-    'build_time'                   => 1758460398,
+    'version'                      => 'develop/2025-09-22',
+    'build_time'                   => 1758511276,
     'api_version'                  => '2.1.0', // field is no longer used.
-    'db_version'                   => 26,
+    'db_version'                   => 27,
 
     // generic settings
     'maxUploadSize'                => 1073741824, // 1 GB