From dcfd65ec3277ecb7245e7f74d71251d2341ec638 Mon Sep 17 00:00:00 2001
From: David Bomba <davidbomba@Davids-iMac.local>
Date: Mon, 5 Aug 2019 09:31:55 +1000
Subject: [PATCH] Fixes for filtering datatable

---
 app/Filters/InvoiceFilters.php                          | 7 ++++++-
 resources/views/portal/default/invoices/index.blade.php | 4 ++--
 routes/client.php                                       | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php
index 4fb0398f8bf4..1fbb7aebdc6c 100644
--- a/app/Filters/InvoiceFilters.php
+++ b/app/Filters/InvoiceFilters.php
@@ -76,7 +76,12 @@ class InvoiceFilters extends QueryFilters
             return $this->builder;
 
         return  $this->builder->where(function ($query) use ($filter) {
-                    $query->where('invoices.custom_value1', 'like', '%'.$filter.'%')
+                    $query->where('invoices.invoice_number', 'like', '%'.$filter.'%')
+                          ->orWhere('invoices.po_number', 'like', '%'.$filter.'%')
+                          ->orWhere('invoices.invoice_date', 'like', '%'.$filter.'%')
+                          ->orWhere('invoices.amount', 'like', '%'.$filter.'%')
+                          ->orWhere('invoices.balance', 'like', '%'.$filter.'%')
+                          ->orWhere('invoices.custom_value1', 'like', '%'.$filter.'%')
                           ->orWhere('invoices.custom_value2', 'like' , '%'.$filter.'%')
                           ->orWhere('invoices.custom_value3', 'like' , '%'.$filter.'%')
                           ->orWhere('invoices.custom_value4', 'like' , '%'.$filter.'%');
diff --git a/resources/views/portal/default/invoices/index.blade.php b/resources/views/portal/default/invoices/index.blade.php
index 8fb54e7e0385..d336d846d73b 100644
--- a/resources/views/portal/default/invoices/index.blade.php
+++ b/resources/views/portal/default/invoices/index.blade.php
@@ -80,8 +80,8 @@ $(function() {
         	url: '{!! route('client.invoices.index') !!}',
 	        data: function(data) { 
 	        	data.client_status = client_statuses; 
-               // data.filter = table_filter;
-                data.search.value = table_filter;
+                data.filter = table_filter;
+              //  data.search.value = table_filter;
 	        } 
 
         },
diff --git a/routes/client.php b/routes/client.php
index f97f103a8a74..95a32206a984 100644
--- a/routes/client.php
+++ b/routes/client.php
@@ -1,6 +1,6 @@
 <?php
 
-Route::get('client', 'Auth\ContactLoginController@showLoginForm')->name('client.login');
+Route::get('client', 'Auth\ContactLoginController@showLoginForm')->name('client.login'); //catch all
 
 Route::get('client/login', 'Auth\ContactLoginController@showLoginForm')->name('client.login');
 Route::post('client/login', 'Auth\ContactLoginController@login')->name('client.login.submit');