Merge branch 'Preorder/fix-rimo-filter' into 'master'
fixed rimo filter preorder See merge request fronk/thetool!1711
This commit is contained in:
@@ -926,6 +926,10 @@ class PreorderModel
|
||||
|
||||
if (array_key_exists("rimo_workorder_status", $filter)) {
|
||||
$rimo_workorder_status = $filter['rimo_workorder_status'];
|
||||
if (is_array($rimo_workorder_status) && in_array('canceled', $rimo_workorder_status) && !in_array('cancelled', $rimo_workorder_status)) {
|
||||
$rimo_workorder_status[] = 'cancelled';
|
||||
}
|
||||
|
||||
if (is_array($rimo_workorder_status) && count($rimo_workorder_status)) {
|
||||
$rimo_workorder_status = array_map(function ($value) {
|
||||
return FronkDB::singleton()->escape($value);
|
||||
|
||||
Reference in New Issue
Block a user