Solved group thing.

This commit is contained in:
James Cole
2016-11-05 10:26:57 +01:00
parent adb97fcb05
commit 46649fe228
4 changed files with 79 additions and 123 deletions

View File

@@ -53,32 +53,19 @@ class TransactionController extends Controller
/**
* @param Request $request
* @param AccountRepositoryInterface $repository
* @param string $what
*
* @return View
*/
public function index(Request $request, AccountRepositoryInterface $repository, string $what)
public function index(Request $request, string $what)
{
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
$subTitleIcon = config('firefly.transactionIconsByWhat.' . $what);
$types = config('firefly.transactionTypesByWhat.' . $what);
$subTitle = trans('firefly.title_' . $what);
$page = intval($request->get('page'));
$assetAccounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
$collector = new JournalCollector(auth()->user());
$collector->setTypes($types)->setLimit($pageSize)->setPage($page);
// depending on the view, we filter the collector to grab the right stuff.
switch ($what) {
default:
$collector->setAccounts($assetAccounts);
break;
case 'transfer':
case 'transfers':
$collector->setDestinationAccounts($assetAccounts);
break;
}
$collector->setTypes($types)->setLimit($pageSize)->setPage($page)->setAllAssetAccounts();
$journals = $collector->getPaginatedJournals();
$journals->setPath('transactions/' . $what);