Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix account transaction type filtering Address issue #11822
Matthew Grove0c0736d33604
diff --git a/app/Api/V1/Controllers/Models/Account/ListController.php b/app/Api/V1/Controllers/Models/Account/ListController.phpindex a092a83bbb..5364831b6c 100644--- a/app/Api/V1/Controllers/Models/Account/ListController.php+++ b/app/Api/V1/Controllers/Models/Account/ListController.php@@ -128,15 +128,16 @@ class ListController extends Controller*/public function transactions(PaginationDateRangeRequest $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 */- $collector = app(GroupCollectorInterface::class);+ $collector = app(GroupCollectorInterface::class);$collector->setUser($admin)->setAccounts(new Collection()->push($account))->withAPIInformation()->setLimit($limit)->setPage($page)->setTypes($types);if (null !== $start) {$collector->setStart($start);@@ -145,18 +146,18 @@ class ListController extends Controller$collector->setEnd($end);}- $paginator = $collector->getPaginatedGroups();+ $paginator = $collector->getPaginatedGroups();$paginator->setPath(route('api.v1.accounts.transactions', [$account->id]).$this->buildParams());// enrich- $enrichment = new TransactionGroupEnrichment();+ $enrichment = new TransactionGroupEnrichment();$enrichment->setUser($admin);- $transactions = $enrichment->enrich($paginator->getCollection());+ $transactions = $enrichment->enrich($paginator->getCollection());/** @var TransactionGroupTransformer $transformer */- $transformer = app(TransactionGroupTransformer::class);+ $transformer = app(TransactionGroupTransformer::class);- $resource = new FractalCollection($transactions, $transformer, 'transactions');+ $resource = new FractalCollection($transactions, $transformer, 'transactions');$resource->setPaginator(new IlluminatePaginatorAdapter($paginator));return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);