From 0502c22ec47d98b60c5460ba39c98f69432c3cd1 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Mon, 10 Nov 2025 18:07:02 +0530 Subject: [PATCH] FIX_HR_LOGIN --- app/Config/Routes.php | 1 + app/Controllers/ClientController.php | 182 +++++++++--------- .../RestAuthenticationController.php | 26 +-- 3 files changed, 105 insertions(+), 104 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 0c0be495..ad1d3874 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -546,6 +546,7 @@ $routes->post("employeeRest/getPostEmployeeDataForAuth", "RestAuthenticationCont // $routes->post("logHrActivity", "RestAuthenticationController::logHrActivity"); $routes->get("employeeRest/getClientDetails", "EmployeeRestController::getClientDetails"); +$routes->get("employeeRest/getAdvertisementImage", "EmployeeRestController::getAdvertisementImage"); diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index 73149423..55bc121f 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -5661,6 +5661,7 @@ class ClientController extends AdminController // $employeeController = new EmployeeController(); // $employeeController->truncateFileData('633'); + $res = $this->getHrAccessData(4005); dd($res); // ---------- TICKET SERVICE CONTROLLER -------------------------------------------------------------------------------- @@ -7200,6 +7201,7 @@ class ClientController extends AdminController public function saveHrAccessData() { try { + // Step 1: Fetch and decode the JSON data $client_id = $this->request->getPost('client_id'); $jsonData = $this->request->getPost('json'); @@ -7207,11 +7209,7 @@ class ClientController extends AdminController if (!$data || !is_array($data)) { log_message('error', 'Invalid or empty JSON in saveHrAccessData: ' . $jsonData); - return $this->respond([ - 'status' => false, - 'code' => 400, - 'message' => 'Invalid JSON data provided.', - ], 400); + return $this->respond(['status' => false,'code' => 400,'message' => 'Invalid JSON data provided.',], 400); } $success = []; @@ -7237,16 +7235,14 @@ class ClientController extends AdminController $post_branch_id = $value['post_branch_id']; $post_hr_id = $value['post_hr_id']; - $preBranchId = $this->getPreBranchIdByPostBranchId($post_branch_id); + // $preBranchId = $this->getPreBranchIdByPostBranchId($post_branch_id); - if (!empty($preBranchId)) { - $value['pre_branch_id'] = $preBranchId; - $value['pre_client_id'] = $this->getPreClientIdByPreBranchId($preBranchId); - $value["pre_hr_id"] = $this->getPreHrIdByPreBranchId($preBranchId); - } + // if (!empty($preBranchId)) { + // $value['pre_branch_id'] = $preBranchId; + // $value['pre_client_id'] = $this->getPreClientIdByPreBranchId($preBranchId); + // $value["pre_hr_id"] = $this->getPreHrIdByPreBranchId($preBranchId); + // } - - // INSERT or UPDATE if (empty($value['pk']) || (int)$value['pk'] === 0) { @@ -7264,6 +7260,7 @@ class ClientController extends AdminController } $success[] = "Updated row with ID {$value['pk']}."; } + } catch (\Exception $e) { log_message('error', 'HRAccess Save Error at index ' . $index . ': ' . $e->getMessage()); $errors[] = "Error at index {$index}: " . $e->getMessage(); @@ -7654,84 +7651,84 @@ class ClientController extends AdminController return $this->respond(['status' => true, 'message' => 'Demo client data wiped successfully'], 200); } - private function getClientlistFromPre (){ + private function getClientlistFromPre() + { $db2 = \Config\Database::connect('preDB'); $auto_fetch_client_list = $db2->table('clients') - ->select('id,client_name') - ->where('is_active',1) - ->get()->getResultArray()??[]; + ->select('id,client_name') + ->where('is_active', 1) + ->get()->getResultArray() ?? []; return $auto_fetch_client_list; - } - public function auto_fetch_branch(){ + public function auto_fetch_branch() + { $data = $this->request->getPost(); $db2 = \Config\Database::connect('preDB'); $auto_fetch_branch_list = $db2->table('client_branch') - ->select('id,branch_name') - ->where('client_id',$data['client_id']) - ->where('is_active',1) - ->get()->getResultArray()??[]; + ->select('id,branch_name') + ->where('client_id', $data['client_id']) + ->where('is_active', 1) + ->get()->getResultArray() ?? []; - return + return - empty($auto_fetch_branch_list) + empty($auto_fetch_branch_list) - ? $this->response->setJSON([ + ? $this->response->setJSON([ 'status' => false, 'message' => 'branch list is empty', 'data' => [] ])->setStatusCode(400) - - : $this->response->setJSON([ + + : $this->response->setJSON([ 'status' => true, - 'message' => 'branch list is found' , - 'data' => $auto_fetch_branch_list + 'message' => 'branch list is found', + 'data' => $auto_fetch_branch_list ])->setStatusCode(200); } - public function auto_fetch_branch_details(){ + public function auto_fetch_branch_details() + { $data = $this->request->getPost(); $db2 = \Config\Database::connect('preDB'); $auto_fetch_branch_details = $db2->table('client_branch') - ->where('client_id',$data['client_id']) - ->where('id',$data['branch_id']) - ->where('is_active',1) - ->get()->getResultArray()??[]; + ->where('client_id', $data['client_id']) + ->where('id', $data['branch_id']) + ->where('is_active', 1) + ->get()->getResultArray() ?? []; return empty($auto_fetch_branch_details) - ? $this->response->setJSON([ - 'status' => false, - 'message' => 'branch details is empty', - 'data' => [] - ])->setStatusCode(400) - - : $this->response->setJSON([ - 'status' => true, - 'message' => 'branch details found' , - 'data' => $auto_fetch_branch_details - ])->setStatusCode(200); + ? $this->response->setJSON([ + 'status' => false, + 'message' => 'branch details is empty', + 'data' => [] + ])->setStatusCode(400) + : $this->response->setJSON([ + 'status' => true, + 'message' => 'branch details found', + 'data' => $auto_fetch_branch_details + ])->setStatusCode(200); } - - private function updatePreClientBranch($pre_branch_id,$post_branch_id ,$operation) + private function updatePreClientBranch($pre_branch_id, $post_branch_id, $operation) { $preDB = \Config\Database::connect('preDB'); - if($operation != 'create'){ + if ($operation != 'create') { $builder = $preDB->table('client_branch'); $builder->where('post_branch_id', $post_branch_id); @@ -7745,87 +7742,88 @@ class ClientController extends AdminController return true; } - public function createDefaultMailTemplate($client_id , $client_data){ + public function createDefaultMailTemplate($client_id, $client_data) + { - $member_welcome_mail_template = $this->notificationModel->where('client_id',NULL)->where('template_name','member_welcome_mail')->get()->getResultArray()[0]??[]; + $member_welcome_mail_template = $this->notificationModel->where('client_id', NULL)->where('template_name', 'member_welcome_mail')->get()->getResultArray()[0] ?? []; - $member_remainder_mail_template = $this->notificationModel->where('client_id',NULL)->where('template_name','member_reminder_mail')->get()->getResultArray()[0]??[]; + $member_remainder_mail_template = $this->notificationModel->where('client_id', NULL)->where('template_name', 'member_reminder_mail')->get()->getResultArray()[0] ?? []; - $member_review_and_summary_mail_template = $this->notificationModel->where('client_id',NULL)->where('template_name','member_review_and_summary_mail')->get()->getResultArray()[0]??[]; + $member_review_and_summary_mail_template = $this->notificationModel->where('client_id', NULL)->where('template_name', 'member_review_and_summary_mail')->get()->getResultArray()[0] ?? []; - $member_ecard_mail_template = $this->notificationModel->where('client_id',NULL)->where('template_name','member_ecard_mail')->get()->getResultArray()[0]??[]; + $member_ecard_mail_template = $this->notificationModel->where('client_id', NULL)->where('template_name', 'member_ecard_mail')->get()->getResultArray()[0] ?? []; - $member_common_mail_template = $this->notificationModel->where('client_id',NULL)->where('template_name','member_common_mail')->get()->getResultArray()[0]??[]; + $member_common_mail_template = $this->notificationModel->where('client_id', NULL)->where('template_name', 'member_common_mail')->get()->getResultArray()[0] ?? []; - $default_member_welcome_mail_template = [ + $default_member_welcome_mail_template = [ 'client_id' => $client_id, 'template_name' => 'member_welcome_mail', - 'subject' => $member_welcome_mail_template['subject']??'', - 'mail_content' => $member_welcome_mail_template['mail_content']??'', - 'mail_content_json'=> $member_welcome_mail_template['mail_content_json']??'', - + 'subject' => $member_welcome_mail_template['subject'] ?? '', + 'mail_content' => $member_welcome_mail_template['mail_content'] ?? '', + 'mail_content_json' => $member_welcome_mail_template['mail_content_json'] ?? '', + 'created_by' => get_session_userid(), 'created_at' => date('Y-m-d H:i:s'), 'updated_by' => null, 'updated_at' => date('Y-m-d H:i:s'), - 'mail_content_copy'=> null - ]; + 'mail_content_copy' => null + ]; - $default_member_remainder_mail_template = [ + $default_member_remainder_mail_template = [ 'client_id' => $client_id, 'template_name' => 'member_reminder_mail', - 'subject' => $member_remainder_mail_template['subject']??'', - 'mail_content' => $member_remainder_mail_template['mail_content']??'', - 'mail_content_json'=> $member_remainder_mail_template['mail_content_json']??'', - + 'subject' => $member_remainder_mail_template['subject'] ?? '', + 'mail_content' => $member_remainder_mail_template['mail_content'] ?? '', + 'mail_content_json' => $member_remainder_mail_template['mail_content_json'] ?? '', + 'created_by' => get_session_userid(), 'created_at' => date('Y-m-d H:i:s'), 'updated_by' => null, 'updated_at' => date('Y-m-d H:i:s'), - 'mail_content_copy'=> null - ]; + 'mail_content_copy' => null + ]; - $default_member_review_and_summary_mail_template = [ + $default_member_review_and_summary_mail_template = [ 'client_id' => $client_id, 'template_name' => 'member_review_and_summary_mail', - 'subject' => $member_review_and_summary_mail_template['subject']??'', - 'mail_content' => $member_review_and_summary_mail_template['mail_content']??'', - 'mail_content_json'=> $member_review_and_summary_mail_template['mail_content_json']??'', - + 'subject' => $member_review_and_summary_mail_template['subject'] ?? '', + 'mail_content' => $member_review_and_summary_mail_template['mail_content'] ?? '', + 'mail_content_json' => $member_review_and_summary_mail_template['mail_content_json'] ?? '', + 'created_by' => get_session_userid(), 'created_at' => date('Y-m-d H:i:s'), 'updated_by' => null, 'updated_at' => date('Y-m-d H:i:s'), - 'mail_content_copy'=> null - ]; + 'mail_content_copy' => null + ]; $default_member_ecard_mail_template = [ 'client_id' => $client_id, 'template_name' => 'member_ecard_mail', - 'subject' => $member_ecard_mail_template['subject']??'', - 'mail_content' => $member_ecard_mail_template['mail_content']??'', - 'mail_content_json'=> $member_ecard_mail_template['mail_content_json']??'', - + 'subject' => $member_ecard_mail_template['subject'] ?? '', + 'mail_content' => $member_ecard_mail_template['mail_content'] ?? '', + 'mail_content_json' => $member_ecard_mail_template['mail_content_json'] ?? '', + 'created_by' => get_session_userid(), 'created_at' => date('Y-m-d H:i:s'), 'updated_by' => null, 'updated_at' => date('Y-m-d H:i:s'), - 'mail_content_copy'=> null - ]; + 'mail_content_copy' => null + ]; $default_member_common_mail_template = [ 'client_id' => $client_id, 'template_name' => 'member_common_mail', - 'subject' => $member_common_mail_template['subject']??'', - 'mail_content' => $member_common_mail_template['mail_content']??'', - 'mail_content_json'=> $member_common_mail_template['mail_content_json']??'', - + 'subject' => $member_common_mail_template['subject'] ?? '', + 'mail_content' => $member_common_mail_template['mail_content'] ?? '', + 'mail_content_json' => $member_common_mail_template['mail_content_json'] ?? '', + 'created_by' => get_session_userid(), 'created_at' => date('Y-m-d H:i:s'), 'updated_by' => null, 'updated_at' => date('Y-m-d H:i:s'), - 'mail_content_copy'=> null - ]; + 'mail_content_copy' => null + ]; $this->myLogger->logme('error', 'Default Mail Template Data ' . json_encode([ $default_member_welcome_mail_template, @@ -7835,18 +7833,16 @@ class ClientController extends AdminController - $default_templates_inserted = $this->notificationModel->insertBatch([ + $default_templates_inserted = $this->notificationModel->insertBatch([ $default_member_welcome_mail_template, $default_member_remainder_mail_template, $default_member_review_and_summary_mail_template, $default_member_ecard_mail_template, $default_member_common_mail_template - ]); - - - return $default_templates_inserted ? true : false; + ]); + return $default_templates_inserted ? true : false; } diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php index 702d43bf..1b901416 100755 --- a/app/Controllers/RestAuthenticationController.php +++ b/app/Controllers/RestAuthenticationController.php @@ -546,11 +546,11 @@ class RestAuthenticationController extends AdminController } public function verifyHrWithEmail() - { + { + $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyHrWithEmail: Received payload = " . json_encode($this->request->getJSON() ?? [])); try { $data = $this->request->getJSON(); - $email = $data->email; $otp = $data->otp; @@ -604,7 +604,17 @@ class RestAuthenticationController extends AdminController return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200); } } catch (\Throwable $th) { - return $this->respond(['status' => 'failed','code' => 500,'data' => $th],500); + $errorData = [ + 'message' => $th->getMessage(), + 'file' => $th->getFile(), + 'line' => $th->getLine(), + 'code' => $th->getCode(), + 'trace' => $th->getTraceAsString(), + 'trace_array' => $th->getTrace(), // full array version (optional) + 'function' => $th->getTrace()[0]['function'] ?? null, + 'class' => $th->getTrace()[0]['class'] ?? null, + ]; + return $this->respond(['status' => 'failed','code' => 500,'data' => $th, 'error_data' => $errorData],500); } } @@ -678,6 +688,7 @@ class RestAuthenticationController extends AdminController ->join('clients', 'client_branch.client_id = clients.id', 'left') ->where('level_contacts.mobile', $mobile_number ) ->where('level_contacts.contact_type', 'client') + ->where('is_active', 1) ->findAll(); //set otp value null $this->hrModel->where('mobile', $mobile_number)->where('otp', $otp)->where('contact_type', 'client')->set(['otp'=>null])->update(); @@ -689,6 +700,7 @@ class RestAuthenticationController extends AdminController ->join('clients', 'client_branch.client_id = clients.id', 'left') ->where('level_contacts.email', $email ) ->where('level_contacts.contact_type', 'client') + ->where('is_active', 1) ->findAll(); //set otp value null $this->hrModel->where('email', $email)->where('otp', $otp)->where('contact_type', 'client')->set(['otp'=>null])->update(); @@ -1949,12 +1961,7 @@ class RestAuthenticationController extends AdminController public function updateMobileNumber() { - log_message('error', ' '); - log_message('error', ' ************************************* UPDATE MOBILE START **************************************** '); - log_message('error', ' '); - $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - updateMobileNumber: Function called"); $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - updateMobileNumber: Received payload = " . json_encode($this->request->getJSON() ?? [])); - try { $payload = $this->request->getJSON(true); @@ -2023,9 +2030,6 @@ class RestAuthenticationController extends AdminController } } catch (\Throwable $th) { $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - updateMobileNumber: Exception: " . $th->getMessage()); - log_message('error', ' '); - log_message('error', ' ************************************* UPDATE MOBILE END **************************************** '); - log_message('error', ' '); return $this->respond([ 'status' => 'failed', 'code' => 500,