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

Auto commit for release 'develop' on 2025-02-20

Browse Source
This commit is contained in:
github-actions
2025-02-20 08:00:12 +01:00
parent 2e3669a32f
commit 12629a1955
6 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Support/JsonApi/Enrichments/AccountEnrichment.php
View File

@@ -234,7 +234,7 @@ class AccountEnrichment implements EnrichmentInterface
private function collectMetaData(): void private function collectMetaData(): void
{ {
$set = AccountMeta::whereIn('name', ['is_multi_currency', 'include_net_worth','currency_id', 'account_role', 'account_number', 'liability_direction', 'interest', 'interest_period', 'current_debt']) $set = AccountMeta::whereIn('name', ['is_multi_currency', 'include_net_worth', 'currency_id', 'account_role', 'account_number', 'liability_direction', 'interest', 'interest_period', 'current_debt'])
->whereIn('account_id', $this->accountIds) ->whereIn('account_id', $this->accountIds)
->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data'])->toArray() ->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data'])->toArray()
; ;

52
app/Support/Preferences.php
View File

@@ -47,15 +47,16 @@ class Preferences
} }
return Preference::where('user_id', $user->id) return Preference::where('user_id', $user->id)
->where('name', '!=', 'currencyPreference') ->where('name', '!=', 'currencyPreference')
->where(function (Builder $q) use ($user): void { ->where(function (Builder $q) use ($user): void {
$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
{ {
/** @var null|User $user */ /** @var null|User $user */
$user = auth()->user(); $user = auth()->user();
@@ -69,7 +70,7 @@ class Preferences
return $this->getForUser($user, $name, $default); return $this->getForUser($user, $name, $default);
} }
public function getForUser(User $user, string $name, null | array | bool | int | string $default = null): ?Preference public function getForUser(User $user, string $name, null|array|bool|int|string $default = null): ?Preference
{ {
Log::debug(sprintf('getForUser(#%d, "%s")', $user->id, $name)); Log::debug(sprintf('getForUser(#%d, "%s")', $user->id, $name));
// don't care about user group ID, except for some specific preferences. // don't care about user group ID, except for some specific preferences.
@@ -80,7 +81,7 @@ class Preferences
$query->where('user_group_id', $userGroupId); $query->where('user_group_id', $userGroupId);
} }
$preference = $query->first(['id', 'user_id', 'user_group_id', 'name', 'data', 'updated_at', 'created_at']); $preference = $query->first(['id', 'user_id', 'user_group_id', 'name', 'data', 'updated_at', 'created_at']);
if (null !== $preference && null === $preference->data) { if (null !== $preference && null === $preference->data) {
$preference->delete(); $preference->delete();
@@ -90,11 +91,13 @@ class Preferences
if (null !== $preference) { if (null !== $preference) {
Log::debug(sprintf('Found preference #%d for user #%d: %s', $preference->id, $user->id, $name)); Log::debug(sprintf('Found preference #%d for user #%d: %s', $preference->id, $user->id, $name));
return $preference; return $preference;
} }
// no preference found and default is null: // no preference found and default is null:
if (null === $default) { if (null === $default) {
Log::debug('Return NULL, create no preference.'); Log::debug('Return NULL, create no preference.');
// return NULL // return NULL
return null; return null;
} }
@@ -131,21 +134,21 @@ class Preferences
Cache::put($key, '', 5); Cache::put($key, '', 5);
} }
public function setForUser(User $user, string $name, null | array | bool | int | string $value): Preference public function setForUser(User $user, string $name, null|array|bool|int|string $value): Preference
{ {
$fullName = sprintf('preference%s%s', $user->id, $name); $fullName = sprintf('preference%s%s', $user->id, $name);
$userGroupId = $this->getUserGroupId($user, $name); $userGroupId = $this->getUserGroupId($user, $name);
$userGroupId = 0 === (int) $userGroupId ? null : (int) $userGroupId; $userGroupId = 0 === (int) $userGroupId ? null : (int) $userGroupId;
Cache::forget($fullName); Cache::forget($fullName);
$query = Preference::where('user_id', $user->id)->where('name', $name); $query = Preference::where('user_id', $user->id)->where('name', $name);
if (null !== $userGroupId) { if (null !== $userGroupId) {
Log::debug('Include user group ID in query'); Log::debug('Include user group ID in query');
$query->where('user_group_id', $userGroupId); $query->where('user_group_id', $userGroupId);
} }
$preference = $query->first(['id', 'user_id', 'user_group_id', 'name', 'data', 'updated_at', 'created_at']); $preference = $query->first(['id', 'user_id', 'user_group_id', 'name', 'data', 'updated_at', 'created_at']);
if (null !== $preference && null === $value) { if (null !== $preference && null === $value) {
$preference->delete(); $preference->delete();
@@ -188,12 +191,13 @@ class Preferences
{ {
$result = []; $result = [];
$preferences = Preference::where('user_id', $user->id) $preferences = Preference::where('user_id', $user->id)
->where(function (Builder $q) use ($user): void { ->where(function (Builder $q) use ($user): void {
$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);
}) })
->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) {
@@ -235,7 +239,7 @@ class Preferences
return $result; return $result;
} }
public function getEncryptedForUser(User $user, string $name, null | array | bool | int | string $default = null): ?Preference public function getEncryptedForUser(User $user, string $name, null|array|bool|int|string $default = null): ?Preference
{ {
$result = $this->getForUser($user, $name, $default); $result = $this->getForUser($user, $name, $default);
if ('' === $result->data) { if ('' === $result->data) {
@@ -260,7 +264,7 @@ class Preferences
return $result; return $result;
} }
public function getFresh(string $name, null | array | bool | int | string $default = null): ?Preference public function getFresh(string $name, null|array|bool|int|string $default = null): ?Preference
{ {
/** @var null|User $user */ /** @var null|User $user */
$user = auth()->user(); $user = auth()->user();
@@ -298,7 +302,7 @@ class Preferences
Session::forget('first'); Session::forget('first');
} }
public function set(string $name, null | array | bool | int | string $value): Preference public function set(string $name, null|array|bool|int|string $value): Preference
{ {
/** @var null|User $user */ /** @var null|User $user */
$user = auth()->user(); $user = auth()->user();

20
composer.lock generated
View File

@@ -1874,16 +1874,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v11.43.0", "version": "v11.43.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "70760d976486310b11d8e487e873077db069e77a" "reference": "99d1573698abc42222f04d25fcd5b213d0eedf21"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/70760d976486310b11d8e487e873077db069e77a", "url": "https://api.github.com/repos/laravel/framework/zipball/99d1573698abc42222f04d25fcd5b213d0eedf21",
"reference": "70760d976486310b11d8e487e873077db069e77a", "reference": "99d1573698abc42222f04d25fcd5b213d0eedf21",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2085,7 +2085,7 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2025-02-18T15:37:56+00:00" "time": "2025-02-19T21:53:48+00:00"
}, },
{ {
"name": "laravel/passport", "name": "laravel/passport",
@@ -11267,16 +11267,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "2.1.5", "version": "2.1.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "451b17f9665481ee502adc39be987cb71067ece2" "reference": "6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/451b17f9665481ee502adc39be987cb71067ece2", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c",
"reference": "451b17f9665481ee502adc39be987cb71067ece2", "reference": "6eaec7c6c9e90dcfe46ad1e1ffa5171e2dab641c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -11321,7 +11321,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2025-02-13T12:49:56+00:00" "time": "2025-02-19T15:46:42+00:00"
}, },
{ {
"name": "phpstan/phpstan-deprecation-rules", "name": "phpstan/phpstan-deprecation-rules",

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' => 'develop/2025-02-19', 'version' => 'develop/2025-02-20',
'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,

20
package-lock.json generated
View File

@@ -4510,9 +4510,9 @@
} }
}, },
"node_modules/chart.js": { "node_modules/chart.js": {
"version": "4.4.7", "version": "4.4.8",
"resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.7.tgz", "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.8.tgz",
"integrity": "sha512-pwkcKfdzTMAU/+jNosKhNL2bHtJc/sSmYgVbuGTEDhzkrhmyihmP7vUc/5ZK9WopidMDHNe3Wm7jOd/WhuHWuw==", "integrity": "sha512-IkGZlVpXP+83QpMm4uxEiGqSI7jFizwVtF3+n5Pc3k7sMO+tkd0qxh2OzLhenM0K80xtmAONWGBn082EiBQSDA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@kurkle/color": "^0.3.0" "@kurkle/color": "^0.3.0"
@@ -8901,9 +8901,9 @@
} }
}, },
"node_modules/postcss": { "node_modules/postcss": {
"version": "8.5.2", "version": "8.5.3",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
"integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==", "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@@ -11344,14 +11344,14 @@
} }
}, },
"node_modules/vite": { "node_modules/vite": {
"version": "6.1.0", "version": "6.1.1",
"resolved": "https://registry.npmjs.org/vite/-/vite-6.1.0.tgz", "resolved": "https://registry.npmjs.org/vite/-/vite-6.1.1.tgz",
"integrity": "sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==", "integrity": "sha512-4GgM54XrwRfrOp297aIYspIti66k56v16ZnqHvrIM7mG+HjDlAwS7p+Srr7J6fGvEdOJ5JcQ/D9T7HhtdXDTzA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"esbuild": "^0.24.2", "esbuild": "^0.24.2",
"postcss": "^8.5.1", "postcss": "^8.5.2",
"rollup": "^4.30.1" "rollup": "^4.30.1"
}, },
"bin": { "bin": {

4
resources/assets/v1/src/locales/it.json
View File

@@ -172,8 +172,8 @@
}, },
"list": { "list": {
"title": "Titolo", "title": "Titolo",
"active": "Attivo", "active": "\u00c8 attivo?",
"native_currency": "Native currency", "native_currency": "Valuta nativa",
"trigger": "Trigger", "trigger": "Trigger",
"response": "Risposta", "response": "Risposta",
"delivery": "Consegna", "delivery": "Consegna",