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 filters

Browse Source
This commit is contained in:
David Bomba 2024-04-30 22:48:57 +10:00
parent 567ae31067
commit 0c95361116
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Filters/RecurringExpenseFilters.php
View File

@ -146,14 +146,14 @@ class RecurringExpenseFilters extends QueryFilters
return $this->builder
->orderByRaw('ISNULL(client_id), client_id '. $sort_col[1])
->orderBy(\App\Models\Client::select('name')
->whereColumn('clients.id', 'expenses.client_id'), $sort_col[1]);
->whereColumn('clients.id', 'recurring_expenses.client_id'), $sort_col[1]);
}
if ($sort_col[0] == 'vendor_id' && in_array($sort_col[1], ['asc', 'desc'])) {
return $this->builder
->orderByRaw('ISNULL(vendor_id), vendor_id '. $sort_col[1])
->orderBy(\App\Models\Vendor::select('name')
->whereColumn('vendors.id', 'expenses.vendor_id'), $sort_col[1]);
->whereColumn('vendors.id', 'recurring_expenses.vendor_id'), $sort_col[1]);
}
@ -161,7 +161,7 @@ class RecurringExpenseFilters extends QueryFilters
return $this->builder
->orderByRaw('ISNULL(category_id), category_id '. $sort_col[1])
->orderBy(\App\Models\ExpenseCategory::select('name')
->whereColumn('expense_categories.id', 'expenses.category_id'), $sort_col[1]);
->whereColumn('expense_categories.id', 'recurring_expenses.category_id'), $sort_col[1]);
}
if($sort_col[0] == 'number') {