Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix #11191
James Cole3f386b9003b8
diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.phpindex 564dc3401e..174328d275 100644--- a/app/Http/Controllers/Account/IndexController.php+++ b/app/Http/Controllers/Account/IndexController.php@@ -167,12 +167,17 @@ class IndexController extends Controller/** @var Carbon $end */$end = clone session('end', today(config('app.timezone'))->endOfMonth());+ $now = now();+ if ($now->gt($end) || $now->lt($start)) {+ $now = $end;+ }+$ids = $accounts->pluck('id')->toArray();Log::debug(sprintf('index: accountsBalancesInRange("%s", "%s")', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));[$startBalances,$endBalances,- ] = Steam::accountsBalancesInRange($accounts, $start, $end, $this->primaryCurrency, $this->convertToPrimary);+ ] = Steam::accountsBalancesInRange($accounts, $start, $now, $this->primaryCurrency, $this->convertToPrimary);$activities = Steam::getLastActivities($ids);diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.phpindex 1d5edb91fc..d9f2d77f77 100644--- a/app/Http/Controllers/Account/ShowController.php+++ b/app/Http/Controllers/Account/ShowController.php@@ -164,7 +164,7 @@ class ShowController extends Controller$timer->stop('collection');$groups->setPath(route('accounts.show', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]));$showAll = false;- $now = today()->endOfDay();+ $now = now();if ($now->gt($end) || $now->lt($start)) {$now = $end;}@@ -173,10 +173,7 @@ class ShowController extends Controller$balances = Steam::accountsBalancesOptimized(new Collection()->push($account), $now)[$account->id];// $balances = Steam::filterAccountBalance(Steam::finalAccountBalance($account, $now), $account, $this->convertToPrimary, $accountCurrency);- return view(- 'accounts.show',- ['account' => $account, 'showAll' => $showAll, 'objectType' => $objectType, 'currency' => $currency, 'today' => $today, 'periods' => $periods, 'subTitleIcon' => $subTitleIcon, 'groups' => $groups, 'attachments' => $attachments, 'subTitle' => $subTitle, 'start' => $start, 'end' => $end, 'chartUrl' => $chartUrl, 'location' => $location, 'balances' => $balances]- );+ return view('accounts.show', ['account' => $account, 'showAll' => $showAll, 'objectType' => $objectType, 'currency' => $currency, 'today' => $today, 'periods' => $periods, 'subTitleIcon' => $subTitleIcon, 'groups' => $groups, 'attachments' => $attachments, 'subTitle' => $subTitle, 'start' => $start, 'end' => $end, 'chartUrl' => $chartUrl, 'location' => $location, 'balances' => $balances]);}/**@@ -224,14 +221,16 @@ class ShowController extends Controller// correctLog::debug(sprintf('showAll: Call accountsBalancesOptimized with date/time "%s"', $end->toIso8601String()));+ $now = now();+ if ($now->gt($end) || $now->lt($start)) {+ $now = $end;+ }+// 2025-10-08 replace finalAccountBalance with accountsBalancesOptimized.// $balances = Steam::finalAccountBalance($account, $end);// $balances = Steam::filterAccountBalance($balances, $account, $this->convertToPrimary, $accountCurrency);- $balances = Steam::accountsBalancesOptimized(new Collection()->push($account), $end)[$account->id];+ $balances = Steam::accountsBalancesOptimized(new Collection()->push($account), $now)[$account->id];- return view(- 'accounts.show',- ['account' => $account, 'showAll' => $showAll, 'location' => $location, 'objectType' => $objectType, 'isLiability' => $isLiability, 'attachments' => $attachments, 'currency' => $currency, 'today' => $today, 'chartUrl' => $chartUrl, 'periods' => $periods, 'subTitleIcon' => $subTitleIcon, 'groups' => $groups, 'subTitle' => $subTitle, 'start' => $start, 'end' => $end, 'balances' => $balances]- );+ return view('accounts.show', ['account' => $account, 'showAll' => $showAll, 'location' => $location, 'objectType' => $objectType, 'isLiability' => $isLiability, 'attachments' => $attachments, 'currency' => $currency, 'today' => $today, 'chartUrl' => $chartUrl, 'periods' => $periods, 'subTitleIcon' => $subTitleIcon, 'groups' => $groups, 'subTitle' => $subTitle, 'start' => $start, 'end' => $end, 'balances' => $balances]);}}