kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 09:22:33 +00:00
Code Issues Projects Releases Wiki Activity

Auto commit for release 'develop' on 2024-09-28

Browse Source
This commit is contained in:
github-actions
2024-09-28 18:35:20 +02:00
parent 5fc55381a2
commit 08a26b976e
4 changed files with 81 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Support/Models/AccountBalanceCalculator.php
View File

@@ -82,6 +82,7 @@ class AccountBalanceCalculator
{ {
if (null === $notBefore) { if (null === $notBefore) {
Log::debug('getLatestBalance: no notBefore date, returning 0'); Log::debug('getLatestBalance: no notBefore date, returning 0');
return '0'; return '0';
} }
Log::debug(sprintf('getLatestBalance: notBefore date is "%s", calculating', $notBefore->format('Y-m-d'))); Log::debug(sprintf('getLatestBalance: notBefore date is "%s", calculating', $notBefore->format('Y-m-d')));
@@ -95,13 +96,15 @@ class AccountBalanceCalculator
->orderBy('transaction_journals.id', 'DESC') ->orderBy('transaction_journals.id', 'DESC')
->orderBy('transaction_journals.description', 'DESC') ->orderBy('transaction_journals.description', 'DESC')
->orderBy('transactions.amount', 'DESC') ->orderBy('transactions.amount', 'DESC')
->where('transactions.account_id', $accountId); ->where('transactions.account_id', $accountId)
;
$notBefore->startOfDay(); $notBefore->startOfDay();
$query->where('transaction_journals.date', '<', $notBefore); $query->where('transaction_journals.date', '<', $notBefore);
$first = $query->first(['transactions.id', 'transactions.balance_dirty', 'transactions.transaction_currency_id', 'transaction_journals.date', 'transactions.account_id', 'transactions.amount', 'transactions.balance_after']); $first = $query->first(['transactions.id', 'transactions.balance_dirty', 'transactions.transaction_currency_id', 'transaction_journals.date', 'transactions.account_id', 'transactions.amount', 'transactions.balance_after']);
$balance = $first->balance_after ?? '0'; $balance = $first->balance_after ?? '0';
Log::debug(sprintf('getLatestBalance: found balance: %s in transaction #%d', $balance, $first->id ?? 0)); Log::debug(sprintf('getLatestBalance: found balance: %s in transaction #%d', $balance, $first->id ?? 0));
return $balance; return $balance;
} }
@@ -131,6 +134,7 @@ class AccountBalanceCalculator
Log::debug('start of optimizedCalculation'); Log::debug('start of optimizedCalculation');
if (false === config('firefly.feature_flags.running_balance_column')) { if (false === config('firefly.feature_flags.running_balance_column')) {
Log::debug('optimizedCalculation is disabled, return.'); Log::debug('optimizedCalculation is disabled, return.');
return; return;
} }
@@ -148,7 +152,8 @@ class AccountBalanceCalculator
->orderBy('transaction_journals.order', 'desc') ->orderBy('transaction_journals.order', 'desc')
->orderBy('transaction_journals.id', 'asc') ->orderBy('transaction_journals.id', 'asc')
->orderBy('transaction_journals.description', 'asc') ->orderBy('transaction_journals.description', 'asc')
->orderBy('transactions.amount', 'asc'); ->orderBy('transactions.amount', 'asc')
;
if ($accounts->count() > 0) { if ($accounts->count() > 0) {
$query->whereIn('transactions.account_id', $accounts->pluck('id')->toArray()); $query->whereIn('transactions.account_id', $accounts->pluck('id')->toArray());
} }

4
changelog.md
View File

@@ -7,8 +7,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed ### Fixed
- #9275 - [Issue 9275](https://github.com/firefly-iii/firefly-iii/issues/9275) (Long wait when editing a transaction) reported by @JC5
- #9278 - [Issue 9278](https://github.com/firefly-iii/firefly-iii/issues/9278) (Update to v6.1.20 changed Balance of Account) reported by @JeuJeus
## 6.1.20 - 2024-09-29 ## 6.1.20 - 2024-09-29