From 1228cf3e31486840c99c69972b7f051b47bb6d52 Mon Sep 17 00:00:00 2001 From: Srinivas-Saravanan Date: Fri, 16 May 2025 16:45:09 +0530 Subject: [PATCH 1/3] FIX_LOGOUT --- app/Controllers/LoginController.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/Controllers/LoginController.php b/app/Controllers/LoginController.php index b3ca218..830fb02 100755 --- a/app/Controllers/LoginController.php +++ b/app/Controllers/LoginController.php @@ -89,9 +89,18 @@ class LoginController extends BaseController public function logout() { + // $path = getenv('cookie.Path'); + // session()->destroy(); + // setcookie('session_data', '', time() - 3600, $path); + // return redirect()->to(base_url('login')); + $path = getenv('cookie.Path'); session()->destroy(); - setcookie('session_data', '', time() - 3600, $path); + // setcookie('session_data', '', time() - 3600, $path); + $path = getenv('cookie.Path'); + $domain = getenv('cookie.Domain'); + $https = getenv('cookie.secure'); + setcookie('session_data',null, time() -3600, $path, $domain, $https, true); return redirect()->to(base_url('login')); } From 60d983553bd120d85c0eac39dc5fe894d7ba49e8 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Thu, 22 May 2025 12:13:59 +0530 Subject: [PATCH 2/3] FIX_RELATIONSHIP_ERROR : RV --- app/Controllers/EmployeeServiceController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php index 691e625..ff6ded1 100755 --- a/app/Controllers/EmployeeServiceController.php +++ b/app/Controllers/EmployeeServiceController.php @@ -153,7 +153,7 @@ class EmployeeServiceController extends AdminController 'is_mandatory' => ['I', 'A', 'DA'], 'data_type' => 'str', 'format' => null, - 'allowed_values' => null, + 'allowed_values' => ['Self', 'Spouse', 'Son', 'Daughter', 'Father', 'Mother', 'Father in Law', 'Mother in Law'], 'custom' => 'check_relationship', 'params' => ['row', 'relationship', 'policy_terms'] ], From 7e23f18b2bcfeba95b70465b3b25fdb6d7c74a55 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Thu, 22 May 2025 15:42:08 +0530 Subject: [PATCH 3/3] FIX_MOBIL_NO_VATION : RV --- app/Helpers/excel_util_helper.php | 6 +++--- app/Models/EmployeePolicyModel.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php index 710ba74..79a9b23 100755 --- a/app/Helpers/excel_util_helper.php +++ b/app/Helpers/excel_util_helper.php @@ -1762,10 +1762,10 @@ if(!function_exists('remap_default_age_ratio_into_relationship')) if(!function_exists('check_dup_mobileno')) { function check_dup_mobileno(array $row,array $existing_mobilenos) - { + { foreach($existing_mobilenos as $k => $value) { - if ($row['12'] == $value['mobile']) { + if (strtolower($row['5']) == 'self' && $row['12'] == $value['mobile']) { return array('status' => false,'error' => "Duplicate Mobile No"); // break; } @@ -1780,7 +1780,7 @@ if(!function_exists('check_dup_email')) { foreach($existing_mobilenos as $k => $value) { - if ($row['13'] == $value['email_corporate']) { + if (strtolower($row['5']) == 'self' && $row['13'] == $value['email_corporate']) { return array('status' => false,'error' => "Duplicate Email"); // break; } diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 2158b04..ff80bc7 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -1414,8 +1414,8 @@ class EmployeePolicyModel extends Model ->join('employees emp', 'employee_polices.employee_id = emp.id') ->join('client_policy cp', 'employee_polices.client_policy_id = cp.id') ->where('employee_polices.client_policy_id',$client_policy_id) - ->whereIn('employee_polices.status', ['Active']) - ->whereIn('emp.emp_status', ['Active']) + ->whereIn('employee_polices.status', ['draft', 'enrolled']) + ->whereIn('emp.emp_status', ['draft', 'enrolled']) ->where('emp.is_active', 1) ->where('emp.relationship', 'Self') ->where('emp.mobile is not null')