kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity

qMerge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop

Browse Source
This commit is contained in:
Sander Dorigo
2025-02-11 16:10:48 +01:00
parent 5806323970 ee260a3df7
commit 04ab7ba07d
15 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Generator/Report/Audit/MonthReportGenerator.php
View File

@@ -174,6 +174,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
$locale = app('steam')->getLocale();
// call is correct.
Log::debug(sprintf('getAuditReport end: Call finalAccountBalance with date/time "%s"', $this->end->toIso8601String()));
return [
'journals' => $journals,
'currency' => $currency,

2
app/Helpers/Collector/Extensions/AccountCollection.php
View File

@@ -260,7 +260,7 @@ trait AccountCollection
}
// the balance must be found BEFORE the transaction date.
// so sub one second. This is not perfect, but works well enough.
$date = clone $transaction['date'];
$date = clone $transaction['date'];
$date->subSecond();
Log::debug(sprintf('accountBalanceIs: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
$balance = Steam::finalAccountBalance($account, $date);

2
app/Http/Controllers/Chart/ReportController.php
View File

@@ -103,7 +103,7 @@ class ReportController extends Controller
$balanceCurrent = clone $current;
$balanceCurrent->subDay()->endOfDay(); // go to correct moment.
Log::debug(sprintf('Call byAccounts("%s")', $balanceCurrent->format('Y-m-d H:i:s')));
$result = $helper->byAccounts($filtered, $balanceCurrent);
$result = $helper->byAccounts($filtered, $balanceCurrent);
// loop result, add to array.
/** @var array $netWorthItem */

7
app/Http/Controllers/Preferences/NotificationsController.php
View File

@@ -1,4 +1,5 @@
<?php
/*
* NotificationsController.php
* Copyright (c) 2025 james@firefly-iii.org.
@@ -25,8 +26,4 @@ namespace FireflyIII\Http\Controllers\Preferences;
use FireflyIII\Http\Controllers\Controller;
class NotificationsController extends Controller
{
}
class NotificationsController extends Controller {}

4
app/Http/Controllers/Transaction/ConvertController.php
View File

@@ -224,7 +224,7 @@ class ConvertController extends Controller
// group accounts:
/** @var Account $account */
foreach ($accountList as $account) {
$date = today()->endOfDay();
$date = today()->endOfDay();
Log::debug(sprintf('getLiabilities: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
$balance = Steam::finalAccountBalance($account, $date)['balance'];
$currency = $this->accountRepository->getAccountCurrency($account) ?? $this->defaultCurrency;
@@ -248,7 +248,7 @@ class ConvertController extends Controller
// group accounts:
/** @var Account $account */
foreach ($accountList as $account) {
$date = today()->endOfDay();
$date = today()->endOfDay();
Log::debug(sprintf('getAssetAccounts: Call finalAccountBalance with date/time "%s"', $date->toIso8601String()));
$balance = Steam::finalAccountBalance($account, $date)['balance'];
$currency = $this->accountRepository->getAccountCurrency($account) ?? $this->defaultCurrency;

10
app/Services/Internal/Support/AccountServiceTrait.php
View File

@@ -659,10 +659,10 @@ trait AccountServiceTrait
// submit to factory:
$submission = [
'group_title' => null,
'user' => $account->user,
'user_group' => $account->user->userGroup,
'transactions' => [
'group_title' => null,
'user' => $account->user,
'user_group' => $account->user->userGroup,
'transactions' => [
[
'type' => 'Opening balance',
'date' => $openingBalanceDate,
@@ -671,7 +671,7 @@ trait AccountServiceTrait
'destination_id' => $destId,
'destination_name' => $destName,
'user' => $account->user,
'user_group' => $account->user->userGroup,
'user_group' => $account->user->userGroup,
'currency_id' => $currency->id,
'order' => 0,
'amount' => $amount,

2
app/Support/Chart/Budget/FrontpageChartGenerator.php
View File

@@ -203,7 +203,7 @@ class FrontpageChartGenerator
$amount = $limit->native_amount;
Log::debug(sprintf('Amount is now "%s".', $amount));
}
$amount = null === $amount ? '0' : $amount;
$amount = null === $amount ? '0' : $amount;
$sumSpent = bcmul($entry['sum'], '-1'); // spent
$data[0]['entries'][$title] ??= '0';
$data[1]['entries'][$title] ??= '0';

2
app/Support/Steam.php
View File

@@ -282,7 +282,7 @@ class Steam
$cache->addProperty($date);
if ($cache->has()) {
// Log::debug(sprintf('CACHED finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));
return $cache->get();
return $cache->get();
}
Log::debug(sprintf('finalAccountBalance(#%d, %s)', $account->id, $date->format('Y-m-d H:i:s')));