Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-09-24
JC508e2da45f783
diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.phpindex df99eef909..94be2ae461 100644--- a/app/Api/V1/Controllers/Insight/Income/TagController.php+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php@@ -158,7 +158,10 @@ 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 f92a7aa9f0..b7b85fd376 100644--- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php+++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php@@ -155,7 +155,10 @@ 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/Api/V1/Controllers/Models/Account/ShowController.php b/app/Api/V1/Controllers/Models/Account/ShowController.phpindex 0934aae084..f87116e9b8 100644--- a/app/Api/V1/Controllers/Models/Account/ShowController.php+++ b/app/Api/V1/Controllers/Models/Account/ShowController.php@@ -77,7 +77,7 @@ final class ShowController extends Controller'sort' => $sort,'start' => $start,'end' => $end,- 'active' => $active,+ 'active' => $active,'date' => $date,] = $request->attributes->all();// get list of accounts. Count it and split it.diff --git a/app/Api/V1/Controllers/Models/Transaction/StoreController.php b/app/Api/V1/Controllers/Models/Transaction/StoreController.phpindex c94fa5caa9..45b190abf8 100644--- a/app/Api/V1/Controllers/Models/Transaction/StoreController.php+++ b/app/Api/V1/Controllers/Models/Transaction/StoreController.php@@ -90,6 +90,7 @@ final class StoreController extends Controller$data = $request->getAll();$data['user'] = auth()->user();$data['user_group'] = $this->userGroup;+try {$transactionGroup = $this->groupRepository->store($data);} catch (DuplicateTransactionException $e) {diff --git a/app/Api/V1/Requests/Generic/ActiveObjectRequest.php b/app/Api/V1/Requests/Generic/ActiveObjectRequest.phpindex e39a2a654f..1a9c40e220 100644--- a/app/Api/V1/Requests/Generic/ActiveObjectRequest.php+++ b/app/Api/V1/Requests/Generic/ActiveObjectRequest.php@@ -40,7 +40,7 @@ class ActiveObjectRequest extends ApiRequest{$validator->after(function (Validator $validator): void {$active = null;- if($this->has('active')) {+ if ($this->has('active')) {$active = $this->boolean('active', null);}diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.phpindex 2edb4f5531..d461374baa 100644--- a/app/Http/Controllers/Budget/BudgetLimitController.php+++ b/app/Http/Controllers/Budget/BudgetLimitController.php@@ -198,7 +198,13 @@ 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 65429e59c1..52c6f900e3 100644--- a/app/Http/Controllers/Budget/IndexController.php+++ b/app/Http/Controllers/Budget/IndexController.php@@ -272,7 +272,10 @@ 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 ad724137dc..f4b32fe5c5 100644--- a/app/Http/Controllers/Chart/BudgetController.php+++ b/app/Http/Controllers/Chart/BudgetController.php@@ -539,7 +539,13 @@ 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 476da65ac3..affea656a0 100644--- a/app/Jobs/CreateAutoBudgetLimits.php+++ b/app/Jobs/CreateAutoBudgetLimits.php@@ -132,7 +132,13 @@ 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));@@ -222,7 +228,13 @@ 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/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php b/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.phpindex 962bc858f2..578f82542f 100644--- a/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php+++ b/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php@@ -95,6 +95,7 @@ trait SupportsGroupProcessingTrait}if (0 === $objects->accounts->count()) {Log::debug('Count is zero, do not continue.');+return;}$earliest = today()->subDays(2);diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.phpindex 2f7975d42b..71efe6641b 100644--- a/app/Repositories/Account/AccountRepository.php+++ b/app/Repositories/Account/AccountRepository.php@@ -237,7 +237,7 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfacif (0 !== count($types)) {$query->accountTypeIn($types);}- if(null !== $filterActive) {+ if (null !== $filterActive) {$query->where('accounts.active', $filterActive);}diff --git a/app/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.phpindex a3a940b1ba..a507156873 100644--- a/app/Support/Http/Controllers/AugumentData.php+++ b/app/Support/Http/Controllers/AugumentData.php@@ -222,7 +222,14 @@ 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/AccountEnrichment.php b/app/Support/JsonApi/Enrichments/AccountEnrichment.phpindex aa6463556c..5601f75fee 100644--- a/app/Support/JsonApi/Enrichments/AccountEnrichment.php+++ b/app/Support/JsonApi/Enrichments/AccountEnrichment.php@@ -350,7 +350,8 @@ class AccountEnrichment implements EnrichmentInterface])->whereIn('account_id', $this->ids)->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data'])- ->toArray();+ ->toArray()+ ;/** @var array $entry */foreach ($set as $entry) {diff --git a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php b/app/Support/JsonApi/Enrichments/RecurringEnrichment.phpindex d0c09bf027..2428353cb0 100644--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php@@ -354,7 +354,11 @@ 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/app/Support/Models/AccountBalanceCalculator.php b/app/Support/Models/AccountBalanceCalculator.phpindex 6ff086d595..83e8279c04 100644--- a/app/Support/Models/AccountBalanceCalculator.php+++ b/app/Support/Models/AccountBalanceCalculator.php@@ -54,6 +54,7 @@ class AccountBalanceCalculatorreturn '0';}+/** @var Builder $query */$query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')->whereNull('transactions.deleted_at')@@ -86,9 +87,14 @@ class AccountBalanceCalculator}$balance = (string) ($first->balance_after ?? '0');- Log::debug(sprintf('getLatestBalance: found balance: %s in transaction #%d on moment %s', Steam::bcround($balance, 2), $first->id ?? 0, $notBefore->format('Y-m-d H:i:s')));-// Log::debug($query->toSql());-// Log::debug($query->toRawSql());+ Log::debug(sprintf(+ 'getLatestBalance: found balance: %s in transaction #%d on moment %s',+ Steam::bcround($balance, 2),+ $first->id ?? 0,+ $notBefore->format('Y-m-d H:i:s')+ ));+ // Log::debug($query->toSql());+ // Log::debug($query->toRawSql());return $balance;}@@ -138,7 +144,6 @@ class AccountBalanceCalculator/** @var Transaction $entry */foreach ($set as $entry) {-// start with empty array:$entry->account_id = (int) $entry->account_id;$entry->transaction_currency_id = (int) $entry->transaction_currency_id;diff --git a/composer.lock b/composer.lockindex 48b7126c08..ca39617fea 100644--- a/composer.lock+++ b/composer.lock@@ -130,23 +130,24 @@},{"name": "brick/math",- "version": "0.19.1",+ "version": "1.0.0","source": {"type": "git","url": "https://github.com/brick/math.git",- "reference": "a89bc96a7cf3d7b59e725afe57ccb95eb03cf6ce"+ "reference": "2effe05d2177c451b86c6a073196a4034c02f211"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/brick/math/zipball/a89bc96a7cf3d7b59e725afe57ccb95eb03cf6ce",- "reference": "a89bc96a7cf3d7b59e725afe57ccb95eb03cf6ce",+ "url": "https://api.github.com/repos/brick/math/zipball/2effe05d2177c451b86c6a073196a4034c02f211",+ "reference": "2effe05d2177c451b86c6a073196a4034c02f211","shasum": ""},"require": {"php": "^8.2"},"require-dev": {- "phpstan/phpstan": "2.1.22",+ "phpstan/phpstan": "2.2.13",+ "phpstan/phpstan-phpunit": "2.0.18","phpunit/phpunit": "^11.5"},"type": "library",@@ -177,7 +178,7 @@],"support": {"issues": "https://github.com/brick/math/issues",- "source": "https://github.com/brick/math/tree/0.19.1"+ "source": "https://github.com/brick/math/tree/1.0.0"},"funding": [{@@ -185,7 +186,7 @@"type": "github"}],- "time": "2026-08-08T23:03:16+00:00"+ "time": "2026-09-12T10:28:18+00:00"},{"name": "carbonphp/carbon-doctrine-types",@@ -1896,20 +1897,20 @@},{"name": "laravel/framework",- "version": "v13.32.0",+ "version": "v13.33.0","source": {"type": "git","url": "https://github.com/laravel/framework.git",- "reference": "cdd8b33c246719acdd118c705ce8c7ab5ef48a96"+ "reference": "91188a17ceaa3dbace6e8a5f7abd0d042e466359"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/laravel/framework/zipball/cdd8b33c246719acdd118c705ce8c7ab5ef48a96",- "reference": "cdd8b33c246719acdd118c705ce8c7ab5ef48a96",+ "url": "https://api.github.com/repos/laravel/framework/zipball/91188a17ceaa3dbace6e8a5f7abd0d042e466359",+ "reference": "91188a17ceaa3dbace6e8a5f7abd0d042e466359","shasum": ""},"require": {- "brick/math": "^0.14.2 || ^0.15 || ^0.16 || ^0.17 || ^0.18 || ^0.19",+ "brick/math": "^0.14.2 || ^0.15 || ^0.16 || ^0.17 || ^0.18 || ^0.19 || ^0.20 || ^1.0","composer-runtime-api": "^2.2","doctrine/inflector": "^2.0.5","dragonmantank/cron-expression": "^3.4",@@ -2123,7 +2124,7 @@"issues": "https://github.com/laravel/framework/issues","source": "https://github.com/laravel/framework"},- "time": "2026-09-15T14:55:30+00:00"+ "time": "2026-09-22T14:12:33+00:00"},{"name": "laravel/passport",@@ -2261,16 +2262,16 @@},{"name": "laravel/serializable-closure",- "version": "v2.0.16",+ "version": "v2.1.0","source": {"type": "git","url": "https://github.com/laravel/serializable-closure.git",- "reference": "7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed"+ "reference": "2d5869a838bbcf37e0d8b0568fc41914e81374b5"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed",- "reference": "7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed",+ "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/2d5869a838bbcf37e0d8b0568fc41914e81374b5",+ "reference": "2d5869a838bbcf37e0d8b0568fc41914e81374b5","shasum": ""},"require": {@@ -2318,7 +2319,7 @@"issues": "https://github.com/laravel/serializable-closure/issues","source": "https://github.com/laravel/serializable-closure"},- "time": "2026-08-18T20:28:54+00:00"+ "time": "2026-09-22T14:32:34+00:00"},{"name": "laravel/slack-notification-channel",@@ -11632,11 +11633,11 @@},{"name": "phpstan/phpstan",- "version": "2.2.14",+ "version": "2.2.15","dist": {"type": "zip",- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9c672e7a8e791dfc3d30e55f683e73fc0b63a3ac",- "reference": "9c672e7a8e791dfc3d30e55f683e73fc0b63a3ac",+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b158556ffd26825cf615a1c1f72fb5157a2301b7",+ "reference": "b158556ffd26825cf615a1c1f72fb5157a2301b7","shasum": ""},"require": {@@ -11692,7 +11693,7 @@"type": "github"}],- "time": "2026-09-12T21:39:33+00:00"+ "time": "2026-09-23T12:23:07+00:00"},{"name": "phpstan/phpstan-deprecation-rules",diff --git a/config/firefly.php b/config/firefly.phpindex acfe862b66..05f7d8322f 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-22',-'build_time' => 1790084753,+'version' => 'develop/2026-09-24',+'build_time' => 1790223628,'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 04c33b2daa..e0ddfff63d 100644--- a/package-lock.json+++ b/package-lock.json@@ -328,9 +328,9 @@"license": "MIT"},"node_modules/@oxc-project/types": {- "version": "0.150.0",- "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.150.0.tgz",- "integrity": "sha512-rDS5/31E9HfPl/CIzGrn0DOlvBbXFseQ5URJ9sYMfstbKLD/c6Gm9vmRzRGDdAXyOIL4zmO37lc9RIwYqVruZw==",+ "version": "0.151.0",+ "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.151.0.tgz",+ "integrity": "sha512-J1yXrIlNDZVzE3ada310xeAw7nH8yCAyLPuUIsjKatFPmfn5bS1oW+cM+QsGOtVWd5nhSpbwZWx/rue+r5Z+PA==","dev": true,"license": "MIT","funding": {@@ -650,9 +650,9 @@}},"node_modules/@rolldown/binding-android-arm-eabi": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.9.tgz",- "integrity": "sha512-tNISae1QEf/vkb3xkRcjV5SEdzPE97We5IVaa2Z8jSszQPZ8U60B/YCYpw4QI7VidYsBtKavczXf+DyDs9WGxw==",+ "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==","cpu": ["arm"],@@ -667,9 +667,9 @@}},"node_modules/@rolldown/binding-android-arm64": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.9.tgz",- "integrity": "sha512-YC8YsI30o606GTZi0VyzYlsDKFP8W61i/QzayHDkLbNEz/IShqAmTa+hsJRj13xTHA0H+6fk4b2UmGn+Q/cMlg==",+ "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==","cpu": ["arm64"],@@ -684,9 +684,9 @@}},"node_modules/@rolldown/binding-darwin-arm64": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.9.tgz",- "integrity": "sha512-IwhlH3qK5urrY8hZiEgGkHKEFN901p/p2bjxCxJlr4GyNnF7wYpUvK+Y43uaRYuC4hpfjzbR3SJC3arX1jGvmw==",+ "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==","cpu": ["arm64"],@@ -701,9 +701,9 @@}},"node_modules/@rolldown/binding-darwin-x64": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.9.tgz",- "integrity": "sha512-XxpJfVzFh+jilRxIXUqcfYAYcunIc/XEzIizsOL1fcJee5Sf7H3mH8WlLmfHfluz5amqR88QQo9izKtmMlavAw==",+ "version": "1.2.10",+ "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.10.tgz",+ "integrity": "sha512-7f5h17q5KZVx/ji1vb8OTq31ch1O2I7K8NPIr44GkyWTApXMIsmhWqZfgpOH10xeauqghDAvGlZktasCkcF6Eg==","cpu": ["x64"],@@ -718,9 +718,9 @@}},"node_modules/@rolldown/binding-freebsd-x64": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.9.tgz",- "integrity": "sha512-kSfvhmgeWyfkbT3p/1s5vSgboogoah2zkm9fX2zjg2hHxSV7T4KhMWRUUaRk4OXNqoD3QAUeRqLcs1aZOK4U1g==",+ "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==","cpu": ["x64"],@@ -735,9 +735,9 @@}},"node_modules/@rolldown/binding-linux-arm-gnueabihf": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.9.tgz",- "integrity": "sha512-1RVzG17pxqbTfYLC352JlLt6kKLG+6Hr30n8DlIJqsnV5luUDd2Qdx9Ayw1Cabfyb1K9k0jXEZ7evxkRoT+uiw==",+ "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==","cpu": ["arm"],@@ -752,9 +752,9 @@}},"node_modules/@rolldown/binding-linux-arm64-gnu": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.9.tgz",- "integrity": "sha512-BXqPvZ2drqVD+/Z8UpKwcs4Mp7grM+eGFku4CAEKrEtcbAsUpzREphK1sogCRZGreVPiMkiiBtw0n3TPteuqvw==",+ "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==","cpu": ["arm64"],@@ -769,9 +769,9 @@}},"node_modules/@rolldown/binding-linux-arm64-musl": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.9.tgz",- "integrity": "sha512-11vWvo8YDwLzukt27J3aYDWU+gg2P7J+ZOmiJ0hkF5BXZDW7pVya7r40MXDy6ya0i9KamoENSVKIugvJNgFXIA==",+ "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==","cpu": ["arm64"],@@ -786,9 +786,9 @@}},"node_modules/@rolldown/binding-linux-ppc64-gnu": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.9.tgz",- "integrity": "sha512-a1tijMkdwsIARtc0F39ApURROkf3NwqinI6TOiSSWCTR7dT96dffNvMUtDHnq64wKNTIZOIlzKrFvvFUznJiyw==",+ "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==","cpu": ["ppc64"],@@ -803,9 +803,9 @@}},"node_modules/@rolldown/binding-linux-s390x-gnu": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.9.tgz",- "integrity": "sha512-x6SQNdAvv4c3hWqTMaWuawzMX9myaCs/yEmlGsxJzkdClnHW7FbrjQuSiRDhuSYzEYoEMhsaJy9qHG/XNemJPQ==",+ "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==","cpu": ["s390x"],@@ -820,9 +820,9 @@}},"node_modules/@rolldown/binding-linux-x64-gnu": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.9.tgz",- "integrity": "sha512-9s0AZ8BFK5/n7B/TBoa2yJE3gI3KURrbXcPBlsAsvjU4VeJKgE90y1YtNxyEUIcHPQkg6/yfF3qihUrcM/Kf0Q==",+ "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==","cpu": ["x64"],@@ -837,9 +837,9 @@}},"node_modules/@rolldown/binding-linux-x64-musl": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.9.tgz",- "integrity": "sha512-P7VWAmV+WdJluH7ovnRGoiv2i8To7GAZ+kGzfGup635cyL7SyYl3lSUaA3Gp5THf0n/Co5EyEqb2zbqq+nMOHQ==",+ "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==","cpu": ["x64"],@@ -854,9 +854,9 @@}},"node_modules/@rolldown/binding-openharmony-arm64": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.9.tgz",- "integrity": "sha512-1qixtsE4BK8h+yS3BfmZ09UhA7O/N4IACva6YBr7EBvCJraByTuRcgOTaiA62Tm0vey3UcKXLOaoGHtYmNGEVg==",+ "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==","cpu": ["arm64"],@@ -871,9 +871,9 @@}},"node_modules/@rolldown/binding-win32-arm64-msvc": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.9.tgz",- "integrity": "sha512-ok8IQjcEPs1AKZfuEUznVBrJw+gK4soq+bx8b1X2XoMqVClarc1q5JDmVtWXY1xfr6ZuHTAsPXHTgTrqKTZeww==",+ "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==","cpu": ["arm64"],@@ -888,9 +888,9 @@}},"node_modules/@rolldown/binding-win32-x64-msvc": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.9.tgz",- "integrity": "sha512-Ip2mXoU0hM0boq3Rf+ekuT653OROSo6aSYcPT1VHE4q52KvyxgFkQgrgb/IEsxOuvQ2fZZbs8khJAyCEPM24/g==",+ "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==","cpu": ["x64"],@@ -3041,13 +3041,13 @@}},"node_modules/rolldown": {- "version": "1.2.9",- "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.9.tgz",- "integrity": "sha512-hx/Pv0N1haXRb11qkfnK5MXB/iqr7i0yjWQqmO9uHqZpBgQSqzc8UsSnEpalsh+j1I8qQ2CkXAkJC8Br3dKSlg==",+ "version": "1.2.10",+ "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.10.tgz",+ "integrity": "sha512-OxkA08pSryMK7B3XiFA09B4OJ1xJMPgIYCBMY2xchzpqgBGsV1o0DetPAE+Sl3N3L4oCPiEzmHVSOj7iR04Zog==","dev": true,"license": "MIT","dependencies": {- "@oxc-project/types": "=0.150.0",+ "@oxc-project/types": "=0.151.0","@rolldown/pluginutils": "^1.0.0"},"bin": {@@ -3057,21 +3057,21 @@"node": "^20.19.0 || >=22.12.0"},"optionalDependencies": {- "@rolldown/binding-android-arm-eabi": "1.2.9",- "@rolldown/binding-android-arm64": "1.2.9",- "@rolldown/binding-darwin-arm64": "1.2.9",- "@rolldown/binding-darwin-x64": "1.2.9",- "@rolldown/binding-freebsd-x64": "1.2.9",- "@rolldown/binding-linux-arm-gnueabihf": "1.2.9",- "@rolldown/binding-linux-arm64-gnu": "1.2.9",- "@rolldown/binding-linux-arm64-musl": "1.2.9",- "@rolldown/binding-linux-ppc64-gnu": "1.2.9",- "@rolldown/binding-linux-s390x-gnu": "1.2.9",- "@rolldown/binding-linux-x64-gnu": "1.2.9",- "@rolldown/binding-linux-x64-musl": "1.2.9",- "@rolldown/binding-openharmony-arm64": "1.2.9",- "@rolldown/binding-win32-arm64-msvc": "1.2.9",- "@rolldown/binding-win32-x64-msvc": "1.2.9"+ "@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"}},"node_modules/rxjs": {@@ -3085,9 +3085,9 @@}},"node_modules/sass": {- "version": "1.104.1",- "resolved": "https://registry.npmjs.org/sass/-/sass-1.104.1.tgz",- "integrity": "sha512-yDA+1aIG3EHgN4V/BvuhCvu61FF6hEd4e+9DxikUm9U0CAGuvdIZ/UYy7qbOxjhbbWQraoyLlMuzdRGOSV5Bmw==",+ "version": "1.105.0",+ "resolved": "https://registry.npmjs.org/sass/-/sass-1.105.0.tgz",+ "integrity": "sha512-4EjSuRTyG8M4yRXXY1PT9OUV5zz23xBxJkbIAprohKHqf6HOU4MCpE3U3vAC+iO1gxobBjESNbcj8rYAQZWnyA==","dev": true,"license": "MIT","dependencies": {diff --git a/resources/assets/v3/js/boot/bootstrap.js b/resources/assets/v3/js/boot/bootstrap.jsindex 0a43486feb..6f8a78fad0 100644--- a/resources/assets/v3/js/boot/bootstrap.js+++ b/resources/assets/v3/js/boot/bootstrap.js@@ -28,10 +28,10 @@ import store from "../store/store.js";import axios from "axios";import Shepherd from "shepherd.js";import "cally";-import {getFreshVariable} from "../store/get-fresh-variable.js";-import {getVariables} from "../store/get-variables.js";-import {getViewRange} from "../support/get-viewrange.js";-import {loadTranslations} from "../support/load-translations.js";+import { getFreshVariable } from "../store/get-fresh-variable.js";+import { getVariables } from "../store/get-variables.js";+import { getViewRange } from "../support/get-viewrange.js";+import { loadTranslations } from "../support/load-translations.js";import i18next from "i18next";window.bootstrapped = false;@@ -79,90 +79,89 @@ getFreshVariable("lastActivity")window.__localeId__ = replacedLocale;store.set("language", replacedLanguage);store.set("locale", replacedLocale);- console.log('Ready with bootstrap for this page.');- loadTranslations(replacedLanguage, replacedLocale)- .then(function () {- window.i18next = i18next;- const event = new Event("firefly-iii-bootstrapped");- document.dispatchEvent(event);- window.bootstrapped = true;- // console.log('Bootstrapped!');+ console.log("Ready with bootstrap for this page.");+ loadTranslations(replacedLanguage, replacedLocale).then(function () {+ window.i18next = i18next;+ const event = new Event("firefly-iii-bootstrapped");+ document.dispatchEvent(event);+ window.bootstrapped = true;+ // console.log('Bootstrapped!');- // page may have an introduction necessary to be played.- if (!window.showTour) {- return;- }- const url = "/";- let site = axios.create({- baseURL: url,- withCredentials: true,- });- axios.defaults.withCredentials = true;- axios.defaults.baseURL = url;+ // page may have an introduction necessary to be played.+ if (!window.showTour) {+ return;+ }+ const url = "/";+ let site = axios.create({+ baseURL: url,+ withCredentials: true,+ });+ axios.defaults.withCredentials = true;+ axios.defaults.baseURL = url;- site.get(window.routeStepsUrl).then(function (data) {- let hints = data.data;+ site.get(window.routeStepsUrl).then(function (data) {+ let hints = data.data;- const tour = new Shepherd.Tour({- useModalOverlay: true,- defaultStepOptions: {- // classes: 'shadow-md bg-purple-dark',- scrollTo: true,- cancelIcon: {- enabled: true,- },+ const tour = new Shepherd.Tour({+ useModalOverlay: true,+ defaultStepOptions: {+ // classes: 'shadow-md bg-purple-dark',+ scrollTo: true,+ cancelIcon: {+ enabled: true,},- });- // cancel or complete- tour.on("cancel", () => {- site.post(window.routeForFinishedTour);- });- tour.on("complete", () => {- site.post(window.routeForFinishedTour);- });+ },+ });+ // cancel or complete+ tour.on("cancel", () => {+ site.post(window.routeForFinishedTour);+ });+ tour.on("complete", () => {+ site.post(window.routeForFinishedTour);+ });- for (let i = 0; i < hints.length; i++) {- if (Object.hasOwn(hints, i)) {- let hint = hints[i];+ for (let i = 0; i < hints.length; i++) {+ if (Object.hasOwn(hints, i)) {+ let hint = hints[i];- let buttons = [];- if (i > 0) {- buttons.push({- text: i18next.t("firefly.intro_prev_label"),- action: tour.back,- });- }- if (i < hints.length - 1) {- buttons.push({- text: i18next.t("firefly.intro_next_label"),- action: tour.next,- });- }- if (i === hints.length - 1) {- // console.log("Add complete");- buttons.push({- text: i18next.t("firefly.intro_done_label"),- action: tour.complete,- });- }+ let buttons = [];+ if (i > 0) {+ buttons.push({+ text: i18next.t("firefly.intro_prev_label"),+ action: tour.back,+ });+ }+ if (i < hints.length - 1) {+ buttons.push({+ text: i18next.t("firefly.intro_next_label"),+ action: tour.next,+ });+ }+ if (i === hints.length - 1) {+ // console.log("Add complete");+ buttons.push({+ text: i18next.t("firefly.intro_done_label"),+ action: tour.complete,+ });+ }- let step = {- // id: 'example-step',- text: hint.text,- buttons: buttons,+ let step = {+ // id: 'example-step',+ text: hint.text,+ buttons: buttons,+ };+ if (Object.hasOwn(hint, "element")) {+ step.attachTo = {+ element: hint.element,+ on: hint.position,};- if (Object.hasOwn(hint, "element")) {- step.attachTo = {- element: hint.element,- on: hint.position,- };- }- tour.addStep(step);}+ tour.addStep(step);}- tour.start();- });+ }+ tour.start();});- });+ });+ },+ );});-diff --git a/resources/assets/v3/js/pages/accounts/index.js b/resources/assets/v3/js/pages/accounts/index.jsindex f91caac3a0..b223816226 100644--- a/resources/assets/v3/js/pages/accounts/index.js+++ b/resources/assets/v3/js/pages/accounts/index.js@@ -22,60 +22,65 @@ 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";window.enableDates = false;-let index = function () {return {listPageSize: 50,- objectType: 'invalid',- sortColumn: 'order',+ objectType: "invalid",+ sortColumn: "order",accounts: [],- sortDirection: 'asc',+ sortDirection: "asc",page: 1,totalPages: 1,init() {- const page = window.location.href.split('?')[0].split("/");+ const page = window.location.href.split("?")[0].split("/");this.objectType = page[page.length - 1].substring(0, 15);const params = new Proxy(new URLSearchParams(window.location.search), {get: (searchParams, prop) => searchParams.get(prop),});- this.sortColumn = params.column ?? 'order';- this.sortDirection = params.direction ?? 'asc';+ this.sortColumn = params.column ?? "order";+ this.sortDirection = params.direction ?? "asc";this.page = parseInt(params.page) || 1;// grab the account list.this.downloadAccounts();-// get accounts by initial sort.- document.querySelectorAll('table.sortable th').forEach((el) => {+ document.querySelectorAll("table.sortable th").forEach((el) => {// console.log('El', el);- el.addEventListener('click', (event) => {+ el.addEventListener("click", (event) => {let newColumn = event.currentTarget.dataset.column;if (newColumn === this.sortColumn) {- this.sortDirection = 'asc' === this.sortDirection ? 'desc' : 'asc';+ this.sortDirection = "asc" === this.sortDirection ? "desc" : "asc";}if (newColumn !== this.sortColumn) {this.sortColumn = newColumn;}- console.log('Will now sort on column', newColumn, 'direction', this.sortDirection);+ console.log("Will now sort on column", newColumn, "direction", this.sortDirection);if (history.pushState) {- let newurl = window.location.protocol + "//" + window.location.host + window.location.pathname + '?column=' + this.sortColumn + '&direction=' + this.sortDirection;- window.history.pushState({path: newurl}, '', newurl);+ let newurl =+ window.location.protocol ++ "//" ++ window.location.host ++ window.location.pathname ++ "?column=" ++ this.sortColumn ++ "&direction=" ++ this.sortDirection;+ window.history.pushState({ path: newurl }, "", newurl);}this.downloadAccounts();});});-getVariable("listPageSize").then((listPageSize) => {this.listPageSize = listPageSize;//addDrag();@@ -85,7 +90,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}"]`)@@ -98,83 +103,109 @@ let index = function () {});},downloadAccounts() {- let sort = 'asc' === this.sortDirection ? this.sortColumn : '-' + this.sortColumn;+ let sort = "asc" === this.sortDirection ? this.sortColumn : "-" + this.sortColumn;let start = window.store.get("start");let end = window.store.get("end");let active = true;- (new Get).list({- active: active,- sort: sort,- page: this.page,- type: this.objectType,- start: start,- end: end- }).then((response) => {- this.accounts = [];- this.totalPages = parseInt(response.data.meta.pagination.total_pages);- for (let i = 1; i < response.data.data.length; i++) {- if (Object.hasOwn(response.data.data, i)) {- let current = response.data.data[i];- let balanceDifference = formatMoney(current.attributes.balance_difference, current.attributes.currency_code, true);- let balanceDiffFloat = parseFloat(current.attributes.balance_difference);- let currentBalance = formatMoney(current.attributes.current_balance, current.attributes.currency_code);- let currentBalanceFloat = parseFloat(current.attributes.current_balance);- let currentDebt = formatMoney(current.attributes.debt_amount, current.attributes.currency_code);- let currentDebtFloat = parseFloat(current.attributes.debt_amount);- if (window.store.get('convert_to_primary')) {- balanceDifference = formatMoney(current.attributes.pc_balance_difference, current.attributes.primary_currency_code, true);- balanceDiffFloat = parseFloat(current.attributes.pc_balance_difference);- currentBalance = formatMoney(current.attributes.pc_current_balance, current.attributes.primary_currency_code);- currentBalanceFloat = parseFloat(current.attributes.pc_current_balance);- currentDebt = formatMoney(current.attributes.pc_debt_amount, current.attributes.primary_currency_code);- currentDebtFloat = parseFloat(current.attributes.pc_debt_amount);- }- let lastActivity = this.formatDate(current.attributes.last_activity);- let noLastActivity = false;- if('' === lastActivity) {- lastActivity = i18next.t('firefly.never');- noLastActivity = true;+ new Get()+ .list({+ active: active,+ sort: sort,+ page: this.page,+ type: this.objectType,+ start: start,+ end: end,+ })+ .then((response) => {+ this.accounts = [];+ this.totalPages = parseInt(response.data.meta.pagination.total_pages);+ for (let i = 1; i < response.data.data.length; i++) {+ if (Object.hasOwn(response.data.data, i)) {+ let current = response.data.data[i];+ let balanceDifference = formatMoney(+ current.attributes.balance_difference,+ current.attributes.currency_code,+ true,+ );+ let balanceDiffFloat = parseFloat(current.attributes.balance_difference);+ let currentBalance = formatMoney(+ current.attributes.current_balance,+ current.attributes.currency_code,+ );+ let currentBalanceFloat = parseFloat(current.attributes.current_balance);+ let currentDebt = formatMoney(+ current.attributes.debt_amount,+ current.attributes.currency_code,+ );+ let currentDebtFloat = parseFloat(current.attributes.debt_amount);+ if (window.store.get("convert_to_primary")) {+ balanceDifference = formatMoney(+ current.attributes.pc_balance_difference,+ current.attributes.primary_currency_code,+ true,+ );+ balanceDiffFloat = parseFloat(current.attributes.pc_balance_difference);+ currentBalance = formatMoney(+ current.attributes.pc_current_balance,+ current.attributes.primary_currency_code,+ );+ currentBalanceFloat = parseFloat(current.attributes.pc_current_balance);+ currentDebt = formatMoney(+ current.attributes.pc_debt_amount,+ current.attributes.primary_currency_code,+ );+ currentDebtFloat = parseFloat(current.attributes.pc_debt_amount);+ }+ let lastActivity = this.formatDate(current.attributes.last_activity);+ let noLastActivity = false;+ if ("" === lastActivity) {+ lastActivity = i18next.t("firefly.never");+ noLastActivity = true;+ }+ //console.log(current);+ let account = {+ id: parseInt(current.id),+ name: current.attributes.name,+ location: null !== current.attributes.longitude && null !== current.attributes.latitude,+ has_attachments: current.attributes.has_attachments,+ role: current.attributes.account_role,+ iban: this.addSpaces(current.attributes.iban),+ account_number: current.attributes.account_number,+ current_balance: currentBalance,+ current_balance_float: currentBalanceFloat,+ active: current.attributes.active,+ last_activity: lastActivity,+ no_last_activity: noLastActivity,+ balance_difference: balanceDifference,+ balance_difference_float: balanceDiffFloat,+ liability_type: i18next.t("firefly.account_type_" + current.attributes.liability_type),+ liability_direction: i18next.t(+ "firefly.liability_direction_" + current.attributes.liability_direction + "_short",+ ),+ liability_interest: current.attributes.interest,+ liability_interest_period: i18next+ .t("firefly.interest_calc_" + current.attributes.interest_period)+ .toLowerCase(),+ current_debt: currentDebt,+ current_debt_float: currentDebtFloat,+ };+ this.accounts.push(account);}- //console.log(current);- let account = {- id: parseInt(current.id),- name: current.attributes.name,- location: null !== current.attributes.longitude && null !== current.attributes.latitude,- has_attachments: current.attributes.has_attachments,- role: current.attributes.account_role,- iban: this.addSpaces(current.attributes.iban),- account_number: current.attributes.account_number,- current_balance: currentBalance,- current_balance_float: currentBalanceFloat,- active: current.attributes.active,- last_activity: lastActivity,- no_last_activity: noLastActivity,- balance_difference: balanceDifference,- balance_difference_float: balanceDiffFloat,- liability_type: i18next.t('firefly.account_type_' + current.attributes.liability_type),- liability_direction: i18next.t('firefly.liability_direction_' + current.attributes.liability_direction + '_short'),- liability_interest: current.attributes.interest,- liability_interest_period: i18next.t('firefly.interest_calc_' + current.attributes.interest_period).toLowerCase(),- current_debt: currentDebt,- current_debt_float: currentDebtFloat,- };- this.accounts.push(account);}- }- });+ });},addSpaces(iban) {if (null === iban) {- return '';+ return "";}- return iban.match(/.{1,4}/g).join(' ');+ return iban.match(/.{1,4}/g).join(" ");},formatDate(date) {if (null === date) {- return '';+ 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") }));+ },};};diff --git a/resources/assets/v3/js/pages/exchange-rates/rates.js b/resources/assets/v3/js/pages/exchange-rates/rates.jsindex 1c3068011e..bffcc113d7 100644--- a/resources/assets/v3/js/pages/exchange-rates/rates.js+++ b/resources/assets/v3/js/pages/exchange-rates/rates.js@@ -22,7 +22,7 @@import "../../boot/bootstrap.js";import sidebar from "../../pages/shared/sidebar.js";import dates from "../shared/dates.js";-import {format} from "date-fns/format";+import { format } from "date-fns/format";import i18next from "i18next";import Post from "../../api/model/exchange-rate/post.js";import Put from "../../api/model/exchange-rate/put.js";@@ -241,7 +241,11 @@ let rates = function () {date: date,rate_id: rate_id,inverse_id: inverse_id,- date_formatted: format(date, window.i18next.t("config.date_time_fns", {lng: window.store.get('locale')}), window.store.get('locale')),+ date_formatted: format(+ date,+ window.i18next.t("config.date_time_fns", { lng: window.store.get("locale") }),+ window.store.get("locale"),+ ),date_field: current.attributes.date.substring(0, 10),rate: rate,inverse: "",diff --git a/resources/assets/v3/js/pages/transactions/shared/create-link-autocomplete.js b/resources/assets/v3/js/pages/transactions/shared/create-link-autocomplete.jsindex 64bece3f4d..f53fb802b2 100644--- a/resources/assets/v3/js/pages/transactions/shared/create-link-autocomplete.js+++ b/resources/assets/v3/js/pages/transactions/shared/create-link-autocomplete.js@@ -24,14 +24,14 @@ import { format } from "date-fns";export function createLinkAutocomplete(fieldIdentifier, url) {let token = document.querySelector('meta[name="csrf-token"]').getAttribute("content");- let locale = window.store.get('locale');+ let locale = window.store.get("locale");const renderJournal = function (item) {return (item.description +'<br><small class="text-muted">' +formatMoney(item.amount, item.currency_code) +" @ " +- format(new Date(item.date), window.i18next.t("config.date_time_fns", {lng: locale}), locale) ++ format(new Date(item.date), window.i18next.t("config.date_time_fns", { lng: locale }), locale) +"</small>");};diff --git a/resources/assets/v3/js/pages/transactions/shared/process-transaction-links.js b/resources/assets/v3/js/pages/transactions/shared/process-transaction-links.jsindex 4d5abf4bc3..9a2c3172e3 100644--- a/resources/assets/v3/js/pages/transactions/shared/process-transaction-links.js+++ b/resources/assets/v3/js/pages/transactions/shared/process-transaction-links.js@@ -4,7 +4,7 @@ import i18next from "i18next";export function processTransactionLinks(transactions) {this.notifications.wait.show = true;- this.notifications.wait.text = i18next.t('firefly.save_links_working');+ this.notifications.wait.text = i18next.t("firefly.save_links_working");let count = 0;for (let i = 0; i < transactions.length; i++) {if (Object.hasOwn(transactions, i) && Object.hasOwn(this.links, i)) {diff --git a/resources/assets/v3/js/pages/transactions/show.js b/resources/assets/v3/js/pages/transactions/show.jsindex 968bd3d226..912379be52 100644--- a/resources/assets/v3/js/pages/transactions/show.js+++ b/resources/assets/v3/js/pages/transactions/show.js@@ -46,8 +46,7 @@ let show = function () {this.downloadTransactionGroup();},downloadTransactionGroup() {-- let locale = window.store.get('locale');+ let locale = window.store.get("locale");new Get().show(this.group.id).then((response) => {const info = response.data.data;@@ -57,7 +56,11 @@ let show = function () {if (Object.hasOwn(info.attributes.transactions, i)) {let current = info.attributes.transactions[i];current.dateObject = new Date(current.date);- current.dateFormatted = format(current.dateObject, window.i18next.t("config.date_time_fns", {lng: locale}), locale);+ current.dateFormatted = format(+ current.dateObject,+ window.i18next.t("config.date_time_fns", { lng: locale }),+ locale,+ );console.log("Date formatted is", current.dateFormatted);this.group.transactions.push(current);}diff --git a/resources/assets/v3/js/pages/webhooks/show.js b/resources/assets/v3/js/pages/webhooks/show.jsindex 1ccfb2ab37..fe91037b6d 100644--- a/resources/assets/v3/js/pages/webhooks/show.js+++ b/resources/assets/v3/js/pages/webhooks/show.js@@ -21,7 +21,7 @@import "../../boot/bootstrap.js";import sidebar from "../../pages/shared/sidebar.js";import dates from "../shared/dates.js";-import {format} from "date-fns/format";+import { format } from "date-fns/format";import i18next from "i18next";import Post from "../../api/model/webhook/post.js";import Get from "../../api/model/webhook/get.js";@@ -110,7 +110,7 @@ let show = function () {});},downloadWebhookMessages: function () {- let locale = window.store.get('locale');+ let locale = window.store.get("locale");this.messages = [];new Get().messages(this.id, {}).then((response) => {for (let i in response.data.data) {@@ -120,8 +120,8 @@ let show = function () {id: current.id,created_at: format(new Date(current.attributes.created_at),- i18next.t("config.date_time_fns", {lng: locale}),- locale+ i18next.t("config.date_time_fns", { lng: locale }),+ locale,),uuid: current.attributes.uuid,success: current.attributes.sent && !current.attributes.errored,diff --git a/resources/assets/v3/js/shared/draw-chart.js b/resources/assets/v3/js/shared/draw-chart.jsindex 8e73a48c0f..e47296d11f 100644--- a/resources/assets/v3/js/shared/draw-chart.js+++ b/resources/assets/v3/js/shared/draw-chart.js@@ -353,7 +353,9 @@ function drawMultiCurrencyLineChart(url, holder, anonymous, drawTodayMarker, coldrawTodayIndex = labelCount;}// add the label to the array- data.labels.push(format(date, i18next.t("config.month_and_day_fns", {lng: locale}), locale));+ data.labels.push(+ format(date, i18next.t("config.month_and_day_fns", { lng: locale }), locale),+ );}}}@@ -432,10 +434,14 @@ function drawMultiCurrencyLineChart(url, holder, anonymous, drawTodayMarker, col// add a marker to the chart if defined.if (drawTodayMarker && "" !== drawTodayLabel) {- let locale = window.store.get('locale');- let language = window.store.get('language');- let markDate = format(new Date(drawTodayLabel), i18next.t("config.month_and_day_fns", {lng: locale}), locale);- let today = i18next.t("firefly.today", {lng: language});+ let locale = window.store.get("locale");+ let language = window.store.get("language");+ let markDate = format(+ new Date(drawTodayLabel),+ i18next.t("config.month_and_day_fns", { lng: locale }),+ locale,+ );+ let today = i18next.t("firefly.today", { lng: language });let xAdjust = 0;if (drawTodayIndex < 3) {xAdjust = today.length * 4;diff --git a/resources/assets/v3/sass/app.scss b/resources/assets/v3/sass/app.scssindex c84e5371cd..9e45472206 100644--- a/resources/assets/v3/sass/app.scss+++ b/resources/assets/v3/sass/app.scss@@ -52,12 +52,14 @@ $primary: #1e6581; // original@import "shepherd.js/dist/css/shepherd.css";// for sortable tables-table.sortable thead th.sortable {cursor:pointer;}+table.sortable thead th.sortable {+ cursor: pointer;+}table.sortable th.sortable.sortable_sorted.sortable_sorted_asc:after {- content: " \25B4"+ content: " \25B4";}table.sortable th.sortable.sortable_sorted.sortable_sorted_desc:after {- content: " \25BE"+ content: " \25BE";}// for light mode, different money colors are used.@@ -87,7 +89,9 @@ html[data-bs-theme="dark"] .money-transfer {}// move over the sub menu things.-.sub-nav-item {padding-left:1em;}+.sub-nav-item {+ padding-left: 1em;+}// some print rules@media print {diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.phpindex dc18ea9212..2df0970055 100644--- a/resources/lang/en_US/firefly.php+++ b/resources/lang/en_US/firefly.php@@ -240,8 +240,8 @@ return ['expected_total' => 'expected total','reconciliation_account_name' => ':name reconciliation (:currency)','saved' => 'Saved',- 'save_transaction_working' => 'Firefly III is storing your transaction. Please wait.',- 'save_links_working' => 'Firefly III is storing your transaction links. Please wait.',+ 'save_transaction_working' => 'Firefly III is storing your transaction. Please wait.',+ 'save_links_working' => 'Firefly III is storing your transaction links. Please wait.','save' => 'Save','advanced_options' => 'Advanced options','advanced_options_explain' => 'Some pages in Firefly III have advanced options hidden behind this button. This page doesn\'t have anything fancy here, but do check out the others!',