Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 16:31:33 +02:00
Code Issues Releases Activity

Client Status Filters

Browse Source
This commit is contained in:
David Bomba 2019-07-30 11:08:39 +00:00
parent 94181908bd
commit 46822855a7
2 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/Filters/InvoiceFilters.php
View File

@ -14,6 +14,8 @@ namespace App\Filters;
use App\Models\Invoice;
use App\Models\User;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Log;
/**
* InvoiceFilters
@ -21,6 +23,44 @@ use Illuminate\Database\Eloquent\Builder;
class InvoiceFilters extends QueryFilters
{
/**
* Filter based on client status
*
* Statuses we need to handle
*
* - all
* - paid
* - unpaid
* - overdue
* - reversed
*
* @param string client_status The invoice status as seen by the client
* @return Illuminate\Database\Query\Builder
*
*/
public function client_status(string $value = '') :Builder
{
if(strlen($value) == 0)
return $this->builder;
$status_parameters = explode(",", $value);
if (in_array('all', $status_parameters))
return $this->builder;
if(in_array('paid', $status_parameters))
$this->builder->where('status_id', Invoice::STATUS_PAID);
if(in_array('unpaid', $status_parameters))
$this->builder->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL]);
if(in_array('overdue', $status_parameters))
$this->builder->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
->where('due_date', '<', Carbon::now());
return $this->builder;
}
/**
* Filter based on search text
@ -45,7 +85,7 @@ class InvoiceFilters extends QueryFilters
/**
* Filters the list based on the status
* archived, active, deleted
* archived, active, deleted - legacy from V1
*
* @param string filter
* @return Illuminate\Database\Query\Builder

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

@ -51,8 +51,12 @@
@section('footer')
<script>
/*global json payload*/
var data;
/*status filter variable - comma separated*/
var client_statuses;
$(function() {
$('#datatable').DataTable({
@ -68,7 +72,13 @@ $(function() {
loadingRecords: "{{ trans('texts.loading') }}",
zeroRecords: "{{ trans('texts.no_records_found') }}"
},
ajax: '{!! route('client.invoices.index') !!}',
ajax: {
url: '{!! route('client.invoices.index') !!}',
data: function(data) {
data.client_status = 'paid';
}
},
drawCallback: function(settings){
data = this.api().ajax.json().data;