From 0ac07c331e660d7417e057f21d8a177c171cb177 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Wed, 4 Feb 2026 12:23:50 +0530
Subject: [PATCH] FIX_ISSUE

---
 app/Controllers/EmployeeController.php     | 20 ++++++++++++++++++--
 app/Controllers/EmployeeRestController.php |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 6de0b0a..17bd959 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -517,10 +517,26 @@ class EmployeeController extends AdminController
 
         $file_data = $this->fileModel->where('id', $file_id)->first();
         $error = json_decode($file_data['reason'] ?? '{}', true);
-        if(!empty($error) && $retun_type == 'api'){
+        if(!empty($error) && $retun_type == 'api' && $file_data['status'] == 'failed'){
             $send = isset($error['error_summary'][5]) || isset($error['error_summary'][6]) ? true : false;
             if($send){
-                return $this->respond(['status' => false, 'code' => 404,  'message' => $error['error_data'] ?? 'System error', 'data' => []], 200);
+
+                $string = $error['error_data'] ?? 'System error';
+
+                $errorMap = [
+                    "Column order conflict" => "Invalid file format. Please use the sample file.",
+                ];
+
+                $message = $string; // Default to the original error
+
+                foreach ($errorMap as $keyword => $friendlyMessage) {
+                    if (strpos($string, $keyword) !== false) {
+                        $message = $friendlyMessage;
+                        break; // Stop looking once we find a match
+                    }
+                }
+
+                return $this->respond(['status' => false, 'code' => 404,  'message' => $message, 'data' => []], 200);
             }
         }
 
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index fbf7ce0..aa7cd9e 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -846,7 +846,7 @@ class EmployeeRestController extends AdminController
             $responce = $employeeController->employeesUplodWithEvents($post_data);
             // print_r($responce); die;
 
-            return $responce;
+            return $this->respond($responce, 200);
 
             // if(!$responce['status']){
             //     $file_data = $this->getDataFromFilesTable(['file_id' => $responce['file_id']]);