From 80a90ade1678bc377065c54ce9875ece14efaa9e Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Tue, 27 Jan 2026 14:39:43 +0530 Subject: [PATCH 1/4] Clinet_id md5 changes : GWM --- app/Controllers/RestAuthenticationController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php index 4afe047..89ec1de 100755 --- a/app/Controllers/RestAuthenticationController.php +++ b/app/Controllers/RestAuthenticationController.php @@ -798,6 +798,7 @@ class RestAuthenticationController extends AdminController $decoded = json_decode($HRAccessData['allowed_modules'], true); $getAllhrData[$key]['allowed_modules'] = $decoded; $HRAccessData['pre_client_id'] = md5($HRAccessData['pre_client_id']); + $HRAccessData['post_client_id'] = md5($HRAccessData['post_client_id']); $token = JWTToken::encode($HRAccessData); $getAllhrData[$key]['token'] = $token; From 3eaaf1cede00ad2a0947e9e32b64d5dd205368a3 Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Tue, 27 Jan 2026 15:24:29 +0530 Subject: [PATCH 2/4] getEmployeePolicy api change : GWM --- app/Models/EmployeePolicyModel.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 306e6ee..72b8ba9 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -163,8 +163,10 @@ class EmployeePolicyModel extends Model ->orderBy('employee_polices.employee_id', 'ASC'); - // Conditionally add where clauses - if ($client_id != 0 && !empty($client_id)) { + // Conditionally add where clauses + if (is_string($client_id) && preg_match('/^[a-f0-9]{32}$/i', $client_id)) { + $result->where('MD5(emp.client_id)', $client_id); + } else if ($client_id != 0 && !empty($client_id)) { $result->where('emp.client_id', $client_id); } if ($branch_id != 0 && !empty($branch_id)) { From 0c0aef4dc351efa938dec9ed69412413e06c01fe Mon Sep 17 00:00:00 2001 From: velz Date: Tue, 27 Jan 2026 16:32:59 +0530 Subject: [PATCH 3/4] FIX_OUTDATED_COMPONENTS --- app/Views/layout/footer.php | 117 ++- app/Views/layout/footer_old_outdated.php | 960 +++++++++++++++++++++++ app/Views/layout/header.php | 18 +- app/Views/layout/header_old_outdated.php | 759 ++++++++++++++++++ 4 files changed, 1777 insertions(+), 77 deletions(-) create mode 100644 app/Views/layout/footer_old_outdated.php create mode 100644 app/Views/layout/header_old_outdated.php diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php index a412cef..ec1ca32 100755 --- a/app/Views/layout/footer.php +++ b/app/Views/layout/footer.php @@ -62,88 +62,69 @@ - +
- - + + + + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + - - - + + + + - - - - + + + + + + + - - - + + + + © NHANCE + + + + + + + + + + + + + + + + + + +
+
+ +
+ + Notification +
+
+
    + +
+
+ + +
+ + TO DOs +
+
+
    + +
+
+
+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 586695f..e021d8a 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -50,17 +50,17 @@ /assets/css/jodit.css" rel="stylesheet" type="text/css" /> - - + + - - + + - - + + - - + + @@ -77,7 +77,7 @@ --> - + diff --git a/app/Views/layout/header_old_outdated.php b/app/Views/layout/header_old_outdated.php new file mode 100644 index 0000000..586695f --- /dev/null +++ b/app/Views/layout/header_old_outdated.php @@ -0,0 +1,759 @@ + + + + + + + <?= isset($page_name) ? $page_name : 'NHance'; ?> + + + + + + + + /assets/images/Nhance_Favi.svg"> + + + /assets/libs/admin-resources/jquery.vectormap/jquery-jvectormap-1.2.2.css" rel="stylesheet" type="text/css" /> + + + /assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" /> + /assets/libs/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" rel="stylesheet" type="text/css" /> + /assets/libs/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css" rel="stylesheet" type="text/css" /> + /assets/libs/datatables.net-select-bs4/css//select.bootstrap4.min.css" rel="stylesheet" type="text/css" /> + + + + /assets/css/bootstrap-creative.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" /> + /assets/css/app-creative.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" /> + + /assets/css/bootstrap-creative-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" /> + /assets/css/app-creative-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet" /> + + + /assets/css/icons.min.css" rel="stylesheet" type="text/css" /> + + /assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" /> + /assets/libs/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet" type="text/css"> + /assets/libs/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet" type="text/css"> + + + + + + + + + + + /assets/css/jodit.css" rel="stylesheet" type="text/css" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ /assets/images/nhance-loader-fast.gif" height="40" width="40" alt="Loading..."> +
+
+ + + +
+ + +
+
+ + + +
+ + + +
+ + +
+
+
+ + + +
+ + + +
+ + + +
+ +
+ + + + + +
+ + +
+ + + + + + +
+
+ + +
\ No newline at end of file From 6f208725e04309561fc45588ef56c9586eb1053c Mon Sep 17 00:00:00 2001 From: velz Date: Fri, 30 Jan 2026 15:24:48 +0530 Subject: [PATCH 4/4] FIX_HR_FILE_UPLOAD_ISSUE&HEADER7&FOOTER --- app/Helpers/utility_helper.php | 8 +- app/Views/layout/footer.php | 117 +++--- ...footer_old_outdated.php => footer_new.php} | 117 +++--- app/Views/layout/header.php | 18 +- app/Views/layout/header_new.php | 367 +++++++++++------- ...er_old_outdated.php => header_new_old.php} | 349 ++++++----------- 6 files changed, 489 insertions(+), 487 deletions(-) rename app/Views/layout/{footer_old_outdated.php => footer_new.php} (90%) rename app/Views/layout/{header_old_outdated.php => header_new_old.php} (63%) diff --git a/app/Helpers/utility_helper.php b/app/Helpers/utility_helper.php index d1f858b..71eeb49 100755 --- a/app/Helpers/utility_helper.php +++ b/app/Helpers/utility_helper.php @@ -739,12 +739,14 @@ if (!function_exists('validateExcelFile')) { function validateExcelFile($file) { - $allowed = [ - 'application/vnd.ms-excel', + $allowed = [ + 'application/vnd.ms-excel','application/vnd', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', - 'application/vnd.oasis.opendocument.spreadsheet' + 'application/vnd.oasis.opendocument.spreadsheet', + 'application/octet-stream' ]; + // if ($file->getError() !== UPLOAD_ERR_OK) return 'Upload error'; // if ($file->getSize() > (16 * 1024 * 1024)) return 'File too large'; // if (!in_array($file->getClientMimeType(), $allowed, true)) return 'Invalid file type'; diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php index ec1ca32..a412cef 100755 --- a/app/Views/layout/footer.php +++ b/app/Views/layout/footer.php @@ -62,69 +62,88 @@ - +
- - - - + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + - - - - + + + - - - + + + + - - - - - - - - + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + - - - + + + + - - - - + + + + + + + - - - + + + + + + - - + + - - + + - - + + @@ -77,7 +77,7 @@ --> - + diff --git a/app/Views/layout/header_new.php b/app/Views/layout/header_new.php index 297f7f2..e021d8a 100644 --- a/app/Views/layout/header_new.php +++ b/app/Views/layout/header_new.php @@ -50,34 +50,34 @@ /assets/css/jodit.css" rel="stylesheet" type="text/css" /> - - + + - - + + - - + + - - + + - + - + @@ -329,84 +329,8 @@ }); - - @@ -420,24 +344,219 @@ -
+
+ +
+
+ + + +
+ + + +
+ + +
+
+
+
+ + +
+ + + +
+