Merge branch 'master' into devbyspi

Layout/default/Address/Form.php

@@ -161,7 +161,7 @@
                     <div class="col-lg-10">
                       <select class="select2 form-control select2-multiple" name="addresstypes[]" id="addresstypes" multiple="multiple" data-placeholder="Choose ...">
                         <?php foreach(TT_ROLES as $role): ?>
-                          <option value="<?=$role?>" <?=(array_key_exists($role, $address->types)) ? "selected='selected'" : ""?>><?=__($role)?></option>
+                          <option value="<?=$role?>" <?=(is_array($address->types) && array_key_exists($role, $address->types)) ? "selected='selected'" : ""?>><?=__($role)?></option>
                         <?php endforeach; ?>
                       </select>
                     </div>
@@ -262,7 +262,7 @@
                     <th></th>
                   </tr>
                   <?php foreach(TT_ADDRESS_LINK_TYPES as $type): ?>
-                    <?php if(array_key_exists($type, $address->links)): ?>
+                    <?php if(is_array($address->links) && count($address->links) && array_key_exists($type, $address->links)): ?>
                       <?php foreach($address->links[$type] as $link): ?>
                         <tr>
                           <td class="font-weight-bold"><?=__($type)?></td>

Layout/default/Address/Index.php

@@ -181,11 +181,13 @@
                   </td>
                 <?php endif; ?>
                 <td>
-                  <?=$address->customer_number?>
-                  <?=($address->spin) ? "<br /><span class='text-pink'>".$address->spin."</span>" : ""?>
+                  <a href="<?=self::getUrl("Address", "view", ["id" => $address->id, 'filter' => $filter, 's' => $pagination['start']])?>">
+                    <?=$address->customer_number?>
+                    <?=($address->spin) ? "<br /><span class='text-pink'>".$address->spin."</span>" : ""?>
+                  </a>
                 </td>
-                <td><?=nl2br($address->company)?></td>
-                <td><?=$address->getFullName()?></td>
+                <td><a href="<?=self::getUrl("Address", "view", ["id" => $address->id, 'filter' => $filter, 's' => $pagination['start']])?>"><?=nl2br($address->company)?></a></td>
+                <td><a href="<?=self::getUrl("Address", "view", ["id" => $address->id, 'filter' => $filter, 's' => $pagination['start']])?>"><?=$address->getFullName()?></a></td>
                 <td>
                   <?=$address->street?><br />
                   <?=$address->zip?> <?=$address->city?>

Layout/default/Address/View.php

@@ -29,7 +29,7 @@
         
         <div class="card">
           <div class="card-body">
-            <h4>Person/Firma</h4>
+            <h3 class="text-center mb-3"><?=$address->getCompanyOrName()?><?=($address->customer_number) ? " [".$address->customer_number."]" : ""?></h3>
             
             <table class="table table-sm table-striped view-table">
               <tr>
@@ -129,8 +129,7 @@
                 <tr>
                   <th>Typ</th>
                   <th>Firma</th>
-                  <th>Vorname</th>
-                  <th>Nachname</th>
+                  <th>Name</th>
                   <th>Telefon</th>
                   <th>Mobil</th>
                   <th>Email</th>
@@ -142,8 +141,7 @@
                       <tr>
                         <td class="font-weight-bold"><?=__($type)?></td>
                         <td><a href="<?=self::getUrl("Address", "view", ["id" => $link->address_id])?>"><?=$link->address->company?></a></td>
-                        <td><a href="<?=self::getUrl("Address", "view", ["id" => $link->address_id])?>"><?=$link->address->firstname?></a></td>
-                        <td><?=$link->address->lastname?></td>
+                        <td><a href="<?=self::getUrl("Address", "view", ["id" => $link->address_id])?>"><?=$link->address->getFullName()?></a></td>
                         <td><?=$link->address->phone?></td>
                         <td><?=$link->address->mobile?></td>
                         <td><?=$link->address->email?></td>
@@ -168,7 +166,7 @@
                     <?php if(array_key_exists($type, $address->linked_as)): ?>
                       <?php foreach($address->linked_as[$type] as $link): ?>
                         <tr>
-                          <td><?=__($type)?> für:</td>
+                          <td><strong><?=__($type)?></strong> für:</td>
                           <td><a href="<?=self::getUrl("Address", "view", ['id' => $link->origin_address_id])?>"><?=$link->origin->getCompanyOrName()?><?=($link->origin->customer_number) ? " [".$link->origin->customer_number."]" : ""?></a></td>
                         </tr>
                       <?php endforeach; ?>
@@ -182,6 +180,49 @@
           </div>
         </div>
         
+        <?php if(is_array($address->contracts) && count($address->contracts)): ?>
+        <div class="card">
+          <div class="card-body">
+            <h4>Verträge</h4>
+            
+            <table class="table table-striped table-sm table-bordered table-hover">
+              <tr>
+                <th>Rolle</th>
+                <th>Contract ID</th>
+                <th>Produkt</th>
+                <th>Matchcode</th>
+                <th>Bestelldatum</th>
+                <th>Fertigstellung</th>
+                <th>Kündigung</th>
+                <th></th>
+              </tr>
+              <?php foreach($address->contracts as $contract): ?>
+              <tr>
+                <td class="contract <?=($contract->isCancelled()) ? "canceled" : ""?>">
+                  <a href="<?=self::getUrl("Contract", "View", ["id" => $contract->id])?>">
+                    <?php if($contract->owner_id == $address->id): ?>
+                      Vertragsinhaber
+                    <?php elseif($contract->billingaddress_id == $address->id): ?>
+                      Rechnungsempfänger
+                    <?php endif; ?>
+                  </a>
+                </td>
+                <td class="contract <?=($contract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["id" => $contract->id])?>"><?=$contract->id?></a></td>
+                <td class="contract <?=($contract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["id" => $contract->id])?>"><?=$contract->product_name?></a></td>
+                <td class="contract <?=($contract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["id" => $contract->id])?>"><?=$contract->matchcode?></a></td>
+                <td class="contract <?=($contract->isCancelled()) ? "canceled" : ""?>"><?=($contract->order_date) ? date('d.m.Y', $contract->order_date) : ""?></td>
+                <td class="contract <?=($contract->isCancelled()) ? "canceled" : ""?>"><?=($contract->finish_date) ? date('d.m.Y', $contract->finish_date) : ""?></td>
+                <td class="contract <?=($contract->isCancelled()) ? "canceled" : ""?>"><?=($contract->cancel_date) ? date('d.m.Y', $contract->cancel_date) : ""?></td>
+                <td>
+                  <a href="<?=self::getUrl("Contract", "deleteLink", ["link_id" => $contract->id])?>" onclick="if(!confirm('Verknüpfung wirklich entfernen?')) return false;" class="text-danger" title="Verknüpfung entfernen"><i class="fas fa-xmark-large"></i></a>
+                </td>
+              </tr>
+              <?php endforeach; ?>
+            </table>
+          </div>
+        </div>
+        <?php endif; ?>
+        
         <div class="card">
           <div class="card-body">
             <a href="<?=self::getUrl("Address","Index", ['filter' => $filter, 's' => $s])?>" class="btn btn-secondary mr-1"><i class="fas fa-list"></i> Zurück zur Übersicht</a>

Layout/default/AddressDB/Form.php

@@ -0,0 +1,296 @@
+<?php
+  $urlfilter = [];
+  if($s) {
+    $urlfilter['s'] = $s;
+  }
+  if(is_array($filter) && count($filter)) {
+    $urlfilter["filter"] = $filter;
+  }
+  $posturl = self::getUrl("AddressDB", "save", $urlfilter);
+  
+  
+  /*
+   * check if address is in one of our networks
+   */
+  if($address_id && !array_key_exists($address->netzgebiet_id, $my_adb_networks)) {
+    $this->setFlash("Keine Berechtigung", "error");
+    mfBaseController::redirect("AddressDB");
+  }
+  
+?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
+    <!-- start page title -->
+    <div class="row">
+      <div class="col-12">
+        <div class="page-title-box">
+          <div class="page-title-right">
+            <ol class="breadcrumb m-0">
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("AddressDB")?>">GWR / AddressDB</a></li>
+              <li class="breadcrumb-item active"><?=($address->id) ? "bearbeiten" : "Neu" ?></li>
+            </ol>
+          </div>
+          <h4 class="page-title">Adresse</h4>
+        </div>
+      </div>
+    </div>
+    <!-- end page title -->
+    
+    <div class="row">
+      <div class="col-lg-12">
+        
+        <div class="card">
+          <div class="card-body">
+            <h4 class="header-title mb-2"><?=($address->id) ? "Adresse bearbeiten" : "Neue Adresse"?></h4>
+            
+            <form class="form-horizontal" method="post" action="<?=$posturl?>">
+              <div class="card">
+                <div class="card-body">
+                  
+                  <?php if(is_array($save_data) && array_key_exists("oaid", $save_data)): ?>
+                  <input type="hidden" name="id" value="<?=$save_data['id']?>" />
+                  <input type="hidden" name="f" value="<?=$save_data['f']?>" />
+                  <?php else: ?>
+                  <input type="hidden" name="id" value="<?=$address->id?>" />
+                  <input type="hidden" name="f" value="<?=$f?>" />
+                  <?php endif; ?>
+                  
+                  
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="oaid">OAID</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("oaid", $save_data)): ?>
+                      <input type="text" class="form-control" name="oaid" id="oaid" value="<?=$save_data['oaid']?>" readonly="readonly" />
+                      <?php else: ?>
+                      <input type="text" class="form-control" name="oaid" id="oaid" value="<?=$address->oaid?>" readonly="readonly" />
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="adrcd">ADRCD</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("strasse", $save_data)): ?>
+                      <input type="text" class="form-control" name="adrcd" id="adrcd" value="<?=$save_data['adrcd']?>" />
+                      <?php else: ?>
+                      <input type="text" class="form-control" name="adrcd" id="adrcd" value="<?=$address->adrcd?>" />
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="extref">Extref</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("strasse", $save_data)): ?>
+                      <input type="text" class="form-control" name="extref" id="extref" value="<?=$save_data['extref']?>" />
+                      <?php else: ?>
+                      <input type="text" class="form-control" name="extref" id="extref" value="<?=$address->extref?>" />
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <hr />
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="netzgebiet_id">Netzgebiet *</label>
+                    <div class="col-lg-10">
+                      <select class="form-control" name="netzgebiet_id" id="netzgebiet_id">
+                        <?php foreach($my_adb_networks as $fnet): ?>
+                          <?php if(is_array($save_data) && array_key_exists("netzgebiet_id", $save_data) && $save_data['netzgebiet_id']): ?>
+                          <option value="<?=$fnet->id?>" <?=($save_data['netzgebiet_id'] == $fnet->id) ? "selected='selected'" : ""?>><?=$fnet->name?></option>
+                          <?php else: ?>
+                          <option value="<?=$fnet->id?>" <?=($address->netzgebiet_id == $fnet->id) ? "selected='selected'" : ""?>><?=$fnet->name?></option>
+                          <?php endif; ?>
+                        <?php endforeach; ?>
+                      </select>
+                    </div>
+                  </div>
+                  
+                  
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="strasse">Straße *</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("strasse", $save_data)): ?>
+                      <input type="text" class="form-control basicAutoComplete" data-url="<?=self::getUrl('AddressDB','api')?>?do=findStreets&autocomplete=1" name="strasse" id="strasse" value="<?=$save_data['strasse']?>">
+                      <?php else: ?>
+                      <input type="text" class="form-control basicAutoComplete" data-url="<?=self::getUrl('AddressDB','api')?>?do=findStreets&autocomplete=1" name="strasse" id="strasse" value="<?=$address->strasse->name?>">
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="hausnummer">Hausnummer *</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("hausnummer", $save_data)): ?>
+                      <input type="text" class="form-control" name="hausnummer" id="hausnummer" value="<?=$save_data['hausnummer']?>">
+                      <?php else: ?>
+                      <input type="text" class="form-control" name="hausnummer" id="hausnummer" value="<?=$address->hausnummer?>">
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="plz">PLZ *</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("plz", $save_data)): ?>
+                      <input type="text" class="form-control basicAutoComplete" autocomplete="off" data-url="<?=self::getUrl('AddressDB','api')?>?do=findZips&autocomplete=1" name="plz" id="plz" value="<?=$save_data['plz']?>">
+                      <?php else: ?>
+                      <input type="text" class="form-control basicAutoComplete" autocomplete="off" data-url="<?=self::getUrl('AddressDB','api')?>?do=findZips&autocomplete=1" name="plz" id="plz" value="<?=$address->plz->plz?>">
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="ortschaft">Ortschaft *</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("ortschaft", $save_data)): ?>
+                      <input type="text" class="form-control basicAutoComplete" autocomplete="off" data-url="<?=self::getUrl('AddressDB','api')?>?do=findDistricts&autocomplete=1" name="ortschaft" id="ortschaft" value="<?=$save_data['ortschaft']?>">
+                      <?php else: ?>
+                      <input type="text" class="form-control basicAutoComplete" autocomplete="off" data-url="<?=self::getUrl('AddressDB','api')?>?do=findDistricts&autocomplete=1" name="ortschaft" id="ortschaft" value="<?=$address->ortschaft->name?>">
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="gemeinde">Gemeinde *</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("gemeinde", $save_data)): ?>
+                      <input type="text" class="form-control basicAutoComplete" autocomplete="off" data-url="<?=self::getUrl('AddressDB','api')?>?do=findCities&autocomplete=1" name="gemeinde" id="gemeinde" value="<?=$save_data['gemeinde']?>">
+                      <?php else: ?>
+                      <input type="text" class="form-control basicAutoComplete" autocomplete="off" data-url="<?=self::getUrl('AddressDB','api')?>?do=findCities&autocomplete=1" name="gemeinde" id="gemeinde" value="<?=$address->strasse->gemeinde->name?>">
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="grund_nr">Grundstücksnr.</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("grund_nr", $save_data)): ?>
+                      <input type="text" class="form-control" name="grund_nr" id="grund_nr" value="<?=$save_data['grund_nr']?>">
+                      <?php else: ?>
+                      <input type="text" class="form-control" name="grund_nr" id="grund_nr" value="<?=$address->grund_nr?>">
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="gps_lat">GPS Breite</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("gps_lat", $save_data)): ?>
+                      <input type="text" class="form-control" name="gps_lat" id="gps_lat" value="<?=$save_data['gps_lat']?>">
+                      <?php else: ?>
+                      <input type="text" class="form-control" name="gps_lat" id="gps_lat" value="<?=$address->gps_lat?>">
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="gps_long">GPS Länge</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("gps_long", $save_data)): ?>
+                      <input type="text" class="form-control" name="gps_long" id="gps_long" value="<?=$save_data['gps_long']?>">
+                      <?php else: ?>
+                      <input type="text" class="form-control" name="gps_long" id="gps_long" value="<?=$address->gps_long?>">
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <hr />
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="rollout">Rollout Jahr (Ganzzahl)</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("rollout", $save_data)): ?>
+                      <input type="text" class="form-control" name="rollout" id="rollout" value="<?=$save_data['rollout']?>">
+                      <?php else: ?>
+                      <input type="text" class="form-control" name="rollout" id="rollout" value="<?=$address->rollout?>">
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="rollout_info">Rollout Info</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("rollout_info", $save_data)): ?>
+                      <input type="text" class="form-control" name="rollout_info" id="rollout_info" value="<?=$save_data['rollout_info']?>">
+                      <?php else: ?>
+                      <input type="text" class="form-control" name="rollout_info" id="rollout_info" value="<?=$address->rollout_info?>">
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="freigabe">Erlaubte Bestelltypen</label>
+                    <div class="col-lg-10">
+                      <select class="form-control select2" name="freigabe[]" id="freigabe" multiple="multiple">
+                        <?php if(is_array($save_data) && array_key_exists("freigabe", $save_data)): ?>
+                        <option value="interest" <?=(is_array($save_data['freigabe']) && in_array("interest",$save_data['freigabe'])) ? "selected='selected'" : ""?>>Interessensbekundung</option>
+                        <option value="provision" <?=(is_array($save_data['freigabe']) && in_array("provision",$save_data['freigabe'])) ? "selected='selected'" : ""?>>Vorsorgeanschluss</option>
+                        <option value="order" <?=(is_array($save_data['freigabe']) && in_array("order",$save_data['freigabe'])) ? "selected='selected'" : ""?>>Vollanschluss</option>
+                        <option value="reorder" <?=(is_array($save_data['freigabe']) && in_array("reorder",$save_data['freigabe'])) ? "selected='selected'" : ""?>>Nachbestellung</option>
+                        <?php else: ?>
+                        <option value="interest" <?=(is_array($address->freigaben) && in_array("interest",$address->freigaben)) ? "selected='selected'" : ""?>>Interessensbekundung</option>
+                        <option value="provision" <?=(is_array($address->freigaben) && in_array("provision",$address->freigaben)) ? "selected='selected'" : ""?>>Vorsorgeanschluss</option>
+                        <option value="order" <?=(is_array($address->freigaben) && in_array("order",$address->freigaben)) ? "selected='selected'" : ""?>>Vollanschluss</option>
+                        <option value="reorder" <?=(is_array($address->freigaben) && in_array("reorder",$address->freigaben)) ? "selected='selected'" : ""?>>Nachbestellung</option>
+                        <?php endif; ?>
+                      </select>
+                    </div>
+                  </div>
+                  
+                  <?php if(!$address->id): ?>
+                  <hr />
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="unit_count">Anzahl Wohneinheiten</label>
+                    <div class="col-lg-10">
+                      <?php if(is_array($save_data) && array_key_exists("unit_count", $save_data)): ?>
+                      <input type="text" class="form-control" name="unit_count" id="unit_count" value="<?=$save_data['unit_count']?>">
+                      <?php else: ?>
+                      <input type="text" class="form-control" name="unit_count" id="unit_count" value="">
+                      <?php endif; ?>
+                    </div>
+                  </div>
+                  
+                  <?php endif; ?>
+                </div>
+              </div>
+              
+              
+              
+              <div class="form-group row">
+                <label class="col-lg-2"></label>
+                <div class="col-lg-10">
+                  <button type="submit" class="btn btn-primary">Speichern</button>
+                </div>
+              </div>
+              
+              
+              
+            </form>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+
+    <script>
+    $(".select2").select2();
+    
+    $('#strasse').autoComplete({minLength: 2}).keydown(preventEnter);
+    $('#plz').autoComplete({minLength: 1}).keydown(preventEnter);
+    $('#gemeinde').autoComplete({minLength: 2}).keydown(preventEnter);
+    $('#ortschaft').autoComplete({minLength: 2}).keydown(preventEnter);
+    $('#hausnummer').keydown(preventEnter);
+    
+    function preventEnter() {
+      if(event.keyCode == 13) {
+        event.preventDefault();
+        return false;
+      }
+    }
+    </script>
+
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/AddressDB/Index.php

@@ -0,0 +1,216 @@
+<?php
+  $pagination_baseurl = $this->getUrl($Mod,"Index");
+  $pagination_baseurl_params = ["filter" => $filter];
+  $pagination_entity_name = "Adressen";
+?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
+
+    <!-- start page title -->
+    <div class="row">
+      <div class="col-12">
+        <div class="page-title-box">
+          <div class="page-title-right">
+            <ol class="breadcrumb m-0">
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
+              <li class="breadcrumb-item active">GWR / AddressDB</li>
+            </ol>
+          </div>
+          <h4 class="page-title">GWR / AddressDB</h4>
+        </div>
+      </div>
+    </div>
+    <!-- end page title -->
+
+    <div class="row">
+      <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" id="filter_form" action="<?=self::getUrl("AddressDB")?>">
+              <div class="row">
+                
+                <div class="col-2">
+                  <label class="form-label" for="filter_network_id">Netzgebiet</label>
+                  <select name="filter[network_id]" id="filter_network_id" class="form-control">
+                    <option></option>
+                    <?php foreach($my_adb_networks as $fnet): ?>
+                    <option value="<?=$fnet->id?>" <?=($filter['network_id'] == $fnet->id) ? "selected='selected'" : ""?>><?=$fnet->name?></option>
+                    <?php endforeach; ?>
+                    <?php if($me->isAdmin()):?><option value="null"  <?=($filter['network_id'] === "null") ? 'selected="selected"' : ""?>>-- Kein Netzgebiet --</option><?php endif; ?>
+                  </select>
+                </div>
+                
+                
+                <div class="col-1">
+                  <label class="form-label" for="filter_zip">PLZ</label>
+                  <input type="text" class="form-control" name="filter[zip]" id="filter_zip" value="<?=$filter['zip']?>" />
+                </div>
+                
+                <div class="col-2">
+                  <div class="<?=(array_key_exists("network_id", $filter) && $filter['network_id'] === "null") ? "hidden" : ""?>" id="filter-gemeinde-id">
+                    <label class="form-label" for="filter_gemeinde_id">Gemeinde</label>
+                    <select name="filter[gemeinde_id]" id="filter_gemeinde_id" class="form-control">
+                      <option></option>
+                      <?php foreach($gemeinden as $gemeinde): ?>
+                      <option value="<?=$gemeinde->id?>" <?=($filter['gemeinde_id'] == $gemeinde->id) ? "selected='selected'" : ""?>><?=$gemeinde->name?></option>
+                      <?php endforeach; ?>
+                    </select>
+                  </div>
+                  <div class="<?=(!array_key_exists("network_id", $filter) || $filter['network_id'] !== "null") ? "hidden" : ""?>" id="filter-gemeinde-text">
+                    <label class="form-label" for="filter_gemeinde">Gemeinde</label>
+                    <input type="text" class="form-control" name="filter[gemeinde]" id="filter_gemeinde" value="<?=$filter['gemeinde']?>" />
+                  </div>
+                </div>
+                
+                <div class="col-2">
+                  <div class="<?=(array_key_exists("network_id", $filter) && $filter['network_id'] == "null") ? "hidden" : ""?>" id="filter-ortschaft-id">
+                    <label class="form-label" for="filter_ortschaft_id">Ortschaft/Ortsteil</label>
+                    <select name="filter[ortschaft_id]" id="filter_ortschaft_id" class="form-control">
+                      <option></option>
+                      <?php foreach($ortschaften as $ortschaft): ?>
+                      <option value="<?=$ortschaft->id?>" <?=($filter['ortschaft_id'] == $ortschaft->id) ? "selected='selected'" : ""?>><?=$ortschaft->name?></option>
+                      <?php endforeach; ?>
+                    </select>
+                  </div>
+                  <div class="<?=(!array_key_exists("network_id", $filter) || $filter['network_id'] !== "null") ? "hidden" : ""?>" id="filter-ortschaft-text">
+                    <label class="form-label" for="filter_ortschaft">Ortsteil</label>
+                    <input type="text" class="form-control" name="filter[ortschaft]" id="filter_ortschaft" value="<?=$filter['ortschaft']?>" />
+                  </div>
+                </div>
+                
+                <div class="col-2">
+                  <label class="form-label" for="filter_street">Strasse</label>
+                  <input type="text" class="form-control" name="filter[street]" id="filter_street" value="<?=$filter['street']?>" />
+                </div>
+              </div>
+              
+              <div class="row mt-2">
+                <div class="col-2">
+                  <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-1">
+                  <label class="form-label" for="filter_adrcd">Adrcd (GWR)</label>
+                  <input type="text" class="form-control" name="filter[adrcd]" id="filter_adrcd" value="<?=$filter['adrcd']?>" />
+                </div>
+                
+                
+                
+                <div class="col-2">
+                  <label class="form-label" for="filter_extref">extref</label>
+                  <input type="text" class="form-control" name="filter[extref]" id="filter_extref" value="<?=$filter['extref']?>" />
+                </div>
+                
+                <div class="col-1">
+                  <label class="form-label" for="filter_rollout">Rollout Jahr</label>
+                  <input type="text" class="form-control" name="filter[rollout]" id="filter_rollout" value="<?=$filter['rollout']?>" />
+                </div>
+                
+                <div class="col-2">
+                  <label class="form-label" for="filter_rollout_info">Rollout Info</label>
+                  <input type="text" class="form-control" name="filter[rollout_info]" id="filter_rollout_info" value="<?=$filter['rollout_info']?>" />
+                </div>
+                
+                
+                
+              </div>
+              <div class="row mt-2">
+                <div class="col">
+                  <button type="submit" class="btn btn-primary">Filter anwenden</button>
+                  <a class="btn btn-secondary" href="<?=self::getUrl("AddressDB")?>">Filter zurücksetzen</a>
+                  <button type="submit" formaction="<?=self::getUrl("AddressDB", "export")?>" id="export-button" class="btn btn-outline-success ml-2"><i class="fas fa-download"></i> CSV-Export</button>
+                </div>
+              </div>
+            </form>
+            
+          </div>
+        </div>
+        
+        
+        
+        
+        <div class="card">
+          <div class="card-body mb-3">
+            <div class="float-left">
+              <h4 class="header-title">Liste aller GWR-Adressen</h4>
+            </div>
+            <div class="float-right">
+              <a class="btn btn-primary mb-2" href="<?=self::getUrl("AddressDB", "add")?>"><i class="fas fa-plus"></i> Neue Adresse anlegen</a>
+              <a class="btn btn-outline-violett mb-2" href="#" onclick="return false;"><i class="fas fa-marker"></i> Bulk update</a>
+              
+            </div>
+            
+<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
+
+            <table class="table table-striped table-hover">
+              <tr>
+                <th>Netzgebiet</th>
+                <th>Adrcd</th>
+                <th>OAID</th>
+                <th>extref</th>
+                <th>PLZ</th>
+                <th>Gemeinde</th>
+                <th>Ortschaft</th>
+                <th>Straße</th>
+                <th>Hausnummer</th>
+                <th>Wohneinheiten</th>
+                <th>Rollout Jahr</th>
+                <th>Rollout Info</th>
+                <th></th>
+              </tr>
+              <?php foreach($addresses as $address): ?>
+              <tr>
+                <td><?=$address->netzgebiet->name?></td>
+                <td><?=$address->adrcd?></td>
+                <td><?=$address->oaid?></td>
+                <td><?=$address->extref?></td>
+                <td><?=$address->plz->plz?></td>
+                <td><?=$address->ortschaft->gemeinde->name?></td>
+                <td><?=$address->ortschaft->name?></td>
+                <td><?=$address->strasse->name?></td>
+                <td><?=$address->hausnummer?></td>
+                <td><?=count($address->wohneinheiten)?></td>
+                <td><?=$address->rollout?></td>
+                <td><?=$address->rollout_info?></td>
+                <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
+                  <a href="<?=self::getUrl("AddressDB", "edit", ["id" => $address->id])?>"><i class="far fa-edit"  title="Adresse Bearbeiten"></i></a>
+                </td>
+              </tr>
+              <?php endforeach; ?>
+            </table>
+            
+<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>            
+<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
+            
+          </div>
+        </div>
+        
+      </div>
+    </div>
+
+    <script>
+      $('#filter_network_id').change(function() {
+        if($('#filter_network_id').val() === "null") {
+          $('#filter-gemeinde-id').hide();
+          $('#filter-gemeinde-text').show();
+          $('#filter-ortschaft-id').hide();
+          $('#filter-ortschaft-text').show();
+          
+          $('#filter-gemeinde-id option:first').prop("selected", "selected");
+          $('#filter-ortschaft-id option:first').prop("selected", "selected");
+        } else {
+          $('#filter-gemeinde-text').hide();
+          $('#filter-gemeinde-id').show();
+          $('#filter-ortschaft-text').hide();
+          $('#filter-ortschaft-id').show();
+        }
+        $('#filter_gemeinde').val("");
+        $('#filter_ortschaft').val("");
+      });
+      
+    </script>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/AddressDB/export.csv.php

