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:
bitbucket 2024-03-20 16:15:28 +05:30
commit fa8f8277e4
4 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Controllers/ClientController.php
View File

@ -834,6 +834,8 @@ class ClientController extends AdminController
$client_policy_id = $this->request->getGet('client_policy_id'); $client_policy_id = $this->request->getGet('client_policy_id');
$record = $this->clientPolicyModel->where('id', $client_policy_id)->first(); $record = $this->clientPolicyModel->where('id', $client_policy_id)->first();
$family_floater=json_decode($record['policy_terms'])->family_floater;
$emp_count = $this->employeeModel ->join('client_policy cp',"employees.client_id = cp.client_id") $emp_count = $this->employeeModel ->join('client_policy cp',"employees.client_id = cp.client_id")
->join('employee_polices ep',"cp.id = ep.client_policy_id AND employees.id = ep.employee_id") ->join('employee_polices ep',"cp.id = ep.client_policy_id AND employees.id = ep.employee_id")
->where("employees.client_id",$record['client_id']) ->where("employees.client_id",$record['client_id'])
@ -864,11 +866,29 @@ class ClientController extends AdminController
$premiumData = $this->policyPremium2Model->where(['client_id' => $record['client_id'], 'client_policy_id' => $client_policy_id, 'is_active' => 1])->findAll(); $premiumData = $this->policyPremium2Model->where(['client_id' => $record['client_id'], 'client_policy_id' => $client_policy_id, 'is_active' => 1])->findAll();
} }
// echo '<pre>'; // echo '<pre>';
// print_r($results); // echo $family_floater;
$resultss = [];
if ($family_floater == 1) {
foreach ($results as $index => $record) {
if ($index == '8' || $index == '7') {
// Clearing the $results array
$resultss[$index] = $record;
}
}
}else{
foreach ($results as $index => $record) {
if ($index == '0' || $index == '1' || $index == '2' || $index == '3' || $index == '4' || $index == '5' || $index == '6') {
// Clearing the $results array
$resultss[$index] = $record;
}
}
}
// print_r($data[0]->policy_type); die; // print_r($data[0]->policy_type); die;
// echo "hello"; // echo "hello";
// return json_encode($premiumData); // return json_encode($premiumData);
return $this->respond(['status' => true,'code' => 200,'data' => $results, 'premiumData' => json_encode($premiumData), 'count' => $emp_count, 'policy_name' => $policy_name], 200); return $this->respond(['status' => true,'code' => 200,'data' => $resultss, 'premiumData' => json_encode($premiumData), 'count' => $emp_count, 'policy_name' => $policy_name,], 200);
} }

35
app/Controllers/EmployeeRestController.php
View File

