fixed report groups and filters

app/Abstracts/Listeners/Report.php

@@ -114,11 +114,11 @@ abstract class Report
 
     public function applyAccountGroup($event)
     {
-        if (($event->model->getTable() != 'invoices') && ($event->model->getTable() != 'bills')) {
+        if ($event->model->getTable() != 'documents') {
             return;
         }
 
-        $filter = request('accounts', []);
+        $filter = explode(',', $this->getSearchStringValue('account_id'));
 
         $event->model->account_id = 0;
 

app/Listeners/Report/AddAccounts.php

@@ -74,7 +74,9 @@ class AddAccounts extends Listener
             return;
         }
 
-        if ($accounts = request('accounts')) {
+        if ($account_ids = $this->getSearchStringValue('account_id')) {
+            $accounts = explode(',', $account_ids);
+
             $rows = collect($event->class->filters['accounts'])->filter(function ($value, $key) use ($accounts) {
                 return in_array($key, $accounts);
             });

app/Listeners/Report/AddCustomers.php

@@ -73,7 +73,9 @@ class AddCustomers extends Listener
             return;
         }
 
-        if ($customers = request('customers')) {
+        if ($customer_ids = $this->getSearchStringValue('customer_id')) {
+            $customers = explode(',', $customer_ids);
+
             $rows = collect($event->class->filters['customers'])->filter(function ($value, $key) use ($customers) {
                 return in_array($key, $customers);
             });

app/Listeners/Report/AddExpenseCategories.php

@@ -56,7 +56,9 @@ class AddExpenseCategories extends Listener
             return;
         }
 
-        if ($categories = request('categories')) {
+        if ($category_ids = $this->getSearchStringValue('category_id')) {
+            $categories = explode(',', $category_ids);
+
             $rows = collect($event->class->filters['categories'])->filter(function ($value, $key) use ($categories) {
                 return in_array($key, $categories);
             });

app/Listeners/Report/AddIncomeCategories.php

@@ -56,7 +56,9 @@ class AddIncomeCategories extends Listener
             return;
         }
 
-        if ($categories = request('categories')) {
+        if ($category_ids = $this->getSearchStringValue('category_id')) {
+            $categories = explode(',', $category_ids);
+
             $rows = collect($event->class->filters['categories'])->filter(function ($value, $key) use ($categories) {
                 return in_array($key, $categories);
             });

app/Listeners/Report/AddIncomeExpenseCategories.php

@@ -75,7 +75,9 @@ class AddIncomeExpenseCategories extends Listener
 
                 break;
             case 'App\Reports\IncomeExpenseSummary':
-                if ($categories = request('categories')) {
+                if ($category_ids = $this->getSearchStringValue('category_id')) {
+                    $categories = explode(',', $category_ids);
+
                     $rows = collect($event->class->filters['categories'])->filter(function ($value, $key) use ($categories) {
                         return in_array($key, $categories);
                     });

app/Listeners/Report/AddSearchString.php

@@ -4,9 +4,8 @@ namespace App\Listeners\Report;
 
 use App\Abstracts\Listeners\Report as Listener;
 use App\Events\Report\FilterApplying;
-use App\Events\Report\FilterShowing;
 
-class AddSearch extends Listener
+class AddSearchString extends Listener
 {
     protected $classes = [
         'App\Reports\IncomeSummary',
@@ -16,21 +15,6 @@ class AddSearch extends Listener
         'App\Reports\TaxSummary',
     ];
 
-    /**
-     * Handle filter showing event.
-     *
-     * @param  $event
-     * @return void
-     */
-    public function handleFilterShowing(FilterShowing $event)
-    {
-        if ($this->skipThisClass($event)) {
-            return;
-        }
-
-        //$event->class->filters['search'] = $this->getSearch();
-    }
-
     /**
      * Handle filter applying event.
      *
@@ -43,7 +27,7 @@ class AddSearch extends Listener
             return;
         }
 
-        // Apply date
+        // Apply search string
         $this->applySearchStringFilter($event);
     }
 }

app/Listeners/Report/AddVendors.php

@@ -73,7 +73,9 @@ class AddVendors extends Listener
             return;
         }
 
-        if ($vendors = request('vendors')) {
+        if ($vendor_ids = $this->getSearchStringValue('vendor_id')) {
+            $vendors = explode(',', $vendor_ids);
+
             $rows = collect($event->class->filters['vendors'])->filter(function ($value, $key) use ($vendors) {
                 return in_array($key, $vendors);
             });

app/Providers/Event.php

@@ -92,7 +92,7 @@ class Event extends Provider
         'App\Listeners\Report\AddExpenseCategories',
         'App\Listeners\Report\AddIncomeCategories',
         'App\Listeners\Report\AddIncomeExpenseCategories',
-        'App\Listeners\Report\AddSearch',
+        'App\Listeners\Report\AddSearchString',
         'App\Listeners\Report\AddRowsToTax',
     ];
 }

config/search-string.php

@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'fail' => 'no-results',
+    'fail' => 'all-results',
 
     /*
     |--------------------------------------------------------------------------