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

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

Browse Source 
# Conflicts:
#	app/Support/Steam.php
This commit is contained in:
James Cole
2024-12-31 08:19:47 +01:00
parent 2e46d9ba33 b58d809063
commit 6fde693e7a
7 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Support/Preferences.php
View File

@@ -52,7 +52,8 @@ class Preferences
$q->whereNull('user_group_id'); $q->whereNull('user_group_id');
$q->orWhere('user_group_id', $user->user_group_id); $q->orWhere('user_group_id', $user->user_group_id);
}) })
->get(); ->get()
;
} }
public function get(string $name, null|array|bool|int|string $default = null): ?Preference public function get(string $name, null|array|bool|int|string $default = null): ?Preference
@@ -178,7 +179,8 @@ class Preferences
$q->orWhere('user_group_id', $user->user_group_id); $q->orWhere('user_group_id', $user->user_group_id);
}) })
->whereIn('name', $list) ->whereIn('name', $list)
->get(['id', 'name', 'data']); ->get(['id', 'name', 'data'])
;
/** @var Preference $preference */ /** @var Preference $preference */
foreach ($preferences as $preference) { foreach ($preferences as $preference) {

3
app/Support/Steam.php
View File

@@ -397,7 +397,8 @@ class Steam
// Log::debug('Return is', $final); // Log::debug('Return is', $final);
$cache->store($final); $cache->store($final);
return $final; return array_merge($return, $others);
// Log::debug('Return is', $final);
} }
public function filterAccountBalances(array $total, Account $account, bool $convertToNative, ?TransactionCurrency $currency = null): array public function filterAccountBalances(array $total, Account $account, bool $convertToNative, ?TransactionCurrency $currency = null): array

2
config/firefly.php
View File

@@ -81,7 +81,7 @@ return [
'running_balance_column' => env('USE_RUNNING_BALANCE', false), 'running_balance_column' => env('USE_RUNNING_BALANCE', false),
// see cer.php for exchange rates feature flag. // see cer.php for exchange rates feature flag.
], ],
'version' => '6.2.0-alpha.1', 'version' => 'develop/2024-12-31',
'api_version' => '2.1.0', // field is no longer used. 'api_version' => '2.1.0', // field is no longer used.
'db_version' => 25, 'db_version' => 25,

6
package-lock.json generated
View File

@@ -12114,9 +12114,9 @@
"license": "ISC" "license": "ISC"
}, },
"node_modules/yaml": { "node_modules/yaml": {
"version": "2.6.1", "version": "2.7.0",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz",
"integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==", "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==",
"dev": true, "dev": true,
"license": "ISC", "license": "ISC",
"bin": { "bin": {