diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index f4bb8046d..3dd4a5910 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -1,1119 +1,1083 @@
 <?php
-  $pagination_baseurl = $this->getUrl($Mod,"Index");
-  $pagination_baseurl_params = ["filter" => $filter];
-  $pagination_entity_name = "Vorbestellungen";
-  
+$pagination_baseurl = $this->getUrl($Mod,"Index");
+$pagination_baseurl_params = ["filter" => $filter];
+$pagination_entity_name = "Vorbestellungen";
+
 ?>
 
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
 
-<style>
-    .preorder-campaign-import {
-        display: flex;
-        gap: 8px;
-        justify-content: flex-start;
-    }
-
-    .preorder-campaign-header, .preorder-campaign-header-buttons {
-        display: flex;
-        justify-content: space-between;
-    }
-
-    .preorder-campaign-header-buttons {
-        max-width: 500px;
-    }
-
-    @media (max-width: 576px) {
-        .preorder-campaign-import, .preorder-campaign-header {
-            display: grid;
-            grid-template-columns: 1fr;
-            grid-gap: 8px;
+    <style>
+        .preorder-campaign-import {
+            display: flex;
+            gap: 8px;
+            justify-content: flex-start;
         }
 
-        .preorder-campaign-table-wrapper {
-            overflow-x: auto;
-        }
-
-        .preorder-campaign-header h4 {
-            text-align: center;
+        .preorder-campaign-header, .preorder-campaign-header-buttons {
+            display: flex;
+            justify-content: space-between;
         }
 
         .preorder-campaign-header-buttons {
-            display: grid;
-            grid-template-columns: 1fr 1fr;
-            grid-gap: 8px;
+            max-width: 500px;
         }
 
-        .preorder-campaign-table-actions {
-            display: grid;
-            grid-gap: 4px;
-            grid-template-columns: auto auto auto;
+        @media (max-width: 576px) {
+            .preorder-campaign-import, .preorder-campaign-header {
+                display: grid;
+                grid-template-columns: 1fr;
+                grid-gap: 8px;
+            }
+
+            .preorder-campaign-table-wrapper {
+                overflow-x: auto;
+            }
+
+            .preorder-campaign-header h4 {
+                text-align: center;
+            }
+
+            .preorder-campaign-header-buttons {
+                display: grid;
+                grid-template-columns: 1fr 1fr;
+                grid-gap: 8px;
+            }
+
+            .preorder-campaign-table-actions {
+                display: grid;
+                grid-gap: 4px;
+                grid-template-columns: auto auto auto;
+            }
+
+            .preorder-campaign-table-actions a {
+                text-align: center;
+                font-size: 24px;
+            }
+
+            .preorder-campaign-table-actions a[title="Vorbestellkampagne Löschen"] {
+                grid-column: 3;
+            }
+
         }
+    </style>
 
-        .preorder-campaign-table-actions a {
-            text-align: center;
-            font-size: 24px;
-        }
+    <script>
+        $(document).ready(function () {
+            if (window.matchMedia('(min-width: 576px)').matches) {
+                return;
+            }
 
-        .preorder-campaign-table-actions a[title="Vorbestellkampagne Löschen"] {
-            grid-column: 3;
-        }
+            // in ul.pagination
+            // if .page-item.disabled.text-secondary exists
+            // only keep the first 2 .page-item, the last 2 .page-item and the .page-item.disabled.text-secondary and the one before and the one after that
 
-    }
-</style>
+            const pagination = $("ul.pagination");
+            const disabled = pagination.find(".page-item.disabled.points");
 
-<script>
-    $(document).ready(function () {
-        if (window.matchMedia('(min-width: 576px)').matches) {
-            return;
-        }
+            if (disabled.length) {
+                const first = pagination.find(".page-item").first();
+                const firstNext = first.next();
+                const last = pagination.find(".page-item").last();
+                const lastNext = last.prev();
+                const prev = disabled.prev();
+                const next = disabled.next();
+                const notToDelete = [first, firstNext, last, lastNext, prev, next, disabled];
 
-        // in ul.pagination
-        // if .page-item.disabled.text-secondary exists
-        // only keep the first 2 .page-item, the last 2 .page-item and the .page-item.disabled.text-secondary and the one before and the one after that
+                // loop through pagination.find(".page-item") and remove all but the first, last, prev, next, firstNext, lastNext
 
-        const pagination = $("ul.pagination");
-        const disabled = pagination.find(".page-item.disabled.points");
+                pagination.find(".page-item").each(function (index, item) {
+                    // if (!notToDelete.includes($(item))) {
+                    //     $(item).remove();
+                    // } fix this becaues of we need [0] of notToDelete to compare
+                    let check = false;
+                    notToDelete.forEach(function (n) {
+                        if (n[0] === item) {
+                            check = true;
+                        }
+                    });
 
-        if (disabled.length) {
-            const first = pagination.find(".page-item").first();
-            const firstNext = first.next();
-            const last = pagination.find(".page-item").last();
-            const lastNext = last.prev();
-            const prev = disabled.prev();
-            const next = disabled.next();
-            const notToDelete = [first, firstNext, last, lastNext, prev, next, disabled];
-
-            // loop through pagination.find(".page-item") and remove all but the first, last, prev, next, firstNext, lastNext
-
-            pagination.find(".page-item").each(function (index, item) {
-                // if (!notToDelete.includes($(item))) {
-                //     $(item).remove();
-                // } fix this becaues of we need [0] of notToDelete to compare
-                let check = false;
-                notToDelete.forEach(function (n) {
-                    if (n[0] === item) {
-                        check = true;
+                    if (!check) {
+                        $(item).remove();
                     }
+
                 });
 
-                if (!check) {
-                    $(item).remove();
-                }
 
-            });
-
-
-        }
-    });
-</script>
+            }
+        });
+    </script>
 
     <!-- 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">Vorbestellungen</li>
-            </ol>
-          </div>
-          <h4 class="page-title">Vorbestellungen<?=(isset($campaign) && $campaign) ? " - ".$campaign->name : ""?></h4>
+        <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">Vorbestellungen</li>
+                    </ol>
+                </div>
+                <h4 class="page-title">Vorbestellungen<?=(isset($campaign) && $campaign) ? " - ".$campaign->name : ""?></h4>
+            </div>
         </div>
-      </div>
     </div>
     <!-- end page title -->
 
     <div class="row">
-      <div class="col-lg-12">
+        <div class="col-lg-12">
 
-        <div class="card">
-          <div class="card-body mb-3">
-            <h4 class="header-title mb-3">Filter</h4>
-            
-            <form method="get" action="<?=self::getUrl("Preorder")?>">
-              <div class="row">
+            <div class="card">
+                <div class="card-body mb-3">
+                    <h4 class="header-title mb-3">Filter</h4>
+
+                    <form method="get" action="<?=self::getUrl("Preorder")?>">
+                        <div class="row">
 
 
-                  <div class="col-sm-12 col-md-2">
-                      <label class="form-label" for="filter_preordercampaign_id" style="display: flex">Kampagne
-                          <?php if(isset($netowner_campaign_ids) && is_array($netowner_campaign_ids) && count($netowner_campaign_ids)): ?>
-                              <div class="dropdown ml-1" style="cursor: pointer">
-                                  <span id="netowner-campaigns-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="dropdown-toggle">(Netzbesitzer&nbsp;<i class="fas fa-caret-down"></i>)</span>
-                                  <div class="dropdown-menu" aria-labelledby="netowner-campaigns-dropdown">
-                                      <?php foreach($netowner_campaign_ids as $netowner => $campaigns): ?>
-                                          <a class="dropdown-item" href="#" onclick="selectNetOwnerCampaign(<?= htmlspecialchars(json_encode($campaigns), ENT_QUOTES, 'UTF-8') ?>, '<?= htmlspecialchars($netowner)?>'); return false;"><?= htmlspecialchars($netowner) ?></a>
-                                      <?php endforeach; ?>
-                                  </div>
-                              </div>
-
-                          <style>
-                              .select2-selection.select2-selection--multiple {
-                                  max-height: 150px;
-                                  overflow-y: auto;
-                              }
-                          </style>
-
-                              <script>
-                                  function selectNetOwnerCampaign(campaigns, netowner) {
-                                      $('#filter_preordercampaign_id').val(campaigns);
-                                      $('#filter_preordercampaign_id').trigger('change');
-                                      console.log(campaigns);
-                                      window.notify('success', 'Kampagnen von ' + netowner + ' ausgewählt');
-                                  }
-                              </script>
-                          <?php endif; ?>
-
-
-                      </label>
-                      <select name="filter[preordercampaign_id][]" id="filter_preordercampaign_id" class="form-control" multiple="multiple">
-                          <?php
-                          // if partner_id is string unset it from filter
-                          if(isset($filter) && array_key_exists("preordercampaign_id", $filter) && is_string($filter["preordercampaign_id"])) {
-                              $filter["preordercampaign_id"] = explode(",", $filter["preordercampaign_id"]);
-                          }
-                          ?>
-                          <?php foreach($my_campaigns as $c): ?>
-                              <option value="<?=$c->id?>" <?=(isset($filter) && array_key_exists("preordercampaign_id", $filter) && in_array($c->id, $filter["preordercampaign_id"])) ? "selected='selected'" : ""?>><?=$c->name?></option>
-                          <?php endforeach; ?>
-                      </select>
-
-                  </div>
+                            <div class="col-sm-12 col-md-2">
+                                <label class="form-label" for="filter_preordercampaign_id">Kampagne</label>
+                                <select name="filter[preordercampaign_id]" id="filter_preordercampaign_id" class="form-control">
+                                    <option value="">Alle</option>
+                                    <?php foreach($my_campaigns as $c): ?>
+                                        <option value="<?=$c->id?>" <?=(isset($campaign) && $c->id == $campaign->id) ? "selected='selected'" : ""?>><?=$c->name?></option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </div>
 
 
 
-                  <div class="col-sm-12 col-md-2">
-                      <label class="form-label" for="partner_id">Partner</label>
-                      <select name="filter[partner_id][]" id="filter_partner_id" class="form-control" multiple="multiple">
-                          <?php
-                          // if partner_id is string unset it from filter
-                            if(isset($filter) && array_key_exists("partner_id", $filter) && is_string($filter["partner_id"])) {
-                                unset($filter["partner_id"]);
-                            }
-                          ?>
-                          <?php foreach($partners as $partner): ?>
-                              <option value="<?=$partner['partner_id']?>" <?=(isset($filter) && array_key_exists("partner_id", $filter) && in_array($partner['partner_id'], $filter["partner_id"])) ? "selected='selected'" : ""?>><?=$partner['name']?></option>
-                          <?php endforeach; ?>
-                      </select>
-                  </div>
-                
-                <div class="col-sm-12 col-md-2">
-                  <label class="form-label" for="filter_status">Status</label>
-                  <select name="filter[status][]" id="filter_status" class="form-control" multiple="multiple">
-                    <?php foreach(PreorderstatusModel::getAll() as $status): ?>
-                      <option value="<?=$status->id?>" <?=(isset($filter) && array_key_exists("status", $filter) && in_array($status->id, $filter['status'])) ? "selected='selected'" : ""?>><?=$status->code?> - <?=$status->name?></option>
-                    <?php endforeach; ?>
-                  </select>
+                            <div class="col-sm-12 col-md-2">
+                                <label class="form-label" for="partner_id">Partner</label>
+                                <select name="filter[partner_id][]" id="filter_partner_id" class="form-control" multiple="multiple">
+                                    <?php
+                                    // if partner_id is string unset it from filter
+                                    if(isset($filter) && array_key_exists("partner_id", $filter) && is_string($filter["partner_id"])) {
+                                        unset($filter["partner_id"]);
+                                    }
+                                    ?>
+                                    <?php foreach($partners as $partner): ?>
+                                        <option value="<?=$partner['partner_id']?>" <?=(isset($filter) && array_key_exists("partner_id", $filter) && in_array($partner['partner_id'], $filter["partner_id"])) ? "selected='selected'" : ""?>><?=$partner['name']?></option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </div>
+
+                            <div class="col-sm-12 col-md-2">
+                                <label class="form-label" for="filter_status">Status</label>
+                                <select name="filter[status][]" id="filter_status" class="form-control" multiple="multiple">
+                                    <?php foreach(PreorderstatusModel::getAll() as $status): ?>
+                                        <option value="<?=$status->id?>" <?=(isset($filter) && array_key_exists("status", $filter) && in_array($status->id, $filter['status'])) ? "selected='selected'" : ""?>><?=$status->code?> - <?=$status->name?></option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </div>
+
+                            <div class="col-sm-12 col-md-2">
+                                <label class="form-label" for="connection_type">Anschlusstyp</label>
+                                <select name="filter[connection_type][]" id="connection_type_id" class="form-control" multiple="multiple">
+                                    <?php
+                                    $connection_types = ["single-dwelling","multi-dwelling","apartment-building","apartment","business"];
+                                    foreach($connection_types as $connection_type): ?>
+                                        <option value="<?=$connection_type?>" <?=(isset($filter) && array_key_exists("connection_type", $filter) && in_array($connection_type, $filter["connection_type"])) ? "selected='selected'" : ""?>><?=__($connection_type, "preorder")?></option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </div>
+
+                            <div class="col-sm-12 col-md-2">
+                                <label class="form-label" for="filter_type">Bestelltyp</label>
+                                <select name="filter[type][]" id="filter_type" class="form-control" multiple="multiple">
+                                    <option value="interest" <?=(isset($filter) && array_key_exists("type", $filter) && in_array("interest", $filter['type'])) ? "selected='selected'" : ""?>>Interessensbekundung</option>
+                                    <option value="provision" <?=(isset($filter) && array_key_exists("type", $filter) && in_array("provision", $filter['type'])) ? "selected='selected'" : ""?>>Vorsorgeanschluss</option>
+                                    <option value="order" <?=(isset($filter) && array_key_exists("type", $filter) && in_array("order", $filter['type'])) ? "selected='selected'" : ""?>>Vollanschluss</option>
+                                </select>
+                            </div>
+
+                            <!--               INFO THIS FILTER IS CURRENTLY HIDDEN    -->
+                            <!--                <div class="col-sm-12 col-md-2">-->
+                            <!--                  <label class="form-label" for="filter_addon_services">Zusatzdienste</label>-->
+                            <!--                  <select name="filter[addon_services]" id="filter_addon_services" class="form-control">-->
+                            <!--                    <option></option>-->
+                            <!--                    <option value="1" --><?php //=(isset($filter['addon_services']) && $filter['addon_services'] == 1) ? "selected='selected'" : ""?><!-- >Nur mit Zusatzdiensten</option>-->
+                            <!--                  </select>-->
+                            <!--                </div>-->
+                        </div>
+                        <div class="row mt-2">
+                            <div class="col-sm-12 col-md-1">
+                                <label class="form-label" for="filter_ucode">Bestellcode</label>
+                                <input type="text" class="form-control" name="filter[ucode]" id="filter_ucode" value="<?=$filter['ucode'] ?? ""?>" />
+                            </div>
+
+                            <div class="col-sm-12 col-md-1">
+                                <label class="form-label" for="filter_oaid">OAID</label>
+                                <input type="text" class="form-control" name="filter[oaid]" id="filter_oaid" value="<?=$filter['oaid'] ?? ""?>" />
+                            </div>
+
+                            <div class="col-sm-12 col-md-2">
+                                <label class="form-label" for="filter_workorder_name">Rimo Workorder Name</label>
+                                <input type="text" class="form-control" name="filter[rimo_workorder_name]" id="filter_workorder_name" value="<?=$filter['workorder_name'] ?? ""?>" />
+                            </div>
+
+                            <div class="col-sm-12 col-md-2">
+                                <label class="form-label" for="filter_address">Anschlussadresse</label>
+                                <input type="text" class="form-control" name="filter[address]" id="filter_address" value="<?=$filter['address'] ?? ""?>" />
+                            </div>
+
+                            <div class="col-sm-12 col-md-2">
+                                <label class="form-label" for="filter_kunde">Kunde</label>
+                                <input type="text" class="form-control" name="filter[kunde]" id="filter_kunde" value="<?=$filter['kunde'] ?? ""?>" />
+                            </div>
+
+                            <div class="col-sm-12 col-md-2">
+                                <label class="form-label" for="filter_magic_search">erweiterte Suche</label>
+                                <input type="text" class="form-control" name="filter[magic_search]" id="filter_magic_search" value="<?=$filter['magic_search'] ?? ""?>" />
+                            </div>
+
+                        </div>
+
+                        <div class="row mt-2">
+                            <div class="col-sm-12 col-md-1">
+                                <label class="form-label" for="filter_unit_missing">Wohneinheit</label>
+                                <select name="filter[unit_missing]" id="filter_unit_missing" class="form-control">
+                                    <option value=""></option>
+                                    <option value="yes" <?=(isset($filter) && array_key_exists("unit_missing", $filter) && $filter['unit_missing'] == "yes") ? "selected='selected'" : ""?>>Wohneinheit fehlt</option>
+                                    <option value="no" <?=(isset($filter) && array_key_exists("unit_missing", $filter) && $filter['unit_missing'] == "no") ? "selected='selected'" : ""?>>Wohneinheit vorhanden</option>
+                                </select>
+                            </div>
+
+                            <div class="col-sm-12 col-md-2">
+                                <label class="form-label" for="rimo_home_extref">Wohneinheit Rimo-Extref</label>
+                                <select name="filter[rimo_home_extref]" id="filter_rimo_home_extref" class="form-control">
+                                    <option value=""></option>
+                                    <option value="0" <?=(isset($filter) && array_key_exists("rimo_home_extref", $filter) && strlen($filter['rimo_home_extref']) && intval($filter['rimo_home_extref']) === 0) ? "selected='selected'" : ""?>>Fehlt</option>
+                                    <option value="1" <?=(isset($filter) && array_key_exists("rimo_home_extref", $filter) && intval($filter['rimo_home_extref']) === 1) ? "selected='selected'" : ""?>>Vorhanden</option>
+                                </select>
+                            </div>
+
+                            <div class="col-sm-12 col-md-1">
+                                <label class="form-label" for="filter_connection_count">Anz. Anschlüsse</label>
+                                <select name="filter[connection_count]" id="filter_connection_count" class="form-control">
+                                    <option value=""></option>
+                                    <option value="1" <?=(isset($filter) && array_key_exists("connection_count", $filter) && intval($filter['connection_count']) === 1) ? "selected='selected'" : ""?>>1</option>
+                                    <option value="2" <?=(isset($filter) && array_key_exists("connection_count", $filter) && intval($filter['connection_count']) === 2) ? "selected='selected'" : ""?>> &gt; 1</option>
+                                </select>
+                            </div>
+
+                            <div class="col-sm-12 col-md-1">
+                                <label class="form-label" for="filter_borderpoint">Übergabepunkt</label>
+                                <select name="filter[borderpoint]" id="filter_borderpoint" class="form-control">
+                                    <option value="all" <?=(isset($filter) && array_key_exists("borderpoint", $filter) && $filter["borderpoint"] == "all") ? "selected='selected'" : ""?>>Alle</option>
+                                    <option value="with" <?=(isset($filter) && array_key_exists("borderpoint", $filter) && $filter["borderpoint"] == "with") ? "selected='selected'" : ""?>>Mit</option>
+                                    <option value="without" <?=(isset($filter) && array_key_exists("borderpoint", $filter) && $filter["borderpoint"] == "without") ? "selected='selected'" : ""?>>Ohne</option>
+                                </select>
+                            </div>
+
+                            <div class="col-sm-12 col-md-1">
+                                <label class="form-label" for="filter_rimo_workorder">Rimo Workorder</label>
+                                <select name="filter[rimo_workorder]" id="filter_rimo_workorder" class="form-control">
+                                    <option value=""></option>
+                                    <option value="0" <?=(isset($filter) && array_key_exists("rimo_workorder", $filter) && strlen($filter['rimo_workorder']) && intval($filter['rimo_workorder']) === 0) ? "selected='selected'" : ""?>>Nicht erstellt</option>
+                                    <option value="1" <?=(isset($filter) && array_key_exists("rimo_workorder", $filter) && intval($filter['rimo_workorder']) === 1) ? "selected='selected'" : ""?>>Erstellt</option>
+                                </select>
+                            </div>
+
+                            <div class="col-sm-12 col-md-2">
+                                <label class="form-label" for="filter_rimo_workorder">Rimo Workorder Status</label>
+                                <select name="filter[rimo_workorder_status]" id="filter_rimo_workorder_status" class="form-control">
+                                    <option value=""></option>
+                                    <option value="new" <?=(isset($filter) && array_key_exists("rimo_workorder_status", $filter) && $filter["rimo_workorder_status"] == "new" ) ? "selected='selected'" : ""?>>New</option>
+                                    <option value="Clarify" <?=(isset($filter) && array_key_exists("rimo_workorder_status", $filter) && $filter["rimo_workorder_status"] == "Clarify" ) ? "selected='selected'" : ""?>>Clarify</option>
+                                    <option value="Accepted" <?=(isset($filter) && array_key_exists("rimo_workorder_status", $filter) && $filter["rimo_workorder_status"] == "Accepted" ) ? "selected='selected'" : ""?>>Accepted</option>
+                                    <option value="Plan released" <?=(isset($filter) && array_key_exists("rimo_workorder_status", $filter) && $filter["rimo_workorder_status"] == "Plan released" ) ? "selected='selected'" : ""?>>Plan released</option>
+                                    <option value="Assigned" <?=(isset($filter) && array_key_exists("rimo_workorder_status", $filter) && $filter["rimo_workorder_status"] == "Assigned" ) ? "selected='selected'" : ""?>>Assigned</option>
+                                    <option value="Documented" <?=(isset($filter) && array_key_exists("rimo_workorder_status", $filter) && $filter["rimo_workorder_status"] == "Documented" ) ? "selected='selected'" : ""?>>Documented</option>
+                                </select>
+                            </div>
+
+                            <div class="col-sm-12 col-md-2">
+                                <label class="form-label" for="filter_rimo_workorder_team_id">Rimo Workorder Assigned Team</label>
+                                <select name="filter[rimo_workorder_team_id]" id="filter_rimo_workorder_team_id" class="form-control">
+                                    <option value=""></option>
+                                    <?php foreach(RimoWorkorderModel::getTeams() as $id => $team): ?>
+                                        <option value="<?=$id?>" <?=(isset($filter) && array_key_exists("rimo_workorder_team_id", $filter) && $filter["rimo_workorder_team_id"] == $id) ? "selected='selected'" : ""?>><?=$team?></option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </div>
+
+                        </div>
+
+                        <div class="row mt-2">
+                            <div class="col preorder-campaign-header-buttons">
+                                <button type="submit" class="btn btn-primary">Filter anwenden</button>
+                                <?php if(isset($campaign) && $campaign->id): ?>
+                                    <a class="btn btn-secondary" href="<?=self::getUrl("Preorder", "", ['filter' => ['preordercampaign_id' => $campaign->id], "resetFilter" => 1])?>">Filter zurücksetzen</a>
+                                <?php else: ?>
+                                    <a class="btn btn-secondary" href="<?=self::getUrl("Preorder", "Index", ["resetFilter" => 1])?>">Filter zurücksetzen</a>
+                                <?php endif; ?>
+                                <?php if(!$me->is("Preorderfront")): ?>
+                                    <button type="submit" formaction="<?=self::getUrl("Preorder", "export")?>" id="export-button" class="btn btn-outline-success"><i class="fas fa-download"></i> CSV-Export</button>
+                                <?php endif; ?>
+                            </div>
+                        </div>
+                    </form>
+
                 </div>
-
-                  <div class="col-sm-12 col-md-2">
-                      <label class="form-label" for="connection_type">Anschlusstyp</label>
-                      <select name="filter[connection_type][]" id="connection_type_id" class="form-control" multiple="multiple">
-                          <?php
-                          $connection_types = ["single-dwelling","multi-dwelling","apartment-building","apartment","business"];
-                          foreach($connection_types as $connection_type): ?>
-                              <option value="<?=$connection_type?>" <?=(isset($filter) && array_key_exists("connection_type", $filter) && in_array($connection_type, $filter["connection_type"])) ? "selected='selected'" : ""?>><?=__($connection_type, "preorder")?></option>
-                          <?php endforeach; ?>
-                      </select>
-                  </div>
-                
-                <div class="col-sm-12 col-md-2">
-                  <label class="form-label" for="filter_type">Bestelltyp</label>
-                  <select name="filter[type][]" id="filter_type" class="form-control" multiple="multiple">
-                    <option value="interest" <?=(isset($filter) && array_key_exists("type", $filter) && in_array("interest", $filter['type'])) ? "selected='selected'" : ""?>>Interessensbekundung</option>
-                    <option value="provision" <?=(isset($filter) && array_key_exists("type", $filter) && in_array("provision", $filter['type'])) ? "selected='selected'" : ""?>>Vorsorgeanschluss</option>
-                    <option value="order" <?=(isset($filter) && array_key_exists("type", $filter) && in_array("order", $filter['type'])) ? "selected='selected'" : ""?>>Vollanschluss</option>
-                  </select>
-                </div>
-
-<!--               INFO THIS FILTER IS CURRENTLY HIDDEN    -->
-<!--                <div class="col-sm-12 col-md-2">-->
-<!--                  <label class="form-label" for="filter_addon_services">Zusatzdienste</label>-->
-<!--                  <select name="filter[addon_services]" id="filter_addon_services" class="form-control">-->
-<!--                    <option></option>-->
-<!--                    <option value="1" --><?php //=(isset($filter['addon_services']) && $filter['addon_services'] == 1) ? "selected='selected'" : ""?><!-- >Nur mit Zusatzdiensten</option>-->
-<!--                  </select>-->
-<!--                </div>-->
-              </div>
-              <div class="row mt-2">
-                <div class="col-sm-12 col-md-1">
-                  <label class="form-label" for="filter_ucode">Bestellcode</label>
-                  <input type="text" class="form-control" name="filter[ucode]" id="filter_ucode" value="<?=$filter['ucode'] ?? ""?>" />
-                </div>
-                
-                <div class="col-sm-12 col-md-1">
-                  <label class="form-label" for="filter_oaid">OAID</label>
-                  <input type="text" class="form-control" name="filter[oaid]" id="filter_oaid" value="<?=$filter['oaid'] ?? ""?>" />
-                </div>
-
-                  <div class="col-sm-12 col-md-2">
-                      <label class="form-label" for="filter_workorder_name">Rimo Workorder Name</label>
-                      <input type="text" class="form-control" name="filter[rimo_workorder_name]" id="filter_workorder_name" value="<?=$filter['workorder_name'] ?? ""?>" />
-                  </div>
-                
-                <div class="col-sm-12 col-md-2">
-                  <label class="form-label" for="filter_address">Anschlussadresse</label>
-                  <input type="text" class="form-control" name="filter[address]" id="filter_address" value="<?=$filter['address'] ?? ""?>" />
-                </div>
-                
-                <div class="col-sm-12 col-md-2">
-                  <label class="form-label" for="filter_kunde">Kunde</label>
-                  <input type="text" class="form-control" name="filter[kunde]" id="filter_kunde" value="<?=$filter['kunde'] ?? ""?>" />
-                </div>
-                
-                <div class="col-sm-12 col-md-2">
-                  <label class="form-label" for="filter_magic_search">erweiterte Suche</label>
-                  <input type="text" class="form-control" name="filter[magic_search]" id="filter_magic_search" value="<?=$filter['magic_search'] ?? ""?>" />
-                </div>
-                
-              </div>
-
-              <div class="row mt-2">
-                <div class="col-sm-12 col-md-1">
-                  <label class="form-label" for="filter_unit_missing">Wohneinheit</label>
-                  <select name="filter[unit_missing]" id="filter_unit_missing" class="form-control">
-                    <option value=""></option>
-                    <option value="yes" <?=(isset($filter) && array_key_exists("unit_missing", $filter) && $filter['unit_missing'] == "yes") ? "selected='selected'" : ""?>>Wohneinheit fehlt</option>
-                    <option value="no" <?=(isset($filter) && array_key_exists("unit_missing", $filter) && $filter['unit_missing'] == "no") ? "selected='selected'" : ""?>>Wohneinheit vorhanden</option>
-                  </select>
-                </div>
-
-                  <div class="col-sm-12 col-md-2">
-                      <label class="form-label" for="rimo_home_extref">Wohneinheit Rimo-Extref</label>
-                      <select name="filter[rimo_home_extref]" id="filter_rimo_home_extref" class="form-control">
-                          <option value=""></option>
-                          <option value="0" <?=(isset($filter) && array_key_exists("rimo_home_extref", $filter) && strlen($filter['rimo_home_extref']) && intval($filter['rimo_home_extref']) === 0) ? "selected='selected'" : ""?>>Fehlt</option>
-                          <option value="1" <?=(isset($filter) && array_key_exists("rimo_home_extref", $filter) && intval($filter['rimo_home_extref']) === 1) ? "selected='selected'" : ""?>>Vorhanden</option>
-                      </select>
-                  </div>
-                
-                <div class="col-sm-12 col-md-1">
-                  <label class="form-label" for="filter_connection_count">Anz. Anschlüsse</label>
-                  <select name="filter[connection_count]" id="filter_connection_count" class="form-control">
-                    <option value=""></option>
-                    <option value="1" <?=(isset($filter) && array_key_exists("connection_count", $filter) && intval($filter['connection_count']) === 1) ? "selected='selected'" : ""?>>1</option>
-                    <option value="2" <?=(isset($filter) && array_key_exists("connection_count", $filter) && intval($filter['connection_count']) === 2) ? "selected='selected'" : ""?>> &gt; 1</option>
-                  </select>
-                </div>
-
-                  <div class="col-sm-12 col-md-1">
-                      <label class="form-label" for="filter_borderpoint">Übergabepunkt</label>
-                      <select name="filter[borderpoint]" id="filter_borderpoint" class="form-control">
-                          <option value="all" <?=(isset($filter) && array_key_exists("borderpoint", $filter) && $filter["borderpoint"] == "all") ? "selected='selected'" : ""?>>Alle</option>
-                          <option value="with" <?=(isset($filter) && array_key_exists("borderpoint", $filter) && $filter["borderpoint"] == "with") ? "selected='selected'" : ""?>>Mit</option>
-                          <option value="without" <?=(isset($filter) && array_key_exists("borderpoint", $filter) && $filter["borderpoint"] == "without") ? "selected='selected'" : ""?>>Ohne</option>
-                      </select>
-                  </div>
-                
-                <div class="col-sm-12 col-md-1">
-                  <label class="form-label" for="filter_rimo_workorder">Rimo Workorder</label>
-                  <select name="filter[rimo_workorder]" id="filter_rimo_workorder" class="form-control">
-                    <option value=""></option>
-                    <option value="0" <?=(isset($filter) && array_key_exists("rimo_workorder", $filter) && strlen($filter['rimo_workorder']) && intval($filter['rimo_workorder']) === 0) ? "selected='selected'" : ""?>>Nicht erstellt</option>
-                    <option value="1" <?=(isset($filter) && array_key_exists("rimo_workorder", $filter) && intval($filter['rimo_workorder']) === 1) ? "selected='selected'" : ""?>>Erstellt</option>
-                  </select>
-                </div>
-                
-                <div class="col-sm-12 col-md-2">
-                  <label class="form-label" for="filter_rimo_workorder">Rimo Workorder Status</label>
-                  <select name="filter[rimo_workorder_status]" id="filter_rimo_workorder_status" class="form-control">
-                    <option value=""></option>
-                    <option value="new" <?=(isset($filter) && array_key_exists("rimo_workorder_status", $filter) && $filter["rimo_workorder_status"] == "new" ) ? "selected='selected'" : ""?>>New</option>
-                    <option value="Clarify" <?=(isset($filter) && array_key_exists("rimo_workorder_status", $filter) && $filter["rimo_workorder_status"] == "Clarify" ) ? "selected='selected'" : ""?>>Clarify</option>
-                    <option value="Accepted" <?=(isset($filter) && array_key_exists("rimo_workorder_status", $filter) && $filter["rimo_workorder_status"] == "Accepted" ) ? "selected='selected'" : ""?>>Accepted</option>
-                    <option value="Plan released" <?=(isset($filter) && array_key_exists("rimo_workorder_status", $filter) && $filter["rimo_workorder_status"] == "Plan released" ) ? "selected='selected'" : ""?>>Plan released</option>
-                    <option value="Assigned" <?=(isset($filter) && array_key_exists("rimo_workorder_status", $filter) && $filter["rimo_workorder_status"] == "Assigned" ) ? "selected='selected'" : ""?>>Assigned</option>
-                    <option value="Documented" <?=(isset($filter) && array_key_exists("rimo_workorder_status", $filter) && $filter["rimo_workorder_status"] == "Documented" ) ? "selected='selected'" : ""?>>Documented</option>
-                  </select>
-                </div>
-                
-                <div class="col-sm-12 col-md-2">
-                  <label class="form-label" for="filter_rimo_workorder_team_id">Rimo Workorder Assigned Team</label>
-                    <select name="filter[rimo_workorder_team_id]" id="filter_rimo_workorder_team_id" class="form-control">
-                        <option value=""></option>
-                        <?php foreach(RimoWorkorderModel::getTeams() as $id => $team): ?>
-                            <option value="<?=$id?>" <?=(isset($filter) && array_key_exists("rimo_workorder_team_id", $filter) && $filter["rimo_workorder_team_id"] == $id) ? "selected='selected'" : ""?>><?=$team?></option>
-                        <?php endforeach; ?>
-                    </select>
-                </div>
-                
-              </div>
-              
-              <div class="row mt-2">
-                  <div class="col preorder-campaign-header-buttons">
-                  <button type="submit" class="btn btn-primary">Filter anwenden</button>
-                  <?php if(isset($campaign) && $campaign->id): ?>
-                    <a class="btn btn-secondary" href="<?=self::getUrl("Preorder", "", ['filter' => ['preordercampaign_id' => $campaign->id], "resetFilter" => 1])?>">Filter zurücksetzen</a>
-                  <?php else: ?>
-                    <a class="btn btn-secondary" href="<?=self::getUrl("Preorder", "Index", ["resetFilter" => 1])?>">Filter zurücksetzen</a>
-                  <?php endif; ?>
-                  <?php if(!$me->is("Preorderfront")): ?>
-                    <button type="submit" formaction="<?=self::getUrl("Preorder", "export")?>" id="export-button" class="btn btn-outline-success"><i class="fas fa-download"></i> CSV-Export</button>
-                  <?php endif; ?>
-                </div>
-              </div>
-            </form>
-            
-          </div>
-        </div>
-        
-        <div class="card">
-          <div class="card-body">
-            <div class="row col" id="map-link">
-              <a href="#" class="btn btn-success" onclick="refreshMap()"><i class="far fa-map"></i> Übersichtskarte einblenden</a>
             </div>
-            <div class="row hidden" id="map-row">
-              <div id="preorder-map" style="height:70vh; width: 100%"></div>
-              <div class="row mt-1">
-                <div class="col">
-                  <button type="button" class="btn btn-sm btn-outline-secondary" onclick="centerMap()"><i class="far fa-dot-circle fa-fw"></i> Zentrieren</button>
-                  <button type="button" class="btn btn-sm btn-outline-success" onclick="toggleTileset()" title="Zwischen Karte und Satellitenbild umschalten"><i class="far fa-arrow-right-arrow-left fa-fw"></i> Karte/Satellit</button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
 
-        
-        <div class="card">
-          <div class="card-body mb-3">
-
-              <div class="preorder-campaign-header">
-                  <h4 class="header-title">Liste aller Vorbestellungen<?= (isset($campaign) && $campaign) ? " - " . $campaign->name : "" ?></h4>
-                  <?php if ($filter['preordercampaign_id']): ?>
-                      <div class="float-right">
-                          <a class="btn btn-primary mb-2"
-                             href="<?= self::getUrl("Preorder", "add", ["preordercampaign_id" => $filter['preordercampaign_id']]) ?>"><i
-                                      class="fas fa-plus"></i> Neue Vorbestellung anlegen</a>
-                      </div>
-                  <?php endif; ?>
-              </div>
-            
-            
-<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
-<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
-
-              <div class="preorder-campaign-table-wrapper">
-            <table class="table table-striped table-hover">
-              <tr>
-                <?php if(!$me->is(["preorderfront"]) && !$me->is("preorderreadonly")): ?>
-                <th></th>
-                <?php endif; ?>
-                <?php if(!$me->is("preorderfront")): ?><th>Kampagne</th><?php endif; ?>
-                <th>Bestelltyp<br />Bestellcode</th>
-                <th>Status</th>
-                <th>Anschlussadresse</th>
-                <th>Anschlüsse<br />OAID</th>
-                <th>Kunde</th>
-                <th>Kontakt</th>
-                <th>Partner</th>
-                <th>Attribute</th>
-                <th>Erstellt<br />Bearbeitet</th>
-                <?php if($me->is(["Admin","netowner"])): ?>
-                <th></th>
-                <?php endif; ?>
-                <th></th>
-              </tr>
-              <?php foreach($preorders as $preorder): ?>
-              <tr class="preorder-list-tr" id="preorder-<?=$preorder->id?>">
-                <?php if(!$me->is(["preorderfront"]) && !$me->is("preorderreadonly")): ?>
-                <td class="bg-lightblue border border-end text-center pointer" onclick="togglePreorder(<?=$preorder->id?>); return false;">
-                  <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 />
-                  <?=$preorder->ucode?>
-                </td>
-                <td class="status"><?=$preorder->status->code?> - <?=$preorder->status->name?></td>
-                <?php if($preorder->building_id): ?>
-                <td><?=$preorder->building->street?><br /><?=$preorder->building->zip?> <?=$preorder->building->city?></td>
-                <?php elseif($preorder->adb_hausnummer_id): ?>
-                <td <?=($preorder->address_created) ? "class='alert-warning' title='Adresse manuell angelegt'" : ""?>">
-                  <?=$preorder->adb_hausnummer->strasse->name?>
-                  <?=$preorder->adb_hausnummer->hausnummer?><?=($preorder->adb_hausnummer->stiege) ? "/".$preorder->adb_hausnummer->stiege : ""?><br />
-                  <?=($preorder->adb_wohneinheit_id) ? ((string)$preorder->adb_wohneinheit ? $preorder->adb_wohneinheit."<br />" : "") : "<i class='text-pink'>&lt;keine Wohneinheit&gt;</i><br />"?>
-                  <?=$preorder->adb_hausnummer->plz->plz?>
-                  <?=$preorder->adb_hausnummer->ortschaft->name?><br />
-                  <?=$preorder->adb_hausnummer->strasse->gemeinde->name?>
-                </td>
-                <?php else: ?>
-                <td></td>
-                <?php endif; ?>
-                <td>
-                  <?=($preorder->connection_count) ? $preorder->connection_count : 1?><br />
-                  <span class="text-pink"><?=$preorder->oaid?></span>
-                </td>
-                <td>
-                  <?=($preorder->company) ? $preorder->company : $preorder->firstname." ".$preorder->lastname?><br />
-                  <?=$preorder->street?><?=($preorder->housenumber) ? " ".$preorder->housenumber : ""?><br />
-                  <?=$preorder->zip?> <?=$preorder->city?>
-                </td>
-                <td>
-                  <?=($preorder->phone) ? $preorder->phone."<br />" : ""?>
-                  <?=($preorder->email) ? $preorder->email : ""?>
-                </td>
-                
-                <td><?=($preorder->partner_id) ? $preorder->partner->getCompanyOrName() : ""?></td>
-                <td>
-                  <label><input type="checkbox" name="attributes_bep_specified" id="attributes_bep_specified-<?=$preorder->id?>" data-preorder-id="<?=$preorder->id?>" value="1" <?=(is_array($preorder->attribute) && array_key_exists("bep_specified", $preorder->attribute) && $preorder->attribute["bep_specified"]) ? "checked='checked'" : ""?> /> Borderpoint festgelegt</label><br />
-                  <label><input type="checkbox" name="attributes_inhouse_cabling_supplied" id="attributes_inhouse_cabling_supplied-<?=$preorder->id?>" data-preorder-id="<?=$preorder->id?>" value="1" <?=(is_array($preorder->attribute) && array_key_exists("inhouse_cabling_supplied", $preorder->attribute) && $preorder->attribute["inhouse_cabling_supplied"]) ? "checked='checked'" : ""?> /> Starterpaket erhalten</label>
-                </td>
-                <td style="white-space: nowrap" class="text-monospace">
-                  <?=date('d.m.Y H:i', $preorder->create)?><br />
-                  <span id="update-<?=$preorder->id?>"><?=date('d.m.Y H:i', $preorder->edit)?></span>
-                </td>
-                
-                <?php if($me->is(["Admin", "netowner"])): ?>
-                <td><?php if($preorder->adb_wohneinheit_id && is_array($preorder->adb_wohneinheit->rimo_workorders) && count($preorder->adb_wohneinheit->rimo_workorders)):?><i class="fas fa-r" title="Rimo Workorder erstellt"></i><?php endif; ?></td>
-                <?php endif; ?>
-                <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
-                    <div class="preorder-campaign-table-actions">
-                    <?php if(!$me->is(["preorderfront"]) && !$me->is("preorderreadonly")): ?>
-                  <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; ?>
+            <div class="card">
+                <div class="card-body">
+                    <div class="row col" id="map-link">
+                        <a href="#" class="btn btn-success" onclick="refreshMap()"><i class="far fa-map"></i> Übersichtskarte einblenden</a>
                     </div>
-                </td>
-              </tr>
-              <?php if(!$me->is(["preorderfront"]) && !$me->is("preorderreadonly")): ?>
-              <tr id="preorder-detail-<?=$preorder->id?>" style="display:none; background-color:#fff">
-                <td colspan="13">
-                  <?php include(realpath(dirname(__FILE__))."/include/preorder-detail.php"); ?>
-                </td>
-              </tr>
-              <tr style="display:none;"></tr>
-              <?php endif; ?>
-              
-              <?php endforeach; ?>
-            </table>
-              </div>
-            
-<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>            
-<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
-            
-          </div>
+                    <div class="row hidden" id="map-row">
+                        <div id="preorder-map" style="height:70vh; width: 100%"></div>
+                        <div class="row mt-1">
+                            <div class="col">
+                                <button type="button" class="btn btn-sm btn-outline-secondary" onclick="centerMap()"><i class="far fa-dot-circle fa-fw"></i> Zentrieren</button>
+                                <button type="button" class="btn btn-sm btn-outline-success" onclick="toggleTileset()" title="Zwischen Karte und Satellitenbild umschalten"><i class="far fa-arrow-right-arrow-left fa-fw"></i> Karte/Satellit</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+
+            <div class="card">
+                <div class="card-body mb-3">
+
+                    <div class="preorder-campaign-header">
+                        <h4 class="header-title">Liste aller Vorbestellungen<?= (isset($campaign) && $campaign) ? " - " . $campaign->name : "" ?></h4>
+                        <?php if ($filter['preordercampaign_id']): ?>
+                            <div class="float-right">
+                                <a class="btn btn-primary mb-2"
+                                   href="<?= self::getUrl("Preorder", "add", ["preordercampaign_id" => $filter['preordercampaign_id']]) ?>"><i
+                                            class="fas fa-plus"></i> Neue Vorbestellung anlegen</a>
+                            </div>
+                        <?php endif; ?>
+                    </div>
+
+
+                    <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
+                    <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
+
+                    <div class="preorder-campaign-table-wrapper">
+                        <table class="table table-striped table-hover">
+                            <tr>
+                                <?php if(!$me->is(["preorderfront"]) && !$me->is("preorderreadonly")): ?>
+                                    <th></th>
+                                <?php endif; ?>
+                                <?php if(!$me->is("preorderfront")): ?><th>Kampagne</th><?php endif; ?>
+                                <th>Bestelltyp<br />Bestellcode</th>
+                                <th>Status</th>
+                                <th>Anschlussadresse</th>
+                                <th>Anschlüsse<br />OAID</th>
+                                <th>Kunde</th>
+                                <th>Kontakt</th>
+                                <th>Partner</th>
+                                <th>Attribute</th>
+                                <th>Erstellt<br />Bearbeitet</th>
+                                <?php if($me->is(["Admin","netowner"])): ?>
+                                    <th></th>
+                                <?php endif; ?>
+                                <th></th>
+                            </tr>
+                            <?php foreach($preorders as $preorder): ?>
+                                <tr class="preorder-list-tr" id="preorder-<?=$preorder->id?>">
+                                    <?php if(!$me->is(["preorderfront"]) && !$me->is("preorderreadonly")): ?>
+                                        <td class="bg-lightblue border border-end text-center pointer" onclick="togglePreorder(<?=$preorder->id?>); return false;">
+                                            <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 />
+                                        <?=$preorder->ucode?>
+                                    </td>
+                                    <td class="status"><?=$preorder->status->code?> - <?=$preorder->status->name?></td>
+                                    <?php if($preorder->building_id): ?>
+                                        <td><?=$preorder->building->street?><br /><?=$preorder->building->zip?> <?=$preorder->building->city?></td>
+                                    <?php elseif($preorder->adb_hausnummer_id): ?>
+                                        <td <?=($preorder->address_created) ? "class='alert-warning' title='Adresse manuell angelegt'" : ""?>">
+                                        <?=$preorder->adb_hausnummer->strasse->name?>
+                                        <?=$preorder->adb_hausnummer->hausnummer?><?=($preorder->adb_hausnummer->stiege) ? "/".$preorder->adb_hausnummer->stiege : ""?><br />
+                                        <?=($preorder->adb_wohneinheit_id) ? ((string)$preorder->adb_wohneinheit ? $preorder->adb_wohneinheit."<br />" : "") : "<i class='text-pink'>&lt;keine Wohneinheit&gt;</i><br />"?>
+                                        <?=$preorder->adb_hausnummer->plz->plz?>
+                                        <?=$preorder->adb_hausnummer->ortschaft->name?><br />
+                                        <?=$preorder->adb_hausnummer->strasse->gemeinde->name?>
+                                        </td>
+                                    <?php else: ?>
+                                        <td></td>
+                                    <?php endif; ?>
+                                    <td>
+                                        <?=($preorder->connection_count) ? $preorder->connection_count : 1?><br />
+                                        <span class="text-pink"><?=$preorder->oaid?></span>
+                                    </td>
+                                    <td>
+                                        <?=($preorder->company) ? $preorder->company : $preorder->firstname." ".$preorder->lastname?><br />
+                                        <?=$preorder->street?><?=($preorder->housenumber) ? " ".$preorder->housenumber : ""?><br />
+                                        <?=$preorder->zip?> <?=$preorder->city?>
+                                    </td>
+                                    <td>
+                                        <?=($preorder->phone) ? $preorder->phone."<br />" : ""?>
+                                        <?=($preorder->email) ? $preorder->email : ""?>
+                                    </td>
+
+                                    <td><?=($preorder->partner_id) ? $preorder->partner->getCompanyOrName() : ""?></td>
+                                    <td>
+                                        <label><input type="checkbox" name="attributes_bep_specified" id="attributes_bep_specified-<?=$preorder->id?>" data-preorder-id="<?=$preorder->id?>" value="1" <?=(is_array($preorder->attribute) && array_key_exists("bep_specified", $preorder->attribute) && $preorder->attribute["bep_specified"]) ? "checked='checked'" : ""?> /> Borderpoint festgelegt</label><br />
+                                        <label><input type="checkbox" name="attributes_inhouse_cabling_supplied" id="attributes_inhouse_cabling_supplied-<?=$preorder->id?>" data-preorder-id="<?=$preorder->id?>" value="1" <?=(is_array($preorder->attribute) && array_key_exists("inhouse_cabling_supplied", $preorder->attribute) && $preorder->attribute["inhouse_cabling_supplied"]) ? "checked='checked'" : ""?> /> Starterpaket erhalten</label>
+                                    </td>
+                                    <td style="white-space: nowrap" class="text-monospace">
+                                        <?=date('d.m.Y H:i', $preorder->create)?><br />
+                                        <span id="update-<?=$preorder->id?>"><?=date('d.m.Y H:i', $preorder->edit)?></span>
+                                    </td>
+
+                                    <?php if($me->is(["Admin", "netowner"])): ?>
+                                        <td><?php if($preorder->adb_wohneinheit_id && is_array($preorder->adb_wohneinheit->rimo_workorders) && count($preorder->adb_wohneinheit->rimo_workorders)):?><i class="fas fa-r" title="Rimo Workorder erstellt"></i><?php endif; ?></td>
+                                    <?php endif; ?>
+                                    <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
+                                        <div class="preorder-campaign-table-actions">
+                                            <?php if(!$me->is(["preorderfront"]) && !$me->is("preorderreadonly")): ?>
+                                                <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; ?>
+                                        </div>
+                                    </td>
+                                </tr>
+                                <?php if(!$me->is(["preorderfront"]) && !$me->is("preorderreadonly")): ?>
+                                    <tr id="preorder-detail-<?=$preorder->id?>" style="display:none; background-color:#fff">
+                                        <td colspan="13">
+                                            <?php include(realpath(dirname(__FILE__))."/include/preorder-detail.php"); ?>
+                                        </td>
+                                    </tr>
+                                    <tr style="display:none;"></tr>
+                                <?php endif; ?>
+
+                            <?php endforeach; ?>
+                        </table>
+                    </div>
+
+                    <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
+                    <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
+
+                </div>
+            </div>
+
         </div>
-        
-      </div>
     </div>
 
-    
+
     <script type="text/javascript">
-      $(document).ready(function() {
-        $("#filter_type").select2({closeOnSelect: false});
-        $("#filter_status").select2({closeOnSelect: false});
-        $("#filter_partner_id").select2({closeOnSelect: false});
-        $("#filter_preordercampaign_id").select2({closeOnSelect: false});
-        $("#connection_type_id").select2({closeOnSelect: false});
-        
-        var attributes = ["bep_specified", "inhouse_cabling_supplied"];
-        
-        
-        
-        attributes.forEach(function(attrib) {
-          $("input[name=attributes_" + attrib + "]").change(function(ev) {
-            // save new value
-            var cb = $("#" + ev.currentTarget.id);
-            var value = $(cb).is(":checked") ? 1 : 0;
-            var preorder_id = $(cb).data("preorder-id");
-            
-            $.post("<?=self::getUrl("Preorder", "Api")?>", {
-                do: "saveAttribute",
-                id: preorder_id,
-                attribute: attrib,
-                value: value
-              },
-              function(success) {
-                if(success.status == "OK") {
-                  attributeSuccess(success.result);
-                } else {
-                  attributeError(success.result.id, success.result.attribute);
-                }
-              },
-              "json"
-            );
-            
-          });
+        $(document).ready(function() {
+            $("#filter_type").select2({closeOnSelect: false});
+            $("#filter_status").select2({closeOnSelect: false});
+            $("#filter_partner_id").select2({closeOnSelect: false});
+            $("#connection_type_id").select2({closeOnSelect: false});
+
+            var attributes = ["bep_specified", "inhouse_cabling_supplied"];
+
+
+
+            attributes.forEach(function(attrib) {
+                $("input[name=attributes_" + attrib + "]").change(function(ev) {
+                    // save new value
+                    var cb = $("#" + ev.currentTarget.id);
+                    var value = $(cb).is(":checked") ? 1 : 0;
+                    var preorder_id = $(cb).data("preorder-id");
+
+                    $.post("<?=self::getUrl("Preorder", "Api")?>", {
+                            do: "saveAttribute",
+                            id: preorder_id,
+                            attribute: attrib,
+                            value: value
+                        },
+                        function(success) {
+                            if(success.status == "OK") {
+                                attributeSuccess(success.result);
+                            } else {
+                                attributeError(success.result.id, success.result.attribute);
+                            }
+                        },
+                        "json"
+                    );
+
+                });
+            });
         });
-      });
-      
-      function attributeSuccess(result) {
-        var id = result.id
-        var attribute = result.attribute
-        var update = result.update
-        
-        $("#attributes_" + attribute + "-" + id).parent().removeClass("text-danger");
-        $("#attributes_" + attribute + "-" + id).parent().addClass("text-success");
-        if(update) {
-          $("#update-" + id).text(update);
-          $("#update-" + id).addClass("text-success")
+
+        function attributeSuccess(result) {
+            var id = result.id
+            var attribute = result.attribute
+            var update = result.update
+
+            $("#attributes_" + attribute + "-" + id).parent().removeClass("text-danger");
+            $("#attributes_" + attribute + "-" + id).parent().addClass("text-success");
+            if(update) {
+                $("#update-" + id).text(update);
+                $("#update-" + id).addClass("text-success")
+            }
+            setTimeout(function() {
+                $("#attributes_" + attribute + "-" + id).parent().removeClass("text-success");
+                $("#update-" + id).removeClass("text-success")
+            }, 2000, id, attribute);
         }
-        setTimeout(function() {
-          $("#attributes_" + attribute + "-" + id).parent().removeClass("text-success");
-          $("#update-" + id).removeClass("text-success")
-        }, 2000, id, attribute);
-      }
-      
-      function attributeError(id, attribute) {
-        $("#attributes_" + attribute + "-" + id).parent().addClass("text-danger");
-        $("#attributes_" + attribute + "-" + id).prop("checked", !$("#attributes_" + attribute + "-" + id).is(":checked"));
-      }
-     
-     
-     
-      /*
-      * Globals for map display
-      */
-      var borderpoly = [];
-      <?php if(isset($campaign) && $campaign && $campaign->adb_netzgebiet): ?>
+
+        function attributeError(id, attribute) {
+            $("#attributes_" + attribute + "-" + id).parent().addClass("text-danger");
+            $("#attributes_" + attribute + "-" + id).prop("checked", !$("#attributes_" + attribute + "-" + id).is(":checked"));
+        }
+
+
+
+        /*
+        * Globals for map display
+        */
+        var borderpoly = [];
+        <?php if(isset($campaign) && $campaign && $campaign->adb_netzgebiet): ?>
         borderpoly = <?=($campaign->adb_netzgebiet->borderpoly) ? $campaign->adb_netzgebiet->borderpoly : "[]"?>;
-      <?php elseif($me->is("Admin")): ?>
+        <?php elseif($me->is("Admin")): ?>
         borderpoly = [];
         <?php foreach(ADBNetzgebietModel::search(["borderpoly" => true]) as $bp_netz): ?>
-          borderpoly.push(<?=$bp_netz->borderpoly?>);
+        borderpoly.push(<?=$bp_netz->borderpoly?>);
         <?php endforeach; ?>
-      <?php endif; ?>
-      
-      var preorderMap;
-      var preorders = [];
-      var markers = [];
-      var markerState = true;
-      var mapCenterPos = [<?=TT_PLACEHOLDER_GPS_LAT?>, <?=TT_PLACEHOLDER_GPS_LONG?>];
-      var tileLayers = {};
-      var tilesets = {
-        "geolandbasemap": {name: "geolandbasemap", imgtype: "png"},
-        "bmaporthofoto30cm": {name: "bmaporthofoto30cm", imgtype: "jpeg"}
-      };
-      var currentTileset = "geolandbasemap";
-      
-      
-      
-      function toggleTileset() {
-        if(currentTileset == "geolandbasemap") {
-          currentTileset = "bmaporthofoto30cm";
-        } else {
-          currentTileset = "geolandbasemap";
-        }
-        renderMap(true);
-      }
-      
-      function refreshMap() {
-        // get Preorders and render map
-        $('#map-link').hide();
-        $('#map-row').show();
-        getMapdata();
-        $([document.documentElement, document.body]).animate({
-          scrollTop: $("#preorder-map").offset().top - 150
-        }, 500);
-      }
+        <?php endif; ?>
+
+        var preorderMap;
+        var preorders = [];
+        var markers = [];
+        var markerState = true;
+        var mapCenterPos = [<?=TT_PLACEHOLDER_GPS_LAT?>, <?=TT_PLACEHOLDER_GPS_LONG?>];
+        var tileLayers = {};
+        var tilesets = {
+            "geolandbasemap": {name: "geolandbasemap", imgtype: "png"},
+            "bmaporthofoto30cm": {name: "bmaporthofoto30cm", imgtype: "jpeg"}
+        };
+        var currentTileset = "geolandbasemap";
+
+
+
+        function toggleTileset() {
+            if(currentTileset == "geolandbasemap") {
+                currentTileset = "bmaporthofoto30cm";
+            } else {
+                currentTileset = "geolandbasemap";
+            }
+            renderMap(true);
+        }
+
+        function refreshMap() {
+            // get Preorders and render map
+            $('#map-link').hide();
+            $('#map-row').show();
+            getMapdata();
+            $([document.documentElement, document.body]).animate({
+                scrollTop: $("#preorder-map").offset().top - 150
+            }, 500);
+        }
+
+        function renderMap(tilesetChangeOnly = false) {
+            if(preorderMap) {
+                if(!tilesetChangeOnly) {
+                    markers.forEach(function(m) {
+                        preorderMap.removeLayer(m);
+                    });
+                }
+            } else {
+                preorderMap = L.map('preorder-map', {fullscreenControl: true, centerControl: true, switchviewControl: true}).setView([<?=TT_PLACEHOLDER_GPS_LAT?>, <?=TT_PLACEHOLDER_GPS_LONG?>], 12);
+            }
+
+            if(!(currentTileset in tileLayers)) {
+                tileLayers[currentTileset] = L.tileLayer('https://mapsneu.wien.gv.at/basemap/{id}/normal/google3857/{z}/{y}/{x}.{imgtype}', {
+                    attribution: '&copy; <a href="https://basemap.at">Basemap.at</a>',
+                    minZoom: 6,
+                    maxZoom: 19,
+                    id: tilesets[currentTileset].name,
+                    imgtype: tilesets[currentTileset].imgtype
+                });
+            }
+
+            tileLayers[currentTileset].addTo(preorderMap);
+
+            for(const [name, t] of Object.entries(tilesets)) {
+                if(name != currentTileset && preorderMap.hasLayer(tileLayers[name])) {
+                    preorderMap.removeLayer(tileLayers[name]);
+                }
+            }
+
+            L.MakiMarkers.accessToken = '<?=TT_MAPBOX_TILE_API_TOKEN?>';
+
+            if(!tilesetChangeOnly) {
+                addMarkers();
+            }
+        }
+
+
+
+        function addMarkers() {
+            if(borderpoly) {
+                var border = L.polygon(borderpoly, {
+                    fillColor: 'blue',
+                    weight: 8,
+                    opacity: 0.5,
+                    color: 'violet',  //Outline color
+                    fillOpacity: 0.05
+                }).addTo(preorderMap);
+            }
+
+            if(!Array.isArray(preorders) | !preorders.length) {
+                return false;
+            }
+            // draw markers and calculate center position
+            var all_coords = [];
+            preorders.forEach(function(preorder) {
+                if(!preorder.gps_lat || !preorder.gps_long) {
+                    return;
+                }
+                var gps = [preorder.gps_lat, preorder.gps_long];
+                all_coords.push(gps);
+
+                var icon_color = "#acf0ab";
+                var icon_name = "home";
+
+                if(preorder.type == "interest") {
+                    icon_color = "#ec98a2";
+                } else if(preorder.type == "provision") {
+                    icon_color = "#ffcd8b";
+                }
+
+                if(preorder.connection_type.match(/^multi/i) || preorder.count > 1) {
+                    icon_name = "town";
+                } else if(preorder.connection_type.match(/^apartment-building/i)) {
+                    icon_name = "city";
+                } else if(preorder.connection_type.match(/^business/i)) {
+                    icon_name = "industry";
+                }
+
+                var marker_popup_content = '<?php include(realpath(dirname(__FILE__))."/include/preorder_popup.php");?>';
+
+                // popup fields
+                [
+                    ["street", preorder.adb_strasse],
+                    ["hausnummer", preorder.adb_hausnummer],
+                    ["zip", preorder.adb_plz],
+                    ["city", preorder.adb_ort],
+                    ["type", preorder.type_label],
+                    ["typestyle", "color: #000; background-color: " + icon_color],
+                    ["adrcd", preorder.adrcd],
+                    ["extref", preorder.extref ? preorder.extref : ""],
+                    ["gps", (preorder.gps_lat && preorder.gps_long) ? preorder.gps_lat + ", " + preorder.gps_long : ""],
+                    ["contact", (preorder.company ? preorder.company + " " : preorder.firstname + " " + preorder.lastname)],
+                    ["phone", preorder.phone ? preorder.phone : ""],
+                    ["email", preorder.email ? preorder.email : ""],
+                    ["connectiontype", preorder.connection_type_label],
+                    ["count", preorder.connection_count]
+                ].forEach(function(item) {
+                    marker_popup_content = marker_popup_content.replaceAll("{{" + item[0].toUpperCase() + "}}", item[1]);
+                });
+
+                var icon = L.MakiMarkers.icon({icon: icon_name, color: icon_color, size: "l"});
+                var marker = L.marker(gps, {icon: icon}).addTo(preorderMap).bindPopup(marker_popup_content);
+                markers[preorder.id] = marker;
+
+                <?php if($me->is("Admin")): ?>
+                if(preorder.borderpoint_lat && preorder.borderpoint_long) {
+                    var circle = L.circle([preorder.borderpoint_lat,preorder.borderpoint_long], {
+                        color: 'orange',
+                        fillColor: 'aqua',
+                        fillOpacity: 0.8,
+                        radius: 1
+                    }).bindTooltip(preorder.borderpoint_lat + ", " + preorder.borderpoint_long).addTo(preorderMap);
+                }
+
+                /*if(preorder.trenches) {
+                  preorder.trenches.forEach((trench) => {
+                    var trench_line = L.polyline(trench, {
+                      color: "limegreen"
+                    }).addTo(preorderMap);
+                  });
+                }*/
+
+                if(preorder.home_trench) {
+                    var home_line = L.polyline(preorder.home_trench, {
+                        color: "aqua"
+                    }).addTo(preorderMap);
+                }
+                <?php endif; ?>
 
-      function renderMap(tilesetChangeOnly = false) {
-        if(preorderMap) {
-          if(!tilesetChangeOnly) {
-            markers.forEach(function(m) {
-              preorderMap.removeLayer(m);
             });
-          }
-        } else {
-          preorderMap = L.map('preorder-map', {fullscreenControl: true, centerControl: true, switchviewControl: true}).setView([<?=TT_PLACEHOLDER_GPS_LAT?>, <?=TT_PLACEHOLDER_GPS_LONG?>], 12);
+
+
+            // calculate center position
+            mapCenterPos = GetCenterFromDegrees(all_coords);
+            preorderMap.setView(mapCenterPos, 12);
+
+            return true;
         }
-        
-        if(!(currentTileset in tileLayers)) {
-          tileLayers[currentTileset] = L.tileLayer('https://mapsneu.wien.gv.at/basemap/{id}/normal/google3857/{z}/{y}/{x}.{imgtype}', {
-            attribution: '&copy; <a href="https://basemap.at">Basemap.at</a>',
-            minZoom: 6,
-            maxZoom: 19,
-            id: tilesets[currentTileset].name,
-            imgtype: tilesets[currentTileset].imgtype
-          });
+
+        function centerMap() {
+            preorderMap.setView(mapCenterPos, 12);
         }
-        
-        tileLayers[currentTileset].addTo(preorderMap);
-        
-        for(const [name, t] of Object.entries(tilesets)) {
-          if(name != currentTileset && preorderMap.hasLayer(tileLayers[name])) {
-            preorderMap.removeLayer(tileLayers[name]);
-          }
+
+        // gets preorders and calls renderMap()
+        function getMapdata() {
+            filter = getFilter();
+
+            $.post('<?=self::getUrl("Preorder", "Api")?>', {
+                    'do': "getFilteredPreorders",
+                    filter: filter
+                },function(success) {
+                    if(success.status == "OK") {
+
+                        if(Array.isArray(success.result.preorders)) {
+                            preorders = success.result.preorders;
+                            renderMap();
+                        }
+                    }
+                },
+                'json'
+            );
+
         }
-        
-        L.MakiMarkers.accessToken = '<?=TT_MAPBOX_TILE_API_TOKEN?>';
-        
-        if(!tilesetChangeOnly) {
-          addMarkers();
+
+        function getFilter() {
+            var fields = ['preordercampaign_id', 'status', 'type', 'address', 'kunde', 'address_source'];
+            var filter = {};
+            fields.forEach(function(field) {
+                if(!field) {
+                    return;
+                }
+                if(!$('#filter_' + field).length) {
+                    return;
+                }
+                let val = $('#filter_' + field).val();
+                if(val.length) {
+                    filter[field] = val;
+                }
+            });
+
+            return filter;
         }
-      }
 
-
-
-      function addMarkers() {
-        if(borderpoly) {
-          var border = L.polygon(borderpoly, {
-            fillColor: 'blue',
-            weight: 8,
-            opacity: 0.5,
-            color: 'violet',  //Outline color
-            fillOpacity: 0.05
-          }).addTo(preorderMap);
-        }
-        
-        if(!Array.isArray(preorders) | !preorders.length) {
-          return false;
-        }
-        // draw markers and calculate center position
-        var all_coords = [];
-        preorders.forEach(function(preorder) {
-          if(!preorder.gps_lat || !preorder.gps_long) {
-            return;
-          }
-          var gps = [preorder.gps_lat, preorder.gps_long];
-          all_coords.push(gps);
-
-          var icon_color = "#acf0ab";
-          var icon_name = "home";
-
-          if(preorder.type == "interest") {
-            icon_color = "#ec98a2";
-          } else if(preorder.type == "provision") {
-            icon_color = "#ffcd8b";
-          }
-          
-          if(preorder.connection_type.match(/^multi/i) || preorder.count > 1) {
-            icon_name = "town";
-          } else if(preorder.connection_type.match(/^apartment-building/i)) {
-            icon_name = "city";
-          } else if(preorder.connection_type.match(/^business/i)) {
-            icon_name = "industry";
-          }
-          
-          var marker_popup_content = '<?php include(realpath(dirname(__FILE__))."/include/preorder_popup.php");?>';
-
-          // popup fields
-          [
-            ["street", preorder.adb_strasse],
-            ["hausnummer", preorder.adb_hausnummer],
-            ["zip", preorder.adb_plz],
-            ["city", preorder.adb_ort],
-            ["type", preorder.type_label],
-            ["typestyle", "color: #000; background-color: " + icon_color],
-            ["adrcd", preorder.adrcd],
-            ["extref", preorder.extref ? preorder.extref : ""],
-            ["gps", (preorder.gps_lat && preorder.gps_long) ? preorder.gps_lat + ", " + preorder.gps_long : ""],
-            ["contact", (preorder.company ? preorder.company + " " : preorder.firstname + " " + preorder.lastname)],
-            ["phone", preorder.phone ? preorder.phone : ""],
-            ["email", preorder.email ? preorder.email : ""],
-            ["connectiontype", preorder.connection_type_label],
-            ["count", preorder.connection_count]
-          ].forEach(function(item) {
-            marker_popup_content = marker_popup_content.replaceAll("{{" + item[0].toUpperCase() + "}}", item[1]);
-          });
-
-          var icon = L.MakiMarkers.icon({icon: icon_name, color: icon_color, size: "l"});
-          var marker = L.marker(gps, {icon: icon}).addTo(preorderMap).bindPopup(marker_popup_content);
-          markers[preorder.id] = marker;
-          
-          <?php if($me->is("Admin")): ?>
-            if(preorder.borderpoint_lat && preorder.borderpoint_long) {
-              var circle = L.circle([preorder.borderpoint_lat,preorder.borderpoint_long], {
-                color: 'orange',
-                fillColor: 'aqua',
-                fillOpacity: 0.8,
-                radius: 1
-              }).bindTooltip(preorder.borderpoint_lat + ", " + preorder.borderpoint_long).addTo(preorderMap);
-            }
-            
-            /*if(preorder.trenches) {
-              preorder.trenches.forEach((trench) => {
-                var trench_line = L.polyline(trench, {
-                  color: "limegreen"
-                }).addTo(preorderMap);
-              });
-            }*/
-
-            if(preorder.home_trench) {
-              var home_line = L.polyline(preorder.home_trench, {
-                color: "aqua"
-                }).addTo(preorderMap);
-            }
-          <?php endif; ?>
-            
-        });
-        
-        
-        // calculate center position
-        mapCenterPos = GetCenterFromDegrees(all_coords);
-        preorderMap.setView(mapCenterPos, 12);
-
-        return true;
-      }
-
-      function centerMap() {
-        preorderMap.setView(mapCenterPos, 12);
-      }
-
-      // gets preorders and calls renderMap()
-      function getMapdata() {
-        filter = getFilter();
-
-        $.post('<?=self::getUrl("Preorder", "Api")?>', {
-          'do': "getFilteredPreorders",
-          filter: filter
-        },function(success) {
-          if(success.status == "OK") {
-            
-            if(Array.isArray(success.result.preorders)) {
-              preorders = success.result.preorders;
-              renderMap();
-            }
-          }
-        },
-        'json'
-        );
-
-      }
-
-      function getFilter() {
-        var fields = ['preordercampaign_id', 'status', 'type', 'address', 'kunde', 'address_source'];
-        var filter = {};
-        fields.forEach(function(field) {
-          if(!field) {
-            return;
-          }
-          if(!$('#filter_' + field).length) {
-            return;
-          }
-          let val = $('#filter_' + field).val();
-          if(val.length) {
-            filter[field] = val;
-          }
-        });
-
-        return filter;
-      }
-
-      <?php if(is_array($filter) && count($filter)): ?>
+        <?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");
-          history.replaceState(null, null, ' ');
-        } else {
-          $('#preorder-' + id).addClass("text-info");
-          $('#preorder-' + id).addClass("bg-lightblue");
-          location.hash = "preorder=" + id;
-          return false;
+        <?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");
+                history.replaceState(null, null, ' ');
+            } else {
+                $('#preorder-' + id).addClass("text-info");
+                $('#preorder-' + id).addClass("bg-lightblue");
+                location.hash = "preorder=" + id;
+                return false;
+            }
         }
-      }
 
-      $("input.preorder-statusflag").change((e) => {
-          var elem = e.target;
-          var preorder_id = $(elem).data("preorder_id");
-          var flag_id = $(elem).data("flag_id");
-          var value = $(elem).prop("checked") ? 1 : 0;
+        $("input.preorder-statusflag").change((e) => {
+            var elem = e.target;
+            var preorder_id = $(elem).data("preorder_id");
+            var flag_id = $(elem).data("flag_id");
+            var value = $(elem).prop("checked") ? 1 : 0;
 
-          $.ajax({
-              url: "<?=self::getUrl("Preorder", "api")?>",
-              type: "POST",
-              data: {
-                  do: "setStatusFlag",
-                  preorder_id: preorder_id,
-                  flag_id: flag_id,
-                  value: value
-              },
-              dataType: "json",
-              context: {
-                  elem: elem,
-                  preorder_id: preorder_id,
-                  flag_id: flag_id,
-              },
-              success: function (success) {
-                  var textelem = $("#preorder-" + this.preorder_id + "-statusflag-" + this.flag_id + "-text");
-                  if(success.status != "OK") {
-                      notify("error","Fehler beim Speichern des Statusflags");
-                      $(this.elem).prop("checked", !$(this.elem).prop("checked"));
-                  } else {
-                      textelem.removeClass("text-danger").addClass("text-success");
-                      setTimeout(function() {
-                          textelem.removeClass("text-success");
-                          textelem.removeClass("text-success")
-                      }, 2000, textelem);
-                  }
+            $.ajax({
+                url: "<?=self::getUrl("Preorder", "api")?>",
+                type: "POST",
+                data: {
+                    do: "setStatusFlag",
+                    preorder_id: preorder_id,
+                    flag_id: flag_id,
+                    value: value
+                },
+                dataType: "json",
+                context: {
+                    elem: elem,
+                    preorder_id: preorder_id,
+                    flag_id: flag_id,
+                },
+                success: function (success) {
+                    var textelem = $("#preorder-" + this.preorder_id + "-statusflag-" + this.flag_id + "-text");
+                    if(success.status != "OK") {
+                        notify("error","Fehler beim Speichern des Statusflags");
+                        $(this.elem).prop("checked", !$(this.elem).prop("checked"));
+                    } else {
+                        textelem.removeClass("text-danger").addClass("text-success");
+                        setTimeout(function() {
+                            textelem.removeClass("text-success");
+                            textelem.removeClass("text-success")
+                        }, 2000, textelem);
+                    }
 
 
-              },
-              error: function () {
-                  notify("error","Fehler beim Speichern des Statusflags");
-                  $(this.elem).prop("checked", !$(this.elem).prop("checked"));
-              }
+                },
+                error: function () {
+                    notify("error","Fehler beim Speichern des Statusflags");
+                    $(this.elem).prop("checked", !$(this.elem).prop("checked"));
+                }
 
-          });
-
-      });
-      
-      // navigation
-      var preorder_id;
-      var hash = window.location.hash.substr(1);
-      var match = hash.match(/preorder=(\d+)/);
-      if(match && match[1]) {
-        preorder_id = match[1]
-        togglePreorder(preorder_id);
-        $('html, body').animate( {scrollTop: $('#preorder-' + preorder_id).offset().top - 230}, 200);
-      }
-      
-      
-      /*
-       * Borderpoint map
-       */
-      
-      var maps = {};
-  
-      function loadBorderpointMap(id) {
-        var lat = $("#preorder-detail-" + id + "-map").data("lat");
-        var long = $("#preorder-detail-" + id + "-map").data("long");
-
-        var blat = $("#preorder-detail-" + id + "-map").data("blat");
-        var blong = $("#preorder-detail-" + id + "-map").data("blong");
-
-        var trenches = $("#preorder-detail-" + id + "-map").data("trench");
-        var home_trench = $("#preorder-detail-" + id + "-map").data("home-trench");
-
-        if(!("map-" + id in maps)) {
-
-          var map = L.map('preorder-map-' + id).setView([lat, long], 19);
-          
-          var tileLayer = L.tileLayer('https://mapsneu.wien.gv.at/basemap/{id}/normal/google3857/{z}/{y}/{x}.{imgtype}', {
-            attribution: '&copy; <a href="https://basemap.at">Basemap.at</a>',
-            minZoom: 12,
-            maxZoom: 19,
-            id: "bmaporthofoto30cm",
-            imgtype: "jpeg"
-          }).addTo(map);
-
-          var circle = L.circle([lat,long], {
-            color: 'orange',
-            fillColor: 'orange',
-            fillOpacity: 0.5,
-            radius: 1
-          }).bindTooltip(lat + ", " + long).addTo(map);
-
-          if(trenches) {
-            trenches.forEach((trench) => {
-              var trench_line = L.polyline(trench, {
-                color: "maroon",
-                weight: 7
-              }).addTo(map);
             });
-          }
 
-          if(home_trench) {
-            var home_line = L.polyline(home_trench, {
-              color: "blue",
-              weight: 7
-              }).addTo(map);
-          }
+        });
 
-          maps["map-" + id] = map;
-
-          setTimeout((id) => {maps["map-" + id].invalidateSize()}, 50, id);
-        }
-      }
-      
-      
-      // detail
-      function togglePortdata(pid) {
-        $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").val($("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").data("default"));
-        $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").val($("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").data("default"));
-        $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").val($("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").data("default"));
-
-        $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").val($("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").data("default"));
-
-
-        $("#preorder-detail-" + pid + "-patchposition-data-form").toggle();
-        $("#preorder-detail-" + pid + "-patchposition-string").toggle();
-
-        $("#preorder-detail-" + pid + "-patchposition-port-form").toggle();
-        $("#preorder-detail-" + pid + "-patchposition-port").toggle();
-
-        $("#preorder-detail-" + pid + "-patchposition-edit").toggle();
-        $("#preorder-detail-" + pid + "-patchposition-controls").toggle();
-
-      }
-
-      function savePortdata(pid) {
-        if(!pid) return;
-
-        var cluster = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").val();
-        var shelf = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").val();
-        var module = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").val();
-        var port = $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").val();
-
-        $.post("<?=self::getUrl("Preorder", "Api")?>", {
-            do: "savePatchposition",
-            id: pid,
-            cluster: cluster,
-            shelf: shelf,
-            module: module,
-            port: port
-          },
-          (success) => {
-            if(success.status == "OK") {
-              var pid = success.result.id;
-              var default_cluster = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").data("default");
-              var cluster = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").val();
-              var shelf = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").val();
-              var module = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").val();
-              var port = $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").val();
-
-              if(!cluster) cluster = default_cluster;
-
-              $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").data("default", cluster);
-              $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").data("default", shelf);
-              $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").data("default", module);
-              $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").data("default", port);
-              $("#preorder-detail-" + pid + "-patchposition-string").text(cluster + "-" + shelf + "-" + module);
-              $("#preorder-detail-" + pid + "-patchposition-port").text(port);
-              togglePortdata(pid);
-
-            }
-          },
-          "json"
-        );
-      }
-
-      function toggleStatusControl(pid, sid) {
-        // set select to current status id
-        $("#preorder-detail-status-" + pid + "-input select").val($("#preorder-detail-status-" + pid + "-text").data("status-id"));
-
-        // toggle controls
-        $("#preorder-detail-status-" + pid + "-text").toggle();
-        $("#preorder-detail-status-" + pid + "-input").toggle();
-
-        return false;
-      }
-
-      function savePreorderStatusControl(pid) {
-        if(!Number.isInteger(pid) || pid < 1) {
-          return false;
+        // navigation
+        var preorder_id;
+        var hash = window.location.hash.substr(1);
+        var match = hash.match(/preorder=(\d+)/);
+        if(match && match[1]) {
+            preorder_id = match[1]
+            togglePreorder(preorder_id);
+            $('html, body').animate( {scrollTop: $('#preorder-' + preorder_id).offset().top - 230}, 200);
         }
 
-        var value = $("#preorder-detail-status-" + pid + "-input select").val();
 
-        //console.log("add opacity-5 to ")
-        $("#preorder-" + pid + "-body").addClass("opacity-5");
-        $("#preorder-" + pid + "-body .loader-big").show();
+        /*
+         * Borderpoint map
+         */
 
-        // reset loading overlay if request times out
-        setTimeout(() => {
-          $("#preorder-" + pid + "-body").removeClass("opacity-5");
-          $("#preorder-" + pid + "-body .loader-big").hide();
-        }, 5000);
+        var maps = {};
 
-        $.post("<?=self::getUrl("Preorder","Api")?>",
-        {
-          'do': "updateStatus",
-          id: pid,
-          status_id: value
-        },
-        function(success) {
-          if(success.status == "OK") {
-            var updates = success.result.updates;
-            //console.log(updates);
+        function loadBorderpointMap(id) {
+            var lat = $("#preorder-detail-" + id + "-map").data("lat");
+            var long = $("#preorder-detail-" + id + "-map").data("long");
 
-            updates.forEach(function(u) {
-              //console.log(u);
-              // update detail status text
-              $("#preorder-detail-status-" + u.id + "-statustext").text(u.code + " - " + u.text);
-              $("#preorder-detail-status-" + u.id + "-text").addClass("text-success");
-              setTimeout(() => { $("#preorder-detail-status-" + u.id + "-text").removeClass("text-success") }, 1500);
+            var blat = $("#preorder-detail-" + id + "-map").data("blat");
+            var blong = $("#preorder-detail-" + id + "-map").data("blong");
 
-              // update list status text
-              $("#preorder-" + u.id + " .status").text(u.code + " - " + u.text);
-              $("#preorder-" + u.id + " .status").addClass("text-success");
-              setTimeout(() => { $("#preorder-" + u.id + " .status").removeClass("text-success") }, 1500);
+            var trenches = $("#preorder-detail-" + id + "-map").data("trench");
+            var home_trench = $("#preorder-detail-" + id + "-map").data("home-trench");
 
-              // update status id data attribute
-              $("#preorder-detail-status-" + u.id + "-text").data("status-id", u.sid);
+            if(!("map-" + id in maps)) {
 
-              if(u.bcode) {
-                $("#preorder-detail-building-status-" + u.id).text(u.bcode + " - " + u.btext);
-              }
-              if(u.ucode) {
-                $("#preorder-detail-unit-status-" + u.id).text(u.ucode + " - " + u.utext);
-              }
+                var map = L.map('preorder-map-' + id).setView([lat, long], 19);
 
-              if(u.ciftoken) {
-                $("#preorder-detail-ciftoken-" + u.id).text(u.ciftoken);
-              }
-              if(u.cifcableurl) {
-                $("#preorder-detail-cifcableurl-" + u.id).text(u.cifcableurl);
-              }
-            });
-            /*
-            if("preorder" in update) {
-              // update detail status text
-              $("#preorder-detail-status-" + pid + "-statustext").text(update.preorder.status.code + " - " + update.preorder.status.text);
-              $("#preorder-detail-status-" + pid + "-text").addClass("text-success");
-              setTimeout(() => { $("#preorder-detail-status-" + pid + "-text").removeClass("text-success") }, 1500);
+                var tileLayer = L.tileLayer('https://mapsneu.wien.gv.at/basemap/{id}/normal/google3857/{z}/{y}/{x}.{imgtype}', {
+                    attribution: '&copy; <a href="https://basemap.at">Basemap.at</a>',
+                    minZoom: 12,
+                    maxZoom: 19,
+                    id: "bmaporthofoto30cm",
+                    imgtype: "jpeg"
+                }).addTo(map);
 
-              // update list status text
-              $("#preorder-" + pid + " .status").text(update.preorder.status.code + " - " + update.preorder.status.text);
-              $("#preorder-" + pid + " .status").addClass("text-success");
-              setTimeout(() => { $("#preorder-" + pid + " .status").removeClass("text-success") }, 1500);
+                var circle = L.circle([lat,long], {
+                    color: 'orange',
+                    fillColor: 'orange',
+                    fillOpacity: 0.5,
+                    radius: 1
+                }).bindTooltip(lat + ", " + long).addTo(map);
 
-              // update status id data attribute
-              $("#preorder-detail-status-" + pid + "-text").data("status-id", update.preorder.status.id);
+                if(trenches) {
+                    trenches.forEach((trench) => {
+                        var trench_line = L.polyline(trench, {
+                            color: "maroon",
+                            weight: 7
+                        }).addTo(map);
+                    });
+                }
+
+                if(home_trench) {
+                    var home_line = L.polyline(home_trench, {
+                        color: "blue",
+                        weight: 7
+                    }).addTo(map);
+                }
+
+                maps["map-" + id] = map;
+
+                setTimeout((id) => {maps["map-" + id].invalidateSize()}, 50, id);
+            }
+        }
+
+
+        // detail
+        function togglePortdata(pid) {
+            $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").val($("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").data("default"));
+            $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").val($("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").data("default"));
+            $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").val($("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").data("default"));
+
+            $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").val($("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").data("default"));
+
+
+            $("#preorder-detail-" + pid + "-patchposition-data-form").toggle();
+            $("#preorder-detail-" + pid + "-patchposition-string").toggle();
+
+            $("#preorder-detail-" + pid + "-patchposition-port-form").toggle();
+            $("#preorder-detail-" + pid + "-patchposition-port").toggle();
+
+            $("#preorder-detail-" + pid + "-patchposition-edit").toggle();
+            $("#preorder-detail-" + pid + "-patchposition-controls").toggle();
+
+        }
+
+        function savePortdata(pid) {
+            if(!pid) return;
+
+            var cluster = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").val();
+            var shelf = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").val();
+            var module = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").val();
+            var port = $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").val();
+
+            $.post("<?=self::getUrl("Preorder", "Api")?>", {
+                    do: "savePatchposition",
+                    id: pid,
+                    cluster: cluster,
+                    shelf: shelf,
+                    module: module,
+                    port: port
+                },
+                (success) => {
+                    if(success.status == "OK") {
+                        var pid = success.result.id;
+                        var default_cluster = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").data("default");
+                        var cluster = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").val();
+                        var shelf = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").val();
+                        var module = $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").val();
+                        var port = $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").val();
+
+                        if(!cluster) cluster = default_cluster;
+
+                        $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_cluster']").data("default", cluster);
+                        $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_shelf']").data("default", shelf);
+                        $("#preorder-detail-" + pid + "-patchposition-data-form input[name='patch_module']").data("default", module);
+                        $("#preorder-detail-" + pid + "-patchposition-port-form input[name='patch_port']").data("default", port);
+                        $("#preorder-detail-" + pid + "-patchposition-string").text(cluster + "-" + shelf + "-" + module);
+                        $("#preorder-detail-" + pid + "-patchposition-port").text(port);
+                        togglePortdata(pid);
+
+                    }
+                },
+                "json"
+            );
+        }
+
+        function toggleStatusControl(pid, sid) {
+            // set select to current status id
+            $("#preorder-detail-status-" + pid + "-input select").val($("#preorder-detail-status-" + pid + "-text").data("status-id"));
+
+            // toggle controls
+            $("#preorder-detail-status-" + pid + "-text").toggle();
+            $("#preorder-detail-status-" + pid + "-input").toggle();
+
+            return false;
+        }
+
+        function savePreorderStatusControl(pid) {
+            if(!Number.isInteger(pid) || pid < 1) {
+                return false;
             }
 
-            if("building" in update) {
-              // update building status text
-              $("#preorder-detail-building-status-" + pid).text(update.building.status.code + " - " + update.building.status.text);
+            var value = $("#preorder-detail-status-" + pid + "-input select").val();
+
+            //console.log("add opacity-5 to ")
+            $("#preorder-" + pid + "-body").addClass("opacity-5");
+            $("#preorder-" + pid + "-body .loader-big").show();
+
+            // reset loading overlay if request times out
+            setTimeout(() => {
+                $("#preorder-" + pid + "-body").removeClass("opacity-5");
+                $("#preorder-" + pid + "-body .loader-big").hide();
+            }, 5000);
+
+            $.post("<?=self::getUrl("Preorder","Api")?>",
+                {
+                    'do': "updateStatus",
+                    id: pid,
+                    status_id: value
+                },
+                function(success) {
+                    if(success.status == "OK") {
+                        var updates = success.result.updates;
+                        //console.log(updates);
+
+                        updates.forEach(function(u) {
+                            //console.log(u);
+                            // update detail status text
+                            $("#preorder-detail-status-" + u.id + "-statustext").text(u.code + " - " + u.text);
+                            $("#preorder-detail-status-" + u.id + "-text").addClass("text-success");
+                            setTimeout(() => { $("#preorder-detail-status-" + u.id + "-text").removeClass("text-success") }, 1500);
+
+                            // update list status text
+                            $("#preorder-" + u.id + " .status").text(u.code + " - " + u.text);
+                            $("#preorder-" + u.id + " .status").addClass("text-success");
+                            setTimeout(() => { $("#preorder-" + u.id + " .status").removeClass("text-success") }, 1500);
+
+                            // update status id data attribute
+                            $("#preorder-detail-status-" + u.id + "-text").data("status-id", u.sid);
+
+                            if(u.bcode) {
+                                $("#preorder-detail-building-status-" + u.id).text(u.bcode + " - " + u.btext);
+                            }
+                            if(u.ucode) {
+                                $("#preorder-detail-unit-status-" + u.id).text(u.ucode + " - " + u.utext);
+                            }
+
+                            if(u.ciftoken) {
+                                $("#preorder-detail-ciftoken-" + u.id).text(u.ciftoken);
+                            }
+                            if(u.cifcableurl) {
+                                $("#preorder-detail-cifcableurl-" + u.id).text(u.cifcableurl);
+                            }
+                        });
+                        /*
+                        if("preorder" in update) {
+                          // update detail status text
+                          $("#preorder-detail-status-" + pid + "-statustext").text(update.preorder.status.code + " - " + update.preorder.status.text);
+                          $("#preorder-detail-status-" + pid + "-text").addClass("text-success");
+                          setTimeout(() => { $("#preorder-detail-status-" + pid + "-text").removeClass("text-success") }, 1500);
+
+                          // update list status text
+                          $("#preorder-" + pid + " .status").text(update.preorder.status.code + " - " + update.preorder.status.text);
+                          $("#preorder-" + pid + " .status").addClass("text-success");
+                          setTimeout(() => { $("#preorder-" + pid + " .status").removeClass("text-success") }, 1500);
+
+                          // update status id data attribute
+                          $("#preorder-detail-status-" + pid + "-text").data("status-id", update.preorder.status.id);
+                        }
+
+                        if("building" in update) {
+                          // update building status text
+                          $("#preorder-detail-building-status-" + pid).text(update.building.status.code + " - " + update.building.status.text);
+                        }
+                        if("unit" in update) {
+                          // update unit status text
+                          $("#preorder-detail-unit-status-" + pid).text(update.unit.status.code + " - " + update.unit.status.text);
+                        }
+                        */
+                        toggleStatusControl(pid);
+
+                    }
+
+                    $("#preorder-" + pid + "-body").removeClass("opacity-5");
+                    $("#preorder-" + pid + "-body .loader-big").hide();
+                },
+                'json');
+        }
+
+        function createWorkorder(pid) {
+            if(!Number.isInteger(pid) || pid < 1) {
+                return false;
             }
-            if("unit" in update) {
-              // update unit status text
-              $("#preorder-detail-unit-status-" + pid).text(update.unit.status.code + " - " + update.unit.status.text);
-            }
-            */
-            toggleStatusControl(pid);
 
-          }
-
-          $("#preorder-" + pid + "-body").removeClass("opacity-5");
-          $("#preorder-" + pid + "-body .loader-big").hide();
-        },
-        'json');
-      }
-
-      function createWorkorder(pid) {
-          if(!Number.isInteger(pid) || pid < 1) {
-              return false;
-          }
-
-          $("#preorder-detail-" + pid + "-rimo button.create-workorder").prop("disabled", true);
-          $("#preorder-detail-" + pid + "-rimo .workorder-container").append("<img src='<?=self::getResourcePath()?>img/ajax-loader.gif' />");
+            $("#preorder-detail-" + pid + "-rimo button.create-workorder").prop("disabled", true);
+            $("#preorder-detail-" + pid + "-rimo .workorder-container").append("<img src='<?=self::getResourcePath()?>img/ajax-loader.gif' />");
 
 
-          $.ajax({
-              url: "<?=self::getUrl("Preorder","Api")?>",
-              method: "POST",
-              data: {
+            $.ajax({
+                url: "<?=self::getUrl("Preorder","Api")?>",
+                method: "POST",
+                data: {
                     do: "createWorkorder",
                     id: pid,
-              },
-              context: {
-                  pid: pid
-              },
-              dataType: 'json',
-              success: function(response) {
-                  if(response.status == "OK") {
-                      wo = response.result;
-                      html = '<h4> \
+                },
+                context: {
+                    pid: pid
+                },
+                dataType: 'json',
+                success: function(response) {
+                    if(response.status == "OK") {
+                        wo = response.result;
+                        html = '<h4> \
                       ' + wo.name + ' \
                       <a href="<?=self::getUrl("RimoWorkorder", "downloadAh")?>?id=' + wo.id + '" onclick="event.preventDefault(); downloadWorkorderAha(' + wo.id + ');"><i class="fas fa-fw fa-file-download ml-2"></i> AHA Blatt</a> \
                       </h4> \
@@ -1138,91 +1102,91 @@
                           </tr> \
                       </table>';
 
-                      $("#preorder-detail-" + wo.preorder_id + "-rimo img").remove();
-                      $("#preorder-detail-" + wo.preorder_id + "-rimo .workorder-container img").remove();
-                      $("#preorder-detail-" + wo.preorder_id + "-rimo button.create-workorder").remove();
-                      $("#preorder-detail-" + wo.preorder_id + "-rimo .workorder-container").append(html);
+                        $("#preorder-detail-" + wo.preorder_id + "-rimo img").remove();
+                        $("#preorder-detail-" + wo.preorder_id + "-rimo .workorder-container img").remove();
+                        $("#preorder-detail-" + wo.preorder_id + "-rimo button.create-workorder").remove();
+                        $("#preorder-detail-" + wo.preorder_id + "-rimo .workorder-container").append(html);
 
-                  } else {
-                      restoreBlankWorkorderView(this.pid);
-                      window.notify("error", "Workorder konnte nicht erstellt werden!");
-                  }
-              },
-              error: function() {
-                  restoreBlankWorkorderView(this.pid);
-                  window.notify("error", "Workorder konnte nicht erstellt werden!");
-              }
-          });
-
-          return true;
-      }
-
-      function restoreBlankWorkorderView(pid) {
-          $("#preorder-detail-" + pid + "-rimo .workorder-container img").remove();
-          $("#preorder-detail-" + pid + "-rimo button.create-workorder").prop("disabled", false);
-      }
-
-      function deleteWorkorder(pid, wid) {
-        //console.log("in delete workorder");
-        if(!Number.isInteger(pid) || pid < 1) {
-          return false;
-        }
-
-        if(!Number.isInteger(wid) || wid < 1) {
-          return false;
-        }
-
-        $.post("<?=self::getUrl("Preorder","Api")?>",
-        {
-          'do': "deleteWorkorder",
-          id: pid,
-          wid: wid
-        },
-        function(success) {
-          if(success.status == "OK") {
-            $("#preorder-detail-" + success.result.id + "-workorder-" + success.result.wid + " td").each(function() {
-              $(this).html("<em class='text-monospace'>--gelöscht--</em>");
+                    } else {
+                        restoreBlankWorkorderView(this.pid);
+                        window.notify("error", "Workorder konnte nicht erstellt werden!");
+                    }
+                },
+                error: function() {
+                    restoreBlankWorkorderView(this.pid);
+                    window.notify("error", "Workorder konnte nicht erstellt werden!");
+                }
             });
 
-            $("#preorder-detail-" + success.result.id + "-workorder-" + success.result.wid + "-del").remove();
-          }
-        },
-        'json');
+            return true;
+        }
 
-        return false;
-      }
+        function restoreBlankWorkorderView(pid) {
+            $("#preorder-detail-" + pid + "-rimo .workorder-container img").remove();
+            $("#preorder-detail-" + pid + "-rimo button.create-workorder").prop("disabled", false);
+        }
 
-      async function downloadWorkorderAha(workorder_id) {
-          if(!workorder_id) return false;
+        function deleteWorkorder(pid, wid) {
+            //console.log("in delete workorder");
+            if(!Number.isInteger(pid) || pid < 1) {
+                return false;
+            }
 
-          var filename;
+            if(!Number.isInteger(wid) || wid < 1) {
+                return false;
+            }
 
-          await fetch('<?=self::getUrl("RimoWorkorder", "downloadAha")?>?id=' + workorder_id)
-              .then(resp => {
-                  const header = resp.headers.get("Content-disposition");
-                  let matches = header.match(/filename=['"]?([^'"]+)/i);
-                  filename = matches[1];
-                  if(!filename) {
-                      window.notify("error", "Fehler beim Download des AH-Blatts");
-                      return false;
-                  }
-                  return resp.blob();
-              })
-              .then(blob => {
-                  const url = window.URL.createObjectURL(blob);
-                  const a = document.createElement('a');
-                  a.style.display = 'none';
-                  a.href = url;
-                  a.download = filename;
-                  document.body.appendChild(a);
-                  a.click();
-                  window.URL.revokeObjectURL(url);
-                  window.notify("success", "Download gestartet...");
-              })
-              .catch(() => {
-                  window.notify("error", "Fehler beim Download des AH-Blatts");
-              });
+            $.post("<?=self::getUrl("Preorder","Api")?>",
+                {
+                    'do': "deleteWorkorder",
+                    id: pid,
+                    wid: wid
+                },
+                function(success) {
+                    if(success.status == "OK") {
+                        $("#preorder-detail-" + success.result.id + "-workorder-" + success.result.wid + " td").each(function() {
+                            $(this).html("<em class='text-monospace'>--gelöscht--</em>");
+                        });
 
-      }
+                        $("#preorder-detail-" + success.result.id + "-workorder-" + success.result.wid + "-del").remove();
+                    }
+                },
+                'json');
+
+            return false;
+        }
+
+        async function downloadWorkorderAha(workorder_id) {
+            if(!workorder_id) return false;
+
+            var filename;
+
+            await fetch('<?=self::getUrl("RimoWorkorder", "downloadAha")?>?id=' + workorder_id)
+                .then(resp => {
+                    const header = resp.headers.get("Content-disposition");
+                    let matches = header.match(/filename=['"]?([^'"]+)/i);
+                    filename = matches[1];
+                    if(!filename) {
+                        window.notify("error", "Fehler beim Download des AH-Blatts");
+                        return false;
+                    }
+                    return resp.blob();
+                })
+                .then(blob => {
+                    const url = window.URL.createObjectURL(blob);
+                    const a = document.createElement('a');
+                    a.style.display = 'none';
+                    a.href = url;
+                    a.download = filename;
+                    document.body.appendChild(a);
+                    a.click();
+                    window.URL.revokeObjectURL(url);
+                    window.notify("success", "Download gestartet...");
+                })
+                .catch(() => {
+                    window.notify("error", "Fehler beim Download des AH-Blatts");
+                });
+
+        }
     </script>
-<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>
\ No newline at end of file
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 8f19bdc74..4339e2078 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -75,31 +75,13 @@ class PreorderController extends mfBaseController {
 
         $this->layout()->set("campaign", new Preordercampaign());
 
-        $all_preorder_campaigns = PreordercampaignModel::getAll();
-        if ($this->me->is("Admin")) {
-            $netowner_campaign_ids = [];
-
-            foreach ($all_preorder_campaigns as $campaign) {
-                $network = new Network($campaign->network_id);
-                $netowner = new Address($network->owner_id);
-
-                if (!array_key_exists($netowner->getCompanyOrName(), $netowner_campaign_ids)) {
-                    $netowner_campaign_ids[$netowner->getCompanyOrName()] = [];
-                }
-
-                $netowner_campaign_ids[$netowner->getCompanyOrName()][] = $campaign->id;
-            }
-
-            $this->layout()->set("netowner_campaign_ids", $netowner_campaign_ids);
-        }
-
         if($this->me->is("Admin")) {
             if($filter['preordercampaign_id']) {
                 $this->layout()->set("campaign", new Preordercampaign($filter['preordercampaign_id']));
             } else {
-                $my_campaigns = $all_preorder_campaigns;
+                $my_campaigns = PreordercampaignModel::getAll();
             }
-            $this->layout()->set("my_campaigns", $all_preorder_campaigns);
+            $this->layout()->set("my_campaigns", PreordercampaignModel::getAll());
         } else {
             if($this->me->is("preorderfront")) {
                 $pns = json_decode($this->me->getFlag("preorder_networks"));