FIX_CLAIM_VIEW
This commit is contained in:
parent
d6db9f3541
commit
53326caf38
@ -754,7 +754,7 @@ class EmployeeRestController extends AdminController
|
|||||||
$result = $empServiceController->excelFileFormatValidation(['file_id' => $file_id]);
|
$result = $empServiceController->excelFileFormatValidation(['file_id' => $file_id]);
|
||||||
if (isset($result['error_summary']) && count($result['error_summary'])) {
|
if (isset($result['error_summary']) && count($result['error_summary'])) {
|
||||||
$result = $empServiceController->getExcelErrorData($file_id);
|
$result = $empServiceController->getExcelErrorData($file_id);
|
||||||
return $this->respond(['status' => 'failed', 'code' => 404, 'message' => "file upload failed with errors", 'data' => $result], 200);
|
return $this->respond(['status' => 'failed', 'code' => 404, 'message' => "The data format is invalid. Click 'Next' to view details.", 'data' => $result], 200);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -2573,6 +2573,8 @@ class EmployeeRestController extends AdminController
|
|||||||
|
|
||||||
public function claimView()
|
public function claimView()
|
||||||
{
|
{
|
||||||
|
try {
|
||||||
|
|
||||||
$ticket_id = $this->request->getGet('ticket_id');
|
$ticket_id = $this->request->getGet('ticket_id');
|
||||||
$ticketController = new TicketController;
|
$ticketController = new TicketController;
|
||||||
$data['ticket_history'] = $ticketController->ticketHistory($ticket_id);
|
$data['ticket_history'] = $ticketController->ticketHistory($ticket_id);
|
||||||
@ -2581,13 +2583,15 @@ class EmployeeRestController extends AdminController
|
|||||||
|
|
||||||
// $ticketData = $data['ticket_data'];
|
// $ticketData = $data['ticket_data'];
|
||||||
// $ticketHistory = $data['ticket_history'];
|
// $ticketHistory = $data['ticket_history'];
|
||||||
|
// print_r($ticketHistory); die;
|
||||||
|
|
||||||
|
$currentClaimStatus = $this->claimStatusModel->select("claim_status")->where('id', $data['claims_data']['claim_status_id'])->where('is_active', 1)->first();
|
||||||
$ticketClaimStatus = $this->claimStatusModel->select('claim_status, display_name')->where('display_name is not null')->where('is_active', 1)->findAll();
|
$ticketClaimStatus = $this->claimStatusModel->select('claim_status, display_name')->where('display_name is not null')->where('is_active', 1)->findAll();
|
||||||
$status_list = array_column($ticketClaimStatus, 'display_name', 'claim_status');
|
$status_list = array_column($ticketClaimStatus, 'display_name', 'claim_status');
|
||||||
|
// print_r($currentClaimStatus); die;
|
||||||
|
|
||||||
$data['ticket_data'] = array_fill_keys(array_keys($data['ticket_data']), []);
|
$data['ticket_data'] = array_fill_keys(array_keys($data['ticket_data']), []);
|
||||||
|
|
||||||
|
|
||||||
// Loop through ticket_data
|
// Loop through ticket_data
|
||||||
foreach ($data['ticket_data'] as $status => &$fields) {
|
foreach ($data['ticket_data'] as $status => &$fields) {
|
||||||
// Search ticket_history for matching old_status_value
|
// Search ticket_history for matching old_status_value
|
||||||
@ -2604,6 +2608,9 @@ class EmployeeRestController extends AdminController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$data['ticket_data'][$currentClaimStatus['claim_status']]['modified_by'] = "";
|
||||||
|
$data['ticket_data'][$currentClaimStatus['claim_status']]['modified_at'] = $formatted = date('d-m-Y h:i A', strtotime($data['claims_data']['updated_at']));
|
||||||
|
|
||||||
$new_ticket_data = [];
|
$new_ticket_data = [];
|
||||||
|
|
||||||
foreach ($data['ticket_data'] as $oldKey => $value) {
|
foreach ($data['ticket_data'] as $oldKey => $value) {
|
||||||
@ -2662,6 +2669,21 @@ class EmployeeRestController extends AdminController
|
|||||||
$data['claim_files'] = $claim_file_urls;
|
$data['claim_files'] = $claim_file_urls;
|
||||||
|
|
||||||
return $this->respond(['status' => (count($data) ? 'success' : 'failed'), 'code' => (count($data) ? 200 : 404), 'data' => $data,], 200);
|
return $this->respond(['status' => (count($data) ? 'success' : 'failed'), 'code' => (count($data) ? 200 : 404), 'data' => $data,], 200);
|
||||||
|
|
||||||
|
} catch (\Throwable $th) {
|
||||||
|
$this->myLogger->logme("error", 'claim_view' .($th->getMessage() . ' --- ' . $th->getLine() . '----' . $th->getTraceAsString()));
|
||||||
|
$errorData = [
|
||||||
|
'message' => $th->getMessage(),
|
||||||
|
'file' => $th->getFile(),
|
||||||
|
'line' => $th->getLine(),
|
||||||
|
'code' => $th->getCode(),
|
||||||
|
'trace' => $th->getTraceAsString(),
|
||||||
|
'trace_array' => $th->getTrace(), // full array version (optional)
|
||||||
|
'function' => $th->getTrace()[0]['function'] ?? null,
|
||||||
|
'class' => $th->getTrace()[0]['class'] ?? null,
|
||||||
|
];
|
||||||
|
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => "", 'error_data' => $errorData], 500);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user