Made different Layouts more customizable

Layout/andom-tec/menu.php

@@ -66,6 +66,7 @@
         </li>
         <?php endif; ?>
         
+        <!--
         <?php if($me->is(["Admin"])): ?>
         <li class="has-submenu">
           <a href="#">
@@ -76,7 +77,7 @@
           </ul>
         </li>
         <?php endif; ?>
-        
+        -->
         <?php if($me->is(["Admin","salespartner"])): ?>
         <li class="has-submenu">
           <a href="#">
@@ -84,7 +85,7 @@
           </a>
           <ul class="submenu">
             <?php if($me->is(["Admin"])): ?>
-              <li><a href="<?=self::getUrl("Preordercampaign")?>"><i class="far fa-calendar-lines text-info"></i> Vorbestellung</a></li>
+              <!--<li><a href="<?=self::getUrl("Preordercampaign")?>"><i class="far fa-calendar-lines text-info"></i> Vorbestellung</a></li>-->
             <?php endif; ?>
             <li><a href="<?=self::getUrl("Order")?>"><i class="far fa-file-signature text-info"></i> Bestellungen</a></li>
           </ul>

Layout/default/Address/Form.php

@@ -1,4 +1,4 @@
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/Building/Form.php

@@ -1,4 +1,4 @@
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
     <!-- start page title -->
     <div class="row">
       <div class="col-12">

Layout/default/Building/Index.php

@@ -3,7 +3,7 @@
   $pagination_baseurl_params = ["filter" => $filter];
   $pagination_entity_name = "Objekte & Anschlüsse";
 ?>
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
 
 

Layout/default/Contractconfig/Index.php

@@ -1,7 +1,7 @@
 <?php
   $siteTitle = "Benutzer";
 ?>
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/Cpeprovisioning/Index.php

@@ -1,4 +1,4 @@
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/Cpeshipping/History.php

@@ -1,4 +1,4 @@
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/Cpeshipping/Index.php

@@ -3,7 +3,7 @@
   $pagination_baseurl_params = ["filter" => $filter];
   $pagination_entity_name = "CPEs";
 ?>
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/Dashboard/Index.php

@@ -1,4 +1,4 @@
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/Linework/Index.php

@@ -3,7 +3,7 @@
   $pagination_baseurl_params = ["filter" => $filter];
   $pagination_entity_name = "Leitungsbauaufträge";
 ?>
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 <?php $wftype = "term"; ?>
 
 

Layout/default/Network/Form.php

@@ -1,4 +1,4 @@
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/Network/Index.php

@@ -3,7 +3,7 @@
   $pagination_baseurl_params = ["filter" => $filter];
   $pagination_entity_name = "Netzgebiete";
 ?>
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/News/Index.php

@@ -1,4 +1,4 @@
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/Order/Form.php

@@ -2,7 +2,7 @@
   //var_dump($order);exit;
   $includes_external_product = false;
 ?>
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">
@@ -701,8 +701,9 @@
               <div class="card">
                 <div class="card-body">
                   
-                  <?php if(TT_FEATURE_IVT): ?>
+                  
                   <?php if($me->is("Admin", "netoperator")): ?>
+                    <?php if(TT_FEATURE_IVT): ?>
                     <?php if($order->id && !$includes_external_product): ?>
                     <div class="form-group row">
                       <label class="col-lg-2"></label>

Layout/default/Order/Index.php

@@ -17,7 +17,7 @@
 	//var_dump($sorted_networks);exit;
 
 ?>
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/Patching/Index.php

@@ -3,7 +3,7 @@
   $pagination_baseurl_params = ["filter" => $filter];
   $pagination_entity_name = "Patchungen";
 ?>
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/Pipework/Index.php

@@ -3,7 +3,7 @@
   $pagination_baseurl_params = ["filter" => $filter];
   $pagination_entity_name = "Tiefbauaufträge";
 ?>
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 <?php $wftype = "building"; ?>
 
 

Layout/default/Pop/Form.php

@@ -1,4 +1,4 @@
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/Preorder/Form.php

@@ -1,4 +1,4 @@
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
     <!-- start page title -->
     <div class="row">
       <div class="col-12">

Layout/default/Preordercampaign/Form.php

