paul
/
kwpayroll
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'added att work days on init' (#23) from paulcortezl5 into main

Browse Source 
Reviewed-on: #23
pull/24/head
paul 6 months ago
parent a2b377387b 712c82ea92
commit a9495d37d7
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File

16
app/Controllers/PayrollController.php
Unescape Escape View File

@ -517,22 +517,22 @@ class PayrollController extends BaseController
$data['incomeList'] = $incomeDeductionModel->where("is_income", 1)->findAll();
$data['deductionList'] = $incomeDeductionModel->where("is_income", 0)->findAll();
$empPayTrans = (new EmployeePayTransactionModel())->getEmpPayTransByPayGroupId($data['paygroupid']);
$empPayTrans = (new EmployeePayTransactionModel())->getEmpPayTransByPayTransIdGroupId($paytransid, $data['paygroupid']);
$empPayTransHTMLTable = new \CodeIgniter\View\Table();
$empPayTransHTMLTable->setTemplate(MiscLib::adminLTETableTemplate());
if($empPayTrans == null)
{
$empPayTrans = (new EmployeePayrollInfoModel())->getEmpPayInfoXEmpPayTypeByPayGrpId($data['paygroupid'], $payTrans->paytype_id);
$empPayTrans = (new EmployeePayrollInfoModel())->getEmpPayInfoXEmpPayTypeByPayGrpId($paytransid, $data['paygroupid'], $payTrans->paytype_id);
$data['showInitBtn'] = true;
$empPayTransHTMLTable->setHeading('ID', 'Company ID', 'Name', 'Branch', 'Daily Basic');
$empPayTransHTMLTable->setHeading('ID', 'Company ID', 'Name', 'Branch', 'Daily Basic', 'Work Days');
foreach($empPayTrans as $trans)
{
$empPayTransHTMLTable->addRow($trans->employee_id, $trans->company_issued_id, $trans->last_name . ', ' . $trans->first_name, $trans->branch_code, $trans->basic_monthly_pay);
$empPayTransHTMLTable->addRow($trans->employee_id, $trans->company_issued_id, $trans->last_name . ', ' . $trans->first_name, $trans->branch_code, $trans->basic_monthly_pay, $trans->att_work_days);
}
$data['tblEmpPayTrans'] = $empPayTransHTMLTable->generate();
@ -563,7 +563,7 @@ class PayrollController extends BaseController
public function empPayTransInitializePayroll($paytransid, $paygroupid, $transtypid)
{
$empPayInfos = (new EmployeePayrollInfoModel())->getEmpPayInfoXEmpPayTypeByPayGrpId($paygroupid, $transtypid);
$empPayInfos = (new EmployeePayrollInfoModel())->getEmpPayInfoXEmpPayTypeByPayGrpId($paytransid, $paygroupid, $transtypid);
$payTrans = (new PayrollTransactionModel())->where('paytrans_id', $paytransid)->first();
$empPayTransactionModel = new EmployeePayTransactionModel();
@ -598,7 +598,7 @@ class PayrollController extends BaseController
'has_hdmf' => $empPayInfo->has_hdmf,
'has_sss' => $empPayInfo->has_sss,
'has_gsis' => $empPayInfo->has_gsis,
'actual_work_days' => $payTrans->no_of_days,
'actual_work_days' => $empPayInfo->att_work_days,
'basic_pay' => 0,
'gross_income' => 0,
'taxable_income' => 0,
@ -621,6 +621,10 @@ class PayrollController extends BaseController
$empPayTransInDedModel = new EmpPayTransIncomeDeductionModel();
$payCompute = new PayrollComputation();
$rawData = ['amount'=>$empPayInDed->amount,
'is_fixed_amt'=>$empPayInDed->is_fixed_amt,
'is_percent_amt'=>$empPayInDed->is_percent_amt,
'worked_days_based'=>$empPayInDed->worked_days_based];
$amount = $payCompute->computeIncomeDeductionByComputationType($rawData, $empPayTransaction);
$empPayTransInDed->fill(

5
app/Models/EmployeePayTransactionModel.php
Unescape Escape View File

@ -87,7 +87,7 @@ class EmployeePayTransactionModel extends Model
return $data;
}
public function getEmpPayTransByPayGroupId($paygroupid)
public function getEmpPayTransByPayTransIdGroupId($paytransid, $paygroupid)
{
$builder = $this->db->table('emp_pay_trans');
$builder->select('*');
@ -98,7 +98,8 @@ class EmployeePayTransactionModel extends Model
$builder->join('pay_group', 'pay_group.pay_group_id = emp_pay_trans.pay_group_id');
$builder->join('emp_status', 'emp_status.emp_status_id = emp_pay_trans.emp_status_id');
$builder->join('employee', 'employee.employee_id = emp_pay_trans.employee_id');
$builder->where(['emp_pay_trans.pay_group_id' => $paygroupid,
$builder->where(['emp_pay_trans.paytrans_id' => $paytransid,
'emp_pay_trans.pay_group_id' => $paygroupid,
'emp_pay_trans.deleted_at' => null]);
return $builder->get()->getResult();
}

4
app/Models/EmployeePayrollInfoModel.php
Unescape Escape View File

@ -88,14 +88,16 @@ class EmployeePayrollInfoModel extends Model
return $builder->get()->getRow();
}
public function getEmpPayInfoXEmpPayTypeByPayGrpId($payGroupId, $payTypeId)
public function getEmpPayInfoXEmpPayTypeByPayGrpId($paytransid, $payGroupId, $payTypeId)
{
$builder = $this->db->table('emp_pay_info');
$builder->select('*');
$builder->join('employee', 'employee.employee_id = emp_pay_info.employee_id');
$builder->join('pay_type', 'pay_type.paytype_id = emp_pay_info.paytype_id');
$builder->join('att_log_summary', 'att_log_summary.employee_id = emp_pay_info.employee_id');
$builder->where(['employee.pay_group_id' => $payGroupId,
'emp_pay_info.paytype_id' => $payTypeId,
'att_log_summary.paytrans_id' => $paytransid,
'emp_pay_info.deleted_at' => null]);
return $builder->get()->getResult();
}

4
app/Views/templates/adminlte/generalcontent.php
Unescape Escape View File

@ -315,7 +315,7 @@
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="/payroll/paytrans" class="nav-link">
<i class="nav-icon far fa-image"></i>
<i class="far fa-circle nav-icon"></i>
<p>
Payroll Transactios
</p>
@ -323,7 +323,7 @@
</li>
<li class="nav-item">
<a href="#" class="nav-link">
<i class="nav-icon far fa-image"></i>
<i class="far fa-circle nav-icon"></i>
<p>
Income &amp; Deduction
</p>

Write Preview
Loading…
Cancel
Save