mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-12-02 11:01:43 +00:00
Check for rule triggers in #7853
This commit is contained in:
@@ -34,6 +34,7 @@ use FireflyIII\Models\PiggyBankRepetition;
|
|||||||
use FireflyIII\Models\RecurrenceTransaction;
|
use FireflyIII\Models\RecurrenceTransaction;
|
||||||
use FireflyIII\Models\RuleTrigger;
|
use FireflyIII\Models\RuleTrigger;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
|
use ValueError;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class ReportSkeleton
|
* Class ReportSkeleton
|
||||||
@@ -247,7 +248,16 @@ class CorrectAmounts extends Command
|
|||||||
/** @var RuleTrigger $item */
|
/** @var RuleTrigger $item */
|
||||||
foreach ($set as $item) {
|
foreach ($set as $item) {
|
||||||
// basic check:
|
// basic check:
|
||||||
if (-1 === bccomp((string)$item->trigger_value, '0')) {
|
$check = 0;
|
||||||
|
try {
|
||||||
|
$check = bccomp((string)$item->trigger_value, '0');
|
||||||
|
} catch (ValueError $e) {
|
||||||
|
$this->friendlyError(sprintf('Rule #%d contained invalid %s-trigger "%s". The trigger has been removed, and the rule is disabled.', $item->rule_id, $item->trigger_type, $item->trigger_value));
|
||||||
|
$item->rule->active = false;
|
||||||
|
$item->rule->save();
|
||||||
|
$item->forceDelete();
|
||||||
|
}
|
||||||
|
if (-1 === $check) {
|
||||||
$fixed++;
|
$fixed++;
|
||||||
$item->trigger_value = app('steam')->positive((string)$item->trigger_value);
|
$item->trigger_value = app('steam')->positive((string)$item->trigger_value);
|
||||||
$item->save();
|
$item->save();
|
||||||
|
|||||||
Reference in New Issue
Block a user