@@ -0,0 +1,121 @@
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
+    <!-- start page title -->
+    <div class="row">
+      <div class="col-12">
+        <div class="page-title-box">
+          <div class="page-title-right">
+            <ol class="breadcrumb m-0">
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Preordercampaign")?>">Vorbestellkampagnen</a></li>
+              <li class="breadcrumb-item active"><?=($Action=="add") ? "neu" : "bearbeiten"?></li>
+            </ol>
+          </div>
+          <h4 class="page-title">Vorbestellkampagne</h4>
+        </div>
+      </div>
+    </div>
+    <!-- end page title -->
+    
+    <div class="row">
+      <div class="col-lg-12">
+        
+        <div class="card">
+          <div class="card-body">
+            <h4 class="header-title mb-2"><?=($Action=="add") ? "Neue " : ""?>Vorbestellkampagne <?=($Action=="edit") ? "bearbeiten " : ""?></h4>
+        
+            <form class="form-horizontal" method="post" action="<?=self::getUrl("Preordercampaign", "save")?>">
+              <input type="hidden" name="id" value="<?=$campaign->id?>" />
+
+              <div class="card">
+                <div class="card-body">
+
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="network_id">Netzgebiet *</label>
+                    <div class="col-lg-10">
+                      <select class="select2 form-control " name="network_id" id="network_id">
+                        <option></option>
+                        <?php foreach($networks as $network): ?>
+                          <option value="<?=$network->id?>" <?=($campaign->network_id == $network->id) ? "selected='selected'" : ""?>><?=($network->name)?></option>
+                        <?php endforeach; ?>
+                      </select>
+                    </div>
+                  </div>
+
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="name">Name *</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="name" id="name" value="<?=$campaign->name?>" />
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="description">Info</label>
+                    <div class="col-lg-10">
+                      <textarea class="form-control" style="height:120px;" name="description"><?=$campaign->description?></textarea>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="area">Gebiet *</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="area" id="area" value="<?=$campaign->area?>" />
+                    </div>
+                  </div>
+                  
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="from">Von</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="from" id="from" value="<?=($campaign->from) ? date('d.m.Y', $campaign->from) : ""?>" />
+                    </div>
+                  </div>
+                  
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="to">Bis</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="to" id="to" value="<?=($campaign->to) ? date('d.m.Y', $campaign->to) : ""?>" />
+                    </div>
+                  </div>
+                  
+                </div>
+              </div>
+
+
+
+              <div class="card">
+                <div class="card-body">
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="note">Interne Notiz</label>
+                    <div class="col-lg-10">
+                      <textarea class="form-control" style="height:120px;" name="note"><?=$campaign->note?></textarea>
+                    </div>
+                  </div>
+                </div>
+              </div>
+
+              <div class="form-group row">
+                <label class="col-lg-2"></label>
+                <div class="col-lg-10">
+                  <button type="submit" class="btn btn-primary">Speichern</button>
+                </div>
+              </div>
+
+
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+
+
+<script type="text/javascript">
+  $('.datepicker').datepicker({
+      language: 'de',
+      format: "dd.mm.yyyy",
+      showWeekDays: true,
+      todayBtn: 'linked',
+      autoclose: true
+  });
+</script>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/Preordercampaign/Index.php

@@ -1,4 +1,4 @@
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">
@@ -23,7 +23,7 @@
           <div class="card-body mb-3">
             <h4 class="header-title mb-3">Filter</h4>
             
-            <form method="get" action="<?=self::getUrl("Address")?>">
+            <form method="get" action="<?=self::getUrl("Preordercampaign")?>">
               <div class="row">
                 
                 <div class="col-2">
@@ -50,7 +50,7 @@
               <div class="row mt-2">
                 <div class="col">
                   <button type="submit" class="btn btn-primary">Filter anwenden</button>
-                  <a class="btn btn-secondary" href="<?=self::getUrl("Preorder")?>">Filter zurücksetzen</a>
+                  <a class="btn btn-secondary" href="<?=self::getUrl("Preordercampaign")?>">Filter zurücksetzen</a>
                 </div>
               </div>
             </form>
@@ -72,6 +72,7 @@
             
             <table class="table table-striped table-hover">
               <tr>
+                <th></th>
                 <th>Netzgebiete</th>
                 <th>Name</th>
                 <th>Gebiet</th>
@@ -80,17 +81,25 @@
                 <th>Ende</th>
                 <th></th>
               </tr>
-              <?php foreach($campaigns as $cam): ?>
+              <?php foreach($campaigns as $camp): ?>
               <tr>
