From 8e867992aa1983ba0c959f95dfa3365e81ab0202 Mon Sep 17 00:00:00 2001 From: Luca Haid Date: Tue, 19 Aug 2025 14:45:57 +0200 Subject: [PATCH] fixed fcp search --- application/Preorder/PreorderModel.php | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/application/Preorder/PreorderModel.php b/application/Preorder/PreorderModel.php index e6a416d7b..61bef9833 100644 --- a/application/Preorder/PreorderModel.php +++ b/application/Preorder/PreorderModel.php @@ -351,7 +351,7 @@ class PreorderModel } mfLoghandler::singleton()->debug($sql); - +die($sql); $res = $db->query($sql); if ($db->num_rows($res)) { @@ -1112,22 +1112,12 @@ class PreorderModel $db = FronkDB::singleton(); $campaign = new Preordercampaign($filter['preordercampaign_id']); if (is_array($fcp)) { - $items = array_map(fn($i) => ADBRimoFcp::getAll([ - 'netzgebiet_id' => intval($campaign->network->adb_netzgebiet_id), - 'name' => $i])[0], array_filter($fcp)); - - - - $items = array_map(fn($i) => $i->id, array_filter($items)); - if ($items) $where .= " AND adb_hausnummer.fcp_id IN (" . implode(',', $items) . ")"; + $where .= " AND adb_hausnummer.rimo_fcp_name IN ('" . implode("','", array_map(fn($i) => $db->escape($i), $fcp)) . "')"; } else { - $fcp = ADBRimoFcp::getAll([ - 'netzgebiet_id' => intval($campaign->network->adb_netzgebiet_id), - 'name' => $fcp]); - if ($fcp) $fcp = $fcp[0]->id; - else $fcp = null; - - $where .= " AND adb_hausnummer.rimo_fcp_name = '" . $db->escape($fcp) . "'"; + $fcp = $db->escape($fcp); + if ($fcp) { + $where .= " AND adb_hausnummer.rimo_fcp_name = '$fcp'"; + } } }