From 5f6df002897dd346ca2e7d682a9f9dcc505e7148 Mon Sep 17 00:00:00 2001 From: paulcortez Date: Thu, 3 Apr 2025 17:26:58 +0800 Subject: [PATCH] Fix sorting on payroll report Fix sorting on payroll report --- app/Models/EmployeePayTransactionModel.php | 2 ++ app/Views/payroll/emppaytransreportview.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Models/EmployeePayTransactionModel.php b/app/Models/EmployeePayTransactionModel.php index 87320d2..ee32b18 100644 --- a/app/Models/EmployeePayTransactionModel.php +++ b/app/Models/EmployeePayTransactionModel.php @@ -101,6 +101,7 @@ class EmployeePayTransactionModel extends Model $builder->where(['emp_pay_trans.paytrans_id' => $paytransid, 'emp_pay_trans.pay_group_id' => $paygroupid, 'emp_pay_trans.deleted_at' => null]); + $builder->orderBy('employee.last_name', 'ASC'); return $builder->get()->getResult(); } public function getEmpPayTransInDedByPayTransIdGroupId($paytransid, $paygroupid) @@ -119,6 +120,7 @@ class EmployeePayTransactionModel extends Model 'emp_pay_trans.pay_group_id' => $paygroupid, 'emp_pay_trans.deleted_at' => null, 'emp_pay_trans_inded.deleted_at' => null]); + $builder->orderBy('employee.last_name', 'ASC'); return $builder->get()->getResult(); } diff --git a/app/Views/payroll/emppaytransreportview.php b/app/Views/payroll/emppaytransreportview.php index 73e5f32..1989166 100644 --- a/app/Views/payroll/emppaytransreportview.php +++ b/app/Views/payroll/emppaytransreportview.php @@ -80,7 +80,7 @@ $(document).ready(function() { //Initialize Select2 Elements $("#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().container().appendTo('#tblEmpPayTransInDed_wrapper .col-md-6:eq(0)'); });