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

Updates for expense filters

Browse Source
This commit is contained in:
David Bomba 2024-05-09 11:42:52 +10:00
parent e248e96868
commit 4b397b5b39
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Filters/ExpenseFilters.php
View File

@ -107,6 +107,12 @@ class ExpenseFilters extends QueryFilters
$query->whereNull('payment_date'); $query->whereNull('payment_date');
}); });
} }
if(in_array('uncategorized', $status_parameters)){
$query->orWhere(function ($query){
$query->whereNull('category_id');
});
}
}); });
// nlog($this->builder->toSql()); // nlog($this->builder->toSql());
@ -200,7 +206,7 @@ class ExpenseFilters extends QueryFilters
return $this->builder->orderByRaw("REGEXP_REPLACE(number,'[^0-9]+','')+0 " . $dir); return $this->builder->orderByRaw("REGEXP_REPLACE(number,'[^0-9]+','')+0 " . $dir);
} }
if (is_array($sort_col) && in_array($sort_col[1], ['asc', 'desc']) && in_array($sort_col[0], ['public_notes', 'date', 'id_number', 'custom_value1', 'custom_value2', 'custom_value3', 'custom_value4'])) { if (is_array($sort_col) && in_array($sort_col[1], ['asc', 'desc']) && in_array($sort_col[0], ['amount', 'public_notes', 'date', 'id_number', 'custom_value1', 'custom_value2', 'custom_value3', 'custom_value4'])) {
return $this->builder->orderBy($sort_col[0], $sort_col[1]); return $this->builder->orderBy($sort_col[0], $sort_col[1]);
} }