diff --git a/app/Controllers/PayrollController.php b/app/Controllers/PayrollController.php index 492398b..1ccaf7e 100644 --- a/app/Controllers/PayrollController.php +++ b/app/Controllers/PayrollController.php @@ -946,10 +946,12 @@ class PayrollController extends BaseController $HTMLColumns = [ 'ID', - 'Name', + 'Last Name', + 'First Name', 'Branch', - 'Daily Basic', + 'Daily Rate', 'Work Days', + 'Monthly Basic', 'Income Tax', 'Gross Amt', 'Deduction Amt', @@ -962,10 +964,12 @@ class PayrollController extends BaseController { $HTMLColValues = [ $empPayTrans->employee_id, - $empPayTrans->last_name . ', ' . $empPayTrans->first_name, - $empPayTrans->branch_code, - $empPayTrans->basic_pay, + $empPayTrans->last_name, + $empPayTrans->first_name, + "[" . $empPayTrans->branch_code . "] " . $empPayTrans->branch_name, + $empPayTrans->basic_daily_pay, $empPayTrans->actual_work_days, + $empPayTrans->basic_pay, $empPayTrans->income_tax, $empPayTrans->gross_income, $empPayTrans->total_deduction, diff --git a/app/Models/EmployeePayTransactionModel.php b/app/Models/EmployeePayTransactionModel.php index a3e81c6..87320d2 100644 --- a/app/Models/EmployeePayTransactionModel.php +++ b/app/Models/EmployeePayTransactionModel.php @@ -117,7 +117,8 @@ class EmployeePayTransactionModel extends Model $builder->join('emp_pay_trans_inded', 'emp_pay_trans_inded.emppaytrans_id = emp_pay_trans.emppaytrans_id'); $builder->where(['emp_pay_trans.paytrans_id' => $paytransid, '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]); return $builder->get()->getResult(); }