Merge branch 'fronkdev' into 'master'

Preorder/Index: Borderpoint now visible for all users

See merge request fronk/thetool!755

Layout/default/Preorder/include/preorder-detail.php

@@ -9,7 +9,7 @@
           <li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-address" data-toggle="tab" aria-expanded="false">Adressdetails</a></li>
             <li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-flags" data-toggle="tab" aria-expanded="false">Status</a></li>
           <li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-rimo" data-toggle="tab" aria-expanded="false">RIMO</a></li>
-          <?php if($me->is("Admin") && $preorder->adb_hausnummer->borderpoint_lat && $preorder->adb_hausnummer->borderpoint_long): ?>
+          <?php if($preorder->adb_hausnummer->borderpoint_lat && $preorder->adb_hausnummer->borderpoint_long): ?>
           <li class="nav-item"><a class="nav-link" href="#preorder-detail-<?=$preorder->id?>-map" data-toggle="tab" aria-expanded="false" onclick="loadBorderpointMap(<?=$preorder->id?>)">Übergabepunkt</a></li>
           <?php endif; ?>
 
@@ -596,8 +596,7 @@
           </div>
       </div>
 
-      <?php if($me->is("Admin")): ?>
-      <div 
+      <div
         id="preorder-detail-<?=$preorder->id?>-map" 
         class="tab-pane" 
         data-lat="<?=$preorder->adb_hausnummer->borderpoint_lat?>" 
@@ -627,7 +626,6 @@
           </div>
         </div>
       </div>
-      <?php endif; ?>
 
     </div>
 

application/Contract/Contract.php

@@ -350,7 +350,9 @@ class Contract extends mfBaseModel {
                 "name" => $file->name,
                 "description" => $file->description,
                 "create_by" => $file->create_by,
-                "edit_by" => $file->edit_by
+                "edit_by" => $file->edit_by,
+                "create" => $file->create,
+                "edit" => $file->edit
             ]);
             $cfile->save();
 
@@ -358,7 +360,11 @@ class Contract extends mfBaseModel {
                 "contract_id" => $this->id,
                 "type" => "file",
                 "value" => $cfile->id,
-                "text" => (array_key_exists($cfile->name, TT_ORDER_FILE_TYPES)) ? TT_ORDER_FILE_TYPES[$cfile->name] : $cfile->name
+                "text" => (array_key_exists($cfile->name, TT_ORDER_FILE_TYPES)) ? TT_ORDER_FILE_TYPES[$cfile->name] : $cfile->name,
+                "create_by" => $file->create_by,
+                "edit_by" => $file->edit_by,
+                "create" => $file->create,
+                "edit" => $file->edit
             ]);
             $journal->save();
         }
@@ -378,7 +384,11 @@ class Contract extends mfBaseModel {
                 'contract_id' => $this->id,
                 'type' => "text",
                 'value' => "",
-                'text' => $order_journal->text
+                'text' => $order_journal->text,
+                'create_by' => $order_journal->create_by,
+                'edit_by' => $order_journal->edit_by,
+                'create' => $order_journal->create,
+                'edit' => $order_journal->edit
             ]);
             $journal->save();
         }

application/Contractjournal/ContractjournalModel.php

@@ -79,7 +79,7 @@ class ContractjournalModel {
     
     $res = $db->query($sql);
     */
-    $res = $db->select("Contractjournal", "*", $where);
+    $res = $db->select("Contractjournal", "*", "$where ORDER BY contract_id,`create`");
     if($db->num_rows($res)) {
       while($data = $db->fetch_object($res)) {
         $items[] = new Contractjournal($data);