From 85c4794e84fd3b4d19e4ea9ebd3bbee58fe68394 Mon Sep 17 00:00:00 2001 From: "sanjeev.p" Date: Tue, 27 Jan 2026 12:14:06 +0530 Subject: [PATCH 1/9] FIX_FE_content api --- app/Views/frontend_content_list.php | 39 ++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/app/Views/frontend_content_list.php b/app/Views/frontend_content_list.php index c88484f3..e2e62833 100644 --- a/app/Views/frontend_content_list.php +++ b/app/Views/frontend_content_list.php @@ -460,7 +460,7 @@ } }else{ toastr.error("Something went wrong!", 'Error'); - } + }} }); } @@ -478,8 +478,13 @@ function appendEditData(data) { $('#frontEndContentForm')[0].reset(); $('#fe_id').val(data.id); - $('#type').val(data.type); - $('#content_section').val(data.content_section); + if (/video/i.test(data.content_section)) { + $('#content_section').val('Video'); + $('#type').val(8); + } else { + $('#type').val(data.type); + $('#content_section').val(data.content_section); + } $('#heading').val(data.heading); // $('#content').val(data.content); // $('#notes').val(data.notes); @@ -533,6 +538,34 @@ return text.length === 0; } + // $('#content_section').on('keyup blur change', function () { + // let val = $(this).val(); + // if (/video/i.test(val)) { + // $(this).val('Video'); + // $('#type').val(8); + // } + // }); + + + $('#content_section').on('input blur', function () { + let $this = $(this); + let val = $this.val().trim(); + + // 1. Handle Empty Input + if (val === '') { + $('#type').val(''); + return; + } + + // 2. Check for "video" (case insensitive) + if (/video/i.test(val)) { + $('#type').val(8); + if (val !== 'Video') { $this.val('Video'); } + } else { + $('#type').val(''); + } + }); + + + + + - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + - - - + + + + - - - - + + + + + + + - - + + + + © 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 73c56916..27e88888 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -50,17 +50,18 @@ /assets/css/jodit.css" rel="stylesheet" type="text/css" /> - - + + - - + + - - + + + + + - - @@ -83,8 +84,8 @@ - - + diff --git a/app/Views/layout/header_old_outdated.php b/app/Views/layout/header_old_outdated.php new file mode 100644 index 00000000..73c56916 --- /dev/null +++ b/app/Views/layout/header_old_outdated.php @@ -0,0 +1,2191 @@ + + + + + + + <?= isset($tab_name) ? $tab_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 2008a0ea2af162375ff8cd19f8080a3b5c87c12b Mon Sep 17 00:00:00 2001 From: velz Date: Tue, 27 Jan 2026 16:33:55 +0530 Subject: [PATCH 8/9] FIX_OUDaTED_COMP_2 --- app/Views/layout/header.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 27e88888..b5bfd6fa 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -84,8 +84,8 @@ - + + From 0479844b31734dfa0edf2a818b59d1ab75da2365 Mon Sep 17 00:00:00 2001 From: "sanjeev.p" Date: Tue, 27 Jan 2026 17:02:33 +0530 Subject: [PATCH 9/9] FIX_sanitizedpostdata --- app/Controllers/ClientController.php | 183 ++++++++++++------------- app/Controllers/EmployeeController.php | 37 ++++- app/Controllers/MasterController.php | 61 +++++---- 3 files changed, 152 insertions(+), 129 deletions(-) diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index a70782b5..e1223709 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -1980,8 +1980,8 @@ class ClientController extends AdminController $this->myLogger->logme('error', 'Client policy CREATE function called'); - $data = $this->request->getPost(); - $sanitized_post_data = sanitizeInputArrayAdvanced($data); + $request_post_data = $this->request->getPost(); + $$sanitized_post_data = sanitizeInputArrayAdvanced($request_post_data); $policy_type_id = $sanitized_post_data['policy_type_id']; $client_branch_id = $sanitized_post_data['client_branch_id']; @@ -1993,8 +1993,8 @@ class ClientController extends AdminController list($insurerBranchId, $insurerId) = explode('-', $insurerValue); - $data['insurer_branch_id'] = $insurerBranchId; - $data['insurer_id'] = $insurerId; + $sanitized_post_data['insurer_branch_id'] = $insurerBranchId; + $sanitized_post_data['insurer_id'] = $insurerId; $tpaValue = (string) $sanitized_post_data['tpa']; @@ -2006,72 +2006,63 @@ class ClientController extends AdminController } - $insert_data['client_id'] = $client_id; - $insert_data['tpa_branch_id'] = $tpaBranchId; - $insert_data['tpa_id'] = $tpaId; - $insert_data['policy_type_id'] = $sanitized_post_data['policy_type_id']; + $sanitized_post_data['client_id'] = $client_id; + $sanitized_post_data['tpa_branch_id'] = $tpaBranchId; + $sanitized_post_data['tpa_id'] = $tpaId; + $sanitized_post_data['policy_type_id'] = $sanitized_post_data['policy_type_id']; - $insert_data['no_of_lives'] = $sanitized_post_data['no_of_lives']; - $insert_data['policy_status'] = $sanitized_post_data['policy_status']; - $insert_data['no_of_employees'] = $sanitized_post_data['no_of_employees']; - $insert_data['earned_premium_date'] = change_date_format($sanitized_post_data['earned_premium_date'], 'd-m-Y', 'Y-m-d') ?? null; - $insert_data['claims_incurred_date'] = change_date_format($sanitized_post_data['claims_incurred_date'], 'd-m-Y', 'Y-m-d') ?? null; - $insert_data['incurred_claims_ratio'] = $sanitized_post_data['incurred_claims_ratio']; - $insert_data['no_lives_at_inception'] = $sanitized_post_data['no_lives_at_inception']; - $insert_data['premium_paid_at_inception'] = $sanitized_post_data['premium_paid_at_inception']; - $insert_data['claims_experience_for_last_3_years'] = $sanitized_post_data['claims_experience_for_last_3_years']; - $insert_data['earned_premium_amount'] = $sanitized_post_data['earned_premium_amount']; - $insert_data['claims_incurred_amount'] = $sanitized_post_data['claims_incurred_amount']; - $insert_data['base_policy'] = ($sanitized_post_data['base_policy'] === '' || $sanitized_post_data['base_policy'] == 0) ? null : $sanitized_post_data['base_policy']; - $insert_data['policy_status'] = 1; - $insert_data['inception_type'] = $sanitized_post_data['inception_type'] ? 2 : 1; - $insert_data['client_branch_id'] = $sanitized_post_data['client_branch_id']; - $insert_data['cd_ac_pk'] = $sanitized_post_data['cd_ac_no']; - $insert_data['gst'] = $sanitized_post_data['gst']; - $insert_data['disclaimer'] = $sanitized_post_data['disclaimer']; - $insert_data['is_member_modify_allowed'] = $sanitized_post_data['is_member_modify_allowed'] ? 1 : 0; - $insert_data['enrolment_visibility'] = $sanitized_post_data['enrolment_visibility'] ? 1 : 0; - $insert_data['is_lgbtq'] = $sanitized_post_data['is_lgbtq'] ? 1 : 0; - $insert_data['wellness_plan_id'] = $sanitized_post_data['wellness_plan_id']; - $insert_data['wellness_vendor_id'] = $sanitized_post_data['wellness_vendor_id']; - $insert_data['wellness_vendor_id'] = !empty($insert_data['wellness_vendor_id']) ? $insert_data['wellness_vendor_id'] : null; + + $sanitized_post_data['earned_premium_date'] = change_date_format($sanitized_post_data['earned_premium_date'], 'd-m-Y', 'Y-m-d') ?? null; + $sanitized_post_data['claims_incurred_date'] = change_date_format($sanitized_post_data['claims_incurred_date'], 'd-m-Y', 'Y-m-d') ?? null; + + $sanitized_post_dataa['base_policy'] = ($sanitized_post_data['base_policy'] === '' || $sanitized_post_data['base_policy'] == 0) ? null : $sanitized_post_data['base_policy']; + $sanitized_post_data['policy_status'] = 1; + $sanitized_post_data['inception_type'] = $sanitized_post_data['inception_type'] ? 2 : 1; + + + + + $sanitized_post_data['is_member_modify_allowed'] = $sanitized_post_data['is_member_modify_allowed'] ? 1 : 0; + $sanitized_post_data['enrolment_visibility'] = $sanitized_post_data['enrolment_visibility'] ? 1 : 0; + $sanitized_post_data['is_lgbtq'] = $sanitized_post_data['is_lgbtq'] ? 1 : 0; + $sanitized_post_data['wellness_vendor_id'] = !empty($sanitized_post_data['wellness_vendor_id']) ? $sanitized_post_data['wellness_vendor_id'] : null; if ($policy_type_id == 1 || $policy_type_id == 2 || $policy_type_id == 6 || $policy_type_id == 7) { - $insert_data['is_addon'] = 1; // Base Policy + $sanitized_post_data['is_addon'] = 1; // Base Policy } else if ($policy_type_id == 4 || $policy_type_id == 5) { - $insert_data['is_addon'] = 2; // SI TOPUP + $sanitized_post_data['is_addon'] = 2; // SI TOPUP } else if ($policy_type_id == 3) { if ($base_policy) { - $insert_data['is_addon'] = 3; // Dependent Addon + $sanitized_post_data['is_addon'] = 3; // Dependent Addon } else { - $insert_data['is_addon'] = 1; + $sanitized_post_data['is_addon'] = 1; } } - $insert_data['policy_start_date'] = change_date_format($sanitized_post_data['policy_start_date'], 'd-m-Y', 'Y-m-d'); - $insert_data['policy_end_date'] = change_date_format($sanitized_post_data['policy_end_date'], 'd-m-Y', 'Y-m-d'); - $insert_data['policy_no'] = $sanitized_post_data['policy_no']; - if ($insert_data['inception_type'] == 2) { - $insert_data['open_date'] = change_date_format($sanitized_post_data['open_date'], 'd-m-Y', 'Y-m-d'); - $insert_data['close_date'] = change_date_format($sanitized_post_data['close_date'], 'd-m-Y', 'Y-m-d'); + $sanitized_post_data['policy_start_date'] = change_date_format($sanitized_post_data['policy_start_date'], 'd-m-Y', 'Y-m-d'); + $sanitized_post_data['policy_end_date'] = change_date_format($sanitized_post_data['policy_end_date'], 'd-m-Y', 'Y-m-d'); + $sanitized_post_data['policy_no'] = $sanitized_post_data['policy_no']; + if ($sanitized_post_data['inception_type'] == 2) { + $sanitized_post_data['open_date'] = change_date_format($sanitized_post_data['open_date'], 'd-m-Y', 'Y-m-d'); + $sanitized_post_data['close_date'] = change_date_format($sanitized_post_data['close_date'], 'd-m-Y', 'Y-m-d'); // $data['reminder_date'] = change_date_format($this->request->getPost('reminder_date'), 'd-m-Y', 'Y-m-d'); - $insert_data['reminder_date'] = $sanitized_post_data['reminder_date']; + $sanitized_post_data['reminder_date'] = $sanitized_post_data['reminder_date']; } else { - $insert_data['open_date'] = null; - $insert_data['closedate'] = null; - $insert_data['reminder_date'] = null; + $sanitized_post_data['open_date'] = null; + $sanitized_post_data['closedate'] = null; + $sanitized_post_data['reminder_date'] = null; } - $insert_data['created_by'] = get_session_userid(); + $sanitized_post_data['created_by'] = get_session_userid(); - $insert = $this->clientPolicyModel->insert($insert_data); + $insert = $this->clientPolicyModel->insert($sanitized_post_data); if ($insert) { $clientPoliceData = $this->clientPolicyModel->getClientPolicyByClientId($sanitized_post_data['client_id']); $clientPoliceData['role'] = get_role_id(); @@ -2097,8 +2088,8 @@ class ClientController extends AdminController $insurerValue = (string) $sanitized_post_data['insurer']; list($insurerBranchId, $insurerId) = explode('-', $insurerValue); - $data['insurer_branch_id'] = $insurerBranchId; - $data['insurer_id'] = $insurerId; + $sanitized_post_data['insurer_branch_id'] = $insurerBranchId; + $sanitized_post_data['insurer_id'] = $insurerId; $tpaValue = (string) $sanitized_post_data['tpa']; if (!empty($tpaValue) || $tpaValue !== '') { @@ -2108,73 +2099,73 @@ class ClientController extends AdminController $tpaId = null; } - $update_data['tpa_branch_id'] = $tpaBranchId; - $update_data['client_id'] = $client_id; - $update_data['tpa_id'] = $tpaId; - $update_data['policy_type_id'] = $sanitized_post_data['policy_type_id']; - $update_data['policy_no'] = $sanitized_post_data['policy_no']; + $sanitized_post_data['tpa_branch_id'] = $tpaBranchId; + $sanitized_post_data['client_id'] = $client_id; + $sanitized_post_data['tpa_id'] = $tpaId; + $sanitized_post_data['policy_type_id'] = $sanitized_post_data['policy_type_id']; + $sanitized_post_data['policy_no'] = $sanitized_post_data['policy_no']; - $update_data['insured'] = $sanitized_post_data['insured']; - $update_data['no_of_lives'] = $sanitized_post_data['no_of_lives']; - $update_data['policy_status'] = $sanitized_post_data['policy_status']; - $update_data['no_of_employees'] = $sanitized_post_data['no_of_employees']; - $update_data['earned_premium_date'] = change_date_format($sanitized_post_data['earned_premium_date'], 'd-m-Y', 'Y-m-d') ?? null; - $update_data['claims_incurred_date'] = change_date_format($sanitized_post_data['claims_incurred_date'], 'd-m-Y', 'Y-m-d') ?? null; - $update_data['incurred_claims_ratio'] = $sanitized_post_data['incurred_claims_ratio']; - $update_data['no_lives_at_inception'] = $sanitized_post_data['no_lives_at_inception']; - $update_data['premium_paid_at_inception'] = $sanitized_post_data['premium_paid_at_inception']; - $update_data['claims_experience_for_last_3_years'] = $sanitized_post_data['claims_experience_for_last_3_years']; - $update_data['earned_premium_amount'] = $sanitized_post_data['earned_premium_amount']; - $update_data['claims_incurred_amount'] = $sanitized_post_data['claims_incurred_amount']; - $update_data['base_policy'] = ($sanitized_post_data['base_policy'] === '' || $sanitized_post_data['base_policy'] == 0) ? null : $sanitized_post_data['base_policy']; - $update_data['policy_status'] = 1; - $update_data['inception_type'] = $sanitized_post_data['inception_type'] ? 2 : 1; - $update_data['enrolment_visibility'] = $sanitized_post_data['enrolment_visibility'] ? 1 : 0; - $update_data['client_branch_id'] = $sanitized_post_data['client_branch_id']; - $update_data['cd_ac_pk'] = $sanitized_post_data['cd_ac_no']; - $update_data['gst'] = $sanitized_post_data['gst']; - $update_data['disclaimer'] = $sanitized_post_data['disclaimer']; - $update_data['policy_start_date'] = change_date_format($sanitized_post_data['policy_start_date'], 'd-m-Y', 'Y-m-d'); - $update_data['policy_end_date'] = change_date_format($sanitized_post_data['policy_end_date'], 'd-m-Y', 'Y-m-d'); - $update_data['is_member_modify_allowed'] = $sanitized_post_data['is_member_modify_allowed'] ? 1 : 0; - $update_data['is_lgbtq'] = $sanitized_post_data['is_lgbtq'] ? 1 : 0; - $update_data['wellness_plan_id'] = $sanitized_post_data['wellness_plan_id']; - $update_data['wellness_vendor_id'] = $sanitized_post_data['wellness_vendor_id']; - $update_data['wellness_vendor_id'] = !empty($update_data['wellness_vendor_id']) ? $update_data['wellness_vendor_id'] : null; + // $sanitized_post_data['insured'] = $sanitized_post_data['insured']; + $sanitized_post_data['no_of_lives'] = $sanitized_post_data['no_of_lives']; + $sanitized_post_data['policy_status'] = $sanitized_post_data['policy_status']; + $sanitized_post_data['no_of_employees'] = $sanitized_post_data['no_of_employees']; + $sanitized_post_data['earned_premium_date'] = change_date_format($sanitized_post_data['earned_premium_date'], 'd-m-Y', 'Y-m-d') ?? null; + $sanitized_post_data['claims_incurred_date'] = change_date_format($sanitized_post_data['claims_incurred_date'], 'd-m-Y', 'Y-m-d') ?? null; + $sanitized_post_data['incurred_claims_ratio'] = $sanitized_post_data['incurred_claims_ratio']; + $sanitized_post_data['no_lives_at_inception'] = $sanitized_post_data['no_lives_at_inception']; + $sanitized_post_data['premium_paid_at_inception'] = $sanitized_post_data['premium_paid_at_inception']; + $sanitized_post_data['claims_experience_for_last_3_years'] = $sanitized_post_data['claims_experience_for_last_3_years']; + $sanitized_post_data['earned_premium_amount'] = $sanitized_post_data['earned_premium_amount']; + $sanitized_post_data['claims_incurred_amount'] = $sanitized_post_data['claims_incurred_amount']; + $sanitized_post_data['base_policy'] = ($sanitized_post_data['base_policy'] === '' || $sanitized_post_data['base_policy'] == 0) ? null : $sanitized_post_data['base_policy']; + $sanitized_post_data['policy_status'] = 1; + $sanitized_post_data['inception_type'] = $sanitized_post_data['inception_type'] ? 2 : 1; + $sanitized_post_data['enrolment_visibility'] = $sanitized_post_data['enrolment_visibility'] ? 1 : 0; + $sanitized_post_data['client_branch_id'] = $sanitized_post_data['client_branch_id']; + $sanitized_post_data['cd_ac_pk'] = $sanitized_post_data['cd_ac_no']; + $sanitized_post_data['gst'] = $sanitized_post_data['gst']; + $sanitized_post_data['disclaimer'] = $sanitized_post_data['disclaimer']; + $sanitized_post_data['policy_start_date'] = change_date_format($sanitized_post_data['policy_start_date'], 'd-m-Y', 'Y-m-d'); + $sanitized_post_data['policy_end_date'] = change_date_format($sanitized_post_data['policy_end_date'], 'd-m-Y', 'Y-m-d'); + $sanitized_post_data['is_member_modify_allowed'] = $sanitized_post_data['is_member_modify_allowed'] ? 1 : 0; + $sanitized_post_data['is_lgbtq'] = $sanitized_post_data['is_lgbtq'] ? 1 : 0; + $sanitized_post_data['wellness_plan_id'] = $sanitized_post_data['wellness_plan_id']; + $sanitized_post_data['wellness_vendor_id'] = $sanitized_post_data['wellness_vendor_id']; + $sanitized_post_data['wellness_vendor_id'] = !empty($sanitized_post_data['wellness_vendor_id']) ? $sanitized_post_data['wellness_vendor_id'] : null; - if ($update_data['inception_type'] == 2) { - $update_data['open_date'] = change_date_format($sanitized_post_data['open_date'], 'd-m-Y', 'Y-m-d'); - $update_data['close_date'] = change_date_format($sanitized_post_data['close_date'], 'd-m-Y', 'Y-m-d'); - // $data['reminder_date'] = change_date_format($sanitized_post_data['reminder_date'), 'd-m-Y', 'Y-m-d'); - $update_data['reminder_date'] = $sanitized_post_data['reminder_date']; + if ($sanitized_post_data['inception_type'] == 2) { + $sanitized_post_data['open_date'] = change_date_format($sanitized_post_data['open_date'], 'd-m-Y', 'Y-m-d'); + $sanitized_post_data['close_date'] = change_date_format($sanitized_post_data['close_date'], 'd-m-Y', 'Y-m-d'); + // $sanitized_post_data['reminder_date'] = change_date_format($sanitized_post_data['reminder_date'), 'd-m-Y', 'Y-m-d'); + $sanitized_post_data['reminder_date'] = $sanitized_post_data['reminder_date']; } else { - $update_data['open_date'] = null; - $update_data['close_date'] = null; - $update_data['reminder_date'] = null; + $sanitized_post_data['open_date'] = null; + $sanitized_post_data['close_date'] = null; + $sanitized_post_data['reminder_date'] = null; } if ($policy_type_id == 1 || $policy_type_id == 2 || $policy_type_id == 6 || $policy_type_id == 7) { - $update_data['is_addon'] = 1; // Base Policy + $sanitized_post_data['is_addon'] = 1; // Base Policy } else if ($policy_type_id == 4 || $policy_type_id == 5) { - $update_data['is_addon'] = 2; // SI TOPUP + $sanitized_post_data['is_addon'] = 2; // SI TOPUP } else if ($policy_type_id == 3) { if ($base_policy) { - $update_data['is_addon'] = 3; // Dependent Addon + $sanitized_post_data['is_addon'] = 3; // Dependent Addon } else { - $update_data['is_addon'] = 1; + $sanitized_post_data['is_addon'] = 1; } } $policy_terms = $this->clientPolicyModel->where('id', $sanitized_post_data['base_policy'])->first(); $old_client_policy_data = $this->clientPolicyModel->where('is_active', 1)->where('id', $id)->first(); - $update_data['updated_by'] = get_session_userid(); - $update = $this->clientPolicyModel->update($id, $update_data); + $sanitized_post_data['updated_by'] = get_session_userid(); + $update = $this->clientPolicyModel->update($id, $sanitized_post_data); if ($update) { diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index 41eef6df..45650b81 100755 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -1108,7 +1108,39 @@ class EmployeeController extends AdminController try { - $filePath = WRITEPATH . '/uploads/excel/' . $file_name['file_name']; + if (!$file_name) { + return $this->respond([ + 'dataStatus' => false, + 'code' => 200, + 'data' => '
No Data Found
', + 'file_data' => null + ], 200); + } + + $filePath = WRITEPATH . 'uploads/excel/' . $file_name['file_name']; + + // ✅ File not exists on disk + if (!file_exists($filePath)) { + return $this->respond([ + 'dataStatus' => false, + 'code' => 200, + 'data' => '
No Data Found
', + 'file_data' => $file_name + ], 200); + } + + + $excel_data = $empDataServiceController->readExcelFileToArray($filePath); + + // ✅ Excel empty or header only + if (empty($excel_data) || count($excel_data) <= 1) { + return $this->respond([ + 'dataStatus' => false, + 'code' => 200, + 'data' => '
No Data Found
', + 'file_data' => $file_name + ], 200); + } if (file_exists($filePath)) { @@ -1144,8 +1176,7 @@ class EmployeeController extends AdminController $errorMessage = 'Error occurred:' . PHP_EOL . json_encode($errorData, JSON_PRETTY_PRINT); $this->myLogger->logme('error', $errorMessage); - $html = '
No Data Found
'; - return $this->respond(['dataStatus' => false, 'code' => 500, 'data' => $html, 'file_data' => $file_name], 500); + return $this->respond(['dataStatus' => false, 'code' => 500, 'data' => '
Something went wrong
', 'file_data' => $file_name ?? null], 500); } } diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index e645daf2..c5f27862 100755 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -320,15 +320,16 @@ class MasterController extends AdminController $uploadFilePath = ROOTPATH . 'public/uploads/logo/'; $file_name = file_Upload($this->request->getFile('insurer_logo'), $uploadFilePath); $data = $this->request->getPost(); + print_r($data);die; $sanitized_post_data = sanitizeInputArrayAdvanced($data); - $insert_data['addition_add_day'] = (!empty($sanitized_post_data['addition_add_day'])) ? 1 : 0; - $insert_data['deletion_add_day'] = (!empty($sanitized_post_data['deletion_add_day'])) ? 1 : 0; - $insert_data['is_multi_event'] = (!empty($sanitized_post_data['is_multi_event'])) ? 1 : 0; - $insert_data['created_by'] = get_session_userid(); - $insert_data['insurer_logo'] = $file_name; + $sanitized_post_data['addition_add_day'] = (!empty($sanitized_post_data['addition_add_day'])) ? 1 : 0; + $sanitized_post_data['deletion_add_day'] = (!empty($sanitized_post_data['deletion_add_day'])) ? 1 : 0; + $sanitized_post_data['is_multi_event'] = (!empty($sanitized_post_data['is_multi_event'])) ? 1 : 0; + $sanitized_post_data['created_by'] = get_session_userid(); + $sanitized_post_data['insurer_logo'] = $file_name; - $insert = $this->insurerModel->insert($insert_data); + $insert = $this->insurerModel->insert($sanitized_post_data); if($insert){ $insurer_data = $this->insurerModel->where(['id' => $insert, 'is_active' => 1])->first(); @@ -537,19 +538,19 @@ class MasterController extends AdminController $sanitized_post_data = sanitizeInputArrayAdvanced($data); $id = $sanitized_post_data['PrimaryKey']; - $update_data['addition_add_day'] = (!empty($sanitized_post_data['addition_add_day'])) ? 1 : 0; - $update_data['deletion_add_day'] = (!empty($sanitized_post_data['deletion_add_day'])) ? 1 : 0; - $update_data['is_multi_event'] = (!empty($sanitized_post_data['is_multi_event'])) ? 1 : 0; - $update_data['updated_by'] = get_session_userid(); + $sanitized_post_data['addition_add_day'] = (!empty($sanitized_post_data['addition_add_day'])) ? 1 : 0; + $sanitized_post_data['deletion_add_day'] = (!empty($sanitized_post_data['deletion_add_day'])) ? 1 : 0; + $sanitized_post_data['is_multi_event'] = (!empty($sanitized_post_data['is_multi_event'])) ? 1 : 0; + $sanitized_post_data['updated_by'] = get_session_userid(); if(!empty($file_name)){ - $update_data['insurer_logo'] = $file_name; + $sanitized_post_data['insurer_logo'] = $file_name; } - $update = $this->insurerModel->update($id,$update_data); + $update = $this->insurerModel->update($id,$sanitized_post_data); if($update){ - echo json_encode(array("status" => true , 'data' => $data)); + echo json_encode(array("status" => true , 'data' => $sanitized_post_data)); }else{ echo json_encode(array("status" => false)); } @@ -922,13 +923,13 @@ class MasterController extends AdminController $eCardTemplate = $sanitized_post_data['ecard_content']; - $insert_data['created_by'] = get_session_userid(); - $insert_data['tpa_logo'] = $file_name; - $insert_data['front_card'] = $front_card_file_name; - $insert_data['back_card'] = $back_card_file_name; - $insert_data['network_hospitals'] = $sanitized_post_data['network_hospitals']; + $sanitized_post_data['created_by'] = get_session_userid(); + $sanitized_post_data['tpa_logo'] = $file_name; + $sanitized_post_data['front_card'] = $front_card_file_name; + $sanitized_post_data['back_card'] = $back_card_file_name; + $inssanitized_post_dataert_data['network_hospitals'] = $sanitized_post_data['network_hospitals']; - $insert = $this->tpaModel->insert($insert_data); + $insert = $this->tpaModel->insert($sanitized_post_data); $tpa_name = (string) $sanitized_post_data['name']; $short_name = (string) $sanitized_post_data['short_name']; @@ -1211,22 +1212,22 @@ class MasterController extends AdminController $id = $sanitized_post_data['PrimaryKey']; - $update_data['updated_by'] = get_session_userid(); + $sanitized_post_data['updated_by'] = get_session_userid(); if(!empty($file_name)){ - $update_data['tpa_logo'] = $file_name; + $sanitized_post_data['tpa_logo'] = $file_name; } if(!empty($front_card_file_name)){ - $update_data['front_card'] = $front_card_file_name; + $sanitized_post_data['front_card'] = $front_card_file_name; } if(!empty($back_card_file_name)){ - $update_data['back_card'] = $back_card_file_name; + $sanitized_post_data['back_card'] = $back_card_file_name; } - $update_data['network_hospitals'] = $sanitized_post_data['network_hospitals']; - $update = $this->tpaModel->update($id,$update_data); + $sanitized_post_data['network_hospitals'] = $sanitized_post_data['network_hospitals']; + $update = $this->tpaModel->update($id,$sanitized_post_data); $tpa_name = (string) $sanitized_post_data['name']; @@ -1258,7 +1259,7 @@ class MasterController extends AdminController if($update){ - echo json_encode(array("status" => true , 'data' => $update_data)); + echo json_encode(array("status" => true , 'data' => $sanitized_post_data)); }else{ echo json_encode(array("status" => false)); } @@ -2196,10 +2197,10 @@ class MasterController extends AdminController // CD Account Details // ====================== 'opening_date' => [ - 'rules' => 'required|valid_date[Y-m-d]', + 'rules' => 'required|valid_date[d-m-Y]', 'errors' => [ 'required' => 'Opening date is required', - 'valid_date' => 'Opening date must be in YYYY-MM-DD format' + 'valid_date' => 'Opening date must be in DD-MM-YYYY format' ] ], @@ -2377,10 +2378,10 @@ class MasterController extends AdminController // CD Account Details // ====================== 'opening_date' => [ - 'rules' => 'required|valid_date[Y-m-d]', + 'rules' => 'required|valid_date[d-m-Y]', 'errors' => [ 'required' => 'Opening date is required', - 'valid_date' => 'Opening date must be in YYYY-MM-DD format' + 'valid_date' => 'Opening date must be in DD-MM-YYYY format' ] ],