Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

Browse Source
This commit is contained in:
VENKATESHWARAN 2024-10-19 20:07:49 +05:30
commit 710ae1efa9
3 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/Controllers/EmployeeServiceController.php
View File

@ -1619,9 +1619,17 @@ class EmployeeServiceController extends AdminController
} }
$this->employeeModel->save($value); $this->employeeModel->save($value);
$emp_id = $this->employeeModel->getInsertID(); if (isset($value['id'])) {
if($emp_id != 0){ $log_message .= $emp_id; } $emp_id = $value['id'];
else{ $emp_id = $employee[0]['id']; } } else {
$emp_id = $this->employeeModel->getInsertID();
$log_message .= $emp_id;
}
//commanded for last insert id is coming from buffer
// $emp_id = $this->employeeModel->getInsertID();
// if($emp_id != 0){ $log_message .= $emp_id; }
// else{ $emp_id = $employee[0]['id']; }
$this->myLogger->logme('error',$log_message); $this->myLogger->logme('error',$log_message);
@ -1647,7 +1655,14 @@ class EmployeeServiceController extends AdminController
} }
$this->employeePolicyModel->save($policy_data); $this->employeePolicyModel->save($policy_data);
$emp_policy_id = $this->employeePolicyModel->getInsertID(); if(isset($policy_data['id']))
{
$emp_policy_id = $policy_data['id'];
}else
{
$emp_policy_id = $this->employeePolicyModel->getInsertID();
}
if($emp_policy_id != 0)//emp policy inserted if($emp_policy_id != 0)//emp policy inserted
{ {
$log_message .= ' with PK ' . $emp_policy_id; $log_message .= ' with PK ' . $emp_policy_id;
@ -1663,7 +1678,7 @@ class EmployeeServiceController extends AdminController
} }
} }
else{ $emp_policy_id = $employee_policy[0]['id']; } // else{ $emp_policy_id = $employee_policy[0]['id']; }
$this->myLogger->logme('error',$log_message); $this->myLogger->logme('error',$log_message);
@ -2004,9 +2019,15 @@ public function employeesEnrollmentInsert($params)
} }
$this->employeeModel->save($value); $this->employeeModel->save($value);
$emp_id = $this->employeeModel->getInsertID(); if (isset($value['id']))
if($emp_id != 0){ $log_message .= $emp_id; } { $emp_id = $value['id']; }
else{ $emp_id = $employee['id']; } else { $emp_id = $this->employeeModel->getInsertID();
$log_message .= $emp_id;
}
// $emp_id = $this->employeeModel->getInsertID();
// if($emp_id != 0){ $log_message .= $emp_id; }
// else{ $emp_id = $employee['id']; }
$this->myLogger->logme('error',$log_message); $this->myLogger->logme('error',$log_message);

5
app/Helpers/excel_util_helper.php
View File

@ -1133,7 +1133,10 @@ if (!function_exists('premium_calculation_manager'))
$insurer = ($insurer->find($policy_terms['insurer_id'])); $insurer = ($insurer->find($policy_terms['insurer_id']));
if($insurer['addition_add_day'] == true) if($insurer['addition_add_day'] == true)
{ {
$emp_data['policy_details']['date_coverage'] = (new DateTime($emp_data['policy_details']['date_coverage']))->modify('+1 day')->format('Y-m-d'); // $emp_data['policy_details']['date_coverage'] = (new DateTime($emp_data['policy_details']['date_coverage']))->modify('+1 day')->format('Y-m-d');
$emp_data['policy_details']['date_coverage'] = isset($emp_data['policy_details']['date_coverage']) && $emp_data['policy_details']['date_coverage'] != '' && $emp_data['policy_details']['date_coverage'] != null ?
(new DateTime($emp_data['policy_details']['date_coverage']))->modify('+1 day')->format('Y-m-d') : null ;
} }
} }
// dd($emp_data); // dd($emp_data);

9
app/Helpers/utility_helper.php
View File

@ -466,3 +466,12 @@ function numberToWords($number)
return $number; // Fallback for numbers beyond the supported range return $number; // Fallback for numbers beyond the supported range
} }
if (!function_exists('print_rr')) {
function print_rr($data)
{
echo "<pre>";
print_r($data);
echo "</pre>";
}
}