diff --git a/application/Admin/functions/RtrReporting.php b/application/Admin/functions/RtrReporting.php index 2550c75d9..23fb32a3b 100644 --- a/application/Admin/functions/RtrReporting.php +++ b/application/Admin/functions/RtrReporting.php @@ -97,6 +97,7 @@ class Admin_RtrReporting { "Nikolai i. S." => "Sankt Nikolai im Sausal", "St.Nikolai i.S." => "Sankt Nikolai im Sausal", "St. Nikolai i. S." => "Sankt Nikolai im Sausal", + "St. Nikolai i. Sausal" => "Sankt Nikolai im Sausal", "Braunau/Inn" => "Braunau am Inn", "Hohenbrugg" => "Fehring", "Seiersberg - Pirka" => "Seiersberg-Pirka", @@ -155,7 +156,8 @@ class Admin_RtrReporting { "Breitenfeld" => "Riegersburg", "Mortanstch" => "Mortantsch", "Eggersdorf" => "Eggersdorf bei Graz", - "Dobl - Zwaring" => "Dobl-Zwaring" + "Dobl - Zwaring" => "Dobl-Zwaring", + "Steyr-Gleink" => "Dietach", //"" => "Sankt Ruprecht an der Raab", //"" => "Sankt Ruprecht an der Raab", @@ -268,7 +270,7 @@ class Admin_RtrReporting { $building = new Building(); $eigen_product_ids = $this->getEigenProductIds(); - foreach(ContractModel::search(["product_id" => $eigen_product_ids]) as $contract) { + foreach(ContractModel::searchActive(["product_id" => $eigen_product_ids]) as $contract) { if($contract->termination_id) continue; $address = $contract->owner; @@ -376,6 +378,8 @@ class Admin_RtrReporting { foreach(ContractModel::searchActive([]) as $contract) { if(!$contract->product->attributes["rtr_tech_code"]->value) continue; + if($contract->price < 0.0000) continue; // netzbetreiber gutschrift + if($contract->vatgroup_id == 4) continue;// vat code provisionen $prod_code = $contract->product->attributes["rtr_tech_code"]->value; @@ -418,12 +422,14 @@ class Admin_RtrReporting { $ort = trim($contract->owner->city); } - if($contract->id == 13595) { // kein Anschluss da OAN, Kunde in Deutschland + if($contract->id == 13595 || $contract->id == 14855) { // kein Anschluss da OAN, Kunde in Deutschland $strasse = "Hatzendorf 79a"; $plz = "8361"; $ort = "Hatzendorf"; } + + // get Gemeinde ID if(!$ort) { @@ -536,8 +542,12 @@ class Admin_RtrReporting { $data[$gemid][$prod_code][$bb_code_down]++; $data[$gemid][$prod_code][$bb_code_up]++; } - } + /*if($gemid == 62382) { + echo "kirchberg an der raab ($gemid) Contract id ".$contract->id." product_name: '".$contract->product->name."' prod_code: '$prod_code' bb_code: '$bb_code' is_sym: ".($is_sym ? "true" : "false")." - '".$contract->matchcode."'\n
"; + }*/ + } + //exit; $csv_header = "gemid;code;bb;anz_akt_anschl"; $csv = $csv_header."\n"; @@ -553,6 +563,9 @@ class Admin_RtrReporting { } } + + + header("Content-type: text/csv; charset=utf-8"); header('Content-disposition: attachment; filename="rtr-B10-report-'.date('Y-m-d_H-i-s').'.csv"');