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

Added phone/email to "kunde" filter in Preorder/Index

Browse Source
This commit is contained in:
Frank Schubert
2023-04-21 12:59:12 +02:00
parent 1802c95c47
commit 9f96fc4cf1
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Layout/default/Preorder/Index.php
View File

@@ -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>

10
application/Preorder/PreorderController.php
View File

@@ -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%')";
}

4
scripts/preorders-split-multiple-connections.php
View File

@@ -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"].';';