CHANGE UI LEVEL FIXES - VADIVEL J 2025-08-21

This commit is contained in:
vadivelJ96 2025-08-21 14:29:44 +05:30
parent 9fc435d5c0
commit a6e06596ad
2 changed files with 22 additions and 34 deletions

View File

@ -646,5 +646,4 @@ $routes->post("ticketSave", "ThzController::ticketSave");
$routes->get("ticketList", "ThzController::ticketList");
$routes->post("ticketConversationSave", "ThzController::ticketConversationSave");
$routes->get("ticketConversationList", "ThzController::ticketConversationList");
$routes->get('ticketAssigning',"ThzController::ticketAssigning");
$routes->post('ticketAutoFetchDetails',"ThzController::ticketAutoFetchDetails");

View File

@ -182,37 +182,6 @@ class ThzController extends BaseController
}
public function ticketAssigning(){
$returnType = strtolower($this->request->getGet('return_type') ?? 'api');
$data = $this->request->getVar();
$assignee_id = $data['assignee_id'];
$thz_id = $data['thz_id'];
$result = $this->thzMasterModel->set('assign_to',$assignee_id)->where('thz_id',$thz_id)->update();
if($returnType === 'api'){
if(empty($result)){
return $this->response->setJSON((['status' => 'error', 'message' => 'No tickets found']));
}
return $this->response->setJSON((['status' => 'success', 'data' => $result]));
}else{
}
}
/************************************************** PRIVATE FUNCTIONS ********************************************************/
@ -278,6 +247,8 @@ class ThzController extends BaseController
$thz_id = $data['thz_id'] ; // thz is alias of ticket
$data['subject'] = $this->findSubject($data['thz_id']);
$assignee_id = $this->findAssigneeId($data['thz_id']) ;
$user_email = $data['email'] ?? '';
@ -316,7 +287,13 @@ class ThzController extends BaseController
return $assigneeId ? $assigneeId : 0 ;
}
private function ticketSaveEmailNotificationBasedOnRole($emailToNotified , $insertOrUpdate , $ticketId , $data){
private function findSubject($ticketId){
$row = $this->thzMasterModel->where('thz_id', $ticketId)->get()->getRow();
$subject = $row ? $row->subject : null;
return $subject ? $subject : " " ;
}
private function ticketSaveEmailNotificationBasedOnRole($emailToNotified , $insertOrUpdate , $ticketId , $data){
$user_email = $emailToNotified['user_email'] ?? null;
$assignee_email = $emailToNotified['assignee_email'] ?? null;
@ -350,7 +327,15 @@ class ThzController extends BaseController
switch ($insertOrUpdate) {
case 'update':
$this->sendEmail( 'ticket_save_update_user', $data ,$user_email , $ticketId ) ;
if(empty($assignee_email)){
$data['assigneeAndStatus'] = "Not Yet Assigned";
$this->sendEmail( 'ticket_save_update_user', $data ,$user_email , $ticketId ) ;
}else{
$data['assigneeAndStatus'] = "Assigned With {$assignee_email}";
$this->sendEmail( 'ticket_save_update_user', $data ,$user_email , $ticketId ) ;
}
break;
case 'create':
@ -410,6 +395,10 @@ class ThzController extends BaseController
$mailTemplate['mail_content'] = str_replace('%message%', $message ?? '', $mailTemplate['mail_content']);
$mailTemplate['mail_content'] = str_replace('%assignee_email%', $data['assignee_email'] ?? '', $mailTemplate['mail_content']);
$mailTemplate['mail_content'] = str_replace('%assigneeAndStatus%',$data['assigneeAndStatus'] ?? '' ,$mailTemplate['mail_content']);
$from_mail = "";
$to_mail = $to_email;
$cc_string = "";