diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 6637745aa..8811d567e 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -944,17 +944,17 @@ class PreorderController extends mfBaseController {
}
$filter = $this->getPreparedFilter($rfilter);
-
if($this->me->is("Admin")) {
$my_networks = NetworkModel::getAll();
} else {
$my_networks = $this->me->myNetworks(["netowner", "salespartner"]);
}
+ //var_dump($my_networks);exit;
$netzgebiet_ids = [];
$my_adb_networks = [];
foreach($my_networks as $network) {
- if($network->adb_netzgebiet_id && !in_array($network->adb_netzgebiet_id, $netzgebiet_ids)) {
+ if($network->adb_netzgebiet_id && !in_array($network->id, $netzgebiet_ids)) {
$netzgebiet_ids[] = $network->id;
$my_adb_networks[$network->adb_netzgebiet_id] = new ADBNetzgebiet($network->adb_netzgebiet_id);
}
@@ -965,6 +965,7 @@ class PreorderController extends mfBaseController {
$campaign_ids = [];
foreach(PreordercampaignModel::search(["network_id" => $netzgebiet_ids]) as $campaign) {
+ echo "campaign: ".$campaign->id."
";
if(!in_array($campaign->id, $campaign_ids)) {
$campaign_ids[] = $campaign->id;
}
@@ -976,6 +977,24 @@ class PreorderController extends mfBaseController {
$preorder_filter["preordercampaign_id"] = $campaign_ids;
}
+ if($preorder_filter['preordercampaign_id'] && in_array($preorder_filter['preordercampaign_id'], $campaign_ids)) {
+ $campaign_id = $preorder_filter['preordercampaign_id'];
+ if(is_numeric($campaign_id) && $campaign_id > 0) {
+ $campaign = new Preordercampaign($campaign_id);
+ $this->layout()->set("campaign", $campaign);
+
+ if($campaign->network->owner_id != $this->me->address_id && NetworkAddressModel::getFirst(["network_id" => $campaign->network_id, "address_id" => $this->me->address_id, "addresstype" => "salespartner"])) {
+ $preorder_filter["operator_id"] = $this->me->address_id;
+ }
+ }
+ } else {
+ $preorder_filter['preordercampaign_id'] = $campaign_ids;
+ if(NetworkAddressModel::getFirst(["address_id" => $this->me->address_id, "addresstype" => "salespartner"])) {
+ $preorder_filter["operator_id"] = $this->me->address_id;
+ }
+
+ }
+
//$preorder_filter['