Merge branch 'develop' into 5.8-dev

And fix rule creation and edit etc
2026-01-06 22:21:42 +00:00 · 2022-10-01 07:34:30 +02:00
parent 5714bd0749 5c471059f3
commit 9bfa52f3ce
10 changed files with 35 additions and 18 deletions
--- a/app/Repositories/Rule/RuleRepository.php
+++ b/app/Repositories/Rule/RuleRepository.php
@@ -425,9 +425,13 @@ class RuleRepository implements RuleRepositoryInterface
            $value          = $trigger['value'] ?? '';
            $stopProcessing = $trigger['stop_processing'] ?? false;
            $active         = $trigger['active'] ?? true;
+            $type           = $trigger['type'];
+            if (true === $trigger['prohibited']) {
+                $type = sprintf('-%s', $type);
+            }

            $triggerValues = [
-                'action'          => $trigger['type'],
+                'action'          => $type,
                'value'           => $value,
                'stop_processing' => $stopProcessing,
                'order'           => $order,