Retainer browse filters when searching

andrewdrake · andrewdrake · commit a3b25d1836aa · 2022-12-10T15:15:21.000+11:00
diff --git a/src/Http/Controllers/DealController.php b/src/Http/Controllers/DealController.php
@@ -213,14 +213,17 @@ public function search(Request $request)
             return redirect(route('laravel-crm.deals.index'));
         }
 
-        $deals = Deal::select(
-            config('laravel-crm.db_table_prefix').'deals.*',
-            config('laravel-crm.db_table_prefix').'people.first_name',
-            config('laravel-crm.db_table_prefix').'people.middle_name',
-            config('laravel-crm.db_table_prefix').'people.last_name',
-            config('laravel-crm.db_table_prefix').'people.maiden_name',
-            config('laravel-crm.db_table_prefix').'organisations.name'
-        )
+        $params = Deal::filters($request, 'search');
+
+        $deals = Deal::filter($params)
+            ->select(
+                config('laravel-crm.db_table_prefix').'deals.*',
+                config('laravel-crm.db_table_prefix').'people.first_name',
+                config('laravel-crm.db_table_prefix').'people.middle_name',
+                config('laravel-crm.db_table_prefix').'people.last_name',
+                config('laravel-crm.db_table_prefix').'people.maiden_name',
+                config('laravel-crm.db_table_prefix').'organisations.name'
+            )
             ->leftJoin(config('laravel-crm.db_table_prefix').'people', config('laravel-crm.db_table_prefix').'deals.person_id', '=', config('laravel-crm.db_table_prefix').'people.id')
             ->leftJoin(config('laravel-crm.db_table_prefix').'organisations', config('laravel-crm.db_table_prefix').'deals.organisation_id', '=', config('laravel-crm.db_table_prefix').'organisations.id')
             ->get()
diff --git a/src/Http/Controllers/LeadController.php b/src/Http/Controllers/LeadController.php
@@ -192,15 +192,18 @@ public function search(Request $request)
         if (! $searchValue || trim($searchValue) == '') {
             return redirect(route('laravel-crm.leads.index'));
         }
+
+        $params = Lead::filters($request, 'search');
         
-        $leads = Lead::select(
-            config('laravel-crm.db_table_prefix').'leads.*',
-            config('laravel-crm.db_table_prefix').'people.first_name',
-            config('laravel-crm.db_table_prefix').'people.middle_name',
-            config('laravel-crm.db_table_prefix').'people.last_name',
-            config('laravel-crm.db_table_prefix').'people.maiden_name',
-            config('laravel-crm.db_table_prefix').'organisations.name'
-        )
+        $leads = Lead::filter($params)
+            ->select(
+                config('laravel-crm.db_table_prefix').'leads.*',
+                config('laravel-crm.db_table_prefix').'people.first_name',
+                config('laravel-crm.db_table_prefix').'people.middle_name',
+                config('laravel-crm.db_table_prefix').'people.last_name',
+                config('laravel-crm.db_table_prefix').'people.maiden_name',
+                config('laravel-crm.db_table_prefix').'organisations.name'
+            )
             ->leftJoin(config('laravel-crm.db_table_prefix').'people', config('laravel-crm.db_table_prefix').'leads.person_id', '=', config('laravel-crm.db_table_prefix').'people.id')
             ->leftJoin(config('laravel-crm.db_table_prefix').'organisations', config('laravel-crm.db_table_prefix').'leads.organisation_id', '=', config('laravel-crm.db_table_prefix').'organisations.id')
             ->get()
diff --git a/src/Http/Controllers/OrderController.php b/src/Http/Controllers/OrderController.php
@@ -213,14 +213,17 @@ public function search(Request $request)
             return redirect(route('laravel-crm.orders.index'));
         }
 
