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

CHANGE_UI_Issues - VADIVEL J 2025-09-24

Browse Source
This commit is contained in:
vadivelJ96 2025-09-24 17:49:57 +05:30
parent 18c59da89b
commit 18f188b4ca
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Controllers/ThzController.php
View File

@ -144,9 +144,6 @@ class ThzController extends BaseController
$data = $this->request->getGet(); $data = $this->request->getGet();
if ($returnType === 'web' && in_array(get_role_id(), [2, 3, 4])) {
$data['assign_to'] = $data['assign_to'] ?? get_session_userid();
}
$tickets = $this->fetchTicketsBasedOnrole($data); $tickets = $this->fetchTicketsBasedOnrole($data);
@ -159,8 +156,9 @@ class ThzController extends BaseController
} }
} else { } else {
$data['ticket_data'] = $tickets; $data['ticket_data'] = $tickets;
$data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['2', '3', '4'])->findAll(); // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu $data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['3', '4'])->findAll();
// 2,3,4 remain person varannum. // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu , 2-"manager l2 " - ivangalum assign pannalam
// 3,4 remain person varannum.
$data['client_list'] = $this->clientModel->getCreatedByUserName(); $data['client_list'] = $this->clientModel->getCreatedByUserName();
$data['ticket_type'] = $this->thzTypeModel->where('is_active', 1)->findAll(); $data['ticket_type'] = $this->thzTypeModel->where('is_active', 1)->findAll();
@ -544,9 +542,9 @@ class ThzController extends BaseController
$ticketId = $thz_id; $ticketId = $thz_id;
$message = $data['notes'] ?? ''; // $message = $data['notes'] ?? '';
$this->sendEmail($templateName, $data, $to_email, $ticketId, $message); $this->sendEmail($templateName, $data, $to_email, $ticketId);
return true; return true;
} }
@ -681,7 +679,7 @@ class ThzController extends BaseController
} }
private function sendEmail($templateName, $data, $to_email, $ticketId , $cc = "", $message = "", $bcc = "") private function sendEmail($templateName, $data, $to_email, $ticketId , $cc = "", $bcc = "")
{ {
$mailTemplate = $this->ticketMailTemplateModel->where('template_name', $templateName)->findAll()[0] ?? []; $mailTemplate = $this->ticketMailTemplateModel->where('template_name', $templateName)->findAll()[0] ?? [];
@ -703,7 +701,7 @@ class ThzController extends BaseController
$mailTemplate['mail_content'] = str_replace('%ticketId%', $ticketId ?? '', $mailTemplate['mail_content']); $mailTemplate['mail_content'] = str_replace('%ticketId%', $ticketId ?? '', $mailTemplate['mail_content']);
$mailTemplate['mail_content'] = str_replace('%message%', $message ?? '', $mailTemplate['mail_content']); $mailTemplate['mail_content'] = str_replace('%message%', $data['notes'] ?? '', $mailTemplate['mail_content']);
$mailTemplate['mail_content'] = str_replace('%assignee_email%', $data['assignee_email'] ?? '', $mailTemplate['mail_content']); $mailTemplate['mail_content'] = str_replace('%assignee_email%', $data['assignee_email'] ?? '', $mailTemplate['mail_content']);