kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Auto commit for release 'v6.1.23' on 2024-11-23

Browse Source
This commit is contained in:
github-actions
2024-11-23 19:19:46 +01:00
parent f9b76fcb8b
commit cd10d04907
12 changed files with 221 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,6 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Helpers\Report\NetWorthInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use FireflyIII\Support\Http\Controllers\BasicDataSupport;
@@ -167,8 +166,9 @@ class ReportController extends Controller
TransactionTypeEnum::WITHDRAWAL,
TransactionTypeEnum::DEPOSIT,
TransactionTypeEnum::RECONCILIATION,
TransactionTypeEnum::TRANSFER
]);
TransactionTypeEnum::TRANSFER,
]
);
$journals = $collector->getExtractedJournals();
// loop. group by currency and by period.
@@ -195,12 +195,13 @@ class ReportController extends Controller
// deposit = incoming
// transfer or reconcile or opening balance, and these accounts are the destination.
if (
TransactionTypeEnum::DEPOSIT->value === $journal['transaction_type_type'] ||
((
TransactionTypeEnum::TRANSFER->value === $journal['transaction_type_type'] ||
TransactionTypeEnum::RECONCILIATION->value === $journal['transaction_type_type'] ||
TransactionTypeEnum::OPENING_BALANCE->value === $journal['transaction_type_type']) &&
in_array($journal['destination_account_id'], $ids, true))) {
TransactionTypeEnum::DEPOSIT->value === $journal['transaction_type_type']
|| ((
TransactionTypeEnum::TRANSFER->value === $journal['transaction_type_type']
|| TransactionTypeEnum::RECONCILIATION->value === $journal['transaction_type_type']
|| TransactionTypeEnum::OPENING_BALANCE->value === $journal['transaction_type_type']
)
&& in_array($journal['destination_account_id'], $ids, true))) {
$key = 'earned';
}
$data[$currencyId][$period][$key] = bcadd($data[$currencyId][$period][$key], $amount);
@@ -208,6 +209,7 @@ class ReportController extends Controller
// loop this data, make chart bars for each currency:
Log::debug('Looping data');
/** @var array $currency */
foreach ($data as $currency) {
Log::debug(sprintf('Now processing currency "%s"', $currency['currency_name']));