kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-10 22:52:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix preferences.

Browse Source
This commit is contained in:
James Cole
2025-02-16 06:33:53 +01:00
parent 07631eea28
commit dfcd5d79be
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Api/V1/Controllers/Summary/BasicController.php
View File

@@ -321,7 +321,6 @@ class BasicController extends Controller
private function getNetWorthInfo(Carbon $start, Carbon $end): array private function getNetWorthInfo(Carbon $start, Carbon $end): array
{ {
Log::debug('getNetWorthInfo');
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
@@ -331,6 +330,7 @@ class BasicController extends Controller
/** @var Carbon $date */ /** @var Carbon $date */
$date = session('end', today(config('app.timezone'))->endOfMonth()); $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 */ /** @var NetWorthInterface $netWorthHelper */
$netWorthHelper = app(NetWorthInterface::class); $netWorthHelper = app(NetWorthInterface::class);
@@ -370,6 +370,22 @@ class BasicController extends Controller
'sub_title' => '', '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'); Log::debug('End of getNetWorthInfo');
return $return; return $return;

3
app/Console/Commands/Correction/CorrectsGroupInformation.php
View File

@@ -33,6 +33,7 @@ use FireflyIII\Models\Budget;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
use FireflyIII\Models\CurrencyExchangeRate; use FireflyIII\Models\CurrencyExchangeRate;
use FireflyIII\Models\ObjectGroup; use FireflyIII\Models\ObjectGroup;
use FireflyIII\Models\Preference;
use FireflyIII\Models\Recurrence; use FireflyIII\Models\Recurrence;
use FireflyIII\Models\Rule; use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleGroup;
@@ -41,6 +42,7 @@ use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\UserGroup; use FireflyIII\Models\UserGroup;
use FireflyIII\Models\Webhook; use FireflyIII\Models\Webhook;
use FireflyIII\Support\Preferences;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Database\QueryException; use Illuminate\Database\QueryException;
@@ -89,6 +91,7 @@ class CorrectsGroupInformation extends Command
Category::class, Category::class,
ObjectGroup::class, ObjectGroup::class,
CurrencyExchangeRate::class, CurrencyExchangeRate::class,
Preference::class,
Recurrence::class, Recurrence::class,
RuleGroup::class, RuleGroup::class,
Rule::class, Rule::class,

2
config/firefly.php
View File

@@ -176,7 +176,7 @@ return [
], ],
// administration specific preferences // administration specific preferences
'admin_specific_prefs' => ['frontpageAccounts', 'lastActivity'], 'admin_specific_prefs' => [],
// default user-related values // default user-related values
'darkMode' => 'browser', 'darkMode' => 'browser',