+                <td class="text-right">
+                  <?php if(date('U') >= $camp->from && date('U') <= $camp->to): ?>
+                  <span class="fa-stack" title="Vorbestellkampagne aktiv">
+                    <i class="fas fa-alarm-clock fa-stack-1x text-success" style="z-index: 20;"></i>
+                    <i class="fas fa-circle-check" style="color: Tomato; vertical-align: top; font-size: 0.7em; padding-right:4px; padding-top:4px; z-index: 10;"></i>
+                  </span>
+                  <?php endif; ?>
+                </td>
                 <td><?=$camp->network->name?></td>
                 <td><?=$camp->name?></td>
                 <td><?=$camp->area?></td>
-                <td><?=count($camp->preorders)?></td>
-                <td><?=date('d.m.Y',$camp->start)?></td>
-                <td><?=date('d.m.Y',$camp->end)?></td>
+                <td><a href="<?=self::getUrl("Preorder", "Index", ["filter" => ["campaign_id" => $camp->id]])?>"><?=count($camp->preorders)?></a></td>
+                <td><?=date('d.m.Y',$camp->from)?></td>
+                <td><?=date('d.m.Y',$camp->to)?></td>
                 <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
-                  <a href="<?=self::getUrl("Preorder", "edit", ["id" => $camp->id])?>"><i class="far fa-edit"  title="Vorbestellkampagne Bearbeiten"></i></a>
-                  <a href="<?=self::getUrl("Preorder", "delete", ["id" => $camp->id])?>" class="text-danger" onclick="if(!confirm('Vorbestellkampagne wirklich löschen?')) return false;" title="Vorbestellkampagne Löschen"><i class="fas fa-trash"></i></a>
+                  <a href="<?=self::getUrl("Preordercampaign", "edit", ["id" => $camp->id])?>"><i class="far fa-edit"  title="Vorbestellkampagne Bearbeiten"></i></a>
+                  <a href="<?=self::getUrl("Preordercampaign", "delete", ["id" => $camp->id])?>" class="text-danger" onclick="if(!confirm('Vorbestellkampagne wirklich löschen?')) return false;" title="Vorbestellkampagne Löschen"><i class="fas fa-trash"></i></a>
                 </td>
               </tr>
               <?php endforeach; ?>

Layout/default/Product/Form.php

@@ -1,4 +1,4 @@
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/Product/Index.php

@@ -3,7 +3,7 @@
   $pagination_baseurl_params = ["filter" => $filter];
   $pagination_entity_name = "Produkte";
 ?>
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/Producttech/Form.php

@@ -1,4 +1,4 @@
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
     <!-- start page title -->
     <div class="row">
       <div class="col-12">

Layout/default/Producttech/Index.php

@@ -1,4 +1,4 @@
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/User/Form.php

@@ -1,7 +1,7 @@
 <?php
   $siteTitle = "Benutzer";
 ?>
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/User/Index.php

@@ -5,7 +5,7 @@
   $pagination_baseurl_params = ["filter" => $filter];
   $pagination_entity_name = "Benutzer";
 ?>
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

Layout/default/Voicenumber/Form.php

@@ -1,4 +1,4 @@
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
     <!-- start page title -->
     <div class="row">
       <div class="col-12">

Layout/default/Voicenumberblock/Form.php

@@ -1,4 +1,4 @@
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
     <!-- start page title -->
     <div class="row">
       <div class="col-12">

Layout/default/Voicenumberblock/Index.php

@@ -3,7 +3,7 @@
   $pagination_baseurl_params = ["filter" => $filter];
   $pagination_entity_name = "Rufnummernblöcke";
 ?>
-<?php include(realpath(dirname(__FILE__)."/../")."/header.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
     <!-- start page title -->
     <div class="row">

application/Preorder/PreorderController.php

@@ -14,6 +14,10 @@ class PreorderController extends mfBaseController {
     }
   }
   
