gitea_admin/erp_naurua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bestellungen-Suche und Name-Spalte fixen

Browse Source
This commit is contained in:
Mathias Gläser
2026-06-15 15:09:27 +02:00
parent f8a468a4f9
commit 27971bde63
2 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/erp/bestellungen/service.php
+3 -4
View File
@@ -181,8 +181,7 @@ function normalize_sales_order_sort_column(string $sortColumn): string
$allowed = [
'order_date',
'external_ref',
'last_name',
'first_name',
'name',
'total_amount',
];
@@ -224,6 +223,7 @@ WHERE (
so.external_ref ILIKE :search_term ESCAPE '\'
OR COALESCE(ad.last_name, '') ILIKE :search_term ESCAPE '\'
OR COALESCE(ad.first_name, '') ILIKE :search_term ESCAPE '\'
OR (COALESCE(ad.first_name, '') || ' ' || COALESCE(ad.last_name, '')) ILIKE :search_term ESCAPE '\'
)
SQL;
$params[':search_term'] = '%' . escape_sales_order_search_term($searchTerm) . '%';
@@ -232,8 +232,7 @@ SQL;
$sortExpressions = [
'order_date' => 'so.order_date',
'external_ref' => 'so.external_ref',
'last_name' => 'COALESCE(ad.last_name, \'\')',
'first_name' => 'COALESCE(ad.first_name, \'\')',
'name' => 'COALESCE(ad.first_name, \'\') || \' \' || COALESCE(ad.last_name, \'\')',
'total_amount' => 'COALESCE(so.total_amount, 0)',
];
$sortExpression = $sortExpressions[$sortColumn] ?? 'so.order_date';