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;
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/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)) {
diff --git a/app/Views/layout/footer_new.php b/app/Views/layout/footer_new.php
new file mode 100644
index 0000000..ec1ca32
--- /dev/null
+++ b/app/Views/layout/footer_new.php
@@ -0,0 +1,941 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+