Added owner_address filter to Order/Index

application/Order/OrderModel.php

@@ -240,6 +240,14 @@ class OrderModel {
         $where .= " AND (Address.company like '%$owner%' OR Address.firstname like '%$owner%' OR Address.lastname like '%$owner%' OR Address.customer_number like '%$owner%')";
       }
     }
+    
+    if(array_key_exists("owner_address", $filter)) {
+      $owner_address = FronkDB::singleton()->escape($filter['owner_address']);
+      if($owner_address) {
+        $where .= " AND (Address.street like '%$owner_address%' OR Address.zip like '%$owner_address%' OR Address.city like '%$owner_address%')";
+      }
+    }
+    
     /*
     if(array_key_exists("owner", $filter)) {
       $owner = FronkDB::singleton()->escape($filter['owner']);

application/Preorder/Preorder.php

@@ -1,5 +1,59 @@
 <?php
 
 class Preorder extends mfBaseModel {
+  private $campaign;
+  private $partner;
   
+  public function getProperty($name) {
+    if($this->$name == null) {
+      
+      if($name == "campaign") {
+        $this->campaign = new Preordercampaign($this->id);
+        return $this->campaign;
+      }
+      
+      if($name == "partner") {
+        $this->partner = mfValuecache::singleton()->get("mfObjectmodel-Address-".$this->partner_id);
+        if(!$this->partner) {
+          $this->partner = new Address($this->partner_id);
+          mfValuecache::singleton()->set("mfObjectmodel-Address-".$this->partner_id, $this->partner);
+        }
+        return $this->partner;
+      }
+      
+      if($name == "creator") {
+        $user = mfValuecache::singleton()->get("Worker-id-".$this->create_by);
+        if($user) {
+          $this->creator = $user;
+          return $this->creator;
+        }
+        $this->creator = new User($this->create_by);
+        if($this->creator->id) {
+          mfValuecache::singleton()->set("Worker-id-".$this->create_by, $this->creator);
+        }
+        return $this->creator;
+      }
+      
+      if($name == "editor") {
+        $this->editor = new User($this->edit_by);
+        return $this->editor;
+      }
+      
+      $classname = ucfirst($name);
+      $idfield = $name."_id";
+      $this->$name = mfValuecache::singleton()->get("mfObjectmodel-$name-".$this->$idfield);
+      if(!$this->$name) {
+        $this->$name = new $classname($this->$idfield);
+      }
+      
+      if($this->$name->id) {
+        mfValuecache::singleton()->set("mfObjectmodel-$name-".$this->$name->id, $this->$name);
+        return $this->$name;
+      } else {
+        return null;
+      }
+    }
+    
+    return $this->$name;
+  }
 }

application/Preorder/PreorderController.php

@@ -15,6 +15,23 @@ class PreorderController extends mfBaseController {
   }
   
   protected function indexAction() {
+    $this->layout()->setTemplate("Preorder/Index");
+    
+    $campaign_filter = [];
+    
+    if($this->request->campaign_id) {
+      $campaign_id = $this->request->campaign_id;
+      if(is_numeric($campaign_id) && $campaign_id > 0) {
+        $campaign = new Preordercampaign($ampaign);
+        $this->layout()->set("campaign", $campaign);
+      }
+      
+      $campaign_filter["preordercampaign_id"] = $campaign_id;
+    }
+    
+    $preorders = PreorderModel::search($campaign_filter);
+    $this->layout()->set("preorders", $preorders);
+    
     
   }
   

application/Preordercampaign/PreordercampaignController.php

@@ -159,7 +159,8 @@ class PreordercampaignController extends mfBaseController {
     }
     
     $this->layout()->setFlash("Vorbestellkampagne erfolgreich gespeichert.", "success");
-    $this->redirect("Preordercampaign", "Edit", ['id' => $new_id]);
+    //$this->redirect("Preordercampaign", "Edit", ['id' => $new_id]);
+    $this->redirect("Preordercampaign");
     
   }