@@ -0,0 +1,31 @@
+<?php
+ob_end_flush();
+header("Content-type: text/csv");
+header('Content-disposition: attachment; filename="addressdb-export-'.date('Y-m-d_H-i-s').'.csv"');
+?>
+AddressDB_ID;Extref;Adrcd;OAID;Netzgebiet_Extref;Netzgebiet;GKZ;Gemeinde;OKZ;Ortschaft;PLZ;SKZ;Strasse;Hausnummer;Grundstueck;GPS Breite; GPS Laenge;Rollout;Rollout_Info;Freigabe;Nutzungseinheiten
+<?php
+$line = 0;
+
+while($data = mysqli_fetch_object($res)):
+  $netzgebiet = Layout::getMfValuecacheObject("ADBNetzgebiet", $data->netzgebiet_id);
+  $strasse = Layout::getMfValuecacheObject("ADBStrasse", $data->strasse_id);
+  $gemeinde = Layout::getMfValuecacheObject("ADBGemeinde",$strasse->gemeinde_id);
+  $ortschaft = Layout::getMfValuecacheObject("ADBOrtschaft", $data->ortschaft_id);
+  $plz = Layout::getMfValuecacheObject("ADBPlz", $data->plz_id);
+  $freigabe_array = json_decode($data->freigabe);
+  if(is_array($freigabe_array)) {
+    $freigabe = join(", ", $freigabe_array);
+  } else {
+    $freigabe = "";
+  }
+  $unit_count = $data->unit_count;
+?>
+<?=$data->id?>;"<?=$data->extref?>";<?=$data->adrcd?>;"<?=$data->oaid?>";"<?=$netzgebiet->extref?>";"<?=$netzgebiet->name?>";<?=$gemeinde->kennziffer?>;"<?=$gemeinde->name?>";<?=$ortschaft->kennziffer?>;"<?=$ortschaft->name?>";"<?=$plz->plz?>";<?=$strasse->kennziffer?>;"<?=$strasse->name?>";"<?=$data->hausnummer?>";"<?=$data->grund_nr?>";<?=$data->gps_lat?>;<?=$data->gps_long?>;<?=$data->rollout?>;"<?=$data->rollout_info?>";"<?=$freigabe?>";<?=$unit_count?>;
+<?php
+$i++;
+if($line % 1000 === 0) {
+  flush();
+}
+
+endwhile;

Layout/default/Admin/Index.php

@@ -0,0 +1,34 @@
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
+
+    <!-- start page title -->
+    <div class="row">
+      <div class="col-12">
+        <div class="page-title-box">
+          <div class="page-title-right">
+            <ol class="breadcrumb m-0">
+              <li class="breadcrumb-item"><a href="javascript: void(0);"><?=MFAPPNAME_SLUG?></a></li>
+              <li class="breadcrumb-item active">Admin</li>
+            </ol>
+          </div>
+          <h4 class="page-title">Admin</h4>
+        </div>
+      </div>
+    </div>
+    <!-- end page title --> 
+
+    <h4>Secret Admin functions</h4>
+
+    <div class="row">
+      <div class="col-12 col-xl-10">
+        <div class="card">
+          <div class="card-body">
+            <div class="row col-12">
+              <div><a href="<?=self::getUrl("Admin", "createNetworkAddressForNetowner")?>">Fehlende NetworkAddress Objekte für Netowner anlegen</a></div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/Building/Form.php

@@ -136,14 +136,14 @@
                   <div class="row">
                     <div class="col-lg-6">
                       <div class="form-group row">
-                        <label class="col-lg-4 col-form-label" for="gps_lat">GPS Länge (N)</label>
+                        <label class="col-lg-4 col-form-label" for="gps_lat">GPS Breite</label>
                         <div class="col-lg-8">
                           <input type="text" class="form-control" name="gps_lat" id="gps_lat" value="<?=$building->gps_lat?>" <?=($building->gps_lat) ? "readonly='readonly'" : ""?> />
                         </div>
                       </div>
 
                       <div class="form-group row">
-                        <label class="col-lg-4 col-form-label" for="gps_long">GPS Breite (E)</label>
+                        <label class="col-lg-4 col-form-label" for="gps_long">GPS Länge</label>
                         <div class="col-lg-8">
                           <input type="text" class="form-control" name="gps_long" id="gps_long" value="<?=$building->gps_long?>" <?=($building->gps_lat) ? "readonly='readonly'" : ""?> />
                         </div>

Layout/default/Building/Index.php

@@ -384,9 +384,13 @@
       accessToken: '<?=TT_MAPBOX_TILE_API_TOKEN?>'
     }).addTo(buildingMap);
     
+    L.MakiMarkers.accessToken = '<?=TT_MAPBOX_TILE_API_TOKEN?>';
+    
     addMarkers();
   }
   
+  
+  
   function addMarkers() {
     if(!Array.isArray(buildings) | !buildings.length) {
       return false;
@@ -399,7 +403,36 @@
       }
       var gps = [building.gps_lat, building.gps_long];
       all_coords.push(gps);
-      var marker = L.marker(gps).addTo(buildingMap);
+      
+      var icon_color = "#CB2B3E";
+      var icon_name = "home";
+      
+      if(building.status == "connected") {
+        icon_color = "#2AAD27";
+      } else if(building.status == "pipework-done") {
+        icon_color = "#CB8427";
+      }
+      
+      if(building.type.match(/^(Zwei)/i)) {
+        icon_name = "town";
+      } else if(building.type.match(/^(Mehr)/i)) {
+        icon_name = "city";
+      } else if(building.type.match(/^(Unternehmen)/i)) {
+        icon_name = "industry";
+      } else if(building.type.match(/^(Sender)/i)) {
+        icon_name = "communications-tower";
+      }
+      
+      var marker_popup_content = '<?php include(realpath(dirname(__FILE__))."/include/building_popup.php");?>';
+      
+      [["street", building.street], ["zip", building.zip], ["city", building.city], ["type", building.type], ["code", building.code], ["popname", building.popname], ["gps", building.gps_lat + ", " + building.gps_long],
+        ["contact", building.contact], ["phone", building.phone], ["email", building.email]
+      ].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(buildingMap).bindPopup(marker_popup_content);
       markers[building.id] = marker;
     });
     

Layout/default/Building/include/building_popup.php

@@ -0,0 +1,36 @@
+<?php
+ob_start();
+?>
+<div class="font-weight-bold">
+  {{STREET}}<br />
+  {{ZIP}} {{CITY}}
+</div>
+
+<hr />
+
+<table>
+  <tr>
+    <th>Objekt-ID:</th>
+    <td>{{CODE}}</td>
+  </tr><tr>
+    <th>Gebäudetyp:</th>
+    <td>{{TYPE}}</td>
+  </tr><tr>
+    <th>POP:</th>
+    <td>{{POPNAME}}</td>
+  </tr><tr>
+    <th>GPS:</th>
+    <td><a href="https://maps.google.com/maps?t=k&q=loc:{{GPS}}">{{GPS}}</a></td>
+  </tr><tr>
+    <th>Kontakt:</th>
+    <td>{{CONTACT}}</td>
+  </tr><tr>
+    <th>Telefon:</th>
+    <td>{{PHONE}}</td>
+  </tr><tr>
+    <th>Email:</th>
+    <td>{{EMAIL}}</td>
+  </tr>
+  
+</table>
+<?=str_replace("\n"," ",ob_get_clean())?>

Layout/default/Contract/Form.php

@@ -1,3 +1,13 @@
+<?php
+  $urlfilter = [];
+  if($s) {
+    $urlfilter['s'] = $s;
+  }
+  if(is_array($filter) && count($filter)) {
+    $urlfilter["filter"] = $filter;
+  }
+  $posturl = self::getUrl("Contract", "save", $urlfilter);
+?>
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
     <!-- start page title -->
     <div class="row">
@@ -23,11 +33,15 @@
           <div class="card-body">
             <h4 class="header-title mb-2"><?=($contract->id) ? "Vertrag bearbeiten" : "Neuer Vertrag"?></h4>
             
-            <form class="form-horizontal" method="post" action="<?=self::getUrl("Contract", "save")?>">
+            <form class="form-horizontal" method="post" action="<?=$posturl?>">
               <div class="card">
                 <div class="card-body">
                   
-                  <input type="hidden" name="id" value="<?=$contact->id?>" />
+                  <input type="hidden" name="id" value="<?=$contract->id?>" />
+                  <input type="hidden" name="origin_contract_id" value="<?=$origin_contract_id?>" />
+                  <input type="hidden" name="f" value="<?=$f?>" />
+                  
+                  
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="owner_id">Vertragsinhaber *</label>
                     <div class="col-lg-10">
@@ -64,6 +78,19 @@
                     </div>
                   </div>
                   
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="matchcode">Anschluss</label>
+                    <div class="col-lg-10">
+                      <select name="products[<?=$i?>][termination_id]" id="termination_id-<?=$i?>" class="form-control select2">
+                        <option></option>
+                        <?php foreach($terminations as $t): ?>
+                          <option value="<?=$t->id?>" <?=($t->id == $contract->termination_id) ? "selected='selected'" : ""?>><?=$t->code?> - <?=$t->getAddress()?></option>
+                        <?php endforeach; ?>
+                      </select>
+                    </div>
+                  </div>
+                  
+                  
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="product_name">Individueller Produktname</label>
                     <div class="col-lg-10">
@@ -95,7 +122,7 @@
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="price_setup">Preis Setup</label>
                     <div class="col-lg-10">
-                      <input type="text" class="form-control" name="price" id="price_setup" value="<?=$contract->price_setup?>">
+                      <input type="text" class="form-control" name="price_setup" id="price_setup" value="<?=$contract->price_setup?>">
                     </div>
                   </div>
                   
@@ -115,7 +142,7 @@
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="billing_period">Verrechnungsperiode</label>
                     <div class="col-lg-10">
-                      <select class="form-control" name="products[<?=$i?>][billing_period]" id="billing_period-<?=$i?>" placeholder="Verrechnungsperiode">
+                      <select class="form-control" name="billing_period" id="billing_period" placeholder="Verrechnungsperiode">
                         <option value="1" <?=($product->billing_period == 1) ? "selected='selected'" : ""?>>Monatlich</option>
                         <option value="12" <?=($product->billing_period == 12) ? "selected='selected'" : ""?>>Jährlich</option>
                       </select>
@@ -134,14 +161,14 @@
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="finish_date">Fertigstellungsdatum</label>
                     <div class="col-lg-10">
-                      <input type="text" class="form-control" name="finish_date" id="finish_date" value="<?=$contract->finish_date?>">
+                      <input type="text" class="form-control" name="finish_date" id="finish_date" value="<?=($contract->finish_date) ? date("d.m.Y",$contract->finish_date) : ""?>">
                     </div>
                   </div>
                   
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="cancel_date">Kündigungsdatum</label>
                     <div class="col-lg-10">
-                      <input type="text" class="form-control" name="cancel_date" id="cancel_date" value="<?=$contract->cancel_date?>">
+                      <input type="text" class="form-control" name="cancel_date" id="cancel_date" value="<?=($contract->cancel_date) ? date("d.m.Y", $contract->cancel_date) : ""?>">
                     </div>
                   </div>
                   
@@ -159,30 +186,31 @@
               <div class="card">
                 <div class="card-body" id="link-container">
                   <h4>Verknüpfungen</h4>
-                  <?php $linknum = 1337; ?>
-                  <div class="form-group row" id="link-<?=$linknum?>">
-                    <label class="col-lg-2 col-form-label" for="links_<?=$linknum?>_contract_id"></label>
-                    <div class="col-lg-6">
-                      <div class="input-group mb-3">
-                        <div class="input-group-prepend">
-                          <select class="form-control" name="links[<?=$linknum?>][type]">
-                            <option value="link">Verknüpfung mit</option>
-                            <option value="upgrade">Upgrade von</option>
-                            <option value="downgrade">Downgrade von</option>
-                            <option value="relocation">Umzug von</option>
-                            <option value="productchange">Produktwechsel von</option>
-                          </select>
-                        </div>
-                        <!--input type="text" class="form-control" name="links[<?=$linknum?>][contract_id]" id="links_<?=$linknum?>_contract_id" placeholder="Contact ID oder Suche nach Produkt, Matchcode, Kunde" value="<?=$contract->cancel_date?>"-->
-                        <select class="form-control basicAutoComplete link-autocomplete" autocomplete="off" name="links[<?=$linknum?>][contract_id]" id="links_<?=$linknum?>_contract_id" data-linknum="<?=$linknum?>" data-url="<?=self::getUrl('Contract','api')?>?do=findContract&autocomplete=1" placeholder="Contact ID oder Suche nach Produkt, Matchcode, Kunde" data-noresults-text="Keine Suchergebnisse">
-                          <option></option>
-                        </select>
-                        <div class="input-group-append">
-                          <button type="button" class="btn btn-danger" onclick="clearNewLink(<?=$linknum?>)"><i class="fas fa-xmark-large mr-1"></i> Entfernen</button>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
+                  
+                  <table class="table table-striped table-sm table-bordered">
+                    <tr>
+                      <th>Verknüpfung</th>
+                      <th>Kunde</th>
+                      <th>Contract ID</th>
+                      <th>Produkt</th>
+                      <th>Matchcode</th>
+                      <th></th>
+                    </tr>
+                    <?php foreach($contract->links as $link): ?>
+                      <tr>
+                        <td><?=__($link->type, "contract")?></td>
+                        <td><a href="<?=self::getUrl("Address", "View", ["id" => $link->contract->owner_id])?>"><?=$link->contract->owner->getCompanyOrName()?></a></td>
+                        <td><a href="<?=self::getUrl("Contract", "View", ["id" => $link->contract_id])?>"><?=$link->contract_id?></a></td>
+                        <td><a href="<?=self::getUrl("Contract", "View", ["id" => $link->contract_id])?>"><?=$link->contract->product->name?></a></td>
+                        <td><a href="<?=self::getUrl("Contract", "View", ["id" => $link->contract_id])?>"><?=$link->contract->matchcode?></a></td>
+                        <td>
+                          <a href="<?=self::getUrl("Contract", "deleteLink", ["link_id" => $link->id])?>" onclick="if(!confirm('Verknüpfung wirklich entfernen?')) return false;" class="text-danger" title="Verknüpfung entfernen"><i class="fas fa-xmark-large"></i></a>
+                        </td>
+                      </tr>
+                      
+                    <?php endforeach; ?>
+                  </table>
+
                 </div>
               </div>
               
@@ -240,7 +268,7 @@
    * customer autocomplete
    */
   // kunde
-  <?php if($contract->owner_id && is_object(($contract->owner))): ?>
+  <?php if($contract->owner_id && is_object($contract->owner)): ?>
   $('#owner_id').autoComplete('set', { value: <?=$contract->owner_id?>, text: '<?=($contract->owner_id) ? str_replace("'", "\\'", str_replace(["\n", "\r"], " ", $contract->owner->getCompanyOrName()))." (".$contract->owner->zip." ".$contract->owner->city.", ".$contract->owner->street.")".(($contract->owner->customer_number) ? " [".$contract->owner->customer_number."]" : "") : ""?>'});
   <?php else: ?>
   $('#owner_id').autoComplete();
@@ -396,7 +424,7 @@
                             <option value="productchange">Produktwechsel von</option> \
                           </select> \
                         </div> \
-                        <select class="form-control basicAutoComplete link-autocomplete" autocomplete="off" name="links[' + linknum + '][contract_id]" id="links_' + linknum + '_contract_id" data-linknum="' + linknum + '" data-url="<?=self::getUrl('Contract','api')?>?do=findContract&autocomplete=1" placeholder="Contact ID oder Suche nach Produkt, Matchcode, Kunde" data-noresults-text="Keine Suchergebnisse"> \
+                        <select class="form-control basicAutoComplete link-autocomplete" autocomplete="off" name="links[' + linknum + '][contract_id]" id="links_' + linknum + '_contract_id" data-linknum="' + linknum + '" data-url="<?=self::getUrl('Contract','api')?>?do=findContract&autocomplete=1" placeholder="Contract ID oder Suche nach Produkt, Matchcode, Kunde" data-noresults-text="Keine Suchergebnisse"> \
                           <option></option> \
                         </select> \
                         <div class="input-group-append"> \

Layout/default/Contract/Index.php

@@ -12,10 +12,10 @@
           <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 active">Verträge</li>
+              <li class="breadcrumb-item active">Aktive Produkte</li>
             </ol>
           </div>
-          <h4 class="page-title">Verträge</h4>
+          <h4 class="page-title">Aktive Produkte</h4>
         </div>
       </div>
     </div>
@@ -28,11 +28,16 @@
           <div class="card-body mb-3">
             <h4 class="header-title mb-3">Filter</h4>
             
-            <form method="get" action="<?=self::getUrl("Building")?>">
+            <form method="get" action="<?=self::getUrl("Contract")?>">
               <div class="row">
                 
                 <div class="col-1">
-                  <label class="form-label" for="filter_owner">Inhaber</label>
+                  <label class="form-label" for="filter_owner">Kundennummer</label>
+                  <input type="text" class="form-control" name="filter[customer_number]" id="filter_street" value="<?=$filter['customer_number']?>" />
+                </div>
+                
+                <div class="col-1">
+                  <label class="form-label" for="filter_owner">Inhaber Name</label>
                   <input type="text" class="form-control" name="filter[owner]" id="filter_street" value="<?=$filter['owner']?>" />
                 </div>
                 
@@ -51,12 +56,19 @@
                   <input type="text" class="form-control" name="filter[product_name]" id="filter_product_name" value="<?=$filter['product_name']?>" />
                 </div>
                 
+                <div class="col-2">
+                  <label class="form-label" for="filter_show_canceled">Gekündigte Produkte</label>
+                  <select class="form-control" name="filter[show_canceled]" id="filter_show_canceled">
+                    <option value="0" <?=($filter['show_canceled'] == 0) ? "selected='selected'" : ""?>>Ausblenden</option>
+                    <option value="1" <?=($filter['show_canceled'] == 1 ) ? "selected='selected'" : ""?>>Anzeigen</option>
+                  </select>
+                </div>
                 
               </div>
               <div class="row mt-2">
                 <div class="col">
                   <button type="submit" class="btn btn-primary">Filter anwenden</button>
-                  <a class="btn btn-secondary" href="<?=self::getUrl("Building")?>">Filter zurücksetzen</a>
+                  <a class="btn btn-secondary" href="<?=self::getUrl("Contract")?>">Filter zurücksetzen</a>
                 </div>
                 <!--<div class="col">
                   <button class="btn btn-info" type="button" onclick="refreshMap()"><i class="far fa-map"></i> Auf Karte anzeigen</button>
@@ -70,10 +82,10 @@
         <div class="card">
           <div class="card-body mb-3">
             <div class="float-left">
-              <h4 class="header-title">Liste aller Verträge</h4>
+              <h4 class="header-title">Liste aller aktiven Produkte</h4>
             </div>
             <div class="float-right">
-              <a class="btn btn-primary mb-2" href="<?=self::getUrl("Contract", "add")?>"><i class="fas fa-plus"></i> Neuen Vertrag anlegen</a>
+              <a class="btn btn-primary mb-2" href="<?=self::getUrl("Contract", "add")?>"><i class="fas fa-plus"></i> Neues Produkt anlegen</a>
             </div>
             
 <?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
@@ -96,10 +108,10 @@
               </tr>
               <?php foreach($contracts as $contract): ?>
               <tr>
