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

Rml workorder/update new stuff

Browse Source
This commit is contained in:
Luca Haid
2025-08-07 14:12:34 +00:00
parent ee9ff0b93d
commit 17e099e487
9 changed files with 55 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
application/RMLWorkorder/RMLWorkorderModel.php
View File

@@ -77,6 +77,9 @@ class RMLWorkorderModel extends TTCrudBaseModel {
if (!empty($filters['preorderInfo'])) {
$searchColumns = "p.firstname|p.lastname|p.company|p.oaid|p.street|p.housenumber|p.zip|p.city|str.name|ort.name";
$sql .= Helper::generateFilterCondition($filters['preorderInfo'], $searchColumns);
} if (!empty($filters['rimo_fcp_name'])) {
$searchColumns = "hn.rimo_fcp_name";
$sql .= Helper::generateFilterCondition($filters['rimo_fcp_name'], $searchColumns);
}
return "WHERE " . ltrim(trim($sql), 'AND');
@@ -89,8 +92,8 @@ class RMLWorkorderModel extends TTCrudBaseModel {
$sql = "
SELECT
w.id, w.status, w.deadlineDate, w.companyId, p.preordercampaign_id,
CONCAT_WS(' ', p.firstname, p.lastname) as customerName,
w.id, w.status, w.deadlineDate, w.companyId, p.preordercampaign_id, hn.rimo_fcp_name,
CONCAT_WS(' ', p.firstname, p.lastname) as customerName, p.ucode,
p.company as customerCompany, p.oaid, c.name as companyName,
str.name as street, hn.hausnummer, hn.stiege, we.bezeichner as apartment, plz.plz, ort.name as city
FROM `$fronkDbName`.`RMLWorkorder` w
@@ -167,6 +170,9 @@ class RMLWorkorderModel extends TTCrudBaseModel {
if (!empty($filters['preorderInfo'])) {
$searchColumns = "p.firstname|p.lastname|p.company|p.oaid|p.street|p.housenumber|p.zip|p.city|str.name|ort.name|p.phone|p.email";
$sql .= Helper::generateFilterCondition($filters['preorderInfo'], $searchColumns);
} if (!empty($filters['rimo_fcp_name'])) {
$searchColumns = "hn.rimo_fcp_name";
$sql .= Helper::generateFilterCondition($filters['rimo_fcp_name'], $searchColumns);
}
return "WHERE " . $sql;
@@ -180,7 +186,7 @@ class RMLWorkorderModel extends TTCrudBaseModel {
$sql = "
SELECT
w.id, w.status, w.deadlineDate, w.appointmentDate,
w.id, w.status, w.deadlineDate, w.appointmentDate, hn.rimo_fcp_name,
CONCAT_WS(' ', p.firstname, p.lastname) as customerName,
p.company as customerCompany, p.oaid, p.phone, p.email,
str.name as street, hn.hausnummer, hn.stiege, we.bezeichner as apartment, plz.plz, ort.name as city