diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php index e907c2d2c..5a40fb125 100644 --- a/application/Preorder/PreorderController.php +++ b/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['