+  protected function indexAction() {
+    
+  }
+  
   protected function addAction() {
     $this->layout()->setTemplate("Preorder/Form");
     

application/Preorder/PreorderModel.php

@@ -67,7 +67,7 @@ class PreorderModel {
     $db = FronkDB::singleton();
     
     $where = self::getSqlFilter($filter);
-    $res = $db->select("Preorder", "*", "$where ORDER BY name, network_id");
+    $res = $db->select("Preorder", "*", "$where ORDER BY zip, city, company, lastname, firstname");
     if($db->num_rows($res)) {
       $data = $db->fetch_object($res);
       $item = new Preorder($data);
@@ -85,7 +85,7 @@ class PreorderModel {
     $db = FronkDB::singleton();
     
     $where = self::getSqlFilter($filter);
-    $res = $db->select("Preorder", "*", "$where ORDER BY name, network_id");
+    $res = $db->select("Preorder", "*", "$where ORDER BY zip, city, company, lastname, firstname");
     if($db->num_rows($res)) {
       while($data = $db->fetch_object($res)) {
         $items[] = new Preorder($data);
@@ -98,13 +98,15 @@ class PreorderModel {
     $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";
+    if(array_key_exists("preordercampaign_id", $filter)) {
+      $preordercampaignid = $filter['preordercampaign_id'];
+      if(is_numeric($preordercampaignid)) {
+        $where .= " AND preordercampaign_id=$preordercampaignid";
       }
     }
     
+    
+    
     //var_dump($filter, $where);exit;
     return $where;
   }

application/Preordercampaign/PreordercampaignController.php

@@ -17,6 +17,24 @@ class PreordercampaignController extends mfBaseController {
   protected function indexAction() {
     $this->layout()->setTemplate("Preordercampaign/Index");
     
+    $this->layout->set("filter", $this->request->filter);
+    
+    if($this->request->filter) {
+      $filter = $this->getPreparedFilter($this->request->filter);
+    }
+    
+    // pagination defaults
+    $pagination = [];
+    $pagination['start'] = 0;
+    $pagination['count'] = 20;
+    $pagination['maxItems'] = 0;
+    
+    if(is_numeric($this->request->s)) {
+      $pagination['start'] = intval($this->request->s);
+    }
+    
+    $my_networks = [];
+    
     if($this->me->is("Admin")) {
       if($filter['network_id']) {
         $my_networks[] = new Network($filter['network_id']);
@@ -79,13 +97,13 @@ class PreordercampaignController extends mfBaseController {
     $id = $this->request->id;
     if(!is_numeric($id) || !$id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
-      $this->redirect("Preordercampain");
+      $this->redirect("Preordercampaign");
     }
     
     $campaign = new Preordercampaign($id);
-    if(!$campain->id) {
+    if(!$campaign->id) {
       $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
-      $this->redirect("Preordercampain");
+      $this->redirect("Preordercampaign");
     }
     
     $this->layout()->set("campaign", $campaign);
@@ -93,4 +111,56 @@ class PreordercampaignController extends mfBaseController {
     return $this->addAction();
   }
   
+  protected function saveAction() {
+    $r = $this->request;
+    //var_dump($r);exit;
+    $id = $r->id;
+    if(is_numeric($id) && $id > 0) {
+      $mode = "edit";
+      $campaign = new Preordercampaign($id);
+      if(!$campaign->id) {
+        $this->layout()->setFlash("Vorbestellkampagne nicht gefunden", "error");
+        $this->redirect("Preordercampaign");
+      }
+    } else {
+      $id = false;
+      $mode = "add";
+    }
+    
+    $data = [];
+    $data['network_id'] = $r->network_id;
+    $data['name'] = $r->name;
+    $data['description'] = $r->description;
+    $data['area'] = $r->area;
+    $data['note'] = $r->note;
+    
+    if($r->from) {
+      $data['from'] = self::dateToTimestamp($r->from);
+    }
+    
+    if($r->to) {
+      $data['to'] = self::dateToTimestamp($r->to);
+    }
+    
+    $data['edit_by'] = $this->me->id;
+    
+    if($mode == "add") {
+      $data['create_by'] = $this->me->id;
+      $campaign = PreordercampaignModel::create($data);
+    } else {
+      $campaign->update($data);
+    }
+    
+    $new_id = $campaign->save();
+    if(!$new_id) {
+      $this->layout()->setFlash("Fehler beim Speichern", "error");
+      $this->layout()->set("campaign", $campaign);
+      return $this->add();
+    }
+    
+    $this->layout()->setFlash("Vorbestellkampagne erfolgreich gespeichert.", "success");
+    $this->redirect("Preordercampaign", "Edit", ['id' => $new_id]);
+    
+  }
+  
 }

application/Preordercampaign/PreordercampaignModel.php

@@ -3,12 +3,10 @@
 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 $description = null;
+  public $area = null;
+  public $from = null;
+  public $to = null;
   
   public $note = null;