-                <td><?=$contract->id?></td>
-                <td><a href="<?=self::getUrl("Address", "View", ["id" => $contract->owner_id])?>" target="_blank"><?=$contract->owner->getCompanyOrName()?></a></td>
-                <td><a href="<?=self::getUrl("Contract", "view", ["id" => $contract->id])?>"><?=$contract->product->name?></a></td>
-                <td><a href="<?=self::getUrl("Contract", "view", ["id" => $contract->id])?>"><?=$contract->matchcode?></a></td>
+                <td><a href="<?=self::getUrl("Contract", "view", ["contract_id" => $contract->id])?>"><?=$contract->id?></a></td>
+                <td><a href="<?=self::getUrl("Address", "View", ["id" => $contract->owner_id])?>" target="_blank"><i class="far fa-eyes" title="Kunde in neuem Tab anzeigen"></i></a> <?=$contract->owner->getCompanyOrName()?></td>
+                <td><a href="<?=self::getUrl("Contract", "view", ["contract_id" => $contract->id])?>"><?=$contract->product_name?></a></td>
+                <td><a href="<?=self::getUrl("Contract", "view", ["contract_id" => $contract->id])?>"><?=$contract->matchcode?></a></td>
                 <!--<td>
                   <?php if($contract->termination_id): ?>
                     <?=$contract->termination->building->street?><br />
@@ -127,9 +139,9 @@
                 <td class="text-monospace"><?=date('d.m.Y H:i', $contract->create)?><br /><?=$contract->creator->name?></td>
                 <td class="text-monospace"><?=date('d.m.Y H:i', $contract->edit)?><br /><?=$contract->editor->name?></td>
                 <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
-                  <a href="<?=self::getUrl("Contract", "view", ["id" => $contract->id])?>"><i class="far fa-eyes"  title="Vertrag anzeigen"></i></a>
-                  <a href="<?=self::getUrl("Contract", "edit", ["id" => $contract->id])?>"><i class="far fa-edit"  title="Vertrag bearbeiten"></i></a>
-                  <a href="<?=self::getUrl("Contract", "cancel", ["id" => $contract->id])?>" class="text-danger" title="Vertrag kündigen"><i class="far fa-file-slash"></i></a>
+                  <a href="<?=self::getUrl("Contract", "view", ["contract_id" => $contract->id, "s" => $s, "filter" => $filter])?>"><i class="far fa-eyes"  title="Aktives Produkt anzeigen"></i></a>
+                  <a href="<?=self::getUrl("Contract", "edit", ["contract_id" => $contract->id, "s" => $s, "filter" => $filter])?>"><i class="far fa-edit"  title="Aktives Produkt bearbeiten"></i></a>
+                  <a href="<?=self::getUrl("Contract", "cancel", ["contract_id" => $contract->id, "s" => $s, "filter" => $filter])?>" class="text-danger" title="Produkt kündigen"><i class="far fa-file-slash"></i></a>
                   <?php if($contract->orderproduct_id): ?><a href="<?=self::getUrl("Order", "edit", ["id" => $contract->orderproduct->order_id])?>"><i class="far fa-file-signature"  title="Bestellung anzeigen"></i></a><?php endif; ?>
                 </td>
               </tr>

Layout/default/Contract/OwnerchangeForm.php

@@ -0,0 +1,7 @@
+<?php
+
+/* 
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Scripting/EmptyPHP.php to edit this template
+ */
+

Layout/default/Contract/ProductchangeForm.php

@@ -0,0 +1,316 @@
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
+
+    <!-- start page title -->
+    <div class="row">
+      <div class="col-12">
+        <div class="page-title-box">
+          <div class="page-title-right">
+            <ol class="breadcrumb m-0">
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Contract")?>">Aktive Produkte</a></li>
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Contract", "view", ['id' => $contract->id])?>"><?=$contract->product_name?> [<?=$contract->matchcode?>]</a></li>
+              <li class="breadcrumb-item active">Konfiguration</li>
+            </ol>
+          </div>
+          <h4 class="page-title">Aktives Produkt</h4>
+        </div>
+      </div>
+    </div>
+    <!-- end page title -->
+    
+    <div class="row">
+      <div class="col-lg-12">
+        
+        <div class="card">
+          <div class="card-body">
+            <a href="<?=self::getUrl("Contract","View", ['id' => $contract->id, 'filter' => $filter, 's' => $s])?>" class="btn btn-sm btn-secondary mr-1"><i class="fas fa-list"></i> Zurück zur Vertragsansicht</a>
+          </div>
+        </div>
+        
+        <div class="card">
+          <div class="card-body">
+            <h3 class="text-center mb-3"><?=$contract->product_name?> (<?=$contract->id?>)</h3>
+            
+            <table class="table table-sm table-striped view-table">
+              <tr>
+                <th style="max-width: 50vw;">Matchcode:</th>
+                <td style="width: 50vw;"><?=$contract->matchcode?></td>
+              </tr>
+              <tr>
+                <th>Vertragsinhaber:</th>
+                <td><a href="<?=self::getUrl("Address", "View", ["id" => $contract->owner->id])?>"><?=$contract->owner->getCompanyOrName()?> (<?=$contract->owner->customer_number?>)</a></td>
+              </tr>
+              <tr>
+                <th>Produkt:</th>
+                <td><?=$contract->product_name?> [<?=$contract->product_id?>]<?=($contract->product_name != $contract->product->name) ? " <i>(".$contract->product->name.")</i>" : ""?></td>
+              </tr><tr>
+                <th>Produkt Info:</th>
+                <td><?=$contract->product_info?></td>
+              </tr>
+            </table>
+            
+          </div>
+        </div>
+        
+        
+        <div class="card">
+          <div class="card-body">
+            <h4 class="text-center mb-3">Neuer Contract</h4>
+            
+            <form method="post" action="<?=self::getUrl("Contract", "saveProductchange")?>">
+              <input type="hidden" name="contract_id" value="<?=$contract->id?>" />
+              
+              <div class="row justify-content-center">
+                <div class="col-xl-6">
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="product_id">Produkt</label>
+                    <div class="col-lg-10">
+                      <select class="form-control basicAutoComplete" autocomplete="off" name="product_id" id="product_id" data-url="<?=self::getUrl('Product','api')?>?do=findProduct&autocomplete=1" placeholder="Tippen zum suchen..." data-noresults-text="Keine Suchergebnisse">
+                        <option></option>
+                      </select>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="matchcode">Matchcode:</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="matchcode" id="matchcode" value="<?=$contract->matchcode?>">
+                      <small class="font-italic">Eindeutige Identifizierung das Produkts. Z.B. Anschlussadresse, Domainname usw.</small>
+                    </div>
+                  </div>
+                  
+                  <?php if(
+                          (is_array($contract->product->attributes) && count($contract->product->attributes))
+                          && (array_key_exists(TT_ATTRIB_TERMINATION_REQUIRED_NAME, $contract->product->attributes)
+                              && $contract->product->attributes[TT_ATTRIB_TERMINATION_REQUIRED_NAME]->value == 1)
+                          || $contract->termination_id
+                          ): ?>
+                  <div class="form-group row" id="termination_id-line">
+                    <?php else: ?>
+                  <div class="form-group row hidden" id="termination_id-line">
+                    <?php endif; ?>
+                    <label class="col-lg-2 col-form-label" for="matchcode">Anschluss</label>
+                    <div class="col-lg-10">
+                      <select name="termination_id" id="termination_id" class="form-control select2">
+                        <option></option>
+                        <?php foreach($terminations as $t): ?>
+                          <option value="<?=$t->id?>" <?=($t->id == $contract->termination_id) ? "selected='selected'" : ""?>><?=$t->code?> - <?=$t->getAddress(true)?></option>
+                        <?php endforeach; ?>
+                      </select>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="product_name">Individueller Produktname:</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="product_name" id="product_name" value="<?=$contract->product_name?>">
+                      <small class="font-italic">Scheint statt dem echten Produktnamen auf der Rechnung auf</small>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="product_info">Produkt Zusatztext:</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="product_info" id="product_info" value="<?=$contract->product_info?>">
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="price_setup">Preis Setup:</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="price_setup" id="price_setup" value="<?=$contract->price_setup?>">
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="price">Preis Periodisch:</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="price" id="price" value="<?=$contract->price?>">
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="price_nne">Preis NNE</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="price_nne" id="price_nne" value="<?=$contract->price_nne?>">
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="price_nbe">Preis NBE</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="price_nbe" id="price_nbe" value="<?=$contract->price_nbe?>">
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="billing_period">Verrechnungsperiode</label>
+                    <div class="col-lg-10">
+                      <select class="form-control" name="billing_period" id="billing_period" placeholder="Verrechnungsperiode">
+                        <option value="1" <?=($product->billing_period == 1) ? "selected='selected'" : ""?>>Monatlich</option>
+                        <option value="12" <?=($product->billing_period == 12) ? "selected='selected'" : ""?>>Jährlich</option>
+                      </select>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="billing_delay">Verzögerter Verrechnungsstart</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="billing_delay" id="billing_delay" placeholder="Freimonate" value="<?=$contract->billing_delay?>">
+                    </div>
+                  </div>
+
+                    
+                  <?php if((is_array($contract->linkFrom) && count($contract->linkFrom)) || (is_array($contract->linkTo) && count($contract->linkTo))): ?>
+                      <h4>Verknüpfte Verträge</h4>
+
+                      <table class="table table-striped table-sm table-bordered table-hover">
+                        <tr>
+                          <th title="Verlinkten Contract mit neuem Contract verknüpfen">Übernehmen</th>
+                          <th title="Verlinkten Contract mit altem Contract zusammen kündigen">Kündigen</th>
+                          <th>Kunde</th>
+                          <th>Contract ID</th>
+                          <th>Produkt</th>
+                          <th>Matchcode</th>
+                          <th>Bestelldatum</th>
+                          <th>Fertigstellung</th>
+                          <th>Kündigung</th>
+                        </tr>
+                        <?php foreach($contract->links as $link): ?>
+                        <?php
+
+                        if($link->contract_id == $contract->id) {
+                          $linkcontract = $link->origin;
+                        } else {
+                          $linkcontract = $link->contract;
+
+                        }
+
+                        ?>
+                        <tr>
+                          <td><input type="radio" class="form-check" id="link-<?=$link->id?>-action-keep" name="links[<?=$link->id?>]" value="keep" <?=($linkcontract->cancel_date && $linkcontract->cancel_date < date('U')) ? "" : "checked='checked'"?> /></td>
+                          <td><input type="radio" class="form-check" id="link-<?=$link->id?>-action-cancel" name="links[<?=$link->id?>]" value="cancel" /></td>
+                          <td><a href="<?=self::getUrl("Address", "View", ["id" => $linkcontract->owner_id])?>" target="_blank"><?=$linkcontract->owner->getCompanyOrName()?></a></td>
+                          <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["contract_id" => $linkcontract->id])?>" target="_blank"><?=$linkcontract->id?></a></td>
+                          <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["contract_id" => $linkcontract->id])?>" target="_blank"><?=$linkcontract->product_name?></a></td>
+                          <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["contract_id" => $linkcontract->id])?>" target="_blank"><?=$linkcontract->matchcode?></a></td>
+                          <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=($linkcontract->order_date) ? date('d.m.Y', $linkcontract->order_date) : ""?></td>
+                          <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=($linkcontract->finish_date) ? date('d.m.Y', $linkcontract->finish_date) : ""?></td>
+                          <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=($linkcontract->cancel_date) ? date('d.m.Y', $linkcontract->cancel_date) : ""?></td>
+                        </tr>
+                        <?php endforeach; ?>
+                      </table>
+                  <?php endif; ?>
+                    
+                    
+                  <!-- TODO: Fileupload -->
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="note">Interne Notiz</label>
+                    <div class="col-lg-10">
+                      <textarea id="note" class="form-control" name="note" rows="5"><?=$contract->note?></textarea>
+                    </div>
+                  </div>
+                  
+                </div>
+              </div>
+              
+                  
+
+              
+              <div class="row">
+                <div class="col text-center">
+                  <input type="submit" class="btn btn-primary" value="Produktwechsel speichern" />
+                </div>
+              </div>
+            </form>
+            
+            
+          </div>
+        </div>
+        
+        
+  
+        <div class="card">
+          <div class="card-body">
+            <a href="<?=self::getUrl("Contract","View", ['id' => $contract->id, 'filter' => $filter, 's' => $s])?>" class="btn btn-sm btn-secondary mr-1"><i class="fas fa-list"></i> Zurück zur Vertragsansicht</a>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+
+    
+    <script>
+      $(".select2").select2({
+        allowClear: true,
+        placeholder: ""
+      });
+      /*
+       * product autocomplete
+       */
+      <?php if($contract->product_id && is_object(($contract->product))): ?>
+        $('#product_id').autoComplete('set', { value: <?=$contract->product_id?>, text: '<?=($contract->product_id) ? str_replace("'", "\\'", str_replace(["\n", "\r"], " ", $contract->product->name))." [".$contract->product_id."]" : ""?>'});
+      <?php else: ?>
+        $('#product_id').autoComplete();
+      <?php endif; ?>
+
+      $('#product_id').keydown(function() {
+        if(event.keyCode == 13) {
+          event.preventDefault();
+          return false;
+        }
+      });
+
+      $('#product_id').on("autocomplete.select", function(evt, item) {
+        if(item && item.value === 0) {
+          $('#product_id').autoComplete('set', null);
+        }
+        if(item && item.value) {
+          updateProduct(item.value);
+        }
+      });
+      // product autocomplete
+      
+      
+      
+      function updateProduct() {
+        var pid = $('input[name=product_id]').val();
+
+        $.get("<?=self::getUrl("Product", "Api")?>",
+        {
+          "do": "getProduct",
+          product_id: pid
+        },
+        function (success) {
+          //console.log(success);
+          p = success.result.product;
+          
+          $('#product_name').val(p.name);
+          //$('#product_info').val(p.name);
+          $('#billing_delay').val(p.billing_delay);
+          $('#billing_period').val(p.billing_period);
+          $('#price').val(p.price);
+          $('#price_setup').val(p.price_setup);
+          $('#price_nne').val(p.price_nne);
+          $('#price_nbe').val(p.price_nbe);
+          
+          if(typeof p.attributes === 'object' && "termination_required" in p.attributes && p.attributes.termination_required == 1) {
+            $('#termination_id-line').show();
+            $('#termination_id').select2({
+              allowClear: true,
+              placeholder: ""
+            });
+          } else {
+            $('#termination_id-line').hide();
+            //$('#termination_id-' + id + '-line').hide();
+          }
+
+        },
+        'json');
+
+      }
+    </script>
+    
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/Contract/View.php

@@ -0,0 +1,282 @@
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
+
+    <!-- start page title -->
+    <div class="row">
+      <div class="col-12">
+        <div class="page-title-box">
+          <div class="page-title-right">
+            <ol class="breadcrumb m-0">
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Contract")?>">Aktive Produkte</a></li>
+              <li class="breadcrumb-item active"><?=$contract->product_name?> [<?=$contract->matchcode?>]</li>
+            </ol>
+          </div>
+          <h4 class="page-title">Aktives Produkt</h4>
+        </div>
+      </div>
+    </div>
+    <!-- end page title -->
+    
+    <div class="row">
+      <div class="col-lg-12">
+        
+        <div class="card">
+          <div class="card-body">
+            <a href="<?=self::getUrl("Contract","Index", ['filter' => $filter, 's' => $s])?>" class="btn btn-sm btn-secondary mr-1"><i class="fas fa-list"></i> Zurück zur Vertragsübersicht</a>
+            <a href="<?=self::getUrl("Contract","edit", ['contract_id' => $contract->id, 'filter' => $filter, 's' => $s, 'f' => "view"])?>" class="btn btn-sm btn-outline-success"><i class="fas fa-edit"></i> Vertrag bearbeiten</a>
+          </div>
+        </div>
+        
+        <div class="card">
+          <div class="card-body">
+            <?php if(!$contract->finish_date || $contract->finish_date > date('U')): ?>
+              <h2 class="text-center mb-3 text-secondary">In Herstellung</h2>
+            <?php endif; ?>
+            <?php if($contract->isCancelled()): ?>
+              <h2 class="text-center mb-3 text-danger">GEKÜNDIGT</h2>
+            <?php endif; ?>
+            <h3 class="text-center mb-3 <?=($contract->isCancelled()) ? "canceled" : ""?>"><?=$contract->product_name?> [<?=$contract->id?>]</h3>
+            
+            <table class="table table-sm table-striped view-table">
+              <tr>
+                <th style="max-width: 50vw;">Matchcode:</th>
+                <td style="width: 50vw;"><?=$contract->matchcode?></td>
+              </tr>
+              <!-- upgrades -->
+              <?php if(is_array($contract->upgradeFrom) && count($contract->upgradeFrom)): ?>
+              <tr>
+                <th>Upgrade von:</th>
+                <td>
+                  <?php foreach($contract->upgradeFrom as $link): ?>
+                    <a href="<?=self::getUrl("Contract", "View", ["contract_id" => $link->origin_contract_id])?>" class="contract-link <?=($link->origin->cancel_date && $link->origin->cancel_date <= date('U')) ? "canceled" : ""?>"><?=$link->origin->product_name?> [<?=$link->origin->matchcode?>] (<?=$link->origin_contract_id?>)</a><br />
+                  <?php endforeach; ?>
+                </td>
+              </tr>
+              <?php endif; ?>
+              <?php if(is_array($contract->upgradeTo) && count($contract->upgradeTo)): ?>
+              <tr>
+                <th>Upgrade auf:</th>
+                <td>
+                  <?php foreach($contract->upgradeTo as $link): ?>
+                    <a href="<?=self::getUrl("Contract", "View", ["contract_id" => $link->contract_id])?>" class="contract-link <?=($link->contract->cancel_date && $link->contract->cancel_date <= date('U')) ? "canceled" : ""?>"><?=$link->contract->product_name?> [<?=$link->contract->matchcode?>] (<?=$link->contract_id?>)</a><br />
+                  <?php endforeach; ?>
+                </td>
+              </tr>
+              <?php endif; ?>
+              
+              <!-- downgrades -->
+              <?php if(is_array($contract->downgradeFrom) && count($contract->downgradeFrom)): ?>
+              <tr>
+                <th>Downgrade von:</th>
+                <td>
+                  <?php foreach($contract->downgradeFrom as $link): ?>
+                    <a href="<?=self::getUrl("Contract", "View", ["contract_id" => $link->origin_contract_id])?>" class="contract-link <?=($link->origin->cancel_date <= date('U')) ? "canceled" : ""?>"><?=$link->origin->product_name?> [<?=$link->origin->matchcode?>] (<?=$link->origin_contract_id?>)</a><br />
+                  <?php endforeach; ?>
+                </td>
+              </tr>
+              <?php endif; ?>
+              <?php if(is_array($contract->downgradeTo) && count($contract->downgradeTo)): ?>
+              <tr>
+                <th>Downgrade auf:</th>
+                <td>
+                  <?php foreach($contract->downgradeTo as $link): ?>
+                    <a href="<?=self::getUrl("Contract", "View", ["contract_id" => $link->contract_id])?>" class="contract-link <?=($link->contract->cancel_date && $link->contract->cancel_date <= date('U')) ? "canceled" : ""?>"><?=$link->contract->product_name?> [<?=$link->contract->matchcode?>] (<?=$link->contract_id?>)</a><br />
+                  <?php endforeach; ?>
+                </td>
+              </tr>
+              <?php endif; ?>
+              
+              <!-- productchange -->
+              <?php if(is_array($contract->productchangeFrom) && count($contract->productchangeFrom)): ?>
+              <tr>
+                <th>Produktwechsel von:</th>
+                <td>
+                  <?php foreach($contract->productchangeFrom as $link): ?>
+                    <a href="<?=self::getUrl("Contract", "View", ["contract_id" => $link->origin_contract_id])?>" class="contract-link <?=($link->origin->cancel_date <= date('U')) ? "canceled" : ""?>"><?=$link->origin->product_name?> [<?=$link->origin->matchcode?>] (<?=$link->origin_contract_id?>)</a><br />
+                  <?php endforeach; ?>
+                </td>
+              </tr>
+              <?php endif; ?>
+              <?php if(is_array($contract->productchangeTo) && count($contract->productchangeTo)): ?>
+              <tr>
+                <th>Produktwechsel auf:</th>
+                <td>
+                  <?php foreach($contract->productchangeTo as $link): ?>
+                    <a href="<?=self::getUrl("Contract", "View", ["contract_id" => $link->contract_id])?>" class="contract-link <?=($link->contract->cancel_date && $link->contract->cancel_date <= date('U')) ? "canceled" : ""?>"><?=$link->contract->product_name?> [<?=$link->contract->matchcode?>] (<?=$link->contract_id?>)</a><br />
+                  <?php endforeach; ?>
+                </td>
+              </tr>
+              <?php endif; ?>
+              
+              <!-- relocation -->
+              <?php if(is_array($contract->relocationFrom) && count($contract->relocationFrom)): ?>
+              <tr>
+                <th>Umzug von:</th>
+                <td>
+                  <?php foreach($contract->relocationFrom as $link): ?>
+                    <a href="<?=self::getUrl("Contract", "View", ["contract_id" => $link->origin_contract_id])?>" class="contract-link <?=($link->origin->cancel_date && $link->origin->cancel_date <= date('U')) ? "canceled" : ""?>"><?=$link->origin->product_name?> [<?=$link->origin->matchcode?>] (<?=$link->origin_contract_id?>)</a><br />
+                  <?php endforeach; ?>
+                </td>
+              </tr>
+              <?php endif; ?>
+              <?php if(is_array($contract->relocationTo) && count($contract->relocationTo)): ?>
+              <tr>
+                <th>Umzug auf:</th>
+                <td>
+                  <?php foreach($contract->relocationTo as $link): ?>
+                    <a href="<?=self::getUrl("Contract", "View", ["contract_id" => $link->contract_id])?>" class="contract-link <?=($link->contract->cancel_date && $link->contract->cancel_date <= date('U')) ? "canceled" : ""?>"><?=$link->contract->product_name?> [<?=$link->contract->matchcode?>] (<?=$link->contract_id?>)</a><br />
+                  <?php endforeach; ?>
+                </td>
+              </tr>
+              <?php endif; ?>
+              <tr>
+                <th>Vertragsinhaber:</th>
+                <td><a href="<?=self::getUrl("Address", "View", ["id" => $contract->owner_id])?>"><?=$contract->owner->getCompanyOrName()?> [<?=$contract->owner->customer_number?>]</a></td>
+              </tr>
+              <?php if($contract->billingaddress_id): ?>
+              <tr>
+                <th>Rechnungsempfänger:</th>
+                <td><a href="<?=self::getUrl("Address", "View", ["id" => $contract->billingaddress_id])?>"><?=$contract->billingaddress->getCompanyOrName()?> [<?=$contract->billingaddress->customer_number?>]</a></td>
+              </tr>
+              <?php endif; ?>
+              <tr>
+                <th>Produkt:</th>
+                <td><?=$contract->product_name?> [<?=$contract->product_id?>]<?=($contract->product_name != $contract->product->name) ? " <i>(".$contract->product->name.")</i>" : ""?></td>
+              </tr><tr>
+                <th>Produkt Info:</th>
+                <td><?=$contract->product_info?></td>
+              </tr>
+              
+              
+              <tr>
+                <th>SLA:</th>
+                <td><?=$contract->sla->name?></td>
+              </tr><tr>
+                <th>Externes Produkt:</th>
+                <td><?=($contract->product_external) ? "Ja" : "Nein"?></td>
+              </tr><tr>
+                <th>Setup Preis:</th>
+                <td>€ <?=$contract->price_setup?></td>
+              </tr><tr>
+                <th>Preis Periodisch:</th>
+                <td>€ <?=$contract->price?></td>
+              </tr><tr>
+                <th>Verrechnungsperiode:</th>
+                <td>
+                  <?=($contract->billing_period == 1) ? "Monatlich" : ""?>
+                  <?=($contract->billing_period == 12) ? "Jährlich" : ""?>
+                  <?=($contract->billing_period == 24) ? "Zweijährlich" : ""?>
+                  <?=($contract->billing_period == 36) ? "Dreijährlich" : ""?>
+                </td>
+              </tr><tr>
+                <th>Verrechnungsstart Verzögerung:</th>
+                <td><?=$contract->billing_delay?> Monate</td>
+              </tr><tr>
+                <th></th>
+                <td></td>
+              </tr><tr>
+                <th>Bestelldatum:</th>
+                <td class="text-monospace"><?=($contract->order_date) ? date('d.m.Y',$contract->order_date) : ""?></td>
+              </tr><tr>
+                <th>Fertigstellungsdatum:</th>
+                <td class="text-monospace">
+                  <?=($contract->finish_date) ? date('d.m.Y',$contract->finish_date) : ""?>
+                  <?=($contract->finish_date_by) ? "(".$contract->finisher->name.")" : ""?>
+                </td>
+              </tr><tr>
+                <th>Kündigungsdatum:</th>
+                <td class="text-monospace">
+                  <?=($contract->cancel_date) ? date('d.m.Y',$contract->cancel_date) : ""?>
+                  <?=($contract->cancel_date_by) ? "(".$contract->canceler->name.")" : ""?>
+                </td>
+              </tr><tr>
+                <th></th>
+                <td></td>
+              </tr><tr>
+                <th>Erstellt:</th>
+                <td class="text-monospace"><?=date('d.m.Y H:i:s',$contract->create)?> (<?=$contract->creator->name?>)</td>
+              </tr><tr>
+                <th>Zuletzt bearbeitet:</th>
+                <td class="text-monospace"><?=date('d.m.Y H:i:s',$contract->edit)?> (<?=$contract->editor->name?>)</td>
+              </tr><tr class="bg-white">
+                <td colspan="2" class="text-center">
+                  <a href="<?=self::getUrl("Contractconfig", "edit", ["contract_id" => $contract->id])?>"><button type="button" class="btn btn-sm btn-outline-info">Konfiguration bearbeiten</button></a>
+                  <?php if($contract->finish_date && $contract->finish_date < date('U')): ?>
+                    <button type="button" class="btn btn-sm btn-outline-secondary">Inhaberwechsel</button>
+                    <a href="<?=self::getUrl("Contract", "productchange", ["contract_id" => $contract->id])?>"><button type="button" class="btn btn-sm btn-outline-success">Produkt-/Standortwechsel</button></a>
+                    <button type="button" class="btn btn-sm btn-outline-danger">Kündigen</button>
+                  <?php else: ?>
+                    <a href="<?=self::getUrl("Contract", "finishContract", ['contract_id' => $contract->id])?>" onclick="if(!confirm('Jetzt fertigstellen und in Verrechnung geben?')) return false"><button type="button" class="btn btn-sm btn-success">Fertigstellen</button></a>
+                  <?php endif; ?>
+                </td>
+              </tr>
+            </table>
+            
+          </div>
+        </div>
+        
+        <?php if((is_array($contract->linkFrom) && count($contract->linkFrom)) || (is_array($contract->linkTo) && count($contract->linkTo))): ?>
+        <div class="card">
+          <div class="card-body">
+            <h4>Verknüpfte Verträge <small><a href="<?=self::getUrl("Contract", "add", ["origin_contract_id" => $contract->id])?>"><i class="fas fa-plus"></i>Neuen Contract anlegen</a></small></h4>
+
+            <table class="table table-striped table-sm table-bordered table-hover">
+              <tr>
+                <th>Kunde</th>
+                <th>Contract ID</th>
+                <th>Typ</th>
+                <th>Produkt</th>
+                <th>Matchcode</th>
+                <th>Bestelldatum</th>
+                <th>Fertigstellung</th>
+                <th>Kündigung</th>
+                <th></th>
+              </tr>
+              <?php foreach($contract->links as $link): ?>
+              <?php
+              
+              if($link->contract_id == $contract->id) {
+                $direction = "von";
+                $linkcontract = $link->origin;
+              } else {
+                $linkcontract = $link->contract;
+                if($link->type == "upgrade" || $link->type == "downgrade") {
+                  $direction = "auf";
+                }
+                if($link->type == "relocation") {
+                  $direction = "nach";
+                }
+                
+              }
+              
+              ?>
+              <tr>
+                <td><a href="<?=self::getUrl("Address", "View", ["id" => $linkcontract->owner_id])?>"><?=$linkcontract->owner->getCompanyOrName()?></a></td>
+                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["contract_id" => $linkcontract->id])?>"><?=$linkcontract->id?></a></td>
+                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=__($link->type, "contract")?> <?=($link->type != "link") ? $direction : ""?></td>
+                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["contract_id" => $linkcontract->id])?>"><?=$linkcontract->product_name?></a></td>
+                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><a href="<?=self::getUrl("Contract", "View", ["contract_id" => $linkcontract->id])?>"><?=$linkcontract->matchcode?></a></td>
+                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=($linkcontract->order_date) ? date('d.m.Y', $linkcontract->order_date) : ""?></td>
+                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=($linkcontract->finish_date) ? date('d.m.Y', $linkcontract->finish_date) : ""?></td>
+                <td class="contract <?=($linkcontract->isCancelled()) ? "canceled" : ""?>"><?=($linkcontract->cancel_date) ? date('d.m.Y', $linkcontract->cancel_date) : ""?></td>
+                <td>
+                  <a href="<?=self::getUrl("Contract", "deleteLink", ["link_id" => $link->id])?>" onclick="if(!confirm('Verknüpfung wirklich entfernen?')) return false;" class="text-danger" title="Verknüpfung entfernen"><i class="fas fa-xmark-large"></i></a>
+                </td>
+              </tr>
+              <?php endforeach; ?>
+            </table>
+          </div>
+        </div>
+        <?php endif; ?>
+        
+        <div class="card">
+          <div class="card-body">
+            <a href="<?=self::getUrl("Contract","Index", ['filter' => $filter, 's' => $s])?>" class="btn btn-sm btn-secondary mr-1"><i class="fas fa-list"></i> Zurück zur Vertragsübersicht</a>
+            <a href="<?=self::getUrl("Contract","edit", ['contract_id' => $contract->id, 'filter' => $filter, 's' => $s, 'f' => "view"])?>" class="btn btn-sm btn-outline-success"><i class="fas fa-edit"></i> Vertrag bearbeiten</a>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/Contractconfig/Form.php

