diff --git a/app/Abstracts/Listeners/Report.php b/app/Abstracts/Listeners/Report.php index a226beddc..cdb33381e 100644 --- a/app/Abstracts/Listeners/Report.php +++ b/app/Abstracts/Listeners/Report.php @@ -16,11 +16,11 @@ abstract class Report protected $classes = []; protected $events = [ - 'App\Events\Common\ReportFilterShowing', - 'App\Events\Common\ReportFilterApplying', - 'App\Events\Common\ReportGroupShowing', - 'App\Events\Common\ReportGroupApplying', - 'App\Events\Common\ReportRowsShowing', + 'App\Events\Report\FilterShowing', + 'App\Events\Report\FilterApplying', + 'App\Events\Report\GroupShowing', + 'App\Events\Report\GroupApplying', + 'App\Events\Report\RowsShowing', ]; public function skipThisClass($event) diff --git a/app/Abstracts/Report.php b/app/Abstracts/Report.php index ee824f5c2..fbab3e728 100644 --- a/app/Abstracts/Report.php +++ b/app/Abstracts/Report.php @@ -2,11 +2,11 @@ namespace App\Abstracts; -use App\Events\Common\ReportFilterShowing; -use App\Events\Common\ReportFilterApplying; -use App\Events\Common\ReportGroupApplying; -use App\Events\Common\ReportGroupShowing; -use App\Events\Common\ReportRowsShowing; +use App\Events\Report\FilterApplying; +use App\Events\Report\FilterShowing; +use App\Events\Report\GroupApplying; +use App\Events\Report\GroupShowing; +use App\Events\Report\RowsShowing; use App\Exports\Common\Reports as Export; use App\Models\Banking\Transaction; use App\Models\Common\Report as Model; @@ -286,19 +286,19 @@ abstract class Report public function setFilters() { - event(new ReportFilterShowing($this)); + event(new FilterShowing($this)); } public function setGroups() { $this->groups = []; - event(new ReportGroupShowing($this)); + event(new GroupShowing($this)); } public function setRows() { - event(new ReportRowsShowing($this)); + event(new RowsShowing($this)); } public function setTotals($items, $date_field, $check_type = false, $table = 'default') @@ -337,14 +337,14 @@ abstract class Report public function applyFilters($model, $args = []) { - event(new ReportFilterApplying($this, $model, $args)); + event(new FilterApplying($this, $model, $args)); return $model; } public function applyGroups($model, $args = []) { - event(new ReportGroupApplying($this, $model, $args)); + event(new GroupApplying($this, $model, $args)); return $model; } diff --git a/app/Events/Common/ReportGroupApplying.php b/app/Events/Report/FilterApplying.php similarity index 88% rename from app/Events/Common/ReportGroupApplying.php rename to app/Events/Report/FilterApplying.php index c1ca44015..d3fc11cb0 100644 --- a/app/Events/Common/ReportGroupApplying.php +++ b/app/Events/Report/FilterApplying.php @@ -1,10 +1,10 @@ skipThisClass($event)) { return; @@ -37,7 +37,7 @@ class AddAccountsToReports extends Listener * @param $event * @return void */ - public function handleReportGroupShowing(ReportGroupShowing $event) + public function handleGroupShowing(GroupShowing $event) { if ($this->skipThisClass($event)) { return; @@ -52,7 +52,7 @@ class AddAccountsToReports extends Listener * @param $event * @return void */ - public function handleReportGroupApplying(ReportGroupApplying $event) + public function handleGroupApplying(GroupApplying $event) { if ($this->skipThisClass($event)) { return; @@ -67,7 +67,7 @@ class AddAccountsToReports extends Listener * @param $event * @return void */ - public function handleReportRowsShowing(ReportRowsShowing $event) + public function handleRowsShowing(RowsShowing $event) { if ($this->skipRowsShowing($event, 'account')) { return; diff --git a/app/Listeners/Common/AddCustomersToReports.php b/app/Listeners/Report/AddCustomers.php similarity index 73% rename from app/Listeners/Common/AddCustomersToReports.php rename to app/Listeners/Report/AddCustomers.php index bc6ec8865..a991d9715 100644 --- a/app/Listeners/Common/AddCustomersToReports.php +++ b/app/Listeners/Report/AddCustomers.php @@ -1,14 +1,14 @@ skipThisClass($event)) { return; @@ -36,7 +36,7 @@ class AddCustomersToReports extends Listener * @param $event * @return void */ - public function handleReportGroupShowing(ReportGroupShowing $event) + public function handleGroupShowing(GroupShowing $event) { if ($this->skipThisClass($event)) { return; @@ -51,7 +51,7 @@ class AddCustomersToReports extends Listener * @param $event * @return void */ - public function handleReportGroupApplying(ReportGroupApplying $event) + public function handleGroupApplying(GroupApplying $event) { if ($this->skipThisClass($event)) { return; @@ -66,7 +66,7 @@ class AddCustomersToReports extends Listener * @param $event * @return void */ - public function handleReportRowsShowing(ReportRowsShowing $event) + public function handleRowsShowing(RowsShowing $event) { if ($this->skipRowsShowing($event, 'customer')) { return; diff --git a/app/Listeners/Common/AddDateToReports.php b/app/Listeners/Report/AddDate.php similarity index 71% rename from app/Listeners/Common/AddDateToReports.php rename to app/Listeners/Report/AddDate.php index 8a34afbf9..e16274f3d 100644 --- a/app/Listeners/Common/AddDateToReports.php +++ b/app/Listeners/Report/AddDate.php @@ -1,12 +1,12 @@ skipThisClass($event)) { return; @@ -37,7 +37,7 @@ class AddDateToReports extends Listener * @param $event * @return void */ - public function handleReportFilterApplying(ReportFilterApplying $event) + public function handleFilterApplying(FilterApplying $event) { if ($this->skipThisClass($event)) { return; diff --git a/app/Listeners/Common/AddExpenseCategoriesToReports.php b/app/Listeners/Report/AddExpenseCategories.php similarity index 74% rename from app/Listeners/Common/AddExpenseCategoriesToReports.php rename to app/Listeners/Report/AddExpenseCategories.php index 3ee1e20a9..da318acf3 100644 --- a/app/Listeners/Common/AddExpenseCategoriesToReports.php +++ b/app/Listeners/Report/AddExpenseCategories.php @@ -1,13 +1,13 @@ skipThisClass($event)) { return; @@ -34,7 +34,7 @@ class AddExpenseCategoriesToReports extends Listener * @param $event * @return void */ - public function handleReportGroupShowing(ReportGroupShowing $event) + public function handleGroupShowing(GroupShowing $event) { if ($this->skipThisClass($event)) { return; @@ -49,7 +49,7 @@ class AddExpenseCategoriesToReports extends Listener * @param $event * @return void */ - public function handleReportRowsShowing(ReportRowsShowing $event) + public function handleRowsShowing(RowsShowing $event) { if ($this->skipRowsShowing($event, 'category')) { return; diff --git a/app/Listeners/Common/AddIncomeCategoriesToReports.php b/app/Listeners/Report/AddIncomeCategories.php similarity index 74% rename from app/Listeners/Common/AddIncomeCategoriesToReports.php rename to app/Listeners/Report/AddIncomeCategories.php index c66cf5624..4fb247385 100644 --- a/app/Listeners/Common/AddIncomeCategoriesToReports.php +++ b/app/Listeners/Report/AddIncomeCategories.php @@ -1,13 +1,13 @@ skipThisClass($event)) { return; @@ -34,7 +34,7 @@ class AddIncomeCategoriesToReports extends Listener * @param $event * @return void */ - public function handleReportGroupShowing(ReportGroupShowing $event) + public function handleGroupShowing(GroupShowing $event) { if ($this->skipThisClass($event)) { return; @@ -49,7 +49,7 @@ class AddIncomeCategoriesToReports extends Listener * @param $event * @return void */ - public function handleReportRowsShowing(ReportRowsShowing $event) + public function handleRowsShowing(RowsShowing $event) { if ($this->skipRowsShowing($event, 'category')) { return; diff --git a/app/Listeners/Common/AddIncomeExpenseCategoriesToReports.php b/app/Listeners/Report/AddIncomeExpenseCategories.php similarity index 86% rename from app/Listeners/Common/AddIncomeExpenseCategoriesToReports.php rename to app/Listeners/Report/AddIncomeExpenseCategories.php index b80388f4f..58018f318 100644 --- a/app/Listeners/Common/AddIncomeExpenseCategoriesToReports.php +++ b/app/Listeners/Report/AddIncomeExpenseCategories.php @@ -1,14 +1,14 @@ class) diff --git a/app/Listeners/Common/AddRowsToTaxReport.php b/app/Listeners/Report/AddRowsToTax.php similarity index 73% rename from app/Listeners/Common/AddRowsToTaxReport.php rename to app/Listeners/Report/AddRowsToTax.php index 52b694bac..60b36f8e8 100644 --- a/app/Listeners/Common/AddRowsToTaxReport.php +++ b/app/Listeners/Report/AddRowsToTax.php @@ -1,11 +1,11 @@ skipThisClass($event)) { return; diff --git a/app/Listeners/Common/AddSearchToReports.php b/app/Listeners/Report/AddSearch.php similarity index 71% rename from app/Listeners/Common/AddSearchToReports.php rename to app/Listeners/Report/AddSearch.php index ea12abe2e..8fb4df09b 100644 --- a/app/Listeners/Common/AddSearchToReports.php +++ b/app/Listeners/Report/AddSearch.php @@ -1,12 +1,12 @@ skipThisClass($event)) { return; @@ -37,7 +37,7 @@ class AddSearchToReports extends Listener * @param $event * @return void */ - public function handleReportFilterApplying(ReportFilterApplying $event) + public function handleFilterApplying(FilterApplying $event) { if ($this->skipThisClass($event)) { return; diff --git a/app/Listeners/Common/AddVendorsToReports.php b/app/Listeners/Report/AddVendors.php similarity index 73% rename from app/Listeners/Common/AddVendorsToReports.php rename to app/Listeners/Report/AddVendors.php index 4d978aa92..3ccd0b807 100644 --- a/app/Listeners/Common/AddVendorsToReports.php +++ b/app/Listeners/Report/AddVendors.php @@ -1,14 +1,14 @@ skipThisClass($event)) { return; @@ -36,7 +36,7 @@ class AddVendorsToReports extends Listener * @param $event * @return void */ - public function handleReportGroupShowing(ReportGroupShowing $event) + public function handleGroupShowing(GroupShowing $event) { if ($this->skipThisClass($event)) { return; @@ -51,7 +51,7 @@ class AddVendorsToReports extends Listener * @param $event * @return void */ - public function handleReportGroupApplying(ReportGroupApplying $event) + public function handleGroupApplying(GroupApplying $event) { if ($this->skipThisClass($event)) { return; @@ -66,7 +66,7 @@ class AddVendorsToReports extends Listener * @param $event * @return void */ - public function handleReportRowsShowing(ReportRowsShowing $event) + public function handleRowsShowing(RowsShowing $event) { if ($this->skipRowsShowing($event, 'vendor')) { return; diff --git a/app/Providers/Event.php b/app/Providers/Event.php index 8499390b7..fe073130b 100644 --- a/app/Providers/Event.php +++ b/app/Providers/Event.php @@ -62,14 +62,14 @@ class Event extends Provider * @var array */ protected $subscribe = [ - 'App\Listeners\Common\AddDateToReports', - 'App\Listeners\Common\AddAccountsToReports', - 'App\Listeners\Common\AddCustomersToReports', - 'App\Listeners\Common\AddVendorsToReports', - 'App\Listeners\Common\AddExpenseCategoriesToReports', - 'App\Listeners\Common\AddIncomeCategoriesToReports', - 'App\Listeners\Common\AddIncomeExpenseCategoriesToReports', - 'App\Listeners\Common\AddSearchToReports', - 'App\Listeners\Common\AddRowsToTaxReport', + 'App\Listeners\Report\AddDate', + 'App\Listeners\Report\AddAccounts', + 'App\Listeners\Report\AddCustomers', + 'App\Listeners\Report\AddVendors', + 'App\Listeners\Report\AddExpenseCategories', + 'App\Listeners\Report\AddIncomeCategories', + 'App\Listeners\Report\AddIncomeExpenseCategories', + 'App\Listeners\Report\AddSearch', + 'App\Listeners\Report\AddRowsToTax', ]; }