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

Fix #7845 among other things

Browse Source
This commit is contained in:
James Cole
2023-08-12 17:43:24 +02:00
parent 4c90f66578
commit 1b9d8dd3c3
38 changed files with 120 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Api/V2/Controllers/Chart/AccountController.php
View File

@@ -100,7 +100,6 @@ class AccountController extends Controller
$frontPage->data = $defaultSet;
$frontPage->save();
}
/** @var Account $account */
foreach ($accounts as $account) {
$currency = $this->repository->getAccountCurrency($account);

2
app/Api/V2/Controllers/Chart/CategoryController.php
View File

@@ -85,7 +85,7 @@ class CategoryController extends Controller
$collector = app(GroupCollectorInterface::class);
$collector->setRange($start, $end)->withAccountInformation();
$collector->setXorAccounts($accounts)->withCategoryInformation();
$collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::RECONCILIATION]);
$collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::RECONCILIATION]);
$journals = $collector->getExtractedJournals();
/** @var array $journal */

9
app/Api/V2/Controllers/Transaction/List/TransactionController.php
View File

@@ -59,15 +59,18 @@ class TransactionController extends Controller
->setPage($page)
->setTypes($request->getTransactionTypes());
$start = $request->getStartDate();
$end = $request->getEndDate();
$start = $this->parameters->get('start');
$end = $this->parameters->get('end');
if (null !== $start) {
$collector->setStart($start);
}
if (null !== $end) {
$collector->setEnd($start);
$collector->setEnd($end);
}
// $collector->dumpQuery();
// exit;
$paginator = $collector->getPaginatedGroups();
$paginator->setPath(
sprintf(