@@ -0,0 +1,108 @@
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
+
+    <!-- start page title -->
+    <div class="row">
+      <div class="col-12">
+        <div class="page-title-box">
+          <div class="page-title-right">
+            <ol class="breadcrumb m-0">
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Contract")?>">Aktive Produkte</a></li>
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Contract", "view", ['id' => $contract->id])?>"><?=$contract->product_name?> [<?=$contract->matchcode?>]</a></li>
+              <li class="breadcrumb-item active">Konfiguration</li>
+            </ol>
+          </div>
+          <h4 class="page-title">Aktives Produkt</h4>
+        </div>
+      </div>
+    </div>
+    <!-- end page title -->
+    
+    <div class="row">
+      <div class="col-lg-12">
+        
+        <div class="card">
+          <div class="card-body">
+            <a href="<?=self::getUrl("Contract","View", ['id' => $contract->id, 'filter' => $filter, 's' => $s])?>" class="btn btn-sm btn-secondary mr-1"><i class="fas fa-list"></i> Zurück zur Vertragsansicht</a>
+          </div>
+        </div>
+        
+        <div class="card">
+          <div class="card-body">
+            <h3 class="text-center mb-3"><?=$contract->product_name?> (<?=$contract->id?>)</h3>
+            
+            <table class="table table-sm table-striped view-table">
+              <tr>
+                <th style="max-width: 50vw;">Matchcode:</th>
+                <td style="width: 50vw;"><?=$contract->matchcode?></td>
+              </tr>
+              <tr>
+                <th>Vertragsinhaber:</th>
+                <td><a href="<?=self::getUrl("Address", "View", ["id" => $contract->owner->id])?>"><?=$contract->owner->getCompanyOrName()?> (<?=$contract->owner->customer_number?>)</a></td>
+              </tr>
+              <tr>
+                <th>Produkt:</th>
+                <td><?=$contract->product_name?></td>
+              </tr><tr>
+                <th>Produkt Info:</th>
+                <td><?=$contract->product_info?></td>
+              </tr>
+            </table>
+            
+          </div>
+        </div>
+        
+        
+        <div class="card">
+          <div class="card-body">
+            <h4 class="text-center mb-3">Konfiguration bearbeiten</h4>
+            <?php if(is_array($groups) && count($groups)): ?>
+            <form method="post" action="<?=self::getUrl("Contractconfig", "Save")?>">
+              <input type="hidden" name="contract_id" value="<?=$contract->id?>" />
+              <table class="table table-sm table-borderless view-table">
+                <?php foreach($groups as $group): ?>
+                <tr class="bg-light">
+                  <th><h4><u><?=$group->name?></u></h4></td>
+                  <td></td>
+                </tr>
+                <?php foreach($group->items as $item): ?>
+                  <tr>
+                    <th style="max-width: 50vw;"><?=$item->displayname?>:</th>
+                    <td style="width: 50vw;">
+                      <?php if($item->type == "enum"): ?>
+                        <select class="form-control" name="itemvalues[<?=$item->id?>]">
+                          <?php foreach($item->getTypedataArray() as $option): ?>
+                            <option value="<?=$option?>" <?=($item->getValue() == $option) ? "selected='selected'" : ""?>><?=$option?></option>
+                          <?php endforeach; ?>
+                        </select>
+                      <?php else: ?>
+                        <input type="text" class="form-control <?=(is_array($error_items) && in_array($item->id, $error_items)) ? "invalid" : ""?>" name="itemvalues[<?=$item->id?>]" value="<?=(isset($request)) ? $request->itemvalues[$item->id] : $item->getValue()?>" />
+                    <?php endif; ?>
+                      <small><?=$item->description?></small>
+                    </td>
+                  </tr>
+                  <?php endforeach; ?>
+                <?php endforeach; ?>
+              </table>
+            
+            
+              <div class="row">
+                <div class="col text-center">
+                  <input type="submit" class="btn btn-primary" value="Konfiguration speichern" />
+                </div>
+              </div>
+            </form>
+            <?php endif; ?>
+          </div>
+        </div>
+  
+        <div class="card">
+          <div class="card-body">
+            <a href="<?=self::getUrl("Contract","View", ['id' => $contract->id, 'filter' => $filter, 's' => $s])?>" class="btn btn-sm btn-secondary mr-1"><i class="fas fa-list"></i> Zurück zur Vertragsansicht</a>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/Contractconfig/Index.php

@@ -1,124 +0,0 @@
-<?php
-  $siteTitle = "Benutzer";
-?>
-<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
-
-    <!-- start page title -->
-    <div class="row">
-      <div class="col-12">
-        <div class="page-title-box">
-          <div class="page-title-right">
-            <ol class="breadcrumb m-0">
-              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>">the-tool</a></li>
-              <li class="breadcrumb-item"><a href="<?=self::getUrl("Contract")?>">Verträge</a></li>
-              <li class="breadcrumb-item">Vertragsconfig</li>
-            </ol>
-          </div>
-          <h4 class="page-title">Vertragsconfig</h4>
-        </div>
-      </div>
-    </div>
-    <!-- end page title -->
-
-    <!-- Main content -->
-    <div class="row">
-      <div class="col-lg">
-        <div class="card">
-          <div class="card-body">
-            
-            <?php if(is_array($groups) && count($groups)): ?>
-            <?php foreach($groups as $group): ?>
-            <h4>Gruppe <?=$group->name?></h4>
-            <form method="post" action="<?=$this->getUrl("User","save")?>">
-              
-              <?php if(is_array($group->items) && count($group->items)): ?>
-              <?php $i = 0; foreach($group->items as $item): ?>
-              
-              <div class="card">
-                <div class="card-body">
-                  
-              
-                <div class="p-2 <?=($i % 2 == 0) ? "bg-light" : ""?>">
-                  <div class="row">
-                    <div class="col-md-11 float-left">
-                      <h4 class="header-title">Attribut <span class="text-monospace text-pink"><?=$item->name?></span></h4>
-                    </div>
-                    <div class="col-md-1 float-right">
-                      <small><a class="text-danger" href="<?=self::getUrl("Contractconfig", "delete", ['id' => $item->id])?>" onclick="if(!confirm('Attribut wirklich löschen?')) return false;"><i class="fas fa-trash-alt"></i> löschen</a></small>
-                    </div>
-                  </div>
-                  <div class="row">
-                    <div class="col-md-4">
-                      <div class="form-group">
-                        <label for="item_<?=$item->id?>_name">Name <small class="text-monospace">[a-z0-9._-]</small></label>
-                        <input type="text" class="form-control" id="item_<?=$item->id?>_name" name="item[<?=$item->id?>][name]" value="<?=$item->name?>" />
-                      </div>
-                    </div>
-                    <div class="col-md-4">
-                      <div class="form-group">
-                        <label for="item_<?=$item->id?>_type">Datentyp</label>
-                        <select class="form-control" id="item_<?=$item->id?>_type" name="item[<?=$item->id?>][type]">
-                          <option value="string">String</option>
-                          <option value="int">Ganzzahl</option>
-                          <option value="decimal">Dezimalzahl</option>
-                          <option value="enum">Auswahl</option>
-                        </select>
-                      </div>
-                    </div>
-                    
-                    <div class="col-md-4">
-                      <div class="form-group" id="ddata_<?=$item->id?>">
-                        <label for="item_<?=$item->id?>_data">Auswahldaten (1 Element pro Zeile)</label>
-                        <textarea class="form-control" id="item_<?=$item->id?>_data" name="item[<?=$item->id?>][data]"><?=$item->typedata?></textarea>
-                        <input type="text" class="form-control" id="item_<?=$item->id?>_pattern" name="item[<?=$item->id?>][pattern]" value="<?=$item->pattern?>" />
-                      </div>
-                    </div>
-                    
-                  </div>
-                  <div class="form-group row">
-                    <div class="col-md-4">
-                      <div class="form-group">
-                        <label for="item_<?=$item->id?>_displayname">Anzeigename</label>
-                        <input type="text" class="form-control" id="item_<?=$item->id?>_displayname" name="item[<?=$item->id?>][displayname]" value="<?=$item->displayname?>" />
-                      </div>
-                    </div>
-                    <div class="col-md-4">
-                      <div class="form-group">
-                        <label for="item_<?=$item->id?>_value">Standardwert</label>
-                        <input type="text" class="form-control" id="item_<?=$item->id?>_value" name="item[<?=$item->id?>][value]" value="<?=$item->value?>">
-                      </div>
-                    </div>
-                    
-                    <div class="col-md-4">
-                      <div class="form-group">
-                        <label for="item_<?=$item->id?>_description">Beschreibung</label>
-                        <input type="text" class="form-control" id="item_<?=$item->id?>_description" name="item[<?=$item->id?>][description]" value="<?=$item->description?>" />
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              </div>
-              
-              <?php $i++; endforeach; ?>
-              <?php endif; ?>
-              
-            <?php endforeach; ?>
-            <?php else: ?>
-            <i>Keine Vertragsconfig Gruppen gefunden</i>
-            <?php endif; ?>
-          </div>
-
-        </div>
-      </div>
-    </div>
-
-<script type="text/javascript">
-  $("#address_id").select2({
-    allowClear: true,
-    placeholder: ""
-  });
-
-</script>
-
-<?php include(realpath(dirname(__FILE__)."/../")."/footer.php"); ?><?php

Layout/default/Contractconfig/Index_old.php

@@ -0,0 +1,247 @@
+<?php
+  $siteTitle = "Benutzer";
+?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
+
+    <!-- start page title -->
+    <div class="row">
+      <div class="col-12">
+        <div class="page-title-box">
+          <div class="page-title-right">
+            <ol class="breadcrumb m-0">
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Contractconfig")?>">Contractconfig</a></li>
+              <li class="breadcrumb-item">Contractconfig</li>
+            </ol>
+          </div>
+          <h4 class="page-title">Contractconfig</h4>
+        </div>
+      </div>
+    </div>
+    <!-- end page title -->
+
+    <!-- Main content -->
+    <div class="row">
+      <div class="col-lg">
+        <div class="card">
+          <div class="card-body">
+            
+            <div class="row">
+              <div class="col-4">
+                <div class="form-group">
+                  <form method="post" action="<?=self::getUrl("Contractconfig", "addGroup")?>">
+                    <label class="form-label" for="">Neue Config Gruppe anlegen</label>
+                    <div class="input-group mb-3">
+                      <input type="text" class="form-control" name="name" placeholder="Gruppenname..." />
+                      <div class="input-group-append">
+                        <button type="submit" class="btn btn-primary"><i class="fas fa-plus"></i> Gruppe hinzufügen</button>
+                      </div>
+                    </div>
+                  </form>
+                </div>
+                
+                
+              </div>
+            </div>
+          
+            <?php if(is_array($configgroups) && count($configgroups)): ?>
+            <?php foreach($configgroups as $group): ?>
+              <h4>Gruppe <?=$group->name?> <small><a href="#" onclick="$('#item-form-<?=$group->id?>').toggle()"><i class="fas fa-plus"></i> Neues Element erstellen</a></small></h4>
+                  
+              <div class="card hidden" id="item-form-<?=$group->id?>">
+                <div class="card-body">
+                  <form method="post" action="<?=self::getUrl("Contractconfig", "save")?>">
+                    <input type="hidden" name="group_id" value="<?=$group->id?>" />
+                    <div class="p-2 <?=($i % 2 == 0) ? "bg-light" : ""?>">
+                      <div class="row col">
+                        <h5>Neues Config Element</h5>
+                      </div>
+                      <div class="row">
+                        <div class="col-md-4">
+                          <div class="form-group">
+                            <label for="item_new_name">Name <small class="text-monospace">[a-z0-9._-]</small></label>
+                            <input type="text" class="form-control" id="item_new_name" name="name" value="" />
+                          </div>
+                        </div>
+                        <div class="col-md-4">
+                          <div class="form-group">
+                            <label for="item_new_type">Datentyp</label>
+                            <select class="form-control" id="item_new_type" name="type" onchange='toggleTypedata("new")'>
+                              <option value="string">String</option>
+                              <option value="int">Ganzzahl</option>
+                              <option value="decimal">Dezimalzahl</option>
+                              <option value="enum">Auswahl</option>
+                            </select>
+                          </div>
+                        </div>
+
+                        <div class="col-md-4">
+                          <div class="form-group" id="typedata_new">
+                            <div class="enum hidden">
+                              <label for="item_new_data">Auswahldaten (1 Element pro Zeile)</label>
+                              <textarea class="form-control" style="height: 128px" id="item_new_data" name="data"></textarea>
+                            </div>
+                            <div class="pattern">
+                              <label for="item_new_pattern">Regex Pattern</label>
+                              <input type="text" class="form-control" id="item_new_pattern" name="pattern" value="" />
+                            </div>
+                          </div>
+                        </div>
+
+                      </div>
+                      <div class="form-group row">
+                        <div class="col-md-4">
+                          <div class="form-group">
+                            <label for="item_new_displayname">Anzeigename</label>
+                            <input type="text" class="form-control" id="item_new_displayname" name="displayname" value="" />
+                          </div>
+                        </div>
+
+                        <div class="col-md-4">
+                          <div class="form-group">
+                            <label for="item_new_description">Beschreibung</label>
+                            <input type="text" class="form-control" id="item_new_description" name="description" value="" />
+                          </div>
+                        </div>
+                      </div>
+
+                      <div class="form-group row">
+                        <div class="col">
+                          <input type="submit" class="btn btn-primary" value="Speichern" />
+                        </div>
+
+                      </div>
+
+                    </div>
+                  </form>
+                </div>
+              </div>
+            
+              <?php if(is_array($group->items) && count($group->items)): ?>
+              <?php $i = 0; foreach($group->items as $item): ?>
+
+                  <div class="list-group">
+                    <a href="#" class="list-group-item list-group-item-action" onclick="$('#item-edit-<?=$item->id?>').toggle()"><span class="text-monospace text-pink"><?=$item->name?></span> - <?=$item->displayname?> [<?=$item->type?>]</a>
+                  
+                  
+                    <div class="card hidden" id="item-edit-<?=$item->id?>">
+                      <div class="card-body">
+
+                        <form method="post" action="<?=self::getUrl("Contractconfig", "save")?>">
+                          <input type="hidden" name="item_id" value="<?=$item->id?>" />
+                          <input type="hidden" name="group_id" value="<?=$group->id?>" />
+                          <div class="p-2 <?=($i % 2 == 0) ? "bg-light" : ""?>">
+                            <div class="row">
+                              
+                            </div>
+                            <div class="row">
+                              <div class="col-md-4">
+                                <div class="form-group">
+                                  <label for="item_<?=$item->id?>_name">Name <small class="text-monospace">[a-z0-9._-]</small></label>
+                                  <input type="text" class="form-control" id="item_<?=$item->id?>_name" name="name" value="<?=$item->name?>" />
+                                </div>
+                              </div>
+                              <div class="col-md-4">
+                                <div class="form-group">
+                                  <label for="item_<?=$item->id?>_type">Datentyp</label>
+                                  <select class="form-control" id="item_<?=$item->id?>_type" name="type" onchange="toggleTypedata(<?=$item->id?>)">
+                                    <option value="string" <?=($item->type == "string") ? "selected='selected'" : ""?>>String</option>
+                                    <option value="int" <?=($item->type == "int") ? "selected='selected'" : ""?>>Ganzzahl</option>
+                                    <option value="decimal" <?=($item->type == "decimal") ? "selected='selected'" : ""?>>Dezimalzahl</option>
+                                    <option value="enum" <?=($item->type == "enum") ? "selected='selected'" : ""?>>Auswahl</option>
+                                  </select>
+                                </div>
+                              </div>
+
+                              <div class="col-md-4">
+                                <div class="form-group" id="typedata_<?=$item->id?>">
+                                  <div class="enum <?=($item->type != "enum") ? "hidden" : ""?>">
+                                    <label for="item_<?=$item->id?>_data">Auswahldaten (1 Element pro Zeile)</label>
+                                    <textarea class="form-control" style="height: 128px" id="item_<?=$item->id?>_data" name="data"><?=$item->typedata?></textarea>
+                                  </div>
+                                  <div class="pattern <?=($item->type != "string") ? "hidden" : ""?>">
+                                    <label for="item_<?=$item->id?>_pattern">Regex Pattern</label>
+                                    <input type="text" class="form-control" id="item_<?=$item->id?>_pattern" name="pattern" value="<?=$item->pattern?>" />
+                                  </div>
+                                </div>
+                              </div>
+
+                            </div>
+                            <div class="form-group row">
+                              <div class="col-md-4">
+                                <div class="form-group">
+                                  <label for="item_<?=$item->id?>_displayname">Anzeigename</label>
+                                  <input type="text" class="form-control" id="item_<?=$item->id?>_displayname" name="displayname" value="<?=$item->displayname?>" />
+                                </div>
+                              </div>
+                              
+                              <div class="col-md-4">
+                                <div class="form-group">
+                                  <label for="item_<?=$item->id?>_description">Beschreibung</label>
+                                  <input type="text" class="form-control" id="item_<?=$item->id?>_description" name="description" value="<?=$item->description?>" />
+                                </div>
+                              </div>
+                            </div>
+
+                            <div class="form-group row">
+                              <div class="col-md-11 float-left">
+                                <input type="submit" class="btn btn-primary" value="Speichern" />
+                              </div>
+                              <div class="col-md-1 float-right">
+                                <small><a class="text-danger" href="<?=self::getUrl("Contractconfig", "deleteItem", ['id' => $item->id])?>" onclick="if(!confirm('Attribut wirklich löschen?')) return false;"><i class="fas fa-trash-alt"></i> löschen</a></small>
+                              </div>
+                                
+                            </div>
+
+                          </div>
+                        </form>
+                      </div>
+                    </div>
+                  </div>
+                  <?php $i++; endforeach; ?>
+                  <?php endif; ?>
+            
+              <?php $i++; endforeach; ?>
+              <?php else: ?>
+                <i>Keine Configgruppen gefunden</i>
+              <?php endif; ?>
+            
+
+          </div>
+
+        </div>
+      </div>
+    </div>
+
+<script type="text/javascript">
+  $("#address_id").select2({
+    allowClear: true,
+    placeholder: ""
+  });
+  
+  var item;
+  var hash = window.location.hash.substr(1);
+  var match = hash.match(/item=(\d+)/);
+  if(match && match[1]) {
+    item = match[1]
+    $('#item-edit-' + item).show()
+    var pos = $('#item-edit-' + item).offset().top;
+    $(window).scrollTop(pos);
+  }
+  
+  function toggleTypedata(id) {
+    var type = $('#item_' + id + '_type').val();
+    if(type == "enum") {
+      $('#typedata_' + id + " .enum").show();
+      $('#typedata_' + id + " .pattern").hide();
+    } else if(type == "string") {
+      $('#typedata_' + id + " .pattern").show();
+      $('#typedata_' + id + " .enum").hide();
+    } else {
+      $('#typedata_' + id + " .pattern").hide();
+      $('#typedata_' + id + " .enum").hide();
+    }
+  }
+</script>
+
+<?php include(realpath(dirname(__FILE__)."/../")."/footer.php"); ?><?php

