From 98525a701ee70d3bf9d2e9e531972f701181798b Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 2 Nov 2021 21:08:13 +0100
Subject: [PATCH] Added contact info and journal link to Cpeprovisioning

---
 Layout/default/Cpeprovisioning/Index.php | 42 ++++++++++++++++--------
 Layout/default/Order/Index.php           | 10 ++++++
 application/Order/OrderController.php    | 23 ++++++++++---
 3 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/Layout/default/Cpeprovisioning/Index.php b/Layout/default/Cpeprovisioning/Index.php
index 52584ea26..37494aeaa 100644
--- a/Layout/default/Cpeprovisioning/Index.php
+++ b/Layout/default/Cpeprovisioning/Index.php
@@ -117,54 +117,56 @@
                 <th>VLANs</th>
                 <th></th>
               </tr>
-              <tr class="<?=($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd"?>  top-no-border">
-                <td><?=($product->termination_id) ? $product->termination->building->network->name : $product->order->owner->zip." ".$product->order->owner->city?></td>
-                <td class="text-pink"><?=$product->order->owner->spin?></td>
-                <td><?=$product->order->owner->getCompanyOrName()?></td>
-                <td><?=$product->product->name?></td>
-                <td><?=$product->product->attributes['bras_type']->value?> - Down: <?=$product->product->attributes["bw_down"]->value?> / Up: <?=$product->product->attributes["bw_up"]->value?></td>
-                <td class="text-monospace">
+              <tr class="<?=($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd"?>  top-no-border bottom-no-border">
+                <td class="pb-0">
+                  <?=($product->termination_id) ? $product->termination->building->network->name : $product->order->owner->zip." ".$product->order->owner->city?>
+                </td>
+                <td class="text-pink pb-0"><?=$product->order->owner->spin?></td>
+                <td class="pb-0"><?=$product->order->owner->getCompanyOrName()?></td>
+                <td class="pb-0"><?=$product->product->name?></td>
+                <td class="pb-0"><?=$product->product->attributes['bras_type']->value?> - Down: <?=$product->product->attributes["bw_down"]->value?> / Up: <?=$product->product->attributes["bw_up"]->value?></td>
+                <td class="text-monospace pb-0">
                   <?php if($product->termination_id): ?>
                     <?php if($product->termination->getPop()->vlan_public): ?>
-                      <label class="order-date-pill active pointer">
+                      <label class="order-date-pill active pointer mb-0">
                         Public: <strong><?=$product->termination->getPop()->vlan_public?></strong>
                         <input type="checkbox" name="vlan_public" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->getPop()->vlan_public?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
                       </label>
                     <?php endif; ?>
                     <?php if($product->termination->getPop()->vlan_nat): ?>
-                      <label class="order-date-pill active pointer">
+                      <label class="order-date-pill active pointer mb-0">
                         NAT: <strong><?=$product->termination->getPop()->vlan_nat?></strong>
                         <input type="checkbox" name="vlan_nat" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->getPop()->vlan_nat?>" <?=($product->cpeprovisioning->vlan_nat) ? "checked='checked'" : ""?> />
                       </label>
                     <?php endif; ?>
                     <?php if($product->termination->getPop()->vlan_ipv6): ?>
-                      <label class="order-date-pill active pointer">
+                      <label class="order-date-pill active pointer mb-0">
                         IPv6: <strong><?=$product->termination->getPop()->vlan_ipv6?></strong>
                         <input type="checkbox" name="vlan_ipv6" form="cpeprovform-<?=$product->id?>" value="<?=$product->termination->getPop()->vlan_ipv6?>" <?=($product->cpeprovisioning->vlan_ipv6) ? "checked='checked'" : ""?> />
                       </label>
                     <?php endif; ?>
                   <?php else: ?>
                     <?php if($product->product->attributes['vlan_default_public']->value): ?>
-                      <label class="order-date-pill active pointer">
+                      <label class="order-date-pill active pointer mb-0">
                         Public: <strong><?=$product->product->attributes['vlan_default_public']->value?></strong>
                         <input type="checkbox" name="vlan_public" form="cpeprovform-<?=$product->id?>" value="<?=$product->product->attributes['vlan_default_public']->value?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
                       </label>
                     <?php endif; ?>
                     <?php if($product->product->attributes['vlan_default_nat']->value): ?>
