Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MERGE_TEST_BUG_FIXES

Browse Source
This commit is contained in:
Ubuntu 2026-07-29 10:52:23 +05:30
commit 3a57ccf180
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controllers/EmployeeRestController.php
View File

@ -4397,6 +4397,7 @@ class EmployeeRestController extends AdminController
$TicketMasterModel = new TicketMasterModel(); $TicketMasterModel = new TicketMasterModel();
$ticket_data = $TicketMasterModel->get_ticket_data($emp_id, $returnType, $ticket_type, $ticket_id); $ticket_data = $TicketMasterModel->get_ticket_data($emp_id, $returnType, $ticket_type, $ticket_id);
// print_r($ticket_data);die;
if (! empty($ticket_data)) { if (! empty($ticket_data)) {

4
app/Models/TicketMasterModel.php
View File

@ -857,7 +857,7 @@ class TicketMasterModel extends Model
") ")
->join('ticket_messages tms', 'ticket_master.id = tms.ticket_id', 'left') ->join('ticket_messages tms', 'ticket_master.id = tms.ticket_id', 'left')
->where('ticket_master.is_active', 1); ->where('ticket_master.is_active', 1);
$query->whereIn('sender', ['staff', 'user']); // $query->whereIn('sender', ['staff', 'user']);
$query->where('ticket_master.emp_id', $emp_id); $query->where('ticket_master.emp_id', $emp_id);
if (! empty($ticket_id)) { if (! empty($ticket_id)) {
@ -871,7 +871,7 @@ class TicketMasterModel extends Model
$query->groupBy('ticket_master.id'); $query->groupBy('ticket_master.id');
$data = $query->findAll(); $data = $query->findAll();
// dd($data, db_connect()->getLastQuery()); // dd($data, db_connect()->getLastQuery());
// print_r($this->db->getLastQuery());die; // print_r($this->db->getLastQuery()->getQuery());die;
return $data; return $data;
} }