From dfcd5d79be0eb0f0731a38c3bbff2763fe5d4a37 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 16 Feb 2025 06:33:53 +0100 Subject: [PATCH] Fix preferences. --- .../V1/Controllers/Summary/BasicController.php | 18 +++++++++++++++++- .../Correction/CorrectsGroupInformation.php | 3 +++ config/firefly.php | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/Api/V1/Controllers/Summary/BasicController.php b/app/Api/V1/Controllers/Summary/BasicController.php index c5d94132a0..05b076ae8c 100644 --- a/app/Api/V1/Controllers/Summary/BasicController.php +++ b/app/Api/V1/Controllers/Summary/BasicController.php @@ -321,7 +321,6 @@ class BasicController extends Controller private function getNetWorthInfo(Carbon $start, Carbon $end): array { - Log::debug('getNetWorthInfo'); /** @var User $user */ $user = auth()->user(); @@ -331,6 +330,7 @@ class BasicController extends Controller /** @var Carbon $date */ $date = session('end', today(config('app.timezone'))->endOfMonth()); } + Log::debug(sprintf('getNetWorthInfo up until "%s".', $date->format('Y-m-d H:i:s'))); /** @var NetWorthInterface $netWorthHelper */ $netWorthHelper = app(NetWorthInterface::class); @@ -370,6 +370,22 @@ class BasicController extends Controller 'sub_title' => '', ]; } + if(0 === count($return)) { + $return[] = [ + 'key' => sprintf('net-worth-in-%s', $this->nativeCurrency->code), + 'title' => trans('firefly.box_net_worth_in_currency', ['currency' => $this->nativeCurrency->symbol]), + 'monetary_value' => '0', + 'currency_id' => (string) $this->nativeCurrency->id, + 'currency_code' => $this->nativeCurrency->code, + 'currency_symbol' => $this->nativeCurrency->symbol, + 'currency_decimal_places' => $this->nativeCurrency->decimal_places, + 'value_parsed' => app('amount')->formatFlat($this->nativeCurrency->symbol, $this->nativeCurrency->decimal_places, '0', false), + 'local_icon' => 'line-chart', + 'sub_title' => '', + ]; + } + + Log::debug('End of getNetWorthInfo'); return $return; diff --git a/app/Console/Commands/Correction/CorrectsGroupInformation.php b/app/Console/Commands/Correction/CorrectsGroupInformation.php index 1a187d2da5..e4c5a87dfb 100644 --- a/app/Console/Commands/Correction/CorrectsGroupInformation.php +++ b/app/Console/Commands/Correction/CorrectsGroupInformation.php @@ -33,6 +33,7 @@ use FireflyIII\Models\Budget; use FireflyIII\Models\Category; use FireflyIII\Models\CurrencyExchangeRate; use FireflyIII\Models\ObjectGroup; +use FireflyIII\Models\Preference; use FireflyIII\Models\Recurrence; use FireflyIII\Models\Rule; use FireflyIII\Models\RuleGroup; @@ -41,6 +42,7 @@ use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\UserGroup; use FireflyIII\Models\Webhook; +use FireflyIII\Support\Preferences; use FireflyIII\User; use Illuminate\Console\Command; use Illuminate\Database\QueryException; @@ -89,6 +91,7 @@ class CorrectsGroupInformation extends Command Category::class, ObjectGroup::class, CurrencyExchangeRate::class, + Preference::class, Recurrence::class, RuleGroup::class, Rule::class, diff --git a/config/firefly.php b/config/firefly.php index 72e3181102..fc5cfd8198 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -176,7 +176,7 @@ return [ ], // administration specific preferences - 'admin_specific_prefs' => ['frontpageAccounts', 'lastActivity'], + 'admin_specific_prefs' => [], // default user-related values 'darkMode' => 'browser',