Merge pull request 'Fix sorting on payroll report' (#47) from paulcortezl5 into main

Reviewed-on: #47
pull/48/head
paul 1 month ago
commit 7b1b46326c

@ -101,6 +101,7 @@ class EmployeePayTransactionModel extends Model
$builder->where(['emp_pay_trans.paytrans_id' => $paytransid, $builder->where(['emp_pay_trans.paytrans_id' => $paytransid,
'emp_pay_trans.pay_group_id' => $paygroupid, 'emp_pay_trans.pay_group_id' => $paygroupid,
'emp_pay_trans.deleted_at' => null]); 'emp_pay_trans.deleted_at' => null]);
$builder->orderBy('employee.last_name', 'ASC');
return $builder->get()->getResult(); return $builder->get()->getResult();
} }
public function getEmpPayTransInDedByPayTransIdGroupId($paytransid, $paygroupid) public function getEmpPayTransInDedByPayTransIdGroupId($paytransid, $paygroupid)
@ -119,6 +120,7 @@ class EmployeePayTransactionModel extends Model
'emp_pay_trans.pay_group_id' => $paygroupid, 'emp_pay_trans.pay_group_id' => $paygroupid,
'emp_pay_trans.deleted_at' => null, 'emp_pay_trans.deleted_at' => null,
'emp_pay_trans_inded.deleted_at' => null]); 'emp_pay_trans_inded.deleted_at' => null]);
$builder->orderBy('employee.last_name', 'ASC');
return $builder->get()->getResult(); return $builder->get()->getResult();
} }

@ -80,7 +80,7 @@ $(document).ready(function() {
//Initialize Select2 Elements //Initialize Select2 Elements
$("#tblEmpPayTransInDed").DataTable({ $("#tblEmpPayTransInDed").DataTable({
"responsive": true, "lengthChange": false, "autoWidth": false, "responsive": true, "lengthChange": false, "autoWidth": false, "order": [[1, "asc"]],
"buttons": ["copy", "csv", "excel", "pdf", "print", "colvis"] "buttons": ["copy", "csv", "excel", "pdf", "print", "colvis"]
}).buttons().container().appendTo('#tblEmpPayTransInDed_wrapper .col-md-6:eq(0)'); }).buttons().container().appendTo('#tblEmpPayTransInDed_wrapper .col-md-6:eq(0)');
}); });

Loading…
Cancel
Save