Layout/default/Contractconfiggroup/Index.php

@@ -0,0 +1,247 @@
+<?php
+  $siteTitle = "Benutzer";
+?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
+
+    <!-- start page title -->
+    <div class="row">
+      <div class="col-12">
+        <div class="page-title-box">
+          <div class="page-title-right">
+            <ol class="breadcrumb m-0">
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Contractconfig")?>">Contractconfig</a></li>
+              <li class="breadcrumb-item">Contractconfig</li>
+            </ol>
+          </div>
+          <h4 class="page-title">Contractconfig</h4>
+        </div>
+      </div>
+    </div>
+    <!-- end page title -->
+
+    <!-- Main content -->
+    <div class="row">
+      <div class="col-lg">
+        <div class="card">
+          <div class="card-body">
+            
+            <div class="row">
+              <div class="col-4">
+                <div class="form-group">
+                  <form method="post" action="<?=self::getUrl("Contractconfiggroup", "save")?>">
+                    <label class="form-label" for="">Neue Config Gruppe anlegen</label>
+                    <div class="input-group mb-3">
+                      <input type="text" class="form-control" name="name" placeholder="Gruppenname..." />
+                      <div class="input-group-append">
+                        <button type="submit" class="btn btn-primary"><i class="fas fa-plus"></i> Gruppe hinzufügen</button>
+                      </div>
+                    </div>
+                  </form>
+                </div>
+                
+                
+              </div>
+            </div>
+          
+            <?php if(is_array($configgroups) && count($configgroups)): ?>
+            <?php foreach($configgroups as $group): ?>
+              <h4>Gruppe <?=$group->name?> <small><a href="#" onclick="$('#item-form-<?=$group->id?>').toggle()"><i class="fas fa-plus"></i> Neues Element erstellen</a></small></h4>
+                  
+              <div class="card hidden" id="item-form-<?=$group->id?>">
+                <div class="card-body">
+                  <form method="post" action="<?=self::getUrl("ContractconfigItem", "save")?>">
+                    <input type="hidden" name="group_id" value="<?=$group->id?>" />
+                    <div class="p-2 <?=($i % 2 == 0) ? "bg-light" : ""?>">
+                      <div class="row col">
+                        <h5>Neues Config Element</h5>
+                      </div>
+                      <div class="row">
+                        <div class="col-md-4">
+                          <div class="form-group">
+                            <label for="item_new_name">Name <small class="text-monospace">[a-z0-9._-]</small></label>
+                            <input type="text" class="form-control" id="item_new_name" name="name" value="" />
+                          </div>
+                        </div>
+                        <div class="col-md-4">
+                          <div class="form-group">
+                            <label for="item_new_type">Datentyp</label>
+                            <select class="form-control" id="item_new_type" name="type" onchange='toggleTypedata("new")'>
+                              <option value="string">String</option>
+                              <option value="int">Ganzzahl</option>
+                              <option value="decimal">Dezimalzahl</option>
+                              <option value="enum">Auswahl</option>
+                            </select>
+                          </div>
+                        </div>
+
+                        <div class="col-md-4">
+                          <div class="form-group" id="typedata_new">
+                            <div class="enum hidden">
+                              <label for="item_new_data">Auswahldaten (1 Element pro Zeile)</label>
+                              <textarea class="form-control" style="height: 128px" id="item_new_data" name="data"></textarea>
+                            </div>
+                            <div class="pattern">
+                              <label for="item_new_pattern">Regex Pattern</label>
+                              <input type="text" class="form-control" id="item_new_pattern" name="pattern" value="" />
+                            </div>
+                          </div>
+                        </div>
+
+                      </div>
+                      <div class="form-group row">
+                        <div class="col-md-4">
+                          <div class="form-group">
+                            <label for="item_new_displayname">Anzeigename</label>
+                            <input type="text" class="form-control" id="item_new_displayname" name="displayname" value="" />
+                          </div>
+                        </div>
+
+                        <div class="col-md-4">
+                          <div class="form-group">
+                            <label for="item_new_description">Beschreibung</label>
+                            <input type="text" class="form-control" id="item_new_description" name="description" value="" />
+                          </div>
+                        </div>
+                      </div>
+
+                      <div class="form-group row">
+                        <div class="col">
+                          <input type="submit" class="btn btn-primary" value="Speichern" />
+                        </div>
+
+                      </div>
+
+                    </div>
+                  </form>
+                </div>
+              </div>
+            
+              <?php if(is_array($group->items) && count($group->items)): ?>
+              <?php $i = 0; foreach($group->items as $item): ?>
+
+                  <div class="list-group">
+                    <a href="#" class="list-group-item list-group-item-action" onclick="$('#item-edit-<?=$item->id?>').toggle()"><span class="text-monospace text-pink"><?=$item->name?></span> - <?=$item->displayname?> [<?=$item->type?>]</a>
+                  
+                  
+                    <div class="card hidden" id="item-edit-<?=$item->id?>">
+                      <div class="card-body">
+
+                        <form method="post" action="<?=self::getUrl("ContractconfigItem", "save")?>">
+                          <input type="hidden" name="item_id" value="<?=$item->id?>" />
+                          <input type="hidden" name="group_id" value="<?=$group->id?>" />
+                          <div class="p-2 <?=($i % 2 == 0) ? "bg-light" : ""?>">
+                            <div class="row">
+                              
+                            </div>
+                            <div class="row">
+                              <div class="col-md-4">
+                                <div class="form-group">
+                                  <label for="item_<?=$item->id?>_name">Name <small class="text-monospace">[a-z0-9._-]</small></label>
+                                  <input type="text" class="form-control" id="item_<?=$item->id?>_name" name="name" value="<?=$item->name?>" />
+                                </div>
+                              </div>
+                              <div class="col-md-4">
+                                <div class="form-group">
+                                  <label for="item_<?=$item->id?>_type">Datentyp</label>
+                                  <select class="form-control" id="item_<?=$item->id?>_type" name="type" onchange="toggleTypedata(<?=$item->id?>)">
+                                    <option value="string" <?=($item->type == "string") ? "selected='selected'" : ""?>>String</option>
+                                    <option value="int" <?=($item->type == "int") ? "selected='selected'" : ""?>>Ganzzahl</option>
+                                    <option value="decimal" <?=($item->type == "decimal") ? "selected='selected'" : ""?>>Dezimalzahl</option>
+                                    <option value="enum" <?=($item->type == "enum") ? "selected='selected'" : ""?>>Auswahl</option>
+                                  </select>
+                                </div>
+                              </div>
+
+                              <div class="col-md-4">
+                                <div class="form-group" id="typedata_<?=$item->id?>">
+                                  <div class="enum <?=($item->type != "enum") ? "hidden" : ""?>">
+                                    <label for="item_<?=$item->id?>_data">Auswahldaten (1 Element pro Zeile)</label>
+                                    <textarea class="form-control" style="height: 128px" id="item_<?=$item->id?>_data" name="data"><?=$item->typedata?></textarea>
+                                  </div>
+                                  <div class="pattern <?=($item->type != "string") ? "hidden" : ""?>">
+                                    <label for="item_<?=$item->id?>_pattern">Regex Pattern</label>
+                                    <input type="text" class="form-control" id="item_<?=$item->id?>_pattern" name="pattern" value="<?=$item->pattern?>" />
+                                  </div>
+                                </div>
+                              </div>
+
+                            </div>
+                            <div class="form-group row">
+                              <div class="col-md-4">
+                                <div class="form-group">
+                                  <label for="item_<?=$item->id?>_displayname">Anzeigename</label>
+                                  <input type="text" class="form-control" id="item_<?=$item->id?>_displayname" name="displayname" value="<?=$item->displayname?>" />
+                                </div>
+                              </div>
+                              
+                              <div class="col-md-4">
+                                <div class="form-group">
+                                  <label for="item_<?=$item->id?>_description">Beschreibung</label>
+                                  <input type="text" class="form-control" id="item_<?=$item->id?>_description" name="description" value="<?=$item->description?>" />
+                                </div>
+                              </div>
+                            </div>
+
+                            <div class="form-group row">
+                              <div class="col-md-11 float-left">
+                                <input type="submit" class="btn btn-primary" value="Speichern" />
+                              </div>
+                              <div class="col-md-1 float-right">
+                                <small><a class="text-danger" href="<?=self::getUrl("Contractconfig", "deleteItem", ['id' => $item->id])?>" onclick="if(!confirm('Attribut wirklich löschen?')) return false;"><i class="fas fa-trash-alt"></i> löschen</a></small>
+                              </div>
+                                
+                            </div>
+
+                          </div>
+                        </form>
+                      </div>
+                    </div>
+                  </div>
+                  <?php $i++; endforeach; ?>
+                  <?php endif; ?>
+            
+              <?php $i++; endforeach; ?>
+              <?php else: ?>
+                <i>Keine Configgruppen gefunden</i>
+              <?php endif; ?>
+            
+
+          </div>
+
+        </div>
+      </div>
+    </div>
+
+<script type="text/javascript">
+  $("#address_id").select2({
+    allowClear: true,
+    placeholder: ""
+  });
+  
+  var item;
+  var hash = window.location.hash.substr(1);
+  var match = hash.match(/item=(\d+)/);
+  if(match && match[1]) {
+    item = match[1]
+    $('#item-edit-' + item).show()
+    var pos = $('#item-edit-' + item).offset().top;
+    $(window).scrollTop(pos);
+  }
+  
+  function toggleTypedata(id) {
+    var type = $('#item_' + id + '_type').val();
+    if(type == "enum") {
+      $('#typedata_' + id + " .enum").show();
+      $('#typedata_' + id + " .pattern").hide();
+    } else if(type == "string") {
+      $('#typedata_' + id + " .pattern").show();
+      $('#typedata_' + id + " .enum").hide();
+    } else {
+      $('#typedata_' + id + " .pattern").hide();
+      $('#typedata_' + id + " .enum").hide();
+    }
+  }
+</script>
+
+<?php include(realpath(dirname(__FILE__)."/../")."/footer.php"); ?><?php

Layout/default/Emailtemplates/attachments/new_order_spin.pdf.php

@@ -23,19 +23,19 @@
     <table style="width: 100%">
       <tr>
         <td style="width:50%">
-          <img src="<?=$ressourcePathPrefix?>assets/pdf/logo.png" />
+          <img src="<?=$ressourcePathPrefix?>assets/pdf/logo-xinon.png" />
         </td>
         <td style="width:50%; text-align: right;">
           <table style="text-align: left; width:100%">
             <tr>
               <td style="text-align: right;">Kundennummer:</td>
-              <td><?=$owner->customer_number?></td>
+              <td style="padding-left: 4pt;"><?=$owner->customer_number?></td>
             </tr><tr>
               <td style="text-align: right;">Vertrag erfasst am:</td>
-              <td><?=date('d.m.Y', $order->create)?></td>
+              <td style="padding-left: 4pt;"><?=date('d.m.Y', $order->create)?></td>
             </tr><tr>
               <td style="text-align: right;">Bestelldatum:</td>
-              <td><?=date('d.m.Y', $order->order_date)?></td>
+              <td style="padding-left: 4pt;"><?=date('d.m.Y', $order->order_date)?></td>
             </tr><tr>
           </table>
         </td>
@@ -85,14 +85,14 @@
       Rechnungsauskünfte, etc) nach Ihrem <strong>persönlichen Service-PIN</strong> fragen.</p>
     </div>
 
-    <div style="height:48pt;"></div>
+    <div style="height:32pt;"></div>
     
     <div>
       <p><strong>Sollten Sie noch Fragen haben erreichen Sie uns per Mail (office@xinon.at) oder
-        telefonisch unter der Rufnummer 03115 40800.</strong></p>
+          telefonisch unter der Rufnummer <span style="white-space: nowrap">03115 40800.</span></strong></p>
     </div>
 
-    <div style="height:48pt;"></div>
+    <div style="height:32pt;"></div>
     
     <div>
       <p>Mit besten Grüßen,</p>

Layout/default/Linework/Index.php

@@ -302,29 +302,36 @@
                           <td><?=($term->building->getWorkflowvalue('ist_rohrverband_name')) ? $term->building->getWorkflowvalue('ist_rohrverband_name') : $term->building->getWorkflowvalue('rohrverband_name')?></td>
                           <td><?=($term->building->getWorkflowvalue('ist_rohrtype')) ? $term->building->getWorkflowvalue('ist_rohrtype') : $term->building->getWorkflowvalue('rohrtype')?></td>
                           <td>
-                            <?php if($term->building->getWorkflowvalue('ist_rohrfarbe')): ?>
+                            <?php $rohrfarbe = false;
+                              if($term->building->getWorkflowvalue('ist_rohrfarbe')) {
+                                $rohrfarbe = $term->building->getWorkflowvalue('ist_rohrfarbe');
+                              } elseif($term->building->getWorkflowvalue('rohrfarbe')) {
+                                $rohrfarbe = $term->building->getWorkflowvalue('rohrfarbe');
+                              }
+                            ?>
+                            <?php if($rohrfarbe): ?>
+                              <?php if(TT_CABLE_COLORS[$rohrfarbe]['two-color']): ?>
                               <span
                                 style="
-                                  background-color: #<?=TT_CABLE_COLORS[$term->building->getWorkflowvalue('ist_rohrfarbe')]["hex"]?>;
-                                  <?php if(TT_CABLE_COLORS[$term->building->getWorkflowvalue('ist_rohrfarbe')]["mark"]): ?>
-                                  color: #<?=TT_CABLE_COLORS[$term->building->getWorkflowvalue('ist_rohrfarbe')]["hexfg"]?>;
-                                  <?php else: ?>
-                                  color: #<?=TT_CABLE_COLORS[$term->building->getWorkflowvalue('ist_rohrfarbe')]["hex"]?>;
-                                  <?php endif; ?>
+                                  background: rgb(<?=TT_CABLE_COLORS[$rohrfarbe]["r"]?>,<?=TT_CABLE_COLORS[$rohrfarbe]["g"]?>,<?=TT_CABLE_COLORS[$rohrfarbe]["b"]?>);
+                                  background: linear-gradient(90deg, rgba(<?=TT_CABLE_COLORS[$rohrfarbe]["r"]?>,<?=TT_CABLE_COLORS[$rohrfarbe]["g"]?>,<?=TT_CABLE_COLORS[$rohrfarbe]["b"]?>,.5) 0%, rgba(<?=TT_CABLE_COLORS[$rohrfarbe]["r"]?>,<?=TT_CABLE_COLORS[$rohrfarbe]["g"]?>,<?=TT_CABLE_COLORS[$rohrfarbe]["b"]?>,.5) 50%, rgba(<?=TT_CABLE_COLORS[$rohrfarbe]["r2"]?>,<?=TT_CABLE_COLORS[$rohrfarbe]["g2"]?>,<?=TT_CABLE_COLORS[$rohrfarbe]["b2"]?>,.5) 50%, rgba(<?=TT_CABLE_COLORS[$rohrfarbe]["r2"]?>,<?=TT_CABLE_COLORS[$rohrfarbe]["g2"]?>,<?=TT_CABLE_COLORS[$rohrfarbe]["b2"]?>,.5) 100%);
+                                  padding-right: 42px;
                                   border-radius: 3px;
-                                ">-------</span> <?=ucfirst($term->building->getWorkflowvalue('ist_rohrfarbe'))?>
-                            <?php elseif($term->building->getWorkflowvalue('rohrfarbe')): ?>
+                                ">&nbsp;</span> <?=ucfirst($rohrfarbe)?>
+
+                              <?php else: ?>
                               <span
                                 style="
-                                  background-color: #<?=TT_CABLE_COLORS[$term->building->getWorkflowvalue('rohrfarbe')]["hex"]?>;
-                                  <?php if(TT_CABLE_COLORS[$term->building->getWorkflowvalue('rohrfarbe')]["mark"]): ?>
-                                  color: #<?=TT_CABLE_COLORS[$term->building->getWorkflowvalue('rohrfarbe')]["hexfg"]?>;
+                                  background-color: #<?=TT_CABLE_COLORS[$rohrfarbe]["hex"]?>;
+                                  <?php if(TT_CABLE_COLORS[$rohrfarbe]["mark"]): ?>
+                                  color: #<?=TT_CABLE_COLORS[$rohrfarbe]["hexfg"]?>;
                                   <?php else: ?>
-                                  color: #<?=TT_CABLE_COLORS[$term->building->getWorkflowvalue('rohrfarbe')]["hex"]?>;
+                                  color: #<?=TT_CABLE_COLORS[$rohrfarbe]["hex"]?>;
                                   <?php endif; ?>
                                   border-radius: 3px;
-                                ">-------</span> <?=ucfirst($term->building->getWorkflowvalue('rohrfarbe'))?>
+                                ">-------</span> <?=ucfirst($rohrfarbe)?>
                               <?php endif; ?>
+                            <?php endif; ?>
                           </td>
                         </tr>
                       </table>

Layout/default/Order/Index.php

@@ -50,7 +50,7 @@
                   <select name="filter[network_id]" id="filter_network_id" class="form-control">
                     <option></option>
                     <?php foreach($sorted_networks as $fnet => $nid): ?>
-                    <option value="<?=$nid?>" <?=($filter['network_id'] == $nid) ? "selected='selected'" : ""?>><?=$fnet?></option>
+                    <option value="<?=$nid?>" <?=(is_array($filter) && array_key_exists("network_id", $filter) && $filter['network_id'] == $nid) ? "selected='selected'" : ""?>><?=$fnet?></option>
                     <?php endforeach; ?>
                   </select>
                 </div>
@@ -285,7 +285,19 @@
                 <td onclick="toggleOrder(<?=$order->id?>)" colspan="6" class="pt-0" style="border-top: none;">
                   <div class="row">
                     <div class="mr-4 order-date-pill <?=($order->shippingdate) ? "active" : ""?>">Versandtermin: <span class="text-monospace"><?=($order->shippingdate) ? "<span class='text-success'>".date("d.m.Y", $order->shippingdate)."</span>" : "--.--.----"?></span></div>
-                    <div class="order-date-pill <?=($order->install_date) ? "active" : ""?>">Vorortinstallation: <span class="text-monospace"><?=($order->install_date) ? "<span class='text-success'>".date("d.m.Y",$order->install_date)."</span>" : "--.--.----"?></span></div>
+                    <?php if($order->install_date): ?>
+                      <div id="date-pill-<?=$order->id?>-install_date" class="order-date-pill active" id="order-install-date-<?=$order->id?>">
+                        <span class='text-success'>Vorortinstallation: <?=date("d.m.Y",$order->install_date)?></span>
+                      <div>
+                    <?php elseif(count($order->install_products)): ?>
+                      <div id="date-pill-<?=$order->id?>-install_date" class="order-date-pill active" id="order-install-date-<?=$order->id?>">
+                        <span class='text-success'>Vorortinstallation: --.--.----</span>
+                      </div>
+                    <?php else: ?>
+                      <div id="date-pill-<?=$order->id?>-install_date" class="order-date-pill" id="order-install-date-<?=$order->id?>">
+                        <span>Vorortinstallation: --.--.----</span>
+                      </div>
+                    <?php endif; ?>
                   </div>
                 </td>
               </tr>
@@ -302,7 +314,7 @@
                             <li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-contact" data-toggle="tab" aria-expanded="false">Kontakt</a></li>
                             <li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-details" data-toggle="tab" aria-expanded="false">Details</a></li>
                             <li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-files" data-toggle="tab" aria-expanded="false">Dokumente</a></li>
-                            <li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-technician" data-toggle="tab" aria-expanded="false">Technische Herstellung</a></li>
+                            <!--<li class="nav-item"><a class="nav-link" href="#order-detail-<?=$order->id?>-technician" data-toggle="tab" aria-expanded="false">Technische Herstellung</a></li>-->
                           </ul>
                         </div>
                       
@@ -625,7 +637,6 @@
               </tr>
               <?php $order_count = 0; ?>
               <?php foreach($orders as $order): ?>
-              <?php //$this->log->debug("blah: ".print_r($order->terminations[0]->workflowitems["customer_setup_date"]->value,true)); ?>
               <tr class="order-list-tr pb-0 <?=($order_count % 2 == 0) ? "table-bg-even" : ""?>" id="order-<?=$order->id?>">
                 <td>
                   <?=($order->customer_type == "business") ? "<i class='fas fa-buildings text-primary mr-1' title='Businessprodukt vorhanden'></i>" : "<i class='fas fa-user text-danger mr-1' title='Nur Residential Produkte'></i>"?>
@@ -731,7 +742,22 @@
                     <div class="mr-4 order-date-pill <?=(count($order->terminations) && $order->terminations[0]->workflowitems["backbone_setup_date"]->value->value_string) ? "active" : ""?>">Leitungsbau Backbone: <span class="text-monospace"><?=(count($order->terminations) && $order->terminations[0]->workflowitems["backbone_setup_date"]->value->value_string) ? "<span class='text-success'>".$order->terminations[0]->workflowitems["backbone_setup_date"]->value->value_string."</span>" : "--.--.----"?></span></div>
                     <div class="mr-4 order-date-pill <?=(count($order->terminations) && $order->terminations[0]->getWorkflowvalue("customer_setup_date")) ? "active" : ""?>">Leitungsbau Kunde: <span class="text-monospace"><?=(count($order->terminations) && $order->terminations[0]->getWorkflowvalue("customer_setup_date")) ? "<span class='text-success'>".$order->terminations[0]->getWorkflowvalue("customer_setup_date")."</span>" : "--.--.----"?></span></div>
                     <div class="mr-4 order-date-pill <?=($order->shippingdate) ? "active" : ""?>">Versandtermin: <span class="text-monospace"><?=($order->shippingdate) ? "<span class='text-success'>".date("d.m.Y", $order->shippingdate)."</span>" : "--.--.----"?></span></div>
