diff --git a/application/Admin/functions/RtrReporting.php b/application/Admin/functions/RtrReporting.php index a3aca8a95..bf7d1b17e 100644 --- a/application/Admin/functions/RtrReporting.php +++ b/application/Admin/functions/RtrReporting.php @@ -6,6 +6,7 @@ class Admin_RtrReporting { private $log; private $flash = []; private $systemowner_id = 1; + private $systemowner_rtr_id = 3452; private $energie_bb_id = 209; private $netowner_is_systemowner = [ @@ -484,6 +485,9 @@ class Admin_RtrReporting { } $netowner = new Address($netowner_id); + if($netowner_id != $this->systemowner_id && ($prod_code == "14311" || $prod_code == "14312")) { + continue; + } if($netowner->id && is_array($netowner->attributes) && array_key_exists("rtrcode", $netowner->attributes) && $netowner->attributes["rtrcode"]->value) { $prov_id = $netowner->attributes["rtrcode"]->value; @@ -497,8 +501,8 @@ class Admin_RtrReporting { $prod_code_p = $prod_code_start."1"; $prod_code_b = $prod_code_start."2"; - if(!$prov_id) { - if(substr($prod_code_start,0, 3) == "343") { + if(!$prov_id || $prov_id == $this->systemowner_rtr_id) { + if(substr($prod_code_start,0, 3) == "343" || $prod_code_start == "1432") { // is OAN product $prov_id = $energie_bb->attributes["rtrcode"]->value; } @@ -520,6 +524,7 @@ class Admin_RtrReporting { } } + //var_dump($data);exit; $csv_header = "partnernetz_id;code";