diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index ebc39a5f15..8bac8029d2 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -115,7 +115,7 @@ class CategoryController extends Controller */ public function index(CRI $repository, SCRI $singleRepository) { - $categories = $repository->listCategories(); + $categories = $repository->getCategories(); $categories->each( function (Category $category) use ($singleRepository) { diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index 02d98879db..1df37061df 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -165,7 +165,7 @@ class JsonController extends Controller */ public function categories(CRI $repository) { - $list = $repository->listCategories(); + $list = $repository->getCategories(); $return = []; foreach ($list as $entry) { $return[] = $entry->name; diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 4c774747ff..0873d45846 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -9,6 +9,8 @@ use FireflyIII\Helpers\Report\ReportHelperInterface; use FireflyIII\Models\Account; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use Illuminate\Support\Collection; use Log; use Preferences; @@ -132,10 +134,6 @@ class ReportController extends Controller case 'audit': // always default return $this->auditReport($start, $end, $accounts); - case 'meta-history': - // always default - return $this->metaHistoryReport($start, $end, $accounts); - break; } @@ -274,7 +272,7 @@ class ReportController extends Controller $expenseTopLength = 8; // list of users stuff: $budgets = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface')->getActiveBudgets(); - $categories = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface')->listCategories(); + $categories = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface')->getCategories(); $accountReport = $this->accountHelper->getAccountReport($start, $end, $accounts); $incomes = $this->helper->getIncomeReport($start, $end, $accounts); $expenses = $this->helper->getExpenseReport($start, $end, $accounts); @@ -335,6 +333,4 @@ class ReportController extends Controller ) ); } - - } diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index d8e1486bca..14f5495fc4 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -90,7 +90,7 @@ class CategoryRepository implements CategoryRepositoryInterface * * @return Collection */ - public function listCategories(): Collection + public function getCategories(): Collection { /** @var Collection $set */ $set = $this->user->categories()->orderBy('name', 'ASC')->get(); diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index cbfd632b81..5c5966c8b7 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -33,7 +33,7 @@ interface CategoryRepositoryInterface * * @return Collection */ - public function listCategories(): Collection; + public function getCategories(): Collection; /** * This method returns a very special collection for each category: diff --git a/resources/views/reports/index.twig b/resources/views/reports/index.twig index 19d948520b..218f280a71 100644 --- a/resources/views/reports/index.twig +++ b/resources/views/reports/index.twig @@ -24,7 +24,6 @@