WIP new Preorder list

Layout/default/Preorder/Index.php

@@ -228,6 +228,9 @@
             
             <table class="table table-striped table-hover">
               <tr>
+                <?php if($me->is(["Admin", "netowner"])): ?>
+                <th></th>
+                <?php endif; ?>
                 <?php if(!$me->is("preorderfront")): ?><th>Kampagne</th><?php endif; ?>
                 <th>Bestelltyp<br />Bestellcode</th>
                 <th>Status</th>
@@ -244,7 +247,12 @@
                 <th></th>
               </tr>
               <?php foreach($preorders as $preorder): ?>
-              <tr>
+              <tr class="preorder-list-tr" id="preorder-<?=$preorder->id?>">
+                <?php if($me->is(["Admin", "netowner"])): ?>
+                <td class="bg-lightblue border border-end text-center pointer" onclick="togglePreorder(<?=$preorder->id?>)">
+                  <i class="fas fa-fw fa-angle-down"></i>
+                </td>
+                <?php endif; ?>
                 <?php if(!$me->is("preorderfront")): ?><td><?=$preorder->campaign->name?></td><?php endif; ?>
                 <td>
                   <?=__($preorder->type, "preorder")?><br />
@@ -294,11 +302,20 @@
                 <?php endif; ?>
                 <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
                   <?php if(!$me->is("preorderfront")): ?>
-                  <a href="<?=self::getUrl("Preorder", "edit", ["id" => $preorder->id])?>"><i class="far fa-edit"  title="Vorbestellkampagne Bearbeiten"></i></a>
+                  <a href="<?=self::getUrl("Preorder", "edit", ["id" => $preorder->id])?>"><i class="far fa-edit"  title="Vorbestellung Bearbeiten"></i></a>
                   <a href="<?=self::getUrl("Preorder", "delete", ["id" => $preorder->id, "filter" => $filter])?>" class="text-danger" onclick="if(!confirm('Vorbestellung wirklich löschen?')) return false;" title="Vorbestellung Löschen"><i class="fas fa-trash"></i></a>
                   <?php endif; ?>
                 </td>
               </tr>
+              <?php if($me->is(["Admin","netowner"])): ?>
+              <tr id="preorder-detail-<?=$preorder->id?>" style="display:none; background-color:#fff">
+                <td colspan="12">
+                  <?php include(realpath(dirname(__FILE__))."/include/preorder-detail.php"); ?>
+                </td>
+              </tr>
+              <tr style="display:none;"></tr>
+              <?php endif; ?>
+              
               <?php endforeach; ?>
             </table>
             
@@ -557,5 +574,27 @@
       <?php if(is_array($filter) && count($filter)): ?>
         //refreshMap();
       <?php endif; ?>
+        
+        
+      function togglePreorder(id) {
+        $('#preorder-detail-' + id).toggle();
+        if($('#preorder-detail-' + id).is(":hidden")) {
+          $('#preorder-' + id).removeClass("bg-lightblue");
+          $('#preorder-' + id).removeClass("text-info");
+        } else {
+          $('#preorder-' + id).addClass("text-info");
+          $('#preorder-' + id).addClass("bg-lightblue");
+        }
+      }
+      
+      // navigation
+      var preorder;
+      var hash = window.location.hash.substr(1);
+      var match = hash.match(/preorder=(\d+)/);
+      if(match && match[1]) {
+        preorder = match[1]
+        togglePreorder(preorder);
+        //$('body').scrollTop($('#preorder-' + preorder).offset() - 150);
+      }
     </script>
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/menu.php

@@ -87,8 +87,8 @@
               <i class="fad fa-fw fa-running"></i>Netzbetrieb <div class="arrow-down"></div>
             </a>
             <ul class="submenu">
-              <?php if($me->can("Cpeprovisioning")): ?><li><a href="<?=self::getUrl("Cpeprovisioning")?>"><i class="fad fa-fw fa-hdd text-info"></i> CPE Provisioning</a></li><?php endif; ?>
-              <?php if($me->can("Cpeshipping")): ?><li><a href="<?=self::getUrl("Cpeshipping")?>"><i class="fad fa-fw fa-shipping-fast text-info"></i> CPE Versand</a></li><?php endif; ?>
+              <?php if($me->isAdmin() || $me->can("Cpeprovisioning")): ?><li><a href="<?=self::getUrl("Cpeprovisioning")?>"><i class="fad fa-fw fa-hdd text-info"></i> CPE Provisioning</a></li><?php endif; ?>
+              <?php if($me->isAdmin() || $me->can("Cpeshipping")): ?><li><a href="<?=self::getUrl("Cpeshipping")?>"><i class="fad fa-fw fa-shipping-fast text-info"></i> CPE Versand</a></li><?php endif; ?>
             </ul>
           </li>
           <?php endif; ?>

application/Preorder/Preorder.php

@@ -10,6 +10,8 @@ class Preorder extends mfBaseModel {
   private $building;
   private $adb_hausnummer;
   private $adb_wohneinheit;
+  private $creator;
+  private $editor;
   private $attribute = [];