Added permission Preorderfront

application/Dashboard/DashboardController.php

@@ -11,8 +11,14 @@ class DashboardController extends mfBaseController {
   }
   
   protected function indexAction() {
+    
+    if($this->me->is("preorderfront")) {
+      $this->redirect("Preorder");
+    }
+    
     $newss = NewsModel::getAll();
     $this->layout()->set("newss", $newss);
+
   }
 
   

application/Preorder/PreorderController.php

@@ -106,6 +106,11 @@ class PreorderController extends mfBaseController {
       $new_filter['add-where'] .= " AND (adb_hausnummer.gemeinde like '%$address%' OR adb_hausnummer.plz like '%$address%' OR adb_hausnummer.strasse like '%$address%')";
     }
     
+    if(array_key_exists("hausnummer", $filter)) {
+      $hausnummer = $this->db()->escape($filter['hausnummer']);
+      $new_filter['hausnummer'] = $hausnummer;
+    }
+    
     if(array_key_exists("kunde", $filter)) {
       $kunde = $this->db()->escape($filter['kunde']);
       $new_filter['add-where'] .= " AND (company like '%$kunde%' OR firstname like '%$kunde%' OR lastname like '%$kunde%' OR street like '%$kunde%' OR zip like '%$kunde%' OR city like '%$kunde%')";
@@ -638,7 +643,7 @@ class PreorderController extends mfBaseController {
     $attribs[$attribute] = $value ? 1 : 0;
     $preorder->attributes = json_encode($attribs);
     if($preorder->save()) {
-      return ["id" => $preorder_id, "attribute" => $attribute];
+      return ["id" => $preorder_id, "attribute" => $attribute, "update" => date("d.m.Y H:i", $preorder->edit)];
     } else {
       $this->returnJson(["status" => "error", "result" => ["id" => $preorder_id, "attribute" => $attribute]]);
     }

application/Preorder/PreorderModel.php

@@ -217,6 +217,7 @@ class PreorderModel {
     
     $where = self::getSqlFilter($filter);
     $sql = "SELECT COUNT(*) as cnt FROM `".FRONKDB_DBNAME."`.Preorder tt_preorder
+            LEFT JOIN `".FRONKDB_DBNAME."`.Preorderstatus tt_preorderstatus ON (tt_preorder.status_id = tt_preorderstatus.id)
             LEFT JOIN `".ADDRESSDB_DBNAME."`.view_hausnummer as adb_hausnummer ON (tt_preorder.adb_hausnummer_id = adb_hausnummer.hausnummer_id)
             WHERE $where
       ";
@@ -443,6 +444,13 @@ class PreorderModel {
       }
     }
     
+    if(array_key_exists("hausnummer", $filter)) {
+      $hausnummer = FronkDB::singleton()->escape($filter['hausnummer']);
+      if($hausnummer) {
+        $where .= " AND adb_hausnummer.hausnummer like '%$hausnummer%'";
+      }
+    }
+    
     if(array_key_exists("attributes", $filter)) {
       $attributes = FronkDB::singleton()->escape($filter['attributes']);
       if(is_array($attributes) && count($attributes)) {

application/User/UserController.php

@@ -178,6 +178,12 @@ class UserController extends mfBaseController {
         $user->permissions->technician = "false";
       }
       
+      if($r->preorderfront == "true") {
+        $user->permissions->preorderfront = "true";
+      } else {
+        $user->permissions->preorderfront = "false";
+      }
+      
       $user->permissions->save();
     }
     

application/WorkerPermission/WorkerPermission.php

@@ -4,6 +4,7 @@ class WorkerPermission extends mfBaseModel {
   public $isAdmin = false;
   public $isTicketadmin = false;
   public $isTechnician = false;
+  public $isPreorderfront = false;
   
   public function loadByUserId($userid) {
     $res = $this->db->select($this->table,"*","worker_id=$userid");
@@ -29,6 +30,9 @@ class WorkerPermission extends mfBaseModel {
     if($this->technician == 'true') {
       $this->isTechnician = true;
     }
+    if($this->preorderfront == 'true') {
+      $this->isPreorderfront= true;
+    }
   }
 
 }