-        $orders = Order::select(
-            config('laravel-crm.db_table_prefix').'orders.*',
-            config('laravel-crm.db_table_prefix').'people.first_name',
-            config('laravel-crm.db_table_prefix').'people.middle_name',
-            config('laravel-crm.db_table_prefix').'people.last_name',
-            config('laravel-crm.db_table_prefix').'people.maiden_name',
-            config('laravel-crm.db_table_prefix').'organisations.name'
-        )
+        $params = Order::filters($request, 'search');
+
+        $orders = Order::filter($params)
+            ->select(
+                config('laravel-crm.db_table_prefix').'orders.*',
+                config('laravel-crm.db_table_prefix').'people.first_name',
+                config('laravel-crm.db_table_prefix').'people.middle_name',
+                config('laravel-crm.db_table_prefix').'people.last_name',
+                config('laravel-crm.db_table_prefix').'people.maiden_name',
+                config('laravel-crm.db_table_prefix').'organisations.name'
+            )
             ->leftJoin(config('laravel-crm.db_table_prefix').'people', config('laravel-crm.db_table_prefix').'orders.person_id', '=', config('laravel-crm.db_table_prefix').'people.id')
             ->leftJoin(config('laravel-crm.db_table_prefix').'organisations', config('laravel-crm.db_table_prefix').'orders.organisation_id', '=', config('laravel-crm.db_table_prefix').'organisations.id')
             ->get()
diff --git a/src/Http/Controllers/QuoteController.php b/src/Http/Controllers/QuoteController.php
@@ -213,14 +213,17 @@ public function search(Request $request)
             return redirect(route('laravel-crm.quotes.index'));
         }
 
-        $quotes = Quote::select(
-            config('laravel-crm.db_table_prefix').'quotes.*',
-            config('laravel-crm.db_table_prefix').'people.first_name',
-            config('laravel-crm.db_table_prefix').'people.middle_name',
-            config('laravel-crm.db_table_prefix').'people.last_name',
-            config('laravel-crm.db_table_prefix').'people.maiden_name',
-            config('laravel-crm.db_table_prefix').'organisations.name'
-        )
+        $params = Quote::filters($request, 'search');
+
+        $quotes = Quote::filter($params)
+            ->select(
+                config('laravel-crm.db_table_prefix').'quotes.*',
+                config('laravel-crm.db_table_prefix').'people.first_name',
+                config('laravel-crm.db_table_prefix').'people.middle_name',
+                config('laravel-crm.db_table_prefix').'people.last_name',
+                config('laravel-crm.db_table_prefix').'people.maiden_name',
+                config('laravel-crm.db_table_prefix').'organisations.name'
+            )
             ->leftJoin(config('laravel-crm.db_table_prefix').'people', config('laravel-crm.db_table_prefix').'quotes.person_id', '=', config('laravel-crm.db_table_prefix').'people.id')
             ->leftJoin(config('laravel-crm.db_table_prefix').'organisations', config('laravel-crm.db_table_prefix').'quotes.organisation_id', '=', config('laravel-crm.db_table_prefix').'organisations.id')
             ->get()
diff --git a/src/Traits/SearchFilters.php b/src/Traits/SearchFilters.php
@@ -68,9 +68,9 @@ public function scopeFilter($query, $params)
                 }
             } elseif (isset($params[$field]) && is_array($params[$field])) {
                 $query->where(function ($query) use ($params, $field) {
-                    $query->orWhereIn($field, $params[$field]);
+                    $query->orWhereIn($this->getTable().'.'.$field, $params[$field]);
                     if (in_array(0, $params[$field])) {
-                        $query->orWhereNull($field);
+                        $query->orWhereNull($this->getTable().'.'.$field);
                     }
                 });
             }

Original file line number	Diff line number	Diff line change
`@@ -68,9 +68,9 @@ public function scopeFilter($query, $params)`
`68`	`68`	`}`
`69`	`69`	`} elseif (isset($params[$field]) && is_array($params[$field])) {`
`70`	`70`	`$query->where(function ($query) use ($params, $field) {`
`71`		`- $query->orWhereIn($field, $params[$field]);`
	`71`	`+ $query->orWhereIn($this->getTable().'.'.$field, $params[$field]);`
`72`	`72`	`if (in_array(0, $params[$field])) {`
`73`		`- $query->orWhereNull($field);`
	`73`	`+ $query->orWhereNull($this->getTable().'.'.$field);`
`74`	`74`	`}`
`75`	`75`	`});`
`76`	`76`	`}`