admin/accounting_dev_v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perbaikan bug global loading HR dan Payroll

Browse Source
This commit is contained in:
Wian Drs
2026-09-14 12:05:53 +07:00
parent 63993ee76e
commit 5e1fd11410
9 changed files with 153 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Employees.php
+33 -41
View File
@@ -407,75 +407,64 @@ class Employees extends MY_Controller {
// =========================================================
private function prepareData()
{
$nullableText = function ($value) {
$value = trim((string) $value);
return $value === '' || in_array(strtolower($value), array('undefined', 'null'), true)
? null
: $value;
};
$nullableId = function ($value) {
$value = (int) $value;
return $value > 0 ? $value : null;
};
$data = [
'nik' => trim($this->input->post('nik')),
'nik' => $nullableText($this->input->post('nik')),
'full_name' => trim(
$this->input->post('full_name')
),
'gender' => $this->input->post('gender'),
'gender' => $nullableText($this->input->post('gender')),
'birth_place' => trim(
$this->input->post('birth_place')
),
'birth_place' => $nullableText($this->input->post('birth_place')),
'birth_date' => $this->input->post('birth_date'),
'birth_date' => $nullableText($this->input->post('birth_date')),
'phone' => trim(
$this->input->post('phone')
),
'phone' => $nullableText($this->input->post('phone')),
'email' => trim(
$this->input->post('email')
),
'email' => $nullableText($this->input->post('email')),
'address' => trim(
$this->input->post('address')
),
'address' => $nullableText($this->input->post('address')),
'join_date' => $this->input->post('join_date'),
'resign_date' => $this->input->post('resign_date'),
'resign_date' => $nullableText($this->input->post('resign_date')),
'employment_status' => $this->input->post('employment_status'),
'marital_status' => $this->input->post('marital_status'),
'religion' => trim(
$this->input->post('religion')
),
'religion' => $nullableText($this->input->post('religion')),
'department_id' => $this->input->post('department_id'),
'department_id' => $nullableId($this->input->post('department_id')),
'position_id' => $this->input->post('position_id'),
'position_id' => $nullableId($this->input->post('position_id')),
'branch_id' => $this->input->post('branch_id'),
'branch_id' => $nullableId($this->input->post('branch_id')),
'bank_name' => trim(
$this->input->post('bank_name')
),
'bank_name' => $nullableText($this->input->post('bank_name')),
'bank_account_number' => trim(
$this->input->post('bank_account_number')
),
'bank_account_number' => $nullableText($this->input->post('bank_account_number')),
'bank_account_name' => trim(
$this->input->post('bank_account_name')
),
'bank_account_name' => $nullableText($this->input->post('bank_account_name')),
'bpjs_kesehatan_number' => trim(
$this->input->post('bpjs_kesehatan_number')
),
'bpjs_kesehatan_number' => $nullableText($this->input->post('bpjs_kesehatan_number')),
'bpjs_ketenagakerjaan_number' => trim(
$this->input->post('bpjs_ketenagakerjaan_number')
),
'bpjs_ketenagakerjaan_number' => $nullableText($this->input->post('bpjs_ketenagakerjaan_number')),
'fingerprint_user_id' => trim(
$this->input->post('fingerprint_user_id')
),
'fingerprint_user_id' => $nullableText($this->input->post('fingerprint_user_id')),
'is_active' => $this->input->post('is_active') === '0' ? 0 : 1
];
@@ -492,7 +481,10 @@ class Employees extends MY_Controller {
private function canEmployee($action)
{
return is_master_admin_user() || check_permission('hr_employees',$action) || check_permission('employees',$action);
return $this->session->userdata('role') === 'Admin'
|| is_master_admin_user()
|| check_permission('hr_employees',$action)
|| check_permission('employees',$action);
}
private function maskRestrictedSalary($employee)
application/controllers/Organizationmaster.php
+1 -1
View File
@@ -9,5 +9,5 @@ class Organizationmaster extends MY_Controller
private function saveMaster($table,$nameField,$position=false){$id=(int)$this->input->post('id');$code=strtoupper(trim($this->input->post('code',true)));$name=trim($this->input->post('name',true));if($code===''||$name==='')return json_response(false,'Kode dan nama wajib diisi.',array(),422);$q=$this->db->where('code',$code);if($id)$q->where('id !=',$id);if($q->count_all_results($table))return json_response(false,'Kode sudah digunakan.',array(),422);$data=array('code'=>$code,$nameField=>$name,'description'=>trim($this->input->post('description',true))?:null,'is_active'=>$this->input->post('is_active')?1:0);if($position)$data['department_id']=$this->input->post('department_id')?:null;if($id)$this->db->where('id',$id)->update($table,$data);else{$this->db->insert($table,$data);$id=$this->db->insert_id();}return json_response(true,'Data berhasil disimpan.',array('id'=>$id));}
public function delete_department($id){return$this->deactivate('k_departments',$id,'department_id');}
public function delete_position($id){return$this->deactivate('k_positions',$id,'position_id');}
private function deactivate($table,$id,$employeeField){if($this->db->where($employeeField,(int)$id)->count_all_results('k_employees')){$this->db->where('id',(int)$id)->update($table,array('is_active'=>0));return json_response(true,'Data sudah digunakan karyawan, sehingga dinonaktifkan dan tidak dihapus.');}$this->db->where('id',(int)$id)->delete($table);return json_response(true,'Data berhasil dihapus.');}
private function deactivate($table,$id,$employeeField){$id=(int)$id;$used=$this->db->where($employeeField,$id)->count_all_results('k_employees')>0;if($table==='k_departments'&&$this->db->where('department_id',$id)->count_all_results('k_positions')>0)$used=true;if($used){$this->db->where('id',$id)->update($table,array('is_active'=>0));return json_response(true,'Data sudah digunakan, sehingga dinonaktifkan dan tidak dihapus.');}$this->db->where('id',$id)->delete($table);return json_response(true,'Data berhasil dihapus.');}
}