diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php index f5ade0fb..3c7b8860 100644 --- a/app/Controllers/EmpDataServiceController.php +++ b/app/Controllers/EmpDataServiceController.php @@ -1221,6 +1221,7 @@ class EmpDataServiceController extends BaseController //Endorsement Correction + public function importCorrectionValidation($params) { diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index b652d3eb..8afffb88 100644 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -190,6 +190,11 @@ class MasterController extends AdminController $uploadFilePath = ROOTPATH . 'public/uploads/logo/'; $file_name = file_Upload($this->request->getFile('insurer_logo'), $uploadFilePath); $data = $this->request->getPost(); + + if($this->request->getPost('addition_add_day')){ + $data['addition_add_day'] = 1; + } + $data['created_by'] = get_session_userid(); $data['insurer_logo'] = $file_name; @@ -265,6 +270,12 @@ class MasterController extends AdminController $data['insurer_logo'] = $file_name; } + if($this->request->getPost('addition_add_day')){ + $data['addition_add_day'] = 1; + }else{ + $data['addition_add_day'] = 0; + } + $update = $this->insurerModel->update($id,$data); if($update){ echo json_encode(array("status" => true , 'data' => $data)); diff --git a/app/Helpers/excel_import_export_helper.php b/app/Helpers/excel_import_export_helper.php index c7cec62d..65e44eaa 100644 --- a/app/Helpers/excel_import_export_helper.php +++ b/app/Helpers/excel_import_export_helper.php @@ -212,10 +212,10 @@ if (! function_exists('transform_objects_to_array_for_si_enhancement')) { $obj->no_of_days, $obj->old_si_premium, $obj->new_si_premium, - $obj->difference_premium, + round($obj->difference_premium, 2), $obj->pro_rata_premimum, $obj->gst, - $obj->total , + round($obj->total, 2), $endorsement_id, ]; diff --git a/app/Views/batch_list.php b/app/Views/batch_list.php index e55bc755..0b28f477 100644 --- a/app/Views/batch_list.php +++ b/app/Views/batch_list.php @@ -18,7 +18,7 @@
- +
@@ -48,7 +48,7 @@ @@ -58,11 +58,9 @@ - - +
SNO - 5 ? substr($file['file_name'], 0, 10) . "..." : $file['file_name'] ?> + - - 5 ? substr(date('d-M-Y H:i:a', strtotime($file['created_at'])), 0, 6) . "..." : $file['created_at'] ?> - + + by diff --git a/app/Views/employee_data_list.php b/app/Views/employee_data_list.php index f1f3d935..f59eb1c7 100644 --- a/app/Views/employee_data_list.php +++ b/app/Views/employee_data_list.php @@ -24,8 +24,16 @@ .table-responsive { overflow-x: auto; } + +.word-wrap { + word-wrap: break-word; + white-space: normal; +} + + +
@@ -37,7 +45,7 @@
- @@ -67,8 +75,7 @@ - + @@ -90,10 +97,10 @@ } ?> - - - - + + + +
( - - )( - )