Merge branch 'fronkdev' into 'master'

2024-02 RML address updates

See merge request fronk/thetool!265

application/Preorder/Preorder.php

@@ -149,9 +149,14 @@ class Preorder extends mfBaseModel {
     }
     
     if($this->adb_hausnummer_id) {
-      foreach(PreorderModel::search(["deleted" => 0, "adb_hausnummer_id" => $this->adb_hausnummer_id, "<status_code" => $status->code]) as $preorder) {
+      foreach(PreorderModel::searchActive(["adb_hausnummer_id" => $this->adb_hausnummer_id, "<status_code" => $status->code]) as $preorder) {
+        if($preorder->deleted) continue;
         if($preorder->id == $this->id) continue;
         
+        // load status explicitly to work around 
+        // visibility in different instances of same class
+        $tmp_s = $preorder->getProperty("status");
+        
         /*if(!$preorder->status->code || !$status->code) {
           $this->log->debug("Preorder->status->code". print_r($preorder->status, true));
           $this->log->debug("Status->code". print_r($status->code, true));
@@ -287,7 +292,7 @@ class Preorder extends mfBaseModel {
         $oaid->unit_string = (string)$wohneinheit;
         //var_dump($oaid);exit;
         if(!$oaid->save()) {
-          $this->log->error("Fehler beim Speichern der OAID für Preorder ".$preorder->id);
+          $this->log->error("Fehler beim Speichern der OAID für Preorder ".$this->id);
           $this->redirect("Preordercampaign", "Admin");
         }
         if(!$this->save()) {

application/Preorder/PreorderModel.php

@@ -440,10 +440,10 @@ class PreorderModel {
     
     if(array_key_exists("deleted", $filter)) {
       $deleted = $filter['deleted'];
-      if(is_numeric($deleted)) {
-        $where .= " AND deleted=$deleted";
-      } elseif($deleted == null) {
+      if($deleted === null || $deleted === false) {
         $where .= " AND (deleted IS NULL OR deleted = 0)";
+      } elseif($deleted) {
+        $where .= " AND deleted > 0";
       }
     }