From 6d4370d2649281477145274b4f9a9baeaea9e0a3 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Sat, 1 Mar 2025 17:46:13 +0530 Subject: [PATCH 1/5] CHANGE_SCRIPT_CHANGE : RV --- app/Controllers/ClientController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index 15533b25..fc493482 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -4295,7 +4295,7 @@ class ClientController extends AdminController // dd($policyTerms); // Re-encode the ordered policy terms $updatedPolicyTerms = json_encode($policyTerms); - dd($updatedPolicyTerms); + // dd($updatedPolicyTerms); // dd($orderedPolicyTerms, $updatedPolicyTerms); $this->clientPolicyModel->update($data[$i]['id'], ['policy_terms' => $updatedPolicyTerms]); From 9b4ecff57bc7041b07a3b366a85132e1ed85accf Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Mon, 3 Mar 2025 10:06:55 +0530 Subject: [PATCH 2/5] FIX_EXCEL_UTIL_HELPER : RV --- app/Controllers/ClientController.php | 2 +- app/Helpers/excel_util_helper.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index fc493482..3d1ca91e 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -4574,7 +4574,7 @@ class ClientController extends AdminController $employeeRestController = new EmployeeServiceController(); // $employeeRestController->excelFileDataValidation(['file_id' => 823]); - // $employeeRestController->employeesOnboardPreprocess(['file_id' => 644]); + // $employeeRestController->employeesOnboardPreprocess(['file_id' => 726]); // $employeeRestController->employeesOnboardProcess(['file_id' => 835]); // $employeeRestController->employeesEnrollmentInsert(['file_id' => 836]); // $r = Jobs::addJob(['job_name' => 'employeesEnrollmentInsert','payload' => ['file_id' => 721]]); diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php index a5cd1bda..c90eebb3 100755 --- a/app/Helpers/excel_util_helper.php +++ b/app/Helpers/excel_util_helper.php @@ -682,7 +682,7 @@ if (!function_exists('generate_relationship_code')) $slug = \Config\Services::slug(); $relationship_code = $slug->slugify($arr['relationship']); $emp_type_code = ($relationship_code == 'self' ? 'EMP_TYP_01' : 'EMP_TYP_03'); - $relationship_code = $gender[ $arr['gender'] ] . $relationship[ $relationship_code ] ; + $relationship_code = $gender[ trim($arr['gender']) ] . $relationship[ trim($relationship_code) ]; return ['relationship_code' => $relationship_code,'emp_type_code' => $emp_type_code]; } } From 6efcb610d39c26ce9326d741fea16fd6f384751e Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Mon, 3 Mar 2025 11:56:59 +0530 Subject: [PATCH 3/5] FIX_LOGIN_API : RV --- .../RestAuthenticationController.php | 82 +++++++++---------- 1 file changed, 40 insertions(+), 42 deletions(-) diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php index 752d116c..616a69cd 100755 --- a/app/Controllers/RestAuthenticationController.php +++ b/app/Controllers/RestAuthenticationController.php @@ -102,70 +102,68 @@ class RestAuthenticationController extends AdminController { try { $email = $this->request->getJSON()->email; - - $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.email_corporate', $email) - ->where('EP.is_active', 1) - ->whereIn('EP.status', ['active']) - ->first(); - - if (isset($employeeData['employee_id'])) - { + + $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']) + ->first(); + + if (isset($employeeData['employee_id'])) { $otp = random_int(100000, 999999); - $update = $this->employeeModel->where('email_corporate', $email)->where('relationship', 'self') - ->where('is_active', 1)->set(array('otp' => $otp )) - ->update(); - if($update) - { + $update = $this->employeeModel->where('email_corporate', $email)->where('relationship', 'Self') + ->where('is_active', 1)->set(array('otp' => $otp)) + ->update(); + if ($update) { $common = [ 'client_id' => $employeeData['client_id'], 'client_branch_id' => $employeeData['client_branch_id'], 'client_policy_id' => null, 'employee_policy_id' => null, - 'employee_id' => $employeeData['id'], + 'employee_id' => $employeeData['employee_id'], 'mail_type' => 'otp_mail', - ]; + ]; $subject = 'Nhance user verification - OTP'; - $mail_content = $otp.' is your verification code for Nhance.'; - $res = MailHelper::send_email(['mail' => $employeeData['email_corporate'], 'subject' => $subject ,'common'=>$common ,'message' => $mail_content]); + $mail_content = $otp . ' is your verification code for Nhance.'; + $res = MailHelper::send_email(['mail' => $employeeData['email_corporate'], 'subject' => $subject, 'common' => $common, 'message' => $mail_content]); $this->myLogger->logme("info", $res); - if(json_decode($res)->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' => "Mail sending failed , try again"]; - return $this->respond(['status' => 'failed','code' => 404,'data' => $result],200); + if (json_decode($res)->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' => "Mail sending failed , try again"]; + return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200); } + } else { - }else{ - - $result = ['user_verification' => false , 'message' => "Verification failed , try again"]; - return $this->respond(['status' => 'failed','code' => 404,'data' => $result],200); - + $result = ['user_verification' => false, 'message' => "Verification failed , try again"]; + return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200); } - - } else { - $result = ['user_verification' => false , 'message' => "User not found"]; - return $this->respond(['status' => 'failed','code' => 404,'data' => $result],200); - + $result = ['user_verification' => false, 'message' => "User not found"]; + return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200); } } catch (\Throwable $th) { - return $this->respond(['status' => 'failed','code' => 500,'data' => $th],500); + return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $th], 500); } } - + public function getVerifiedUserData() { From b808b920c9f8769dadd3a8fa5ec2057f8f5eca6e Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Mon, 3 Mar 2025 17:53:00 +0530 Subject: [PATCH 4/5] CHANGE_CLAIMS_CHANGES : RV --- app/Helpers/sendMailNotification.php | 2 +- app/Views/ticket_form_gmc.php | 2 +- app/Views/ticket_form_handler.php | 23 ++++++++++++++++++----- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/app/Helpers/sendMailNotification.php b/app/Helpers/sendMailNotification.php index 44bea402..bd66c776 100755 --- a/app/Helpers/sendMailNotification.php +++ b/app/Helpers/sendMailNotification.php @@ -1247,7 +1247,7 @@ class sendMailNotification $subject = $notification['subject']; $rand_string = 'HX3kUh'; - $link = generate_download_link($rand_string); + $link = generate_download_link($rand_string).'/1'; $name = 'John Doe'; $mobile = 9080706050; diff --git a/app/Views/ticket_form_gmc.php b/app/Views/ticket_form_gmc.php index b23212e9..4654048e 100644 --- a/app/Views/ticket_form_gmc.php +++ b/app/Views/ticket_form_gmc.php @@ -343,7 +343,7 @@ -
+