Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix https://github.com/firefly-iii/firefly-iii/issues/11531
James Cole7481c8d4c06e
diff --git a/app/Handlers/Events/DestroyedGroupEventHandler.php b/app/Handlers/Events/DestroyedGroupEventHandler.phpindex 1498dd326f..18b4144709 100644--- a/app/Handlers/Events/DestroyedGroupEventHandler.php+++ b/app/Handlers/Events/DestroyedGroupEventHandler.php@@ -28,6 +28,7 @@ use FireflyIII\Enums\WebhookTrigger;use FireflyIII\Events\DestroyedTransactionGroup;use FireflyIII\Events\RequestedSendWebhookMessages;use FireflyIII\Generator\Webhook\MessageGeneratorInterface;+use FireflyIII\Support\Facades\FireflyConfig;use FireflyIII\Support\Models\AccountBalanceCalculator;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;@@ -61,6 +62,9 @@ class DestroyedGroupEventHandlerprivate function updateRunningBalance(DestroyedTransactionGroup $event): void{+ if (false === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {+ return;+ }Log::debug(__METHOD__);$group = $event->transactionGroup;foreach ($group->transactionJournals as $journal) {diff --git a/app/Handlers/Events/UpdatedGroupEventHandler.php b/app/Handlers/Events/UpdatedGroupEventHandler.phpindex 99c86005df..6ff8cab4d2 100644--- a/app/Handlers/Events/UpdatedGroupEventHandler.php+++ b/app/Handlers/Events/UpdatedGroupEventHandler.php@@ -34,6 +34,7 @@ use FireflyIII\Models\TransactionJournal;use FireflyIII\Repositories\PeriodStatistic\PeriodStatisticRepositoryInterface;use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;use FireflyIII\Services\Internal\Support\CreditRecalculateService;+use FireflyIII\Support\Facades\FireflyConfig;use FireflyIII\Support\Models\AccountBalanceCalculator;use FireflyIII\TransactionRules\Engine\RuleEngineInterface;use Illuminate\Support\Collection;@@ -217,6 +218,9 @@ class UpdatedGroupEventHandlerprivate function updateRunningBalance(UpdatedTransactionGroup $event): void{+ if (false === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {+ return;+ }Log::debug(__METHOD__);$group = $event->transactionGroup;foreach ($group->transactionJournals as $journal) {diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.phpindex a4da0d865a..33f13977b1 100644--- a/app/Http/Controllers/DebugController.php+++ b/app/Http/Controllers/DebugController.php@@ -113,7 +113,9 @@ class DebugController extends Controller// also do some recalculations.Artisan::call('correction:recalculates-liabilities');- AccountBalanceCalculator::recalculateAll(false);+ if (true === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {+ AccountBalanceCalculator::recalculateAll(false);+ }try {Artisan::call('twig:clean');diff --git a/app/Support/Models/AccountBalanceCalculator.php b/app/Support/Models/AccountBalanceCalculator.phpindex 3298c7ed39..35a4a98a53 100644--- a/app/Support/Models/AccountBalanceCalculator.php+++ b/app/Support/Models/AccountBalanceCalculator.php@@ -31,6 +31,7 @@ use FireflyIII\Models\AccountBalance;use FireflyIII\Models\Transaction;use FireflyIII\Models\TransactionJournal;use FireflyIII\Support\Facades\Amount;+use FireflyIII\Support\Facades\FireflyConfig;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;@@ -64,6 +65,9 @@ class AccountBalanceCalculatorpublic static function recalculateForJournal(TransactionJournal $transactionJournal): void{+ if (false === FireflyConfig::get('use_running_balance', config('firefly.feature_flags.running_balance_column'))->data) {+ return;+ }Log::debug(__METHOD__);$object = new self();