Fixes for recurring invoice filters
This commit is contained in:
parent
195901bf1c
commit
fef4b6780d
|
|
@ -125,6 +125,10 @@ class RecurringInvoiceFilters extends QueryFilters
|
|||
{
|
||||
|
||||
$sort_col = explode('|', $sort);
|
||||
|
||||
if ($sort_col[0] == 'next_send_datetime') {
|
||||
$sort_col[0] = 'next_send_date';
|
||||
}
|
||||
|
||||
if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col[0], \Illuminate\Support\Facades\Schema::getColumnListing('recurring_invoices'))) {
|
||||
return $this->builder;
|
||||
|
|
@ -145,10 +149,6 @@ class RecurringInvoiceFilters extends QueryFilters
|
|||
return $this->builder->orderBy('status_id', $dir)->orderBy('last_sent_date', $dir);
|
||||
}
|
||||
|
||||
if ($sort_col[0] == 'next_send_datetime') {
|
||||
$sort_col[0] = 'next_send_date';
|
||||
}
|
||||
|
||||
return $this->builder->orderBy($sort_col[0], $dir);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue