added Preorder filter

application/Preorder/PreorderModel.php

@@ -112,7 +112,16 @@ class PreorderModel {
     $db = FronkDB::singleton();
     
     $where = self::getSqlFilter($filter);
-    $res = $db->select("Preorder", "*", "$where ORDER BY lastname, firstname");
+    
+    $sql = "SELECT tt_preorder.* FROM `".FRONKDB_DBNAME."`.Preorder tt_preorder
+            LEFT JOIN `".ADDRESSDB_DBNAME."`.view_hausnummer as adb_hausnummer ON (tt_preorder.adb_hausnummer_id = adb_hausnummer.hausnummer_id)
+            WHERE $where
+            ORDER BY lastname, firstname
+      ";
+    
+    mfLoghandler::singleton()->debug($sql);
+    
+    $res = $db->query($sql);
     if($db->num_rows($res)) {
       while($data = $db->fetch_object($res)) {
         $items[] = new Preorder($data);
@@ -131,9 +140,6 @@ class PreorderModel {
       if(is_numeric($deleted)) {
         $where .= " AND deleted=$deleted";
       }
-      /*if($deleted === null) {
-        $where .= " AND deleted IS NULL";
-      }*/
     }
     
     if(array_key_exists("preordercampaign_id", $filter)) {
@@ -196,7 +202,30 @@ class PreorderModel {
     }
     
     
+    if(array_key_exists("gemeinde", $filter)) {
+      $gemeinde = FronkDB::singleton()->escape($filter['gemeinde']);
+      if($gemeinde) {
+        $where .= " AND `".ADDRESSDB_DBNAME."`.view_hausnummer.gemeinde like '%$gemeinde%'";
+      }
+    }
     
+    if(array_key_exists("plz", $filter)) {
+      $plz = FronkDB::singleton()->escape($filter['plz']);
+      if($plz) {
+        $where .= " AND `".ADDRESSDB_DBNAME."`.view_hausnummer.plz like '%$plz%'";
+      }
+    }
+    
+    if(array_key_exists("strasse", $filter)) {
+      $strasse = FronkDB::singleton()->escape($filter['strasse']);
+      if($strasse) {
+        $where .= " AND `".ADDRESSDB_DBNAME."`.view_hausnummer.strasse like '%$strasse%'";
+      }
+    }
+    
+    if(array_key_exists("add-where", $filter)) {
+      $where .= " ".$filter['add-where'];
+    }
     
     //var_dump($filter, $where);exit;
     return $where;