Merge branch 'dev' of bitbucket.org:jubilian/nhance-enrollment into dev

app/Config/Autoload.php

@@ -99,5 +99,5 @@ class Autoload extends AutoloadConfig
      * @var string[]
      * @phpstan-var list<string>
      */
-    public $helpers = ['uuid','session','utility', 'form', 'url', 'oauth', 'fileupload', 'excel_import_export', 'file', 'drive','ExcelSanitizeHelper'];
+    public $helpers = ['uuid','session','utility', 'form', 'url', 'oauth', 'fileupload', 'excel_import_export', 'file', 'drive','ExcelSanitizeHelper','sms_helper'];
 }

app/Config/Routes.php

@@ -71,6 +71,7 @@ $routes->group("/client", ["filter" => "authMVC"], function ($routes) {
     $routes->get('remove/(:num)', 'ClientController::removeClient/$1');
     $routes->get("list/(:any)", "ClientController::editClientOnboarding/$1");
     $routes->post('wipe', 'ClientController::wipeDemoClient');
+    $routes->get("typeList/(:any)", "ClientController::typeList/$1");
     // application/config/routes.php
 
     // Add a route for the view_Deposit method

app/Controllers/ClientController.php

@@ -337,7 +337,7 @@ class ClientController extends AdminController
     {
         $this->myLogger->logme('error', 'Client list function called');
         $headerData['page_name'] = 'Client List';
-        $data['clientList'] = $this->clientModel->getCreatedByUserName();
+        $data['clientList'] = $this->clientModel->getCreatedByUserName(1);
         $data['client_rm'] = $this->clientRMModel->getAllClientRM();
         $data['lead_data'] = $this->leadsModel->getLeadForInsertClientList();
 
@@ -349,6 +349,26 @@ class ClientController extends AdminController
 
         // $this->loadLayout('client_onboarding', $data);
     }
+    public function typeList($id = null)
+    {
+        try {
+            $data = $this->clientModel->getCreatedByUserName($id); // passing client_type 
+            if (empty($data)) {
+                return $this->response
+                    ->setJSON(['status' => 'error', 'message' => 'No Records found'])
+                    ->setStatusCode(404);
+            }
+
+            return $this->response
+                ->setJSON(['status' => 'success', 'data' => $data])
+                ->setStatusCode(200);
+
+        } catch (\Throwable $e) {
+            return $this->response
+                ->setJSON(['status' => 'error', 'message' => $e->getMessage()])
+                ->setStatusCode(500);
+        }
+    }
 
     public function updateEmpAndPolicyStatus()
     {

app/Controllers/RestAuthenticationController.php

@@ -74,18 +74,7 @@ class RestAuthenticationController extends AdminController
         return $response->getBody();
     }
 
-    // public function callThirdPartyGETAPI($queryParams, $endPoint)
-    // {
-    //     $client = \Config\Services::curlrequest();
-    //     $url = env('POST_ENROLLMENT_BASEURL') . $endPoint;
 
-    //     $response = $client->get($url, [
-    //         'query' => $queryParams, // pass as query parameters
-    //         'http_errors' => false   // prevent exception on non-200 status
-    //     ]);
-
-    //     return $response->getBody();
-    // }
 
     public function callThirdPartyGETAPI($queryParams, $endPoint, $params = [])
     {
@@ -114,7 +103,19 @@ class RestAuthenticationController extends AdminController
 
 
 
-   
+
+
+
+
+
+
+
+
+
+
+
+
+    
     // employee auth api's start
 
     public function verifyEmployeeWithMobileNumber()
@@ -124,7 +125,9 @@ class RestAuthenticationController extends AdminController
         $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - Verify Employee With Mobile Number: Function called");
 
         try {
-            $mobile_number = $this->request->getJSON()->mobile_number;
+            $data = $this->request->getJSON();
+            $mobile_number = $data->mobile_number;
+
             $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: Received mobile_number = " . $mobile_number);
           
             $empdata = RestAuthHelper::getPreAndPostDataByEmailOrMobile(['mobile_number' => $mobile_number]); 
@@ -137,42 +140,90 @@ class RestAuthenticationController extends AdminController
                 return $this->respond(['status' => 'failed','code' => 404,'data' => $result],200);
             }
 
+
+
             $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: employee data both PRE & POST = " . json_encode($empdata));
 
-            $employeeData = $this->employeeModel->select('employees.relationship,EP.employee_id')
-                                    ->join('employee_polices EP', 'EP.employee_id = employees.id', 'inner') 
-                                    ->where('employees.is_active', 1)
-                                    ->where('employees.relationship', 'self')
-                                    ->where('employees.emp_status !=', 'truncated')
-                                    ->where('employees.mobile', $mobile_number)
-                                    ->where('EP.is_active', 1)
-                                    ->whereIn('EP.status', ['draft', 'enrolled', 'expired'])
-                                    ->first();
             
             $employeeData = [];
             if (isset($empdata['pre']) && !empty($empdata['pre'])) {
                 $employeeData = $empdata['pre'];
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: Using PRE data");
-            } elseif (isset($empdata['post']) && !empty($empdata['post'])) {
-                $employeeData = $empdata['post'];
-                $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: Using POST data");
             }
+
+            $otp = random_int(100000, 999999);
             
             $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: Final employee data to verify = " . json_encode($employeeData));
             
             if (isset($employeeData['employee_id'])) 
-            {   
+            {  
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: Employee verified with ID = " . $employeeData['employee_id']);
                 log_message('error', '  ');
                 log_message('error', '************************ PRE END ********************************');
-                $result = ['user_verification' => true ,'message' => "Verified Successfully" ];
+
-                return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
+                
+                $sql = "
+                    UPDATE employees
+                    INNER JOIN employee_polices ON employee_polices.employee_id = employees.id
+                    SET employees.otp = ?
+                    WHERE employees.id = ?
+                    AND employees.relationship = 'self'
+                    AND employees.is_active = 1
+                    AND employee_polices.is_active = 1
+                    AND employee_polices.status IN ('draft', 'enrolled')
+                ";
+
+                $db = db_connect();
+                $update = $db->query($sql, [$otp, $employeeData['employee_id']]);
+
+                $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: OTP update query executed. SQL = " . $db->getLastQuery());
+
+                if($update)
+                {
+
+                    //If post-enrollment data exist update the same otp generated from pre-enrollment.
+                    if (isset($empdata['post']['client_id']) && !empty($empdata['post']['client_id'])) {
+                        $data->otp = $otp;
+                        $data->client_id = $empdata['post']['client_id']; 
+                        $data->employee_id = $empdata['post']['employee_id']; 
+                        $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: Attached otp, client_id and employee_id from POST data to update the otp");
+
+                        $this->callThirdPartyAPI($data, 'updateEmpOTP');
+                        $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: Calling callThirdPartyAPI for updateEmpOTP");
+                    }
+
+                    
+                    //send sms 
+                    $SMSResult = sendOtpSms($mobile_number, $otp);
+                    if ($SMSResult['status'] == 'success') 
+                    {
+                        $result = ['user_verification' => true ,'message' => "Verified Successfully" ];
+                        return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
+                    }else{
+                        $result = ['user_verification' => false, 'message' => "SMS sending failed , try again"];
+                        return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
+                    }
+
+                }else{
+
+                    $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: OTP update query Failed. SQL = " . $db->getLastQuery());
+
+                    $result = ['user_verification' => false, 'message' => "Try again. , try again"];
+                    return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
+
+                }
+                
+
+                
             } else {
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithMobileNumber: Employee ID not found, calling third-party API to POST");
                 log_message('error', '  ');
                 log_message('error', '************************ PRE END ********************************');
+
                 // Call the third-party API function
-                return $this->callThirdPartyAPI($this->request->getJSON(),'verifyEmployeeNumber');
+                $reqData = $this->request->getJSON();
+                $reqData->otp = $otp;  
+                return $this->callThirdPartyAPI($reqData,'verifyEmployeeNumber');
             }
         } catch (\Throwable $th) {
 
@@ -208,22 +259,7 @@ class RestAuthenticationController extends AdminController
 
             $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithEmailId: employee data both PRE & POST = " . json_encode($empdata));
 
-            $employeeData = $this->employeeModel->select('
+           
-                employees.relationship,
-                EP.employee_id,
-                employees.client_id,
-                employees.client_branch_id,
-                employees.email_corporate
-
-            ')
-                ->join('employee_polices EP', 'EP.employee_id = employees.id', 'inner')
-                ->where('employees.is_active', 1)
-                ->where('employees.relationship', 'Self')
-                ->where('employees.emp_status !=', 'truncated')
-                ->where('employees.email_corporate', $email)
-                ->where('EP.is_active', 1)
-                ->whereIn('EP.status', ['draft', 'enrolled', 'expired'])
-            ->first();
 
             $employeeData = [];
             if (isset($empdata['pre']) && !empty($empdata['pre'])) {
@@ -231,15 +267,12 @@ class RestAuthenticationController extends AdminController
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithEmailId: Using PRE data");
             } 
 
+            $otp = random_int(100000, 999999);
 
-            if (isset($employeeData['employee_id'])) {
+            if (isset($employeeData['employee_id'])) 
+            {
 
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithEmailId: Valid employee found, generating OTP");
-                $otp = random_int(100000, 999999);
-
-                //  $update  = $this->employeeModel->where('email_corporate', $email)->where('relationship', 'self')
-                //                                 ->where('is_active', 1)->set(array('otp' => $otp ))
-                //                                 ->update();
 
                 $sql = "
                     UPDATE employees
@@ -253,7 +286,7 @@ class RestAuthenticationController extends AdminController
                 ";
 
                 $db = db_connect();
-                // $update = $db->query($sql, [$otp, $email]);
+               
                 $update = $db->query($sql, [$otp, $employeeData['employee_id']]);
 
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithEmailId: OTP update query executed. SQL = " . $db->getLastQuery());
@@ -261,17 +294,20 @@ class RestAuthenticationController extends AdminController
                 if($update)
                 {   
                     $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithEmailId: OTP updated successfully in PRE DATABASE");
-                    $data->otp = $otp;  
+                    
+                    //If post-enrollment data exist update the same otp generated from pre-enrollment.
                     if (isset($empdata['post']['client_id']) && !empty($empdata['post']['client_id'])) {
+                        $data->otp = $otp; 
                         $data->client_id = $empdata['post']['client_id']; 
                         $data->employee_id = $empdata['post']['employee_id']; 
                         $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithEmailId: Attached otp, client_id and employee_id from POST data to update the otp");
+
+                        $this->callThirdPartyAPI($data, 'updateEmpOTP');
+                        $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithEmailId: Calling callThirdPartyAPI for updateEmpOTP");
                     }
 
-                    $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithEmailId: Calling callThirdPartyAPI for updateEmpOTP");
-                    $this->callThirdPartyAPI($data, 'updateEmpOTP');
-
 
+                    //send Email
                     $common = [
                         'client_id' => $employeeData['client_id'],
                         'client_branch_id' => $employeeData['client_branch_id'],
@@ -309,15 +345,16 @@ class RestAuthenticationController extends AdminController
             } else {
 
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - verifyEmployeeWithEmailId: Employee not found with email in the PRE DATABASE, falling back to third-party API");
+
+                // Call the third-party API function
                 $apiParams = $this->request->getJSON();
                 if (!empty($empdata['post']['client_id'])) {
                     $apiParams->client_id = $empdata['post']['client_id']; 
                 }
-                // print_r($apiParams); die;
+                $apiParams->otp = $otp;
-                // Call the third-party API function
+                return $this->callThirdPartyAPI($apiParams, 'verifyEmployeeEmailId');
                 log_message('error', '  ');
                 log_message('error', '************************ PRE END ********************************');
-                return $this->callThirdPartyAPI($apiParams, 'verifyEmployeeEmailId');
             }
         } catch (\Throwable $th) {
             log_message('error', '  ');
@@ -336,79 +373,42 @@ class RestAuthenticationController extends AdminController
 
         try {
            
-            $otp_verification = isset($this->request->getJSON()->otp_verification) ? $this->request->getJSON()->otp_verification : null;
+            
             $mobile_number = isset($this->request->getJSON()->mobile_number) ? $this->request->getJSON()->mobile_number : null;
-
-            $otp = isset($this->request->getJSON()->otp) ? $this->request->getJSON()->otp : null;
             $email_id = isset($this->request->getJSON()->email_id) ? $this->request->getJSON()->email_id : null;
+            $otp = isset($this->request->getJSON()->otp) ? $this->request->getJSON()->otp : null;
 
-            if (isset($this->request->getJSON()->login_by_hr)) 
+            $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: Fetching empdata via RestAuthHelper");
-            {   
+            $empdata = RestAuthHelper::getPreAndPostDataByEmailOrMobile(['email_id' => $email_id, 'otp' => $otp, 'mobile_number' => $mobile_number ]); 
-                $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: login_by_hr detected, fetching employee data directly");
+            
-                $employeeData = $this->employeeModel->where('id', $this->request->getJSON()->employee_id)->where('relationship', 'self')->where('emp_status !=', 'truncated')->where('is_active', 1)->first();
-                $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: employeeData (login_by_hr) = " . json_encode($employeeData));
-            }else{
-
-                $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: Fetching empdata via RestAuthHelper");
-                $empdata = RestAuthHelper::getPreAndPostDataByEmailOrMobile(['email_id' => $email_id, 'otp' => $otp, 'mobile_number' => $mobile_number ]); 
-                // print_r($empdata); die;
-
-                if(empty($empdata)){
-                    $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: empdata is empty");
-                    log_message('error', '  ');
-                    log_message('error', '************************ PRE END ********************************');
-                    return $this->respond(['status' => 'failed','code' => 404,'data' => "", 'message' => "No data found"],200);                
-                }
-
-                $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: empdata = " . json_encode($empdata));
-
-                if (isset($mobile_number)) 
-                {
-                    // $employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->where('emp_status !=', 'truncated')->where('is_active', 1)->first();
-
-                    $employeeData = $this->employeeModel
-                        ->select('employees.*')
-                        ->join('employee_polices EP', 'EP.employee_id = employees.id', 'inner')
-                        ->where('employees.is_active', 1)
-                        ->where('employees.relationship', 'self')
-                        ->where('employees.emp_status !=', 'truncated')
-                        ->where('employees.mobile', $mobile_number)
-                        ->where('EP.is_active', 1)
-                        ->whereIn('EP.status', ['draft', 'enrolled'])
-                        ->first();
-                } else {
-                    // $employeeData = $this->employeeModel->where('email_corporate', $email_id)->where('otp', $otp)->where('relationship', 'self')->where('emp_status !=', 'truncated')->where('is_active', 1)->first();
-                     $employeeData = $this->employeeModel
-                        ->select('employees.*')
-                        ->join('employee_polices', 'employees.id = employee_polices.employee_id')
-                        ->where('employees.email_corporate', $email_id)
-                        ->where('employees.relationship', 'Self')
-                        ->where('employee_polices.is_active', 1)
-                        ->whereIn('employee_polices.status', ['draft', 'enrolled'])
-                        ->where('employees.is_active', 1)
-                        ->whereIn('employees.emp_status', ['draft', 'enrolled'])
-                        ->where('employees.otp', $otp)
-                        ->orderBy('id', 'desc')
-                        ->first();
-                }   
-
-                $employeeData = [];
-                if (isset($empdata['pre']) && !empty($empdata['pre'])) {
-                    $employeeData = $empdata['pre'];
-                     $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: Using PRE data from empdata");
-                } 
 
+            if(empty($empdata)){
+                $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: empdata is empty");
+                log_message('error', '  ');
+                log_message('error', '************************ PRE END ********************************');
+                return $this->respond(['status' => 'Invalid OTP','code' => 404,'data' => "", 'message' => "Invalid OTP"],200);                
             }
 
+            $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: empdata = " . json_encode($empdata));
+
+                
+            $employeeData = [];
+            if (isset($empdata['pre']) && !empty($empdata['pre'])) {
+                $employeeData = $empdata['pre'];
+                    $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: Using PRE data from empdata");
+            } 
+
+            
+
             $requestData = $this->request->getJSON();
             if (isset($empdata['post']['client_id']) && !empty($empdata['post']['client_id'])) {
                 $requestData->client_id = $empdata['post']['client_id']; 
                 $requestData->employee_id = $empdata['post']['employee_id']; 
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: Added client_id and employee_id to requestData for to get the POST employee data");
             }
-            // print_r($requestData); die;
+            
 
-            if ($employeeData && $otp_verification == true || $employeeData && isset($this->request->getJSON()->login_by_hr) || $employeeData && isset($this->request->getJSON()->otp) ) 
+            if ( $employeeData && isset($this->request->getJSON()->otp) ) 
             {   
                 $this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: Verified employee found");
                 $auth =  HttpRequestHelper::getRequestInfo();
@@ -455,34 +455,83 @@ class RestAuthenticationController extends AdminController
             $this->myLogger->logme("error", "Exception: " . $e->getMessage() . " --- Line: " . $e->getLine() . " --- Trace: " . $e->getTraceAsString());
             log_message('error', '  ');
             log_message('error', '************************ PRE END ********************************');
-            return $this->respond(['status' => 'failed','code' => 500,'data' => "", 'message' => $e->getMessage()],500);
+            return $this->respond(['status' => 'failed','code' => 500,'data' => "", 'message' => "Invalid OTP", 'error' => $e->getMessage()],500);
         }
     }
 
     // employee auth api's end
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
     // HR auth api's start
 
     public function verifyHrWithMobileNumber()
     {
         try {
-            $mobile_number = $this->request->getJSON()->mobile_number;
+
-           
+            $data = $this->request->getJSON();
+
+            $mobile_number = $data->mobile_number;
+
             $HrData = $this->hrModel->where('mobile', $mobile_number)
                                     ->where('contact_type', 'client')
                                     ->where('is_active', 1)
                                     ->first();
-            
+
-            if ($HrData) {
+            $otp = random_int(100000, 999999);
+
+
+            if ($HrData) 
+            {
                 
-                $result = ['user_verification' => true ,'message' => "Verified Successfully"];
+                    $sql = "UPDATE level_contacts SET otp = ? WHERE mobile = ? AND contact_type = 'client' AND is_active = 1";
-                return $this->respond(['status' => 'success','code' => 200,'data' => $result],200);
+
-            } else {
+                    $db = db_connect();
-               // Call the third-party API function
+                    $update = $db->query($sql, [$otp, $mobile_number]);
-               return $this->callThirdPartyAPI($this->request->getJSON(),'verifyHrWithMobileNumber');
+
+                    if($update)
+                    {
+                        //update otp in post-enrollment
+                        $data->otp = $otp; 
+                        $this->callThirdPartyAPI($data, 'updateHROTP');
+
+                        //send sms 
+                        $SMSResult = sendOtpSms($mobile_number, $otp);
+                        if ($SMSResult['status'] == 'success') 
+                        {
+                            $result = ['user_verification' => true, 'message' => "Verified Successfully"];
+                            return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result], 200);
+                        } else {
+                            $result = ['user_verification' => false, 'message' => "SMS sending failed , try again"];
+                            return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
+                        }
+
+                    }else {
+                        $result = ['user_verification' => false, 'message' => "SMS sending failed , try again"];
+                        return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
+                    }
+
+            }else {
+
+            // Call the third-party API function
+            $reqData = $this->request->getJSON();
+            $reqData->otp = $otp;  
+            return $this->callThirdPartyAPI($reqData,'verifyHrWithMobileNumber');
 
             }
+
         } catch (\Throwable $th) {
             return $this->respond(['status' => 'failed','code' => 500,'data' => $th],500);
         }
@@ -501,9 +550,11 @@ class RestAuthenticationController extends AdminController
                                     ->where('is_active', 1)
                                     ->first();
           
+            $otp = random_int(100000, 999999);
+
             if ($HrData) {
                 
-                $otp = random_int(100000, 999999);
+               
 
                 $sql = "
                         UPDATE level_contacts
@@ -546,6 +597,8 @@ class RestAuthenticationController extends AdminController
 
             } else {
                // Call the third-party API function
+                $reqData = $this->request->getJSON();
+                $reqData->otp = $otp;  
                return $this->callThirdPartyAPI($this->request->getJSON(),'verifyHrWithEmail');
 
             }
@@ -557,21 +610,19 @@ class RestAuthenticationController extends AdminController
     public function getVerifiedHrData()
     {
         try {
-            // mobile number 
+            
-            $otp_verification = isset($this->request->getJSON()->otp_verification) ? $this->request->getJSON()->otp_verification : null;
-            $mobile_number = isset($this->request->getJSON()->mobile_no) ? $this->request->getJSON()->mobile_no : null;
-            // email id
             $otp = isset($this->request->getJSON()->otp) ? $this->request->getJSON()->otp : null;
             $email = isset($this->request->getJSON()->email) ? $this->request->getJSON()->email : null;
+            $mobile_number = isset($this->request->getJSON()->mobile_no) ? $this->request->getJSON()->mobile_no : null;
 
             if (isset($mobile_number)) 
             {
-                $hrData = $this->hrModel->where('mobile', $mobile_number)->where('contact_type', 'client')->first();
+                $hrData = $this->hrModel->where('mobile', $mobile_number)->where('contact_type', 'client')->where('otp', $otp)->first();
             }else{
                 $hrData = $this->hrModel->where('email', $email)->where('contact_type', 'client')->where('otp', $otp)->first();
             }
 
-            if ($hrData && $otp_verification == true || $hrData && isset($this->request->getJSON()->otp) ) 
+            if ($hrData) 
             {
 
                 $auth =  HttpRequestHelper::getRequestInfo();
@@ -597,10 +648,10 @@ class RestAuthenticationController extends AdminController
                                             ->where('level_contacts.mobile', $mobile_number )
                                             ->where('level_contacts.contact_type', 'client')
                                             ->findAll();
+                    //set otp value null
+                    $this->hrModel->where('mobile', $mobile_number)->where('otp', $otp)->where('contact_type', 'client')->set(['otp'=>null])->update();
 
-                }else if(isset($this->request->getJSON()->otp)){ 
+                }else if(isset($this->request->getJSON()->email)){ 
-
-                    $this->hrModel->where('email', $email)->where('otp', $otp)->where('contact_type', 'client')->set(['otp'=>null])->update();
 
                     $getAllhrData = $this->hrModel->select('level_contacts.id ,level_contacts.mobile , level_contacts.email , clients.id as client_id, clients.client_name, clients.short_name , client_branch.id as client_branch_id,client_branch.branch_name , client_branch.post_branch_id')
                                             ->join('client_branch', 'level_contacts.ref_id = client_branch.id', 'left')
@@ -608,10 +659,15 @@ class RestAuthenticationController extends AdminController
                                             ->where('level_contacts.email', $email )
                                             ->where('level_contacts.contact_type', 'client')
                                             ->findAll();
+                    //set otp value null
+                    $this->hrModel->where('email', $email)->where('otp', $otp)->where('contact_type', 'client')->set(['otp'=>null])->update();
                 }
 
+
                 if(count($getAllhrData))
                 {
+
+
                     $db2 = \Config\Database::connect('postDB');
                     foreach ($getAllhrData as $key => $value) {
 
@@ -636,28 +692,20 @@ class RestAuthenticationController extends AdminController
                         }
                        
                     }
+
+
+                    // Call the third-party API function
+                    $apiResponse = $this->callThirdPartyAPI($this->request->getJSON(),'getVerifiedHrData');
+                    return $this->respond(['status' => 'success','code' => 200,'data' => $getAllhrData , 'post_enrollment'=> json_decode($apiResponse, true)],200);
+
+                }else {
+
+                    // Call the third-party API function
+                    $apiResponse = $this->callThirdPartyAPI($this->request->getJSON(),'getVerifiedHrData');
+                    return $this->respond(['status' => 'failed','code' => 404,'data' => "" , 'post_enrollment'=> json_decode($apiResponse, true)],200);
                 }
 
-                $apiResponse = $this->callThirdPartyAPI($this->request->getJSON(),'getVerifiedHrData');
+               
-                return $this->respond(['status' => 'success','code' => 200,'data' => $getAllhrData , 'post_enrollment'=> json_decode($apiResponse, true)],200);
-
-                //call and get allowed module data from post enrollment
-                // $queryParams = [
-                //     'hr_id' => $hrData['0']['id'],
-                //     'request_for'   => 'pre_enrollment'
-                // ];
-                // $HRAccessRes = $this->callThirdPartyGETAPI($queryParams,'getHRAccessData');
-                // $HRAccessData = json_decode($HRAccessRes,true);
-                // if(isset($HRAccessData['data']['allowed_modules'])){ $hrData['0']['allowed_modules'] =  json_decode($HRAccessData['data']['allowed_modules'],true)['pre']; }else{ $hrData['0']['allowed_modules'] = []; }
-                
-                // $hrData['0']['token_type'] = 'pre';
-                // $result = JWTToken::encode($hrData['0']);
-  
-                // // Call the third-party API function
-                // $apiResponse = $this->callThirdPartyAPI($this->request->getJSON(),'getVerifiedHrData');
-                // return $this->respond(['status' => 'success','code' => 200,'data' => $result , 'post_enrollment'=> json_decode($apiResponse, true)],200);
-
-
             } else {
 
                 // Call the third-party API function

app/Helpers/RestAuthHelper.php

@@ -285,6 +285,10 @@ class RestAuthHelper
                 ->where('EP.is_active', 1)
                 ->whereIn('EP.status', ['draft', 'enrolled']);
 
+            if (!empty($otp)) {
+                $builder->where('employees.otp', $otp);
+            }
+
             if (!empty($old_mpin)) {
                 $builder->where('employees.mpin', $old_mpin);
             }

app/Helpers/sms_helper.php

@@ -0,0 +1,44 @@
+<?php
+
+use CodeIgniter\Database\BaseConnection;
+
+if (!function_exists('sendOtpSms')) {
+
+   
+    function sendOtpSms(string $mobile, string $otp)
+    {
+        $apiKey = env('SMS_API_KEY');
+        $senderId = env('SMS_SENDER_ID');
+        $templateId = env('SMS_TEMPLATE_ID');
+        $serviceName = env('SMS_SERVICE_NAME');
+        $appName = env('SMS_APP_NAME');
+
+        // Replace variables {#var#}
+        $message = "Hi, Your One Time Code for logging into Nhance {$appName} App is {$otp}. Valid for 3 minutes. Please do not share this with anyone. -NHANCE";
+
+        log_message('info' , 'SMS - Message '.$message);
+
+        // Build the API URL
+        $url = "https://smsapi.24x7sms.com/api_2.0/SendSMS.aspx?" . http_build_query([
+            'APIKEY'        => $apiKey,
+            'MobileNo'      => $mobile,
+            'SenderID'      => $senderId,
+            'Message'       => $message,
+            'ServiceName'   => $serviceName,
+            'DLTTemplateID' => $templateId,
+        ]);
+
+        // Send request
+        $response = @file_get_contents($url);
+
+        log_message('info' , 'SMS - Response '.$response);
+
+        // If response failed
+        if ($response === FALSE) {
+            return ['status' => 'failed', 'message' => 'Failed to send SMS.'];
+        }
+
+
+        return ['status' => 'success', 'message' => 'OTP sent successfully', 'api_response' => $response];
+    }
+}

app/Models/ClientModel.php

@@ -105,13 +105,21 @@ class ClientModel extends Model
     }
             
 
-    public function getCreatedByUserName(){
+    public function getCreatedByUserName($client_type = null){
 
-        return $this->db->table('clients')
+        // return $this->db->table('clients')
+        // ->select('clients.*')
+        // ->where('is_active', 1)
+        // ->get()
+        // ->getResult();
+        $query =  $this->db->table('clients')
         ->select('clients.*')
-        ->where('is_active', 1)
+        ->where('clients.is_active', 1);
-        ->get()
+        if (!empty($client_type)) {
-        ->getResult();
+            $query->where('clients.client_type', $client_type);
+        }
+        $data = $query->get()->getResult();
+        return $data;
         
     }
 

app/Views/client_basic_info.php

@@ -91,13 +91,14 @@ input:checked + .slider:before {
                             <div class="form-group col-md-6">
                                 <label for="client_name">Client Name<span
                                         class="text-danger">*</span></label>
-                                <input type="text" class="form-control" id="client_name"
+                                <input type="text" class="form-control" id="client_name"  data-old-name="<?= isset($client['client_name']) ? $client['client_name'] : '' ?>"
                                     placeholder="Enter Client Name" value="<?= isset($client['client_name']) ? $client['client_name'] : '' ?>" name="client_name" required>
                             </div>
                             <div class="form-group col-md-6">
                                 <label for="short_name">Client Short Name<span
                                         class="text-danger">*</span></label>
                                 <input type="text" class="form-control" id="short_name"
+                                    data-old-short="<?= isset($client['short_name']) ? $client['short_name'] : '' ?>"
                                     placeholder="Enter Short Name" value="<?= isset($client['short_name']) ? $client['short_name'] : '' ?>" name="short_name" onkeyup="validateInput(this, 'clients', 'short_name', 'clientBtnSubmit')" required>
                             </div>
                         </div>

app/Views/client_branch.php

@@ -855,6 +855,71 @@ function checkMobileNumber(input) {
 
 }
 
+let shortNameTimer;
+
+$("#client_name").on("input change keyup", function() {
+    clearTimeout(shortNameTimer); // cancel previous call
+    shortNameTimer = setTimeout(() => {
+        generateShortName();      // only runs after 200ms pause
+    }, 200); // adjust debounce delay as needed
+});
+
+function generateShortName() {
+    let clientInput = $("#client_name");
+    let shortInput = $("#short_name");
+
+    let oldClientName = clientInput.data("old-name");   // from DB
+    let oldShortName = shortInput.data("old-short");    // from DB
+    let newClientName = clientInput.val().trim();
+    console.log(`LN 866 : NEW - ${newClientName} | OLD - ${oldClientName} | OLD SN - ${oldShortName}`);
+
+    if (newClientName.toUpperCase() === (oldClientName || '').toUpperCase()) {
+        shortInput.val(oldShortName);
+        return;
+    }
+
+    if (newClientName.length == 0) {
+        shortInput.val('');
+        return;
+    }
+
+    if (newClientName.length > 0) {
+        let shortName = newClientName.substring(0, 10).replace(/\s+/g, '').toUpperCase();
+        shortInput.val(shortName);
+        makeUniqueShortName(shortName);
+    }
+}
+
+
+
+function makeUniqueShortName(baseName) {
+    let input = $("#short_name")[0]; // input element
+    checkDuplicateTableFieldValue("clients", "short_name", baseName, function(isDuplicate) {
+        if (isDuplicate) {
+            // Append sequence until unique
+            let counter = 1;
+            function tryNext() {
+                let padded = String(counter).padStart(3, '0'); // 001, 002, 003
+                let newName = baseName + padded;
+
+                checkDuplicateTableFieldValue("clients", "short_name", newName, function(exists) {
+                    if (exists) {
+                        counter++;
+                        tryNext(); // keep checking
+                    } else {
+                        $("#short_name").val(newName);
+                        validateInput(input, "clients", "short_name", "clientBtnSubmit");
+                    }
+                });
+            }
+            tryNext();
+        } else {
+            $("#short_name").val(baseName);
+            validateInput(input, "clients", "short_name", "clientBtnSubmit");
+        }
+    });
+}
+
 function validateInput(input, table, field, submitBtnId){
 
     let value = $(input).val();

app/Views/client_list.php

@@ -81,7 +81,8 @@
                                             <?php $account_managers .= $client->account_manager . ', '; ?>
                                         <?php endif; ?>
                                     <?php endforeach; ?>
-                                    <?php echo rtrim($account_managers, ', '); ?> 
+                                    <?php $account_managers = rtrim($account_managers, ', ');
+                                          echo $account_managers !== '' ? $account_managers : 'N/A'; ?> 
                                 </td>
                                 <td>
                                     <div class="btn-group dropdown">
@@ -261,9 +262,9 @@
     $(document).ready(function(){
     $('#lead_id').select2();
     })   
-
+    var table;
     $(document).ready(function(){
-        $('#tickets-table').DataTable({
+        table = $('#tickets-table').DataTable({
             dom: "<'row'<'col-sm-0'f><'col-sm-7 text-right'B>>" + 
                 "<'row'<'col-sm-12'tr>>" + 
                 "<'row'<'col-sm-5'i><'col-sm-7'p>>", 
@@ -271,6 +272,11 @@
                 extend: 'csv',
                 text: 'CSV',
                 title: 'ClientList',
+                // title: function() {
+                //         return $('#toggleButtons').is(':checked') 
+                //             ? 'GC-Client-List' 
+                //             : 'RC-Client-List';
+                // },
                 className: 'my_class',
                 exportOptions: {
                     columns: ':not(:last-child)'
@@ -278,13 +284,91 @@
             }],
             language: {
                 search: "_INPUT_",
-                searchPlaceholder: "Search..."
+                searchPlaceholder: "Search...",
+                emptyTable: '<div class="text-center text-muted">No Data found</div>'
             },
             paging: true ,
             // pagingType: 'full_numbers'
         });
-    }) 
+            $(".dt-buttons").prepend(`
+                <span id="statusSwitchWrapper" class="dt-switch-wrapper">
+                        <span class="custom-switch mr-2" style="text-align: left;">
+                            <input type="checkbox" class="custom-control-input" id="toggleButtons" checked>
+                            <label class="custom-control-label" for="toggleButtons" style="vertical-align: sub !important;">Group Client</label>
+                        </span>
+                </span>
+            `);
+            
+            $('#toggleButtons').on('change', function() {
+                    let type = $(this).is(':checked') ? 1 : 2;
+                    // $('div.col-6 h4').text(
+                    //     $(this).is(':checked') 
+                    //         ? "GC Client List" 
+                    //         : "RC Client List"
+                    // );
+                    let url = '<?= base_url('client/typeList/') ?>' + type;
 
+                    $.ajax({
+                        url: url,        
+                        method: 'GET',
+                        success: function(response) {
+                            if (response.status === "success" && Array.isArray(response.data)) {
+                                renderRows(response.data);
+                            } else {
+                                renderRows([]);
+                            }
+                        },
+                        error: function(xhr, status, error) {
+                            console.error("Error loading:", error);
+                            renderRows([]);
+                        }
+                    });
+            });
+
+     });
+    
+    function renderRows(data) {
+        table.clear();
+        if (Array.isArray(data) && data.length) {
+            data.forEach((row, index) => {
+                let clientrm = <?= json_encode($client_rm) ?>;
+                let account_managers = "";
+
+                clientrm.forEach(client => {
+                    if (client.client_id == row.id) {
+                        account_managers += client.account_manager + ", ";
+                    }
+                });
+                account_managers = account_managers.replace(/,\s*$/, "");
+                if (account_managers === "") account_managers = "N/A";
+
+                let rowData = [
+                    `<span> ${row.client_name} (${row.short_name})</span>`,
+                    account_managers,                
+                    `<div class="btn-group dropdown">
+                        <a href="javascript:void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown" aria-expanded="false">
+                            <i class="mdi mdi-dots-horizontal"></i>
+                        </a>        
+                        <div class="dropdown-menu dropdown-menu-right">
+                            <a class="dropdown-item" href="<?= base_url("client/list/") ?>${row.id}">
+                                <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
+                            </a>
+                            
+                            <?php if(in_array(get_role_id(), [1, 5])) { ?>
+                                <a class="dropdown-item" data-id="${row.id}" onclick="removeClient(this)">
+                                    <i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete
+                                </a>
+                            <?php } ?>
+                        </div>
+                    </div>`
+                ];
+
+                let newRow = table.row.add(rowData);
+                $(newRow.node()).find('td:eq(0)').addClass('client_info').attr('data-id', row.id);
+                });
+        } 
+        table.draw();
+    }
     //DO NOT REMOVE THIS FUNCTION >>> THI FUNCTION FOR CLIENT SOFT DELETE
     // function removeClient(element) 
     // {