-                    <div id="date-pill-<?=$order->id?>-install_date" class="order-date-pill <?=($order->install_date) ? "active" : ""?>" id="order-install-date-<?=$order->id?>">Vorortinstallation: <span class="text-monospace"><?=($order->install_date) ? "<span class='text-success'>".date("d.m.Y",$order->install_date)."</span>" : "--.--.----"?></span></div>
+                    
+                    <?php if($order->install_date): ?>
+                      <div id="date-pill-<?=$order->id?>-install_date" class="order-date-pill active" id="order-install-date-<?=$order->id?>">
+                        <span class='text-success'>Vorortinstallation: <?=date("d.m.Y",$order->install_date)?></span>
+                      <div>
+                    <?php elseif(count($order->install_products)): ?>
+                      <div id="date-pill-<?=$order->id?>-install_date" class="order-date-pill active" id="order-install-date-<?=$order->id?>">
+                        <span class='text-success'>Vorortinstallation: --.--.----</span>
+                      </div>
+                    <?php else: ?>
+                      <div id="date-pill-<?=$order->id?>-install_date" class="order-date-pill" id="order-install-date-<?=$order->id?>">
+                        <span>Vorortinstallation: --.--.----</span>
+                      </div>
+                    <?php endif; ?>
+                          
+                    
                   </div>
                 </td>
               </tr>

Layout/default/Preorder/Form.php

@@ -7,7 +7,7 @@
             <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")?>">Vorbestellung</a></li>
-              <li class="breadcrumb-item active"><?=($campaign->id) ? "bearbeiten" : "Neu" ?></li>
+              <li class="breadcrumb-item active"><?=($preorder->id) ? "bearbeiten" : "Neu" ?></li>
             </ol>
           </div>
           <h4 class="page-title">Vorbestellung</h4>
@@ -47,18 +47,109 @@
                   
                   
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="price">Adresse *</label>
+                    <label class="col-lg-2 col-form-label" for="adb_hausnummer_id">Adresse *</label>
                     <div class="col-lg-10">
                       <select class="form-control" name="adb_hausnummer_id" id="adb_hausnummer_id" />
                         <?php if($preorder->adb_hausnummer_id): ?>
                           <option value="<?=$preorder->adb_hausnummer_id?>" selected="selected"><?=$preorder->adb_hausnummer->plz->plz?> <?=$preorder->adb_hausnummer->strasse->ortschaft->name?>, <?=$preorder->adb_hausnummer->strasse->name?> <?=$preorder->adb_hausnummer->hausnummer?></option>
                         <?php endif; ?>
                       </select>
+                      
+                      <div id="new-address-toggle" class="alert alert-info mt-1 mb-1 pb-1 pt-1 hidden">
+                        <h5><i class="icon fas fa-info-circle"></i> Adresse nicht gefunden?</h5>
+                        Vertippt? Richtiges Netzgebiet (<strong><?=$campaign->network->name?></strong>) ?<br /><br /><a href="#" onclick="toggleNewAddress()"><i class="far fa-plus-square"></i> Hier klickem um die Adresse neu anzulegen</a>
+                        
+                        <div id="new-address" class="mt-0 mb-4 hidden">
+                          <hr />
+                          <div class="row" id="new-address-form">
+                            <div class="col-7 border">
+                              <div class="mb-3">
+                                <h4>Neue Adresse in Adress-Datenbank eintragen:</h4>
+                                <small class="text-danger">Alle mit * markierten Felder sind Pflichtfelder</small>
+                              </div>
+                              <div class="form-group row">
+                                <label class="col-lg-3 col-form-label" for="street">Straße <span class="text-danger">*</span> / Hausnummer <span class="text-danger">*</span></label>
+                                <div class="col-lg-6">
+                                  <input type="text" class="form-control basicAutoComplete" autocomplete="off" data-url="<?=self::getUrl('AddressDB','api')?>?do=findStreets&autocomplete=1" name="new_address_street" id="new_address_street" value="<?=$preorder->new_address_street?>" placeholder="Straße" />
+                                </div>
+                                <div class="col-lg-3">
+                                  <input type="text" class="form-control" name="new_address_housenumber" id="new_address_housenumber" value="<?=$preorder->new_address_housenumber?>" placeholder="Hausnummer" />
+                                </div>
+                              </div>
+
+                              <div class="form-group row">
+                                <label class="col-lg-3 col-form-label" for="zip">PLZ <span class="text-danger">*</span> / Ort <span class="text-danger">*</span></label>
+                                <div class="col-lg-2">
+                                  <input type="text" class="form-control basicAutoComplete" autocomplete="off" data-url="<?=self::getUrl('AddressDB','api')?>?do=findZips&campaign_id=<?=$campaign->id?>&autocomplete=1" name="new_address_zip" id="new_address_zip" value="<?=$preorder->new_address_zip?>" placeholder="PLZ" />
+                                </div>
+                                <div class="col-lg-7">
+                                  <input type="text" class="form-control basicAutoComplete" autocomplete="off" data-url="<?=self::getUrl('AddressDB','api')?>?do=findCities&campaign_id=<?=$campaign->id?>&autocomplete=1" name="new_address_city" id="new_address_city" value="<?=$preorder->new_address_city?>" placeholder="Ort" />
+                                </div>
+                              </div>
+
+                              <div class="form-group row">
+                                <label class="col-lg-3 col-form-label" for="zip">Ortsteil <span class="text-danger">*</span></label>
+                                <div class="col-lg-9">
+                                  <input type="text" class="form-control basicAutoComplete" autocomplete="off" data-url="<?=self::getUrl('AddressDB','api')?>?do=findDistricts&campaign_id=<?=$campaign->id?>&autocomplete=1" name="new_address_district" id="new_address_district" value="<?=$preorder->new_address_zip?>" placeholder="Ortsteil" />
+                                </div>
+
+                              </div>
+
+
+                              <div class="form-group row">
+                                <label class="col-lg-3 col-form-label" for="">Wohneinheit</label>
+                                <div class="col-lg-4">
+                                  <div class="form-group row">
+                                    <label class="col-lg-4 col-form-label text-right" for="">Block:</label>
+                                    <div class="col-lg-6">
+                                      <input type="text" class="form-control" name="new_address_block" id="new_address_block" value="<?=$preorder->block?>" />
+                                    </div>
+                                  </div>
+                                </div>
+                                <div class="col-lg-4">
+                                  <div class="form-group row">
+                                    <label class="col-lg-4 col-form-label text-right" for="">Stiege:</label>
+                                    <div class="col-lg-6">
+                                      <input type="text" class="form-control" name="new_address_stiege" id="new_address_stiege" value="<?=$preorder->stiege?>" />
+                                    </div>
+                                  </div>
+                                </div>
+                              </div>
+                              
+                              <div class="form-group row">
+                                <label class="col-lg-3 col-form-label" for=""></label>
+                                <div class="col-lg-4">
+                                  <div class="form-group row">
+                                    <label class="col-lg-4 col-form-label text-right" for="">Stock:</label>
+                                    <div class="col-lg-6">
+                                      <input type="text" class="form-control" name="new_address_stock" id="new_address_stock" value="<?=$preorder->stock?>" />
+                                    </div>
+                                  </div>
+                                </div>
+                                <div class="col-lg-4">
+                                  <div class="form-group row">
+                                    <label class="col-lg-4 col-form-label text-right" for="">Tür:</label>
+                                    <div class="col-lg-6">
+                                      <input type="text" class="form-control" name="new_address_tuer" id="new_address_tuer" value="<?=$preorder->tuer?>" />
+                                    </div>
+                                  </div>
+                                </div>
+                              </div>
+
+                            </div>
+                          </div>
+                        </div>
+                        
+                      </div>
                     </div>
                   </div>
+
                   
-                  <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="price">Wohneinheit *</label>
+                  
+                  
+                  
+                  <div class="form-group row" id="wohneinheit_row">
+                    <label class="col-lg-2 col-form-label" for="adb_wohneinheit_id">Wohneinheit *</label>
                     <div class="col-lg-10">
                       <select class="form-control" name="adb_wohneinheit_id" id="adb_wohneinheit_id" />
                       <?php if($preorder->adb_wohneinheit_id): ?>
@@ -70,16 +161,22 @@
                   
                   
                   <div class="form-group row">
-                      <label class="col-lg-2 col-form-label" for="product_id">Vertriebspartner</label>
-                      <div class="col-lg-10">
-                        <select class="form-control" name="partner_id" id="partner_id">
-                          <option value=""></option>
+                    <label class="col-lg-2 col-form-label" for="product_id">Vertriebspartner</label>
+                    <div class="col-lg-10">
+                      <select class="form-control" name="partner_id" id="partner_id">
+                        <option value=""></option>
+                        <?php if($preorder->id): ?>
                           <?php foreach($partners as $partner): ?>
                           <option value="<?=$partner->id?>" <?=($preorder->partner_id == $partner->id) ? "selected='selected'" : ""?>><?=$partner->getCompanyOrName()?></option>
                           <?php endforeach; ?>
-                        </select>
-                      </div>
+                        <?php else: ?>
+                          <?php foreach($partners as $partner): ?>
+                          <option value="<?=$partner->id?>" <?=($me->address_id == $partner->id) ? "selected='selected'" : ""?>><?=$partner->getCompanyOrName()?></option>
+                          <?php endforeach; ?>
+                        <?php endif; ?>
+                      </select>
                     </div>
+                  </div>
                   
                   <div id="preorder-form" class="mt-4">
                     <h4>Vorbestellung & Produkt</h4>
@@ -222,52 +319,90 @@
                     <div class="form-group row">
                       <label class="col-lg-2 col-form-label" for="company">Firma</label>
                       <div class="col-lg-10">
-                        <input type="text" class="form-control" name="company" id="company" value="<?=$preorder->company?>" />
+                        <input type="text" class="form-control" name="company" id="company" value="<?=$preorder->company?>" placeholder="Firma" />
                       </div>
                     </div>
                     <div class="form-group row">
                       <label class="col-lg-2 col-form-label" for="uid">UID</label>
                       <div class="col-lg-10">
-                        <input type="text" class="form-control" name="uid" id="uid" value="<?=$preorder->uid?>" />
+                        <input type="text" class="form-control" name="uid" id="uid" value="<?=$preorder->uid?>" placeholder="UID" />
                       </div>
                     </div>
                     <div class="form-group row">
                       <label class="col-lg-2 col-form-label" for="firstname">Vorname *</label>
                       <div class="col-lg-10">
-                        <input type="text" class="form-control" name="firstname" id="firstname" value="<?=$preorder->firstname?>" />
+                        <input type="text" class="form-control" name="firstname" id="firstname" value="<?=$preorder->firstname?>" placeholder="Vorname" />
                       </div>
                     </div>
                     <div class="form-group row">
                       <label class="col-lg-2 col-form-label" for="lastname">Nachname *</label>
                       <div class="col-lg-10">
-                        <input type="text" class="form-control" name="lastname" id="lastname" value="<?=$preorder->lastname?>" />
+                        <input type="text" class="form-control" name="lastname" id="lastname" value="<?=$preorder->lastname?>" placeholder="Nachname" />
                       </div>
                     </div>
                     <div class="form-group row">
-                      <label class="col-lg-2 col-form-label" for="street">Straße *</label>
-                      <div class="col-lg-10">
-                        <input type="text" class="form-control" name="street" id="street" value="<?=$preorder->street?>" />
+                      <label class="col-lg-2 col-form-label" for="street">Straße / Hausnummer *</label>
+                      <div class="col-lg-5">
+                        <input type="text" class="form-control" name="street" id="street" value="<?=$preorder->street?>" placeholder="Straße" />
+                      </div>
+                      <div class="col-lg-5">
+                        <input type="text" class="form-control" name="housenumber" id="housenumber" value="<?=$preorder->housenumber?>" placeholder="Hausnummer" />
+                      </div>
+                    </div>
+                    <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for=""></label>
+                      <div class="col-lg-1">
+                        <div class="form-group row">
+                          <label class="col-lg-6 col-form-label text-right" for="">Block:</label>
+                          <div class="col-lg-6">
+                            <input type="text" class="form-control" name="block" id="block" value="<?=$preorder->block?>" />
+                          </div>
+                        </div>
+                      </div>
+                      <div class="col-lg-1">
+                        <div class="form-group row">
+                          <label class="col-lg-6 col-form-label text-right" for="">Stiege:</label>
+                          <div class="col-lg-6">
+                            <input type="text" class="form-control" name="stiege" id="stiege" value="<?=$preorder->stiege?>" />
+                          </div>
+                        </div>
+                      </div>
+                      <div class="col-lg-1">
+                        <div class="form-group row">
+                          <label class="col-lg-6 col-form-label text-right" for="">Stock:</label>
+                          <div class="col-lg-6">
+                            <input type="text" class="form-control" name="stock" id="stock" value="<?=$preorder->stock?>" />
+                          </div>
+                        </div>
+                      </div>
+                      <div class="col-lg-1">
+                        <div class="form-group row">
+                          <label class="col-lg-6 col-form-label text-right" for="">Tür:</label>
+                          <div class="col-lg-6">
+                            <input type="text" class="form-control" name="tuer" id="tuer" value="<?=$preorder->tuer?>" />
+                          </div>
+                        </div>
                       </div>
                     </div>
                     <div class="form-group row">
                       <label class="col-lg-2 col-form-label" for="zip">PLZ / Ort *</label>
                       <div class="col-lg-3">
-                        <input type="text" class="form-control" name="zip" id="zip" value="<?=$preorder->zip?>" />
+                        <input type="text" class="form-control" name="zip" id="zip" value="<?=$preorder->zip?>" placeholder="PLZ" />
                       </div>
                       <div class="col-lg-7">
-                        <input type="text" class="form-control" name="city" id="city" value="<?=$preorder->city?>" />
+                        <input type="text" class="form-control" name="city" id="city" value="<?=$preorder->city?>" placeholder="Ort" />
                       </div>
                     </div>
                     <div class="form-group row">
                       <label class="col-lg-2 col-form-label" for="phone">Telefon</label>
                       <div class="col-lg-10">
-                        <input type="text" class="form-control" name="phone" id="phone" value="<?=$preorder->phone?>" />
+                        <input type="text" class="form-control" name="phone" id="phone" value="<?=$preorder->phone?>" placeholder="Telefon" />
                       </div>
                     </div>
                     <div class="form-group row">
                       <label class="col-lg-2 col-form-label" for="email">Email</label>
                       <div class="col-lg-10">
-                        <input type="text" class="form-control" name="email" id="email" value="<?=$preorder->email?>" />
+                        <input type="text" class="form-control" name="email" id="email" value="<?=$preorder->email?>" placeholder="Email" />
                       </div>
                     </div>
                     
@@ -293,9 +428,18 @@
                 </div>
               </div>
               
-              
-              
             </form>
+            
+            <?php if($preorder->submit_type == "api" && $preorder->submit_request): ?>
+              <div class="card">
+                <div class="card-body">
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label">Raw API Request</label>
+                    <div class="col-lg-10 text-monospace border" style="max-height: 512px; line-break: auto; overflow: auto; white-space: pre"><script>document.write(JSON.stringify(JSON.parse('<?=str_replace(["\n","\r"],"",$preorder->submit_request)?>'), null, "\t"));</script></div>
+                  </div>
+                </div>
+              </div>
+              <?php endif; ?>
           </div>
         </div>
         
@@ -334,7 +478,25 @@
         $("#setup_product_id").val($("#setup-activation input.value").val());
       <?php endif; ?>
     }
