diff --git a/app/Listeners/Report/AddExpenseCategories.php b/app/Listeners/Report/AddExpenseCategories.php index 9685b3465..3fb732bf7 100644 --- a/app/Listeners/Report/AddExpenseCategories.php +++ b/app/Listeners/Report/AddExpenseCategories.php @@ -26,7 +26,7 @@ class AddExpenseCategories extends Listener } // send true for add limit on search and filter.. - $event->class->filters['categories'] = $this->getExpenseCategories(true); + $event->class->filters['categories'] = $this->getExpenseCategories(); $event->class->filters['routes']['categories'] = ['categories.index', 'search=type:' . $this->getExpenseCategoryTypes('string') . ' enabled:1']; $event->class->filters['multiple']['categories'] = true; } diff --git a/app/Listeners/Report/AddIncomeCategories.php b/app/Listeners/Report/AddIncomeCategories.php index d492a955d..eed9d1cbe 100644 --- a/app/Listeners/Report/AddIncomeCategories.php +++ b/app/Listeners/Report/AddIncomeCategories.php @@ -26,7 +26,7 @@ class AddIncomeCategories extends Listener } // send true for add limit on search and filter.. - $event->class->filters['categories'] = $this->getIncomeCategories(true); + $event->class->filters['categories'] = $this->getIncomeCategories(); $event->class->filters['routes']['categories'] = ['categories.index', 'search=type:' . $this->getIncomeCategoryTypes('string') . ' enabled:1']; $event->class->filters['multiple']['categories'] = true; } diff --git a/app/Listeners/Report/AddIncomeExpenseCategories.php b/app/Listeners/Report/AddIncomeExpenseCategories.php index 9552e4fd4..6836552e7 100644 --- a/app/Listeners/Report/AddIncomeExpenseCategories.php +++ b/app/Listeners/Report/AddIncomeExpenseCategories.php @@ -27,8 +27,10 @@ class AddIncomeExpenseCategories extends Listener return; } - $event->class->filters['categories'] = $this->getIncomeExpenseCategories(true); - $event->class->filters['routes']['categories'] = ['categories.index', 'search=type:' . implode(',', array_merge($this->getIncomeCategoryTypes(), $this->getExpenseCategoryTypes())) . ' enabled:1']; + $types = array_merge($this->getIncomeCategoryTypes(), $this->getExpenseCategoryTypes()); + + $event->class->filters['categories'] = $this->getIncomeExpenseCategories(); + $event->class->filters['routes']['categories'] = ['categories.index', 'search=type:' . implode(',', $types) . ' enabled:1']; $event->class->filters['multiple']['categories'] = true; }