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

Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev

Browse Source
This commit is contained in:
Frank Schubert
2024-11-22 13:54:30 +01:00
parent 7dafe1357f 1dec1de189
commit c28a322210
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Api/v1/AddressdbApicontroller.php
+6 -2
View File
@@ -389,7 +389,9 @@ class AddressdbApicontroller extends mfBaseApicontroller {
if(count($this->filter_salescluster_ids)) { if(count($this->filter_salescluster_ids)) {
$where .= " AND netzgebiet_id IN (" . implode(",", $this->filter_salescluster_ids) . ")"; $where .= " AND netzgebiet_id IN (" . implode(",", $this->filter_salescluster_ids) . ")";
} }
$where .= " AND Hausnummer.visibility='public'"; if(!$this->me->is("preorderaddressreporting")) {
$where .= " AND Hausnummer.visibility='public'";
}
$sql = AddressDB::$wohneinheit_query; $sql = AddressDB::$wohneinheit_query;
$sql .= "\n WHERE $where AND ((" . implode(" OR ", $ort_search) . ") OR (" . implode(" OR ", $strasse_search) . ") OR (" . implode(" OR ", $plz_search) . ") OR (" . implode(" OR ", $hausnummer_search) . ")) ORDER BY strasse, LENGTH(hausnummer), hausnummer, LENGTH(`Wohneinheit`.tuer),`Wohneinheit`.tuer, zusatz, LENGTH(num), num"; $sql .= "\n WHERE $where AND ((" . implode(" OR ", $ort_search) . ") OR (" . implode(" OR ", $strasse_search) . ") OR (" . implode(" OR ", $plz_search) . ") OR (" . implode(" OR ", $hausnummer_search) . ")) ORDER BY strasse, LENGTH(hausnummer), hausnummer, LENGTH(`Wohneinheit`.tuer),`Wohneinheit`.tuer, zusatz, LENGTH(num), num";
@@ -681,7 +683,9 @@ class AddressdbApicontroller extends mfBaseApicontroller {
if($search_cluster_id) { if($search_cluster_id) {
$where .= " AND Netzgebiet.extref='$search_cluster_id'"; $where .= " AND Netzgebiet.extref='$search_cluster_id'";
} }
$where .= " AND Hausnummer.visibility='public'"; if(!$this->me->is("preorderaddressreporting")) {
$where .= " AND Hausnummer.visibility='public'";
}
//echo $where; //echo $where;
//var_dump($this->filter_salescluster_ids);exit; //var_dump($this->filter_salescluster_ids);exit;