Merge laravel 5.4 into develop.

This commit is contained in:
James Cole
2017-02-05 16:20:02 +01:00
162 changed files with 1063 additions and 6274 deletions

View File

@@ -208,7 +208,8 @@ class BillController extends Controller
// use collector:
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class, [auth()->user()]);
$collector = app(JournalCollectorInterface::class);
$collector->setUser(auth()->user());
$collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->setLimit($pageSize)->setPage($page)->withBudgetInformation()
->withCategoryInformation();
$journals = $collector->getPaginatedJournals();