From 23967167b03f79c6be73c6f7617866c6027299a4 Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 9 Jul 2025 17:22:37 +0530 Subject: [PATCH 1/2] FIX_FILEHISTORY --- app/Controllers/EmployeeController.php | 6 +++--- app/Models/FileModel.php | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index 28f3a010..512122c6 100755 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -1390,7 +1390,7 @@ class EmployeeController extends AdminController } //STEP:3 - Update files table status - $this->fileModel->where('id', $file_id)->set(['status' => 'truncated'])->update(); + $this->fileModel->where('id', $file_id)->set(['status' => 'truncated','updated_by' => $loggedInUserID])->update(); $this->myLogger->logme('error', '---- files table updated ----'); //FINAL STEP - Update reverse entry in cash_deposite table @@ -1479,7 +1479,7 @@ class EmployeeController extends AdminController // dd($affectedRows); $affectedRows = $affectedRows * 2; - $this->fileModel->where('id', $file_id)->set(['status' => 'truncated'])->update(); + $this->fileModel->where('id', $file_id)->set(['status' => 'truncated','updated_by' => $loggedInUserID])->update(); } @@ -1546,7 +1546,7 @@ class EmployeeController extends AdminController // STEP 3: //update files table status to "truncated" - $this->fileModel->where('id', $file_id)->set(['status' => 'truncated'])->update(); + $this->fileModel->where('id', $file_id)->set(['status' => 'truncated','updated_by' => $loggedInUserID])->update(); $this->myLogger->logme('error', 'files table updated'); diff --git a/app/Models/FileModel.php b/app/Models/FileModel.php index c6f04f63..5b27a7d4 100755 --- a/app/Models/FileModel.php +++ b/app/Models/FileModel.php @@ -19,7 +19,8 @@ class FileModel extends Model "client_id", "policy_id", "client_branch_id", - "uploaded_by" + "uploaded_by", + "updated_by" ]; From 8c4fcfbf50914c1d38fbb58cfa5775d51991f3e7 Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 9 Jul 2025 17:38:42 +0530 Subject: [PATCH 2/2] FIX_CLAIMAPI_FOR_HR --- app/Controllers/EmployeeRestController.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 23ea2fcf..1efbc94e 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -2595,6 +2595,25 @@ class EmployeeRestController extends AdminController $data['claims_data'] = $this->ticketMaster->getTicketDataByTicketID($ticket_id); $data['ticket_data'] = $ticketController->getMoreInfo($requestFrom = 'rest', $ticket_id); + + // $data = $response['data']; // Assuming your full array is stored in $response + // $ticketData = $data['ticket_data']; + // $ticketHistory = $data['ticket_history']; + + // Loop through ticket_data + foreach ($data['ticket_data'] as $status => &$fields) { + // Search ticket_history for matching old_status_value + foreach ($data['ticket_history'] as $history) { + if ($history['old_status_value'] === $status) { + // Attach modified_by and created_at + $fields['modified_by'] = $history['modified_by']; + $fields['modified_at'] = date('d-m-Y h:i A', strtotime($history['created_at'])); + // Break after first match (assuming latest entry is enough) + break; + } + } + } + return $this->respond(['status' => (count($data) ? 'success' : 'failed'),'code' => (count($data) ? 200 : 404),'data' => $data ], 200);