Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Merge branch 'develop' into develop
James Coleb299465fb2df
diff --cc app/Api/V1/Controllers/Models/Account/ListController.phpindex 5364831b6c,e6bff2f40a..71eb0fdbf6--- a/app/Api/V1/Controllers/Models/Account/ListController.php+++ b/app/Api/V1/Controllers/Models/Account/ListController.php@@@ -126,14 -126,19 +126,14 @@@ class ListController extends Controlle/*** Show all transaction groups related to the account.*/- public function transactions(PaginationDateRangeRequest $request, Account $account): JsonResponse+ public function transactions(ListRequest $request, Account $account): JsonResponse{- [- 'limit' => $limit,- 'page' => $page,- 'start' => $start,- 'end' => $end,- 'types' => $types,- ] = $request->attributes->all();- $manager = $this->getManager();+ ['limit' => $limit, 'page' => $page, 'start' => $start, 'end' => $end, 'type' => $type] = $request->attributes->all();+ $types = $this->mapTransactionTypes($type ?? 'default');+ $manager = $this->getManager();/** @var User $admin */- $admin = auth()->user();+ $admin = auth()->user();// use new group collector:/** @var GroupCollectorInterface $collector */