From 9f96fc4cf18fd30d9089fa96b0cbfdfb356b6c18 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Fri, 21 Apr 2023 12:59:12 +0200
Subject: [PATCH] Added phone/email to "kunde" filter in Preorder/Index

---
 Layout/default/Preorder/Index.php                |  3 ++-
 application/Preorder/PreorderController.php      | 10 +++++++++-
 scripts/preorders-split-multiple-connections.php |  4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 4b3b3a097..717f37bb4 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -58,7 +58,7 @@
                   </select>
                 </div>
                 
-                <div class="col-2">
+                <div class="col-1">
                   <label class="form-label" for="filter_status">Status</label>
                   <select name="filter[status][]" id="filter_status" class="form-control" multiple="multiple">
                     <option value="new" <?=(isset($filter) && array_key_exists("status", $filter) && in_array("new", $filter['status'])) ? "selected='selected'" : ""?>>Aufgenommen</option>
@@ -97,6 +97,7 @@
                 </div>
                 
               </div>
+
               <div class="row mt-2">
                 <div class="col-2">
                   <label class="form-label" for="filter_address_source">Adressherkunft</label>
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 9f9b02e87..a70158b07 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -114,6 +114,14 @@ class PreorderController extends mfBaseController {
     
     $new_filter['add-where'] = "";
     
+    if(array_key_exists("search",$filter) && trim($filter['search'])) {
+      $search = trim($filter['search']);
+      $new_filter['add-where'] = " AND (";
+      $new_filter['add-where'] .= " adb_hausnummer.gemeinde like '%$search%' OR adb_hausnummer.plz like '%$search%' OR adb_hausnummer.strasse like '%$search%'";
+      $new_filter['add-where'] .= " OR company like '%$search%' OR firstname like '%$search%' OR lastname like '%$search%' OR concat(firstname, ' ', lastname) like '%$search%' OR concat(lastname, ' ', firstname) like '%$search%' OR street like '%$search%' OR zip like '%$search%' OR city like '%$search%' OR email like '%$search' OR phone like '%$search'";
+      $new_filter['add-where'] .= " OR ucode like '%$search' OR oaid like '%$search'";
+    }
+    
     if(array_key_exists("address", $filter) && $filter["address"]) {
       $address = $this->db()->escape($filter['address']);
       $new_filter['add-where'] .= " AND (adb_hausnummer.gemeinde like '%$address%' OR adb_hausnummer.plz like '%$address%' OR adb_hausnummer.strasse like '%$address%')";
@@ -126,7 +134,7 @@ class PreorderController extends mfBaseController {
     
     if(array_key_exists("kunde", $filter) && $filter["kunde"]) {
       $kunde = $this->db()->escape($filter['kunde']);
-      $new_filter['add-where'] .= " AND (company like '%$kunde%' OR firstname like '%$kunde%' OR lastname like '%$kunde%' OR concat(firstname, ' ', lastname) like '%$kunde%' OR concat(lastname, ' ', firstname) like '%$kunde%' OR street like '%$kunde%' OR zip like '%$kunde%' OR city like '%$kunde%')";
+      $new_filter['add-where'] .= " AND (company like '%$kunde%' OR firstname like '%$kunde%' OR lastname like '%$kunde%' OR concat(firstname, ' ', lastname) like '%$kunde%' OR concat(lastname, ' ', firstname) like '%$kunde%' OR street like '%$kunde%' OR zip like '%$kunde%' OR city like '%$kunde%' OR phone like '%$kunde%' OR email like '%$kunde%')";
     }
     
     
diff --git a/scripts/preorders-split-multiple-connections.php b/scripts/preorders-split-multiple-connections.php
index 128cb66d9..a875b7549 100755
--- a/scripts/preorders-split-multiple-connections.php
+++ b/scripts/preorders-split-multiple-connections.php
@@ -88,7 +88,7 @@ foreach($missing_units as $mu) {
   /*echo "Adresse: ".$preorder->adb_hausnummer->strasse->name." ".$preorder->adb_hausnummer->hausnummer;
   echo " | Bestellte Anschlüsse: ".$preorder->connection_count;
   echo " | Vorhandene Wohneinheiten: ".$mu['unit_count'];*/
-  echo '"'.$preorder->adb_hausnummer->strasse->name.'";';
+  echo '"'.$preorder->adb_hausnummer->strasse->name." ".$preorder->adb_hausnummer->hausnummer.'";';
   echo $preorder->connection_count.';';
   echo $mu['unit_count'].';';
   echo ';';
@@ -101,7 +101,7 @@ foreach($missing_doors as $md) {
   echo " | Bestellte Anschlüsse: ".$preorder->connection_count;
   echo " | Vorhandene Wohneinheiten: ".$md['unit_count'];
   echo " | Vorhandene Tür/Top Nummern: ".$md["door_count"];*/
-  echo '"'.$preorder->adb_hausnummer->strasse->name.'";';
+  echo '"'.$preorder->adb_hausnummer->strasse->name." ".$preorder->adb_hausnummer->hausnummer.'";';
   echo $preorder->connection_count.';';
   echo $md["unit_count"].';';
   echo $md["door_count"].';';