Fixed limiting netowrk_ids/campaigns in Preorder/Export

application/Preorder/PreorderController.php

@@ -620,29 +620,16 @@ class PreorderController extends mfBaseController {
     $my_adb_networks = [];
     foreach($my_networks as $network) {
       if($network->adb_netzgebiet_id && !in_array($network->adb_netzgebiet_id, $netzgebiet_ids)) {
-        $netzgebiet_ids[] = $network->adb_netzgebiet_id;
+        $netzgebiet_ids[] = $network->id;
         $my_adb_networks[$network->adb_netzgebiet_id] = new ADBNetzgebiet($network->adb_netzgebiet_id);
       }
     }
     
-    /*if(array_key_exists("network_id", $filter) && $filter['network_id']) {
-      if($this->me->is("Admin")) {
-        $filter['netzgebiet_id'] = $filter['network_id'];
-      } else {
-        if(in_array($filter['network_id'], $netzgebiet_ids)) {
-          $filter['netzgebiet_id'] = $filter['network_id'];
-        }
-      }
-    }*/
     unset($filter['network_id']);
-    
     $preorder_filter = $filter;
-    /*if(!array_key_exists("netzgebiet_id", $preorder_filter)) {
-      $preorder_filter['netzgebiet_id'] = $netzgebiet_ids;
-    }*/
     
     $campaign_ids = [];
-    foreach(PreordercampaignModel::search(["netzgebiet_id" => $netzgebiet_ids]) as $campaign) {
+    foreach(PreordercampaignModel::search(["network_id" => $netzgebiet_ids]) as $campaign) {
       if(!in_array($campaign->id, $campaign_ids)) {
         $campaign_ids[] = $campaign->id;
       }
@@ -656,7 +643,6 @@ class PreorderController extends mfBaseController {
     
     $preorder_filter['<status_code'] = 800;
     
-    //var_dump($filter, $preorder_filter);exit;
     // Get mysqli resource from Model, so layout can output data as it's retrieved
     // Works around lousy performance and horrendous memory usage
     $res = PreorderModel::search($preorder_filter, [], true);