From 49e179eed4e082514904436edb2b7972e7aa155d Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Tue, 27 Jan 2026 10:43:24 +0530
Subject: [PATCH 1/2] FIX_LIVE_ISSUE

---
 app/Controllers/EmployeeRestController.php |  2 ++
 app/Helpers/utility_helper.php             | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index e90be33..ee4a9ca 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -4472,6 +4472,8 @@ class EmployeeRestController extends AdminController
             ->join('client_policy', 'employee_polices.client_policy_id = client_policy.id')
             ->where([
                 'employees.is_active'              => 1,
+                'employees.emp_status'             => 'draft',
+                'employee_polices.status'          => 'draft',
                 'employee_polices.is_active'       => 1,
                 'client_policy.policy_type_id'     => 2,
                 'employees.family_floater_key'     => 'self',
diff --git a/app/Helpers/utility_helper.php b/app/Helpers/utility_helper.php
index e1b8a9b..5a91892 100755
--- a/app/Helpers/utility_helper.php
+++ b/app/Helpers/utility_helper.php
@@ -557,7 +557,7 @@ if (!function_exists('change_date_format')) {
                 $date = DateTime::createFromFormat($source_format, $date_str);
                 if (!$date) {
                     // throw new Exception("Invalid date string for source format: $source_format");
-                    log_message('error', "❌ Date format error : Invalid date string | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}");
+                    // log_message('error', "❌ Date format error : Invalid date string | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}");
                     return null;
                 }
                 return $date->format($output_format);
@@ -568,7 +568,7 @@ if (!function_exists('change_date_format')) {
                 $date = DateTime::createFromFormat($source_format, $date_str);
                 if (!$date) {
                     // throw new Exception("Invalid date string for source format: $source_format");
-                    log_message('error', "❌ Date format error : Invalid date string | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}");
+                    // log_message('error', "❌ Date format error : Invalid date string | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}");
                     return null;
                 }
                 return $date->format('Y-m-d'); // MySQL default format
@@ -585,15 +585,15 @@ if (!function_exists('change_date_format')) {
                 // If no format matches, throw an exception
                 $allowed_placeholders = implode(', ', $allowed_formats);
                 // throw new Exception("Invalid date string format. Allowed formats: $allowed_placeholders");
-                log_message(
-                    'error',
-                    "❌ Date format error: Invalid date string. Allowed formats: {$allowed_placeholders} | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}"
-                );
+                // log_message(
+                //     'error',
+                //     "❌ Date format error: Invalid date string. Allowed formats: {$allowed_placeholders} | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}"
+                // );
                 return null;
             }
         } catch (Exception $e) {
             // return "Error: " . $e->getMessage();
-            log_message('error', "❌ Date format error: {$e->getMessage()} | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}");
+            // log_message('error', "❌ Date format error: {$e->getMessage()} | Params => date_str: {$date_str}, source_format: {$source_format}, output_format: {$output_format}");
             return null;
         }
 

From 4a409692e680ad4d320cdef6d72639d71b67bea6 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Tue, 27 Jan 2026 11:08:33 +0530
Subject: [PATCH 2/2] FIX_ISSUES

---
 app/Controllers/EmployeeController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 8b9785d..936d914 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -500,7 +500,7 @@ class EmployeeController extends AdminController
         }
     }
 
-    public function getExcelFileErrors($file_id, $retun_type)
+    public function getExcelFileErrors($file_id, $retun_type = null)
     {
         // $file_id = $this->request->uri->getSegment(3);
         $empServiceController = new EmployeeServiceController();