Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-09-25
JC57b0b5f8b40f1
diff --git a/.ci/php-cs-fixer/composer.lock b/.ci/php-cs-fixer/composer.lockindex 27b23ff69f..bd60a4a9cb 100644--- a/.ci/php-cs-fixer/composer.lock+++ b/.ci/php-cs-fixer/composer.lock@@ -148,16 +148,16 @@},{"name": "composer/semver",- "version": "3.4.4",+ "version": "3.5.0","source": {"type": "git","url": "https://github.com/composer/semver.git",- "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95"+ "reference": "f7a296f4c4cf8cb8bb83e35d6951a406bb11afa5"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/composer/semver/zipball/198166618906cb2de69b95d7d47e5fa8aa1b2b95",- "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95",+ "url": "https://api.github.com/repos/composer/semver/zipball/f7a296f4c4cf8cb8bb83e35d6951a406bb11afa5",+ "reference": "f7a296f4c4cf8cb8bb83e35d6951a406bb11afa5","shasum": ""},"require": {@@ -199,7 +199,7 @@"homepage": "http://robbast.nl"}],- "description": "Semver library that offers utilities, version constraint parsing and validation.",+ "description": "Version comparison library that offers utilities, version constraint parsing and validation.","keywords": ["semantic","semver",@@ -209,7 +209,7 @@"support": {"irc": "ircs://irc.libera.chat:6697/composer","issues": "https://github.com/composer/semver/issues",- "source": "https://github.com/composer/semver/tree/3.4.4"+ "source": "https://github.com/composer/semver/tree/3.5.0"},"funding": [{@@ -221,7 +221,7 @@"type": "github"}],- "time": "2025-08-20T19:15:30+00:00"+ "time": "2026-09-24T14:38:51+00:00"},{"name": "composer/xdebug-handler",diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.phpindex 94be2ae461..df99eef909 100644--- a/app/Api/V1/Controllers/Insight/Income/TagController.php+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php@@ -158,10 +158,7 @@ final class TagController extends Controller'currency_id' => (string) $foreignCurrencyId,'currency_code' => $journal['foreign_currency_code'],];- $response[$foreignKey]['difference'] = bcadd(- (string) $response[$foreignKey]['difference'],- Steam::positive($journal['foreign_amount'])- );+ $response[$foreignKey]['difference'] = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];}}diff --git a/app/Api/V1/Controllers/Insight/Transfer/TagController.php b/app/Api/V1/Controllers/Insight/Transfer/TagController.phpindex b7b85fd376..f92a7aa9f0 100644--- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php+++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php@@ -155,10 +155,7 @@ final class TagController extends Controller'currency_id' => (string) $foreignCurrencyId,'currency_code' => $journal['foreign_currency_code'],];- $response[$foreignKey]['difference'] = bcadd(- (string) $response[$foreignKey]['difference'],- Steam::positive($journal['foreign_amount'])- );+ $response[$foreignKey]['difference'] = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float}}diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.phpindex ea6db0b9dd..90cbe69704 100644--- a/app/Http/Controllers/Account/IndexController.php+++ b/app/Http/Controllers/Account/IndexController.php@@ -114,6 +114,7 @@ final class IndexController extends Controller// make paginator:$accounts = new LengthAwarePaginator($accounts, $total, $pageSize, $page);$accounts->setPath(route('accounts.index', [$objectType]));+return view('accounts.index', ['objectType' => $objectType,'inactivePage' => $inactivePage,@@ -121,7 +122,7 @@ final class IndexController extends Controller'subTitleIcon' => $subTitleIcon,'subTitle' => $subTitle,'page' => $page,- 'accounts' => [],+ 'accounts' => [],// 'accounts' => $accounts,]);}diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.phpindex d461374baa..2edb4f5531 100644--- a/app/Http/Controllers/Budget/BudgetLimitController.php+++ b/app/Http/Controllers/Budget/BudgetLimitController.php@@ -198,13 +198,7 @@ final class BudgetLimitController extends Controllerif ($request->expectsJson()) {$array = $limit->toArray();// add some extra metadata:- $spentArr = $this->opsRepository->sumExpenses(- $limit->start_date,- $limit->end_date,- null,- new Collection()->push($budget),- $currency- );+ $spentArr = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);$array['spent'] = $spentArr[$currency->id]['sum'] ?? '0';$array['left_formatted'] = Amount::formatAnything($limit->transactionCurrency, bcadd($array['spent'], (string) $array['amount']));$array['amount_formatted'] = Amount::formatAnything($limit->transactionCurrency, $limit['amount']);diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.phpindex 52c6f900e3..65429e59c1 100644--- a/app/Http/Controllers/Budget/IndexController.php+++ b/app/Http/Controllers/Budget/IndexController.php@@ -272,10 +272,7 @@ final class IndexController extends Controllerif (array_key_exists($currency->id, $spentArr) && array_key_exists('sum', $spentArr[$currency->id])) {$array['spent'][$currency->id]['spent'] = $spentArr[$currency->id]['sum'];- $array['spent'][$currency->id]['spent_outside'] = Steam::negative(bcsub(- $spentInLimits[$currency->id],- $spentArr[$currency->id]['sum']- ));+ $array['spent'][$currency->id]['spent_outside'] = Steam::negative(bcsub($spentInLimits[$currency->id], $spentArr[$currency->id]['sum']));$array['spent'][$currency->id]['currency_id'] = $currency->id;$array['spent'][$currency->id]['currency_symbol'] = $currency->symbol;$array['spent'][$currency->id]['currency_decimal_places'] = $currency->decimal_places;diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.phpindex f4b32fe5c5..ad724137dc 100644--- a/app/Http/Controllers/Chart/BudgetController.php+++ b/app/Http/Controllers/Chart/BudgetController.php@@ -539,13 +539,7 @@ final class BudgetController extends Controller}// get spent amount in this period for this currency.- $sum = $this->opsRepository->sumExpenses(- $currentStart,- $currentEnd,- $accounts,- new Collection()->push($budget),- $currency- );+ $sum = $this->opsRepository->sumExpenses($currentStart, $currentEnd, $accounts, new Collection()->push($budget), $currency);$amount = Steam::positive($sum[$currency->id]['sum'] ?? '0');$chartData[0]['entries'][$title] = Steam::bcround($amount, $currency->decimal_places);diff --git a/app/Jobs/CreateAutoBudgetLimits.php b/app/Jobs/CreateAutoBudgetLimits.phpindex affea656a0..476da65ac3 100644--- a/app/Jobs/CreateAutoBudgetLimits.php+++ b/app/Jobs/CreateAutoBudgetLimits.php@@ -132,13 +132,7 @@ class CreateAutoBudgetLimits implements ShouldQueue// if has one, calculate expenses and use that as a base.$repository = app(OperationsRepositoryInterface::class);$repository->setUser($autoBudget->budget->user);- $spent = $repository->sumExpenses(- $previousStart,- $previousEnd,- null,- new Collection()->push($autoBudget->budget),- $autoBudget->transactionCurrency- );+ $spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);$currencyId = $autoBudget->transaction_currency_id;$spentAmount = $spent[$currencyId]['sum'] ?? '0';Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));@@ -228,13 +222,7 @@ class CreateAutoBudgetLimits implements ShouldQueue// if has one, calculate expenses and use that as a base.$repository = app(OperationsRepositoryInterface::class);$repository->setUser($autoBudget->budget->user);- $spent = $repository->sumExpenses(- $previousStart,- $previousEnd,- null,- new Collection()->push($autoBudget->budget),- $autoBudget->transactionCurrency- );+ $spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);$currencyId = $autoBudget->transaction_currency_id;$spentAmount = $spent[$currencyId]['sum'] ?? '0';Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));diff --git a/app/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.phpindex a507156873..a3a940b1ba 100644--- a/app/Support/Http/Controllers/AugumentData.php+++ b/app/Support/Http/Controllers/AugumentData.php@@ -222,14 +222,7 @@ trait AugumentData$currentEnd->addMonth();}// primary currency amount.- $expenses = $opsRepository->sumExpenses(- $currentStart,- $currentEnd,- null,- $budgetCollection,- $entry->transactionCurrency,- $this->convertToPrimary- );+ $expenses = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $entry->transactionCurrency, $this->convertToPrimary);$spent = $expenses[$currency->id]['sum'] ?? '0';$entry->pc_spent = $spent;diff --git a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php b/app/Support/JsonApi/Enrichments/RecurringEnrichment.phpindex 2428353cb0..d0c09bf027 100644--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php@@ -354,11 +354,7 @@ class RecurringEnrichment implements EnrichmentInterface/** @var RecurrenceRepetition $repetition */foreach ($set as $repetition) {- $recurrence = $this->collection->filter(- static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id- )- ->first()- ;+ $recurrence = $this->collection->filter(static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id)->first();$fromDate = clone ($recurrence->latest_date ?? $recurrence->first_date);$recurrenceId = (int) $repetition->recurrence_id;$repId = (int) $repetition->id;diff --git a/composer.lock b/composer.lockindex ca39617fea..288c8d798d 100644--- a/composer.lock+++ b/composer.lock@@ -10539,39 +10539,41 @@},{"name": "ergebnis/phpstan-rules",- "version": "2.13.1",+ "version": "2.14.0","source": {"type": "git","url": "https://github.com/ergebnis/phpstan-rules.git",- "reference": "f69db86b98595c34fc1f61c89fe3b380141aa519"+ "reference": "04fac7195113fd33d35c01060cc09e03542494d5"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/f69db86b98595c34fc1f61c89fe3b380141aa519",- "reference": "f69db86b98595c34fc1f61c89fe3b380141aa519",+ "url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/04fac7195113fd33d35c01060cc09e03542494d5",+ "reference": "04fac7195113fd33d35c01060cc09e03542494d5","shasum": ""},"require": {"ext-mbstring": "*",- "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",+ "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0 || ~8.6.0","phpstan/phpstan": "^2.1.35"},"require-dev": {"codeception/codeception": "^4.0.0 || ^5.0.0","doctrine/orm": "^2.20.0 || ^3.3.0",- "ergebnis/composer-normalize": "^2.49.0",+ "ergebnis/composer-normalize": "^2.53.0","ergebnis/license": "^2.7.0",- "ergebnis/php-cs-fixer-config": "^6.59.0",- "ergebnis/phpunit-slow-test-detector": "^2.20.0",+ "ergebnis/php-cs-fixer-config": "^6.63.2",+ "ergebnis/phpunit-slow-test-detector": "^2.25.0",+ "ergebnis/rector-rules": "^1.18.3","fakerphp/faker": "^1.24.1","phpstan/extension-installer": "^1.4.3",- "phpstan/phpstan-deprecation-rules": "^2.0.3",- "phpstan/phpstan-phpunit": "^2.0.12",- "phpstan/phpstan-strict-rules": "^2.0.8",- "phpunit/phpunit": "^9.6.21",+ "phpstan/phpstan-deprecation-rules": "^2.0.5",+ "phpstan/phpstan-phpunit": "^2.0.18",+ "phpstan/phpstan-strict-rules": "^2.0.12",+ "phpunit/phpunit": "^9.6.33","psr/container": "^2.0.2",+ "rector/rector": "^2.3.8","symfony/finder": "^5.4.45",- "symfony/process": "^5.4.47"+ "symfony/process": "^5.4.51"},"type": "phpstan-extension","extra": {@@ -10579,6 +10581,9 @@"includes": ["rules.neon"]+ },+ "branch-alias": {+ "dev-main": "2.14-dev"}},"autoload": {@@ -10608,7 +10613,7 @@"security": "https://github.com/ergebnis/phpstan-rules/blob/main/.github/SECURITY.md","source": "https://github.com/ergebnis/phpstan-rules"},- "time": "2026-01-27T17:13:06+00:00"+ "time": "2026-09-24T19:43:19+00:00"},{"name": "fakerphp/faker",@@ -10675,16 +10680,16 @@},{"name": "fruitcake/laravel-debugbar",- "version": "v4.4.3",+ "version": "v4.4.4","source": {"type": "git","url": "https://github.com/fruitcake/laravel-debugbar.git",- "reference": "caa08515a2eef6d8137653d3a1f3c3387cadf184"+ "reference": "02274537e13944ad1990c521bd06d0fb3578ba17"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/fruitcake/laravel-debugbar/zipball/caa08515a2eef6d8137653d3a1f3c3387cadf184",- "reference": "caa08515a2eef6d8137653d3a1f3c3387cadf184",+ "url": "https://api.github.com/repos/fruitcake/laravel-debugbar/zipball/02274537e13944ad1990c521bd06d0fb3578ba17",+ "reference": "02274537e13944ad1990c521bd06d0fb3578ba17","shasum": ""},"require": {@@ -10700,7 +10705,7 @@},"require-dev": {"larastan/larastan": "^3",- "laravel/ai": "^0.8",+ "laravel/ai": "^0.8|^0.9|^0.10|^0.11|^1.0","laravel/octane": "^2","laravel/pennant": "^1","laravel/pint": "^1",@@ -10762,7 +10767,7 @@],"support": {"issues": "https://github.com/fruitcake/laravel-debugbar/issues",- "source": "https://github.com/fruitcake/laravel-debugbar/tree/v4.4.3"+ "source": "https://github.com/fruitcake/laravel-debugbar/tree/v4.4.4"},"funding": [{@@ -10774,7 +10779,7 @@"type": "github"}],- "time": "2026-09-01T13:46:43+00:00"+ "time": "2026-09-24T10:05:29+00:00"},{"name": "hamcrest/hamcrest-php",@@ -11800,16 +11805,16 @@},{"name": "phpunit/php-code-coverage",- "version": "14.3.3",+ "version": "14.3.4","source": {"type": "git","url": "https://github.com/sebastianbergmann/php-code-coverage.git",- "reference": "f8640c238e930b914d0098a1edbad6652e61a64a"+ "reference": "93bd0e0cbe90030d2b734fd6df6ef61a7c1230e8"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f8640c238e930b914d0098a1edbad6652e61a64a",- "reference": "f8640c238e930b914d0098a1edbad6652e61a64a",+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/93bd0e0cbe90030d2b734fd6df6ef61a7c1230e8",+ "reference": "93bd0e0cbe90030d2b734fd6df6ef61a7c1230e8","shasum": ""},"require": {@@ -11817,7 +11822,7 @@"ext-libxml": "*","ext-mbstring": "*","ext-xmlwriter": "*",- "nikic/php-parser": "^5.8.0",+ "nikic/php-parser": "^5.9.0","php": ">=8.4","phpunit/php-text-template": "^6.0","sebastian/complexity": "^6.0",@@ -11828,7 +11833,7 @@"theseer/tokenizer": "^2.0.1"},"require-dev": {- "phpunit/phpunit": "^13.3.3"+ "phpunit/phpunit": "^13.3.4"},"suggest": {"ext-pcov": "PHP extension that provides line coverage",@@ -11866,7 +11871,7 @@"support": {"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues","security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/14.3.3"+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/14.3.4"},"funding": [{@@ -11886,7 +11891,7 @@"type": "tidelift"}],- "time": "2026-09-10T13:08:32+00:00"+ "time": "2026-09-25T03:17:09+00:00"},{"name": "phpunit/php-file-iterator",diff --git a/config/firefly.php b/config/firefly.phpindex f7cb36d79b..fe8a5bf1bc 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -78,8 +78,8 @@ return ['running_balance_column' => (bool)env_default_when_empty(env('USE_RUNNING_BALANCE'), true), // this is only the default value, is not used.// see cer.php for exchange rates feature flag.],-'version' => 'develop/2026-09-24',-'build_time' => 1790242581,+'version' => 'develop/2026-09-25',+'build_time' => 1790313489,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.diff --git a/package-lock.json b/package-lock.jsonindex e0ddfff63d..7fc083c97d 100644--- a/package-lock.json+++ b/package-lock.json@@ -650,9 +650,9 @@}},"node_modules/@rolldown/binding-android-arm-eabi": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.10.tgz",- "integrity": "sha512-bp9svZb+QurZeh+8H4BhrZkifEB0YBNvTVzNSJnJQkj4NrRwmQoDUCGP0vSN7PbvLeM7l1tK6GXL8mrTiH2myg==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.11.tgz",+ "integrity": "sha512-A5kXfGKvKWWZE0TtPrfsvT+q4Y5d1QG8gGUzpYjGydM+fARM9MuX90PrXYXe0XbsDVgyxxNzHo6giCj90bsFNw==","cpu": ["arm"],@@ -667,9 +667,9 @@}},"node_modules/@rolldown/binding-android-arm64": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.10.tgz",- "integrity": "sha512-wm6Dld3RXUAZ/gRWKyUy+4W1B5CB5UeFaOzsSWJWEdxZXHH8rCYiZ5dGe6oJmhsunAPWzL7FZV+VtvmN5Ye2eA==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.11.tgz",+ "integrity": "sha512-z6cTycz+iJ4PVkuL4HHW4DfTfoeU/2nqYYuSOrTmH7yHK5Y0LCOnA03V4ZNxavyVaU1oOqUgIg2klN/s+USGOA==","cpu": ["arm64"],@@ -684,9 +684,9 @@}},"node_modules/@rolldown/binding-darwin-arm64": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.10.tgz",- "integrity": "sha512-UbEfXq/AqGNgRTV3ik+X/iR6mUxu2QdYAadwRxJWquUGnW6gDqdP1FtLtFXRow7RJx0ssRwi80XAPr4r+4DtsA==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.11.tgz",+ "integrity": "sha512-jShvqNtP6vDC6/A5JOAzbVV+DkgHqhl/ScVCJEbt+TUY6QYz7YnXcrg3sLtFBniro0f/Ld50ZwCWA6f7KYD1nQ==","cpu": ["arm64"],@@ -701,9 +701,9 @@}},"node_modules/@rolldown/binding-darwin-x64": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.10.tgz",- "integrity": "sha512-7f5h17q5KZVx/ji1vb8OTq31ch1O2I7K8NPIr44GkyWTApXMIsmhWqZfgpOH10xeauqghDAvGlZktasCkcF6Eg==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.11.tgz",+ "integrity": "sha512-f2i2xiNWq1Z1l2++q2fuhZRdLAT3aqxD6vRNm1RAxpUoBcdqNB3C0s1Bt+K+PbEx2F5F4gQp6hqKkphCY/xF9w==","cpu": ["x64"],@@ -718,9 +718,9 @@}},"node_modules/@rolldown/binding-freebsd-x64": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.10.tgz",- "integrity": "sha512-ynOk/eEYhC6ZB2xCGvKrEOwE58oBy9LnrAqtkrDF9Fz1VTaNdGZTsV0VarJdhPwb+sOJTGjCLwcuyRJZ1dnMcQ==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.11.tgz",+ "integrity": "sha512-4Ir5FSOKIAMr4r0kExpt1s3bMgzJU3rA45AYOHtQpls0oNeqcYBKrWMlckrYH4KCfGLfkfn1tN1dmZPMVsdXow==","cpu": ["x64"],@@ -735,9 +735,9 @@}},"node_modules/@rolldown/binding-linux-arm-gnueabihf": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.10.tgz",- "integrity": "sha512-ERrAs185meZZhGan7a4l3RiiJK1ArSDlHdST++uvSxe+FDbR4TwUPahT/cbZJvaG6fIpDpF78surN+tX708Y4Q==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.11.tgz",+ "integrity": "sha512-/gnRDM+39BROzAN/k1OZjDPnDMcZxB/0EUxKjONO5yVkNEvlsoMDrxGNKgZi/ttFriS2gwlDNzB65pvNbFOXIQ==","cpu": ["arm"],@@ -752,9 +752,9 @@}},"node_modules/@rolldown/binding-linux-arm64-gnu": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.10.tgz",- "integrity": "sha512-KN7OHKD0J3jy1UzBwZWPxpwhODf9IARUIJcrH+yLYKOcmegZ8luEUM38lDP1bDVj40yP6PsSzCqOJF76vljFnQ==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.11.tgz",+ "integrity": "sha512-PFaK8HwvAHbaKbBcDNQihjMKYvFnA5hiENx/l5tphTDz1E0WFp32l0A7aq7lyUwGsRw/xSrNIy/gIK4thrSCrw==","cpu": ["arm64"],@@ -769,9 +769,9 @@}},"node_modules/@rolldown/binding-linux-arm64-musl": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.10.tgz",- "integrity": "sha512-8l9wP8O+wa8zD6iw6egSfzVtu7oZVfH3hlUsMM4MwbLMhxleqeoXbZzjddyK3YyNlwLhqznq3tF7PkNJ8T/V2w==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.11.tgz",+ "integrity": "sha512-AskzJUIKRLPxkruR1wLKewGbOw+EYfU/9lOrBFj4AFrEA8hPpKFnODWNu2WLaNs0QNkEb9QIJufmVZZIL/bJlg==","cpu": ["arm64"],@@ -786,9 +786,9 @@}},"node_modules/@rolldown/binding-linux-ppc64-gnu": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.10.tgz",- "integrity": "sha512-SeXNKeQzA5kLhz/J0CH6ZP0/HJ3v1xm/0YbiYpE0kK7emfRC2OIGGIaE14xzkISEGv2aYuUSpiLiU5Gbq+OI0A==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.11.tgz",+ "integrity": "sha512-qlUGAheh2yh8afH7QBgx0PrRHN85hKnNd78x8MeMhXivuevgd8vgf6/CstOzmNKY/lLTHvNTrPy98cLnAugzJw==","cpu": ["ppc64"],@@ -803,9 +803,9 @@}},"node_modules/@rolldown/binding-linux-s390x-gnu": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.10.tgz",- "integrity": "sha512-mtht0nR+y8/hart4175Ll15w7lY8dg7CtQ+j2FDNTsDRspOWTK/2V3l0aj9sIj7XmvqxT8Yli/wq22e7feTTWg==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.11.tgz",+ "integrity": "sha512-secpEad+0vCbSfn8upFySkDskv+bGPk3THSDS9Y89yc4rb4kzqHp8Dmyd9BkQW4SnhNXBZCl/6CrO//hZahNJQ==","cpu": ["s390x"],@@ -820,9 +820,9 @@}},"node_modules/@rolldown/binding-linux-x64-gnu": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.10.tgz",- "integrity": "sha512-FSM94nGd55NYo48usCyM/nHfUKRnqc9+b0vJNuKV0oCCpIp/OGims7rO1Nv/DkFkt0S/s2rxsJ2kkS8J3HcpeA==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.11.tgz",+ "integrity": "sha512-mOVBT3dPpkWm8XBWPmU4bf+U6dYDLeMo/9ojUmis4N0L5uu10qra5vOyngZ7/PSdoE4G9KvRt4bloRxNjLas7A==","cpu": ["x64"],@@ -837,9 +837,9 @@}},"node_modules/@rolldown/binding-linux-x64-musl": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.10.tgz",- "integrity": "sha512-C3YxNB16myRLs7o+B+6PnQ6jBsdIS4+AE4Ah8glVGhDpEv9AOvxhZ/1duAb4B0UGczEK/lBbccksd8VI+p6zfw==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.11.tgz",+ "integrity": "sha512-Is78i9A8Ui4SqcxUwFJ9uMmjDn58IbVTjFWYdQestFEgeuEmHMLGNriXnVJKkwG2YiZjw8cP0zCTyDMdDGtOOg==","cpu": ["x64"],@@ -854,9 +854,9 @@}},"node_modules/@rolldown/binding-openharmony-arm64": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.10.tgz",- "integrity": "sha512-571TlE/F1eeTjjdjYAMMMPs1Mfv3MtX6s3+ZKVU6HiUjZ5Njc6c/qzNy/8K3zALTZnaw3JQVYrHxvNfjm43KAg==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.11.tgz",+ "integrity": "sha512-dUCXneZ87INUMyQ0D+C0HrEBNUPNXHaPmU5GTjyKTJEiussw9Kaj5Ln8UztPe4epV/ffvgNBEadksdYhmW6xJA==","cpu": ["arm64"],@@ -871,9 +871,9 @@}},"node_modules/@rolldown/binding-win32-arm64-msvc": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.10.tgz",- "integrity": "sha512-QXW+ZWaiqs2c7Fi++D/SsW07LTPcUrncxcskJGfGNBoaLik1IU6fJymz4HsqwEO0u5Iq11yTO0B/mc4cPk7jrQ==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.11.tgz",+ "integrity": "sha512-jByxb6qfd+bH1xUd0qnfFnb17i9sWBPY2tOavJ0l3tdr3OTu+Kvtm8cd/JV5nFt657b1VqGltxg9olOEfofXWw==","cpu": ["arm64"],@@ -888,9 +888,9 @@}},"node_modules/@rolldown/binding-win32-x64-msvc": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.10.tgz",- "integrity": "sha512-5FQFGgah17YeMtG1Yd5a+rMxQpTksyNXxRtKz06FVTaQw3RKYUJQbUoKk0/5jrXBpDo+7makNP7UHA2LQyH64A==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.11.tgz",+ "integrity": "sha512-/PzKqzAJ03i19oy2ItPvyvaVjOjBCNnfaJs8yvUdGBKmiESgnrJSQ2awd81QzFbbnAmu7YO9ZnJrDCb9VSJPRA==","cpu": ["x64"],@@ -3041,9 +3041,9 @@}},"node_modules/rolldown": {- "version": "1.2.10",- "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.10.tgz",- "integrity": "sha512-OxkA08pSryMK7B3XiFA09B4OJ1xJMPgIYCBMY2xchzpqgBGsV1o0DetPAE+Sl3N3L4oCPiEzmHVSOj7iR04Zog==",+ "version": "1.2.11",+ "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.11.tgz",+ "integrity": "sha512-qpSwIyz0jHQq5qXBTNxFmE6664rJ7O+4TvPFOiOaBSrz8IOHc1koKKSqTM2H6u1UG1+TveuC6vaDHKXFOvb1Kw==","dev": true,"license": "MIT","dependencies": {@@ -3057,21 +3057,21 @@"node": "^20.19.0 || >=22.12.0"},"optionalDependencies": {- "@rolldown/binding-android-arm-eabi": "1.2.10",- "@rolldown/binding-android-arm64": "1.2.10",- "@rolldown/binding-darwin-arm64": "1.2.10",- "@rolldown/binding-darwin-x64": "1.2.10",- "@rolldown/binding-freebsd-x64": "1.2.10",- "@rolldown/binding-linux-arm-gnueabihf": "1.2.10",- "@rolldown/binding-linux-arm64-gnu": "1.2.10",- "@rolldown/binding-linux-arm64-musl": "1.2.10",- "@rolldown/binding-linux-ppc64-gnu": "1.2.10",- "@rolldown/binding-linux-s390x-gnu": "1.2.10",- "@rolldown/binding-linux-x64-gnu": "1.2.10",- "@rolldown/binding-linux-x64-musl": "1.2.10",- "@rolldown/binding-openharmony-arm64": "1.2.10",- "@rolldown/binding-win32-arm64-msvc": "1.2.10",- "@rolldown/binding-win32-x64-msvc": "1.2.10"+ "@rolldown/binding-android-arm-eabi": "1.2.11",+ "@rolldown/binding-android-arm64": "1.2.11",+ "@rolldown/binding-darwin-arm64": "1.2.11",+ "@rolldown/binding-darwin-x64": "1.2.11",+ "@rolldown/binding-freebsd-x64": "1.2.11",+ "@rolldown/binding-linux-arm-gnueabihf": "1.2.11",+ "@rolldown/binding-linux-arm64-gnu": "1.2.11",+ "@rolldown/binding-linux-arm64-musl": "1.2.11",+ "@rolldown/binding-linux-ppc64-gnu": "1.2.11",+ "@rolldown/binding-linux-s390x-gnu": "1.2.11",+ "@rolldown/binding-linux-x64-gnu": "1.2.11",+ "@rolldown/binding-linux-x64-musl": "1.2.11",+ "@rolldown/binding-openharmony-arm64": "1.2.11",+ "@rolldown/binding-win32-arm64-msvc": "1.2.11",+ "@rolldown/binding-win32-x64-msvc": "1.2.11"}},"node_modules/rxjs": {@@ -3410,16 +3410,16 @@"link": true},"node_modules/vite": {- "version": "8.3.0",- "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.0.tgz",- "integrity": "sha512-lhZBVvEHefgE+HQZC9O7EBJgCU/nVzFNl7vkS4RE0APtWLP02/8QVIkQtzBxPquh7lq5/78NHipTj7ODQ6XuyQ==",+ "version": "8.3.1",+ "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.1.tgz",+ "integrity": "sha512-/bvH9E9tmCXRGp2uXY3WbOldqpTwFkbha/8ANaEQ6VkxhH60KyqLwgZq6lG2y+4uT55x9+9eUHMpQ7uGnOCKjA==","dev": true,"license": "MIT","dependencies": {"lightningcss": "^1.33.0","picomatch": "^4.0.7","postcss": "^8.5.28",- "rolldown": "~1.2.6",+ "rolldown": "~1.2.9","tinyglobby": "^0.2.17"},"bin": {diff --git a/resources/assets/v3/js/pages/accounts/index.js b/resources/assets/v3/js/pages/accounts/index.jsindex 07b1f10346..29774ecef5 100644--- a/resources/assets/v3/js/pages/accounts/index.js+++ b/resources/assets/v3/js/pages/accounts/index.js@@ -22,14 +22,14 @@ import "../../boot/bootstrap.js";import sidebar from "../shared/sidebar.js";import dates from "../shared/dates.js";import Alpine from "alpinejs";-import {getVariable} from "../../store/get-variable.js";+import { getVariable } from "../../store/get-variable.js";import Put from "../../api/model/account/put.js";import Get from "../../api/model/account/get.js";-import {format} from "date-fns";+import { format } from "date-fns";import formatMoney from "../../util/format-money.js";import i18next from "i18next";-import {addDrag} from "../shared/drag-and-droppable-rows.js";-import {nextTick} from "alpinejs/src/nextTick.js";+import { addDrag } from "../shared/drag-and-droppable-rows.js";+import { nextTick } from "alpinejs/src/nextTick.js";window.enableDates = false;@@ -47,21 +47,29 @@ let index = function () {pageNavUrl: "./accounts/",handleFunc: null,-updateHistory() {if (history.pushState) {- let newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname + "?page=" + this.page + "&column=" + this.sortColumn + "&direction=" + this.sortDirection;- window.history.pushState({path: newUrl}, "", newUrl);+ let newUrl =+ window.location.protocol ++ "//" ++ window.location.host ++ window.location.pathname ++ "?page=" ++ this.page ++ "&column=" ++ this.sortColumn ++ "&direction=" ++ this.sortDirection;+ window.history.pushState({ path: newUrl }, "", newUrl);}},init() {this.handleFunc = this.handlePageClick.bind(this);const page = window.location.href.split("?")[0].split("/");- if ('inactive-accounts' === page[page.length - 2]) {+ if ("inactive-accounts" === page[page.length - 2]) {this.active = false;}-this.objectType = page[page.length - 1].substring(0, 15);this.pageNavUrl = "./accounts/" + this.objectType;const params = new Proxy(new URLSearchParams(window.location.search), {@@ -96,7 +104,7 @@ let index = function () {let item = e.detail[i];if (item.order !== item.currentOrder) {// PUT new order to system.- new Put().put({order: item.order}, {id: item.id});+ new Put().put({ order: item.order }, { id: item.id });// save new order as current order in the row.document.querySelector(`tr[data-id="${item.id}"]`)@@ -195,12 +203,12 @@ let index = function () {this.accounts.push(account);}}- console.log('Count of accounts', this.accounts.length);+ console.log("Count of accounts", this.accounts.length);this.loading = false;if (0 === this.accounts.length) {- document.querySelectorAll('.data-holder').forEach((el) => {- el.classList.add('d-none');- })+ document.querySelectorAll(".data-holder").forEach((el) => {+ el.classList.add("d-none");+ });}});},@@ -214,19 +222,19 @@ let index = function () {if (null === date) {return "";}- return format(new Date(date), i18next.t("config.date_time_fns_short", {lng: window.store.get("locale")}));+ return format(new Date(date), i18next.t("config.date_time_fns_short", { lng: window.store.get("locale") }));},handlePageClick(e) {let link = e.currentTarget;let page = parseInt(link.dataset.page);- console.log('Click detected requested page ', page);+ console.log("Click detected requested page ", page);if (isNaN(page)) {e.preventDefault();return false;}this.page = page;- console.log('Page set to ', this.page);+ console.log("Page set to ", this.page);this.updateHistory();this.downloadAccounts();e.preventDefault();@@ -236,11 +244,11 @@ let index = function () {return false;},capturePageNavigation() {- document.querySelectorAll('a.page-link').forEach((el) => {- el.removeEventListener('click', this.handleFunc);- el.addEventListener('click', this.handleFunc);+ document.querySelectorAll("a.page-link").forEach((el) => {+ el.removeEventListener("click", this.handleFunc);+ el.addEventListener("click", this.handleFunc);});- }+ },};};diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.phpindex bba34d0ebd..0b609c52d4 100644--- a/resources/lang/en_US/firefly.php+++ b/resources/lang/en_US/firefly.php@@ -1976,10 +1976,10 @@ return ['account_locked_currency' => 'The currency of this account must remain :name as long as piggy banks are linked to it.','i_am_owed_amount' => 'I am owed amount','i_owe_amount' => 'I owe amount',- 'may_inactive_accounts_link' => 'If all your accounts are inactive, <a href="{{url}}">you can view them on this separate page</a>.',- 'no_inactive_accounts' => 'You have no inactive (archived) accounts. <a href="{{url}}">Go back to your list of active accounts</a>.',+ 'may_inactive_accounts_link' => 'If all your accounts are inactive, <a href="{{url}}">you can view them on this separate page</a>.',+ 'no_inactive_accounts' => 'You have no inactive (archived) accounts. <a href="{{url}}">Go back to your list of active accounts</a>.','inactive_account_link' => 'You have :count inactive (archived) account, which you can view on this separate page.|You have :count inactive (archived) accounts, which you can view on this separate page.',- 'inactive_account_link_js' => 'You can view inactive accounts on this separate page.',+ 'inactive_account_link_js' => 'You can view inactive accounts on this separate page.','all_accounts_inactive' => 'These are your inactive accounts.','active_account_link' => 'This link goes back to your active accounts.','account_missing_transaction' => 'Account #:id (":name") cannot be viewed directly, but Firefly is missing redirect information.',