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

Merge branch 'v6.2' of github.com:firefly-iii/firefly-iii into v6.2

Browse Source 
# Conflicts:
#	app/Support/Steam.php
This commit is contained in:
James Cole
2024-12-23 06:56:31 +01:00
parent 1cf9c76329 c0499df4ec
commit 3c65b46aa5
91 changed files with 1146 additions and 1157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/HomeController.php
View File

@@ -29,11 +29,9 @@ use FireflyIII\Events\RequestedVersionCheckStatus;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Http\Middleware\Installer;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Support\Facades\Steam;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;

4
app/Http/Controllers/PreferencesController.php
View File

@@ -103,7 +103,7 @@ class PreferencesController extends Controller
$darkMode = app('preferences')->get('darkMode', 'browser')->data;
$customFiscalYear = app('preferences')->get('customFiscalYear', 0)->data;
$fiscalYearStartStr = app('preferences')->get('fiscalYearStart', '01-01')->data;
$convertToNative =app('preferences')->get('convert_to_native', false)->data;
$convertToNative = app('preferences')->get('convert_to_native', false)->data;
if (is_array($fiscalYearStartStr)) {
$fiscalYearStartStr = '01-01';
}
@@ -257,7 +257,7 @@ class PreferencesController extends Controller
}
// convert native
$convertToNative = 1 === (int) $request->get('convertToNative');
$convertToNative = 1 === (int) $request->get('convertToNative');
app('preferences')->set('convert_to_native', $convertToNative);
// custom fiscal year