diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 75c60b5..8258cf1 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -495,6 +495,11 @@ $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) { $routes->get("getAdvertisementImage", "EmployeeRestController::getAdvertisementImage"); $routes->post("logHrActivity", "RestAuthenticationController::logHrActivity"); + $routes->get("hrFileList", "EmployeeRestController::hrFileList"); + $routes->get("hrFileUploadMasters", "EmployeeRestController::hrFileUploadMasters"); + $routes->get("hrFileDownload", "EmployeeRestController::hrFileDownload"); + $routes->post("hrFileUpload", "EmployeeRestController::hrFileUpload"); + }); $routes->get("getEmployeeActiveOrInactivePolicy", "EmployeeRestController::getEmployeeActiveOrInactivePolicy"); $routes->get("sendPushNotification", "EmployeeRestController::sendPushNotification"); diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index 678100a..fdf55ca 100755 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -133,12 +133,19 @@ class ClientController extends AdminController $field = $this->request->getPost('field'); $value = $this->request->getPost('value'); + // print_rr($value); die; + if($value == '') return $this->response->setJSON(['isDuplicate' => false]); + // Load the database if not already loaded $db = db_connect(); // Perform the query $builder = $db->table($table); - $isDuplicate = $builder->where($field, $value)->where('is_active', 1)->countAllResults() > 0; + if(is_array($value)){ + $isDuplicate = $builder->where($value)->where('is_active', 1)->countAllResults() > 0; + }else{ + $isDuplicate = $builder->where($field, $value)->where('is_active', 1)->countAllResults() > 0; + } // Return the result return $this->response->setJSON(['isDuplicate' => $isDuplicate]); diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index f841d35..feca6fd 100755 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -27,6 +27,7 @@ use App\Models\ClientDepositModel; use App\Models\PolicyPremium2Model; use App\Models\AuditHistoryModel; use App\Models\UserModel; +use App\Models\HrFileUploadModel; @@ -73,6 +74,7 @@ class EmployeeController extends AdminController protected $PolicyPremium2Model; protected $auditHistory; protected $userModel; + protected $hrFileUploadModel; public function __construct() @@ -96,6 +98,7 @@ class EmployeeController extends AdminController $this->PolicyPremium2Model = new PolicyPremium2Model(); $this->auditHistory = new AuditHistoryModel(); $this->userModel = new userModel(); + $this->hrFileUploadModel = new HrFileUploadModel(); } public function list() @@ -1970,7 +1973,7 @@ class EmployeeController extends AdminController $policy_terms = isset($policy_details['policy_terms']) ? true : false; $si_enhancement_true_or_false = 1; - if($policy_terms){ + if($policy_terms == true){ $policyTermsData = json_decode($policy_details['policy_terms']); if (isset($policyTermsData->suminsuredenhancement) && $policyTermsData->suminsuredenhancement !== null) { @@ -1983,7 +1986,7 @@ class EmployeeController extends AdminController $message = null; - if (!isset($policy_terms)) { + if ($policy_terms == false) { $message .= 'Policy terms'; } @@ -1993,7 +1996,7 @@ class EmployeeController extends AdminController } $message = isset($message) ? ($message . ' not defined for choosed policy') : null; - return $this->respond(['dataStatus' => true, 'code' => 200, 'message' => $message, 'si_enhancement' => $si_enhancement_true_or_false, 'insurer_multi_event' => $insurer_details['is_multi_event']], 200); + return $this->respond(['dataStatus' => true, 'code' => 200, 'message' => $message, 'si_enhancement' => $si_enhancement_true_or_false, 'insurer_multi_event' => $insurer_details['is_multi_event'] ?? null], 200); } @@ -2477,7 +2480,8 @@ class EmployeeController extends AdminController //------------------------------------------------------------------------------------------------------ - public function test_members_list(){ + public function test_members_list() + { // $model = new EmployeeModel(); // $list = [ // ['relationship' => 'spouse','emp_code' => 'TEST002', 'name' => 'Lakshmi','email_personal' => 'lakshmi@gmail.com','mobile'=>'6382156701','gender'=>'female','dob'=>'1996-05-19','doj'=>'2022-02-01','basic_pay'=>'100000','emp_status'=>'enrolled'], @@ -2500,7 +2504,8 @@ class EmployeeController extends AdminController return $this->loadLayout('test_members_list',$data); } - public function mapEmployees(){ + public function mapEmployees() + { $client_id = $this->request->getPost('client_id'); $branch_id = $this->request->getPost('branch_id'); $policy_id = $this->request->getPost('client_policy_id'); @@ -2534,7 +2539,8 @@ class EmployeeController extends AdminController } } - public function getDataForMapping(){ + public function getDataForMapping() + { $policy_id = $this->request->getPost('policy_id');log_message('error',$policy_id); $data['policy_start_date'] = $this->clientPolicyModel->select('policy_start_date')->where('id',$policy_id)->first()['policy_start_date']; $data['si_amt'] = $this->PolicyPremium2Model->select('si')->where('client_policy_id', $policy_id)->groupBy('si')->findAll(); @@ -2542,7 +2548,8 @@ class EmployeeController extends AdminController return $this->respond(['status' => true, 'code' => 200, 'data' => $data], 200); } - public function unmapEmployees($actionType){ + public function unmapEmployees($actionType) + { $selected_employees = (array)$this->request->getPost('selected'); if($actionType == 0){ for($i = 0;$irequest->getPost('emp_id'); @@ -2712,7 +2717,8 @@ class EmployeeController extends AdminController } - public function formatFieldName($unformattedString){ + public function formatFieldName($unformattedString) + { if (str_contains($unformattedString, '_')) { $data = str_replace('_', ' ', $unformattedString); @@ -2726,88 +2732,88 @@ class EmployeeController extends AdminController } + //------------------------------------------------------------------------------------------------------ + public function download_inception() + { + $client = $this->request->getPost('client'); + $branch = $this->request->getPost('branch'); + $policies = $this->request->getPost('policies'); + $status = $this->request->getPost('status'); + $empCode = $this->request->getPost('empCode'); + $empName = $this->request->getPost('empName'); -public function download_inception() -{ - $client = $this->request->getPost('client'); - $branch = $this->request->getPost('branch'); - $policies = $this->request->getPost('policies'); - $status = $this->request->getPost('status'); - $empCode = $this->request->getPost('empCode'); - $empName = $this->request->getPost('empName'); + $result = $this->employeePolicyModel->download_inception( + $client, $branch, $policies, $status, $empCode, $empName + ); - $result = $this->employeePolicyModel->download_inception( - $client, $branch, $policies, $status, $empCode, $empName - ); + if (empty($result)) { + return $this->response->setStatusCode(204)->setBody('No data found'); + } - if (empty($result)) { - return $this->response->setStatusCode(204)->setBody('No data found'); - } + $formatted = []; + foreach ($result as $index => $row) { + $rowWithSerial = ['S.NO' => $index + 1] + $row; + $formatted[] = $rowWithSerial; + } + $result = $formatted; - $formatted = []; - foreach ($result as $index => $row) { - $rowWithSerial = ['S.NO' => $index + 1] + $row; - $formatted[] = $rowWithSerial; - } - $result = $formatted; + $spreadsheet = new Spreadsheet(); + $sheet = $spreadsheet->getActiveSheet(); - $spreadsheet = new Spreadsheet(); - $sheet = $spreadsheet->getActiveSheet(); + $headers = array_keys($result[0]); + $columnWidth = 20; // standard column width - $headers = array_keys($result[0]); - $columnWidth = 20; // standard column width - - $colIndex = 1; - foreach ($headers as $header) { - $columnLetter = Coordinate::stringFromColumnIndex($colIndex); - $cellCoordinate = $columnLetter . '1'; - - $sheet->setCellValue($cellCoordinate, ucfirst(str_replace('_', ' ', $header))); - - $sheet->getColumnDimension($columnLetter)->setWidth($columnWidth); - - $style = $sheet->getStyle($cellCoordinate); - $style->getFont()->setBold(true); - $style->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER); - $style->getBorders()->getAllBorders()->setBorderStyle(Border::BORDER_THIN); - - $colIndex++; - } - - $rowNum = 2; - foreach ($result as $row) { $colIndex = 1; - foreach ($row as $cell) { + foreach ($headers as $header) { $columnLetter = Coordinate::stringFromColumnIndex($colIndex); - $cellCoordinate = $columnLetter . $rowNum; - $sheet->setCellValue($cellCoordinate, $cell); + $cellCoordinate = $columnLetter . '1'; + + $sheet->setCellValue($cellCoordinate, ucfirst(str_replace('_', ' ', $header))); + + $sheet->getColumnDimension($columnLetter)->setWidth($columnWidth); + + $style = $sheet->getStyle($cellCoordinate); + $style->getFont()->setBold(true); + $style->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER); + $style->getBorders()->getAllBorders()->setBorderStyle(Border::BORDER_THIN); + $colIndex++; } - $rowNum++; + + $rowNum = 2; + foreach ($result as $row) { + $colIndex = 1; + foreach ($row as $cell) { + $columnLetter = Coordinate::stringFromColumnIndex($colIndex); + $cellCoordinate = $columnLetter . $rowNum; + $sheet->setCellValue($cellCoordinate, $cell); + $colIndex++; + } + $rowNum++; + } + + + $exportDir = WRITEPATH . 'exports'; + if (!is_dir($exportDir)) { + mkdir($exportDir, 0777, true); + } else { + chmod($exportDir, 0777); + } + + $filename = 'inception_export_' . date('Ymd_His') . '.xlsx'; + $filepath = $exportDir . '/' . $filename; + + $writer = new Xlsx($spreadsheet); + $writer->save($filepath); + + return $this->response->setJSON([ + 'status' => 'success', + 'downloadUrl' => base_url('employee/download_file?file=' . urlencode($filename)) + ]); } - $exportDir = WRITEPATH . 'exports'; - if (!is_dir($exportDir)) { - mkdir($exportDir, 0777, true); - } else { - chmod($exportDir, 0777); - } - - $filename = 'inception_export_' . date('Ymd_His') . '.xlsx'; - $filepath = $exportDir . '/' . $filename; - - $writer = new Xlsx($spreadsheet); - $writer->save($filepath); - - return $this->response->setJSON([ - 'status' => 'success', - 'downloadUrl' => base_url('employee/download_file?file=' . urlencode($filename)) - ]); -} - - public function download_file() { $filename = $this->request->getGet('file'); @@ -2822,4 +2828,12 @@ public function download_inception() + + + + + + + + } diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 8069280..38329a0 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -32,7 +32,7 @@ use App\Models\ClientBranchModel; use App\Models\AuditHistoryModel; use App\Models\SIMappingModel; use App\Models\InsurerModel; - +use App\Models\HrFileUploadModel; use App\Controllers\Jobs ; use App\Controllers\JobWorker ; @@ -79,6 +79,7 @@ class EmployeeRestController extends AdminController protected $siMappingModel; protected $employeeHelper; protected $insurerModel; + protected $hrFileUploadModel; public function __construct() @@ -106,6 +107,7 @@ class EmployeeRestController extends AdminController $this->siMappingModel = new SIMappingModel(); $this->employeeHelper = new EmployeeHelper(); $this->insurerModel = new InsurerModel(); + $this->hrFileUploadModel = new HrFileUploadModel(); } @@ -1335,13 +1337,14 @@ class EmployeeRestController extends AdminController $array->family_floaters_of_dependent_and_gst_value = 0; } - $checkGmcParentsPolicyExist = $this->clientPolicyModel->select('client_policy.id as ClientPolicyId , client_policy.client_id as ClientId, client_policy.policy_type_id as policy_type_id, policy_type.long_name as Policy_Name , client_policy.is_addon as is_addon , client_policy.open_for_enrollment as OpenForEnrollment , client_policy.inception_type as inception_type , client_policy.policy_terms as Policy_Terms') + $checkGmcParentsPolicyExist = $this->clientPolicyModel->select('client_policy.id as ClientPolicyId , client_policy.client_id as ClientId, client_policy.policy_type_id as policy_type_id, policy_type.long_name as Policy_Name , client_policy.is_addon as is_addon , client_policy.open_for_enrollment as OpenForEnrollment , client_policy.inception_type as inception_type , client_policy.policy_terms as Policy_Terms , client_policy.is_premium_summery as is_premium_summery, client_policy.enrolment_visibility') ->join('policy_type', 'client_policy.policy_type_id = policy_type.id', 'left') ->where('client_policy.policy_type_id', 3 ) ->where('client_policy.is_addon', 1 ) ->where('client_policy.client_id', $this->request->getGet('client_id') ) ->where('client_policy.client_branch_id', $this->request->getGet('client_branch_id') ) ->where('client_policy.is_active', 1 ) + ->where('client_policy.enrolment_visibility', 1 ) ->get() ->getResult(); if($checkGmcParentsPolicyExist) @@ -1903,6 +1906,7 @@ class EmployeeRestController extends AdminController ->where('client_branch_id',$this->request->getGet('client_branch_id')) ->where('policy_status', 1) ->where('is_active', 1) + ->where('enrolment_visibility', 1) ->findAll(); if(count($clientPolicy)) @@ -3494,4 +3498,142 @@ class EmployeeRestController extends AdminController } + //-------------------------------------------------------------------------------------------- + public function hrFileUpload() + { + try { + // Check file + $file = $this->request->getFile('file_name'); + if (!$file) { + return $this->response->setJSON([ + 'status' => false, + 'message' => "Invalid file or file not uploaded.", + 'data' => "No Data" + ]); + } + + // Upload folder path + $uploadPath = WRITEPATH . 'uploads/hr_files/'; + + // If directory not exists, create it + if (!is_dir($uploadPath)) { + mkdir($uploadPath, 0777, true); + } + + // New file name with timestamp + $newFileName = time() . '_' . $file->getRandomName(); + + // Move file + $file->move($uploadPath, $newFileName); + + // Prepare data + $data = [ + 'client_id' => $this->request->getPost('client_id'), + 'client_branch_id' => $this->request->getPost('client_branch_id'), + 'policy_no' => $this->request->getPost('policy_no'), + 'file_name' => $newFileName, + 'file_action' => $this->request->getPost('file_action'), + 'status' => $this->request->getPost('status'), + 'created_by' => $this->request->getPost('created_by'), + 'updated_by' => $this->request->getPost('created_by'), + ]; + + // Save into DB + $this->hrFileUploadModel->insert($data); + + return $this->respondCreated([ + 'status' => true, + 'message' => 'File uploaded successfully', + 'data' => $data + ]); + + } catch (\Exception $e) { + return $this->failServerError($e->getMessage()); + } + + } + + public function hrFileDownload($id = null) + { + try { + + $file_id = $this->request->getGet('id') ?? $id; + + // Find record + $record = $this->hrFileUploadModel->find($file_id); + + if (!$record) { + return $this->failNotFound("File record not found"); + } + + $uploadPath = WRITEPATH . 'uploads/hr_files/'; + $filePath = $uploadPath . $record['file_name']; + + if (!file_exists($filePath)) { + return $this->failNotFound("File not found on server"); + } + + // Force file download + return $this->response->download($filePath, null) + ->setFileName($record['file_name']); + } catch (\Exception $e) { + return $this->failServerError($e->getMessage()); + } + } + + public function hrFileList() + { + try { + $request = service('request'); + $builder = $this->hrFileUploadModel; + + // Allowed filter keys + $filters = [ + 'client_id', + 'client_branch_id', + 'policy_no', + 'file_action', + 'status', + 'created_by' + ]; + + // Apply filters dynamically + foreach ($filters as $key) { + $value = $request->getGetPost($key); // supports both GET and POST + if (!empty($value)) { + $builder->where($key, $value); + } + } + + // Fetch results + $data = $builder->findAll(); + + return $this->respond([ + 'status' => true, + 'message' => 'File list fetched successfully', + 'data' => $data + ]); + } catch (\Exception $e) { + return $this->failServerError($e->getMessage()); + } + } + + public function hrFileUploadMasters() + { + try { + //for inception upload + $data['actions'] = ['inception' => 'Inception (Employee + Dependents)', 'missed_inception' => 'Missed Inception (Employee + Dependents)', 'addition' => 'Addition (Employee + Dependents)', 'dependent_addition' => 'Dependent Addition (Only Dependents)', 'deletion' => 'Deletion', 'correction' => 'Correction', 'si_enhancement' => 'SI Enhancement']; + + return $this->respond([ + 'status' => true, + 'message' => 'File inception upload masters', + 'data' => $data + ]); + } catch (\Exception $e) { + return $this->failServerError($e->getMessage()); + } + } + + + } \ No newline at end of file diff --git a/app/Helpers/EmployeeHelper.php b/app/Helpers/EmployeeHelper.php index 6feadc8..e33e6dd 100644 --- a/app/Helpers/EmployeeHelper.php +++ b/app/Helpers/EmployeeHelper.php @@ -30,20 +30,25 @@ class EmployeeHelper public function validation_addEmployeeAndDependence($data){ - $employeeData = $this->employeeModel->where('emp_code',$data[0]->emp_code) - ->where('client_id',$data[0]->client_id) - ->where('client_branch_id',$data[0]->client_branch_id) - ->where('is_active', 1 ) - ->where('is_addon_value',0) - ->findAll(); - - $arr [] = $data; - + $arr [] = $data; + $client_policy_id = $data[0]->client_policy_id ; - + $array = $this->clientPolicyModel ->where('id',$client_policy_id) ->find(); + + $is_addon_value = $array[0]['is_addon']; + + if($is_addon_value == 1){ $is_addon_value = 0 ; }else{ $is_addon_value = 1 ; } + + + $employeeData = $this->employeeModel->where('emp_code',$data[0]->emp_code) + ->where('client_id',$data[0]->client_id) + ->where('client_branch_id',$data[0]->client_branch_id) + ->where('is_active', 1 ) + ->where('is_addon_value',$is_addon_value) + ->findAll(); $array = $array[0]; diff --git a/app/Helpers/sendMailNotification.php b/app/Helpers/sendMailNotification.php index ec13519..5624627 100755 --- a/app/Helpers/sendMailNotification.php +++ b/app/Helpers/sendMailNotification.php @@ -11,6 +11,7 @@ use App\Models\EmployeeModel; use App\Models\PolicyPremium1Model; use App\Models\PolicyPremium2Model; use App\Models\MailAttachmentModel; +use Kint\Kint; class sendMailNotification { @@ -351,10 +352,10 @@ class sendMailNotification $gst = 0; } - // dd($payable_employee_array); + // Kint::dump($payable_employee_array); // dd(count($payable_employee_array['emp_data'])); - if(isset($payable_employee_array['emp_data']) && count($payable_employee_array['emp_data']) > 0 && $client_policy_data['is_premium_summery'] == 1){ + if(isset($payable_employee_array['emp_data']) && count($payable_employee_array['emp_data']) > 0){ $table_content .= '

