'; var_dump($excel_columns);
+ //check no of columns in excel
+ $total_defined_columns = count($columns_to_check);
+ $excel_columns_count = count($excel_columns);
+
+ if($total_defined_columns != $excel_columns_count)
+ {
+ //columns count mismatch
+ $message = "File columns count mismatch. Expected - $total_defined_columns and received - $excel_columns_count";
+ $this->myLogger->logme('error',($message . ' for file id ' . $file_id));
+ $this->bdsDumpModel->where('id', $file_id)->set(['status' => 'failed','reason' => json_encode(['error_summary' => array_count_values([5]),'error_data' => $message])])->update();
+ return array('error_summary' => [5], 'error_data' => $message);
+ }
+
+ //check columns order in excel
+ $column_count_res = check_columns_name($columns_to_check, $excel_columns);
+
+ if(isset($column_count_res) && count($column_count_res))
+ {
+ //columns count mismatch
+ $message = implode("\n", $column_count_res);
+ $this->myLogger->logme('error',($message . ' for file id ' . $file_id));
+ $this->bdsDumpModel->where('id', $file_id)->set(['status' => 'failed','reason' => json_encode(['error_summary' => array_count_values([6]), 'error_data' => $message])])->update();
+ return array('error_summary' => [6], 'error_data' => $message);
+ }
+
+ //Store the error data by this structure
+ $result = ['error_type' => 1, 'error_summary' => [], 'error_data' => []];
+
+ $insurer_data = $this->insurerModel->where('is_active', 1)->findAll();
+ $insurer_branch_data = $this->insurerBranchModel->where('is_active', 1)->findAll();
+ $pt_data = $this->policyTransactionModel->where('is_active', 1)->findAll();
+ $user_data = $this->userModel->where('is_active', 1)->findAll();
+ $agent_data = db_connect()->table('partner_agent')->where('is_active', 1)->get()->getResultArray();
+ $rto_master = db_connect()->table('rto_master')->where('is_active', 1)->get()->getResultArray();
+ $vehicle_type = db_connect()->table('vehicle_type')->where('is_active', 1)->get()->getResultArray();
+ $nhance_branch_data = db_connect()->table('nhance_branch')->where('is_active', 1)->get()->getResultArray();
+
+
+ //remove header
+ unset($excel_data[0]);
+
+ try {
+ foreach ($excel_data as $row_key => $row) {
+
+ //avoid empty rows
+ if (check_row_is_empty_or_null($row)) {
+ break;
+ }
+
+ $insurers = [];
+ foreach ($row as $col_key => $col)
+ {
+ $is_mandatory = $columns_to_check[$keys[$col_key]]['is_mandatory'];
+ $format = $columns_to_check[$keys[$col_key]]['format'];
+ $data_type = $columns_to_check[$keys[$col_key]]['data_type'];
+ $allowed_values = $columns_to_check[$keys[$col_key]]['allowed_values'];
+ $custom_function = isset($columns_to_check[$keys[$col_key]]['custom']) ? $columns_to_check[$keys[$col_key]]['custom'] : null;
+ $binding_params = isset($columns_to_check[$keys[$col_key]]['params']) ? $columns_to_check[$keys[$col_key]]['params'] : null;
+
+ $column_dispaly_name = $columns_to_check[$keys[$col_key]]['col_name'];
+ $column_index = $columns_to_check[$keys[$col_key]]['col_idx'];
+ $column_cell = $columns_to_check[$keys[$col_key]]['col_cell_name'];
+
+
+ //mandatory check
+ if(is_bool($is_mandatory) && $is_mandatory === true)
+ {
+ if($col == "" || $col == NULL)
+ {
+ array_push($result['error_summary'],1); //push error code for summary
+ $result['error_data'][$row_key][$keys[$col_key]]['col_name'] = $column_dispaly_name; //push column name
+ $result['error_data'][$row_key][$keys[$col_key]]['col_idx'] = $column_index; //push column index
+ $result['error_data'][$row_key][$keys[$col_key]]['error'][] = 'Value is mandatory'; //push exact error desc
+ }
+ }
+
+ //format check
+ if(isset($format))
+ {
+ $validation = validate_excel_value($col, $data_type, $format, $allowed_values);
+ if (!$validation['status']) {
+ array_push($result['error_summary'], 2);
+
+ $result['error_data'][$row_key][$keys[$col_key]]['col_name'] = $column_dispaly_name;
+ $result['error_data'][$row_key][$keys[$col_key]]['col_idx'] = $column_index;
+ $result['error_data'][$row_key][$keys[$col_key]]['error'][] = $validation['error'];
+ }
+ }
+
+ //allowed values check
+ if(($is_mandatory === true && isset($allowed_values) && is_array($allowed_values)) || (is_array($is_mandatory) && (isset($allowed_values) && is_array($allowed_values))))
+ {
+ if(!in_array((trim($col)),$allowed_values))
+ {
+ array_push($result['error_summary'],3);
+ $result['error_data'][$row_key][$keys[$col_key]]['col_name'] = $column_dispaly_name; //push column name
+ $result['error_data'][$row_key][$keys[$col_key]]['col_idx'] = $column_index; //push column index
+ $result['error_data'][$row_key][$keys[$col_key]]['error'][] = "Value not allowed: Expected ".implode(",",$allowed_values)." and received $col";
+ }
+ }
+
+ //custom function check
+ if(isset($custom_function))
+ {
+ //convert string params into PHP variables
+ // Create an array of variables to pass custom helper funcitons
+ $param_values = [];
+ foreach($binding_params as $bkey => $bparam) { $param_values[] = ($$bparam); }
+ $res = call_user_func_array($custom_function,$param_values);
+ if($res['status'] === false) {
+ array_push($result['error_summary'],4);
+ $result['error_data'][$row_key][$keys[$col_key]]['col_name'] = $column_dispaly_name; //push column name
+ $result['error_data'][$row_key][$keys[$col_key]]['col_idx'] = $column_index; //push column index
+ $result['error_data'][$row_key][$keys[$col_key]]['error'][] = $res['error'];
+ }
+
+ if($res['status'] == true && isset($res['insurer'])){
+ $insurers = $res['insurer'];
+ }
+
+ }
+
+ }//col foreach
+
+ }
+ } catch (\Exception $e) {
+ $errorDetails = [
+ 'error_message' => $e->getMessage(),
+ 'file' => $e->getFile(),
+ 'line' => $e->getLine(),
+ 'stack_trace' => $e->getTraceAsString(),
+ ];
+ $message = "Contact system admin";
+ $this->bdsDumpModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([5]), 'error_data' => $message])])->update();
+ $this->myLogger->logme("error", 'Claim dump file format validation failed due to : ' . json_encode($errorDetails ?? []));
+ return $errorDetails;
+ }
+
+ // return $result;
+
+ if (isset($result['error_summary']) && count($result['error_summary'])) {
+ $result['error_summary'] = array_count_values($result['error_summary']);
+ $status = 'failed';
+ $failure_reason = ((json_encode($result)));
+ $this->bdsDumpModel->where('id', $file_id)->set(['status' => $status, 'reason' => $failure_reason])->update();
+ $this->myLogger->logme("error", '{file_id} uploaded failed', ['file_id' => $file_id]);
+ } else { //trigger next data validation via job queue server
+ //proceed next data level validation in JOB queue
+ $r = Jobs::addJob(['job_name' => 'insertBulkBdsData', 'payload' => ['file_id' => $file_id]]);
+ // $response = $this->insertBulkBdsData(['file_id' => $file_id]);
+ }
+
+ return $result;
+ }
+
+ public function insertBulkBdsData($params)
+ {
+ helper('excel_util_helper');
+ $file_id = $params['file_id'];
+ $file = $this->bdsDumpModel->where("id", $file_id)->first();
+
+ $return = [];
+ if (empty($file)) {
+ return array('status' => false, 'message' => 'File not found in Database');
+ }
+
+ $file_name_with_path = WRITEPATH . "/uploads/bds_dump_excel/" . $file['file_name'];
+
+ //check physical file exist
+ if (!file_exists($file_name_with_path)) {
+ $message = "Physcial file not found";
+ $this->myLogger->logme('error', ($message . ' for file id : ' . $file_id));
+ $this->bdsDumpModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([5]), 'error_data' => $message])])->update();
+ return array('error_summary' => [5], 'error_data' => $message);
+ }
+
+ // get the BDS dump excel colums
+ $columns_to_check = $this->bds_bulk_upload_excel_file_column;
+ $keys = array_keys($columns_to_check);
+ $allowedHighestColumn = end($columns_to_check);
+
+ // Read the excel file
+ $excel_data = $this->extractExcelData($file['file_name'], $allowedHighestColumn['col_cell_name']);
+ $excel_columns = ($excel_data[0]);
+
+ //remove header
+ unset($excel_data[0]);
+ // dd($excel_data);
+
+ //Store the error data by this structure
+ $result = ['error_type' => 1, 'error_summary' => [], 'error_data' => []];
+
+ $client_data = $this->clientModel->where('is_active', 1)->where('client_type', 1)->findAll();
+ $insurer_data = $this->insurerModel->where('is_active', 1)->findAll();
+ $insurer_branch_data = $this->insurerBranchModel->where('is_active', 1)->findAll();
+ $vehicle_data = $this->vehicleModel->where('is_active', 1)->findAll();
+ $user_data = $this->userModel->where('is_active', 1)->findAll();
+ $agent_data = db_connect()->table('partner_agent')->where('is_active', 1)->get()->getResultArray();
+ $rto_master = db_connect()->table('rto_master')->where('is_active', 1)->get()->getResultArray();
+ $vehicle_type_data = db_connect()->table('vehicle_type')->where('is_active', 1)->get()->getResultArray();
+ $nhance_branch_data = db_connect()->table('nhance_branch')->where('is_active', 1)->get()->getResultArray();
+
+ try {
+
+ $pt_ids = [];
+ foreach ($excel_data as $row_key => $row) {
+
+ //avoid empty rows
+ if (check_row_is_empty_or_null($row)) {
+ break;
+ }
+
+ $vehicle_number = trim($row[2]);
+ $vehicle_type = trim($row[3]);
+ $client_name = trim($row[5]);
+ $client_email = trim($row[6]);
+
+ $insurer_short_name = trim($row[7]);
+ $insurer_branch_code = trim($row[8]);
+ $salse_generated_by = trim($row[13]);
+ $serviced_by = trim($row[14]);
+ $agent_code = trim($row[15]);
+ $nhance_branch = trim($row[1]);
+
+ $policy_no = trim($row[4]);
+ $policy_issue_date = trim($row[9]);
+ $policy_start_date = trim($row[10]);
+ $policy_end_date = trim($row[11]);
+ $revenue_type = trim($row[12]);
+
+ $base_premium = trim($row[16]);
+ $non_commission_premium_amount = trim($row[17]);
+ $tp_premium = trim($row[18]);
+ $igst = trim($row[19]);
+ $cgst = trim($row[20]);
+ $sgst = trim($row[21]);
+ $stamp_duty = trim($row[22]);
+ $total = trim($row[23]);
+ $agreed_amount = trim($row[24]);
+ $agreed_bp_percentage = trim($row[25]);
+ $agreed_tp_percentage = trim($row[26]);
+ $actual_bp_amount = trim($row[27]);
+ $actual_tp_amount = trim($row[28]);
+ $actual_bp_percentage = trim($row[29]);
+ $actual_tp_percentage = trim($row[30]);
+ $actual_bp_brokerage_amount = trim($row[31]);
+ $actual_tp_brokerage_amount = trim($row[32]);
+ $expected_amount = trim($row[33]);
+ $rewards = trim($row[34]);
+
+ $current_insurer_data = check_insurer_exist($row, $insurer_data)['insurer'] ?? null;
+ $current_insurer_branch_data = check_insurer_branch_exist($row, $insurer_branch_data, $current_insurer_data)['branch'] ?? null;
+
+ $current_nhance_branch = check_nhance_branch($row, $nhance_branch_data)['branch'] ?? null;
+ $current_agent_data = check_agent_exist($row, $agent_data)['agent'] ?? null;
+
+ $salse = check_user_exist($row, 13, $user_data)['user'] ?? null;
+ $service = check_user_exist($row, 14, $user_data)['user'] ?? null;
+
+ $gst_amt = calculate_gst_amount($row) ?? null;
+
+ // get the client and vehicle id
+ $vehicle_and_client_ids = $this->getClientAndVehicleId($row, $vehicle_data, $client_data, $rto_master, $vehicle_type_data);
+ $vehicle_id = $vehicle_and_client_ids['vehicle_id'] ?? null;
+ $client_id = $vehicle_and_client_ids['client_id'] ?? null;
+
+ $policy_transaction_data = [
+
+ 'issuer' => 2,
+ 'issuer_branch' => $current_nhance_branch['id'] ?? null,
+ 'client_id' => $client_id,
+ 'policy_type_id' => 8,
+ 'insurer_id' => $current_insurer_branch_data['insurer_id'] ?? null,
+ 'insurer_branch_id' => $current_insurer_branch_data['id'] ?? null,
+ 'policy_no' => $policy_no,
+ 'vehicle_id' => $vehicle_id,
+ 'issue_type' => 1,
+ 'policy_issue_date' => change_date_format($policy_issue_date, 'd/M/Y', 'Y-m-d'),
+ 'policy_start_date' => change_date_format($policy_start_date, 'd/M/Y', 'Y-m-d'),
+ 'policy_end_date' => change_date_format($policy_end_date, 'd/M/Y', 'Y-m-d'),
+ 'action_type' => 'inception',
+ 'revenue_type' => $revenue_type,
+ 'co_share' => 0,
+ 'status' => 'completed',
+ 'renewal_date' => change_date_format($policy_end_date, 'd/M/Y', 'Y-m-d'),
+ 'policy_holder_name' => $client_name,
+ 'month' => change_date_format($policy_issue_date, 'd/M/Y', 'Y-m-d'),
+ 'sales_generated_by' => $salse['id'] ?? null,
+ 'serviced_by' => $service['id'] ?? null,
+ 'agent_id' => $current_agent_data['id'] ?? null,
+ 'agent_code' => $current_agent_data['agent_code'] ?? null,
+ 'file_id' => $params['file_id'],
+
+ 'endorsement_no' => null,
+ 'client_branch_id' => null,
+ 'client_policy_id' => null,
+ 'ct_type' => null,
+ 'remarks' => null,
+
+ ];
+
+ $co_share_data = [
+
+ 'pt_id' => null,
+ 'insurer_id' => $current_insurer_branch_data['insurer_id'] ?? null,
+ 'insurer_branch_id' => $current_insurer_branch_data['id'] ?? null,
+ 'co_share_type' => 1,
+ 'co_share_per' => 100,
+
+ 'bp_amt' => $base_premium,
+ 'bp_gst_amt' => $gst_amt,
+ 'bp_igst' => $igst ,
+ 'bp_sgst' => $sgst,
+ 'bp_cgst' => $cgst,
+
+ 'tp_amt' => $tp_premium,
+ 'tp_gst_amt' => 0,
+ 'tp_igst' => 0,
+ 'tp_sgst' => 0,
+ 'tp_cgst' => 0,
+
+ 'tep_amt' => 0,
+ 'tep_gst_amt' => 0,
+ 'tep_igst' => 0,
+ 'tep_sgst' => 0,
+ 'tep_cgst' => 0,
+
+ 'agreed_amt' => $agreed_amount,
+ 'agreed_bp_per' => $agreed_bp_percentage,
+ 'agreed_tp_per' => $agreed_tp_percentage,
+ 'agreed_tep_per' => 0,
+
+ 'actual_bp_amt' => $actual_bp_amount,
+ 'actual_tp_amt' => $actual_tp_amount,
+ 'actual_tep_amt' => 0,
+
+ 'actual_bp_per' => $actual_bp_percentage,
+ 'actual_tp_per' => $actual_tp_percentage,
+ 'actual_tep_per' => 0,
+
+ 'actual_bp_brokerage_amt' => $actual_bp_brokerage_amount,
+ 'actual_tp_brokerage_amt' => $actual_tp_brokerage_amount,
+ 'actual_tep_brokerage_amt' => 0,
+
+ 'standerd_bp_per' => 15.00,
+ 'standerd_tp_per' => 2.50,
+ 'agreed_tep_per' => 0,
+
+ 'reward' => $rewards,
+ 'variance' => 0,
+
+ 'remark' => null,
+ 'amount' => $total,
+ 'stamp_duty' => $stamp_duty,
+
+ 'cop_amt' => $base_premium,
+ 'cotp_amt' => $tp_premium,
+ 'cotep_amt' => 0.00,
+
+ 'exp_amt' => $expected_amount,
+ 'statement_id' => null,
+
+ 'follower_policy_no' => null,
+ 'non_comm_per_amt' => $non_commission_premium_amount,
+
+ 'pt_policy_issue_date' => change_date_format($policy_issue_date, 'd/M/Y', 'Y-m-d'),
+
+ 'file_id' => $params['file_id']
+ ];
+
+ if(!empty($vehicle_id) && !empty($client_id)){
+ $pt_id = $this->policyTransactionModel->insert($policy_transaction_data);
+ if($pt_id){
+ $co_share_data['pt_id'] = $pt_id;
+ $pt_co_share_id = $this->PTCOShareDetailsModel->insert($co_share_data);
+
+ $client_policy_insert_data = $this->prepareClientPolicyInsertData($policy_transaction_data);
+ $client_policy_id = $this->clientPolicyModel->insert($client_policy_insert_data);
+ $this->policyTransactionModel->update($pt_id, ['client_policy_id' => $client_policy_id]);
+ $pt_ids[] = $pt_id;
+ $this->myLogger->logme('error', "BDS entry successfully added with pt_id : $pt_id, pt_co_share_id : $pt_co_share_id, client_policy_id :$client_policy_id");
+
+ }
+ }else{
+ $this->myLogger->logme('error', 'Skipped......... , vehicle id and client id missing');
+ }
+
+ }
+
+ } catch (\Exception $e) {
+ $errorDetails = [
+ 'error_message' => $e->getMessage(),
+ 'file' => $e->getFile(),
+ 'line' => $e->getLine(),
+ 'stack_trace' => $e->getTraceAsString(),
+ ];
+ $message = "Contact system admin";
+ $this->bdsDumpModel->where('id', $file_id)->set(['status' => 'failed', 'reason' => json_encode(['error_summary' => array_count_values([5]), 'error_data' => $message])])->update();
+ $this->myLogger->logme("error", 'Claim dump file format validation failed due to : ' . json_encode($errorDetails ?? []));
+ return $errorDetails;
+ }
+
+ // return $result;
+
+ if (isset($result['error_summary']) && count($result['error_summary'])) {
+ $result['error_summary'] = array_count_values($result['error_summary']);
+ $status = 'failed';
+ $failure_reason = ((json_encode($result)));
+ $this->bdsDumpModel->where('id', $file_id)->set(['status' => $status, 'reason' => $failure_reason])->update();
+ $this->myLogger->logme("error", '{file_id} uploaded failed', ['file_id' => $file_id]);
+ } else{
+ $result = count($pt_ids);
+ $status = 'success';
+ $failure_reason = ((json_encode($result)));
+ $this->bdsDumpModel->where('id', $file_id)->set(['status' => $status, 'reason' => $failure_reason])->update();
+ $this->myLogger->logme("error", '{file_id} uploaded success', ['file_id' => $file_id]);
+ }
+
+ return $result;
+ }
+
+ public function extractExcelData($file_name, $highestColumn)
+ {
+ // $file_name = "claims_dump_form_client.xlsx";
+ // Load the Excel file
+ $file_name_with_path = WRITEPATH . "/uploads/bds_dump_excel/" . $file_name;
+ $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($file_name_with_path);
+ $worksheet = $spreadsheet->getActiveSheet();
+
+ // Get the highest row and column numbers
+ $highestRow = $worksheet->getHighestDataRow();
+ // $highestColumn = $worksheet->getHighestDataColumn();
+ // dd($highestRow, $highestColumn);
+
+ // Get header row (assuming headers are in row 1)
+ // $headerRow = $worksheet->rangeToArray('A1:' . $highestColumn . '1', null, true, false)[0];
+ $excel_data = $worksheet->rangeToArray('A1:' . $highestColumn . $highestRow);
+ // print_rr($excel_data); die;
+
+ //Sanitize the excel data
+ $excel_data = ExcelSanitizeHelper::sanitizeArrayData($excel_data);
+ // dd($excel_data);
+
+ // dd($data);
+ return $excel_data;
+ }
+
+ public function getBdsBulkUploadExcelErrorData($file_id)
+ {
+ try {
+
+ $file = $this->bdsDumpModel->where('id', $file_id)->first();
+ $error_data = json_decode($file['reason']);
+ // dd($error_data);
+
+ $file_name_with_path = WRITEPATH . "/uploads/bds_dump_excel/" . $file['file_name'];
+ // Kint::dump(file_exists($file_name_with_path)); die;
+
+ //check the file exist or not
+ if (!file_exists($file_name_with_path)) {
+ $error_message = "File not found";
+ $this->myLogger->logme('error', ($error_message . ' for file id ' . $file_id));
+ return 0;
+ }
+
+ $columns_to_check = $this->bds_bulk_upload_excel_file_column;
+ $allowedHighestColumn = end($columns_to_check);
+ // Kint::dump($columns_to_check); die;
+
+ $excel_data = $this->extractExcelData($file['file_name'], $allowedHighestColumn['col_cell_name']);
+ $excelErrorData['excel_header'] = $excel_data[0];
+ unset($excel_data[0]);
+
+ // Kint::dump($excel_data); die;
+ if ($error_data->error_type == 1) {
+
+ $finalArray = [];
+ foreach ($error_data->error_data as $key => $value) {
+ foreach ($value as $key2 => $value2) {
+ $error_data = $value2->error;
+ $data = ['value' => $excel_data[$key][$value2->col_idx], 'error' => $error_data,];
+ $excel_data[$key][$value2->col_idx] = $data;
+ }
+ array_push($finalArray, $excel_data[$key]);
+ }
+
+ foreach ($finalArray as $fkey => $value) {
+ foreach ($value as $vkey => $arrayData) {
+ if (!is_array($arrayData)) {
+ $data = ['value' => $arrayData];
+ $finalArray[$fkey][$vkey] = $data;
+ }
+ }
+ }
+
+ $excelErrorData['excel_data'] = $finalArray;
+ return $excelErrorData;
+ } else if ($error_data->error_type == 2) {
+
+
+ $allErrors = [];
+ $typeTowArray = [];
+
+ foreach ($error_data->error_data as $index => $item) {
+
+ foreach ($item as $field) {
+ if (!isset($allErrors[$index])) {
+ $allErrors[$index] = [];
+ }
+ $allErrors[$index] = array_merge($allErrors[$index], $field->error);
+ }
+ }
+
+ // dd(array_keys($allErrors));
+ foreach ($allErrors as $key => $value) {
+ // echo $key;
+ // print_r($value);
+ foreach ($excel_data as $excel_data_index => $excel_data_value) {
+ if ($excel_data_value[0] == $key) {
+ $data = ['value' => $excel_data[$excel_data_index][1], 'error' => $value,];
+ $excel_data[$excel_data_index][1] = $data;
+ array_push($typeTowArray, $excel_data[$excel_data_index]);
+ break;
+ }
+ }
+ }
+ // dd($data);
+ foreach ($typeTowArray as $fkey => $value) {
+ foreach ($value as $vkey => $arrayData) {
+ if (!is_array($arrayData)) {
+ $data = ['value' => $arrayData];
+ $typeTowArray[$fkey][$vkey] = $data;
+ }
+ }
+ }
+
+ $excelErrorData['excel_data'] = $typeTowArray;
+ return $excelErrorData;
+ }
+
+ } catch (\Exception $e) {
+ // Handle any exceptions
+ $errorMessage = $e->getMessage(); //die();
+ $this->myLogger->logme('error', $errorMessage);
+ return false; // You can return an error response here
+ }
+ }
+
+ public function getBdsdumpFileErrorData()
+ {
+ $file_id = $this->request->getGet('file_id');
+ $file = $this->bdsDumpModel->where('id', $file_id)->first();
+ if (!isset($file)) {
+ return $this->respond(['status' => false, 'code' => 404, 'message' => 'No data found'], 200);
+ } else {
+ return $this->respond(['status' => true, 'code' => 200, 'data' => $file['reason']], 200);
+ }
+ }
+
+ public function getBdsDumpExcelFileErrors($file_id)
+ {
+ // Render views and capture output
+ $result = $this->getBdsBulkUploadExcelErrorData($file_id) ?? [];
+ // dd($result);
+
+ if ($result != 0) {
+
+ $result['file_id'] = $file_id;
+ echo view('excel_errors', $result);
+ } else if ($result == 0) {
+
+ $data['message'] = 'File Not Found Physically';
+ return view('errors/404', $data);
+ } else {
+
+ echo view('errors/html/production');
+ }
+ }
+
+ public function getClientAndVehicleId($row, $vehicle_data, $client_data, $rto_master, $vehicle_type_data)
+ {
+ $vehicle_number = trim($row[2]);
+ $client_name = trim($row[5]);
+ $client_email = trim($row[6]);
+
+ $vehicle_id = null;
+ $client_id = null;
+
+ // -------------------------------------------
+ // 1. First Stage: Check if vehicle already exists
+ // -------------------------------------------
+ foreach ($vehicle_data as $v) {
+ if (strcasecmp(trim($v['vehicle_no']), $vehicle_number) === 0) {
+ $vehicle_id = $v['id'];
+ $client_id = $v['owner'];
+ break;
+ }
+ }
+
+ // -------------------------------------------
+ // 2. Second Stage: Vehicle not found -> check client by email
+ // -------------------------------------------
+ $second_stage_client_id = null;
+
+ if (empty($vehicle_id) && empty($client_id)) {
+
+ foreach ($client_data as $c) {
+ if (strcasecmp(trim($c['email']), $client_email) === 0) {
+ $second_stage_client_id = $c['id'];
+ break;
+ }
+ }
+
+ if (!empty($second_stage_client_id)) {
+
+ // Existing client – Insert vehicle
+ $matched_rto_id = check_rto_data($row, $rto_master);
+ $vehicle_type_id = check_vehicle_type($row, $vehicle_type_data);
+
+ $vehicle_insert = [
+ 'vehicle_no' => $vehicle_number,
+ 'vehicle_type' => $vehicle_type_id['vehicle_type']['id'] ?? null,
+ 'owner' => $second_stage_client_id,
+ 'rto_id' => $matched_rto_id['rto_data']['id'] ?? null,
+ ];
+
+ $vehicle_id = $this->vehicleModel->insert($vehicle_insert);
+ $client_id = $second_stage_client_id;
+ } else {
+
+ // -------------------------------------------
+ // 3. Third Stage: No existing client → Insert new client then insert vehicle
+ // -------------------------------------------
+ $client_insert = [
+ 'client_name' => $client_name,
+ 'short_name' => $client_name,
+ 'email' => $client_email,
+ 'entity_type_id' => 7,
+ 'client_type' => 2,
+ ];
+
+ $client_id = $this->clientModel->insert($client_insert);
+
+ if ($client_id) {
+
+ $matched_rto_id = check_rto_data($row, $rto_master);
+ $vehicle_type_id = check_vehicle_type($row, $vehicle_type_data);
+
+ $vehicle_insert = [
+ 'vehicle_no' => $vehicle_number,
+ 'vehicle_type' => $vehicle_type_id['vehicle_type']['id'] ?? null,
+ 'owner' => $client_id,
+ 'rto_id' => $matched_rto_id['rto_data']['id'] ?? null,
+ ];
+
+ $vehicle_id = $this->vehicleModel->insert($vehicle_insert);
+ }
+ }
+ }
+
+ return [
+ 'client_id' => $client_id,
+ 'vehicle_id' => $vehicle_id,
+ ];
+ }
}
diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php
index 761ceffa..4a4b7cbd 100755
--- a/app/Controllers/RestAuthenticationController.php
+++ b/app/Controllers/RestAuthenticationController.php
@@ -398,47 +398,54 @@ class RestAuthenticationController extends AdminController
$otp = isset($this->request->getJSON()->otp) ? $this->request->getJSON()->otp : null;
$client_id = $this->request->getJSON()->client_id ?? null;
- if (isset($mobile_number))
- {
- // $employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->where('emp_status !=', 'truncated')->where('is_active', 1)->first();
- $builder = $this->employeeModel
- ->select('employees.*')
- ->join('employee_polices', 'employees.id = employee_polices.employee_id')
- ->where('employees.mobile', $mobile_number)
- ->where('employees.relationship', 'Self')
- ->where('employee_polices.is_active', 1)
- ->whereIn('employee_polices.status', ['active', 'expired'])
- ->where('employees.is_active', 1)
- ->whereIn('employees.emp_status', ['active', 'expired'])
- ->where('otp', $otp);
+ if(empty($otp)){
+ return $this->respond(['status' => 'OTP is required','code' => 400,'message' => 'OTP is required'], 200);
+ }
- if (!empty($client_id)) {
- $builder->where('employees.client_id', $client_id);
- }
+ if (empty($mobile_number) && empty($email_id)) {
+ return $this->respond(['status' => 'failed','code' => 400,'message' => 'Mobile number or Email ID is required'], 200);
+ }
- $employeeData = $builder->orderBy('employees.id', 'desc')->first();
+ if (isset($mobile_number))
+ {
+ // $employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->where('emp_status !=', 'truncated')->where('is_active', 1)->first();
+ $builder = $this->employeeModel
+ ->select('employees.*')
+ ->join('employee_polices', 'employees.id = employee_polices.employee_id')
+ ->where('employees.mobile', $mobile_number)
+ ->where('employees.relationship', 'Self')
+ ->where('employee_polices.is_active', 1)
+ ->whereIn('employee_polices.status', ['active', 'expired'])
+ ->where('employees.is_active', 1)
+ ->whereIn('employees.emp_status', ['active', 'expired'])
+ ->where('otp', $otp);
- } else {
- // $employeeData = $this->employeeModel->where('email_corporate', $email_id)->where('otp', $otp)->where('relationship', 'self')->where('emp_status !=', 'truncated')->where('is_active', 1)->first();
- $builder = $this->employeeModel
- ->select('employees.*')
- ->join('employee_polices', 'employees.id = employee_polices.employee_id')
- ->where('employees.email_corporate', $email_id)
- ->where('employees.relationship', 'Self')
- ->where('employee_polices.is_active', 1)
- ->whereIn('employee_polices.status', ['active', 'expired'])
- ->where('employees.is_active', 1)
- ->whereIn('employees.emp_status', ['active', 'expired'])
- ->where('otp', $otp);
+ if (!empty($client_id)) {
+ $builder->where('employees.client_id', $client_id);
+ }
- if (!empty($client_id)) {
- $builder->where('employees.client_id', $client_id);
- }
+ $employeeData = $builder->orderBy('employees.id', 'desc')->first();
- $employeeData = $builder->orderBy('employees.id', 'desc')->first();
- }
+ } else {
+ // $employeeData = $this->employeeModel->where('email_corporate', $email_id)->where('otp', $otp)->where('relationship', 'self')->where('emp_status !=', 'truncated')->where('is_active', 1)->first();
+ $builder = $this->employeeModel
+ ->select('employees.*')
+ ->join('employee_polices', 'employees.id = employee_polices.employee_id')
+ ->where('employees.email_corporate', $email_id)
+ ->where('employees.relationship', 'Self')
+ ->where('employee_polices.is_active', 1)
+ ->whereIn('employee_polices.status', ['active', 'expired'])
+ ->where('employees.is_active', 1)
+ ->whereIn('employees.emp_status', ['active', 'expired'])
+ ->where('otp', $otp);
+
+ if (!empty($client_id)) {
+ $builder->where('employees.client_id', $client_id);
+ }
+
+ $employeeData = $builder->orderBy('employees.id', 'desc')->first();
+ }
-
$lastQuery = $this->employeeModel->db->getLastQuery();
$this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: Last Executed Query: " . $lastQuery);
$this->myLogger->logme("error", "REST-AUTH-CONTROLLER - getVerifiedUserData: employeeData: " . json_encode($employeeData ?? []));
diff --git a/app/Controllers/RuleImportController.php b/app/Controllers/RuleImportController.php
index f5579aac..d1647bae 100644
--- a/app/Controllers/RuleImportController.php
+++ b/app/Controllers/RuleImportController.php
@@ -4,6 +4,9 @@ namespace App\Controllers;
use CodeIgniter\API\ResponseTrait;
use App\Models\CommissionFilesModel;
use App\Models\InsurerModel;
+use App\Models\PartnerPolicyModel;
+
+
class RuleImportController extends AdminController
{
@@ -12,7 +15,9 @@ class RuleImportController extends AdminController
protected $ruleImportService;
protected $commissionFilesModel;
protected $departments;
+ protected $departmentFields;
protected $insurerModel;
+ protected $partnerPolicyModel;
public function __construct()
{
@@ -20,13 +25,40 @@ class RuleImportController extends AdminController
$this->myLogger = \Config\Services::mylogger();
$this->ruleImportService = \Config\Services::ruleImportService();
-
+ $this->partnerPolicyModel = new partnerPolicyModel();
$this->commissionFilesModel = new CommissionFilesModel();
$this->insurerModel = new InsurerModel();
$this->departments = [
'motor' => 'Motor',
'health' => 'Health',
];
+
+ $this->departmentFields = [
+ 'motor' => [
+ 'department',
+ 'vehicle_type',
+ 'vehicle_sub_type',
+ 'policy_type',
+ 'vehicle_age',
+ 'is_new_vehicle',
+ 'cubic_capacity',
+ 'policy_business_type',
+ 'fuel_type',
+ 'produt',
+ 'geo_rto_state',
+ 'geo_rto_city',
+ 'model',
+ 'make',
+ 'weight',
+ 'renewal_type',
+ 'renewal_sub_type',
+ 'premium',
+ 'od_premium',
+ 'tp_premium',
+ 'product'
+ ],
+ ];
+
}
public function commissionFileUploadList()
@@ -194,6 +226,8 @@ class RuleImportController extends AdminController
'insurer_id' => (int)$insurerId,
'department' => $department,
'commission_month' => $commissionMonth,
+ 'created_by' => (int)$createdBy,
+
];
$this->myLogger->logme('info', 'RuleImportController::upload - Calling ruleImportService->processUpload', ['payload' => $payload]);
@@ -262,10 +296,22 @@ class RuleImportController extends AdminController
// handle existing JSON file based on $override (bool)
if (file_exists($jsonPath)) {
if ($overwrite) {
- // delete existing file before writing (deterministic overwrite)
- if (!@unlink($jsonPath)) {
- $this->myLogger->logme('warning', 'RuleImportController::upload - Failed to delete existing JSON before overwrite', ['json_path' => $jsonPath]);
- // proceed to overwrite anyway by writing to the same path
+ // rename existing file before overwrite
+ if (file_exists($jsonPath)) {
+
+ $backupPath = $jsonPath . '.' . date('YmdHis') . '.bak';
+
+ if (!@rename($jsonPath, $backupPath)) {
+ $this->myLogger->logme(
+ 'warning',
+ 'RuleImportController::upload - Failed to rename existing JSON before overwrite',
+ [
+ 'json_path' => $jsonPath,
+ 'backup_path' => $backupPath
+ ]
+ );
+ // continue anyway; writing to same path will overwrite
+ }
}
$finalJson = $jsonData;
} else {
@@ -487,7 +533,7 @@ class RuleImportController extends AdminController
public function deleteCommissionData($id)
{
- $return = $this->removeCommissionRules($id);
+ $return = $this->updateCommissionRules($id);
// dd($return);
if($return['status'] == true){
@@ -498,7 +544,7 @@ class RuleImportController extends AdminController
}
}
- public function deActiveCommissionRules($id)
+ public function updateCommissionRules($id, $post_data = null)
{
// 1. Fetch commission record
$commission_data = $this->commissionFilesModel
@@ -528,7 +574,7 @@ class RuleImportController extends AdminController
// 4. Read JSON
$json = file_get_contents($filePath);
$rules = json_decode($json, true);
- // dd($rules);
+ // print_rr($rules); die;
if (!is_array($rules)) {
$this->myLogger->logme("error", "Invalid JSON structure in file: $filePath");
@@ -537,9 +583,58 @@ class RuleImportController extends AdminController
// 5. Mark matching rule as deleted
$ruleFound = false;
- foreach ($rules as &$rule) {
- if (!isset($rule['is_deleted']) && isset($rule['file_id']) && $rule['file_id'] == $id) {
- $rule['is_deleted'] = true; // <-- NEW FEATURE
+ $log_message = "Rule file updated successfully";
+
+ if(empty($post_data)){
+ foreach ($rules as &$rule) {
+ if (isset($rule['file_id']) && $rule['file_id'] == $id && isset($rule['is_deleted']) && $rule['is_deleted'] == false) {
+ $rule['is_deleted'] = true;
+ $ruleFound = true;
+ }
+ }
+ $log_message = "Rule marked as deleted and file updated successfully";
+ } else {
+
+ foreach ($rules as &$rule) {
+ // Match rules for the same file and not deleted
+ if (isset($rule['file_id']) && $rule['file_id'] == $id && $rule['is_deleted'] == false)
+ {
+ // 1. DELETE RULE
+ if (!empty($post_data['rule_id']) && $post_data['rule_id'] == $rule['id'] && isset($post_data['is_deleted']))
+ {
+ $rule['is_deleted'] = true;
+ $ruleFound = true;
+ break;
+ }
+
+ // 2. UPDATE RULE
+ if (!empty($post_data['rule_id']) && $post_data['rule_id'] == $rule['id'])
+ {
+ $rule['conditions'] = $post_data['rule_data']['conditions'];
+ $rule['calculation'] = $post_data['rule_data']['calculation'];
+ $rule['name'] = $post_data['rule_data']['name'];
+ $ruleFound = true;
+ break;
+ }
+ }
+ }
+
+ // 3. CREATE NEW RULE (only if not found)
+ if (empty($post_data['rule_id']) && !$ruleFound) {
+
+ $newRuleId = 'rule_' . substr(md5(json_encode($post_data['rule_data']) . time()), 0, 13) . '_' . $id . '_' . strtolower($monthFolder);
+ $newRule = [
+ 'id' => $newRuleId,
+ 'name' => $post_data['rule_data']['name'],
+ "department" => $post_data['rule_data']['department'] ?? "motor",
+ 'is_deleted' => false,
+ 'file_id' => $id,
+ 'conditions' => $post_data['rule_data']['conditions'],
+ 'calculation' => $post_data['rule_data']['calculation'],
+ ];
+
+ $rules[] = $newRule; // correctly push new rule
+
$ruleFound = true;
}
}
@@ -552,11 +647,11 @@ class RuleImportController extends AdminController
// 6. Always save file back (No unlink)
file_put_contents($filePath, json_encode($rules, JSON_PRETTY_PRINT));
- $this->myLogger->logme("error", "Rule marked deleted and file updated: $filePath");
+ $this->myLogger->logme("error", $log_message);
return [
'status' => true,
- 'message' => 'Rule marked as deleted and file updated successfully'
+ 'message' => $log_message
];
}
@@ -641,5 +736,109 @@ class RuleImportController extends AdminController
}
}
+ public function ruleList($id)
+ {
+ $data['page_name'] = "Rule Manager";
+ $data['departments'] = $this->departments;
+ $data['commission_file_id'] = $id;
+ $data['departmentFields'] = json_encode($this->departmentFields);
+ $data['rules'] = $this->getRuleJson($id);
+ return $this->loadLayout('commission_rules_list', $data);
+ }
+
+ public function getRuleJson($id)
+ {
+
+ // 1. Fetch commission record
+ $commission_data = $this->commissionFilesModel
+ ->where('is_active', 1)
+ ->where('id', $id)
+ ->first();
+
+ if (!$commission_data) {
+ $this->myLogger->logme("error", "Commission record not found for ID: $id");
+ return [];
+ }
+
+ // 2. Convert commission_month → OCT2025
+ $month = date("M", strtotime($commission_data['commission_month']));
+ $year = date("Y", strtotime($commission_data['commission_month']));
+ $monthFolder = strtoupper($month . $year);
+
+ // 3. Path
+ $fileName = $commission_data['insurer_id'] . '_' . $commission_data['department'] . '.json';
+ $filePath = WRITEPATH . "uploads/commission/rules/" . $monthFolder . "/" . $fileName;
+
+ if (!file_exists($filePath)) {
+ $this->myLogger->logme("error", "Rule file not found: $filePath");
+ return [];
+ }
+
+ // 4. Read JSON
+ $json = file_get_contents($filePath);
+ $rules = json_decode($json, true);
+
+ if(!empty($rules)){
+ return $rules;
+ }else{
+ return [];
+ }
+
+ }
+
+ public function saveRule()
+ {
+ $post_data = $this->request->getPost();
+
+ $file_id = $post_data['file_id'];
+ $return = $this->updateCommissionRules($file_id, $post_data);
+ // print_r($return); die;
+
+ if(empty($post_data['rule_id'])){
+ $success_message = "New rule created successfully";
+ $error_message = "Failed to created the new rule";
+ }else{
+ $success_message = "Rule updated successfully";
+ $error_message = "Failed to update the rule";
+ }
+
+ if($return['status'] == true){
+ $data = $this->getRuleJson($file_id);
+ return $this->respond(['status' => true, 'code' => 200, 'data' => $data, 'message' => $success_message], 200);
+ }else{
+ return $this->respond(['status' => false, 'code' => 400, 'message' => $error_message], 200);
+ }
+
+ }
+
+ public function removeRule()
+ {
+ $post_data = $this->request->getPost();
+
+ $file_id = $post_data['file_id'];
+ $return = $this->updateCommissionRules($file_id, $post_data);
+ // print_r($return); die;
+
+ $success_message = "Rule deleted successfully";
+ $error_message = "Failed to delete the rule";
+
+ if($return['status'] == true){
+ $data = $this->getRuleJson($file_id);
+ return $this->respond(['status' => true, 'code' => 200, 'data' => $data, 'message' => $success_message], 200);
+ }else{
+ return $this->respond(['status' => false, 'code' => 400, 'message' => $error_message], 200);
+ }
+ }
+
+ public function checkRuleUsage()
+ {
+ $rule_id = $this->request->getGet('rule_id');
+
+ $count = $this->partnerPolicyModel->where('commission_applied_rule', $rule_id)
+ ->countAllResults();
+ // $count = 1;
+ return $this->respond(['status' => true, 'code' => 200, 'count' => $count, 'message' => ""], 200);
+ }
+
}
diff --git a/app/Controllers/ThzController.php b/app/Controllers/ThzController.php
index 29f89df4..139b5b8e 100644
--- a/app/Controllers/ThzController.php
+++ b/app/Controllers/ThzController.php
@@ -102,16 +102,19 @@ class ThzController extends BaseController
public function ticketList()
{
- try {
+ // try {
$returnType = strtolower($this->request->getGet('return_type') ?? 'api');
$data = $this->request->getGet();
- if ($returnType === 'web' && in_array(get_role_id(), [3, 4])) {
+ if ($returnType === 'web' && in_array(get_role_id(), [4])) {
$data['assign_to'] = $data['assign_to'] ?? get_session_userid();
}
+ if ($returnType === 'web' && in_array(get_role_id(), [3])) {
+ $data['clientIds'] = $this->clientModel->getClientIdBasedonLoggedInSessionID();
+ }
$tickets = $this->fetchTicketsBasedOnrole($data);
@@ -124,8 +127,9 @@ class ThzController extends BaseController
} else {
$data['ticket_data'] = $tickets;
$data['assignee'] = $this->userModel->where('is_active', 1)->whereIn('role', ['3', '4'])->findAll();
- // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu , 2-"manager l2 " - ivangalum assign pannalam
- // 3,4 remain person varannum.
+ // enga 5-"head" and 1-"admin" assign pannvaga so dropdown la varakudhathu , 2-"manager l2 " - ivangalum assign pannalam. 3,4 remain person varannum dropdown la.
+ // Roles - 5 (Head) , 1 (Admin) and 2 (Manager) are already assigned to others, so the dropdown should not be shown.
+ // 3 (Account Manager) and 4 (Staff) should be selectable, so have to show in dropdown .
$data['client_list'] = $this->clientModel->getCreatedByUserName();
$data['ticket_type'] = $this->thzTypeModel->where('is_active', 1)->findAll();
$data['tab_name'] = "Tickets";
@@ -138,9 +142,9 @@ class ThzController extends BaseController
'status' => 'success',
'data' => $tickets,
])->setStatusCode(200);
- } catch (\Throwable $e) {
- return handle_exception($e, $this->myLogger, $this->response);
- }
+ // } catch (\Throwable $e) {
+ // return handle_exception($e, $this->myLogger, $this->response);
+ // }
}
public function ticketConversationSave()
@@ -348,6 +352,7 @@ class ThzController extends BaseController
// $id = $data['thz_id'] ?? null;
$assign_to = $data['assign_to'] ?? null;
$mobile = $data['mobile'] ?? null;
+ $clientIds = $data['clientIds'] ?? null;
if (!empty($assign_to)) {
// Tickets assigned to a staff
@@ -371,6 +376,17 @@ class ThzController extends BaseController
->findAll();
}
+
+ if (!empty($clientIds)) {
+ return $this->thzMasterModel
+ ->select('thz_master.*, user_profiles.first_name as assignee_name')
+ ->join('user_profiles', 'user_profiles.id = thz_master.assign_to', 'left')
+ ->whereIn('thz_master.client_id', $clientIds)
+ ->orderBy('thz_master.created_at', 'desc')
+ ->findAll();
+ }
+
+
// All tickets (e.g., for managers)
return $this->thzMasterModel
->select('thz_master.*, user_profiles.first_name as assignee_name')
diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index 6219326a..87620e51 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -26,6 +26,7 @@ use App\Models\VehicleModel;
use App\Models\PartnerPolicyModel;
use DOMDocument;
+use DOMXPath;
use Psr\Log\LoggerInterface;
use Kint\Kint;
@@ -1313,7 +1314,7 @@ class TicketController extends BaseController
}
}
- public function convertHtmlToText($html)
+ public function convertHtmlToTextOld($html)
{
if(!empty($html)){
$dom = new DOMDocument();
@@ -1324,6 +1325,36 @@ class TicketController extends BaseController
}
}
+ public function convertHtmlToText($html)
+ {
+ if (empty($html)) {
+ return '';
+ }
+
+ // Remove BOM / strange characters
+ $html = preg_replace('/[\x00-\x1F\x80-\xFF]/', ' ', $html);
+
+ // Load HTML safely
+ $dom = new DOMDocument();
+ libxml_use_internal_errors(true);
+ $dom->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
+
+ // Remove style and script tags
+ $xpath = new DOMXPath($dom);
+ foreach ($xpath->query('//style|//script') as $node) {
+ $node->parentNode->removeChild($node);
+ }
+
+ // Extract clean text
+ $text = $dom->textContent;
+
+ // Clean extra spaces
+ $text = preg_replace('/\s+/', ' ', $text);
+
+ return trim($text);
+ }
+
+
public function removeTicket()
{
$ticket_id = $this->request->getGet('ticket_id');
@@ -2068,7 +2099,7 @@ class TicketController extends BaseController
->join('policy_type', 'policy_type.id = client_policy.policy_type_id AND policy_type.is_active = 1')
->join('insurers', 'insurers.id = client_policy.insurer_id AND insurers.is_active = 1', 'left')
->join('tpa', 'tpa.id = client_policy.tpa_id AND tpa.is_active = 1', 'left')
- ->where('client_policy.policy_status', 1)
+ // ->where('client_policy.policy_status', 1)
->whereIn('client_policy.id', $policy_ids)
->findAll();
diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php
index ea0e4fb8..ee62c702 100755
--- a/app/Controllers/UserController.php
+++ b/app/Controllers/UserController.php
@@ -20,6 +20,7 @@ use App\Models\AuthHistoryModel;
use App\Models\UserActivityHistoryModel;
use App\Models\PartnerStaffModel;
use App\Models\PartnerManagerIncentiveFileModel;
+use App\Models\NhanceBranchModel;
class UserController extends AdminController
@@ -36,6 +37,7 @@ class UserController extends AdminController
protected $userActivityHistoryModel;
protected $partnerStaffModel;
protected $partnerManagerIncentiveFileModel;
+ protected $nhanceBranchModel;
public function __construct()
{
@@ -51,6 +53,7 @@ class UserController extends AdminController
$this->userActivityHistoryModel = new UserActivityHistoryModel();
$this->partnerStaffModel = new PartnerStaffModel();
$this->partnerManagerIncentiveFileModel = new PartnerManagerIncentiveFileModel();
+ $this->nhanceBranchModel = new NhanceBranchModel();
}
public function list()
@@ -63,6 +66,7 @@ class UserController extends AdminController
// print_r($data); die;
$data['roleData'] = $this->roleModel->select('id, role')->findAll();
$data['teamData'] = $this->teamModel->select('id, name')->where('is_active',1)->findAll();
+ $data['NHanceBranchData'] = $this->nhanceBranchModel->select('id, branch_name')->where('is_active',1)->findAll();
$this->loadLayout('UserList', $data);
}
@@ -70,6 +74,7 @@ class UserController extends AdminController
public function create()
{
$this->myLogger->logme('error', 'User create function called');
+ dd($this->request->getPost());
$teams = $this->request->getPost('team');
//if this is get method return to user creation page
diff --git a/app/Filters/Cors.php b/app/Filters/Cors.php
new file mode 100644
index 00000000..c47f2762
--- /dev/null
+++ b/app/Filters/Cors.php
@@ -0,0 +1,422 @@
+
+ */
+ protected array $allowedOrigins = [];
+
+ /**
+ * Whether to allow credentials (cookies, authorization headers) in CORS requests
+ * WARNING: Cannot be true if using wildcard (*) origin
+ *
+ * @var bool
+ */
+ protected bool $allowCredentials = false;
+
+ /**
+ * HTTP methods allowed for CORS requests
+ *
+ * @var string
+ */
+ protected string $allowedMethods = 'GET,POST,PUT,PATCH,DELETE,OPTIONS';
+
+ /**
+ * HTTP headers allowed in CORS requests
+ *
+ * @var string
+ */
+ protected string $allowedHeaders = 'Content-Type,Authorization,X-Requested-With,Accept,Origin';
+
+ /**
+ * Headers exposed to the client (accessible via JavaScript)
+ *
+ * @var string
+ */
+ protected string $exposeHeaders = '';
+
+ /**
+ * How long (in seconds) the preflight response can be cached
+ * Default: 24 hours (86400 seconds)
+ *
+ * @var int
+ */
+ protected int $maxAge = 86400;
+
+ /**
+ * Whether to enable debug logging for CORS requests
+ *
+ * @var bool
+ */
+ protected bool $debug = false;
+
+ /**
+ * Initialize CORS configuration from environment variables
+ *
+ * @throws \RuntimeException If configuration is invalid
+ */
+
+ protected $myLogger;
+ public function __construct()
+ {
+
+ $this->myLogger = \Config\Services::mylogger();
+ // Parse allowed origins from environment variable
+ // Format: comma or semicolon separated list
+ // Examples: "https://example.com,https://app.example.com" or "*.example.com"
+ $raw = env('CORS_ALLOWED_ORIGINS', '*');
+ $parts = preg_split('/\s*[,;]\s*/', trim($raw));
+ $this->allowedOrigins = array_filter(array_map('trim', $parts));
+
+ // Load other configuration from environment
+ $this->allowCredentials = filter_var(
+ env('CORS_ALLOW_CREDENTIALS', false),
+ FILTER_VALIDATE_BOOLEAN
+ );
+ $this->allowedMethods = env('CORS_ALLOWED_METHODS', $this->allowedMethods);
+ $this->allowedHeaders = env('CORS_ALLOWED_HEADERS', $this->allowedHeaders);
+ $this->exposeHeaders = env('CORS_EXPOSE_HEADERS', $this->exposeHeaders);
+ $this->maxAge = (int) env('CORS_MAX_AGE', $this->maxAge);
+ $this->debug = filter_var(env('CORS_DEBUG', false), FILTER_VALIDATE_BOOLEAN);
+
+ // Security validation: wildcard origin cannot be used with credentials
+ // This is a browser security requirement, not just a best practice
+ if ($this->allowCredentials && in_array('*', $this->allowedOrigins, true)) {
+ throw new \RuntimeException(
+ 'CORS configuration error: Cannot use wildcard (*) origin with credentials enabled. ' .
+ 'This violates browser security policies. Either disable credentials or specify explicit origins.'
+ );
+ }
+
+ $this->log('CORS filter initialized', [
+ 'allowed_origins' => $this->allowedOrigins,
+ 'allow_credentials' => $this->allowCredentials,
+ 'allowed_methods' => $this->allowedMethods,
+ ]);
+ }
+
+ /**
+ * Check if a given origin is allowed to access this API
+ *
+ * Supports:
+ * - Exact matches: https://example.com
+ * - Wildcard origins: *.example.com
+ * - Scheme-less matching: example.com (matches http and https)
+ * - Universal wildcard: *
+ *
+ * @param string|null $origin The Origin header from the request
+ * @return bool True if origin is allowed, false otherwise
+ */
+ protected function isOriginAllowed(?string $origin): bool
+ {
+ // Reject empty origins
+ if (empty($origin)) {
+ $this->log('Origin rejected: empty origin header');
+ return false;
+ }
+
+ // Validate origin format - must include scheme (http:// or https://)
+ // This prevents malformed origins from being accepted
+ if (!preg_match('#^https?://#i', $origin)) {
+ $this->log('Origin rejected: invalid format (missing scheme)', ['origin' => $origin]);
+ return false;
+ }
+
+ // If wildcard present in configuration, allow any origin
+ if (in_array('*', $this->allowedOrigins, true)) {
+ $this->log('Origin allowed: wildcard match', ['origin' => $origin]);
+ return true;
+ }
+
+ // Parse the host from the origin for wildcard matching
+ // Example: https://app.example.com:8080 → app.example.com
+ $originHost = parse_url($origin, PHP_URL_HOST) ?: $origin;
+
+ foreach ($this->allowedOrigins as $allowed) {
+ if ($allowed === '') {
+ continue;
+ }
+
+ // 1. Exact match (including scheme and port)
+ // Example: https://example.com matches https://example.com
+ if (strcasecmp($allowed, $origin) === 0) {
+ $this->log('Origin allowed: exact match', [
+ 'origin' => $origin,
+ 'matched_rule' => $allowed
+ ]);
+ return true;
+ }
+
+ // 2. Handle scheme-less and wildcard patterns
+ // If the allowed entry doesn't contain ://, it's either a host-only or wildcard pattern
+ if (strpos($allowed, '://') === false) {
+
+ // 2a. Wildcard subdomain pattern: *.example.com
+ // Matches: app.example.com, api.example.com, dev.app.example.com
+ // Does NOT match: example.com (use explicit entry for root domain)
+ if (strpos($allowed, '*.') === 0) {
+ $allowedRoot = substr($allowed, 2); // Remove *. prefix
+
+ // Check if origin host ends with the allowed root domain
+ if ($originHost === $allowedRoot || str_ends_with($originHost, '.' . $allowedRoot)) {
+ $this->log('Origin allowed: wildcard subdomain match', [
+ 'origin' => $origin,
+ 'matched_rule' => $allowed,
+ 'origin_host' => $originHost
+ ]);
+ return true;
+ }
+ }
+ // 2b. Direct host match (scheme-less)
+ // Allows both http and https for the same host
+ // Example: example.com matches both http://example.com and https://example.com
+ else {
+ if (strcasecmp($allowed, $originHost) === 0) {
+ $this->log('Origin allowed: host match (scheme-less)', [
+ 'origin' => $origin,
+ 'matched_rule' => $allowed,
+ 'origin_host' => $originHost
+ ]);
+ return true;
+ }
+ }
+ }
+ }
+
+ // No match found - reject this origin
+ $this->log('Origin rejected: no matching rule', [
+ 'origin' => $origin,
+ 'checked_rules' => $this->allowedOrigins
+ ]);
+ return false;
+ }
+
+ /**
+ * Build the Access-Control-Allow-Origin header value
+ *
+ * Returns either:
+ * - '*' if wildcard is configured and credentials are disabled
+ * - The actual origin value if credentials are enabled or specific origins configured
+ *
+ * Note: When credentials are enabled, you MUST echo back the specific origin,
+ * browsers reject wildcard with credentials.
+ *
+ * @param string $origin The validated origin
+ * @return string The value for Access-Control-Allow-Origin header
+ */
+ protected function buildAllowOriginHeader(string $origin): string
+ {
+ // If wildcard configured and credentials NOT required, can safely return '*'
+ // This allows any origin to access the resource
+ if (in_array('*', $this->allowedOrigins, true) && !$this->allowCredentials) {
+ return '*';
+ }
+
+ // Otherwise, must return the specific origin
+ // This is required when allow-credentials is true
+ return $origin;
+ }
+
+ /**
+ * Add all CORS headers to the response
+ *
+ * This method is called for both preflight and actual requests
+ * to ensure consistent CORS headers across all responses.
+ *
+ * @param ResponseInterface $response The response object to add headers to
+ * @param RequestInterface $request The original request
+ * @param string $origin The validated origin
+ * @param bool $isPreflight Whether this is a preflight OPTIONS request
+ * @return void
+ */
+ protected function addCorsHeaders(
+ ResponseInterface $response,
+ RequestInterface $request,
+ string $origin,
+ bool $isPreflight = false
+ ): void {
+ // CRITICAL: Vary header prevents caching issues
+ // Without this, a cached response for origin A might be served to origin B,
+ // causing CORS errors because the Access-Control-Allow-Origin won't match
+ $response->setHeader('Vary', 'Origin');
+
+ // Set the allowed origin
+ $allowOrigin = $this->buildAllowOriginHeader($origin);
+ $response->setHeader('Access-Control-Allow-Origin', $allowOrigin);
+
+ // If credentials are allowed, set the header
+ // This allows cookies, authorization headers, and TLS client certificates
+ if ($this->allowCredentials) {
+ $response->setHeader('Access-Control-Allow-Credentials', 'true');
+ }
+
+ // Allowed HTTP methods
+ $response->setHeader('Access-Control-Allow-Methods', $this->allowedMethods);
+
+ // Handle allowed headers
+ if ($isPreflight) {
+ // For preflight: respect what the browser is asking for
+ // The browser sends Access-Control-Request-Headers to ask permission
+ $requestedHeaders = $request->getHeaderLine('Access-Control-Request-Headers');
+ $response->setHeader(
+ 'Access-Control-Allow-Headers',
+ $requestedHeaders ?: $this->allowedHeaders
+ );
+ } else {
+ // For actual requests: use configured headers
+ // Access-Control-Request-Headers is only for preflight
+ $response->setHeader('Access-Control-Allow-Headers', $this->allowedHeaders);
+ }
+
+ // Expose additional headers to the client (accessible via JavaScript)
+ // Without this, only simple headers are accessible: Cache-Control, Content-Language,
+ // Content-Type, Expires, Last-Modified, Pragma
+ if (!empty($this->exposeHeaders)) {
+ $response->setHeader('Access-Control-Expose-Headers', $this->exposeHeaders);
+ }
+
+ // Cache duration for preflight responses
+ // Reduces preflight requests by allowing browser to cache the permissions
+ if ($this->maxAge > 0) {
+ $response->setHeader('Access-Control-Max-Age', (string) $this->maxAge);
+ }
+ }
+
+ /**
+ * Execute before the controller
+ *
+ * Handles preflight OPTIONS requests by returning early with appropriate headers.
+ * For other requests, allows them to proceed to the controller.
+ *
+ * @param RequestInterface $request The request object
+ * @param mixed $arguments Optional arguments
+ * @return ResponseInterface|null Response for preflight, null for other requests
+ */
+ public function before(RequestInterface $request, $arguments = null)
+ {
+ $origin = $request->getHeaderLine('Origin') ?: '';
+ $method = strtoupper($request->getMethod());
+
+ // Handle preflight OPTIONS requests
+ // Preflight is sent by browsers before actual cross-origin requests
+ // to check if the actual request is safe to send
+ if ($method === 'OPTIONS') {
+ $this->log('Preflight request received', [
+ 'origin' => $origin,
+ 'method' => $method,
+ 'uri' => (string) $request->getUri()
+ ]);
+
+ // Validate origin - reject if not allowed
+ if (empty($origin) || !$this->isOriginAllowed($origin)) {
+ $this->log('Preflight rejected: origin not allowed', ['origin' => $origin]);
+
+ // Return 403 Forbidden for rejected origins
+ // Some prefer 200 with no CORS headers, but 403 is more explicit
+ return Services::response()
+ ->setStatusCode(403)
+ ->setJSON(['error' => 'Origin not allowed']);
+ }
+
+ // Origin is valid - build preflight response
+ $response = Services::response();
+ $this->addCorsHeaders($response, $request, $origin, true);
+
+ // 204 No Content is the standard response for successful preflight
+ // It indicates "permission granted, but no data to return"
+ $response->setStatusCode(204);
+ $response->setBody('');
+
+ $this->log('Preflight approved', [
+ 'origin' => $origin,
+ 'allowed_methods' => $this->allowedMethods
+ ]);
+
+ return $response;
+ }
+
+ // For non-OPTIONS requests, don't return a response
+ // Let the request proceed to the controller
+ // CORS headers will be added in after() method
+ return null;
+ }
+
+ /**
+ * Execute after the controller
+ *
+ * Adds CORS headers to the response for actual (non-preflight) requests.
+ * This ensures all API responses include proper CORS headers.
+ *
+ * @param RequestInterface $request The request object
+ * @param ResponseInterface $response The response object
+ * @param mixed $arguments Optional arguments
+ * @return void
+ */
+ public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+ {
+ $origin = $request->getHeaderLine('Origin') ?: '';
+
+ // Only add CORS headers if origin is present and allowed
+ // No origin header means it's a same-origin request (no CORS needed)
+ if (empty($origin)) {
+ return;
+ }
+
+ if (!$this->isOriginAllowed($origin)) {
+ $this->log('Response blocked: origin not allowed', [
+ 'origin' => $origin,
+ 'uri' => (string) $request->getUri()
+ ]);
+ return;
+ }
+
+ // Add CORS headers to the response
+ $this->addCorsHeaders($response, $request, $origin, false);
+
+ $this->log('CORS headers added to response', [
+ 'origin' => $origin,
+ 'status' => $response->getStatusCode()
+ ]);
+ }
+
+ /**
+ * Log debug information if debug mode is enabled
+ *
+ * Logs to CodeIgniter's log system at 'info' level.
+ * Enable with CORS_DEBUG=true in .env file.
+ *
+ * @param string $message The log message
+ * @param array $context Additional context data
+ * @return void
+ */
+ protected function log(string $message, array $context = []): void
+ {
+ if (!$this->debug) {
+ return;
+ }
+
+ // $logger = Services::logger();
+ $contextString = !empty($context) ? json_encode($context, JSON_UNESCAPED_SLASHES) : '';
+ $this->myLogger->logme('error','[CORS] ' . $message . ($contextString ? ' | ' . $contextString : ''));
+ // $logger->info('[CORS] ' . $message . ($contextString ? ' | ' . $contextString : ''));
+ }
+}
\ No newline at end of file
diff --git a/app/Helpers/MailHelper.php b/app/Helpers/MailHelper.php
index 89e90262..6c16ca8a 100755
--- a/app/Helpers/MailHelper.php
+++ b/app/Helpers/MailHelper.php
@@ -318,7 +318,7 @@ class MailHelper
$attachments = isset($params['attachments']) ? $params['attachments'] : [];
$common = isset($params['common']) ? $params['common'] : '';
$bcc = isset($params['bcc']) ? $params['bcc'] : '';
- $cc = isset($params['cc']) ? $params['cc'] : '';
+ $cc = (isset($params['cc']) && !empty($params['cc'])) ? $params['cc'] : '';
$from_address = isset($params['from_mail']) && !empty($params['from_mail']) ? $params['from_mail'] : getenv('email.fromEmail');
// $from_address = "claims@nhanceindia.in";
diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php
index 15f41462..b5334313 100755
--- a/app/Helpers/excel_util_helper.php
+++ b/app/Helpers/excel_util_helper.php
@@ -50,7 +50,6 @@ if (!function_exists('check_columns_name')) {
}
}
-
if (!function_exists('check_row_is_empty_or_null')) {
function check_row_is_empty_or_null($arr)
@@ -89,7 +88,6 @@ if (!function_exists('check_excel_date_format')) {
}
}
-
if (!function_exists('check_relationship')) {
function check_relationship($row, $relationship, $policy_terms)
{
@@ -132,7 +130,6 @@ if (!function_exists('check_relationship')) {
}
}
-
if (!function_exists('check_doj')) {
function check_doj($row)
@@ -179,7 +176,6 @@ if (!function_exists('check_doc')) {
}
}
-
if (!function_exists('check_employee_band')) {
function check_employee_band($row, $policy_terms, $slab_details)
{
@@ -218,7 +214,6 @@ if (!function_exists('check_employee_band')) {
}
}
-
if (!function_exists('check_si')) {
function check_si($row, $policy_details, $slab_details)
{
@@ -326,7 +321,6 @@ if (!function_exists('check_basic_pay')) {
}
}
-
if (!function_exists('check_dob_diff')) {
function check_dob_diff($row, $relationships, $default_age_ratio, $policy_details)
{
@@ -381,6 +375,10 @@ if (!function_exists('data_group_by_family')) {
if ($data_source == 'excel') {
if (!check_row_is_empty_or_null($row)) {
+ if(empty($action)){
+ $row['data_from'] = "excel";
+ }
+
// for this condition to avoid 5,00,000 to 500000
if($current_column_action == 'SI'){
$row[3] = removeNumberFormatting($row[3]);
@@ -398,6 +396,8 @@ if (!function_exists('data_group_by_family')) {
} else {
$result[$row[1]][] = $row;
}
+
+
}
} else if ($data_source = 'db') {
if (strtolower($row['relationship']) == 'self' && isset($result[$row['emp_code']])) {
@@ -464,8 +464,6 @@ if (!function_exists('check_self_available_in_family')) {
}
}
-
-
if (!function_exists('name_and_empid_check_in_db')) {
function name_and_empid_check_in_db($family_data, $actionArr)
{
@@ -955,7 +953,6 @@ if (!function_exists('calculate_premium_new')) {
}
}
-
if (!function_exists('transform_excel_data_to_db')) {
function transform_excel_data_to_db($memArr, $actionArr)
{
@@ -1022,12 +1019,19 @@ if (!function_exists('transform_excel_data_to_db')) {
$result['temp']['rata_premimum'] = isset($memArr['temp']['rata_premimum']) ? $memArr['temp']['rata_premimum'] : 0;
$result['policy_details'] = $policy;
+ if(isset($memArr['self_rata_premium'])){
+ $result['self_rata_premium'] = $memArr['self_rata_premium'] ?? 0;
+ }
+
+ if(isset($memArr['data_from'])){
+ $result['data_from'] = $memArr['data_from'] ?? 'excel';
+ }
+
return $result;
}
}
}
-
if (!function_exists('premium_calculation_manager_old')) {
function premium_calculation_manager_old($emp_data, $policy_terms, $slab_details, $default_si = null)
{
@@ -1839,6 +1843,15 @@ if (!function_exists('premium_calculation_manager')) {
//set dependent si to 0
$emp_data['policy_details']['basic_cover_si'] = 0;
$emp_data['policy_details']['premium'] = 0;
+
+ if(isset($emp_data['self_rata_premium']) && !empty($emp_data['self_rata_premium'])){
+ $self_rata_premium = (int)($emp_data['self_rata_premium'] ?? 0);
+ $dependent_rata_premium = (int)($emp_data['policy_details']['rata_premimum'] ?? 0);
+ $actual_rata_premium = abs($dependent_rata_premium - $self_rata_premium);
+ $emp_data['policy_details']['rata_premimum'] = $actual_rata_premium;
+ $emp_data['policy_details']['gst'] = (float) number_format(($emp_data['policy_details']['rata_premimum'] * ($gst / 100)), 2, '.', '');
+ }
+
}else if(strtolower($emp_data['relationship']) != 'self' && $temp_slab_rates[0]['premium_type'] == 1 && ($emp_data['temp']['action'] == 'I' || $emp_data['temp']['action'] == 'A' || $emp_data['temp']['action'] == 'MI')){
$emp_data['policy_details']['basic_cover_si'] = 0;
@@ -1853,7 +1866,6 @@ if (!function_exists('premium_calculation_manager')) {
}
}
-
if (!function_exists('calculate_pro_rata_premimum')) {
function calculate_pro_rata_premimum($premium, $employee_policy_coverage_days, $policy_coverage_days)
{
@@ -1976,7 +1988,6 @@ if (!function_exists('get_emp_policy_records_from_audit_history')) {
}
}
-
if (!function_exists('replace_original_data')) {
function replace_original_data(array $original_data, array $current_data)
{
@@ -2048,7 +2059,6 @@ if (!function_exists('remap_default_age_ratio_into_relationship')) {
}
}
-
if (!function_exists('check_dup_mobileno')) {
function check_dup_mobileno(array $row, array $existing_mobilenos)
{
@@ -2178,7 +2188,6 @@ if (!function_exists('convert_string_to_date')) {
}
}
-
if (!function_exists('transform_enrollment_row_to_inception_row')) {
function transform_enrollment_row_to_inception_row($row)
{
@@ -2414,7 +2423,6 @@ if (!function_exists('check_unit')) {
}
}
-
if (!function_exists('transform_si_excel_row_to_calculatable_format')) {
function transform_si_excel_row_to_calculatable_format(array $employee, array $employee_policy, array $maxage_and_maxcount, array $slab_details, string $applicable_slab_name, string $augmented_si, array $grid_master)
{
@@ -2874,3 +2882,458 @@ if (!function_exists('is_valid_or_empty_email')) {
}
}
+if (!function_exists('validatet_family_floter_rata_premium')) {
+ function validatet_family_floter_rata_premium($family){
+
+ // print_rr($family); die;
+ if (count($family) === 2) {
+ return $family; // skip if only two members
+ }
+
+ $excelCount = count(array_filter($family, fn($r) => ($r['data_from'] ?? '') === 'excel') ?? []);
+ $reset_family_premium = false;
+ $dependentRataGiven = false;
+
+ if($excelCount == 1){
+
+ $selfPremium = 0;
+ $familyPremium = 0;
+
+ foreach ($family as $row) {
+
+ // Get self premium
+ if (isset($row['relationship']) && strtolower($row['relationship']) == 'self') {
+ $selfPremium = (float) ($row['policy_details']['rata_premimum'] ?? 0);
+ }
+
+ // Sum the dependents premium
+ if (isset($row['relationship']) && strtolower($row['relationship']) !== 'self')
+ {
+ $familyPremium += (float) ($row['policy_details']['rata_premimum'] ?? 0);
+ }
+ }
+
+ if($selfPremium > $familyPremium || $selfPremium == $familyPremium){
+ $reset_family_premium = true;
+ }
+ }
+
+ foreach ($family as &$row) {
+
+ // Skip if the member is self
+ if (isset($row['relationship']) && strtolower($row['relationship']) == 'self') {
+ continue;
+ }
+
+ // For dependents
+ if (isset($row['temp']['premium_type']) && $row['temp']['premium_type'] == 1) {
+
+ if (!$dependentRataGiven && isset($row['data_from']) && $row['data_from'] === 'excel') {
+ // First eligible dependent keeps premium
+ $dependentRataGiven = true;
+ } else if(isset($row['data_from']) && $row['data_from'] === 'excel'){
+ $row['policy_details']['rata_premimum'] = 0;
+ $row['policy_details']['gst'] = 0;
+ }
+
+ if($reset_family_premium == true && isset($row['data_from']) && $row['data_from'] === 'excel'){
+ $row['policy_details']['rata_premimum'] = 0;
+ $row['policy_details']['gst'] = 0;
+ }
+
+ }
+
+ }
+
+ return $family;
+ }
+}
+
+
+if (!function_exists('validate_excel_value')) {
+ function validate_excel_value($value, $data_type, $format = null, $allowed_values = null)
+ {
+ switch ($data_type) {
+
+ case 'date':
+ return validate_date_value($value, $format);
+
+ case 'mobile':
+ return validate_mobile_value($value);
+
+ case 'email':
+ return validate_email_value($value);
+
+ case 'vehicle':
+ return validate_indian_vehicle_number($value);
+
+ default:
+ return [
+ 'status' => true,
+ 'error' => null
+ ];
+ }
+ }
+}
+
+if (!function_exists('validate_date_value')) {
+ function validate_date_value($value, $format)
+ {
+ if(empty($value)) {
+ return ['status' => true, 'error' => null]; // allow empty
+ }
+
+ $d = DateTime::createFromFormat($format, $value);
+
+ if ($d && $d->format($format) === $value) {
+ return ['status' => true, 'error' => null];
+ }
+
+ return [
+ 'status' => false,
+ 'error' => "Invalid date format. Expected format: {$format}"
+ ];
+ }
+}
+
+if (!function_exists('validate_mobile_value')) {
+ function validate_mobile_value($value)
+ {
+ if (preg_match('/^[0-9]{10}$/', $value)) {
+ return ['status' => true, 'error' => null];
+ }
+
+ return [
+ 'status' => false,
+ 'error' => "Invalid mobile number. Expected 10 digits."
+ ];
+ }
+}
+
+if (!function_exists('validate_email_value')) {
+ function validate_email_value($value)
+ {
+ if (filter_var($value, FILTER_VALIDATE_EMAIL)) {
+ return ['status' => true, 'error' => null];
+ }
+
+ return [
+ 'status' => false,
+ 'error' => "Invalid email address."
+ ];
+ }
+}
+
+if (!function_exists('validate_indian_vehicle_number')) {
+ function validate_indian_vehicle_number($number)
+ {
+ $number = strtoupper(trim($number));
+
+ // Normal Format:
+ // 2 letters (state) + 2 digits (district) + 1 or 2 letters (series) + 4 digits
+ $normalPattern = '/^[A-Z]{2}[0-9]{2}[A-Z]{1,2}[0-9]{4}$/';
+
+ // BH Series: 22BH1234AA
+ $bhPattern = '/^[0-9]{2}BH[0-9]{4}[A-Z]{2}$/';
+
+ if (preg_match($normalPattern, $number)) {
+ return ['status' => true, 'error' => null];
+ }
+
+ if (preg_match($bhPattern, $number)) {
+ return ['status' => true, 'error' => null];
+ }
+
+ return [
+ 'status' => false,
+ 'error' => "Invalid Vehicle Number"
+ ];
+ }
+}
+
+if (!function_exists('check_user_exist')) {
+ function check_user_exist($row, $col_key, $user_data)
+ {
+ // Get the uploaded value from the column
+ $input_value = trim($row[$col_key]);
+
+ // Loop DB user list
+ foreach ($user_data as $user) {
+
+ // Check if DB has 'first_name' key and matches input
+ if (isset($user['first_name']) && strtolower(trim($user['first_name'])) === strtolower($input_value)) {
+
+ return [
+ 'status' => true,
+ 'error' => null,
+ 'user' => $user,
+ ];
+ }
+ }
+
+ // If no user matched
+ return [
+ 'status' => false,
+ 'error' => "User '{$input_value}' not found in database."
+ ];
+ }
+}
+
+if (!function_exists('check_agent_exist')) {
+ function check_agent_exist($row, $agent_data)
+ {
+ // Get agent code from the uploaded row
+ $agent_code = trim($row[15]); // or use index if needed
+
+ // Loop agent data from DB
+ foreach ($agent_data as $agent) {
+ // Assuming DB keys: agent_code
+ if (isset($agent['agent_code']) && $agent['agent_code'] == $agent_code) {
+ return [
+ 'status' => true,
+ 'error' => null,
+ 'agent' => $agent,
+ ];
+ }
+ }
+
+ // If not matched
+ return [
+ 'status' => false,
+ 'error' => "Agent code '{$agent_code}' not found in database."
+ ];
+ }
+}
+
+if (!function_exists('check_rto_data')) {
+ function check_rto_data($row, $rto_master)
+ {
+ // Vehicle number from uploaded row
+ $vehicle_no = strtoupper(trim($row[2])); // Example: TN10AB1234
+
+ // Must be at least 4 characters to extract RTO
+ if (strlen($vehicle_no) < 4) {
+ return [
+ 'status' => false,
+ 'error' => "Invalid vehicle number format: '{$vehicle_no}'"
+ ];
+ }
+
+ // Extract State (first 2 letters) and RTO Code (next 2 digits)
+ $state_code = substr($vehicle_no, 0, 2); // TN
+ $rto_code = substr($vehicle_no, 2, 2); // 10
+
+ // Validate they are correct format
+ if (!ctype_alpha($state_code) || !ctype_digit($rto_code)) {
+ return [
+ 'status' => false,
+ 'error' => "Vehicle number '{$vehicle_no}' has invalid state or RTO code."
+ ];
+ }
+
+ // Loop RTO master data
+ foreach ($rto_master as $rto) {
+
+ // Expected DB fields: rto_state, rto_code
+ if (
+ isset($rto['rto_state']) &&
+ isset($rto['rto_code']) &&
+ strtoupper($rto['rto_state']) === $state_code &&
+ (string)$rto['rto_code'] === $rto_code
+ ) {
+ return [
+ 'status' => true,
+ 'error' => null,
+ 'rto_data' => $rto
+ ];
+ }
+ }
+
+ // Not found in RTO master
+ return [
+ 'status' => false,
+ 'error' => "RTO '{$state_code} {$rto_code}' not found in RTO master."
+ ];
+ }
+}
+
+if (!function_exists('check_vehicle_type')) {
+ function check_vehicle_type($row, $vehicle_type)
+ {
+ // Vehicle type from uploaded Excel row
+ $input_type = strtolower(trim($row[3])); // Example: CAR
+
+ // Loop vehicle type master
+ foreach ($vehicle_type as $vt) {
+
+ if (isset($vt['vehicle_type']) && strtolower($vt['vehicle_type']) == $input_type) {
+ return [
+ 'status' => true,
+ 'error' => null,
+ 'vehicle_type' => $vt,
+ ];
+ }
+ }
+
+ // Not found in master
+ return [
+ 'status' => false,
+ 'error' => "Vehicle type '{$input_type}' not found in master."
+ ];
+ }
+}
+
+if (!function_exists('check_policy_no')) {
+ function check_policy_no($row, $pt_data)
+ {
+ // Get policy number from Excel row
+ $policy_no = strtolower(trim($row[4]));
+
+ // Empty policy number
+ if ($policy_no === '') {
+ return [
+ 'status' => false,
+ 'error' => "Policy number is empty."
+ ];
+ }
+
+ // Loop all policy transactions (pt_data)
+ foreach ($pt_data as $pt) {
+
+ // Check policy_no exists in DB list
+ if (isset($pt['policy_no']) && strtolower($pt['policy_no']) == $policy_no) {
+ return [
+ 'status' => false,
+ 'error' => "Duplicate policy number '{$policy_no}' found in database."
+ ];
+ }
+ }
+
+ // If no match found → not duplicate
+ return [
+ 'status' => true,
+ 'error' => null
+ ];
+ }
+}
+
+if (!function_exists('check_insurer_exist')) {
+ function check_insurer_exist($row, $insurer_master)
+ {
+ // Get insurer short name from Excel row (col 7)
+ $short_name = strtolower(trim($row[7]));
+
+ foreach ($insurer_master as $insurer) {
+ if (
+ isset($insurer['short_name']) &&
+ strtolower($insurer['short_name']) === $short_name
+ ) {
+ return [
+ 'status' => true,
+ 'error' => null,
+ 'insurer' => $insurer // return entire insurer row for next validation
+ ];
+ }
+ }
+
+ return [
+ 'status' => false,
+ 'error' => "Insurer '{$short_name}' not found in database."
+ ];
+ }
+}
+
+if (!function_exists('check_insurer_branch_exist')) {
+ function check_insurer_branch_exist($row, $insurer_branch_master, $insurer)
+ {
+ // Get branch code from Excel row (col 8)
+ $branch_code = strtolower(trim($row[8]));
+
+ // Loop all branches
+ foreach ($insurer_branch_master as $branch) {
+
+ if (
+ isset($insurer['id']) && $branch['insurer_id'] == $insurer['id'] &&
+ strtolower($branch['branch_code']) == $branch_code
+ ) {
+ return [
+ 'status' => true,
+ 'error' => null,
+ 'branch' => $branch
+ ];
+ }
+ }
+
+ return [
+ 'status' => false,
+ 'error' => "Branch code '{$branch_code}' not found in database."
+ ];
+ }
+}
+
+if (!function_exists('check_nhance_branch')) {
+ function check_nhance_branch($row, $nhance_branch_master)
+ {
+ // Get branch name from Excel row (col 8)
+ $branch_name = strtolower(trim($row[1]));
+
+ // Loop all branches
+ foreach ($nhance_branch_master as $branch) {
+
+ if (
+ isset($branch['branch_name']) &&
+ strtolower($branch['branch_name']) == $branch_name
+ ) {
+ return [
+ 'status' => true,
+ 'error' => null,
+ 'branch' => $branch
+ ];
+ }
+ }
+
+ return [
+ 'status' => false,
+ 'error' => "Branch '{$branch_name}' not found in database."
+ ];
+ }
+}
+
+if (!function_exists('calculate_gst_amount')) {
+ function calculate_gst_amount($row) {
+
+ // Extract values
+ $base_premium = (float)trim($row[16]);
+ $non_commission_premium_amount = (float)trim($row[17]);
+ $tp_premium = (float)trim($row[18]);
+ $igst = (float)trim($row[19]);
+ $cgst = (float)trim($row[20]);
+ $sgst = (float)trim($row[21]);
+
+ // Total GST percentage
+ $gst_percentage = $igst + $cgst + $sgst;
+
+ // Step 1: Choose taxable amount
+ if ($non_commission_premium_amount > 0) {
+ // GST on non-commission premium
+ $taxable_amount = $non_commission_premium_amount;
+ } else {
+ // GST on base premium + TP premium
+ $taxable_amount = $base_premium + $tp_premium;
+ }
+
+ // Step 2: GST Amount calculation
+ $gst_amount = ($taxable_amount * $gst_percentage) / 100;
+
+ return round($gst_amount, 2);
+ }
+}
+
+
+
+
+
+
+
+
+
diff --git a/app/Helpers/sendMailNotification.php b/app/Helpers/sendMailNotification.php
index fae31ef5..cc46a3cd 100755
--- a/app/Helpers/sendMailNotification.php
+++ b/app/Helpers/sendMailNotification.php
@@ -381,7 +381,7 @@ class sendMailNotification
}
$table_content .= $policy_name_for_policy_type . '';
- $table_content .= '| Name | '; @@ -1554,7 +1554,7 @@ class sendMailNotification // Generate summary table for addon if applicable if (count($Addon_list) > 0) { $table_content .= '|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Name | '; @@ -1709,7 +1709,7 @@ class sendMailNotification // Generate summary table for addon if applicable if (count($Addon_list) > 0) { $table_content .= '||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Name | '; @@ -1865,7 +1865,7 @@ class sendMailNotification if (count($Addon_list) > 0) { $table_content .= '|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| " . $ct . ""; endif; ?> @@ -448,7 +449,7 @@ table.dataTable tbody td { |
" . $ut . "";
endif;
?>
@@ -486,6 +487,18 @@ table.dataTable tbody td {
+
+
+
+
+
+
+
@@ -849,6 +862,13 @@ table.dataTable tbody td {
var table;
$(document).ready(function () {
+ $('#nhance_branch_id').select2();
+
+ $('#nhance_branch_id')
+ .val(null) // ✅ MUST be null
+ .trigger('change.select2'); // ✅ correct trigger
+
+
var incentiveMonthPicker = flatpickr("#incentive_month", {
dateFormat: "Y-m-d", // real value stored (hidden)
altInput: true, // show a user-friendly display
@@ -858,9 +878,13 @@ table.dataTable tbody td {
table = $('#user-table').DataTable({
scrollX: true,
+ // dom: "<'row'<'col-sm-3'f><'col-sm-9'B>>" +
+ // "<'row'<'col-sm-12'tr>>" +
+ // "<'row'<'col-sm-5'i><'col-sm-7'p>>",
dom: "<'row'<'col-sm-3'f><'col-sm-9'B>>" +
- "<'row'<'col-sm-12'tr>>" +
- "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+ "<'row'<'col-sm-12'tr>>" +
+ "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
+ lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
buttons: [
// {
// extend: 'collection',
@@ -983,6 +1007,18 @@ table.dataTable tbody td {
}
});
+ // IMPORTANT — DataTables draw event REF: TTS
+ table.on('draw.dt', function () {
+
+ let rowCount = $('#scroll-horizontal-datatable').DataTable().rows({ filter: 'applied' }).count();
+
+ if (rowCount <= 2) {
+ $('.dataTables_scrollBody').css('overflow', 'inherit');
+ } else {
+ $('.dataTables_scrollBody').css('overflow', 'auto');
+ }
+ });
+
$('#team').multiselect({
@@ -1022,7 +1058,8 @@ table.dataTable tbody td {
type: "GET",
dataType: 'json',
success: function (res) {
- console.log(res)
+ console.log(":():",res);
+ console.log(":():",res.data.nhance_branch_id);
$('#updateModal').modal('show');
$('#role').val('')
$('#UserForm').attr('action', '');
@@ -1033,6 +1070,18 @@ table.dataTable tbody td {
$('#mobile').val(res.data.mobile);
$('#emp_code').val(res.data.emp_code);
$('#role option[value="' + res.data.role + '"]').prop('selected', true);
+ if (res.data.nhance_branch_id !== null &&
+ res.data.nhance_branch_id !== "" &&
+ res.data.nhance_branch_id !== 0) {
+ $('#nhance_branch_id')
+ .val(res.data.nhance_branch_id)
+ .trigger('change.select2'); // ✅ correct trigger
+ } else {
+ $('#nhance_branch_id')
+ .val(null) // ✅ MUST be null
+ .trigger('change.select2'); // ✅ correct trigger
+ }
+
$('#btnSubmit').html('Update');
$.each(res.userTeamData, function(index, item) {
@@ -1769,6 +1818,7 @@ table.dataTable tbody td {
$('#email').val('');
$('#mobile').val('');
$('#emp_code').val('');
+ $('#nhance_branch_id').val('0');
$('#UserForm').attr('action', '');
let myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));
myModal.show(); // open modal
diff --git a/app/Views/add_image_list.php b/app/Views/add_image_list.php
index 46332236..ff3770a1 100755
--- a/app/Views/add_image_list.php
+++ b/app/Views/add_image_list.php
@@ -16,6 +16,9 @@ table.dataTable thead th {
max-width: 98% !important;
}
+
+.dataTables_length label {height: 21px !important;}
+
@@ -36,9 +39,9 @@ table.dataTable thead th {
@@ -117,9 +119,13 @@ $(document).ready(function() {
if (ticketsTable.length) {
ticketsTable.DataTable({
scrollX: true,
+ // dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + // Filter left, buttons right
+ // "<'row'<'col-sm-12'tr>>" +
+ // "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
dom: "<'row'<'col-sm-2'f><'col-sm-10 text-right'B>>" + // Filter left, buttons right
"<'row'<'col-sm-12'tr>>" +
- "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+ "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
+ lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
buttons: [
{
extend: 'collection',
diff --git a/app/Views/bds_report_Insurer_wise_Data.php b/app/Views/bds_report_Insurer_wise_Data.php
index d020fb8c..b122a7e1 100644
--- a/app/Views/bds_report_Insurer_wise_Data.php
+++ b/app/Views/bds_report_Insurer_wise_Data.php
@@ -23,6 +23,7 @@ table.dataTable tbody td {
#scroll-horizontal-datatable tfoot .right-align-input {
text-align: right !important;
}
+.dataTables_length label {height: 21px !important;}
@@ -74,9 +75,13 @@ table.dataTable tbody td {
if (ticketsTable.length) {
ticketsTable.DataTable({
scrollX: true,
+ // dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
+ // "<'row'<'col-sm-12'tr>>" +
+ // "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
- "<'row'<'col-sm-12'tr>>" +
- "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+ "<'row'<'col-sm-12'tr>>" +
+ "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
+ lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
buttons: [
{
extend: 'collection',
diff --git a/app/Views/bds_report_bap_wise_data.php b/app/Views/bds_report_bap_wise_data.php
index 928ad3a4..812f0abf 100644
--- a/app/Views/bds_report_bap_wise_data.php
+++ b/app/Views/bds_report_bap_wise_data.php
@@ -23,6 +23,7 @@ table.dataTable tbody td {
#scroll-horizontal-datatable tfoot .right-align-input {
text-align: right !important;
}
+.dataTables_length label {height: 21px !important;}
@@ -76,9 +77,13 @@ table.dataTable tbody td {
if (ticketsTable.length) {
ticketsTable.DataTable({
scrollX: true,
+ // dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
+ // "<'row'<'col-sm-12'tr>>" +
+ // "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
- "<'row'<'col-sm-12'tr>>" +
- "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+ "<'row'<'col-sm-12'tr>>" +
+ "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
+ lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
buttons: [
{
extend: 'collection',
diff --git a/app/Views/bds_tat_wise_report.php b/app/Views/bds_tat_wise_report.php
index c47cc259..6d904cec 100644
--- a/app/Views/bds_tat_wise_report.php
+++ b/app/Views/bds_tat_wise_report.php
@@ -19,6 +19,7 @@
.right-align-input {
text-align: right;
}
+ .dataTables_length label {height: 21px !important;}
@@ -91,9 +92,9 @@
if (ticketsTable.length) {
ticketsTable.DataTable({
scrollX: true,
- dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
- "<'row'<'col-sm-12'tr>>" +
- "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+ // dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
+ // "<'row'<'col-sm-12'tr>>" +
+ // "<'row'<'col-sm-5'i><'col-sm-7'p>>",
// buttons: [
// {
// extend: 'csv',
@@ -107,6 +108,10 @@
// },
// ],
+ dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" +
+ "<'row'<'col-sm-12'tr>>" +
+ "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
+ lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
buttons: [
{
extend: 'collection',
diff --git a/app/Views/business_team_list.php b/app/Views/business_team_list.php
index 3aeb2ed0..3a91bf1e 100644
--- a/app/Views/business_team_list.php
+++ b/app/Views/business_team_list.php
@@ -43,6 +43,7 @@
color: #16181b !important;
cursor: pointer !important;
}
+ .dataTables_length label {height: 21px !important;}
@@ -338,9 +339,13 @@
if (ticketsTable.length) {
ticketsTable.DataTable({
+ // dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
+ // "<'row'<'col-sm-12'tr>>" +
+ // "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
dom: "<'row'<'col-sm-6'f><'col-sm-6 text-right'B>>" + // Filter left, buttons right
- "<'row'<'col-sm-12'tr>>" +
- "<'row'<'col-sm-5'i><'col-sm-7'p>>", // Pagination at the bottom, without page length selector
+ "<'row'<'col-sm-12'tr>>" +
+ "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
+ lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
buttons: [
{
extend: 'collection',
diff --git a/app/Views/cd_master_list.php b/app/Views/cd_master_list.php
index c0ff4584..139a0c75 100755
--- a/app/Views/cd_master_list.php
+++ b/app/Views/cd_master_list.php
@@ -17,6 +17,8 @@ table.dataTable thead th {
max-width: 98% !important;
}
+.column-header {margin-right: 10px;}
+
.custom-dropdown-menu {
display: none;
position: absolute;
@@ -49,6 +51,8 @@ table.dataTable thead th {
.dataTables_filter {
position: absolute;
}
+.dataTables_length label {height: 21px !important;}
+
@@ -70,15 +74,15 @@ table.dataTable thead th {
+
+
+
+
+
+
+
+
diff --git a/app/Views/hr_activity_history.php b/app/Views/hr_activity_history.php
index 8f52d592..00b45f96 100644
--- a/app/Views/hr_activity_history.php
+++ b/app/Views/hr_activity_history.php
@@ -47,6 +47,8 @@ table.dataTable tbody td {
#hr_activity_history_append_area tbody tr {
background-color: transparent !important;
}
+.dataTables_length label {height: 21px !important;}
+
@@ -98,12 +100,26 @@ $(document).ready(function () {
var table = ticketsTable.DataTable({
scrollX: true,
+ // dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
+ // "<'row'<'col-sm-12'tr>>" +
+ // "<'row'<'col-sm-5'i><'col-sm-7'p>>",
dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
"<'row'<'col-sm-12'tr>>" +
- "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+ "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
+ lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
language: {
- search: "_INPUT_",
- searchPlaceholder: "Search..."
+ search: `
+
+ _INPUT_
+
+
+
+
+ `,
+ searchPlaceholder: "Search",
+ emptyTable: 'No Data found '
},
paging: true,
pageLength: 10,
diff --git a/app/Views/hr_file_upload.php b/app/Views/hr_file_upload.php
index 9d5cf1e5..5df2f43e 100644
--- a/app/Views/hr_file_upload.php
+++ b/app/Views/hr_file_upload.php
@@ -3,6 +3,8 @@
padding: 5px 7px 5px 0 !important;
color: #000000;
}
+ .dataTables_length label {height: 21px !important;}
+
@@ -143,7 +145,7 @@
|
|
- | ' . $file['first_name'] . '' ?> |
+ ' . $file['first_name'] . '' ?> |
|
|
@@ -182,9 +185,13 @@
$(document).ready(function() {
$('#tickets-table').DataTable({
+ // dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
+ // "<'row'<'col-sm-12'tr>>" +
+ // "<'row'<'col-sm-5'i><'col-sm-7'p>>",
dom: "<'row'<'col-12 d-flex justify-content-between align-items-center'<'datatable-search dataTables_filter'f><'datatable-buttons dt-buttons'B>>>" +
- "<'row'<'col-sm-12'tr>>" +
- "<'row'<'col-sm-5'i><'col-sm-7'p>>",
+ "<'row'<'col-sm-12'tr>>" +
+ "<'row align-items-center'<'col-5 text-start'i><'col-7 d-flex justify-content-end align-items-center'<'me-2'l>p>>",
+ lengthMenu: [[10, 20, 50, 100], [10, 20, 50, 100]],
buttons: [
{
text: ' Add ',
diff --git a/app/Views/insurer_or_tpa_data.php b/app/Views/insurer_or_tpa_data.php
index 33e34bf2..902e5419 100755
--- a/app/Views/insurer_or_tpa_data.php
+++ b/app/Views/insurer_or_tpa_data.php
@@ -101,13 +101,13 @@
-
+
@@ -171,10 +171,10 @@
$(document).ready(function() {
- // var policy_issue_datePicker = flatpickr("#policy_issue_date", {
- // dateFormat: "d/m/Y",
- // allowInput: false,
- // });
+ var policy_issue_datePicker = flatpickr("#policy_issue_date", {
+ dateFormat: "d/m/Y",
+ allowInput: false,
+ });
$('#insurer_or_tpa, #action_type').on('change', togglePolicyIssueDate);
});
@@ -796,15 +796,15 @@
function togglePolicyIssueDate() {
let insurer = $('#insurer_or_tpa').val();
let action = $('#action_type').val();
- // if (insurer === 'insurer' && action === 'import') {
- // $('.policy_issue_date_row').show();
- // $('#policy_issue_date').attr('required', true);
- // $('#policy_issue_date_label').html('Policy Issue Date *');
- // } else {
- // $('.policy_issue_date_row').hide();
- // $('#policy_issue_date').removeAttr('required').val('');
- // $('#policy_issue_date_label').text('Policy Issue Date');
- // }
+ if (insurer === 'insurer' && action === 'import') {
+ $('.policy_issue_date_row').show();
+ $('#policy_issue_date').attr('required', true);
+ $('#policy_issue_date_label').html('Policy Issue Date *');
+ } else {
+ $('.policy_issue_date_row').hide();
+ $('#policy_issue_date').removeAttr('required').val('');
+ $('#policy_issue_date_label').text('Policy Issue Date');
+ }
}
function fetchTpaIdFromTpa(){
diff --git a/app/Views/insurer_statement_list.php b/app/Views/insurer_statement_list.php
index 197d19ed..3728bfff 100644
--- a/app/Views/insurer_statement_list.php
+++ b/app/Views/insurer_statement_list.php
@@ -164,6 +164,15 @@
margin-left: 5px;
border-radius: 6px;
}
+ th.no-sort {
+ pointer-events: none; /* disable click */
+ }
+
+ th.no-sort:before,
+ th.no-sort:after {
+ display: none !important; /* hide DataTables sorting arrows */
+ }
+
@@ -205,11 +214,12 @@
+
+
-
+
+
+
+
+
+
| ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||