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

Merge branch 'fronkdev' into 'master'

Browse Source 
Fixed RTR B10 report - removed provision contracts

See merge request fronk/thetool!1753
This commit is contained in:
Frank Schubert
2025-09-16 13:57:36 +00:00
parent 5136d087a5 5d8d236887
commit fd39ba1db2
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
application/Admin/functions/RtrReporting.php
View File

@@ -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<br />";
}*/
}
//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"');