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

MERGE_TEST_TKT_ESCALATION&ECARD_BULK&BENEFTIS_ISSUES&CR

Browse Source
This commit is contained in:
Ubuntu 2026-01-03 16:38:50 +05:30
commit 75f0049cf8
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Controllers/EmployeeController.php
View File

@ -3323,15 +3323,18 @@ class EmployeeController extends AdminController
->where('employee_polices.wellness_onboard', '0') ->where('employee_polices.wellness_onboard', '0')
->where('emp.emp_status', 'active') ->where('emp.emp_status', 'active')
->where('emp.is_active', 1) ->where('emp.is_active', 1)
->where('cp.wellness_plan_id is not null',null,false) ->groupStart()
->where('cp.wellness_plan_id !=',"") ->where('cp.wellness_plan_id IS NOT NULL', null, false)
->where('cp.wellness_plan_id !=',0) ->orWhere('cp.wellness_plan_id !=', '')
->orWhere('cp.wellness_plan_id !=', 0)
->where('cp.wellness_vendor_id is null') ->groupEnd()
->where('cp.wellness_vendor_id !=',0) ->groupStart()
->where('cp.wellness_vendor_id !=',"") ->where('cp.wellness_vendor_id IS NULL', null, false)
// ->where('cp.policy_status',1) ->orWhere('cp.wellness_vendor_id =', '')
// ->where('cp.is_active',1) ->orWhere('cp.wellness_vendor_id =', 0)
->groupEnd()
->where('cp.policy_status',1)
->where('cp.is_active',1)
->findAll(); ->findAll();
// echo count($data);die(); // echo count($data);die();
// if(is_array($data) && count($data)) // if(is_array($data) && count($data))

16
app/Controllers/ThzController.php
View File

@ -234,8 +234,24 @@ class ThzController extends BaseController
->where('thz_master.thz_id', $thz_id) ->where('thz_master.thz_id', $thz_id)
->findAll(); ->findAll();
$clientId = $result['master'][0]['client_id'];
$accManagerId = $this->getAcmIdUsingClientId($clientId ?? null);
$accManager = $this->userModel->find($accManagerId);
if (!empty($result['master'])) { if (!empty($result['master'])) {
$notes = $this->thzMasterNotesModel->ticketConversationList($thz_id, $returnType); $notes = $this->thzMasterNotesModel->ticketConversationList($thz_id, $returnType);
$accManagerName = $accManager['first_name'] ?? '';
foreach ($notes as &$note) {
if (empty($note['name'])) {
$note['name'] = $accManagerName;
}
}
unset($note);
$result['notes'] = !empty($notes) ? $notes : []; $result['notes'] = !empty($notes) ? $notes : [];
} else { } else {
$this->myLogger->logme('error', 'No tickets found for ticket id ' . json_encode($thz_id)); $this->myLogger->logme('error', 'No tickets found for ticket id ' . json_encode($thz_id));