diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index ae365001eb..98ce6dcc98 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -231,14 +231,14 @@ class BillController extends Controller $collector = app(JournalCollectorInterface::class); $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->setLimit($pageSize)->setPage($page)->withBudgetInformation() ->withCategoryInformation(); - $journals = $collector->getPaginatedJournals(); - $journals->setPath(route('bills.show', [$bill->id])); + $transactions = $collector->getPaginatedJournals(); + $transactions->setPath(route('bills.show', [$bill->id])); $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill, new Carbon); $hideBill = true; $subTitle = e($bill->name); - return view('bills.show', compact('journals', 'yearAverage', 'overallAverage', 'year', 'hideBill', 'bill', 'subTitle')); + return view('bills.show', compact('transactions', 'yearAverage', 'overallAverage', 'year', 'hideBill', 'bill', 'subTitle')); } /** diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 34e6ff5ef3..c9c27fd605 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -373,10 +373,10 @@ class BudgetController extends Controller $collector = app(JournalCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page) ->withoutBudget()->withOpposingAccount(); - $journals = $collector->getPaginatedJournals(); - $journals->setPath(route('budgets.no-budget')); + $transactions = $collector->getPaginatedJournals(); + $transactions->setPath(route('budgets.no-budget')); - return view('budgets.no-budget', compact('journals', 'subTitle', 'moment', 'periods', 'start', 'end')); + return view('budgets.no-budget', compact('transactions', 'subTitle', 'moment', 'periods', 'start', 'end')); } /** @@ -416,13 +416,13 @@ class BudgetController extends Controller /** @var JournalCollectorInterface $collector */ $collector = app(JournalCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation(); - $journals = $collector->getPaginatedJournals(); - $journals->setPath(route('budgets.show', [$budget->id])); + $transactions = $collector->getPaginatedJournals(); + $transactions->setPath(route('budgets.show', [$budget->id])); $subTitle = trans('firefly.all_journals_for_budget', ['name' => $budget->name]); - return view('budgets.show', compact('limits', 'budget', 'repetition', 'journals', 'subTitle')); + return view('budgets.show', compact('limits', 'budget', 'repetition', 'transactions', 'subTitle')); } /** @@ -454,13 +454,13 @@ class BudgetController extends Controller $collector = app(JournalCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($budgetLimit->start_date, $budgetLimit->end_date) ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation(); - $journals = $collector->getPaginatedJournals(); - $journals->setPath(route('budgets.show', [$budget->id, $budgetLimit->id])); + $transactions = $collector->getPaginatedJournals(); + $transactions->setPath(route('budgets.show', [$budget->id, $budgetLimit->id])); $start = session('first', Carbon::create()->startOfYear()); $end = new Carbon; $limits = $this->getLimits($budget, $start, $end); - return view('budgets.show', compact('limits', 'budget', 'budgetLimit', 'journals', 'subTitle')); + return view('budgets.show', compact('limits', 'budget', 'budgetLimit', 'transactions', 'subTitle')); } diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 3fad48e139..8b0d41fa10 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -217,10 +217,10 @@ class CategoryController extends Controller $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutCategory()->withOpposingAccount() ->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]); $collector->removeFilter(InternalTransferFilter::class); - $journals = $collector->getPaginatedJournals(); - $journals->setPath(route('categories.no-category')); + $transactions = $collector->getPaginatedJournals(); + $transactions->setPath(route('categories.no-category')); - return view('categories.no-category', compact('journals', 'subTitle', 'moment', 'periods', 'start', 'end')); + return view('categories.no-category', compact('transactions', 'subTitle', 'moment', 'periods', 'start', 'end')); } /** @@ -283,11 +283,11 @@ class CategoryController extends Controller $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount() ->setCategory($category)->withBudgetInformation()->withCategoryInformation(); $collector->removeFilter(InternalTransferFilter::class); - $journals = $collector->getPaginatedJournals(); - $journals->setPath(route('categories.show', [$category->id])); + $transactions = $collector->getPaginatedJournals(); + $transactions->setPath(route('categories.show', [$category->id])); - return view('categories.show', compact('category', 'moment', 'journals', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end')); + return view('categories.show', compact('category', 'moment', 'transactions', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end')); }