-                      <label class="order-date-pill active pointer">
+                      <label class="order-date-pill active pointer mb-0">
                         NAT: <strong><?=$product->product->attributes['vlan_default_nat']->value?></strong>
                         <input type="checkbox" name="vlan_nat" form="cpeprovform-<?=$product->id?>" value="<?=$product->product->attributes['vlan_default_nat']->value?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
                       </label>
                     <?php endif; ?>
                     <?php if($product->product->attributes['vlan_default_ipv6']->value): ?>
-                      <label class="order-date-pill active pointer">
+                      <label class="order-date-pill active pointer mb-0">
                         IPv6: <strong><?=$product->product->attributes['vlan_default_ipv6']->value?></strong>
                         <input type="checkbox" name="vlan_ipv6" form="cpeprovform-<?=$product->id?>" value="<?=$product->product->attributes['vlan_default_ipv6']->value?>" <?=($product->cpeprovisioning->vlan_public) ? "checked='checked'" : ""?> />
                       </label>
                     <?php endif; ?>
                   <?php endif; ?>
                 </td>
-                <td style="font-size: 18px; cursor:pointer; min-width: 180px;">
+                <td class="pb-0" style="cursor:pointer; min-width: 180px;">
                   <?php
                   
                   $vot = false;
@@ -200,6 +202,18 @@
                   <?=($product->order->note) ? "<i class='fas fa-clipboard-list text-purple' title='Kommentar: ".str_replace('"', '&#34;', $product->order->note)."'></i>" : ""?>
                 </td>
               </tr>
+              <tr class="<?=($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd"?> bottom-no-border top-no-border">
+                <td>
+                  <?php if($product->termination_id && $product->termination->getPop()): ?>
+                    <strong>POP</strong>: <?=$product->termination->getPop()->name?>
+                  <?php endif; ?>
+                </td>
+                <td><strong>Telefon:</strong> <?=$product->order->owner->phone?></td>
+                
+                <td><strong>Email:</strong> <?=$product->order->owner->email?></td>
+                <td><a target="_blank" href="<?=self::getUrl("Order", "Index", ["id" => $product->order_id, "addJournal" => 1])?>"><i class="fas fa-scroll"></i> Bestelljournal</a></td>
+                <td colspan="3"></td>
+                  
               <tr class="<?=($prov_count % 2 == 0) ? "table-bg-even" : "table-bg-odd"?> bottom-no-border">
                 <td colspan="6">
                   
diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php
index d56e5b22f..6cff59824 100644
--- a/Layout/default/Order/Index.php
+++ b/Layout/default/Order/Index.php
@@ -774,6 +774,16 @@
         $('html,body').unbind().animate({scrollTop: $(element).offset().top-180},'slow');
       };
       
+      <?php if($highlight): ?>
+        toggleOrder(<?=$highlight?>);
+        scrollToDiv("#order-<?=$highlight?>");
+        <?php if($addJournal): ?>
+          $('#new-journal-<?=$highlight?>').toggle()
+          $('#new-journal-<?=$highlight?> textarea[name=text]').focus();
+        <?php endif; ?>
+      <?php endif; ?>
+      
+      
       function saveVororttermin(id) {
         date = $('#vororttermin-' + id).val();
         if(!date) {
diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php
index 6c0fd32d6..b289d60f0 100644
--- a/application/Order/OrderController.php
+++ b/application/Order/OrderController.php
@@ -16,14 +16,27 @@ class OrderController extends mfBaseController {
   
   protected function indexAction() {
     $this->layout()->setTemplate("Order/Index");
-    //$this->layout()->set("orders", OrderModel::getAll());
+    
+    if($this->request->id && $this->me->is("Admin")) {
+      $order = new Order($this->request->id);
+      if($order->id) {
+        $this->layout()->set("orders", [$order]);
+        $this->layout()->set("highlight", $this->request->id);
+        $this->layout()->set("mynetworks", NetworkModel::getAll());
+        
+        if($this->request->addJournal) {
+          $this->layout()->set("addJournal", true);
+        }
+        
+        return true;
+      }
+    }
+    
     $filter = [];
     
     $this->layout->set("filter", $this->request->filter);
-    //if($this->request->filter) {
-      $filter = $this->getPreparedFilter($this->request->filter);
-    //}
-    //var_dump($filter);exit;
+    $filter = $this->getPreparedFilter($this->request->filter);
+
     // pagination defaults
     $pagination = [];
     $pagination['start'] = 0;