Added order position deletion; added fontawesome pro

application/Address/AddressController.php

@@ -306,7 +306,7 @@ class AddressController extends mfBaseController {
       $result = ['value' => $id, 'text' => $address->getCompanyOrName()." (".$address->zip." ".$address->city.", ".$address->street.")".(($address->customer_number) ? " [".$address->customer_number."]" : "")];
       $results[] = $result;
       if(count($results) > 5) {
-        $results[] = ['value' => 0, 'text' =>  "&nbsp;&nbsp;--> &nbsp;&nbsp;Mehr Suchergebnisse vorhanden. Bitte Suchebegriff genauer definieren &nbsp;&nbsp;<--"];
+        $results[] = ['value' => 0, 'text' =>  "&nbsp;&nbsp;--> &nbsp;&nbsp;Mehr Suchergebnisse vorhanden. Bitte Suchbegriff genauer definieren &nbsp;&nbsp;<--"];
         break;
       }
     }

application/Building/BuildingController.php

@@ -349,8 +349,11 @@ class BuildingController extends mfBaseController {
     $data = [];
     
     switch($do) {
-      case "findBuildings":
-        $return = $this->findBuildingsApi();
+      case "getFilteredBuildings":
+        $return = $this->getFilteredBuildingsApi();
+        break;
+      case 'findBuildings':
+        $return = $this->findBuildings();
         break;
       default:
         $return = false;
@@ -365,7 +368,7 @@ class BuildingController extends mfBaseController {
     $this->returnJson($data);
   }
   
-  private function findBuildingsApi() {
+  private function getFilteredBuildingsApi() {
     $buildings = [];
     $filter = $this->request->filter;
     
@@ -381,4 +384,55 @@ class BuildingController extends mfBaseController {
     return ["buildings" => $buildings];
   }
   
+  private function findBuildings() {
+    $buildings = [];
+    $network_id = $this->request->network_id;
+    $search = $this->request->search;
+    
+    foreach(BuildingModel::search(['network_id' => $network_id, 'street' => $search]) as $b) {
+      $buildings[$b->id] = $b;
+    }
+    foreach(BuildingModel::search(['network_id' => $network_id, 'code' => $search]) as $b) {
+      $buildings[$b->id] = $b;
+    }
+    foreach(BuildingModel::search(['network_id' => $network_id, 'oan_id' => $search]) as $b) {
+      $buildings[$b->id] = $b;
+    }
+    foreach(BuildingModel::search(['network_id' => $network_id, 'zip' => $search]) as $b) {
+      $buildings[$b->id] = $b;
+    }
+    foreach(BuildingModel::search(['network_id' => $network_id, 'city' => $search]) as $b) {
+      $buildings[$b->id] = $b;
+    }
+    
+    $unsorted = [];
+    
+    foreach($buildings as $building) {
+      $u = [];
+      $u['id'] = $building->id;
+      $u['street'] = $building->street;
+      $u['zip'] = $building->zip;
+      $u['city'] = $building->city;
+      $u['oan_id'] = $building->oan_id;
+      $u['code'] = $building->code;
+      $u['status'] = $building->status->name;
+      $unsorted[$building->street."-".$building->id] = $u;
+    }
+    
+    //var_dump($unsorted);exit;
+    
+    ksort($unsorted);
+    
+    $results = [];
+    foreach($unsorted as $r) {
+      $results[] = $r;
+      if(count($results) >= 20) {
+        break;
+      }
+    }
+    
+    return ["count" => count($buildings), "buildings" => $results];
+    
+  }
+  
 }

application/Building/BuildingModel.php

@@ -215,6 +215,13 @@ class BuildingModel {
       }
     }
     
+    if(array_key_exists("oan_id", $filter)) {
+      $oan_id = FronkDB::singleton()->escape($filter['oan_id']);
+      if($oan_id) {
+        $where .= " AND Building.`oan_id` like '%$oan_id%'";
+      }
+    }
+    
     if(array_key_exists("street", $filter)) {
       $street = FronkDB::singleton()->escape($filter["street"]);
       if($street) {

application/Order/OrderController.php

@@ -619,6 +619,12 @@ class OrderController extends mfBaseController {
           continue;
         }
         
+        if($p['delete'] == 1) {
+          $product = new OrderProduct($product_id);
+          $product->delete();
+          continue;
+        }
+        
         $prod = new Product($p['product_id']);
         if(!$prod->id) {
           $this->log->warn(__CLASS__."::save() Invalid product: ".$p['product_id']);

application/Preorder/Preorder.php

@@ -1,54 +1,5 @@
 <?php
 
 class Preorder extends mfBaseModel {
-  private $network;
   
-  
-  public function getProperty($name) {
-    if($this->$name == null) {
-      
-      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") {
-        $user = mfValuecache::singleton()->get("Worker-id-".$this->edit_by);
-        if($user) {
-          $this->editor = $user;
-          return $this->editor;
-        }
-        $this->editor = new User($this->edit_by);
-        if($this->editor->id) {
-          mfValuecache::singleton()->set("Worker-id-".$this->edit_by, $this->editor);
-        }
-        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

@@ -9,16 +9,25 @@ class PreorderController extends mfBaseController {
     $this->me = $me;
     $this->layout()->set("me",$me);
     
-    if(!$me->is(["Admin"])) {
+    if(!$me->is(["Admin", "salespartner"])) {
       $this->redirect("Dashboard");
     }
   }
   
-  protected function indexAction() {
-    $this->layout()->setTemplate("Preorder/Index");
+  protected function addAction() {
+    $this->layout()->setTemplate("Preorder/Form");
     
-    $campaigns = PreorderModel::getAll();
-    $this->layout()->set("campaigns", $campaigns);
+    if($this->me->isAdmin()) {
+      $this->layout()->set("networks", NetworkModel::getAll());
+    } else {
+      $this->layout()->set("networks", $this->me->my_networks);
+    }
     
+    $this->layout()->set("types", BuildingtypeModel::getAll());
+    $this->layout()->set("statuses", BuildingstatusModel::getAll());
+    
+    $this->layout()->set("networksections", NetworksectionModel::getAll());
   }
+  
+  
 }

application/Preorder/PreorderModel.php

@@ -22,6 +22,10 @@ class PreorderModel {
     
     foreach($data as $field => $value) {
       if(property_exists(get_called_class(), $field)) {
+        if(substr($field, 0, 5) == "vlan_" && !$value) {
+          $model->$field = null;
+          continue;
+        }
         $model->$field = $value;
       }
     }
@@ -43,12 +47,13 @@ class PreorderModel {
     return $model;
   }
   
+  
   public static function getAll() {
     $items = [];
     
     $db = FronkDB::singleton();
     
-    $res = $db->select("Preorder", "*", "ORDER BY `create`");
+    $res = $db->select("Preorder", "*");
     if($db->num_rows($res)) {
       while($data = $db->fetch_object($res)) {
         $items[] = new Preorder($data);
@@ -62,7 +67,7 @@ class PreorderModel {
     $db = FronkDB::singleton();
     
     $where = self::getSqlFilter($filter);
-    $res = $db->select("Preorder", "*", "$where ORDER BY `create`");
+    $res = $db->select("Preorder", "*", "$where ORDER BY name, network_id");
     if($db->num_rows($res)) {
       $data = $db->fetch_object($res);
       $item = new Preorder($data);
@@ -80,7 +85,7 @@ class PreorderModel {
     $db = FronkDB::singleton();
     
     $where = self::getSqlFilter($filter);
-    $res = $db->select("Preorder", "*", "$where ORDER BY `create`");
+    $res = $db->select("Preorder", "*", "$where ORDER BY name, network_id");
     if($db->num_rows($res)) {
       while($data = $db->fetch_object($res)) {
         $items[] = new Preorder($data);

application/Preordercampaign/Preordercampaign.php

@@ -0,0 +1,60 @@
+<?php
+
+class Preordercampaign extends mfBaseModel {
+  private $network;
+  private $preorders;
+  
+  
+  public function getProperty($name) {
+    if($this->$name == null) {
+      
+      if($name == "preorders") {
+        $this->preorders = PreorderModel::search(['preordercampaign_id' => $this->id]);
+        return $this->preorders;
+      }
+      
+      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") {
+        $user = mfValuecache::singleton()->get("Worker-id-".$this->edit_by);
+        if($user) {
+          $this->editor = $user;
+          return $this->editor;
+        }
+        $this->editor = new User($this->edit_by);
+        if($this->editor->id) {
+          mfValuecache::singleton()->set("Worker-id-".$this->edit_by, $this->editor);
+        }
+        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/Preordercampaign/PreordercampaignController.php

@@ -0,0 +1,96 @@
+<?php
+
+class PreordercampaignController extends mfBaseController {
+  
+  protected function init() {
+    $this->needlogin=true;
+    $me = new User();
+    $me->loadMe();
+    $this->me = $me;
+    $this->layout()->set("me",$me);
+    
+    if(!$me->is(["Admin", "salespartner"])) {
+      $this->redirect("Dashboard");
+    }
+  }
+  
+  protected function indexAction() {
+    $this->layout()->setTemplate("Preordercampaign/Index");
+    
+    if($this->me->is("Admin")) {
+      if($filter['network_id']) {
+        $my_networks[] = new Network($filter['network_id']);
+      } else {
+        $my_networks = NetworkModel::getAll();
+      }
+      $this->layout()->set("mynetworks", NetworkModel::getAll());
+    } else {
+      $use_filter_network = false;
+      $my_networks = $this->me->my_networks;
+      
+      foreach($my_networks as $mn) {
+        if($mn->id == $filter['network_id']) {
+          $use_filter_network = true;
+          continue;
+        }
+      }
+      
+      if($use_filter_network) {
+        $my_networks = [];
+        $my_networks[] = new Network($filter['network_id']);
+      }
+      
+      $this->layout()->set("mynetworks", $this->me->my_networks);
+      
+    }
+    unset($filter['network_id']);
+    
+    $campaigns = PreordercampaignModel::search(['network_id' => $my_networks]);
+    $this->layout()->set("campaigns", $campaigns);
+    
+  }
+  
+  private function getPreparedFilter($filter) {
+    $new_filter = [];
+    
+    foreach($filter as $name => $value) {
+      $new_filter[$name] = $value;
+    }
+    
+    return $new_filter;
+  }
+  
+  protected function addAction() {
+    $this->layout()->setTemplate("Preordercampaign/Form");
+    
+    if($this->me->isAdmin()) {
+      $this->layout()->set("networks", NetworkModel::getAll());
+    } else {
+      $this->layout()->set("networks", $this->me->my_networks);
+    }
+    
+    $this->layout()->set("types", BuildingtypeModel::getAll());
+    $this->layout()->set("statuses", BuildingstatusModel::getAll());
+    
+    $this->layout()->set("networksections", NetworksectionModel::getAll());
+  }
+  
+  protected function editAction() {
+    $id = $this->request->id;
+    if(!is_numeric($id) || !$id) {
+      $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
+      $this->redirect("Preordercampain");
+    }
+    
+    $campaign = new Preordercampaign($id);
+    if(!$campain->id) {
+      $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
+      $this->redirect("Preordercampain");
+    }
+    
+    $this->layout()->set("campaign", $campaign);
+    
+    return $this->addAction();
+  }
+  
+}

application/Preordercampaign/PreordercampaignModel.php

@@ -0,0 +1,109 @@
+<?php
+
+class PreordercampaignModel {
+  public $name = null;
+  public $network_id = null;
+  public $gps_lat = null;
+  public $gps_long = null;
+  public $location = null;
+  public $vlan_public = null;
+  public $vlan_nat = null;
+  public $vlan_ipv6 = null;
+  
+  public $note = null;
+  
+  public $create_by = null;
+  public $edit_by = null;
+  public $create = null;
+  public $edit = null;
+  
+  public static function create(Array $data) {
+    $model = new Preordercampaign();
+    
+    foreach($data as $field => $value) {
+      if(property_exists(get_called_class(), $field)) {
+        $model->$field = $value;
+      }
+    }
+    
+    $me = mfValuecache::singleton()->get("me");
+    if(!$me) {
+      $me = new User();
+      $me->loadMe();
+      mfValuecache::singleton()->set("me", $me);
+    }
+
+    if($model->create_by === null) {
+      $model->create_by = $me->id;
+    }
+    if($model->edit_by === null) {
+      $model->edit_by = $me->id;
+    }
+    
+    return $model;
+  }
+  
+  public static function getAll() {
+    $items = [];
+    
+    $db = FronkDB::singleton();
+    
+    $res = $db->select("Preordercampaign", "*", "ORDER BY `create`");
+    if($db->num_rows($res)) {
+      while($data = $db->fetch_object($res)) {
+        $items[] = new Preordercampaign($data);
+      }
+    }
+    return $items;
+    
+  }
+  
+  public static function getFirst() {
+    $db = FronkDB::singleton();
+    
+    $where = self::getSqlFilter($filter);
+    $res = $db->select("Preordercampaign", "*", "$where ORDER BY `create`");
+    if($db->num_rows($res)) {
+      $data = $db->fetch_object($res);
+      $item = new Preordercampaign($data);
+      if($item->id) {
+        return $item;
+      } else {
+        return null;
+      }
+    }
+    return null;
+  }
+  
+  public static function search($filter) {
+    $items = [];
+    $db = FronkDB::singleton();
+    
+    $where = self::getSqlFilter($filter);
+    $res = $db->select("Preordercampaign", "*", "$where ORDER BY `create`");
+    if($db->num_rows($res)) {
+      while($data = $db->fetch_object($res)) {
+        $items[] = new Preordercampaign($data);
+      }
+    }
+    return $items;
+  }
+  
+  private function getSqlFilter($filter) {
+    $where = "1=1 ";
+
+    //var_dump($filter);exit;
+    if(array_key_exists("network_id", $filter)) {
+      $networkid = $filter['network_id'];
+      if(is_numeric($networkid)) {
+        $where .= " AND network_id=$networkid";
+      } elseif(is_array($network_id) && count($network_id)) {
+        $where .= " AND network_id IN (". implode(",", $network_id).")";
+      }
+    }
+    
+    //var_dump($filter, $where);exit;
+    return $where;
+  }
+  
+}