Merge branch 'fronkdev' into 'master'

Finished MaintenanceNotification

See merge request fronk/thetool!730
This commit is contained in:
Frank Schubert
2024-11-13 17:16:08 +00:00
8 changed files with 465 additions and 14 deletions

View File

@@ -511,7 +511,18 @@ class ContractModel {
$where .= " AND (Contract.`product_name` like '%$product_name%' OR Product.name like '%$product_name%')";
}
}
if(array_key_exists("termination_id", $filter)) {
$termination_id = $filter['termination_id'];
if(is_array($termination_id)) {
if(count($termination_id)) {
$where .= " AND Contract.termination_id IN (".implode(",", $termination_id).")";
}
} elseif($termination_id) {
$termination_id = FronkDB::singleton()->escape($filter['termination_id']);
$where .= " AND Contract.termination_id = $termination_id";
}
}
if(array_key_exists("matchcode", $filter)) {
$matchcode = $db->escape($filter['matchcode']);