Policy Type :'; $temp_data = ''; @@ -411,7 +412,7 @@ class sendMailNotification // dd($si); // Premium summery for show and hide the Additional premium data - if($client_policy_data['is_premium_summery'] == 1){ + if($inner_item['payable_employee'] == 1 || $client_policy_data['is_premium_summery'] == 1){ if($policy_premium_data['premium_type'] == 2){ $temp_data .= '' . $si . ''; @@ -467,7 +468,7 @@ class sendMailNotification $table_content .= 'Sum Insured'; // Premium summery for show and hide the Additional premium data - if($client_policy_data['is_premium_summery'] == 1){ + if($inner_item['payable_employee'] == 1 || $client_policy_data['is_premium_summery'] == 1){ $table_content .= 'Premium'; $table_content .= 'GST'; } @@ -480,7 +481,7 @@ class sendMailNotification $table_content .= '

'; // Premium summery for show and hide the Additional premium data - if($client_policy_data['is_premium_summery'] == 1){ + if($inner_item['payable_employee'] == 1 || $client_policy_data['is_premium_summery'] == 1){ $addon_list_array = [ 'policy_name' => $policy_name_for_policy_type . '( Payable By Employee )', 'addtional_premium' => round($addtional_premium), diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 0ee72b6..d29c75f 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -1862,15 +1862,18 @@ class EmployeePolicyModel extends Model 'employee_polices.basic_cover_si As `Basic cover SI`', + "DATE_FORMAT(employee_polices.date_coverage, '%d-%b-%Y') AS `Date of Coverage`", "DATE_FORMAT(emp.doj, '%d-%b-%Y') AS `DOJ`", 'emp.basic_pay As `Basic Pay`', 'emp.band As `Band/Grade`', + 'emp.designation As `Designation`', 'emp.mobile as Phone', 'emp.email_corporate As Email', - 'emp.change_event', - 'employee_polices.pre_existing_alignments as `PRE EXISTING AILMENTS`', + 'COALESCE(employee_polices.pre_existing_alignments, 0) as `PRE EXISTING AILMENTS`', + + 'emp.change_event', 'employee_polices.date_of_exit', 'employee_polices.reason_for_exit', @@ -1902,25 +1905,27 @@ class EmployeePolicyModel extends Model $result->where('employee_polices.client_policy_id', $policy_id); } - if (is_array($status) && count($status) > 0) { + // if (is_array($status) && count($status) > 0) { - $result->where('employee_polices.status !=', 'expired'); + // $result->where('employee_polices.status !=', 'expired'); - if (in_array("active", $status)) { + // if (in_array("active", $status)) { - $result->where('employee_polices.tpa_id IS NOT NULL'); - $result->where('employee_polices.uhid IS NOT NULL'); - $result->whereIn('employee_polices.status', $status); - } elseif (in_array("pending", $status)) { + // $result->where('employee_polices.tpa_id IS NOT NULL'); + // $result->where('employee_polices.uhid IS NOT NULL'); + // $result->whereIn('employee_polices.status', $status); + // } elseif (in_array("pending", $status)) { - $result->where('employee_polices.tpa_id IS NULL'); - $result->where('employee_polices.uhid IS NULL'); - $result->whereIn('employee_polices.status', array_merge($status, ['active'])); - } else { + // $result->where('employee_polices.tpa_id IS NULL'); + // $result->where('employee_polices.uhid IS NULL'); + // $result->whereIn('employee_polices.status', array_merge($status, ['active'])); + // } else { - $result->whereIn('employee_polices.status', $status); - } - } + // $result->whereIn('employee_polices.status', $status); + // } + // } + + $result->where('employee_polices.status =', 'enrolled'); if (!empty(trim($emp_code))) { $result->where('emp.emp_code', $emp_code); diff --git a/app/Models/HrFileUploadModel.php b/app/Models/HrFileUploadModel.php new file mode 100644 index 0000000..e5e2a22 --- /dev/null +++ b/app/Models/HrFileUploadModel.php @@ -0,0 +1,34 @@ +Email* + onkeyup="validateInput(this, 'employees', 'email_corporate')" required>
+ onkeyup="validateInput(this, 'employees', 'mobile')" required>
@@ -677,6 +677,11 @@ function send_mail_for_individual_employee_ecard(id) { function validateInput(input, table, field) { + let emp_code = $('#emp_code_for_edit').val(); + let client_id = $('#clients').val(); + console.log("emp_code", emp_code); + console.log("client_id", client_id); + let value = $(input).val(); let label = $(input).closest('.form-group').find('label').text().replace('*', '').trim(); @@ -685,10 +690,18 @@ function validateInput(input, table, field) { message = label + " already exists!"; } - checkDuplicateTableFieldValue(table, field, value, function(isDuplicate) { + let data = {}; + data["emp_code !="] = emp_code; + data[field] = value; + + console.log(data); + + checkDuplicateTableFieldValue(table, field, data, function(isDuplicate) { if (isDuplicate) { toastr.warning(message, 'WARNING'); - $(input).val('') + $("#btnSubmit").prop('disabled', true); + }else{ + $("#btnSubmit").prop('disabled', false); } }); @@ -722,7 +735,6 @@ function closeModal() { } - function get_emp_history(input, emp_id) { $('.loader').fadeIn(); $('.loader-mask').fadeIn(); diff --git a/app/Views/policy_gmc_terms.php b/app/Views/policy_gmc_terms.php index 0d9b2bd..f1a120d 100755 --- a/app/Views/policy_gmc_terms.php +++ b/app/Views/policy_gmc_terms.php @@ -354,7 +354,7 @@ label {
+ value="">
@@ -1223,13 +1223,9 @@ $('body').on('click', '.btnPolicyMaster', function() { if (jsonObject[key]['either-parents-pil'] == 1) { $('#family_floaters').val('EPORPIL'); - } else if (jsonObject[key].parents == 1 && jsonObject[key][ - 'parents-in-law' - ] == 1) { + } else if (jsonObject[key].parents == 1 && jsonObject[key]['parents-in-law'] == 1) { $('#family_floaters').val('2EPORPIL'); - } else if (jsonObject[key].parents == 2 && jsonObject[key][ - 'parents-in-law' - ] == 2) { + } else if (jsonObject[key].parents == 2 && jsonObject[key]['parents-in-law'] == 2) { $('#family_floaters').val('4EPORPIL'); } else if (jsonObject[key].parents == 1) { $('#family_floaters').val('1P'); @@ -1240,7 +1236,7 @@ $('body').on('click', '.btnPolicyMaster', function() { } else if (jsonObject[key]['parents-in-law'] == 2) { $('#family_floaters').val('2PIL'); } else if (jsonObject[key]['either-parents-pil'] == 2) { - $('#family_floaters').val('4EPORPIL'); + $('#family_floaters').val('2EPORPIL'); } }