Merge branch 'fronkdev' into 'master'

Preorder cancelling / GWR menu visibility

See merge request fronk/thetool!22

Layout/default/Building/Form.php

@@ -40,13 +40,14 @@
                             if($building->network_id == $network->id):
                               echo "selected='selected'";
                             endif;
-                          else:
+                          elseif($request_network_id):
                             if($request_network_id == $network->id):
                               echo "selected='selected'";
                             endif;
+                          elseif(count($networks) == 1):
+                            echo "selected='selected'";
                           endif;
                           ?>><?=($network->name)?></option>
-                            endif;
                         <?php endforeach; ?>
                       </select>
                     </div>

Layout/default/menu.php

@@ -30,7 +30,7 @@
           </li>
           <?php endif; ?>
 
-          <?php if($me->is(["Admin", "netowner"])): ?>
+          <?php if($me->is(["Admin"]) || ($me->is("netowner") && $me->hasGwrNetworks())): ?>
           <li class="has-submenu">
             <a href="#">
               <i class="far fa-database"></i>Stammdaten <div class="arrow-down"></div>
@@ -51,7 +51,7 @@
                   <li class="has-sub-submenu"><a href="<?=self::getUrl("User")?>"><i class="fad fa-users text-info"></i> Benutzer</a></li>
               <li class="has-sub-submenu font-weight-bold mt-1"><a>Grundstammdaten</a></li>
               <?php endif; ?>
-              <?php if($me->is(["Admin", "netowner"])): ?>
+              <?php if($me->is(["Admin"]) || ($me->is("netowner") && $me->hasGwrNetworks())): ?>
               <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"])): ?>

application/Api/v1/PreorderApicontroller.php

@@ -135,7 +135,7 @@ class PreorderApicontroller extends mfBaseApicontroller {
     }
     if(!$preorder) {
       // try oan id
-      $preorder = PreorderModel::getFirst(['oaid' => strtolower($code), 'partner_id' => $this->me->address_id]);
+      $preorder = PreorderModel::getFirst(['oaid' => strtolower($code), 'partner_id' => $this->me->address_id], "`create` DESC");
     }
     
     if(!$preorder) {
@@ -206,6 +206,7 @@ class PreorderApicontroller extends mfBaseApicontroller {
     // set cancel_date and canceller
     $preorder->cancel_request = date('U');
     $preorder->cancel_request_by = $this->me->id;
+    $preorder->status_id = 15; // 899 - Cancelled
     if(!$preorder->save()) {
       return mfResponse::InternalServerError();
     }

application/Preorder/PreorderController.php

@@ -639,6 +639,7 @@ class PreorderController extends mfBaseController {
     
     $preorder->deleted = date('U');
     $preorder->deleted_by = $this->me->id;
+    $preorder->status_id = 15; // 899 - Cancelled
     $preorder->save();
     
     $this->layout()->setFlash("Vorbestellung erfolgreich gelöscht!", "success");

application/User/User.php

@@ -260,6 +260,14 @@ class User extends mfBaseModel {
     return $typenets;
   }
   
+  public function hasGwrNetworks() {
+    $my_networks = $this->myNetworks(["netowner"]);
+    foreach($my_networks as $network) {
+      if($network->adb_netzgebiet_id) return true;
+    }
+    return false;
+  }
+  
   private function getMyNetworks() {
     if(!$this->id) {
       return false;