diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.php index bed7e662ea..cec6291ebb 100644 --- a/app/Http/Controllers/Rule/SelectController.php +++ b/app/Http/Controllers/Rule/SelectController.php @@ -38,8 +38,8 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; use Illuminate\Support\Collection; -use Illuminate\View\View; use Illuminate\Support\Facades\Log; +use Illuminate\View\View; use Throwable; /** @@ -150,9 +150,13 @@ class SelectController extends Controller } foreach ($textTriggers as $textTrigger) { - $trigger = new RuleTrigger(); - $trigger->trigger_type = $textTrigger['type']; - $trigger->trigger_value = $textTrigger['value']; + $trigger = new RuleTrigger(); + $trigger->trigger_type = $textTrigger['type']; + $trigger->trigger_value = $textTrigger['value']; + $trigger->stop_processing = $textTrigger['stop_processing']; + if ($textTrigger['prohibited']) { + $trigger->trigger_type = sprintf('-%s', $textTrigger['type']); + } $triggers->push($trigger); } diff --git a/app/Support/Http/Controllers/RequestInformation.php b/app/Support/Http/Controllers/RequestInformation.php index 53091d7bfc..cca2adf519 100644 --- a/app/Support/Http/Controllers/RequestInformation.php +++ b/app/Support/Http/Controllers/RequestInformation.php @@ -33,9 +33,9 @@ use FireflyIII\User; use Hash; use Illuminate\Contracts\Validation\Validator as ValidatorContract; use Illuminate\Routing\Route; +use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Validator; use InvalidArgumentException; -use Illuminate\Support\Facades\Log; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; use Route as RouteFacade; @@ -75,6 +75,7 @@ trait RequestInformation $current = [ 'type' => $triggerInfo['type'] ?? '', 'value' => $triggerInfo['value'] ?? '', + 'prohibited' => $triggerInfo['prohibited'] ?? false, 'stop_processing' => 1 === (int)($triggerInfo['stop_processing'] ?? '0'), ]; $current = RuleFormRequest::replaceAmountTrigger($current);