Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for filtering datatable

Browse Source
This commit is contained in:
David Bomba 2019-08-05 09:31:55 +10:00
parent 40b12515c3
commit dcfd65ec32
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Filters/InvoiceFilters.php
View File

@ -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.'%');

4
resources/views/portal/default/invoices/index.blade.php
View File

@ -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;
}
},

2
routes/client.php
View File

@ -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');