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

fixed createWorkordersFromPreorders to add statusflag filter

Browse Source
This commit is contained in:
Luca Haid
2025-08-19 08:40:29 +02:00
parent 8553cde24b
commit 1d4483e5a0
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
application/Preorder/PreorderModel.php
View File

@@ -646,6 +646,21 @@ class PreorderModel
}
}
if (!empty($filter['preorder_status_flags_all']) && is_array($filter['preorder_status_flags_all'])) {
$sanitized_flags = array_map('intval', $filter['preorder_status_flags_all']);
$flags_list = implode(',', $sanitized_flags);
$flags_count = count($sanitized_flags);
$dbName = FRONKDB_DBNAME;
$where .= " AND tt_preorder.id IN (
SELECT psv.preorder_id
FROM `{$dbName}`.PreorderStatusflagValue psv
WHERE psv.flag_id IN ({$flags_list}) AND psv.value = 1
GROUP BY psv.preorder_id
HAVING COUNT(DISTINCT psv.flag_id) = {$flags_count}
)";
}
if (array_key_exists("preorder_status_flags_disabled", $filter)) {
$preorder_status_flags_disabled = $filter['preorder_status_flags_disabled'];
if (is_array($preorder_status_flags_disabled) && count($preorder_status_flags_disabled)) {

2
application/RMLWorkorderAdmin/RMLWorkorderAdminController.php
View File

@@ -85,7 +85,7 @@ class RMLWorkorderAdminController extends TTCrud
}
private function createWorkordersFromPreorders() {
$newPreorders = PreorderModel::searchActive(['status_code' => 220]);
$newPreorders = PreorderModel::searchActive(['status_code' => 220, 'preorder_status_flags_all' => [3,5]]);
if (empty($newPreorders)) return;
foreach ($newPreorders as $preorder) {