Merge branch 'fronkdev' into 'master'

Fixed non-netowners not seeing Preorders

See merge request fronk/thetool!670
This commit is contained in:
Frank Schubert
2024-10-17 10:09:30 +00:00

View File

@@ -136,14 +136,17 @@ class PreorderController extends mfBaseController {
$campaign = new Preordercampaign($campaign_id);
$this->layout()->set("campaign", $campaign);
if($campaign->owner_id != $this->me->address_id) {
if($campaign->owner_id != $this->me->address_id && NetworkAddressModel::getFirst(["network_id" => $campaign->network_id, "address_id" => $this->me->address_id, "salespartner"])) {
$filter["operator_id"] = $this->me->address_id;
}
}
} else {
$filter['preordercampaign_id'] = $my_campaign_ids;
$filter["operator_id"] = $this->me->address_id;
if(NetworkAddressModel::getFirst(["address_id" => $this->me->address_id, "salespartner"])) {
$filter["operator_id"] = $this->me->address_id;
}
}
if(!$filter['preordercampaign_id']) $filter['preordercampaign_id'] = 0;