meteo/Sentri
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: List of travel entries in travel reimbursement PDF is not sorted on date.

Browse Source
This commit is contained in:
Marco
2026-07-13 23:44:30 +02:00
parent c7ec962e4e
commit a7888e1a58
3 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pub/api/v1/office/travel-reimburse/index.php
View File

@@ -17,7 +17,17 @@ if (!$GLOBALS['modules_enabled']['office']) {
if ($API_office_travel_reimburse->request_method === 'GET') {
$API_office_travel_reimburse->checkPermissions('office-travel-reimburse', 'RO');
$_GET['builder'] = [1 => ['where' => [0 => 'user_uuid', 1 => $_SESSION['user']['user_uuid']]]];
if (!isset($_GET['builder']) || !is_array($_GET['builder'])) {
$_GET['builder'] = [];
}
# Append user_uuid where builder to always search for the user_uuid that is requesting the travel entries
$_GET['builder'][] = [
'where' => [
0 => 'user_uuid',
1 => $_SESSION['user']['user_uuid']
]
];
$travel_reimbursements = $API_office_travel_reimburse->getTravelReimburse();
$API_office_travel_reimburse->apiOutput($code = 200, $travel_reimbursements);

6
pub/api/v1/office/travel-reimburse/send/index.php
View File

@@ -20,8 +20,6 @@ if (!$GLOBALS['modules_enabled']['office']) {
}
if ($API_office_travel_reimburse->request_method === 'POST') {
ini_set('display_errors', 1);
$API_office_travel_reimburse->checkPermissions('office-travel-reimburse', 'RO');
$portal_settings = $GLOBALS['conn']->query("SELECT * FROM system_settings")->fetch_assoc();
$month = $_POST['calender_month'];
@@ -38,6 +36,10 @@ if ($API_office_travel_reimburse->request_method === 'POST') {
0 => 'travel_date',
1 => $firstDay,
2 => $lastDay
],
'orderBy' => [
0 => 'travel_date',
1 => 'ASC'
]
]
];