Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-09-26
JC56b5bfe963ee0
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/Api/V1/Controllers/Models/Account/ShowController.php b/app/Api/V1/Controllers/Models/Account/ShowController.phpindex 3e878a0145..bcbf124e39 100644--- a/app/Api/V1/Controllers/Models/Account/ShowController.php+++ b/app/Api/V1/Controllers/Models/Account/ShowController.php@@ -63,31 +63,12 @@ final class ShowController extends Controller});}- private function isAllDatabaseSort(array $instructions, string $model): bool- {- if (0 === count($instructions)) {- return true;- }- $config = config(sprintf('firefly.allowed_db_sort_parameters.%s', $model));- if (null === $config) {- return true;- }- foreach ($instructions as $item) {- $field = $item[0];- if (!in_array($field, $config)) {- return false;- }- }- return true;-- }-/*** Display a listing of the resource.*/public function index(ShowRequest $request): JsonResponse{- $manager = $this->getManager();+ $manager = $this->getManager();['types' => $types,'page' => $page,@@ -98,28 +79,27 @@ final class ShowController extends Controller'end' => $end,'active' => $active,'date' => $date,- ]- = $request->attributes->all();+ ] = $request->attributes->all();// get list of accounts. Count it and split it.$this->repository->resetAccountOrder();- $collection = $this->repository->getAccountsByType($types, $sort, $active);- $count = $collection->count();- $dbFields = $this->isAllDatabaseSort($sort, 'Account');- $accounts = $collection;+ $collection = $this->repository->getAccountsByType($types, $sort, $active);+ $count = $collection->count();+ $dbFields = $this->isAllDatabaseSort($sort, 'Account');+ $accounts = $collection;if ($dbFields) {$accounts = $collection->slice($offset, $limit);}// enrich/** @var User $admin */- $admin = auth()->user();- $enrichment = new AccountEnrichment();+ $admin = auth()->user();+ $enrichment = new AccountEnrichment();$enrichment->setSort($sort);$enrichment->setDate($date);$enrichment->setStart($start);$enrichment->setEnd($end);$enrichment->setUser($admin);- $accounts = $enrichment->enrich($accounts);+ $accounts = $enrichment->enrich($accounts);if (!$dbFields) {// now do the slicing.@@ -127,13 +107,13 @@ final class ShowController extends Controller}// make paginator:- $paginator = new LengthAwarePaginator($accounts, $count, $limit, $page);- $paginator->setPath(route('api.v1.accounts.index') . $this->buildParams());+ $paginator = new LengthAwarePaginator($accounts, $count, $limit, $page);+ $paginator->setPath(route('api.v1.accounts.index').$this->buildParams());/** @var AccountTransformer $transformer */$transformer = app(AccountTransformer::class);- $resource = new FractalCollection($accounts, $transformer, self::RESOURCE_KEY);+ $resource = new FractalCollection($accounts, $transformer, self::RESOURCE_KEY);$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);@@ -150,23 +130,42 @@ final class ShowController extends Controller// get list of accounts. Count it and split it.$this->repository->resetAccountOrder();$account->refresh();- $manager = $this->getManager();+ $manager = $this->getManager();['start' => $start, 'end' => $end, 'date' => $date] = $request->attributes->all();// enrich/** @var User $admin */- $admin = auth()->user();- $enrichment = new AccountEnrichment();+ $admin = auth()->user();+ $enrichment = new AccountEnrichment();$enrichment->setDate($date);$enrichment->setStart($start);$enrichment->setEnd($end);$enrichment->setUser($admin);- $account = $enrichment->enrichSingle($account);+ $account = $enrichment->enrichSingle($account);/** @var AccountTransformer $transformer */- $transformer = app(AccountTransformer::class);- $resource = new Item($account, $transformer, self::RESOURCE_KEY);+ $transformer = app(AccountTransformer::class);+ $resource = new Item($account, $transformer, self::RESOURCE_KEY);return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);}++ private function isAllDatabaseSort(array $instructions, string $model): bool+ {+ if (0 === count($instructions)) {+ return true;+ }+ $config = config(sprintf('firefly.allowed_db_sort_parameters.%s', $model));+ if (null === $config) {+ return true;+ }+ foreach ($instructions as $item) {+ $field = $item[0];+ if (!in_array($field, $config, true)) {+ return false;+ }+ }++ return true;+ }}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/AccountEnrichment.php b/app/Support/JsonApi/Enrichments/AccountEnrichment.phpindex 01f5ccbddb..28f821a9e5 100644--- a/app/Support/JsonApi/Enrichments/AccountEnrichment.php+++ b/app/Support/JsonApi/Enrichments/AccountEnrichment.php@@ -472,22 +472,55 @@ class AccountEnrichment implements EnrichmentInterfaceswitch ($field) {default:throw new FireflyException(sprintf('Account enrichment cannot sort on field "%s"', $field));+case 'account_number':case 'liability_direction':- $this->collection = $this->collection->sortBy(static fn (Account $account) => $account->meta[$field] ?? '', SORT_REGULAR, 'desc' === $parameter[1]);+ $this->collection = $this->collection->sortBy(+ static fn (Account $account) => $account->meta[$field] ?? '',+ SORT_REGULAR,+ 'desc' === $parameter[1]+ );+break;+case 'liability_interest':- $this->collection = $this->collection->sortBy(static fn (Account $account) => (float) ($account->meta['interest'] ?? 0.0), SORT_NUMERIC, 'desc' === $parameter[1]);+ $this->collection = $this->collection->sortBy(+ static fn (Account $account) => (float) ($account->meta['interest'] ?? 0.0),+ SORT_NUMERIC,+ 'desc' === $parameter[1]+ );+break;+case 'role':- $this->collection = $this->collection->sortBy(static fn (Account $account) => $account->meta['account_role'] ?? '', SORT_REGULAR, 'desc' === $parameter[1]);+ $this->collection = $this->collection->sortBy(+ static fn (Account $account) => $account->meta['account_role'] ?? '',+ SORT_REGULAR,+ 'desc' === $parameter[1]+ );+break;+case 'account_number_and_iban':- $this->collection = $this->collection->sortBy(static fn (Account $account) => sprintf('%s-%s', $account->iban, $account->meta['account_number']), SORT_REGULAR, 'desc' === $parameter[1]);+ $this->collection = $this->collection->sortBy(+ static fn (Account $account) => sprintf('%s-%s', $account->iban, $account->meta['account_number']),+ SORT_REGULAR,+ 'desc' === $parameter[1]+ );+break;+case 'last_activity':- $this->collection = $this->collection->sortBy(static fn (Account $account) => null === $account->meta['last_activity'] ? '0000-00-00 00:00:00' : $account->meta['last_activity']->format('Y-m-d H:i:s'), SORT_REGULAR, 'desc' === $parameter[1]);+ $this->collection = $this->collection->sortBy(+ static fn (Account $account) => null === $account->meta['last_activity']+ ? '0000-00-00 00:00:00'+ : $account->meta['last_activity']->format('Y-m-d H:i:s'),+ SORT_REGULAR,+ 'desc' === $parameter[1]+ );+break;+case 'current_balance':case 'pc_current_balance':case 'debt_amount':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/config/firefly.php b/config/firefly.phpindex c4d85abb7c..7525f11c30 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -79,7 +79,7 @@ return [// see cer.php for exchange rates feature flag.],'version' => 'develop/2026-09-26',-'build_time' => 1790392684,+'build_time' => 1790399251,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.diff --git a/resources/assets/v3/js/pages/accounts/index.js b/resources/assets/v3/js/pages/accounts/index.jsindex 51ceab895d..9f4b673c70 100644--- a/resources/assets/v3/js/pages/accounts/index.js+++ b/resources/assets/v3/js/pages/accounts/index.js@@ -87,7 +87,7 @@ let index = function () {// grab the account list.this.downloadAccounts();// get accounts by initial sort.- document.addEventListener('alpine:initialized', () => {+ document.addEventListener("alpine:initialized", () => {document.querySelectorAll("table.sortable th.sortable").forEach((el) => {el.addEventListener("click", (event) => {let newColumn = event.currentTarget.dataset.column;@@ -97,7 +97,7 @@ let index = function () {if (newColumn !== this.sortColumn) {this.sortColumn = newColumn;}- console.log('New sort instructions', this.sortColumn, this.sortDirection)+ console.log("New sort instructions", this.sortColumn, this.sortDirection);this.updateHistory();this.downloadAccounts();});