@ -617,6 +617,8 @@ class EmployeeRestController extends AdminController
$emp_code =isset($extra['1'][$index]) ? $extra['1'][$index] : 0; $emp_code =isset($extra['1'][$index]) ? $extra['1'][$index] : 0;
$name = $extra['2'][$index]; $name = $extra['2'][$index];
// print_r("--" . $emp_code. "---");
// print_r( $emp_code != 0 );
if($emp_code != 0 && $name != '' || $name != null){ if($emp_code != 0 && $name != '' || $name != null){
$record = [ $record = [
// 'id' => $id, // 'id' => $id,
@ -625,12 +627,13 @@ class EmployeeRestController extends AdminController
// Check if the 'doj' key exists before accessing it // Check if the 'doj' key exists before accessing it
'doj' => $doj_new_format, 'doj' => $doj_new_format,
'gender' => $extra['4'][$index], 'gender' => $extra['4'][$index],
'relationship' => $extra['5'][$index], 'relationship' => ucfirst($extra['5'][$index]),
'family_floater_key' => $relation, 'family_floater_key' => $relation,
'dob' => $dob_new_format, 'dob' => $dob_new_format,
'email_corporate' => $extra['7'][$index], 'email_corporate' => $extra['7'][$index],
'mobile'=> $extra['8'][$index], 'mobile'=> $extra['8'][$index],
'client_id' => $client_id, 'client_id' => $client_id,
'emp_status'=>'draft'
]; ];
$record2 = [ $record2 = [
@ -644,6 +647,7 @@ class EmployeeRestController extends AdminController
{ {
$employee = $this->employeeModel->checkExistingEmpEntrollment($dataToInsert[$a]); $employee = $this->employeeModel->checkExistingEmpEntrollment($dataToInsert[$a]);
$emp_id =0; $emp_id =0;
if ($employee) { if ($employee) {
$emp_id =$employee['id']; $emp_id =$employee['id'];
$id =$emp_id; $id =$emp_id;
@ -653,17 +657,18 @@ class EmployeeRestController extends AdminController
$this->myLogger->logme('error',('Update - ' . $employee['id'].' - '. $employee['emp_code'] .' - '.$employee['name'])); $this->myLogger->logme('error',('Update - ' . $employee['id'].' - '. $employee['emp_code'] .' - '.$employee['name']));
} }
}else{ }else{
if ($dataToInsert[$a]['emp_code'] != 0) {
$result = $this->employeeModel->insert($dataToInsert[$a]); $result = $this->employeeModel->insert($dataToInsert[$a]);
$emp_id =$result; $emp_id =$result;
if ($result) { if ($result) {
$emp = $this->employeeModel->where('id', $result)->get()->getResult(); $emp = $this->employeeModel->where('id', $result)->get()->getResult();
$policy_name = $this->employeePolicyModel->where('employee_id', $result)->get()->getResult();; $policy_name = $this->employeePolicyModel->where('employee_id', $result)->get()->getResult();;
$log_message = 'Insert Employee- '.$dataToInsert[$a]['name'] .'('.$dataToInsert[$a]['emp_code'] .') with PK '; $log_message = 'Insert Employee- '.$dataToInsert[$a]['name'] .'('.$dataToInsert[$a]['emp_code'] .') with PK ';
$this->myLogger->logme('error',('Insert - ' . $dataToInsert[$a]['emp_code'] .' - '. $dataToInsert[$a]['name'])); $this->myLogger->logme('error',('Insert - ' . $dataToInsert[$a]['emp_code'] .' - '. $dataToInsert[$a]['name']));
}
} }
} }
$emp_policy_data =[ $emp_policy_data =[
@ -694,10 +699,10 @@ class EmployeeRestController extends AdminController
$data['policy_name']=$policy_name['name']; $data['policy_name']=$policy_name['name'];
$message = view('mail_welcome', $data); $message = view('mail_welcome', $data);
if ($dataToInsert[$a]['email_corporate'] != null || $dataToInsert[$a]['email_corporate'] != '' && $dataToInsert[$a]['relationship'] == 'Self') { // if ($dataToInsert[$a]['email_corporate'] != null || $dataToInsert[$a]['email_corporate'] != '' && $dataToInsert[$a]['relationship'] == 'Self') {
$job_details = new Jobs(); // $job_details = new Jobs();
$r = Jobs::addJob(['job_name' => 'send_email','payload' => ['mail' => $mail, 'subject' => $subject,'message'=> $message]]); // $r = Jobs::addJob(['job_name' => 'send_email','payload' => ['mail' => $mail, 'subject' => $subject,'message'=> $message]]);
} // }
// print_r($r);//die(); // print_r($r);//die();
// $jobWorker = new JobWorker(); // $jobWorker = new JobWorker();

5
app/Views/policy_gmc_terms.php
View File

@ -626,6 +626,8 @@ var grid_html = '';
var gmc_policy_type_id = $(this).attr('id'); var gmc_policy_type_id = $(this).attr('id');
if(gmc_policy_type_id >= '2'){ if(gmc_policy_type_id >= '2'){
$('#policyGMCTerms').css('display', ''); $('#policyGMCTerms').css('display', '');
@ -640,11 +642,12 @@ var grid_html = '';
method: 'GET', method: 'GET',
data: {client_policy_id: client_policy_id}, data: {client_policy_id: client_policy_id},
success: function(response) { success: function(response) {
console.log('response',response);
setTimeout(function() { setTimeout(function() {
$('.loader').fadeOut(); $('.loader').fadeOut();
$('.loader-mask').delay(350).fadeOut('slow'); $('.loader-mask').delay(350).fadeOut('slow');
}, 1000); }, 1000);
console.log(response);
$('#nameOfThePolicyInGMC').html(' - ' + response.policy_name.name); $('#nameOfThePolicyInGMC').html(' - ' + response.policy_name.name);
$('gmc_emp_count').val(response.count); $('gmc_emp_count').val(response.count);

4
app/Views/policy_gpa_terms.php
View File

@ -446,12 +446,12 @@
$('body').on('click', '.btnPolicyMaster', function () { $('body').on('click', '.btnPolicyMaster', function () {
var client_policy_id = $(this).data('id'); var client_policy_id = $(this).data('id');
console.log('client_policy_id :' ,client_policy_id); // console.log('client_policy_id :' ,client_policy_id);
$('#gpa_client_policy_id').val(client_policy_id); $('#gpa_client_policy_id').val(client_policy_id);
var gpa_policy_type_id = $(this).attr('id'); var gpa_policy_type_id = $(this).attr('id');
console.log('gpa_policy_type_id', gpa_policy_type_id) // console.log('gpa_policy_type_id', gpa_policy_type_id)
if(gpa_policy_type_id == '1'){ if(gpa_policy_type_id == '1'){