Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Fixed potential issue with non-existant Netzgebieten

Browse Source
This commit is contained in:
Frank Schubert
2025-12-15 16:03:59 +01:00
parent 56ffe97c3b
commit 54ade253c2
5 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/ADBWohneinheit/ADBWohneinheitController.php
View File

@@ -28,7 +28,10 @@ class ADBWohneinheitController extends mfBaseController {
foreach($my_networks as $network) {
if($network->adb_netzgebiet_id && !in_array($network->adb_netzgebiet_id, $netzgebiet_ids)) {
$netzgebiet_ids[] = $network->adb_netzgebiet_id;
$my_adb_networks[$network->adb_netzgebiet_id] = new ADBNetzgebiet($network->adb_netzgebiet_id);
$adb_network = new ADBNetzgebiet($network->adb_netzgebiet_id);
if(!$adb_network->isLoaded()) continue;
$my_adb_networks[$network->adb_netzgebiet_id] = $adb_network;
}
}
$this->layout()->set("my_adb_networks", $my_adb_networks);

17
application/AddressDB/AddressDBController.php
View File

@@ -1,7 +1,7 @@
<?php
class AddressDBController extends mfBaseController {
protected function init() {
$this->needlogin=true;
$me = new User();
@@ -66,7 +66,10 @@ class AddressDBController extends mfBaseController {
foreach($my_networks as $network) {
if($network->adb_netzgebiet_id && !in_array($network->adb_netzgebiet_id, $netzgebiet_ids)) {
$netzgebiet_ids[] = $network->adb_netzgebiet_id;
$my_adb_networks[$network->adb_netzgebiet_id] = new ADBNetzgebiet($network->adb_netzgebiet_id);
$adb_network = new ADBNetzgebiet($network->adb_netzgebiet_id);
if(!$adb_network->isLoaded()) continue;
$my_adb_networks[$network->adb_netzgebiet_id] = $adb_network;
}
}
//var_dump($my_networks, $my_adb_networks);
@@ -260,7 +263,10 @@ class AddressDBController extends mfBaseController {
foreach($my_networks as $network) {
if($network->adb_netzgebiet_id && !in_array($network->adb_netzgebiet_id, $netzgebiet_ids)) {
$netzgebiet_ids[] = $network->adb_netzgebiet_id;
$my_adb_networks[$network->adb_netzgebiet_id] = new ADBNetzgebiet($network->adb_netzgebiet_id);
$adb_network = new ADBNetzgebiet($network->adb_netzgebiet_id);
if(!$adb_network->isLoaded()) continue;
$my_adb_networks[$network->adb_netzgebiet_id] = $adb_network;
}
}
$this->layout()->set("my_adb_networks", $my_adb_networks);
@@ -503,7 +509,10 @@ class AddressDBController extends mfBaseController {
foreach($my_networks as $network) {
if($network->adb_netzgebiet_id && !in_array($network->adb_netzgebiet_id, $netzgebiet_ids)) {
$netzgebiet_ids[] = $network->adb_netzgebiet_id;
$my_adb_networks[$network->adb_netzgebiet_id] = new ADBNetzgebiet($network->adb_netzgebiet_id);
$adb_network = new ADBNetzgebiet($network->adb_netzgebiet_id);
if(!$adb_network->isLoaded()) continue;
$my_adb_networks[$network->adb_netzgebiet_id] = $adb_network;
}
}

5
application/Api/v1/PreorderApicontroller.php
View File

@@ -136,7 +136,10 @@ class PreorderApicontroller extends mfBaseApicontroller {
foreach($my_networks as $network) {
if($network->adb_netzgebiet_id && !in_array($network->adb_netzgebiet_id, $netzgebiet_ids)) {
$netzgebiet_ids[] = $network->id;
$my_adb_networks[$network->adb_netzgebiet_id] = new ADBNetzgebiet($network->adb_netzgebiet_id);
$adb_network = new ADBNetzgebiet($network->adb_netzgebiet_id);
if(!$adb_network->isLoaded()) continue;
$my_adb_networks[$network->adb_netzgebiet_id] = $adb_network;
}
}
$preorder_filter = [];

4
application/Preorder/PreorderController.php
View File

@@ -992,7 +992,9 @@ class PreorderController extends mfBaseController {
foreach($my_networks as $network) {
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);
$adb_network = new ADBNetzgebiet($network->adb_netzgebiet_id);
if(!$adb_network->isLoaded()) continue;
$my_adb_networks[$network->adb_netzgebiet_id] = $adb_network;
}
}

4
application/Preordercampaign/Preordercampaign.php
View File

@@ -192,7 +192,9 @@ class Preordercampaign extends mfBaseModel {
if($name == "salesclusters") {
$items = PreordercampaignSalesclusterModel::search(["preordercampaign_id" => $this->id]);
foreach($items as $pog) {
$this->salesclusters[$pog->salescluster_id] = new ADBNetzgebiet($pog->salescluster_id);
$sc = new ADBNetzgebiet($pog->salescluster_id);
if(!$sc->id) continue;
$this->salesclusters[$pog->salescluster_id] = $sc;
}
return $this->salesclusters;
}