Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2025-09-26
JC5eb6f78406e71
diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.phpindex f599788536..377bacd735 100644--- a/app/Http/Controllers/DebugController.php+++ b/app/Http/Controllers/DebugController.php@@ -109,7 +109,7 @@ class DebugController extends ControllerArtisan::call('route:clear');Artisan::call('view:clear');- PeriodStatistic::where('id','>',0)->delete();+ PeriodStatistic::where('id', '>', 0)->delete();// also do some recalculations.Artisan::call('correction:recalculates-liabilities');diff --git a/app/Models/PeriodStatistic.php b/app/Models/PeriodStatistic.phpindex af29deb02a..9a167fafe0 100644--- a/app/Models/PeriodStatistic.php+++ b/app/Models/PeriodStatistic.php@@ -9,7 +9,6 @@ use FireflyIII\Support\Models\ReturnsIntegerUserIdTrait;use Illuminate\Database\Eloquent\Casts\Attribute;use Illuminate\Database\Eloquent\Model;use Illuminate\Database\Eloquent\Relations\MorphTo;-use Illuminate\Database\Eloquent\SoftDeletes;class PeriodStatistic extends Model{@@ -20,8 +19,8 @@ class PeriodStatistic extends Modelreturn ['created_at' => 'datetime','updated_at' => 'datetime',- 'start' => SeparateTimezoneCaster::class,- 'end' => SeparateTimezoneCaster::class,+ 'start' => SeparateTimezoneCaster::class,+ 'end' => SeparateTimezoneCaster::class,];}diff --git a/app/Support/Http/Controllers/PeriodOverview.php b/app/Support/Http/Controllers/PeriodOverview.phpindex 4081faba0c..b87dda9531 100644--- a/app/Support/Http/Controllers/PeriodOverview.php+++ b/app/Support/Http/Controllers/PeriodOverview.php@@ -89,12 +89,12 @@ trait PeriodOverview$this->accountRepository = app(AccountRepositoryInterface::class);$this->periodStatisticRepo = app(PeriodStatisticRepositoryInterface::class);$range = Navigation::getViewRange(true);- [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];+ [$start, $end] = $end < $start ? [$end, $start] : [$start, $end];/** @var array $dates */- $dates = Navigation::blockPeriods($start, $end, $range);- [$start, $end] = $this->getPeriodFromBlocks($dates, $start, $end);- $this->statistics = $this->periodStatisticRepo->allInRangeForModel($account, $start, $end);+ $dates = Navigation::blockPeriods($start, $end, $range);+ [$start, $end] = $this->getPeriodFromBlocks($dates, $start, $end);+ $this->statistics = $this->periodStatisticRepo->allInRangeForModel($account, $start, $end);// TODO needs to be re-arranged:// get all period stats for entire range.@@ -102,7 +102,7 @@ trait PeriodOverview// create new ones, or use collected.- $entries = [];+ $entries = [];Log::debug(sprintf('Count of loops: %d', count($dates)));foreach ($dates as $currentDate) {$entries[] = $this->getSingleAccountPeriod($account, $currentDate['period'], $currentDate['start'], $currentDate['end']);@@ -138,11 +138,11 @@ trait PeriodOverview*/protected function getCategoryPeriodOverview(Category $category, Carbon $start, Carbon $end): array{- $range = Navigation::getViewRange(true);+ $range = Navigation::getViewRange(true);[$start, $end] = $end < $start ? [$end, $start] : [$start, $end];// properties for entries with their amounts.- $cache = new CacheProperties();+ $cache = new CacheProperties();$cache->addProperty($start);$cache->addProperty($end);$cache->addProperty($range);@@ -154,32 +154,32 @@ trait PeriodOverview}/** @var array $dates */- $dates = Navigation::blockPeriods($start, $end, $range);- $entries = [];+ $dates = Navigation::blockPeriods($start, $end, $range);+ $entries = [];// collect all expenses in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setCategory($category);$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::DEPOSIT->value]);- $earnedSet = $collector->getExtractedJournals();+ $earnedSet = $collector->getExtractedJournals();// collect all income in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setCategory($category);$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);- $spentSet = $collector->getExtractedJournals();+ $spentSet = $collector->getExtractedJournals();// collect all transfers in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setCategory($category);$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::TRANSFER->value]);- $transferSet = $collector->getExtractedJournals();+ $transferSet = $collector->getExtractedJournals();foreach ($dates as $currentDate) {$spent = $this->filterJournalsByDate($spentSet, $currentDate['start'], $currentDate['end']);$earned = $this->filterJournalsByDate($earnedSet, $currentDate['start'], $currentDate['end']);@@ -187,17 +187,17 @@ trait PeriodOverview$title = Navigation::periodShow($currentDate['end'], $currentDate['period']);$entries[]= [- 'transactions' => 0,- 'title' => $title,- 'route' => route(- 'categories.show',- [$category->id, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]- ),- 'total_transactions' => count($spent) + count($earned) + count($transferred),- 'spent' => $this->groupByCurrency($spent),- 'earned' => $this->groupByCurrency($earned),- 'transferred' => $this->groupByCurrency($transferred),- ];+ 'transactions' => 0,+ 'title' => $title,+ 'route' => route(+ 'categories.show',+ [$category->id, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]+ ),+ 'total_transactions' => count($spent) + count($earned) + count($transferred),+ 'spent' => $this->groupByCurrency($spent),+ 'earned' => $this->groupByCurrency($earned),+ 'transferred' => $this->groupByCurrency($transferred),+ ];}$cache->store($entries);@@ -213,11 +213,11 @@ trait PeriodOverview*/protected function getNoBudgetPeriodOverview(Carbon $start, Carbon $end): array{- $range = Navigation::getViewRange(true);+ $range = Navigation::getViewRange(true);[$start, $end] = $end < $start ? [$end, $start] : [$start, $end];- $cache = new CacheProperties();+ $cache = new CacheProperties();$cache->addProperty($start);$cache->addProperty($end);$cache->addProperty($this->convertToPrimary);@@ -228,28 +228,28 @@ trait PeriodOverview}/** @var array $dates */- $dates = Navigation::blockPeriods($start, $end, $range);- $entries = [];+ $dates = Navigation::blockPeriods($start, $end, $range);+ $entries = [];// get all expenses without a budget./** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setRange($start, $end)->withoutBudget()->withAccountInformation()->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);- $journals = $collector->getExtractedJournals();+ $journals = $collector->getExtractedJournals();foreach ($dates as $currentDate) {$set = $this->filterJournalsByDate($journals, $currentDate['start'], $currentDate['end']);$title = Navigation::periodShow($currentDate['end'], $currentDate['period']);$entries[]= [- 'title' => $title,- 'route' => route('budgets.no-budget', [$currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),- 'total_transactions' => count($set),- 'spent' => $this->groupByCurrency($set),- 'earned' => [],- 'transferred_away' => [],- 'transferred_in' => [],- ];+ 'title' => $title,+ 'route' => route('budgets.no-budget', [$currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),+ 'total_transactions' => count($set),+ 'spent' => $this->groupByCurrency($set),+ 'earned' => [],+ 'transferred_away' => [],+ 'transferred_in' => [],+ ];}$cache->store($entries);@@ -266,38 +266,38 @@ trait PeriodOverviewprotected function getNoCategoryPeriodOverview(Carbon $theDate): array{Log::debug(sprintf('Now in getNoCategoryPeriodOverview(%s)', $theDate->format('Y-m-d')));- $range = Navigation::getViewRange(true);- $first = $this->journalRepos->firstNull();- $start = null === $first ? new Carbon() : $first->date;- $end = clone $theDate;- $end = Navigation::endOfPeriod($end, $range);+ $range = Navigation::getViewRange(true);+ $first = $this->journalRepos->firstNull();+ $start = null === $first ? new Carbon() : $first->date;+ $end = clone $theDate;+ $end = Navigation::endOfPeriod($end, $range);Log::debug(sprintf('Start for getNoCategoryPeriodOverview() is %s', $start->format('Y-m-d')));Log::debug(sprintf('End for getNoCategoryPeriodOverview() is %s', $end->format('Y-m-d')));// properties for cache- $dates = Navigation::blockPeriods($start, $end, $range);- $entries = [];+ $dates = Navigation::blockPeriods($start, $end, $range);+ $entries = [];// collect all expenses in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->withoutCategory();$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::DEPOSIT->value]);- $earnedSet = $collector->getExtractedJournals();+ $earnedSet = $collector->getExtractedJournals();// collect all income in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->withoutCategory();$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);- $spentSet = $collector->getExtractedJournals();+ $spentSet = $collector->getExtractedJournals();// collect all transfers in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->withoutCategory();$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::TRANSFER->value]);@@ -311,13 +311,13 @@ trait PeriodOverview$title = Navigation::periodShow($currentDate['end'], $currentDate['period']);$entries[]= [- 'title' => $title,- 'route' => route('categories.no-category', [$currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),- 'total_transactions' => count($spent) + count($earned) + count($transferred),- 'spent' => $this->groupByCurrency($spent),- 'earned' => $this->groupByCurrency($earned),- 'transferred' => $this->groupByCurrency($transferred),- ];+ 'title' => $title,+ 'route' => route('categories.no-category', [$currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),+ 'total_transactions' => count($spent) + count($earned) + count($transferred),+ 'spent' => $this->groupByCurrency($spent),+ 'earned' => $this->groupByCurrency($earned),+ 'transferred' => $this->groupByCurrency($transferred),+ ];}Log::debug('End of loops');@@ -335,7 +335,7 @@ trait PeriodOverview];$this->transactions = [];foreach ($types as $type) {- $set = $this->getSingleAccountPeriodByType($account, $start, $end, $type);+ $set = $this->getSingleAccountPeriodByType($account, $start, $end, $type);$return['total_transactions'] += $set['count'];unset($set['count']);$return[$type] = $set;@@ -409,15 +409,15 @@ trait PeriodOverviewreturn $grouped;}- $grouped = [+ $grouped = ['count' => 0,];/** @var PeriodStatistic $statistic */foreach ($statistics as $statistic) {- $id = (int)$statistic->transaction_currency_id;- $currency = Amount::getTransactionCurrencyById($id);- $grouped[$id] = [+ $id = (int)$statistic->transaction_currency_id;+ $currency = Amount::getTransactionCurrencyById($id);+ $grouped[$id] = ['amount' => (string)$statistic->amount,'count' => (int)$statistic->count,'currency_id' => $currency->id,@@ -439,11 +439,11 @@ trait PeriodOverview*/protected function getTagPeriodOverview(Tag $tag, Carbon $start, Carbon $end): array // period overview for tags.{- $range = Navigation::getViewRange(true);+ $range = Navigation::getViewRange(true);[$start, $end] = $end < $start ? [$end, $start] : [$start, $end];// properties for cache- $cache = new CacheProperties();+ $cache = new CacheProperties();$cache->addProperty($start);$cache->addProperty($end);$cache->addProperty('tag-period-entries');@@ -453,37 +453,37 @@ trait PeriodOverview}/** @var array $dates */- $dates = Navigation::blockPeriods($start, $end, $range);- $entries = [];+ $dates = Navigation::blockPeriods($start, $end, $range);+ $entries = [];// collect all expenses in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setTag($tag);$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::DEPOSIT->value]);- $earnedSet = $collector->getExtractedJournals();+ $earnedSet = $collector->getExtractedJournals();// collect all income in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setTag($tag);$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);- $spentSet = $collector->getExtractedJournals();+ $spentSet = $collector->getExtractedJournals();// collect all transfers in this period:/** @var GroupCollectorInterface $collector */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setTag($tag);$collector->setRange($start, $end);$collector->setTypes([TransactionTypeEnum::TRANSFER->value]);- $transferSet = $collector->getExtractedJournals();+ $transferSet = $collector->getExtractedJournals();// filer all of them:- $earnedSet = $this->filterJournalsByTag($earnedSet, $tag);- $spentSet = $this->filterJournalsByTag($spentSet, $tag);- $transferSet = $this->filterJournalsByTag($transferSet, $tag);+ $earnedSet = $this->filterJournalsByTag($earnedSet, $tag);+ $spentSet = $this->filterJournalsByTag($spentSet, $tag);+ $transferSet = $this->filterJournalsByTag($transferSet, $tag);foreach ($dates as $currentDate) {$spent = $this->filterJournalsByDate($spentSet, $currentDate['start'], $currentDate['end']);@@ -492,17 +492,17 @@ trait PeriodOverview$title = Navigation::periodShow($currentDate['end'], $currentDate['period']);$entries[]= [- 'transactions' => 0,- 'title' => $title,- 'route' => route(- 'tags.show',- [$tag->id, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]- ),- 'total_transactions' => count($spent) + count($earned) + count($transferred),- 'spent' => $this->groupByCurrency($spent),- 'earned' => $this->groupByCurrency($earned),- 'transferred' => $this->groupByCurrency($transferred),- ];+ 'transactions' => 0,+ 'title' => $title,+ 'route' => route(+ 'tags.show',+ [$tag->id, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]+ ),+ 'total_transactions' => count($spent) + count($earned) + count($transferred),+ 'spent' => $this->groupByCurrency($spent),+ 'earned' => $this->groupByCurrency($earned),+ 'transferred' => $this->groupByCurrency($transferred),+ ];}return $entries;@@ -513,12 +513,12 @@ trait PeriodOverview*/protected function getTransactionPeriodOverview(string $transactionType, Carbon $start, Carbon $end): array{- $range = Navigation::getViewRange(true);- $types = config(sprintf('firefly.transactionTypesByType.%s', $transactionType));+ $range = Navigation::getViewRange(true);+ $types = config(sprintf('firefly.transactionTypesByType.%s', $transactionType));[$start, $end] = $end < $start ? [$end, $start] : [$start, $end];// properties for cache- $cache = new CacheProperties();+ $cache = new CacheProperties();$cache->addProperty($start);$cache->addProperty($end);$cache->addProperty('transactions-period-entries');@@ -528,16 +528,16 @@ trait PeriodOverview}/** @var array $dates */- $dates = Navigation::blockPeriods($start, $end, $range);- $entries = [];- $spent = [];- $earned = [];- $transferred = [];+ $dates = Navigation::blockPeriods($start, $end, $range);+ $entries = [];+ $spent = [];+ $earned = [];+ $transferred = [];// collect all journals in this period (regardless of type)- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setTypes($types)->setRange($start, $end);- $genericSet = $collector->getExtractedJournals();- $loops = 0;+ $genericSet = $collector->getExtractedJournals();+ $loops = 0;foreach ($dates as $currentDate) {$title = Navigation::periodShow($currentDate['end'], $currentDate['period']);@@ -555,14 +555,14 @@ trait PeriodOverview}}$entries[]- = [- 'title' => $title,- 'route' => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),- 'total_transactions' => count($spent) + count($earned) + count($transferred),- 'spent' => $this->groupByCurrency($spent),- 'earned' => $this->groupByCurrency($earned),- 'transferred' => $this->groupByCurrency($transferred),- ];+ = [+ 'title' => $title,+ 'route' => route('transactions.index', [$transactionType, $currentDate['start']->format('Y-m-d'), $currentDate['end']->format('Y-m-d')]),+ 'total_transactions' => count($spent) + count($earned) + count($transferred),+ 'spent' => $this->groupByCurrency($spent),+ 'earned' => $this->groupByCurrency($earned),+ 'transferred' => $this->groupByCurrency($transferred),+ ];++$loops;}@@ -603,7 +603,7 @@ trait PeriodOverview{$return = [];foreach ($set as $entry) {- $found = false;+ $found = false;/** @var array $localTag */foreach ($entry['tags'] as $localTag) {@@ -715,13 +715,13 @@ trait PeriodOverviewexit;}- $currencyId = (int)$journal['currency_id'];- $currencyCode = $journal['currency_code'];- $currencyName = $journal['currency_name'];- $currencySymbol = $journal['currency_symbol'];- $currencyDecimalPlaces = $journal['currency_decimal_places'];- $foreignCurrencyId = $journal['foreign_currency_id'];- $amount = $journal['amount'] ?? '0';+ $currencyId = (int)$journal['currency_id'];+ $currencyCode = $journal['currency_code'];+ $currencyName = $journal['currency_name'];+ $currencySymbol = $journal['currency_symbol'];+ $currencyDecimalPlaces = $journal['currency_decimal_places'];+ $foreignCurrencyId = $journal['foreign_currency_id'];+ $amount = $journal['amount'] ?? '0';if ($this->convertToPrimary && $currencyId !== $this->primaryCurrency->id && $foreignCurrencyId !== $this->primaryCurrency->id) {$amount = $journal['pc_amount'] ?? '0';diff --git a/app/Support/Report/Budget/BudgetReportGenerator.php b/app/Support/Report/Budget/BudgetReportGenerator.phpindex 2fd81217bb..4de1c9d9a6 100644--- a/app/Support/Report/Budget/BudgetReportGenerator.php+++ b/app/Support/Report/Budget/BudgetReportGenerator.php@@ -334,16 +334,16 @@ class BudgetReportGenerator// make sum information:$this->report['sums'][$currencyId]??= [- 'budgeted' => '0',- 'spent' => '0',- 'left' => '0',- 'overspent' => '0',- 'currency_id' => $currencyId,- 'currency_code' => $limitCurrency->code,- 'currency_name' => $limitCurrency->name,- 'currency_symbol' => $limitCurrency->symbol,- 'currency_decimal_places' => $limitCurrency->decimal_places,- ];+ 'budgeted' => '0',+ 'spent' => '0',+ 'left' => '0',+ 'overspent' => '0',+ 'currency_id' => $currencyId,+ 'currency_code' => $limitCurrency->code,+ 'currency_name' => $limitCurrency->name,+ 'currency_symbol' => $limitCurrency->symbol,+ 'currency_decimal_places' => $limitCurrency->decimal_places,+ ];$this->report['sums'][$currencyId]['budgeted'] = bcadd((string)$this->report['sums'][$currencyId]['budgeted'], $limit->amount);$this->report['sums'][$currencyId]['spent'] = bcadd((string)$this->report['sums'][$currencyId]['spent'], $spent);$this->report['sums'][$currencyId]['left'] = bcadd((string)$this->report['sums'][$currencyId]['left'], bcadd($limit->amount, $spent));diff --git a/config/firefly.php b/config/firefly.phpindex cf0424ddc6..c990ec4a8e 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -79,7 +79,7 @@ return [// see cer.php for exchange rates feature flag.],'version' => 'develop/2025-09-26',- 'build_time' => 1758908498,+ 'build_time' => 1758914637,'api_version' => '2.1.0', // field is no longer used.'db_version' => 27,