';
+ // Kint::dump($excel_data);
+ 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;
+
+ $excelErrorData['excel_data'] = $finalArray;
+ return $excelErrorData;
- }else if($error_data->error_type == 2){
+ }else if($error_data->error_type == 2){
- $allErrors = [];
- $typeTowArray = [];
+ $allErrors = [];
+ $typeTowArray = [];
- foreach ($error_data->error_data as $index => $item) {
+ foreach ($error_data->error_data as $index => $item) {
- foreach ($item as $field) {
- if (!isset($allErrors[$index])) {
- $allErrors[$index] = [];
+ foreach ($item as $field) {
+ if (!isset($allErrors[$index])) {
+ $allErrors[$index] = [];
+ }
+ $allErrors[$index] = array_merge($allErrors[$index], $field->error);
}
- $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)
+ // dd(array_keys($allErrors));
+ foreach ($allErrors as $key => $value){
+ // echo $key;
+ // print_r($value);
+ foreach($excel_data as $excel_data_index => $excel_data_value)
{
- $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;
+ 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;
+
+ }
+ // 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;
+
}
- $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
+ }
+ }
- }
+ // ---------------------------------------------------------------------------------
- }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 getFileMetaDataByFileId($file_id, $status = 'success')
+ {
-
-
- }
-
-
-// ---------------------------------------------------------------------------------
-
-public function getFileMetaDataByFileId($file_id, $status = 'success'){
-
- $data = $this->fileModel
+ $data = $this->fileModel
->select('files.*, clients.client_name, clients.short_name, policy_type.policy_type as policy_name,client_branch.branch_code')
->join('clients', 'clients.id = files.client_id')
->join('client_policy', 'client_policy.id = files.policy_id')
@@ -2016,11 +2146,9 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){
return ['msg_txt' => $msg_txt, 'user_id' => $user_id, 'url' => $url, 'status' => $status, 'title' => $msg_title];
}
-
-
- public function setPullNotification($data){
-
-
+
+ public function setPullNotification($data)
+ {
$array = ['message_text' => $data['msg_txt'], 'action_url' => $data['url'], 'msg_status' => $data['status'], 'msg_title' => $data['title']];
$jsonEncodeData = json_encode($array);
@@ -2031,17 +2159,14 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){
'role_id' => NULL,
'team_id' => NULL,
'message_type' => '1to1',
- ];
+ ];
-
- $this->messageModel->insert($msg_data);
-
-
-}
+ $this->messageModel->insert($msg_data);
+ }
public function employeesEnrollmentInsert($params)
{
- // dd($this->request);
+ // dd($this->request);
helper('excel_util_helper');
//get file name
$file_id = $params['file_id'];
@@ -2059,10 +2184,10 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){
if(!file_exists($file_name_with_path))
{
//file not found update status and reason
- $message = "Physical file not found";
+ $message = "Physical file not found";
// echo $message;
$this->myLogger->logme('error',($message . ' for file id ' . $file_id));
- $this->fileModel->where('id', $file_id)->set(['status' => 'failed','reason' => json_encode(['error_summary' => array_count_values([5]),'error_data' => $message])])->update();
+ $this->fileModel->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);
}
@@ -2077,7 +2202,8 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){
$allowedHighestColumn = end($columns_to_check);
$excel_data = $sheet->rangeToArray('A1:' . $allowedHighestColumn['col_cell_name'] . $highestRowAndColumn['row']);
// print_r($keys);die();
- //get existing units in the current branch
+
+ //get existing units in the current branch
$existing_units = $this->clientBranchModel->getExisitingUnits(client_id: $file['client_id'],client_branch_id: $file['client_branch_id']);
//remove header
unset($excel_data[0]);
@@ -2109,11 +2235,11 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){
{
$temp_unit = $existing_units[0];
}
-
+
$value['emp_code'] = $row[1];
$value['name'] = $row[2];
$value['doj'] = (!empty($row[3]) ? change_date_format($row[3],'d-M-Y','Y-m-d') : null );
- $value['gender'] = $row[4];
+ $value['gender'] = normalizeGender($row[4]);
$value['relationship'] = ucfirst(trim($row[5]));
$value['dob'] = change_date_format($row[6],'d-M-Y','Y-m-d');
$value['email_corporate'] = $row[7];
@@ -2149,10 +2275,10 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){
$policy_data['date_coverage'] = $row[13] != "" && $row[13] != null ? change_date_format($row[13],'d-M-Y','Y-m-d') : null;
$policy_data['client_policy_id'] = $file['policy_id'];
- $employee = $this->employeeModel->checkExistingEmployee($value,$file['client_branch_id']);
- unset($value['temp']);
+ $employee = $this->employeeModel->checkExistingEmployee($value,$file['client_branch_id']);
+ unset($value['temp']);
//save employee table
- // dd($employee['id']);
+ // dd($employee['id']);
if($employee !== null)
{
$value['updated_by'] = $file['created_by'];
@@ -2170,11 +2296,11 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){
$value = ExcelSanitizeHelper::sanitizeArrayData($value);
$this->employeeModel->save($value);
- if (isset($value['id']))
- { $emp_id = $value['id']; }
- else { $emp_id = $this->employeeModel->getInsertID();
+ if (isset($value['id']))
+ { $emp_id = $value['id']; }
+ else { $emp_id = $this->employeeModel->getInsertID();
$log_message .= $emp_id;
- }
+ }
// $emp_id = $this->employeeModel->getInsertID();
// if($emp_id != 0){ $log_message .= $emp_id; }
@@ -2232,8 +2358,8 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){
'employee_id' => $emp_id,
'mail_type' => 'member_welcome_mail',
];
- //store email and mail content via helper to send notification
- $emp_emails[] = sendMailNotification::sendMailNotification('member_welcome_mail', $params);
+ //store email and mail content via helper to send notification
+ $emp_emails[] = sendMailNotification::sendMailNotification('member_welcome_mail', $params);
}
}
}// endof if row is empty check
@@ -2241,7 +2367,7 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){
// dd($emp_emails);
- // for bulk mail queue job push
+ // for bulk mail queue job push
if (!empty($emp_emails) && count($emp_emails) > 0) {
$emp_emails = array_chunk($emp_emails, 20);
@@ -2259,6 +2385,140 @@ public function getFileMetaDataByFileId($file_id, $status = 'success'){
return true;
- }//end of employeesEnrollmentInsert
+ } //end of employeesEnrollmentInsert
+ // --------- MEMBER DATA AND INCEPTION DATA COMPARISION ------------------------------------------------------------------------
+
+ public function compareMemberDataAndInceptionData($params)
+ {
+ $file_id = $params['file_id'] ?? null;
+ if (empty($file_id)) {
+ return ['status' => false, 'msg' => 'File ID is missing'];
+ }
+
+ // ✅ Get File Data
+ $file = $this->fileModel->where(['is_active' => 1, 'id' => $file_id])->first();
+ if (empty($file)) {
+ return ['status' => false, 'msg' => 'File not found in DB'];
+ }
+
+ // ✅ Get Client Policy Data
+ $client_policy_data = $this->clientPolicyModel->where(['is_active' => 1, 'id' => $file['policy_id']])->first();
+ if (empty($client_policy_data)) {
+ return ['status' => false, 'msg' => 'Client policy data not found in DB (policy_id: ' . $file['policy_id'] . ')'];
+ }
+
+ // ✅ Get Lead Data
+ $leadModel = new LeadsModel();
+ $lead_data = $leadModel->where(['is_active' => 1, 'id' => $client_policy_data['is_from_lead']])->first();
+ if (empty($lead_data)) {
+ return ['status' => false, 'msg' => 'Lead data not found in DB (lead_id: ' . $client_policy_data['is_from_lead'] . ')'];
+ }
+
+ // ✅ Define File Paths
+ $inception_file_path = !empty($file['file_name']) ? WRITEPATH . "uploads/excel/" . $file['file_name'] : '';
+ $member_file_path = !empty($lead_data['file_name']) ? WRITEPATH . "uploads/lead_files/" . $lead_data['file_name'] : '';
+
+ // ✅ Check Inception File
+ if (empty($file['file_name']) || !file_exists($inception_file_path)) {
+ $message = empty($file['file_name']) ? "Inception file name is missing" : "Inception physical file not found";
+ $this->myLogger->logme('error', "$message for file id $file_id");
+ $this->fileModel->update($file_id, [
+ 'status' => 'failed',
+ 'reason' => json_encode(['error_summary' => [5], 'error_data' => $message])
+ ]);
+ return ['error_summary' => [5], 'error_data' => $message];
+ }
+
+ // ✅ Check Member File
+ if (empty($lead_data['file_name']) || !file_exists($member_file_path)) {
+ $message = empty($lead_data['file_name']) ? "Member file name is missing" : "Member data physical file not found";
+ $this->myLogger->logme('error', "$message for lead id {$lead_data['id']}");
+ $this->fileModel->update($file_id, [
+ 'status' => 'failed',
+ 'reason' => json_encode(['error_summary' => [5], 'error_data' => $message])
+ ]);
+ return ['error_summary' => [5], 'error_data' => $message];
+ }
+
+
+ // ✅ Read Inception Excel
+ $inception_columns = $this->inception_excel_columns;
+ $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($inception_file_path);
+ $sheet = $spreadsheet->getActiveSheet();
+ $highestRow = $sheet->getHighestDataRow();
+ $allowedColumn = end($inception_columns)['col_cell_name'];
+ $inception_data = $sheet->rangeToArray("A1:{$allowedColumn}{$highestRow}");
+ $inception_data = ExcelSanitizeHelper::sanitizeArrayData($inception_data);
+
+ // ✅ Read Member Excel
+ $member_columns = $this->member_data_excel_columns;
+ $spreadsheet2 = \PhpOffice\PhpSpreadsheet\IOFactory::load($member_file_path);
+ $sheet2 = $spreadsheet2->getSheet(0);
+ $highestRow2 = $sheet2->getHighestDataRow();
+ $allowedColumn2 = end($member_columns)['col_cell_name'];
+ $member_data = $sheet2->rangeToArray("A1:{$allowedColumn2}{$highestRow2}");
+ $member_data = ExcelSanitizeHelper::sanitizeArrayData($member_data);
+
+ // dd($inception_data, $member_data);
+
+ // ✅ Compare Inception Data with Member Data
+ $result = ['error_type' => 2, 'error_summary' => [], 'error_data' => []];
+
+ $inception_data_count = count($inception_data);
+ $member_data_count = count($member_data);
+
+ if ($inception_data_count !== $member_data_count) {
+ $result['error_summary'][] = 15;
+ $result['error_message'] = "
+ Inception Data Count:
+ {$inception_data_count}
+ Member Data Count:
+ {$member_data_count}";
+ }
+
+ foreach ($inception_data as $inception_key => $inception_row) {
+
+ // 🔹 If inception row is empty → stop all further processing
+ if (check_row_is_empty_or_null($inception_row)) {
+ break;
+ }
+
+ $match_found = false;
+
+ foreach ($member_data as $member_row) {
+ if (
+ $inception_row[1] == $member_row[1] && // emp_id / emp_code
+ $inception_row[2] == $member_row[2] && // name_of_emp_dep / name
+ $inception_row[5] == $member_row[3] && // relationship
+ normalizeGender($inception_row[4]) == normalizeGender($member_row[4]) && // gender
+ $inception_row[3] == $member_row[5] && // dob
+ $inception_row[13] == $member_row[7] && // email
+ $inception_row[12] == $member_row[8] // phone / mobile
+ ) {
+ $match_found = true;
+ break;
+ }
+ }
+
+ if (!$match_found) {
+ array_push($result['error_summary'], 14);
+ $result['error_data'][$inception_key]['sno']['error'][] = "This inception row was not found in the member data list.";
+ }
+ }
+
+ // ✅ Handle Result
+ if (!empty($result['error_summary'])) {
+ $result['error_summary'] = array_count_values($result['error_summary']);
+ $this->fileModel->update($file_id, [
+ 'status' => 'failed',
+ 'reason' => json_encode($result)
+ ]);
+ $this->myLogger->logme('error', "File ID $file_id comparison failed");
+ } else {
+ Jobs::addJob(['job_name' => 'excelFileDataValidation', 'payload' => ['file_id' => $file_id]]);
+ }
+
+ return $result;
+ }
}
\ No newline at end of file
diff --git a/app/Controllers/JobWorker.php b/app/Controllers/JobWorker.php
index 50c9820b..1dbf51b5 100755
--- a/app/Controllers/JobWorker.php
+++ b/app/Controllers/JobWorker.php
@@ -171,6 +171,10 @@ class JobWorker extends AdminController
'type' => 'CC', // Handler Category
'handler' => 'App\Controllers\LeadsController',
],
+ 'compareMemberDataAndInceptionData' => [
+ 'type' => 'CC', // Handler Category
+ 'handler' => 'App\Controllers\EmployeeServiceController',
+ ],
];
diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php
index 115b5176..731202da 100644
--- a/app/Controllers/LeadsController.php
+++ b/app/Controllers/LeadsController.php
@@ -665,7 +665,10 @@ class LeadsController extends BaseController
if ($value['lead_form_type'] == 1) {
//for this push the job to the calculateMembersDemography() function
$job_details = new Jobs();
- $r = Jobs::addJob(['job_name' => 'memberDataListExcelFileFormatValidation', 'payload' => [
+ // $r = Jobs::addJob(['job_name' => 'memberDataListExcelFileFormatValidation', 'payload' => [
+ // 'lead_id' => $insert,
+ // ]]);
+ $r = Jobs::addJob(['job_name' => 'calculateMembersDemography', 'payload' => [
'lead_id' => $insert,
]]);
}
@@ -773,7 +776,7 @@ class LeadsController extends BaseController
$multi_file_data = [];
foreach ($files as $index => $value) {
- $file_name = file_Upload($value, $uploadFilePath);
+ $file_name = file_Upload_for_lead($value, $uploadFilePath);
$multi_file_data[] = [
'file_name' => $file_name,
'docs_name' => $docs_names[$index],
@@ -809,7 +812,10 @@ class LeadsController extends BaseController
if (!empty($lead_form_type) && $lead_form_type == 1 && $key == 0) {
//for this push the job to the calculateMembersDemography() function
$job_details = new Jobs();
- $r = Jobs::addJob(['job_name' => 'memberDataListExcelFileFormatValidation', 'payload' => [
+ // $r = Jobs::addJob(['job_name' => 'memberDataListExcelFileFormatValidation', 'payload' => [
+ // 'lead_id' => $lead_id,
+ // ]]);
+ $r = Jobs::addJob(['job_name' => 'calculateMembersDemography', 'payload' => [
'lead_id' => $lead_id,
]]);
log_message('info', "calculateMembersDemography JOB PUSHED");
@@ -1024,14 +1030,7 @@ class LeadsController extends BaseController
// 3. Optimize lead data query with specific field selection
$lead_data = $this->leadsModel
->select('
- leads.id,
- leads.policy_type_id,
- leads.lead_type,
- leads.source_policy_id,
- leads.policy_end_date,
- leads.lead_form_type,
- leads.created_by,
- leads.client_name,
+ leads.*,
lead_files.status as demography_file_status,
policy_type.question_json,
policy_type.policy_type,
@@ -1090,6 +1089,7 @@ class LeadsController extends BaseController
// 7. Define mail templates as constants or config
$mail_content = $this->getMailTemplate();
+ $placement_mail_content = $this->getMailTemplate('placement');
$subject = $this->getSubjectTemplate($lead_data);
// 8. Pre-calculate sum assured only for GPA
@@ -1098,7 +1098,7 @@ class LeadsController extends BaseController
// 9. Transform mail content once
$data['mail_content'] = $this->transformMailContent($lead_data, $mail_content, $data['page_name']);
$data['subject'] = $this->transformMailContent($lead_data, $subject, $data['page_name']);
- $data['placement_mail_content'] = $this->transformMailContent($lead_data, $mail_content, 'Placement');
+ $data['placement_mail_content'] = $this->transformMailContent($lead_data, $placement_mail_content, 'Placement');
$data['placement_subject'] = $this->transformMailContent($lead_data, $subject, 'Placement');
// 10. Combine related queries
@@ -1151,24 +1151,43 @@ class LeadsController extends BaseController
}
// 13. Extract mail template to separate method for reusability
- private function getMailTemplate()
- {
- return '
- Dear Sir,
- Greetings From Nhance India!
- Please find attached the {{RFQ_OR_QCR}} for {{POLICY_TYPE}} policy pertaining to {{CLIENT_NAME}}.
- Kindly request you to share the competitive quotes at the earliest.
- In case of any query, please feel free to contact us.
- Thank You!
- Best regards,
+ private function getMailTemplate( $template_type = "" )
+ {
+ if($template_type == 'placement'){
+ return '
+ Dear Sir,
+ Greetings From Nhance India!
+ Please find attached the {{RFQ_OR_QCR}} for {{POLICY_TYPE}} policy pertaining to {{CLIENT_NAME}}.
+ Kindly request you to issue the policy at the earliest.
+ In case of any query, please feel free to contact us.
+ Thank You!
+ Best regards,
+
+
+ {{LOGGED_USER_NAME}}
+ Mobile: {{LOGGED_USER_MOBILE}}
+
-
- {{LOGGED_USER_NAME}}
- Mobile: {{LOGGED_USER_MOBILE}}
-
-
- 
- ';
+
+ ';
+ }else{
+ return '
+ Dear Sir,
+ Greetings From Nhance India!
+ Please find attached the {{RFQ_OR_QCR}} for {{POLICY_TYPE}} policy pertaining to {{CLIENT_NAME}}.
+ Kindly request you to share the competitive quotes at the earliest.
+ In case of any query, please feel free to contact us.
+ Thank You!
+ Best regards,
+
+
+ {{LOGGED_USER_NAME}}
+ Mobile: {{LOGGED_USER_MOBILE}}
+
+
+
+ ';
+ }
}
// 14. Extract subject template to separate method
@@ -3680,7 +3699,7 @@ class LeadsController extends BaseController
private function prepareClientData($data)
{
return [
- 'client_type' => $data['client_type'] ?? null,
+ 'client_type' => 1,
'entity_type_id' => $data['entity_type_id'] ?? null,
'client_code' => $data['client_code'] ?? null,
'client_name' => $data['client_name'] ?? null,
@@ -3730,6 +3749,8 @@ class LeadsController extends BaseController
'policy_start_date' => $data['policy_start_date'],
'policy_end_date' => $data['policy_end_date'],
'policy_status' => 1,
+ 'policy_entry_from' => 3,
+ 'is_from_lead' => $data['id'],
];
$policy_type_id = $data['policy_type_id'];
@@ -5273,10 +5294,10 @@ class LeadsController extends BaseController
'filePath' => $fullPath
];
} else {
- log_message('warning', 'File name is empty for ID: ' . $id);
+ log_message('error', 'File name is empty for ID: ' . $id);
}
} else {
- log_message('warning', 'File does not exist at path: ' . $fullPath);
+ log_message('error', 'File does not exist at path: ' . $fullPath);
}
} else {
log_message('warning', 'No active lead file found for ID: ' . $id . ' and lead_id: ' . $lead_id);
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index 9e4a5a08..58618abf 100755
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -1350,6 +1350,16 @@ class MasterController extends AdminController
// === INSERT ===
if (empty($id)) {
+ $cd_acc_count = $this->CDMasterModel->where('is_active', 1)
+ ->where('client_id', $data['client_id'])
+ ->where('insurer_id', $data['insurer_id'])
+ ->where('insurer_branch_id', $data['insurer_branch_id'])
+ ->countAllResults();
+
+ if($cd_acc_count > 0){
+ return $this->respond(['status' => false, 'message' => 'A CD account has already been created for this client, insurer, and insurer branch combination.'], 200);
+ }
+
$this->myLogger->logme("error", 'Performing INSERT operation.');
$insert = $this->CDMasterModel->insert($data);
$this->myLogger->logme("error", 'Insert result: ' . json_encode($insert));
@@ -1574,6 +1584,15 @@ class MasterController extends AdminController
$data['insurer_branch_id'] = $insurer_branch_id;
+ $cd_acc_count = $this->CDMasterModel->where('is_active', 1)
+ ->where('client_id', $data['client_id'])
+ ->where('insurer_id', $data['insurer_id'])
+ ->where('insurer_branch_id', $data['insurer_branch_id'])
+ ->countAllResults();
+
+ if($cd_acc_count > 0){
+ return $this->respond(['status' => false, 'message' => 'A CD account has already been created for this client, insurer, and insurer branch combination.'], 200);
+ }
// array with data for CD Traction table
$cd_tranction_data = [
@@ -1617,6 +1636,24 @@ class MasterController extends AdminController
}
}
+ public function checkDuplicateCdAccount()
+ {
+ $data = $this->request->getGet();
+
+ $cd_acc_count = $this->CDMasterModel
+ ->where('is_active', 1)
+ ->where('client_id', $data['client_id'])
+ ->where('insurer_id', $data['insurer_id'])
+ ->where('insurer_branch_id', $data['insurer_branch_id'])
+ ->countAllResults();
+
+ if($cd_acc_count > 0){
+ return $this->respond(['status' => false, 'message' => 'A CD account has already been created for this client, insurer, and insurer branch combination.'], 200);
+ }else{
+ return $this->respond(['status' => true], 200);
+ }
+ }
+
//Vehicle Master data Function
diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index 77643f19..bf508a48 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -1271,9 +1271,10 @@ class PolicyTransactionController extends BaseController
$data['tsi'] = generate_tsi_code($issue_type['issue_type'] ?? 1);
- $client_branch_id = $data['client_branch_id'];
- if ($data['client_branch_id'] == "") {
+ if (!isset($data['client_branch_id']) || $data['client_branch_id'] == "") {
$client_branch_id = $issue_type['client_branch_id'];
+ }else{
+ $client_branch_id = $data['client_branch_id'];
}
$data['is_cd_reduce_from_bds'] = (isset($issue_type['policy_type_id']) && $issue_type['policy_type_id'] > 7 && $data['client_type'] == 1) ? 1 : 0;
@@ -1431,7 +1432,11 @@ class PolicyTransactionController extends BaseController
$pt_id = null;
if(!empty($data)){
- $inception_data = $this->policyTransactionModel->where('policy_no', $data['policy_no'])->where('client_id', $data['client_id'])->first();
+ $inception_data = $this->policyTransactionModel
+ ->where('policy_no', $data['policy_no'])
+ ->where('client_id', $data['client_id'])
+ ->where('action_type', 'inception')
+ ->first();
$pt_id = $inception_data['id'];
}
@@ -2404,8 +2409,8 @@ class PolicyTransactionController extends BaseController
// $client_name = preg_replace('/^\p{Z}+|\p{Z}+$/u', '', $excel_row[3]); //clientname from excel
- $endorsement_no = preg_replace('/^\p{Z}+|\p{Z}+$/u', '', $excel_row[2]); //policy_end_date from excel
- $endorsement_no = preg_replace( '/[\x{200B}\x{200C}\x{200D}\x{FEFF}\x{00A0}\x{200E}\x{200F}\x{202A}-\x{202E}]/u', '', $excel_row[2]); //policy_end_date from excel
+ $endorsement_no = preg_replace('/^\p{Z}+|\p{Z}+$/u', '', $excel_row[2]??''); //policy_end_date from excel
+ $endorsement_no = preg_replace( '/[\x{200B}\x{200C}\x{200D}\x{FEFF}\x{00A0}\x{200E}\x{200F}\x{202A}-\x{202E}]/u', '', $excel_row[2]??''); //policy_end_date from excel
// Kint::dump($excel_key,$policy_no,$endorsement_no,$policy_start_date,$policy_end_date);//die();
foreach ($source_data as $source_key => $source_row) {
diff --git a/app/Controllers/TestingController.php b/app/Controllers/TestingController.php
index a7cdddd1..98257f4e 100644
--- a/app/Controllers/TestingController.php
+++ b/app/Controllers/TestingController.php
@@ -362,18 +362,18 @@ class TestingController extends BaseController
$pre_clients_list = $this->getNonDuplicatePreClients();
- $log_post_clients_list = $post_clients_list ;
+ $log_post_clients_list = $post_clients_list;
- $log_pre_clients_list = $pre_clients_list ;
+ $log_pre_clients_list = $pre_clients_list;
log_message('error', 'Post Clients to be processed: ' . count($log_post_clients_list));
log_message('error', 'Pre Clients to be processed: ' . count($log_pre_clients_list));
- $matched_Count = 0 ;
+ $matched_Count = 0;
$expected_match_count = min(count($post_clients_list), count($pre_clients_list));
-
+
if (
!empty($pre_clients_list) &&
@@ -444,31 +444,27 @@ class TestingController extends BaseController
}
}
-
+
log_message('error', 'Expected Match Count : ' . $expected_match_count);
log_message('error', 'Total Matched Count: ' . $matched_Count);
log_message('error', 'Total UnMatched Count: ' . $expected_match_count - $matched_Count);
-
-
- log_message('error','unmatched_reocrds');
+
+
+ log_message('error', 'unmatched_reocrds');
$log_post_clients_list = array_values($log_post_clients_list);
$log_pre_clients_list = array_values($log_pre_clients_list);
- if( (count($log_pre_clients_list) < count($log_post_clients_list))){
- log_message('error',"unmatched records count from pre- ". count($log_pre_clients_list));
- log_message('error',print_r($log_pre_clients_list,true));
+ if ((count($log_pre_clients_list) < count($log_post_clients_list))) {
+ log_message('error', "unmatched records count from pre- " . count($log_pre_clients_list));
+ log_message('error', print_r($log_pre_clients_list, true));
} else {
- log_message('error',"unmatched records count from post - ".count($log_post_clients_list));
- log_message('error',print_r($log_post_clients_list,true));
+ log_message('error', "unmatched records count from post - " . count($log_post_clients_list));
+ log_message('error', print_r($log_post_clients_list, true));
}
-
-
- }
+ }
return $this->response->setJSON(['status' => 'success', 'message' => 'Client and Branch mapping completed.'])->setStatusCode(200);
-
-
}
@@ -535,7 +531,7 @@ class TestingController extends BaseController
return $results;
}
public function membervalidation($lead_id = 329)
- {
+ {
$lead_controll = new LeadsController();
// $lead_controll->getMemberDataExcelFileErrors();
$res = $lead_controll->memberDataListExcelFileFormatValidation(['lead_id' => $lead_id]);
@@ -543,18 +539,81 @@ class TestingController extends BaseController
}
private $firstNames = [
- 'Rajesh', 'Priya', 'Amit', 'Sneha', 'Vikram', 'Anjali', 'Rahul', 'Deepika',
- 'Sanjay', 'Kavita', 'Arun', 'Pooja', 'Manoj', 'Nisha', 'Suresh', 'Meera',
- 'Karthik', 'Divya', 'Ravi', 'Lakshmi', 'Anand', 'Swathi', 'Vijay', 'Rekha',
- 'Ashok', 'Sangeetha', 'Prakash', 'Uma', 'Ramesh', 'Vani', 'Kumar', 'Radha',
- 'Dinesh', 'Shanti', 'Ganesh', 'Parvati', 'Mohan', 'Sita', 'Arjun', 'Geetha'
+ 'Rajesh',
+ 'Priya',
+ 'Amit',
+ 'Sneha',
+ 'Vikram',
+ 'Anjali',
+ 'Rahul',
+ 'Deepika',
+ 'Sanjay',
+ 'Kavita',
+ 'Arun',
+ 'Pooja',
+ 'Manoj',
+ 'Nisha',
+ 'Suresh',
+ 'Meera',
+ 'Karthik',
+ 'Divya',
+ 'Ravi',
+ 'Lakshmi',
+ 'Anand',
+ 'Swathi',
+ 'Vijay',
+ 'Rekha',
+ 'Ashok',
+ 'Sangeetha',
+ 'Prakash',
+ 'Uma',
+ 'Ramesh',
+ 'Vani',
+ 'Kumar',
+ 'Radha',
+ 'Dinesh',
+ 'Shanti',
+ 'Ganesh',
+ 'Parvati',
+ 'Mohan',
+ 'Sita',
+ 'Arjun',
+ 'Geetha'
];
private $lastNames = [
- 'Kumar', 'Sharma', 'Singh', 'Patel', 'Reddy', 'Nair', 'Iyer', 'Krishnan',
- 'Rao', 'Gupta', 'Verma', 'Agarwal', 'Joshi', 'Mehta', 'Desai', 'Pillai',
- 'Menon', 'Bhat', 'Naidu', 'Varma', 'Malhotra', 'Kapoor', 'Chopra', 'Saxena',
- 'Pandey', 'Mishra', 'Tiwari', 'Dubey', 'Sinha', 'Jain', 'Shah', 'Thakur'
+ 'Kumar',
+ 'Sharma',
+ 'Singh',
+ 'Patel',
+ 'Reddy',
+ 'Nair',
+ 'Iyer',
+ 'Krishnan',
+ 'Rao',
+ 'Gupta',
+ 'Verma',
+ 'Agarwal',
+ 'Joshi',
+ 'Mehta',
+ 'Desai',
+ 'Pillai',
+ 'Menon',
+ 'Bhat',
+ 'Naidu',
+ 'Varma',
+ 'Malhotra',
+ 'Kapoor',
+ 'Chopra',
+ 'Saxena',
+ 'Pandey',
+ 'Mishra',
+ 'Tiwari',
+ 'Dubey',
+ 'Sinha',
+ 'Jain',
+ 'Shah',
+ 'Thakur'
];
private $relationships = ['Self', 'Spouse', 'Son', 'Daughter', 'Father', 'Mother'];
@@ -611,9 +670,9 @@ class TestingController extends BaseController
for ($i = 1; $i <= $totalRecords; $i++) {
$row = $i + 1; // Start from row 2 (row 1 is header)
-
+
$record = $this->generateSampleRecord($i);
-
+
$sheet->setCellValue('A' . $row, $record['sl_no']);
$sheet->setCellValue('B' . $row, $record['emp_code']);
$sheet->setCellValue('C' . $row, $record['name']);
@@ -664,33 +723,33 @@ class TestingController extends BaseController
$firstName = $this->firstNames[array_rand($this->firstNames)];
$lastName = $this->lastNames[array_rand($this->lastNames)];
$name = $firstName . ' ' . $lastName;
-
+
$relationship = $this->relationships[array_rand($this->relationships)];
$gender = $this->genders[array_rand($this->genders)];
-
+
// Generate random age between 18 and 65
$age = rand(18, 65);
-
+
// Calculate DOB based on age
$year = date('Y') - $age;
$month = str_pad(rand(1, 12), 2, '0', STR_PAD_LEFT);
$day = str_pad(rand(1, 28), 2, '0', STR_PAD_LEFT);
$dob = "{$day}-{$month}-{$year}";
-
+
// Generate employee code
$empCode = 'EMP' . str_pad($index, 6, '0', STR_PAD_LEFT);
-
+
// Generate email
$email = strtolower($firstName . '.' . $lastName . $index) . '@' . $this->domains[array_rand($this->domains)];
-
+
// Generate mobile number (Indian format)
$mobile = '+91' . rand(7000000000, 9999999999);
-
+
// Generate insurance amounts
$siOptions = [100000, 200000, 300000, 500000, 1000000];
$si = $siOptions[array_rand($siOptions)];
$si_enhancement = rand(0, 1) ? rand(50000, 200000) : 0;
-
+
$proposed_si_1 = $si + rand(100000, 500000);
$proposed_si_2 = $proposed_si_1 + rand(100000, 500000);
$proposed_si_3 = $proposed_si_2 + rand(100000, 500000);
@@ -716,64 +775,67 @@ class TestingController extends BaseController
}
- public function logo_renaming(){
-
- $directory = ROOTPATH . 'public/uploads/logo/';
+ public function logo_renaming()
+ {
- if (!is_dir($directory)) {
- die("Directory not found: $directory");
+ $directory = ROOTPATH . 'public/uploads/logo/';
+
+ if (!is_dir($directory)) {
+ die("Directory not found: $directory");
+ }
+
+ $files = scandir($directory);
+
+ $client_logo_files = $this->get_client_logo_files();
+
+ $rename_files = "";
+ $failed_rename_files = "";
+
+ foreach ($files as $file) {
+ // Skip system entries
+ if ($file === '.' || $file === '..') {
+ continue;
}
- $files = scandir($directory);
- $client_logo_files = $this->get_client_logo_files();
+ $oldPath = $directory . $file;
- $rename_files = "";
- $failed_rename_files = "";
+ if (is_file($oldPath) && in_array(trim($file), $client_logo_files)) {
- foreach ($files as $file) {
- // Skip system entries
- if ($file === '.' || $file === '..' ) {
- continue;
- }
-
+ // Remove all spaces from filename
+ $newFileName = preg_replace('/\s+|\x{00A0}|\x{200B}|\x{200C}|\x{200D}|\x{FEFF}/u', '', $file);
- $oldPath = $directory . $file;
+ $newPath = $directory . $newFileName;
- if (is_file($oldPath) && in_array(trim($file) , $client_logo_files)) {
-
- // Remove all spaces from filename
- $newFileName = preg_replace('/\s+|\x{00A0}|\x{200B}|\x{200C}|\x{200D}|\x{FEFF}/u', '', $file);
-
- $newPath = $directory . $newFileName;
-
- // Only rename if the name changed
- if ($oldPath !== $newPath) {
- if (rename($oldPath, $newPath)) {
- $rename_files .= "\n Renamed: $file → $newFileName \n";
- } else {
- $failed_rename_files .= "\n Failed file: $file \n";
- }
+ // Only rename if the name changed
+ if ($oldPath !== $newPath) {
+ if (rename($oldPath, $newPath)) {
+ $rename_files .= "\n Renamed: $file → $newFileName \n";
+ } else {
+ $failed_rename_files .= "\n Failed file: $file \n";
}
}
}
+ }
- $dbUpdated = $this->update_client_logo_files();
+ $dbUpdated = $this->update_client_logo_files();
- log_message('error', 'Renamed Files: ' . $rename_files);
- log_message('error', 'Failed Renames: ' . $failed_rename_files);
- log_message('error', 'Database Update Status: ' . ($dbUpdated ? 'Success' : 'No changes made'));
+ log_message('error', 'Renamed Files: ' . $rename_files);
+ log_message('error', 'Failed Renames: ' . $failed_rename_files);
+ log_message('error', 'Database Update Status: ' . ($dbUpdated ? 'Success' : 'No changes made'));
- return $this->response->setJSON(['status' => 'success',
+ return $this->response->setJSON([
+ 'status' => 'success',
'message' => 'Logo renaming completed. kindly check backend logs for details',
'data' => [
'renamed_files' => $rename_files,
'failed_renames' => $failed_rename_files
]
- ])->setStatusCode(200);
+ ])->setStatusCode(200);
}
- public function get_client_logo_files(){
+ public function get_client_logo_files()
+ {
$db = \Config\Database::connect();
@@ -783,14 +845,15 @@ class TestingController extends BaseController
$results = $query->getResultArray() ?? [];
- $files = array_map(function($item) {
+ $files = array_map(function ($item) {
return trim($item['client_logo']);
}, $results);
return $files;
}
- public function update_client_logo_files(){
+ public function update_client_logo_files()
+ {
$db = \Config\Database::connect();
@@ -803,9 +866,63 @@ class TestingController extends BaseController
$query = $db->query($sql);
return $db->affectedRows() > 0;
-
-
}
+ public function createDefaultMailTempalteInDB()
+ {
+ $postDB = \Config\Database::connect(); // target DB
+ $preDB = \Config\Database::connect('preDB'); // source DB
+
+ // Templates to copy
+ $templateNames = [
+ 'member_welcome_mail',
+ 'member_reminder_mail',
+ 'member_review_and_summary_mail'
+ ];
+
+
+
+
+ foreach ($templateNames as $template) {
+
+ $exists = $postDB->table('notifications')
+ ->where('client_id', NULL)
+ ->where('template_name', $template)
+ ->countAllResults();
+
+ if ($exists > 0) {
+ continue; // Skip if already inserted
+ }
+
+ // Fetch template from preDB
+ $templateData = $preDB->table('notifications')
+ ->where('client_id', NULL)
+ ->where('template_name', $template)
+ ->get()
+ ->getRowArray();
+
+ if (!empty($templateData)) {
+
+ // Remove ID to avoid duplicate primary key issues
+ unset($templateData['id']);
+
+ // Set created_by and timestamps if needed
+ $templateData['client_id'] = NULL;
+ $templateData['created_by'] = 1;
+ $templateData['cretaed_at'] = date('Y-m-d H:i:s');
+ $templateData['updated_by'] = NULL;
+ $templateData['updated_at'] = NULL;
+
+ // Insert into postDB
+ $postDB->table('notifications')->insert($templateData);
+ }
+ }
+
+
+ return $this->response->setJSON(['message'=>"Created Default Mail Tempalte In DB "])->setStatusCode(200);
+ }
+
+
+
}
diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php
index b4d391dc..ec046563 100755
--- a/app/Controllers/UserController.php
+++ b/app/Controllers/UserController.php
@@ -62,7 +62,7 @@ class UserController extends AdminController
// echo '';
// print_r($data); die;
$data['roleData'] = $this->roleModel->select('id, role')->findAll();
- $data['teamData'] = $this->teamModel->select('id, name')->findAll();
+ $data['teamData'] = $this->teamModel->select('id, name')->where('is_active',1)->findAll();
$this->loadLayout('UserList', $data);
}
@@ -156,9 +156,11 @@ class UserController extends AdminController
public function edit()
{
+ // echo ":/ in 159";
if (!$this->request->getPost()) {
return redirect()->to(base_url('/user/list'));
} else {
+ // echo ":/ in 163";
$id = $this->request->getPost('PrimaryKey');
$teams = $this->request->getPost('team');
$userData = $this->request->getPost();
@@ -166,6 +168,7 @@ class UserController extends AdminController
unset($userData['PrimaryKey']);
$existingData = $this->userModel->where('id',$id)->first();;
+ // dd($existingData);die;
// Update data in the 'users' table based on the $id
$userData['updated_by'] = get_session_userid();
diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php
index e608b013..2c7ff2bb 100755
--- a/app/Helpers/excel_util_helper.php
+++ b/app/Helpers/excel_util_helper.php
@@ -109,7 +109,8 @@ if (!function_exists('check_relationship')) {
$family_floaters = isset($policy_terms['family_floaters']);
if ($family_floaters) {
- if (isset($relationship[$col]) && $relationship[$col]['gender'] != $row[4]) {
+ $relation_gender = normalizeGender($row[4]);
+ if (isset($relationship[$col]) && $relationship[$col]['gender'] != $relation_gender) {
$error = "Gender relationship conflict: Expected " . $relationship[$col]['gender'] . ", received $row[4]";
return array('status' => false, 'error' => $error);
}
@@ -369,13 +370,24 @@ if (!function_exists('check_dob_diff')) {
}
if (!function_exists('data_group_by_family')) {
- function data_group_by_family($emp_data, $data_source = 'excel', $action = '')
+ function data_group_by_family($emp_data, $data_source = 'excel', $action = '', $current_column_action = null)
{
$result = [];
// Kint::dump($emp_data);
foreach ($emp_data as $rkey => $row) {
+
+
+
if ($data_source == 'excel') {
if (!check_row_is_empty_or_null($row)) {
+
+ // for this condition to avoid 5,00,000 to 500000
+ if($current_column_action == 'SI'){
+ $row[3] = removeNumberFormatting($row[3]);
+ }else if(in_array($current_column_action, ['I','DA', 'MI', 'A'])){
+ $row[6] = removeNumberFormatting($row[6]);
+ }
+
if ($action == 'enrollment') //if action is enrollment transform current row into inception row, becoz we treat enrollment as inception
{
$row = transform_enrollment_row_to_inception_row($row);
@@ -637,12 +649,19 @@ if (!function_exists('check_dependent_conflict')) {
if (!function_exists('generate_relationship_code')) {
function generate_relationship_code($arr)
{
- $gender = ['M' => 1, 'F' => 2];
+ $gender = [
+ 'M' => 1,
+ 'Male' => 1,
+ 'male' => 1,
+ 'F' => 2,
+ 'Female' => 2,
+ 'female' => 2,
+ ];
$relationship = ['self' => 1, 'spouse' => 2, 'son' => 3, 'daughter' => 4, 'father' => 5, 'mother' => 6, 'father-in-law' => 7, 'mother-in-law' => 8];
$slug = \Config\Services::slug();
$relationship_code = $slug->slugify($arr['relationship']);
$emp_type_code = ($relationship_code == 'self' ? 'EMP_TYP_01' : 'EMP_TYP_03');
- $relationship_code = $gender[trim($arr['gender'])] . $relationship[trim($relationship_code)];
+ $relationship_code = $gender[trim($arr['gender'])] ?? "" . $relationship[trim($relationship_code)] ?? "";
return ['relationship_code' => $relationship_code, 'emp_type_code' => $emp_type_code];
}
}
@@ -2041,6 +2060,22 @@ if (!function_exists('formatIndianCurrency')) {
}
}
+if (!function_exists('normalizeGender')) {
+ function normalizeGender($gender)
+ {
+ $gender = strtoupper(trim($gender));
+
+ if (in_array($gender, ['M', 'MALE'])) {
+ return 'M';
+ } elseif (in_array($gender, ['F', 'FEMALE'])) {
+ return 'F';
+ }
+
+ // Optional: return null or original if not recognized
+ return null;
+ }
+}
+
// ------------- FUNCTION FOR LEAD MEMBER DATA LIST VALIDATIONS --------------------------------------
if (!function_exists('check_columns_name_exist')) {
@@ -2291,8 +2326,8 @@ if (!function_exists('validateFamily')) {
// Validation 3: Validate spouse gender if spouse exists
if ($spouseMember !== null) {
- $selfGender = strtoupper(trim($selfMember[4])); // Gender field
- $spouseGender = strtoupper(trim($spouseMember[4]));
+ $selfGender = normalizeGender(trim($selfMember[4])); // Gender field
+ $spouseGender = normalizeGender(trim($spouseMember[4]));
$selfName = $selfMember[2]; // Name field
$spouseName = $spouseMember[2];
diff --git a/app/Helpers/sendMailNotification.php b/app/Helpers/sendMailNotification.php
index f9de6b09..a726fe16 100755
--- a/app/Helpers/sendMailNotification.php
+++ b/app/Helpers/sendMailNotification.php
@@ -57,6 +57,13 @@ class sendMailNotification
$mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "Review Details", $mail_content);
if ($dataToInsert['relationship'] == 'Self' && $mail != null || $mail != '') {
+
+ $mail_content = preg_replace('/]*>( |\s)*<\/p>/i', '', $mail_content);
+
+ $data['params'] = $params;$data['client_logo'] = $client_logo;
+ $data['mail_content'] = $mail_content;
+ $mail_content = view('mail_template', $data);
+
$wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to'], 'attachments' => $attachments, 'common' => $common];
}
@@ -89,6 +96,12 @@ class sendMailNotification
$mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $employee_mobile_no, $mail_content);
$mail = $emp_data['email_corporate'];
+ $mail_content = preg_replace('/]*>( |\s)*<\/p>/i', '', $mail_content);
+
+ $data['params'] = $params;$data['client_logo'] = $client_logo;
+ $data['mail_content'] = $mail_content;
+ $mail_content = view('mail_template', $data);
+
$wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content, 'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to'], 'common' => $common];
return $wholeData;
@@ -139,6 +152,13 @@ class sendMailNotification
$mail_content = str_replace(["[[ecard_download_link]]", "{{ecard_download_link}}"], "Download Insurance Card", $mail_content);
$mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content);
+ $mail_content = preg_replace('/]*>( |\s)*<\/p>/i', '', $mail_content);
+
+ $data['params'] = $params;$data['client_logo'] = $client_logo;
+ $data['mail_content'] = $mail_content;
+ $mail_content = view('mail_template', $data);
+
+
$wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to'], 'common' => $common];
return $wholeData;
@@ -523,6 +543,13 @@ class sendMailNotification
$mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $employee_mobile_no, $mail_content);
$mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content , $mail_content);
+ $mail_content = preg_replace('/]*>( |\s)*<\/p>/i', '', $mail_content);
+
+ $data['params'] = $params;$data['client_logo'] = $client_logo;
+ $data['mail_content'] = $mail_content;
+ $mail_content = view('mail_template', $data);
+
+
// print_r($mail_content); die;
// $mail = "aadhavanvalli@gmail.com";
@@ -825,6 +852,13 @@ class sendMailNotification
$full_name = $value['first_name'] .' ' .$value['last_name'];
$mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $full_name , $mail_content);
+ $mail_content = preg_replace('/]*>( |\s)*<\/p>/i', '', $mail_content);
+
+ $data['params'] = $params;$data['client_logo'] = $client_logo;
+ $data['mail_content'] = $mail_content;
+ $mail_content = view('mail_template', $data);
+
+
$wholeData[] = ['mail' => $value['email'], 'subject' => $subject,'message'=> $mail_content, 'reply_to' => $client_data['reply_to'], 'common' => $common];
// $wholeData[] = ['mail' => $value['email'], 'subject' => $subject,'message'=> $mail_content, 'bcc'=> $client_data['common_mails'}};
}
@@ -1118,6 +1152,11 @@ class sendMailNotification
$mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content , $mail_content);
+ $mail_content = preg_replace('/]*>( |\s)*<\/p>/i', '', $mail_content);
+
+ $data['params'] = $params;$data['client_logo'] = $client_logo;
+ $data['mail_content'] = $mail_content;
+ $mail_content = view('mail_template', $data);
$hr_mails = $client_data['hr_mails'];
$mail_array = explode(',', $hr_mails);
@@ -1182,7 +1221,14 @@ class sendMailNotification
$mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "Review Details", $mail_content);
- if ($mail != null || $mail != '') {
+ if ( isset($mail) && !empty($mail) ) {
+
+ $mail_content = preg_replace('/]*>( |\s)*<\/p>/i', '', $mail_content);
+
+ $data['params'] = $params;$data['client_logo'] = $client_logo;
+ $data['mail_content'] = $mail_content;
+ $mail_content = view('mail_template', $data);
+
$wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to'], 'attachments' => $attachments];
}
@@ -1215,6 +1261,13 @@ class sendMailNotification
if ((isset($notification_data) && $notification_data['enabled'] == 1)) {
if (isset($mail) && !empty($mail)) {
+
+ $mail_content = preg_replace('/]*>( |\s)*<\/p>/i', '', $mail_content);
+
+ $data['params'] = $params;$data['client_logo'] = $client_logo;
+ $data['mail_content'] = $mail_content;
+ $mail_content = view('mail_template', $data);
+
$wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content, 'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to']];
}
@@ -1268,6 +1321,12 @@ class sendMailNotification
$mail_content = str_replace(["[[ecard_download_link]]", "{{ecard_download_link}}"], "Download Insurance Card", $mail_content);
$mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content);
+ $mail_content = preg_replace('/]*>( |\s)*<\/p>/i', '', $mail_content);
+
+ $data['params'] = $params;$data['client_logo'] = $client_logo;
+ $data['mail_content'] = $mail_content;
+ $mail_content = view('mail_template', $data);
+
$wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails'],'attachments' => $attachments, 'reply_to' => $client_data['reply_to']];
return $wholeData;
@@ -1419,6 +1478,11 @@ class sendMailNotification
$mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $mobile, $mail_content);
$mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content , $mail_content);
+ $mail_content = preg_replace('/]*>( |\s)*<\/p>/i', '', $mail_content);
+
+ $data['params'] = $params;$data['client_logo'] = $client_logo;
+ $data['mail_content'] = $mail_content;
+ $mail_content = view('mail_template', $data);
$wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content, 'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to']];
@@ -1568,6 +1632,13 @@ class sendMailNotification
$mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name . ' (' . $emp_code . ')' , $mail_content);
$mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content , $mail_content);
+
+ $mail_content = preg_replace('/]*>( |\s)*<\/p>/i', '', $mail_content);
+
+ $data['params'] = $params;$data['client_logo'] = $client_logo;
+ $data['mail_content'] = $mail_content;
+ $mail_content = view('mail_template', $data);
+
$wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content, 'reply_to' => $client_data['reply_to']];
return $wholeData;
@@ -1717,6 +1788,11 @@ class sendMailNotification
$mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name . ' (' . $emp_code . ')' , $mail_content);
$mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content , $mail_content);
+ $mail_content = preg_replace('/]*>( |\s)*<\/p>/i', '', $mail_content);
+
+ $data['params'] = $params;$data['client_logo'] = $client_logo;
+ $data['mail_content'] = $mail_content;
+ $mail_content = view('mail_template', $data);
$wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content, 'reply_to' => $client_data['reply_to']];
diff --git a/app/Helpers/utility_helper.php b/app/Helpers/utility_helper.php
index f66229f5..9130a991 100755
--- a/app/Helpers/utility_helper.php
+++ b/app/Helpers/utility_helper.php
@@ -65,6 +65,19 @@ if (!function_exists('file_Upload')) {
}
}
+if (!function_exists('file_Upload_for_lead')) {
+ function file_Upload_for_lead($fileToUpload, $filepath)
+ {
+ if ($fileToUpload !== null && $fileToUpload->isValid() && !$fileToUpload->hasMoved()) {
+ $fileToUpload->move($filepath);
+ $fileName = $fileToUpload->getName();
+ return $fileName;
+ } else {
+ return "";
+ }
+ }
+}
+
// if (!function_exists('multi_file_Upload')) {
// function multi_file_Upload($fileToUpload, $filepath)
// {
@@ -859,3 +872,17 @@ if (!function_exists('expected_amount_calc')) {
return round($expectedAmount, 2); // Optional: round to 2 decimal places
}
}
+
+if (!function_exists('getFileIfExists')) {
+ function getFileIfExists($path)
+ {
+ return file_exists(FCPATH . $path) ? base_url($path) : '';
+ }
+}
+
+if (!function_exists('removeNumberFormatting')) {
+ function removeNumberFormatting($number)
+ {
+ return (float) str_replace(',', '', trim($number));
+ }
+}
diff --git a/app/Models/ClientPolicyModel.php b/app/Models/ClientPolicyModel.php
index 152cad7f..d3618eb6 100755
--- a/app/Models/ClientPolicyModel.php
+++ b/app/Models/ClientPolicyModel.php
@@ -56,6 +56,7 @@ class ClientPolicyModel extends Model
"is_lgbtq",
"placement_json",
"policy_entry_from",
+ "is_from_lead",
];
// Callbacks
diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php
index bea76e50..97aa91d4 100755
--- a/app/Models/EmployeePolicyModel.php
+++ b/app/Models/EmployeePolicyModel.php
@@ -611,6 +611,36 @@ class EmployeePolicyModel extends Model
$subquery_endorsement_condition = "{$insurer_or_tpa}" === 'tpa' ? "WHERE (endorsement_id IS NOT NULL OR endorsement_id != '')" : "WHERE (endorsement_id IS NULL OR endorsement_id = '')";
+ /*
+ ROUND(sidata.new_si_premium - sidata.old_si_premium, 2) AS difference_premium,
+ ROUND(
+ (sidata.new_si_premium - sidata.old_si_premium) *
+ (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365,
+ 2
+ ) AS pro_rata_premium,
+ ROUND(
+ (
+ (sidata.new_si_premium - sidata.old_si_premium) *
+ (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365
+ ) * 0.18,
+ 2
+ ) AS gst,
+ ROUND(
+ (
+ (sidata.new_si_premium - sidata.old_si_premium) *
+ (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365
+ ) +
+ ROUND(
+ (
+ (sidata.new_si_premium - sidata.old_si_premium) *
+ (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365
+ ) * 0.18,
+ 2
+ ),
+ 2
+ ) AS total
+ */
+
$query = $this->db->query("
SELECT
a.id AS endorsement_primarykey,
@@ -643,33 +673,40 @@ class EmployeePolicyModel extends Model
sidata.old_si_premium,
sidata.date_of_coverage,
DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1 AS no_of_days,
- ROUND(sidata.new_si_premium - sidata.old_si_premium, 2) AS difference_premium,
+
+ ROUND(ABS(sidata.new_si_premium - sidata.old_si_premium), 2) AS difference_premium,
ROUND(
- (sidata.new_si_premium - sidata.old_si_premium) *
- (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365,
+ ABS(
+ (sidata.new_si_premium - sidata.old_si_premium) *
+ (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365
+ ),
2
) AS pro_rata_premium,
ROUND(
- (
- (sidata.new_si_premium - sidata.old_si_premium) *
- (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365
- ) * 0.18,
+ ABS(
+ (
+ (sidata.new_si_premium - sidata.old_si_premium) *
+ (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365
+ ) * 0.18
+ ),
2
) AS gst,
ROUND(
- (
- (sidata.new_si_premium - sidata.old_si_premium) *
- (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365
- ) +
- ROUND(
- (
- (sidata.new_si_premium - sidata.old_si_premium) *
- (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365
- ) * 0.18,
- 2
+ ABS(
+ (
+ (sidata.new_si_premium - sidata.old_si_premium) *
+ (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365
+ ) +
+ (
+ (
+ (sidata.new_si_premium - sidata.old_si_premium) *
+ (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365
+ ) * 0.18
+ )
),
2
) AS total
+
FROM
emp_endorsement a
LEFT JOIN employees ON employees.emp_code = a.emp_code
@@ -1532,8 +1569,15 @@ class EmployeePolicyModel extends Model
e.doj,
e.band,
TIMESTAMPDIFF(YEAR, e.dob, CURDATE()) AS emp_age,
- (SELECT name FROM employees WHERE relationship = "Self" and emp_code = ' . $this->db->escape($emp_code) . ' and client_id = '.$client_id.' LIMIT 1) AS self,
-
+ (
+ SELECT name FROM employees
+ WHERE relationship = "Self"
+ and emp_code = ' . $this->db->escape($emp_code) . '
+ and client_id = '.$client_id.'
+ and is_active = 1
+ and emp_status = "active"
+ LIMIT 1
+ ) AS self,
ep.tpa_id,
ep.uhid,
diff --git a/app/Models/FileModel.php b/app/Models/FileModel.php
index ff4f584e..0f72c18f 100755
--- a/app/Models/FileModel.php
+++ b/app/Models/FileModel.php
@@ -22,6 +22,7 @@ class FileModel extends Model
"uploaded_by",
"updated_by",
"hr_file_id",
+ "is_comparison_skipped",
];
diff --git a/app/Models/PolicyTransactionModel.php b/app/Models/PolicyTransactionModel.php
index a9629d73..e9f6e8cc 100644
--- a/app/Models/PolicyTransactionModel.php
+++ b/app/Models/PolicyTransactionModel.php
@@ -1829,24 +1829,35 @@ class PolicyTransactionModel extends Model
// ==============================
if ($date_type == 'statement_month' && $start_date != 0 && $end_date != 0) {
$date_condition = "
- AND insurer_statements.month >= '{$start_date}'
- AND insurer_statements.month <= '{$end_date}'
+ AND insurer_statements_oq.month >= '{$start_date}'
+ AND insurer_statements_oq.month <= '{$end_date}'
";
}
// ==============================
// BASE QUERY
// ==============================
- $builder = $this->db->table('policy_transaction')
+
+
+ // ==============================
+ // Without Statement Upload
+ // ==============================
+
+
+ $builder2 = $this->db->table('policy_transaction')
->select("
- policy_transaction.*,
+ policy_transaction.id AS id,
+ policy_transaction.endorsement_no AS endorsement_no,
+ policy_transaction.ref AS ref,
DATE_FORMAT(policy_transaction.policy_issue_date, '%d %b %Y') AS policy_issue_date,
- DATE_FORMAT(
- IF(policy_transaction.month IS NULL,
- policy_transaction.policy_issue_date,
- policy_transaction.month
- ), '%b %Y'
- ) AS policy_issue_month,
+
+ DATE_FORMAT( policy_transaction.policy_issue_date,, '%b %Y') AS policy_issue_month,
+
+ CASE
+ WHEN 1 = 1 THEN 'no statement uploaded'
+ ELSE 'statement uploaded'
+ END AS statement_uploaded ,
+
CASE
WHEN clients.client_type = 1 THEN 'Group'
@@ -1898,89 +1909,15 @@ class PolicyTransactionModel extends Model
-- ==============================
-- SUBQUERY: Total IRDA Amount
+ -- Alias Agreed Amount ...!!
-- ==============================
- ROUND((
- SELECT (
- SUM(co_share_stmt_details.actual_bp_brokerage_amt) +
- SUM(co_share_stmt_details.actual_tp_brokerage_amt) +
- SUM(co_share_stmt_details.actual_tep_brokerage_amt) +
- SUM(co_share_stmt_details.reward)
- )
- FROM co_share_stmt_details
- JOIN insurer_statements ON co_share_stmt_details.statement_id = insurer_statements.id
- WHERE co_share_stmt_details.co_share_id = pt_co_share_details.id
- AND co_share_stmt_details.is_active = 1
- AND insurer_statements.is_active = 1
- {$date_condition}
- ), 2) AS total_irda_amt,
+ ROUND(pt_co_share_details.exp_amt, 2) AS total_irda_amt,
-- Reward Only
- ROUND((
- SELECT SUM(co_share_stmt_details.reward)
- FROM co_share_stmt_details
- JOIN insurer_statements ON co_share_stmt_details.statement_id = insurer_statements.id
- WHERE co_share_stmt_details.co_share_id = pt_co_share_details.id
- AND co_share_stmt_details.is_active = 1
- AND insurer_statements.is_active = 1
- {$date_condition}
- ), 2) AS reward,
+ ROUND(0, 2) AS reward,
-- Billed Amount
- ROUND((
- SELECT SUM(
- COALESCE(co_share_stmt_details.actual_bp_brokerage_amt, 0) +
- COALESCE(co_share_stmt_details.actual_tp_brokerage_amt, 0) +
- COALESCE(co_share_stmt_details.actual_tep_brokerage_amt, 0) +
- COALESCE(co_share_stmt_details.reward, 0)
- )
- FROM co_share_stmt_details
- JOIN pt_co_share_details AS pt_table ON co_share_stmt_details.co_share_id = pt_table.id
- JOIN insurer_statements ON co_share_stmt_details.statement_id = insurer_statements.id
- WHERE co_share_stmt_details.co_share_id = pt_co_share_details.id
- AND co_share_stmt_details.is_active = 1
- AND pt_table.is_active = 1
- AND insurer_statements.is_active = 1
- AND insurer_statements.invoice_status IS NOT NULL
- {$date_condition}
- ), 2) AS billed_amt,
-
- -- Unbilled Amount
- ROUND(
- (
- (
- SELECT
- SUM(
- COALESCE(co_share_stmt_details.actual_bp_brokerage_amt, 0) +
- COALESCE(co_share_stmt_details.actual_tp_brokerage_amt, 0) +
- COALESCE(co_share_stmt_details.actual_tep_brokerage_amt, 0) +
- COALESCE(co_share_stmt_details.reward, 0)
- )
- FROM co_share_stmt_details
- JOIN insurer_statements ON co_share_stmt_details.statement_id = insurer_statements.id
- WHERE co_share_stmt_details.co_share_id = pt_co_share_details.id
- AND co_share_stmt_details.is_active = 1
- {$date_condition}
- )
- -
- (
- SELECT
- SUM(
- COALESCE(co_share_stmt_details.actual_bp_brokerage_amt, 0) +
- COALESCE(co_share_stmt_details.actual_tp_brokerage_amt, 0) +
- COALESCE(co_share_stmt_details.actual_tep_brokerage_amt, 0) +
- COALESCE(co_share_stmt_details.reward, 0)
- )
- FROM co_share_stmt_details
- JOIN pt_co_share_details AS pt_table ON co_share_stmt_details.co_share_id = pt_table.id
- JOIN insurer_statements ON co_share_stmt_details.statement_id = insurer_statements.id
- WHERE co_share_stmt_details.co_share_id = pt_co_share_details.id
- AND co_share_stmt_details.is_active = 1
- AND pt_table.is_active = 1
- AND insurer_statements.is_active = 1
- AND insurer_statements.invoice_status IS NULL
- {$date_condition}
- )
- ), 2) AS unbilled_amt,
+ ROUND(0, 2) AS billed_amt,
created_user.first_name AS user_name,
@@ -2012,9 +1949,255 @@ class PolicyTransactionModel extends Model
->join('tpa_branch', 'policy_transaction.tpa_branch_id = tpa_branch.id', 'left')
->join('user_profiles AS sales_user', 'policy_transaction.sales_generated_by = sales_user.id', 'left')
->join('user_profiles AS service_user', 'policy_transaction.serviced_by = service_user.id', 'left')
- ->join('user_profiles AS created_user', 'policy_transaction.created_by = created_user.id', 'left')
+ ->join('user_profiles AS created_user', 'policy_transaction.created_by = created_user.id', 'left')
+
->where('policy_transaction.is_active', 1)
- ->where('pt_co_share_details.is_active', 1);
+ ->where('pt_co_share_details.is_active', 1)
+
+ // ========================================================
+ // GROUP BY Insurer Statement Months
+ // =======================================================
+ ->groupBy('policy_transaction.policy_no , pt_co_share_details.insurer_id ');
+
+ // ==============================
+ // ROLE-BASED FILTERS
+ // ==============================
+ if (
+ (!in_array(get_role_id(), [1, 5])) &&
+ !(
+ in_array(MANAGEMENT_TEAM_ID, user_team()) ||
+ in_array(FINANCE_TEAM_ID, user_team()) ||
+ in_array(BUSINESS_TEAM_ID, user_team())
+ )
+ ) {
+ if (get_role_id() == 4 && in_array(POS_TEAM_ID, user_team())) {
+ $builder2->where('policy_transaction.created_by', get_session_userid());
+ }
+ }
+
+ // ==============================
+ // ADDITIONAL FILTERS
+ // ==============================
+ if (!empty($where)) {
+ log_message('info', 'Where condition: ' . json_encode($where));
+ $builder2->where($where);
+ }
+
+ if ($start_date != 0 && $end_date != 0 && $date_type != 0 && $date_type != 'statement_month') {
+ $startDate = date('Y-m-d 00:00:00', strtotime($start_date));
+ $endDate = date('Y-m-d 23:59:59', strtotime($end_date));
+
+ $builder2->where("policy_transaction.{$date_type} >=", $startDate)
+ ->where("policy_transaction.{$date_type} <=", $endDate);
+ }
+
+
+ // ==============================
+ // FILTER BY IDs
+ // ==============================
+ if ($client_id != 0) $builder2->where('policy_transaction.client_id', $client_id);
+ if ($insurer_id != 0) $builder2->where('policy_transaction.insurer_id', $insurer_id);
+ if ($client_branch_id != 0) $builder2->where('policy_transaction.client_branch_id', $client_branch_id);
+ if ($insurer_branch_id != 0) $builder2->where('policy_transaction.insurer_branch_id', $insurer_branch_id);
+ if ($client_policy_id != 0) $builder2->where('policy_transaction.client_policy_id', $client_policy_id);
+ if ($user_id != 0) $builder2->where('policy_transaction.created_by', $user_id);
+ if ($policy_type_id != 0) $builder2->where('client_policy.policy_type_id', $policy_type_id);
+ if ($issuer != 0) $builder2->where('policy_transaction.issuer', $issuer);
+
+ // ==============================
+ // DEFAULT 90-DAY FILTER
+ // ==============================
+ if (
+ $client_id == 0 &&
+ $insurer_id == 0 &&
+ $policy_type_id == 0 &&
+ $date_type == 0 &&
+ $issuer == 0
+ ) {
+ $fromDate = date('Y-m-d', strtotime('-90 days'));
+ $toDate = date('Y-m-d 23:59:59');
+
+ if (empty($where)) {
+ $builder2->where('policy_transaction.created_at >=', $fromDate)
+ ->where('policy_transaction.created_at <=', $toDate);
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ // ==============================
+ // With Statement Upload
+ // ==============================
+
+ $builder = $this->db->table('policy_transaction')
+ ->select("
+ policy_transaction.id AS id,
+ policy_transaction.endorsement_no AS endorsement_no,
+ policy_transaction.ref AS ref,
+ DATE_FORMAT(policy_transaction.policy_issue_date, '%d %b %Y') AS policy_issue_date,
+ DATE_FORMAT(
+ IF(insurer_statements_oq.month IS NULL,
+ policy_transaction.policy_issue_date,
+ insurer_statements_oq.month
+ ), '%b %Y'
+ ) AS policy_issue_month,
+
+ CASE
+ WHEN insurer_statements_oq.month IS NULL THEN 'no statement uploaded'
+ ELSE 'statement uploaded'
+ END AS statement_uploaded ,
+
+
+ CASE
+ WHEN clients.client_type = 1 THEN 'Group'
+ WHEN clients.client_type = 2 THEN 'Retail'
+ ELSE '-'
+ END AS client_type,
+
+ CASE
+ WHEN policy_transaction.revenue_type = 'NA' THEN 'Fresh'
+ ELSE 'Renewal'
+ END AS revenue_type,
+
+ CASE
+ WHEN policy_transaction.action_type = 'inception' THEN 'Policy'
+ ELSE 'Endorsement'
+ END AS action_type,
+
+ clients.client_name AS client_name,
+ clients.short_name AS client_short_name,
+ client_branch.branch_name AS client_branch_name,
+ client_branch.address1 AS client_address,
+ policy_type.policy_type,
+ policy_type.bap,
+ insurers.name AS insurer_name,
+ insurers.short_name AS insurer_short_name,
+ insurer_branch.branch_name AS insurer_branch_name,
+ insurer_branch.branch_code AS insurer_branch_code,
+ user_profiles.first_name AS user_name,
+ vehicle.vehicle_no,
+ tpa.name AS tpa_name,
+ pt_co_share_details.remark AS remarks,
+ pt_co_share_details.cop_amt AS bp_amt,
+ pt_co_share_details.exp_amt,
+ pt_co_share_details.id AS pt_id,
+ sales_user.first_name AS salse_person_name,
+ service_user.first_name AS service_person_name,
+
+ ROUND(pt_co_share_details.cop_amt + pt_co_share_details.cotp_amt + pt_co_share_details.cotep_amt, 2) AS premium_wo_gst,
+ ROUND((ROUND(pt_co_share_details.cop_amt + pt_co_share_details.cotp_amt + pt_co_share_details.cotep_amt, 2) * 18 / 100), 2) AS gst_amount,
+ ROUND(
+ ROUND(pt_co_share_details.cop_amt + pt_co_share_details.cotp_amt + pt_co_share_details.cotep_amt, 2) +
+ ROUND((ROUND(pt_co_share_details.cop_amt + pt_co_share_details.cotp_amt + pt_co_share_details.cotep_amt, 2) * 18 / 100), 2),
+ 2) AS total_premium,
+
+ ROUND(pt_co_share_details.cotp_amt + pt_co_share_details.cotep_amt, 2) AS tp_or_ter,
+ DATEDIFF(policy_transaction.policy_end_date, CURDATE()) AS days,
+ (pt_co_share_details.agreed_tp_per + pt_co_share_details.agreed_tep_per) AS agreed_tp_or_ter_per,
+ pt_co_share_details.agreed_bp_per,
+
+ -- ==============================
+ -- SUBQUERY: Total IRDA Amount
+ -- Alias Agreed Amount ...!!
+ -- ==============================
+ ROUND(pt_co_share_details.exp_amt, 2) AS total_irda_amt,
+ -- Reward Only
+ ROUND((
+ SELECT SUM(co_share_stmt_details.reward)
+ FROM co_share_stmt_details
+ JOIN insurer_statements ON co_share_stmt_details.statement_id = insurer_statements.id
+ WHERE co_share_stmt_details.co_share_id = pt_co_share_details.id
+ AND co_share_stmt_details.is_active = 1
+ AND insurer_statements.is_active = 1
+ AND insurer_statements.month = insurer_statements_oq.month
+ {$date_condition}
+ GROUP BY('policy_transaction.policy_no , insurer_statements.month , pt_co_share_details.insurer_id')
+ ), 2) AS reward,
+
+ -- Billed Amount
+ ROUND((
+ SELECT SUM(
+ COALESCE(co_share_stmt_details.actual_bp_brokerage_amt, 0) +
+ COALESCE(co_share_stmt_details.actual_tp_brokerage_amt, 0) +
+ COALESCE(co_share_stmt_details.actual_tep_brokerage_amt, 0) +
+ COALESCE(co_share_stmt_details.reward, 0)
+ )
+ FROM co_share_stmt_details
+ JOIN pt_co_share_details AS pt_table ON co_share_stmt_details.co_share_id = pt_table.id
+ JOIN insurer_statements ON co_share_stmt_details.statement_id = insurer_statements.id
+ WHERE co_share_stmt_details.co_share_id = pt_co_share_details.id
+ AND co_share_stmt_details.is_active = 1
+ AND pt_table.is_active = 1
+ AND insurer_statements.is_active = 1
+ AND insurer_statements.invoice_status IS NOT NULL
+ AND insurer_statements.month = insurer_statements_oq.month
+ {$date_condition}
+ GROUP BY('policy_transaction.policy_no , insurer_statements.month , pt_co_share_details.insurer_id')
+ ), 2) AS billed_amt,
+
+ created_user.first_name AS user_name,
+
+ CASE
+ WHEN pt_co_share_details.co_share_type IN (0, 1) THEN policy_transaction.policy_no
+ WHEN pt_co_share_details.co_share_type > 1 THEN
+ CASE
+ WHEN pt_co_share_details.follower_policy_no IS NULL OR pt_co_share_details.follower_policy_no = ''
+ THEN policy_transaction.policy_no
+ ELSE pt_co_share_details.follower_policy_no
+ END
+ ELSE policy_transaction.policy_no
+ END AS policy_no
+ ")
+
+ // ==============================
+ // JOINS
+ // ==============================
+ ->join('pt_co_share_details', 'policy_transaction.id = pt_co_share_details.pt_id', 'left')
+ ->join('clients', 'clients.id = policy_transaction.client_id')
+ ->join('client_branch', 'policy_transaction.client_branch_id = client_branch.id', 'left')
+ ->join('client_policy', 'policy_transaction.client_policy_id = client_policy.id', 'left')
+ ->join('user_profiles', 'policy_transaction.created_by = user_profiles.id', 'left')
+ ->join('vehicle', 'policy_transaction.vehicle_id = vehicle.id', 'left')
+ ->join('policy_type', 'policy_transaction.policy_type_id = policy_type.id', 'left')
+ ->join('insurers', 'pt_co_share_details.insurer_id = insurers.id', 'left')
+ ->join('insurer_branch', 'pt_co_share_details.insurer_branch_id = insurer_branch.id', 'left')
+ ->join('tpa', 'policy_transaction.tpa_id = tpa.id', 'left')
+ ->join('tpa_branch', 'policy_transaction.tpa_branch_id = tpa_branch.id', 'left')
+ ->join('user_profiles AS sales_user', 'policy_transaction.sales_generated_by = sales_user.id', 'left')
+ ->join('user_profiles AS service_user', 'policy_transaction.serviced_by = service_user.id', 'left')
+ ->join('user_profiles AS created_user', 'policy_transaction.created_by = created_user.id', 'left')
+
+
+ ->join('co_share_stmt_details', 'pt_co_share_details.id = co_share_stmt_details.co_share_id','left')
+ ->join('insurer_statements insurer_statements_oq','insurer_statements_oq.id = co_share_stmt_details.statement_id','left')
+
+ ->where('policy_transaction.is_active', 1)
+ ->where('pt_co_share_details.is_active', 1)
+ ->where('insurer_statements_oq.id IS NOT NULL')
+
+
+ // ========================================================
+ // GROUP BY Insurer Statement Months
+ // =======================================================
+ ->groupBy('policy_transaction.policy_no , pt_co_share_details.insurer_id ,insurer_statements_oq.month');
// ==============================
// ROLE-BASED FILTERS
@@ -2053,12 +2236,12 @@ class PolicyTransactionModel extends Model
$startDate = date('Y-m-d', strtotime($start_date));
$endDate = date('Y-m-d', strtotime($end_date));
- $builder->join('co_share_stmt_details', 'pt_co_share_details.id = co_share_stmt_details.co_share_id', 'left')
- ->join('insurer_statements', 'co_share_stmt_details.statement_id = insurer_statements.id', 'left')
+ $builder->join('co_share_stmt_details cssdfilter', 'pt_co_share_details.id = cssdfilter.co_share_id', 'left')
+ ->join('insurer_statements', 'cssdfilter.statement_id = insurer_statements.id', 'left')
->where('insurer_statements.is_active', 1)
->where('insurer_statements.month >=', $startDate)
->where('insurer_statements.month <=', $endDate)
- ->groupBy('co_share_stmt_details.co_share_id');
+ ->groupBy('cssdfilter.co_share_id');
}
// ==============================
@@ -2092,17 +2275,22 @@ class PolicyTransactionModel extends Model
}
}
- // ==============================
- // ORDER & EXECUTION
- // ==============================
- $builder->orderBy('policy_transaction.id', 'desc');
- $result = $builder->get()->getResultArray();
- // Uncomment if you need to debug SQL
- // dd($this->db->getLastQuery());
+
+
+ $sql1 = $builder2->getCompiledSelect();
+ $sql2 = $builder->getCompiledSelect();
+
+ $finalSql = "($sql1) UNION ALL ($sql2)
+ ORDER BY policy_no DESC, insurer_branch_name ASC, statement_uploaded ASC,
+ STR_TO_DATE(policy_issue_month, '%b %Y') ASC";
+
+
+ $result = $this->db->query($finalSql)->getResultArray();
return $result;
+
}
diff --git a/app/Views/UserList.php b/app/Views/UserList.php
index 2936af69..82441b22 100755
--- a/app/Views/UserList.php
+++ b/app/Views/UserList.php
@@ -342,6 +342,13 @@ table.dataTable tbody td {
+ get()['userData']->role;
+
+
+ ?>
@@ -511,7 +518,17 @@ table.dataTable tbody td {
@@ -522,7 +539,16 @@ table.dataTable tbody td {
@@ -673,7 +699,34 @@ table.dataTable tbody td {
BDS - All access
All access
+
+ Accounts
+ BDS - Policy Transaction
+ Policy | Endorsement | Statement Upload
+
+ BDS - Report
+ TAT wise | ACM Status wise | ACM TAT wise
+
+
+ BDS - Policy Report
+ BDS | Variance | Outstanding | IRDA | Renewal | TAT Band
+
+
+ BDS - Pending Actions
+ Finance Team
+
+
+ BDS - Masters
+ Vehicle | CD | Insurer
+
+
+ BDS - Documents
+ ✓
+
+
+
+
POS
BDS - Policy Transaction
diff --git a/app/Views/batch_list.php b/app/Views/batch_list.php
index cbbc1731..d4b69dcf 100755
--- a/app/Views/batch_list.php
+++ b/app/Views/batch_list.php
@@ -82,14 +82,15 @@
-
-
+
-
-
+
-
+
+
+
+
@@ -98,7 +99,6 @@
-
@@ -135,6 +135,11 @@
failed
+
+
+ failed
+
diff --git a/app/Views/cd_master_add_modal.php b/app/Views/cd_master_add_modal.php
index c57936c5..9089d35f 100644
--- a/app/Views/cd_master_add_modal.php
+++ b/app/Views/cd_master_add_modal.php
@@ -46,7 +46,7 @@
-
-
-
@@ -842,6 +844,17 @@ input:checked + .slider::before {
if(response.status == false && response.insurer_id != 'undefined'){
toastr.warning('The CD Account Number not found.', 'Warning');
+
+ $('#cd_ac_no').empty();
+ $('#cd_ac_no').append($('
diff --git a/app/Views/leads_list.php b/app/Views/leads_list.php
index dad5ce01..1762f32c 100644
--- a/app/Views/leads_list.php
+++ b/app/Views/leads_list.php
@@ -164,7 +164,7 @@ table.dataTable tbody td {
- S.No
+ S.No
Lead Type
Issuer
Client Type
@@ -209,8 +209,10 @@ table.dataTable tbody td {
-
-
+