From 46062c878d0c6eff414c4211b1c12c9e9e451a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Duli=C3=A7i?= Date: Tue, 19 Jan 2021 18:00:10 +0300 Subject: [PATCH] added list limit to report filters --- app/Abstracts/Listeners/Report.php | 6 +++--- app/Listeners/Report/AddAccounts.php | 1 + app/Listeners/Report/AddCustomers.php | 1 + app/Listeners/Report/AddExpenseCategories.php | 1 + app/Listeners/Report/AddIncomeCategories.php | 1 + app/Listeners/Report/AddIncomeExpenseCategories.php | 1 + app/Listeners/Report/AddVendors.php | 1 + 7 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Abstracts/Listeners/Report.php b/app/Abstracts/Listeners/Report.php index cdb33381e..ffcfe8955 100644 --- a/app/Abstracts/Listeners/Report.php +++ b/app/Abstracts/Listeners/Report.php @@ -52,7 +52,7 @@ abstract class Report public function getAccounts() { - return Account::enabled()->orderBy('name')->pluck('name', 'id')->toArray(); + return Account::enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id')->toArray(); } public function getItemCategories() @@ -77,7 +77,7 @@ abstract class Report public function getCategories($types) { - return Category::type($types)->orderBy('name')->pluck('name', 'id')->toArray(); + return Category::type($types)->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id')->toArray(); } public function getCustomers() @@ -92,7 +92,7 @@ abstract class Report public function getContacts($types) { - return Contact::type($types)->orderBy('name')->pluck('name', 'id')->toArray(); + return Contact::type($types)->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id')->toArray(); } public function applyDateFilter($event) diff --git a/app/Listeners/Report/AddAccounts.php b/app/Listeners/Report/AddAccounts.php index ae910212f..a048889ed 100644 --- a/app/Listeners/Report/AddAccounts.php +++ b/app/Listeners/Report/AddAccounts.php @@ -29,6 +29,7 @@ class AddAccounts extends Listener } $event->class->filters['accounts'] = $this->getAccounts(); + $event->class->filters['routes']['accounts'] = 'accounts.index'; } /** diff --git a/app/Listeners/Report/AddCustomers.php b/app/Listeners/Report/AddCustomers.php index a991d9715..698b25026 100644 --- a/app/Listeners/Report/AddCustomers.php +++ b/app/Listeners/Report/AddCustomers.php @@ -28,6 +28,7 @@ class AddCustomers extends Listener } $event->class->filters['customers'] = $this->getCustomers(); + $event->class->filters['routes']['customers'] = 'customers.index'; } /** diff --git a/app/Listeners/Report/AddExpenseCategories.php b/app/Listeners/Report/AddExpenseCategories.php index da318acf3..73d04b65d 100644 --- a/app/Listeners/Report/AddExpenseCategories.php +++ b/app/Listeners/Report/AddExpenseCategories.php @@ -26,6 +26,7 @@ class AddExpenseCategories extends Listener } $event->class->filters['categories'] = $this->getExpenseCategories(); + $event->class->filters['routes']['categories'] = ['categories.index', 'search=type:expense']; } /** diff --git a/app/Listeners/Report/AddIncomeCategories.php b/app/Listeners/Report/AddIncomeCategories.php index 4fb247385..b0f160829 100644 --- a/app/Listeners/Report/AddIncomeCategories.php +++ b/app/Listeners/Report/AddIncomeCategories.php @@ -26,6 +26,7 @@ class AddIncomeCategories extends Listener } $event->class->filters['categories'] = $this->getIncomeCategories(); + $event->class->filters['routes']['categories'] = ['categories.index', 'search=type:income']; } /** diff --git a/app/Listeners/Report/AddIncomeExpenseCategories.php b/app/Listeners/Report/AddIncomeExpenseCategories.php index 58018f318..7555eda64 100644 --- a/app/Listeners/Report/AddIncomeExpenseCategories.php +++ b/app/Listeners/Report/AddIncomeExpenseCategories.php @@ -27,6 +27,7 @@ class AddIncomeExpenseCategories extends Listener } $event->class->filters['categories'] = $this->getIncomeExpenseCategories(); + $event->class->filters['routes']['categories'] = ['categories.index', 'search=type:income,expense']; } /** diff --git a/app/Listeners/Report/AddVendors.php b/app/Listeners/Report/AddVendors.php index 3ccd0b807..66f3beb07 100644 --- a/app/Listeners/Report/AddVendors.php +++ b/app/Listeners/Report/AddVendors.php @@ -28,6 +28,7 @@ class AddVendors extends Listener } $event->class->filters['vendors'] = $this->getVendors(); + $event->class->filters['routes']['vendors'] = 'vendors.index'; } /**