diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php index cff84df8..4a4e9faf 100755 --- a/app/Controllers/EmpDataServiceController.php +++ b/app/Controllers/EmpDataServiceController.php @@ -2230,7 +2230,7 @@ class EmpDataServiceController extends BaseController //send ecard mail if the event is tpa only if ($file['insurer_or_tpa'] == 'tpa') { - if ($get_policy_type['policy_type_id'] != 1) { + if (in_array($get_policy_type['policy_type_id'], [2, 3])) { // generate e-card and store S3 $r = Jobs::addJob(['job_name' => 'bulkGenerateEcardAndStoreinS3', 'payload' => ['client_policy_id' => $client_policy_id]]); @@ -2646,7 +2646,7 @@ class EmpDataServiceController extends BaseController 'status' => $status_val, ]); - if($client_policy_data['policy_type_id'] != 1){ + if(in_array($client_policy_data['policy_type_id'], [2, 3])){ // re-generate e-card and store S3 $r = Jobs::addJob(['job_name' => 'bulkGenerateEcardAndStoreinS3', 'payload' => ['client_policy_id' => $client_policy_id]]); } diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index ed66382e..8baab690 100755 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -485,7 +485,17 @@ class EmployeeController extends AdminController } public function getExcelFileErrors($file_id, $retun_type = null) - { + { + + $file_data = $this->fileModel->where('id', $file_id)->first(); + $error = json_decode($file_data['reason'] ?? '{}', true); + if(!empty($error) && $retun_type == 'api'){ + $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); + } + } + // $file_id = $this->request->uri->getSegment(3); $empServiceController = new EmployeeServiceController(); diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php index 1dbe0636..da6e50ec 100644 --- a/app/Controllers/TicketController.php +++ b/app/Controllers/TicketController.php @@ -1151,9 +1151,9 @@ class TicketController extends BaseController 'errors' => ['required' => 'Employee Email is required'] ], - 'client_name' => [ + 'client_id' => [ 'rules' => 'required', - 'errors' => ['required' => 'Client Name is required'] + 'errors' => ['required' => 'Client ID is required'] ], 'insurer_id' => [