|
|
|
@ -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();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|