-  
+
+    $('#new_address_street').autoComplete({minLength: 2}).keydown(preventEnter).change(updateCustomerAddressFromNewAddress).on("autocomplete.select", updateCustomerAddressFromNewAddress);
+    $('#new_address_zip').autoComplete({minLength: 1}).keydown(preventEnter).change(updateCustomerAddressFromNewAddress).on("autocomplete.select", updateCustomerAddressFromNewAddress);
+    $('#new_address_city').autoComplete({minLength: 2}).keydown(preventEnter).change(updateCustomerAddressFromNewAddress).on("autocomplete.select", updateCustomerAddressFromNewAddress);
+    $('#new_address_district').autoComplete({minLength: 2}).keydown(preventEnter);
+    $('#new_address_housenumber').keydown(preventEnter).change(updateCustomerAddressFromNewAddress).on("autocomplete.select", updateCustomerAddressFromNewAddress);
+    $('#new_address_block').keydown(preventEnter);
+    $('#new_address_stiege').keydown(preventEnter);
+    $('#new_address_stock').keydown(preventEnter);
+    $('#new_address_tuer').keydown(preventEnter);
+    
+    
+    function preventEnter() {
+      if(event.keyCode == 13) {
+        event.preventDefault();
+        return false;
+      }
+    }
+      
     
     $("#product_id").select2({
       allowClear: true,
@@ -363,12 +525,20 @@
     
     $('#adb_hausnummer_id').select2({
       ajax: {
-        url: '<?=self::getUrl("AddressDB", "api", ["do" => "findAddress"])?>',
+        url: '<?=self::getUrl("AddressDB", "api", ["do" => "findAddress", "campaign_id" => $campaign->id])?>',
         delay: 250,
         dataType: 'json'
       },
       minimumInputLength: 3,
-      placeholder: "Suche nach Straße, Hausnummer, Ort"
+      placeholder: "Suche nach Straße, Hausnummer, Ort",
+      allowClear: true
+    });
+    
+    $('#adb_hausnummer_id').on('select2:close', function(e) {
+      if(!$('#adb_hausnummer_id').val()) {
+        $('#new-address-toggle').show();
+      }
+      
     });
     
     
@@ -376,6 +546,28 @@
       var hausnummer_id = $('#adb_hausnummer_id').val();
       if(!hausnummer_id) return;
       
+      $('#new-address-toggle').hide();
+      $('#new-address').hide();
+      
+      $.get('<?=self::getUrl("AddressDB", "Api")?>',
+      {
+        do: "getAddressByHousenumber",
+        hausnummer_id: hausnummer_id
+      },
+      function(success) {
+        if(success.status != "OK") {
+          return;
+        }
+        var address = success.result;
+        console.log(address);
+        $('#new_address_street').val(address.strasse);
+        $('#new_address_housenumber').val(address.hausnummer);
+        $('#new_address_zip').val(address.plz);
+        $('#new_address_city').val(address.ort);
+        $('#new_address_district').val(address.ortschaft);
+      },
+      'json');
+      
       
       $.get('<?=self::getUrl("AddressDB", "Api")?>',
       {
@@ -434,6 +626,14 @@
       "json");
     });
     
+    function updateCustomerAddressFromNewAddress() {
+      $('input[name=street]').val($('#new_address_street').val());
+      $('input[name=housenumber]').val($('#new_address_housenumber').val());
+      $('input[name=zip]').val($('#new_address_zip').val());
+      $('input[name=city]').val($('#new_address_city').val());
+    }
+    
+    
     $('#adb_wohneinheit_id').change(function() {
       val = $('#adb_wohneinheit_id').val();
       
@@ -558,6 +758,12 @@
     'json');
     
   }
+  
+  function toggleNewAddress() {
+    $('#new-address').toggle();
+    $('#wohneinheit_row').toggle();
+    event.preventDefault();
+  }
 </script>
     
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/Preorder/Index.php

@@ -16,7 +16,7 @@
               <li class="breadcrumb-item active">Vorbestellungen</li>
             </ol>
           </div>
-          <h4 class="page-title">Vorbestellungen<?=($campaign) ? " - ".$campaign->name : ""?></h4>
+          <h4 class="page-title">Vorbestellungen<?=(isset($campaign) && $campaign) ? " - ".$campaign->name : ""?></h4>
         </div>
       </div>
     </div>
@@ -36,8 +36,8 @@
                   <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(PreordercampaignModel::getAll() as $c): ?>
-                      <option value="<?=$c->id?>" <?=($c->id == $campaign->id) ? "selected='selected'" : ""?>><?=$c->name?></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>
@@ -61,6 +61,14 @@
                     <option value="order" <?=(isset($filter) && array_key_exists("type", $filter) && in_array("order", $filter['type'])) ? "selected='selected'" : ""?>>Vollanschluss</option>
                   </select>
                 </div>
+
+                <div class="col-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" <?=(array_key_exists("addon_services", $filter) && $filter['addon_services'] == 1) ? "selected='selected'" : ""?>>Nur mit Zusatzdiensten</option>
+                  </select>
+                </div>
                 
                 <div class="col-2">
                   <label class="form-label" for="filter_address">Anschlussadresse</label>
@@ -72,6 +80,17 @@
                   <input type="text" class="form-control" name="filter[kunde]" id="filter_kunde" value="<?=$filter['kunde']?>" />
                 </div>
                 
+              </div>
+              <div class="row mt-2">
+                <div class="col-2">
+                  <label class="form-label" for="filter_address_source">Adressherkunft</label>
+                  <select name="filter[address_source]" id="filter_address_source" class="form-control">
+                    <option value=""></option>
+                    <option value="addressdb" <?=(isset($filter) && array_key_exists("address_source", $filter) && $filter['address_source'] == "addressdb") ? "selected='selected'" : ""?>>thetool AddressDB</option>
+                    <option value="manual" <?=(isset($filter) && array_key_exists("address_source", $filter) && $filter['address_source'] == "manual") ? "selected='selected'" : ""?>>manuelle Eingabe</option>
+                  </select>
+                </div>
+                
               </div>
               <div class="row mt-2">
                 <div class="col">
@@ -94,7 +113,7 @@
             <div class="row">
               <div class="col-12">
                 <div class="float-left">
-                  <h4 class="header-title">Liste aller Vorbestellungen<?=($campaign) ? " - ".$campaign->name : ""?></h4>
+                  <h4 class="header-title">Liste aller Vorbestellungen<?=(isset($campaign) && $campaign) ? " - ".$campaign->name : ""?></h4>
                 </div>
                 <?php if($filter['preordercampaign_id']): ?>
                   <div class="float-right">
@@ -131,11 +150,12 @@
                 <?php if($preorder->building_id): ?>
                 <td><?=$preorder->building->street?><br /><?=$preorder->building->zip?> <?=$preorder->building->city?></td>
                 <?php elseif($preorder->adb_hausnummer_id): ?>
-                <td>
+                <td <?=($preorder->address_created) ? "class='alert-warning' title='Manuell angelegt'" : ""?>">
                   <?=$preorder->adb_hausnummer->strasse->name?>
                   <?=$preorder->adb_hausnummer->hausnummer?><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: ?>
@@ -144,7 +164,7 @@
                 <td><?=($preorder->connection_count) ? $preorder->connection_count : 1?></td>
                 <td>
                   <?=($preorder->company) ? $preorder->company : $preorder->firstname." ".$preorder->lastname?><br />
-                  <?=$preorder->street?><br />
+                  <?=$preorder->street?><?=($preorder->housenumber) ? " ".$preorder->housenumber : ""?><br />
                   <?=$preorder->zip?> <?=$preorder->city?>
                 </td>
                 <td>

Layout/default/Preordercampaign/Form.php

@@ -122,6 +122,7 @@
 
               <div class="card">
                 <div class="card-body">
+                  
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="adb_netzgebiet_ids">Beschränkt auf Salescluster (GWR)</label>
                     <div class="col-lg-10">
@@ -142,6 +143,39 @@
                       <small>Diese Felder müssen beim Bestellen angegeben werden</small>
                     </div>
                   </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="district_is_city">Ortsteil ist Ort:</label>
+                    <div class="col-lg-10">
+                      <select class="form-control" name="district_is_city" id="district_is_city">
+                          <option value="0" <?=(!$campaign->district_is_city) ? "selected='selected'" : ""?>>Nein</option>
+                          <option value="1" <?=($campaign->district_is_city) ? "selected='selected'" : ""?>>Ja</option>
+                      </select>
+                      <small>Statt Ort muss Ortsteil/Bezirk angegeben werden</small>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="hausnummer_add_zusatz">Adresszusatz an Hausnummer anhängen:</label>
+                    <div class="col-lg-10">
+                      <select class="form-control" name="hausnummer_add_zusatz" id="hausnummer_add_zusatz">
+                          <option value="0" <?=(!$campaign->hausnummer_add_zusatz) ? "selected='selected'" : ""?>>Nein</option>
+                          <option value="1" <?=($campaign->hausnummer_add_zusatz) ? "selected='selected'" : ""?>>Ja</option>
+                      </select>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="exist_is_error">Erlaubte Vorbestellungen pro Wohneinheit (API):</label>
+                    <div class="col-lg-10">
+                      <select class="form-control" name="exist_is_error" id="exist_is_error">
+                          <option value="0" <?=(!$campaign->exist_is_error) ? "selected='selected'" : ""?>>Mehr als eine</option>
+                          <option value="1" <?=($campaign->exist_is_error) ? "selected='selected'" : ""?>>Maximal eine</option>
+                      </select>
+                      <small>Weiterer Bestellversuch liefert Fehler zurück</small>
+                    </div>
+                  </div>
+                  
                 </div>
               </div>
               

Layout/default/Preordercampaign/Index.php

@@ -36,6 +36,18 @@
                   </select>
                 </div>
                 
+                <?php if($me->is("Admin")): ?>
+                <div class="col-2">
+                  <label class="form-label" for="filter_netowner">Netzbesitzer</label>
+                  <select name="filter[netowner]" id="filter_netowner" class="form-control">
+                    <option></option>
+                    <?php foreach($netowners as $owner): ?>
+                    <option value="<?=$owner->id?>" <?=($filter['netowner'] == $owner->id) ? "selected='selected'" : ""?>><?=$owner->getCompanyOrName()?></option>
+                    <?php endforeach; ?>
+                  </select>
+                </div>
+                <?php endif; ?>
+                
                 <div class="col-1">
                   <label class="form-label" for="filter_name">Name</label>
                   <input type="text" class="form-control" name="filter[name]" id="filter_name" value="<?=$filter['name']?>" />
@@ -59,15 +71,15 @@
         </div>
         
         
-        
-        
         <div class="card">
           <div class="card-body mb-3">
             <div class="float-left">
               <h4 class="header-title">Liste aller Vorbestellkampagnen</h4>
             </div>
             <div class="float-right">
-              <a class="btn btn-primary mb-2" href="<?=self::getUrl("Preordercampaign", "add")?>"><i class="fas fa-plus"></i> Neue Vorbestellkampagne anlegen</a>
+              <?php if($me->is("Admin")): ?>
+                <a class="btn btn-primary mb-2" href="<?=self::getUrl("Preordercampaign", "add")?>"><i class="fas fa-plus"></i> Neue Vorbestellkampagne anlegen</a>
+              <?php endif; ?>
             </div>
             
             <table class="table table-striped table-hover">
@@ -102,15 +114,19 @@
                   <a href="<?=self::getUrl("Preorder", "Index", ["filter" => ["preordercampaign_id" => $camp->id]])?>">
                     <?=$camp->active_preorder_count?>
                     <?php if($camp->homes_total): ?>
-                      / <?=$camp->homes_total?> (<?=(round((count($camp->active_preorders) / $camp->homes_total) * 100, 2))?> %)
+                      / <?=$camp->homes_total?> (<?=(round(($camp->active_preorder_count / $camp->homes_total) * 100, 2))?> %)
                     <?php endif; ?>
                   </a>
                 </td>
                 <td><?=date('d.m.Y',$camp->from)?></td>
                 <td><?=date('d.m.Y',$camp->to)?></td>
                 <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
-                  <a href="<?=self::getUrl("Preordercampaign", "edit", ["id" => $camp->id])?>"><i class="far fa-edit"  title="Vorbestellkampagne Bearbeiten"></i></a>
-                  <a href="<?=self::getUrl("Preordercampaign", "delete", ["id" => $camp->id])?>" class="text-danger" onclick="if(!confirm('Vorbestellkampagne wirklich löschen?')) return false;" title="Vorbestellkampagne Löschen"><i class="fas fa-trash"></i></a>
+                  <a href="<?=self::getUrl("Preordercampaign", "downloadAddonServices", ["preordercampaign_id" => $camp->id])?>" title="Bestellte Zusatzdienste exportieren"><i class="far fa-sunset"></i></a>
+                  <a href="<?=self::getUrl("Preordernotification", "Index", ["filter" => ["preordercampaign_id" => $camp->id]])?>" title="Email Aussendungen"><i class="far fa-envelope"></i></a>
+                  <?php if($me->is("Admin")):  ?>
+                    <a href="<?=self::getUrl("Preordercampaign", "edit", ["id" => $camp->id])?>"><i class="far fa-edit"  title="Vorbestellkampagne Bearbeiten"></i></a>
+                    <a href="<?=self::getUrl("Preordercampaign", "delete", ["id" => $camp->id])?>" class="text-danger" onclick="if(!confirm('Vorbestellkampagne wirklich löschen?')) return false;" title="Vorbestellkampagne Löschen"><i class="fas fa-trash"></i></a>
+                  <?php endif; ?>
                 </td>
               </tr>
               <?php endforeach; ?>

Layout/default/Preordercampaign/services.csv.php

@@ -0,0 +1,8 @@
+<?php
+header("Content-type: text/csv");
+header('Content-disposition: attachment; filename="preorder-services-'.$campaign->name.'-'.date("Y-m-d_H-m-s").'.csv"');
+?>
+Code;Gemeinde;PLZ;Ortschaft;Strasse;Hausnummer;Block;Stiege;Stock;Tuer;Adresszusatz;Adressinfo;Firma;UID;Vorname;Nachname;Kontakt Strasse;Kontakt PLZ;Kontakt Ort;Telefon;Email;Dienstleistung;Data
+<?php foreach($csv as $c):?>
+"<?=$c["ucode"]?>";"<?=$c["gemeinde"]?>";"<?=$c["plz"]?>";"<?=$c["ortschaft"]?>";"<?=$c["strasse"]?>";"<?=$c["hausnummer"]?>";"<?=$c["block"]?>";"<?=$c["stiege"]?>";"<?=$c["stock"]?>";"<?=$c["tuer"]?>";"<?=$c["zusatz"]?>";"<?=$c["address_info"]?>";"<?=$c["contact_company"]?>";"<?=$c["contact_uid"]?>";"<?=$c["contact_firstname"]?>";"<?=$c["contact_lastname"]?>";"<?=$c["contact_street"]?>";"<?=$c["contact_plz"]?>";"<?=$c["contact_ort"]?>";"<?=$c["phone"]?>";"<?=$c["email"]?>";"<?=$c["service"]?>";"<?=$c["service_data"]?>"
+<?php endforeach;

Layout/default/Preordernotification/Form.php

@@ -0,0 +1,368 @@
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
+
+    <!-- start page title -->
+    <div class="row">
+      <div class="col-12">
+        <div class="page-title-box">
+          <div class="page-title-right">
+            <ol class="breadcrumb m-0">
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Preorder")?>">Vorbestellung</a></li>
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Preordernotification")?>">Emailaussendungen</a></li>
+              <li class="breadcrumb-item active"><?=($notification->id) ? "bearbeiten" : "Neu" ?></li>
+            </ol>
+          </div>
+          <h4 class="page-title"><?=($notification->id) ? "Emailaussendung bearbeiten" : "Neue Emailaussendung" ?></h4>
+        </div>
+      </div>
+    </div>
+    <!-- end page title -->
+    
+    <div class="row">
+      <div class="col-lg-12">
+        
+        <div class="card">
+          <div class="card-body">
+            
+            <form class="form-horizontal" method="post" action="<?=self::getUrl("Preordernotification", "save")?>" enctype="multipart/form-data">
+              
+              <div class="card">
+                <div class="card-body">
+                  
+                  <input type="hidden" name="id" value="<?=$notification->id?>" />
+                  <input type="hidden" name="preordercampaign_id" value="<?=$campaign->id?>" />
+                  
+                  <h4>Absender</h4>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="sender_name">Name *</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="sender_name" id="sender_name" value="<?=($notification->sender_name) ? $notification->sender_name : $campaign->network->owner->getCompanyOrName()?>">
+                      <small>Wird beim Empfänger als Absender angezeigt</small>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="sender_email">Emailadresse *</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="sender_email" id="sender_email" value="<?=($notification->sender_email) ? $notification->sender_email : $campaign->network->owner->email?>">
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="sender_replyto">Antworten an (Reply-To):</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="sender_replyto" id="sender_replyto" value="<?=$notification->sender_replyto?>">
+                    </div>
+                  </div>
+                  
+                  <hr />
+                  
+                  <h4 class="mt-4">Empfänger</h4>
+                  <p>Die Aussendung wird an die Kontaktemailadresse aller Bestellungen versendet. Wählen Sie folgende Konditionen aus, um die Empfänger zu beschränken:</p>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="preordercamaign">Vorbestellkampagne</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="preordercampaign" id="preordercampaign" value="<?=$campaign->name?>" disabled="disabled">
+                    </div>
+                  </div>
+                
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="type">Bestelltyp</label>
+                    <div class="col-lg-10">
+                      <select class="form-control select2" name="type[]" id="type" multiple="multiple">
+                        <option value="interest" <?=($notification && array_key_exists("type", $notification->filter) && in_array("interest", $notification->filter["type"])) ? "selected='selected'" : ""?>>Interessensbekundung</option>
+                        <option value="provision" <?=($notification && array_key_exists("type", $notification->filter) && in_array("provision", $notification->filter["type"])) ? "selected='selected'" : ""?>>Vorsorgeanschluss</option>
+                        <option value="order" <?=($notification && array_key_exists("type", $notification->filter) && in_array("order", $notification->filter["type"])) ? "selected='selected'" : ""?>>Vollanschluss</option>
+                        <option value="reorder" <?=($notification && array_key_exists("type", $notification->filter) && in_array("reorder", $notification->filter["type"])) ? "selected='selected'" : ""?>>Nachbestellung</option>
+                      </select>
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="connection_type">Anschlusstyp</label>
+                    <div class="col-lg-10">
+                      <select class="form-control select2" name="connection_type[]" id="connection_type" multiple="multiple">
+                        <option value="single-dwelling" <?=($notification && array_key_exists("connection_type", $notification->filter) && in_array("single-dwelling", $notification->filter['connection_type'])) ? "selected='selected'" : ""?>>Einfamilienhaus</option>
+                        <option value="multi-dwelling" <?=($notification && array_key_exists("connection_type", $notification->filter) && in_array("multi-dwelling", $notification->filter['connection_type'])) ? "selected='selected'" : ""?>>Mehrfamilienhaus</option>
+                        <option value="apartment-building" <?=($notification && array_key_exists("connection_type", $notification->filter) && in_array("apartment-building", $notification->filter['connection_type'])) ? "selected='selected'" : ""?>>Mehrparteienhaus</option>
+                        <option value="apartment" <?=($notification && array_key_exists("connection_type", $notification->filter) && in_array("apartment", $notification->filter['connection_type'])) ? "selected='selected'" : ""?>>Wohneinheit in Mehrparteienhaus</option>
+                        <option value="business" <?=($notification && array_key_exists("connection_type", $notification->filter) && in_array("business", $notification->filter['connection_type'])) ? "selected='selected'" : ""?>>Gewerbebetrieb</option>
+                      </select>
+                    </div>
+                  </div>
+              
+                  
+                  <!--div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="product_id">Vertriebspartner</label>
+                    <div class="col-lg-10">
+                      <select class="form-control select2" name="partner_id" id="partner_id" multiple="multiple">
+                        <option value=""></option>
+                        <?php foreach($partners as $partner): ?>
+                        <option value="<?=$partner->id?>" <?=($notification->id && $notification->partner_id == $partner->id) ? "selected='selected'" : ""?>><?=$partner->getCompanyOrName()?></option>
+                        <?php endforeach; ?>
+                      </select>
+                    </div>
+                  </div-->
+                  
+                  <hr />
+                  
+                
+                  <h4 class="mt-4">Email</h4>
+                  
+                  <p>Im folgenden Editor können Sie ein HTML-Email verfassen. Verwenden Sie das Menü und die Werkzeugleiste um den Text zu formatieren.</p>
+                  <div class="form-group row mt-3 col-12">
+                    <label class="form-label" for="subject">Betreff:</label>
+                    <input type="text" class="form-control" name="subject" id="subject" value="<?=$notification->subject?>" placeholder="Betreff" style="border-radius:0;" />
+                  </div>
+                  <textarea id="body_html" name="body_html" placeholder="Bitte geben Sie hier den Emailinhalt ein..." rows="12" style="width: 100%; height: 600px;  padding: 10px;"><?= htmlentities($notification->body_html)?></textarea>
+                
+                  
+                  <h4 class="mt-4">Dateianhänge</h4>
+                  <div class="form-group row mb-3">
+                    <div class="col-xl-5 input-grop">
+                      <div class="custom-file">
+                        <input type="file" name="attachment[]" id="attachment" class="custom-file-input" multiple="multiple" />
+                        <label class="custom-file-label" for="attachment"> Datei(en) auswählen</label>
+                      </div>
+                    </div>
+                  </div>
+                  
+                  <?php if(is_array($notification->files) && count($notification->files)): ?>
+                  <div class="row">
+                    <div class="col-4">
+                      <div class="card" style="">
+                        <ul class="list-group list-group-flush">
+                          <?php foreach($notification->files as $file): ?>
+                          <li id="file-<?=$file->id?>" class="list-group-item"><input type="hidden" name="deletefile[<?=$file->id?>]" id="deletefile-<?=$file->id?>" value="" /><a href="#" onclick="deleteFile(<?=$file->id?>)" class="mr-2"><i class="far fa-trash text-danger"></i></a> <span class="filename"><i class="far fa-file"></i> <?=$file->filename?></span></li>
+                          <?php endforeach; ?>
+                        </ul>
+                      </div>
+                      
+                    </div>
+                  </div>
+                  <?php endif; ?>
+                  
+                </div>
+              </div>
+                  
+              <div class="card">
+                <div class="card-body">
+                  
+                  <h4>Versand</h4>
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="tosend_day">Versandzeitpunkt</label>
+                    <div class="col-lg-2">
+                      <label>Datum</label>
+                      <input type="text" class="form-control" name="tosend_day" id="tosend_date" value="<?=($notification->tosend_date) ? date("d.m.Y", $notification->tosend_date) : ""?>" />
+                      <small>Emailversand wird zu diesem Zeitpunkt gestartet</small>
+                    </div>
+                    <div class="col-lg-2">
+                      <label>Uhrzeit</label>
+                      <select name="tosend_hour" class="form-control">
+                        <?php for($h = 0; $h < 24; $h++): ?>
+                        <option value="<?=$h?>" <?=($notification->tosend_date && date('H', $notification->tosend_date) == $h) ? "selected='selected'" : ""?>><?=str_pad($h, 2, "0", STR_PAD_LEFT)?>:00</option>
+                        <?php endfor; ?>
+                      </select>
+                    </div>
+                    
+                  </div>
+                  
+                  <hr />
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="testmail_to">Test Email versenden</label>
+                    <div class="col-lg-10">
+                      <div class="row">
+                        <div class="col-6">
+                          
+                          <div class="input-group mb-3">
+                            <div class="input-group-prepend">
+                              <span class="input-group-text"><i class="fas fa-envelope"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="testmail_to" id="testmail_to" value="" placeholder="Testempfänger" />
+                          </div>
+                        
+                        </div>
+                        <div class="col-6">
+                          <button type="submit" name="send_testmail" value="1" class="btn btn-outline-success"><i class="far fa-paper-plane"></i> Testmail jetzt abschicken</button>
+                        </div>
+                      </div>
+                      
+                    </div>
+                  </div>
+                  
+                  
+                </div>
+              </div>
+              
+              <div class="card">
+                <div class="card-body">
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="note">Interne Notiz</label>
+                    <div class="col-lg-10">
+                      <textarea id="note" class="form-control" name="note" rows="5"><?=$notification->note?></textarea>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              
+              <div class="form-group row">
+                <label class="col-lg-2"></label>
+                <div class="col-lg-10">
+                  <button type="submit" name="return" value="form" class="btn btn-primary mr-1">Speichern</button>
+                  <button type="submit" name="return" value="index" class="btn btn-primary">Speichern und zur Übersicht</button>
+                </div>
+              </div>
+              
+              
+              
+            </form>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+<script type="text/javascript" src="<?=self::getResourcePath()?>plugins/tinymce/tinymce.min.js"></script>
+<script type="text/javascript" src="<?=self::getResourcePath()?>plugins/bs-custom-file-input/bs-custom-file-input.min.js"></script>
+
+<script type="text/javascript">
+  
+  var menu_vars = [
+    ['vorname', "Vorname"],
+    ['nachname', "Nachname"],
+    ['firma', "Firma"],
+    ['firma_oder_name', "Firma oder Name"],
+    ['email', "Emailadresse"],
+    ['anschluss_oaid', "Anschluss OAID"],
+    ['anschluss_strasse', "Anschluss Straße"],
+    ['anschluss_hausnummer', "Anschluss Hausnummer"],
+    ['anschluss_plz', "Anschluss PLZ"],
+    ['anschluss_ort', "Anschluss Ort"],
+    ['anschluss_gemeinde', "Anschluss Gemeinde"],
+    ['preorder_code', "Bestellcode"],
+  ];
+  
+  var menu_vars_items = "";
+  menu_vars.forEach((item) => { menu_vars_items += " " + item[0]});
+  menu_vars_items = menu_vars_items.trim();
+  console.log(menu_vars_items);
+  
+  $(function () {
+    tinymce.init({
+      //font_formats: "Arial=arial,sans-serif;",
+      selector: '#body_html',
+      language: 'de',
+      skin: "tinymce-5",
+      plugins: ' code link autolink lists table',
+      paste_block_drop: true,
+      paste_as_text: true,
+      paste_data_images: false,
+      promotion: false,
+      toolbar1: 'undo redo | styles | bold italic underline strikethrough | fontfamily fontsize fontcolor | alignleft aligncenter alignright alignjustify | bullist numlist | outdent indent | table | link unlink | code',
+      toolbar2: 'vorname nachname firma',
+      content_css: "<?=self::getResourcePath()?>/assets/css/tinymce.css",
+      font_family_formats: "Arial=arial,sans-serif; Courier New=courier new,courier,monospace; Georgia=georgia,palatino,serif; Helvetica=helvetica,sans-serif; Lucida Sans=lucida sans unicode,sans-serif; Tahoma=tahoma,arial,helvetica,sans-serif; Times New Roman=times new roman,times,serif",
+      menubar: 'file edit view insert format tools table variables',
+      menu: {
+        variables: { title: 'Textbausteine', items: menu_vars_items }
+      },
+      setup: function (editor) {
+        menu_vars.forEach(function(item) {
+          editor.ui.registry.addMenuItem(item[0], {
+            text: item[1],
+            onAction: function () {
+              editor.insertContent('{{' + item[0].toUpperCase() + '}}');
+            }
+          });
+        });
+        /*
+        editor.ui.registry.addMenuItem('vorname', {
+          text: 'Vorname',
+          onAction: function () {
+            editor.insertContent('{{VORNAME}}');
+          }
+        });
+        editor.ui.registry.addMenuItem('nachname', {
+          text: 'Nachname',
+          onAction: function () {
+            editor.insertContent('{{NACHNAME}}');
+          }
+        });
+        editor.ui.registry.addMenuItem('firma', {
+          text: 'Firma',
+          onAction: function () {
+            editor.insertContent('{{FIRMA}}');
+          }
+        });
+        editor.ui.registry.addMenuItem('firmaodername', {
+          text: 'Firma oder Name',
+          onAction: function () {
+            editor.insertContent('{{FIRMA_ODER_NAME}}');
+          }
+        });
+        editor.ui.registry.addMenuItem('email', {
+          text: 'Emailadresse',
+          onAction: function () {
+            editor.insertContent('{{EMAIL}}');
+          }
+        });*/
+      }
+      
+    });
+    
+    bsCustomFileInput.init();
+    
+    /*$('#body_html').summernote({
+      height: 400,
+      lang: "de-DE",
+      placeholder: "Bitte geben Sie hier den Emailtext ein...",
+      toolbar: [
+        ['style', ['style']],
+        ['font', ['bold', 'underline', 'clear', 'fontname']],
+        ['fontsize', ['fontsize', 'fontsizeunit']],
+        ['color', ['color']],
+        ['para', ['ul', 'ol', 'paragraph', 'height']],
+        ['table', ['table']],
+        ['insert', ['link']],
+        ['view', ['fullscreen', 'codeview', 'help']]
+      ],
+      fontNames: ["Arial", "Arial Black", "Courier New", "Georgia", "Helvetica", "Lucida Sans Unicode", "Tahoma", "Times New Roman"],
+      
+      addDefaultFonts: false
+        
+    });
+    //$('#body_html').summernote('fontSizeUnit', "pt");
+    //$('#body_html').summernote("fontSize", 12);*/
+
+    $('#tosend_date').datepicker({
+      language: 'de',
+      format: "dd.mm.yyyy",
+      showWeekDays: true,
+      todayBtn: 'linked',
+      autoclose: true
+    });
+    
+    $(".select2").select2({
+      allowClear: true,
+      placeholder: ""
+    });
+  });
+      
+  function deleteFile(id) {
+    event.preventDefault();
+    console.log($("#deletefile-" + id).val());
+    if(!$("#deletefile-" + id).val()) {
+      $('#file-' + id + " .filename").css("text-decoration", "line-through");
+      $('#file-' + id + " .filename").css("color", "red");
+      $("#deletefile-" + id).val("1");
+    } else {
+      $('#file-' + id + " .filename").removeAttr("style");
+      $("#deletefile-" + id).val("");
+    }
+  }
+</script>
+
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/Preordernotification/Index.php

@@ -0,0 +1,123 @@
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
+
+    <!-- start page title -->
+    <div class="row">
+      <div class="col-12">
+        <div class="page-title-box">
+          <div class="page-title-right">
+            <ol class="breadcrumb m-0">
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Preordercampaign")?>">Vorbestellkampagnen</a></li>
+              <li class="breadcrumb-item active">Emailaussendungen</li>
+            </ol>
+          </div>
+          <h4 class="page-title">Emailaussendungen</h4>
+        </div>
+      </div>
+    </div>
+    <!-- end page title -->
+
+    <div class="row">
+      <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("Preordernotification")?>">
+              <div class="row">
+                
+                <div class="col-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-1">
+                  <label class="form-label" for="filter_betreff">Betreff</label>
+                  <input type="text" class="form-control" name="filter[betreff]" id="filter_betreff" value="<?=$filter['betreff']?>" />
+                </div>
+                
+                <div class="col-2">
+                  <label class="form-label" for="filter_sent_date">Status</label>
+                  <select name="filter[sent_date]" id="filter_sent_date" class="form-control">
+                    <option value="open">Offen</option>
+                    <option value="sent">bereits versendet</option>
+                  </select>
+                </div>
+                
+              </div>
+              
+              <div class="row mt-2">
+                <div class="col">
+                  <button type="submit" class="btn btn-primary">Filter anwenden</button>
+                  <a class="btn btn-secondary" href="<?=self::getUrl("Preordernotification")?>">Filter zurücksetzen</a>
+                </div>
+              </div>
+            </form>
+            
+          </div>
+        </div>
+        
+        
+        <div class="card">
+          <div class="card-body mb-3">
+            <div class="float-left">
+              <h4 class="header-title">Liste offener Aussendungen</h4>
+            </div>
+            <div class="float-right">
+              <?php if($filter['preordercampaign_id']): ?>
+                <a class="btn btn-primary mb-2" href="<?=self::getUrl("Preordernotification", "add", ['preordercampaign_id' => $filter['preordercampaign_id']])?>"><i class="fas fa-plus"></i> Neue Aussendung erstellen</a>
+              <?php endif; ?>
+            </div>
+            
+            <table class="table table-striped table-hover">
+              <tr>
+                <th class="text-center">Versendet</th>
+                <th>Kampagne</th>
+                <th>Betreff</th>
+                <th>Anzahl Empfänger</th>
+                <th>Geplanter Versand</th>
+                <th>Bearbeitet</th>
+                <th>Erstellt</th>
+                <th></th>
+              </tr>
+              <?php foreach($notifications as $notification): ?>
+              <tr>
+                <td class="text-center">
+                  <?php if($notification->send_start && $notification->send_finish): ?>
+                    <i class='fas fa-check text-success' title='Versand erfolgreich abgeschlossen'></i>
+                  <?php elseif($notification->send_start && !$notification->send_finish): ?> 
+                    <i class='fas fa-loader text-info' title='Versand gestartet'></i>
+                  <?php elseif(!$notification->send_start && !$notification->send_finish): ?>
+                    <i class='fas fa-remove text-danger' title='Noch nicht versendet'></i>
+                  <?php endif; ?>
+                <?=($notification->sent_date) ? date('d.m.Y', $notification->sent_date) : ""?>
+                </td>
+                <td><?=$notification->campaign->name?></td>
+                <td><?=$notification->subject?></td>
+                <td title="Anzahl berechnet am <?=date('d.m.Y H:i', $notification->edit)?>"><?=($notification->recipient_count) ? $notification->recipient_count : ""?></td>
+                <td><?=($notification->tosend_date) ? date('d.m.Y', $notification->tosend_date) : "" ?></td>
+                <td><?=date("d.m.Y H:i",$notification->edit)?> (<?=$notification->editor->name?>)</td>
+                <td><?=date("d.m.Y H:i",$notification->create)?> (<?=$notification->creator->name?>)</td>
+                <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
+                  <?php if(!$notification->sent_date): ?>
+                  <a href="<?=self::getUrl("Preordernotification", "edit", ["id" => $notification->id])?>"><i class="far fa-edit"  title="Aussendung bearbeiten"></i></a>
+                  <a href="<?=self::getUrl("Preordernotification", "delete", ["id" => $notification->id])?>" class="text-danger" onclick="if(!confirm('Aussendung wirklich löschen?')) return false;" title="Aussendung Löschen"><i class="fas fa-trash"></i></a>
+                  <?php endif; ?>
+                </td>
+              </tr>
+              <?php endforeach; ?>
+            </table>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/Product/Form.php

@@ -114,7 +114,7 @@
                         <div class="col-lg-10">
                           Name: <input type="text" class="form-control" name="producttech_new_name" id="producttech_new_name" value="<?=$producttech_new_name?>">
                           Kundentyp: <select name="producttech_new_customer_type" class="form-control"><option value="residential">Residential</option><option value="business">Business</option></select>
-                          RTR Code: <input type="text" class="form-control" name="producttech_new_rtrcode" id="producttech_new_rtrcode" value="<?=$producttech_new_rtrcode?>">
+                          <!--RTR Code: <input type="text" class="form-control" name="producttech_new_rtrcode" id="producttech_new_rtrcode" value="<?=$producttech_new_rtrcode?>">-->
                           Beschreibung: <textarea class="form-control" name="producttech_new_description" id="productgroup_new_description"><?=$producttech_new_description?></textarea>
                           Interne Notiz: <textarea class="form-control" name="producttech_new_note" id="productgroup_new_note"><?=$producttech_new_note?></textarea>
                         </div>

Layout/default/Product/Index.php

@@ -24,6 +24,81 @@
     <div class="row">
       <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("Product")?>">
+              <div class="row">
+                
+                <div class="col-2">
+                  <label class="form-label" for="filter_network_id">Produktgruppen</label>
+                  <select name="filter[productgroup_id][]" id="filter_productgroup_id" class="form-control select2" multiple="multiple">
+                    <option></option>
+                    <?php foreach(ProductgroupModel::getAll() as $group): ?>
+                    <option value="<?=$group->id?>" <?=(is_array($filter) && array_key_exists('productgroup_id', $filter) && in_array($group->id, $filter['productgroup_id'])) ? "selected='selected'" : ""?>><?=$group->name?></option>
+                    <?php endforeach; ?>
+                  </select>
+                </div>
+                
+                <div class="col-2">
+                  <label class="form-label" for="filter_producttech_id">Technologien</label>
+                  <select name="filter[producttech_id][]" id="filter_producttech_id" class="form-control select2" multiple="multiple">
+                    <option></option>
+                    <?php foreach(ProducttechModel::getAll() as $tech): ?>
+                    <option value="<?=$tech->id?>" <?=(is_array($filter) && array_key_exists('producttech_id', $filter) && in_array($tech->id, $filter['producttech_id'])) ? "selected='selected'" : ""?>><?=$tech->name?></option>
+                    <?php endforeach; ?>
+                  </select>
+                </div>
+                
+                <div class="col-2">
+                  <label class="form-label" for="filter_sla_id">SLA</label>
+                  <select name="filter[sla_id]" id="filter_sla_id" class="form-control">
+                    <option></option>
+                    <?php foreach(SlaModel::getAll() as $sla): ?>
+                    <option value="<?=$sla->id?>" <?=(is_array($filter) && array_key_exists('sla_id', $filter) && $filter['sla_id'] == $sla->id) ? "selected='selected'" : ""?>><?=$sla->name?></option>
+                    <?php endforeach; ?>
+                  </select>
+                </div>
+                
+                <div class="col-2">
+                  <label class="form-label" for="filter_name">Name</label>
+                  <input type="text" class="form-control" name="filter[name]" id="filter_name" value="<?=$filter['name']?>" />
+                </div>
+                
+                <div class="col-2">
+                  <label class="form-label" for="filter_customer_type">Kundentyp</label>
+                  <select name="filter[customer_type]" id="filter_customer_type" class="form-control">
+                    <option></option>
+                    <option value="business" <?=(is_array($filter) && array_key_exists('customer_type', $filter) && $filter['customer_type'] == "business") ? "selected='selected'" : ""?>>Business</option>
+                    <option value="residential" <?=(is_array($filter) && array_key_exists('customer_type', $filter) && $filter['customer_type'] == "residential") ? "selected='selected'" : ""?>>Residential</option>
+                  </select>
+                </div>
+                
+                <div class="col-2">
+                  <label class="form-label" for="filter_external">Externe Produkte</label>
+                  <select name="filter[external]" id="filter_external" class="form-control">
+                    <option></option>
+                    <option value="1" <?=(is_array($filter) && array_key_exists('external', $filter) && $filter['external']) ? "selected='selected'" : ""?>>Anzeigen</option>
+                    <option value="0" <?=(is_array($filter) && array_key_exists('external', $filter) && !$filter['external']) ? "selected='selected'" : ""?>>Ausblenden</option>
+                  </select>
+                </div>
+                
+              </div>
+              <div class="row mt-2">
+                <div class="col">
+                  <button type="submit" class="btn btn-primary">Filter anwenden</button>
+                  <a class="btn btn-secondary" href="<?=self::getUrl("Product")?>">Filter zurücksetzen</a>
+                </div>
+                <!--<div class="col">
+                  <button class="btn btn-info" type="button" onclick="refreshMap()"><i class="far fa-map"></i> Auf Karte anzeigen</button>
+                </div>-->
+              </div>
+            </form>
+
+          </div>
+        </div>
+        
         <div class="card">
           <div class="card-body mb-3">
             <div class="float-left">
@@ -34,8 +109,8 @@
             </div>
 
 
-<?php //include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
-<?php //include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
 
             <table class="table table-striped table-hover">
               <tr>
@@ -69,12 +144,17 @@
               <?php endforeach; ?>
             </table>
             
-<?php //include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
-<?php //include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
           </div>
         </div>
         
       </div>
     </div>
 
+    <script type="text/javascript">
+      $("#filter_productgroup_id").select2({closeOnSelect: false});
+      $("#filter_producttech_id").select2({closeOnSelect: false});
+    </script>
+    
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/Productgroup/Form.php

@@ -0,0 +1,78 @@
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
+
+    <!-- start page title -->
+    <div class="row">
+      <div class="col-12">
+        <div class="page-title-box">
+          <div class="page-title-right">
+            <ol class="breadcrumb m-0">
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Network")?>">Produktgruppen</a></li>
+              <li class="breadcrumb-item active"><?=($group->id) ? "bearbeiten" : "Neu" ?></li>
+            </ol>
+          </div>
+          <h4 class="page-title">Productgruppen</h4>
+        </div>
+      </div>
+    </div>
+    <!-- end page title -->
+    
+    <div class="row">
+      <div class="col-lg-12">
+        
+        <div class="card">
+          <div class="card-body">
+            <h4 class="header-title mb-2"><?=($group->id) ? "Produktgruppe bearbeiten" : "Neue Produktgruppe"?></h4>
+            
+            <form class="form-horizontal" method="post" action="<?=self::getUrl("Productgroup", "save")?>">
+              <div class="card">
+                <div class="card-body">
+                  
+                  <input type="hidden" name="id" value="<?=$group->id?>" />
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="name">Name</label>
+                    <div class="col-lg-10">
+                      <input type="text" class="form-control" name="name" id="name" value="<?=$group->name?>">
+                    </div>
+                  </div>
+                  
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="contractconfiggroups">Contractconfig Groups</label>
+                    <div class="col-lg-10">
+                      <select class="select2 form-control select2-multiple" name="contractconfiggroups[]" id="contractconfiggroups" multiple="multiple" data-placeholder="Choose ...">
+                        <?php foreach(ContractconfiggroupModel::getAll() as $ccgroup): ?>
+                          <option value="<?=$ccgroup->id?>" <?=(is_array($group->contractconfiggroups) && array_key_exists($ccgroup->id, $group->contractconfiggroups)) ? "selected='selected'" : ""?>><?=$ccgroup->name?></option>
+                        <?php endforeach; ?>
+                      </select>
+                    </div>
+                  </div>
+                  
+                </div>
+                
+              </div>
+              
+              <div class="form-group row">
+                <label class="col-lg-2"></label>
+                <div class="col-lg-10">
+                  <button type="submit" class="btn btn-primary">Speichern</button>
+                </div>
+              </div>
+              
+              
+              
+            </form>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+
+    <script type="text/javascript">
+      $("#contractconfiggroups").select2({
+        allowClear: true,
+        placeholder: "",
+        closeOnSelect: false
+      });
+  </script>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/Productgroup/Index.php

@@ -0,0 +1,68 @@
+<?php
+  $pagination_baseurl = $this->getUrl($Mod,"Index");
+  $pagination_baseurl_params = ["filter" => $filter];
+  $pagination_entity_name = "Produktgruppen";
+?>
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
+
+    <!-- start page title -->
+    <div class="row">
+      <div class="col-12">
+        <div class="page-title-box">
+          <div class="page-title-right">
+            <ol class="breadcrumb m-0">
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
+              <li class="breadcrumb-item active">Produkte</li>
+            </ol>
+          </div>
+          <h4 class="page-title">Produkte</h4>
+        </div>
+      </div>
+    </div>
+    <!-- end page title -->
+
+    <div class="row">
+      <div class="col-lg-12">
+        
+        <div class="card">
+          <div class="card-body mb-3">
+            <div class="float-left">
+              <h4 class="header-title">Liste aller Produktgruppen</h4>
+            </div>
+            <div class="float-right">
+              <a class="btn btn-primary mb-2" href="<?=self::getUrl("Productgroup", "add")?>"><i class="fas fa-plus"></i> Neue Produktgruppe erstellen</a>
+            </div>
+
+
+<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
+
+            <table class="table table-striped table-hover">
+              <tr>
+                <th>Produktgruppe</th>
+                <th>Beschreibung</th>
+                <th>Anzahl Produkte</th>
+                <th></th>
+              </tr>
+              <?php foreach($productgroups as $group): ?>
+              <tr>
+                <td><?=$group->name?></td>
+                <td><?=$group->description?></td>
+                <td><a href="<?=self::getUrl("Product","Index", ['filter' => ['productgroup_id' => [$group->id]]])?>"><?=(is_array($group->products)) ? count($group->products) : "0"?></a></td>
+                <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
+                  <a href="<?=self::getUrl("Productgroup", "edit", ["id" => $group->id])?>"><i class="far fa-edit"  title="Produktgruppe Bearbeiten"></i></a>
+                  <a href="<?=self::getUrl("Productgroup", "delete", ["id" => $group->id])?>" class="text-danger" onclick="if(!confirm('Produktgruppe wirklich löschen?')) return false;" title="Produktgruppe Löschen"><i class="fas fa-trash"></i></a>
+                </td>
+              </tr>
+              <?php endforeach; ?>
+            </table>
+            
+<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
+<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
+          </div>
+        </div>
+        
+      </div>
+    </div>
+
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>

Layout/default/Workflow/items/color.php

@@ -11,14 +11,29 @@ if(preg_match('/^(.+)-1R$/', $color_name, $cmatch)) {
 <select class="form-control selectpicker show-tick" name="wfitem_<?=$item->name?>" id="wfitem_<?=$item->name?>_<?=$$wftype->id?>" title="Farbe wählen" data-style="btn-outline-<?=$color_name?>">
   <option></option>
   <?php foreach(TT_CABLE_COLORS as $name => $color): ?>
-  <option 
-    style="background-color: rgba(<?=$color["r"]?>,<?=$color["g"]?>,<?=$color["b"]?>, .5); color: #<?=$color["hexfg"]?>" 
-    value="<?=$name?>" 
-    data-bg-color="#<?=$color["hex"]?>" <?=($color['mark']) ? "data-icon='fa-ellipsis-h'" : ""?>
-    <?=($name == $item->value->value_string) ? "selected='selected'" : ""?>
-  >
-    <?=ucfirst($name)?>
-  </option>
+  <?php if($color['two-color']): ?>
+    <option 
+      style="color: #<?=$color["hexfg"]?>;
+        background: rgb(<?=$color["r"]?>,<?=$color["g"]?>,<?=$color["b"]?>);
+        background: linear-gradient(90deg, rgba(<?=$color["r"]?>,<?=$color["g"]?>,<?=$color["b"]?>,.5) 0%, rgba(<?=$color["r"]?>,<?=$color["g"]?>,<?=$color["b"]?>,.5) 50%, rgba(<?=$color["r2"]?>,<?=$color["g2"]?>,<?=$color["b2"]?>,.5) 50%, rgba(<?=$color["r2"]?>,<?=$color["g2"]?>,<?=$color["b2"]?>,.5) 100%);
+        text-shadow: 1px 1px 2px #<?=$color["hex"]?>;
+        
+        "
+      value="<?=$name?>" 
+      data-bg-color="#<?=$color["hex"]?>" <?=($color['mark']) ? "data-icon='fa-ellipsis-h'" : ""?>
+      <?=($name == $item->value->value_string) ? "selected='selected'" : ""?>
+    >
+      <?=ucfirst($name)?>
+    </option>
+  <?php else: ?>
+    <option 
+      style="background-color: rgba(<?=$color["r"]?>,<?=$color["g"]?>,<?=$color["b"]?>, .5); color: #<?=$color["hexfg"]?>" 
+      value="<?=$name?>" 
+      data-bg-color="#<?=$color["hex"]?>" <?=($color['mark']) ? "data-icon='fa-ellipsis-h'" : ""?>
+      <?=($name == $item->value->value_string) ? "selected='selected'" : ""?>
+    >
+      <?=ucfirst($name)?>
+  <?php endif; ?>
   <?php endforeach; ?>
 </select>
 

Layout/default/footer.php

@@ -19,7 +19,8 @@
         <script type="text/javascript">
             $(".selectpicker").selectpicker({
               iconBase: "fas",
-              tickIcon: "check"
+              tickIcon: "check",
+              sanitize: false
             });
         </script>
     </body>

Layout/default/header.php

@@ -27,6 +27,7 @@
         <script type="text/javascript" src="<?=self::getResourcePath()?>js/bootstrap-datepicker.de.min.js"></script>
         <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/geo/geo.js"></script>
         <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/leaflet.js"></script>
+        <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/leaflet.MakiMarkers.js"></script>
         <script type="text/javascript" src="<?=self::getResourcePath()?>js/popper.min.js"></script>
         <script type="text/javascript" src="<?=self::getResourcePath()?>js/bootstrap.min.js"></script>
         <script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/bootstrap-select.min.js"></script>

Layout/default/menu.php

@@ -18,27 +18,36 @@
             <li><a href="<?=self::getUrl("News")?>"><i class="far fa-th-list text-info"></i> News</a></li>
           </ul>
         </li>
+        <?php endif; ?>
 
+        <?php if($me->is(["Admin", "netowner"])): ?>
         <li class="has-submenu">
           <a href="#">
             <i class="far fa-database"></i>Stammdaten <div class="arrow-down"></div>
           </a>
           <ul class="submenu">
-            <li class="has-sub-submenu">
-              <a href="<?=self::getUrl("Address")?>"><i class="fad fa-user text-info"></i> Personen & Firmen</a>
-              <!--<ul class="sub-submenu">
-                <li><a href="<?=self::getUrl("Address", "Index" , ["filter" => ["addresstype" => ["employee"]]])?>"><i class="fas fa-"></i> Mitarbeiter</a></li>
-                <li><a href="<?=self::getUrl("Address", "Index" , ["filter" => ["addresstype" => ["supplier"]]])?>"><i class="fas fa-"></i> Lieferanten</a></li>
-              </ul>-->
-            </li>
+            <?php if($me->is(["Admin"])): ?>
+            <li class="has-sub-submenu font-weight-bold"><a>Betriebsstammdaten</a></li>
+            <li><a href="<?=self::getUrl("Address")?>"><i class="fad fa-user text-info"></i> Personen & Firmen</a></li>
             <li><a href="<?=self::getUrl("Product")?>"><i class="far fa-rectangle-list text-info"></i> Produkte</a></li>
-            <li><a href="<?=self::getUrl("Producttech")?>"><i class="fad fa-microchip text-info"></i> Technologien</a></li>
-            <li><a href="<?=self::getUrl("User")?>"><i class="fad fa-users text-info"></i> Benutzer</a></li>
+            <li><a href="<?=self::getUrl("Productgroup")?>"><i class="far fa-list-tree text-info"></i> Produktgruppen</a></li>
+
             <li><a href="<?=self::getUrl("Network")?>"><i class="fad fa-network-wired text-info"></i> Netzgebiete</a></li>
-            <li class="has-sub-submenu"><a href="<?=self::getUrl("Pop")?>"><i class="fad fa-house text-info"></i> Pops</a></li>
+            <li class="has-sub-submenu"><a href="<?=self::getUrl("User")?>"><i class="fad fa-users text-info"></i> Benutzer</a></li>
+            <li ><a href="<?=self::getUrl("Pop")?>"><i class="fad fa-house text-info"></i> Pops</a></li>
             <li ><a href="<?=self::getUrl("Devicemanufactor")?>"><i class="fad fa-router text-info"></i> Geräte Hersteller</a></li>
             <li><a href="<?=self::getUrl("Devicetype")?>"><i class="fad fa-router text-info"></i> Geräte Typen</a></li>
-              <li><a href="<?=self::getUrl("Device")?>"><i class="fad fa-router text-info"></i> Devices</a></li>
+            <li><a href="<?=self::getUrl("Device")?>"><i class="fad fa-router text-info"></i> Devices</a></li>
+            <li class="has-sub-submenu font-weight-bold mt-1"><a>Grundstammdaten</a></li>
+            <?php endif; ?>
+            <?php if($me->is(["Admin", "netowner"])): ?>
+            <li><a href="<?=self::getUrl("AddressDB")?>"><i class="fas fa-city text-info"></i> GWR / AddressDB</a></li>
+            <?php endif; ?>
+            <?php if($me->is(["Admin"])): ?>
+            <li><a href="<?=self::getUrl("Producttech")?>"><i class="fad fa-microchip text-info"></i> Technologien</a></li>
+            <!--<li><a href="<?=self::getUrl("Contractconfig")?>"><i class="fad fa-gear text-info"></i> ContractConfig</a></li>-->
+            <?php endif; ?>
+
           </ul>
         </li>
         <?php endif; ?>
@@ -81,17 +90,18 @@
           </ul>
         </li>
         <?php endif; ?>
-
-        <?php if($me->is(["Admin","salespartner"])): ?>
+        <?php if($me->is(["Admin","netowner","salespartner"])): ?>
         <li class="has-submenu">
           <a href="#">
             <i class="fal fa-money-bill-wave"></i>Verkauf <div class="arrow-down"></div>
           </a>
           <ul class="submenu">
-            <?php if($me->is(["Admin"])): ?>
+            <?php if($me->is(["Admin","netowner","salespartner"])): ?>
               <li><a href="<?=self::getUrl("Preordercampaign")?>"><i class="far fa-calendar-lines text-info"></i> Vorbestellung</a></li>
             <?php endif; ?>
-            <li><a href="<?=self::getUrl("Order")?>"><i class="far fa-file-signature text-info"></i> Bestellungen</a></li>
+            <?php if($me->is(["Admin","salespartner"])): ?>
+              <li><a href="<?=self::getUrl("Order")?>"><i class="far fa-file-signature text-info"></i> Bestellungen</a></li>
+            <?php endif; ?>
           </ul>
         </li>
         <?php endif; ?>
@@ -104,7 +114,7 @@
           <ul class="submenu">
             <li><a href="<?=self::getUrl("Contract")?>"><i class="fas fa-file-contract"></i> Verträge</a></li>
             <li><hr /></li>
-            <li><a href="<?=self::getUrl("Contractconfig")?>"><i class="fas fa-wrench"></i> Vertragsconfig</a></li>
+            <li><a href="<?=self::getUrl("Contractconfiggroup")?>"><i class="fas fa-wrench"></i> Vertragsconfig</a></li>
           </ul>
         </li>
         <?php endif; ?>

Layout/default/tpl/pagination.php

@@ -53,7 +53,7 @@ if($mfPagination_pagecount < 12) {
     $mfPagination_baseurl_params['s'] = $i * $pagination['count'];
     
     if(($i == 0 || $i == $mfPagination_pagecount) || ($i >= $show_from && $i <= $show_to)) {
-      $log->debug("show_from: $show_from, show_to: $show_to");
+      //$log->debug("show_from: $show_from, show_to: $show_to");
       
       $page = [
         's' => $i * $pagination['count'],