diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 3dd4a5910..a3dd4ed17 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -282,14 +282,15 @@ $pagination_entity_name = "Vorbestellungen";
-
@@ -472,6 +473,7 @@ $pagination_entity_name = "Vorbestellungen";
$("#filter_status").select2({closeOnSelect: false});
$("#filter_partner_id").select2({closeOnSelect: false});
$("#connection_type_id").select2({closeOnSelect: false});
+ $("#filter_rimo_workorder_status").select2({closeOnSelect: false});
var attributes = ["bep_specified", "inhouse_cabling_supplied"];
diff --git a/application/Preorder/PreorderModel.php b/application/Preorder/PreorderModel.php
index b57550c3e..84f0da5fa 100644
--- a/application/Preorder/PreorderModel.php
+++ b/application/Preorder/PreorderModel.php
@@ -709,9 +709,15 @@ class PreorderModel {
}
if(array_key_exists("rimo_workorder_status", $filter)) {
- $rimo_workorder_status = FronkDB::singleton()->escape($filter['rimo_workorder_status']);
- if($rimo_workorder_status) {
- $where .= " AND workorder.rimo_status = '$rimo_workorder_status'";
+ $rimo_workorder_status = $filter['rimo_workorder_status'];
+ if (is_array($rimo_workorder_status) && count($rimo_workorder_status)) {
+ $rimo_workorder_status = array_map(function($value) {
+ return FronkDB::singleton()->escape($value);
+ }, $filter['rimo_workorder_status']);
+ $where .= " AND workorder.rimo_status IN ('".implode("','", $rimo_workorder_status)."')";
+ } else if($rimo_workorder_status) {
+ $rimo_workorder_status = FronkDB::singleton()->escape($rimo_workorder_status);
+ $where .= " AND workorder.rimo_status = '$rimo_workorder_status'";
}
}