MERGE_UAT_BUG_FIXES
This commit is contained in:
commit
df94bff0c1
@ -4397,6 +4397,7 @@ class EmployeeRestController extends AdminController
|
||||
|
||||
$TicketMasterModel = new TicketMasterModel();
|
||||
$ticket_data = $TicketMasterModel->get_ticket_data($emp_id, $returnType, $ticket_type, $ticket_id);
|
||||
// print_r($ticket_data);die;
|
||||
|
||||
if (! empty($ticket_data)) {
|
||||
|
||||
|
||||
@ -857,7 +857,7 @@ class TicketMasterModel extends Model
|
||||
")
|
||||
->join('ticket_messages tms', 'ticket_master.id = tms.ticket_id', 'left')
|
||||
->where('ticket_master.is_active', 1);
|
||||
$query->whereIn('sender', ['staff', 'user']);
|
||||
// $query->whereIn('sender', ['staff', 'user']);
|
||||
$query->where('ticket_master.emp_id', $emp_id);
|
||||
|
||||
if (! empty($ticket_id)) {
|
||||
@ -871,7 +871,7 @@ class TicketMasterModel extends Model
|
||||
$query->groupBy('ticket_master.id');
|
||||
$data = $query->findAll();
|
||||
// dd($data, db_connect()->getLastQuery());
|
||||
// print_r($this->db->getLastQuery());die;
|
||||
// print_r($this->db->getLastQuery()->getQuery());die;
|
||||
return $data;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user