Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for recurring invoice filters

This commit is contained in:
David Bomba 2025-01-29 19:55:44 +11:00
parent 195901bf1c
commit fef4b6780d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Filters/RecurringInvoiceFilters.php
View File

@ -126,6 +126,10 @@ class RecurringInvoiceFilters extends QueryFilters
$sort_col = explode('|', $sort); $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'))) { if (!is_array($sort_col) || count($sort_col) != 2 || !in_array($sort_col[0], \Illuminate\Support\Facades\Schema::getColumnListing('recurring_invoices'))) {
return $this->builder; return $this->builder;
} }
@ -145,10 +149,6 @@ class RecurringInvoiceFilters extends QueryFilters
return $this->builder->orderBy('status_id', $dir)->orderBy('last_sent_date', $dir); 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); return $this->builder->orderBy($sort_col[0], $dir);
} }