Merge branch 'spidev' into 'master'
Kalender See merge request fronk/thetool!706
This commit is contained in:
@@ -225,7 +225,6 @@ class AddressModel {
|
||||
$sql .= " LIMIT " . $limit['count'];
|
||||
}
|
||||
}
|
||||
|
||||
mfLoghandler::singleton()->debug($sql);
|
||||
|
||||
$res = $db->query($sql);
|
||||
@@ -484,7 +483,16 @@ class AddressModel {
|
||||
$where .= " " . $filter['add-where'];
|
||||
}
|
||||
|
||||
//var_dump($filter, $where);exit;
|
||||
if (array_key_exists("Controller!", $filter)) {
|
||||
$termstring = trim($filter['search_term!']);
|
||||
$termExplode = explode(" ", $termstring);
|
||||
foreach ($termExplode as $term) {
|
||||
$wherestring .= " AND (`customer_number` LIKE '%" . $term . "%' OR `company` LIKE '%" . $term . "%' OR `firstname` LIKE '%" . $term . "%' OR `lastname` LIKE '%" . $term . "%' OR `street` LIKE '%" . $term . "%' OR `zip` LIKE '%" . $term . "%' OR `city` LIKE '%" . $term . "%') ";
|
||||
}
|
||||
$where .= " AND customer_number > 0 $wherestring";
|
||||
}
|
||||
|
||||
// var_dump($filter, $where);exit;
|
||||
return $where;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user