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

Labels Milestones

New Pull Request

added init employee for late encoded #27

Merged
paul merged 1 commits from paulcortezl5 into main 6 months ago
Conversation 0 Commits 1 Files Changed 8
8 changed files with 324 additions and 69 deletions
Show Stats Download Patch File Download Diff File

2
app/Config/Routes.php
Unescape Escape View File

@ -60,7 +60,9 @@ $routes->get('payroll/paytrans', 'PayrollController::payrollTransactions');
$routes->post('payroll/addpaytrans', 'PayrollController::addPayrollTransactions');
$routes->get('payroll/emppaytrans/(:num)', 'PayrollController::employeePayrollTransactions/$1');
$routes->get('payroll/emppaytransviewempinit/(:num)/(:num)', 'PayrollController::employeePayrollTransactionsViewEmpForInit/$1/$2');
$routes->get('payroll/emppaytransinit/(:num)/(:num)/(:num)', 'PayrollController::empPayTransInitializePayroll/$1/$2/$3');
$routes->get('payroll/emppaytransempinit/(:num)/(:num)', 'PayrollController::empPayTransInitializeEmpPayroll/$1/$2');
$routes->post('payroll/emppaytransupdateworkdays', 'PayrollController::employeePayrollTransactionsEditDaysWorked');
$routes->get('payroll/emppaytransrecom/(:num)', 'PayrollController::employeePayrollTransactionsRecompute/$1');
$routes->post('payroll/saveemppaytransaddinded', 'PayrollController::saveEmpPayTransIncomeDeduction');

2
app/Controllers/HRController.php
Unescape Escape View File

@ -213,7 +213,7 @@ class HRController extends BaseController
$data['payGroups'] = (new PayrollGroupModel())->findAll();
$employeeHTMLTable = new \CodeIgniter\View\Table();
$employeeHTMLTable->setTemplate(MiscLib::adminLTETableTemplate());
$employeeHTMLTable->setTemplate(MiscLib::adminLTEDataTable1Template("tblEmployee"));
if($employees == null)
$data['tblEmployee'] = '<p>No employees found.</p>';

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

@ -275,7 +275,7 @@ class PayrollController extends BaseController
$data['salarycomputations'] = $payCompute->basic_salary_computations;
$empPayInfoHTMLTable = new \CodeIgniter\View\Table();
$empPayInfoHTMLTable->setTemplate(MiscLib::adminLTETableTemplate());
$empPayInfoHTMLTable->setTemplate(MiscLib::adminLTEDataTable1Template("tblEmployeeInfo"));
if($empPayInfos == null)
$data['tblEmpPayInfo'] = '<p>No employee payroll type found.</p>';
@ -510,11 +510,12 @@ class PayrollController extends BaseController
$incomeDeductionModel = new IncomeDeductionModel();
$data['paygroupid'] = $this->request->getGet('grpid');
$data['showInitBtn'] = false;
$payTrans = (new PayrollTransactionModel())->where('paytrans_id', $paytransid)->first();
$data['paytransid'] = $paytransid;
$data['initURL'] = $paytransid.'/'.$data['paygroupid'].'/'.$payTrans->paytype_id;
// INIT, OPEN, CLOSED
$data['transactionStatus'] = 'INIT';
//$payTrans = (new PayrollTransactionModel())->where('paytrans_id', $paytransid)->first();
$data['payTrans'] = (new PayrollTransactionModel())->find($paytransid);
$data['paygroups'] = (new PayrollGroupModel())->findAll();
$data['incomeList'] = $incomeDeductionModel->where("is_income", 1)->findAll();
@ -527,14 +528,14 @@ class PayrollController extends BaseController
if($empPayTrans == null)
{
$empPayTrans = (new EmployeePayrollInfoModel())->getEmpPayInfoXEmpPayTypeByPayGrpId($data['paygroupid'], $payTrans->paytype_id);
$empPayTrans = (new EmployeePayrollInfoModel())->getEmpPayInfoXEmpPayTypeByPayGrpId($data['paygroupid'], $data['payTrans']->paytype_id);
$attSummary = (new AttendanceSummaryModel())->where('paytrans_id', $paytransid)->findAll();
$empPayTransHTMLTable->setHeading('ID', 'Company ID', 'Name', 'Branch', 'Daily Basic', 'Work Days');
if($empPayTrans != null)
{
$data['showInitBtn'] = true;
$data['transactionStatus'] = 'INIT';
foreach($empPayTrans as $trans)
{
@ -547,6 +548,8 @@ class PayrollController extends BaseController
}
else
{
$data['transactionStatus'] = 'OPEN';
$empPayTransHTMLTable->setHeading('ID', 'Name', 'Branch', 'Basic Salary', 'Days Work', 'Gross', 'Deduction', 'Net', 'Action');
foreach($empPayTrans as $trans)
@ -569,20 +572,41 @@ class PayrollController extends BaseController
return view('payroll/emppaytransactionview', $data);
}
public function empPayTransInitializePayroll($paytransid, $paygroupid, $transtypid)
public function employeePayrollTransactionsViewEmpForInit($paytransid, $paygroupid)
{
$empPayInfos = (new EmployeePayrollInfoModel())->getEmpPayInfoXEmpPayTypeByPayGrpId($paygroupid, $transtypid);
$incomeDeductionModel = new IncomeDeductionModel();
$data['payGroup'] = (new PayrollGroupModel())->find($paygroupid);
$data['payTrans'] = (new PayrollTransactionModel())->find($paytransid);
// INIT, OPEN, CLOSED
$data['transactionStatus'] = 'INIT';
$empPayTrans = (new EmployeePayTransactionModel())->getEmpPayTransByPayTransIdGroupId($paytransid, $paygroupid);
$empPayInfos = (new EmployeePayrollInfoModel())->getEmpPayInfoXEmpPayTypeByPayGrpId($paygroupid, $data['payTrans']->paytype_id);
$empPayTransHTMLTable = new \CodeIgniter\View\Table();
$empPayTransHTMLTable->setTemplate(MiscLib::adminLTETableTemplate());
$attSummary = (new AttendanceSummaryModel())->where('paytrans_id', $paytransid)->findAll();
$payTrans = (new PayrollTransactionModel())->where('paytrans_id', $paytransid)->first();
$empPayTransactionModel = new EmployeePayTransactionModel();
$empPayTransHTMLTable->setHeading('ID', 'Company ID', 'Name', 'Branch', 'Daily Basic', 'Work Days', 'Action');
foreach($empPayInfos as $empPayInfo)
{
$empPayTransaction = new EmployeePayTransaction();
$empAttSum = MiscLib::searchFromAsocArray('employee_id', $empPayInfo->employee_id, $attSummary);
$empIsInEmpPayTrans = (MiscLib::searchFromAsocArray('employee_id', $empPayInfo->employee_id, $empPayTrans) == null) ? false : true;
$empPayTransHTMLTable->addRow($empPayInfo->employee_id, $empPayInfo->company_issued_id, $empPayInfo->last_name . ', ' . $empPayInfo->first_name, $empPayInfo->branch_code, $empPayInfo->basic_monthly_pay, ($empAttSum === null) ? 0 : $empAttSum->att_work_days, ($empIsInEmpPayTrans) ? '<button type="button" class="btn btn-primary btn-sm" disabled>Already Initialized</button>' : '<a href="/payroll/emppaytransempinit/'.$data['payTrans']->paytrans_id.'/'.$empPayInfo->emppay_id.'" class="btn btn-warning btn-sm">Initialize</a>');
}
$data['tblEmpPayTrans'] = $empPayTransHTMLTable->generate();
$empPayTransaction->fill(
['paytrans_id' => $paytransid,
return view('payroll/emppaytransinitempview', $data);
}
public function empPayTransFillArrayFromEmpPayInfo($paytransid, $empPayInfo, $empAttSum)
{
return ['paytrans_id' => $paytransid,
'company_id' => $empPayInfo->company_id,
'branch_code' => $empPayInfo->branch_code,
'dept_id' => $empPayInfo->dept_id,
@ -617,8 +641,40 @@ class PayrollController extends BaseController
'total_deduction' => 0,
'taxable_deduction' => 0,
'nontaxable_deduction' => 0,
'net_pay' => 0]
);
'net_pay' => 0];
}
public function empPayTransInDedFillArrayFromEmpPayInDed($emppaytransid, $empPayInDed, $amount)
{
return ['emppaytrans_id' => $emppaytransid,
'inded_id' => $empPayInDed->inded_id,
'payslip_display' => $empPayInDed->payslip_display,
'inded_name' => $empPayInDed->inded_name,
'coa_code' => $empPayInDed->coa_code,
'is_income' => $empPayInDed->is_income,
'is_taxable' => $empPayInDed->is_taxable,
'include_in_gross' => $empPayInDed->include_in_gross,
'is_fixed_amt' => $empPayInDed->is_fixed_amt,
'is_percent_amt' => $empPayInDed->is_percent_amt,
'worked_days_based' => $empPayInDed->worked_days_based,
'amount' => $amount,
'base_amount' => $empPayInDed->amount,
'is_override' => $empPayInDed->is_override];
}
public function empPayTransInitializePayroll($paytransid, $paygroupid, $transtypid)
{
$empPayInfos = (new EmployeePayrollInfoModel())->getEmpPayInfoXEmpPayTypeByPayGrpId($paygroupid, $transtypid);
$attSummary = (new AttendanceSummaryModel())->where('paytrans_id', $paytransid)->findAll();
$payTrans = (new PayrollTransactionModel())->find($paytransid);
$empPayTransactionModel = new EmployeePayTransactionModel();
foreach($empPayInfos as $empPayInfo)
{
$empPayTransaction = new EmployeePayTransaction();
$empAttSum = MiscLib::searchFromAsocArray('employee_id', $empPayInfo->employee_id, $attSummary);
$empPayTransaction->fill($this->empPayTransFillArrayFromEmpPayInfo($paytransid, $empPayInfo, $empAttSum));
$empPayTransactionModel->save($empPayTransaction);
$empPayTransaction = $empPayTransactionModel->find($empPayTransactionModel->getInsertID());
@ -637,28 +693,52 @@ class PayrollController extends BaseController
'worked_days_based'=>$empPayInDed->worked_days_based];
$amount = $payCompute->computeIncomeDeductionByComputationType($rawData, $empPayTransaction);
$empPayTransInDed->fill(
['emppaytrans_id' => $empPayTransaction->emppaytrans_id,
'inded_id' => $empPayInDed->inded_id,
'payslip_display' => $empPayInDed->payslip_display,
'inded_name' => $empPayInDed->inded_name,
'coa_code' => $empPayInDed->coa_code,
'is_income' => $empPayInDed->is_income,
'is_taxable' => $empPayInDed->is_taxable,
'include_in_gross' => $empPayInDed->include_in_gross,
$empPayTransInDed->fill($this->empPayTransInDedFillArrayFromEmpPayInDed($empPayTransaction->emppaytrans_id, $empPayInDed, $amount));
$empPayTransInDedModel->save($empPayTransInDed);
}
$this->computeEmployeePayroll($empPayTransaction->emppaytrans_id, true);
}
return redirect()->back()->withInput()->with('message', 'Payroll processed. Please verify the entries.');
}
public function empPayTransInitializeEmpPayroll($paytransid, $emppayid)
{
$empPayTransactionModel = new EmployeePayTransactionModel();
$empPayInfo = (new EmployeePayrollInfoModel())->getEmpPayInfoXEmpPayTypeByEmpPayId($emppayid);
$payTrans = (new PayrollTransactionModel())->find($paytransid);
$attSummary = (new AttendanceSummaryModel())->where('paytrans_id', $paytransid)->findAll();
$empAttSum = MiscLib::searchFromAsocArray('employee_id', $empPayInfo->employee_id, $attSummary);
$empPayTransaction = new EmployeePayTransaction();
$empPayTransaction->fill($this->empPayTransFillArrayFromEmpPayInfo($paytransid, $empPayInfo, $empAttSum));
$empPayTransactionModel->save($empPayTransaction);
$empPayTransaction = $empPayTransactionModel->find($empPayTransactionModel->getInsertID());
$empPayInDeds = (new EmpPayIncomeDeductionModel())->getEmpPayInDedByEmpPayIdSchedId($empPayInfo->emppay_id, $payTrans->payschedule_id);
foreach($empPayInDeds as $empPayInDed)
{
$empPayTransInDed = new EmpPayTransIncomeDeduction();
$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' => $amount,
'base_amount' => $empPayInDed->amount,
'is_override' => $empPayInDed->is_override]
);
'worked_days_based'=>$empPayInDed->worked_days_based];
$amount = $payCompute->computeIncomeDeductionByComputationType($rawData, $empPayTransaction);
$empPayTransInDed->fill($this->empPayTransInDedFillArrayFromEmpPayInDed($empPayTransaction->emppaytrans_id, $empPayInDed, $amount));
$empPayTransInDedModel->save($empPayTransInDed);
}
$this->computeEmployeePayroll($empPayTransaction->emppaytrans_id, true);
}
return redirect()->back()->withInput()->with('message', 'Payroll processed. Please verify the entries.');
}

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

@ -99,4 +99,15 @@ class EmployeePayrollInfoModel extends Model
'emp_pay_info.deleted_at' => null]);
return $builder->get()->getResult();
}
public function getEmpPayInfoXEmpPayTypeByEmpPayId($emppayid)
{
$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->where(['emp_pay_info.emppay_id' => $emppayid,
'emp_pay_info.deleted_at' => null]);
return $builder->get()->getRow();
}
}

22
app/Views/hr/employeeview.php
Unescape Escape View File

@ -8,6 +8,11 @@
<!-- CSS of the page -->
<?= $this->section('css') ?>
<!-- DataTables -->
<link rel="stylesheet" href="<?= base_url() ?>adminlte/plugins/datatables-bs4/css/dataTables.bootstrap4.min.css">
<link rel="stylesheet" href="<?= base_url() ?>adminlte/plugins/datatables-responsive/css/responsive.bootstrap4.min.css">
<?= $this->endSection() ?>
<!-- .CSS -->
@ -343,9 +348,26 @@
<?= $this->section('js') ?>
<!-- DataTables & Plugins -->
<script src="<?= base_url() ?>adminlte/plugins/datatables/jquery.dataTables.min.js"></script>
<script src="<?= base_url() ?>adminlte/plugins/datatables-bs4/js/dataTables.bootstrap4.min.js"></script>
<script src="<?= base_url() ?>adminlte/plugins/datatables-responsive/js/dataTables.responsive.min.js"></script>
<script src="<?= base_url() ?>adminlte/plugins/datatables-responsive/js/responsive.bootstrap4.min.js"></script>
<script>
$(document).ready(function() {
$('#tblEmployee').DataTable({
"paging": true,
"lengthChange": false,
"searching": true,
"ordering": true,
"info": true,
"autoWidth": false,
"responsive": true,
});
});
function editEmployee(data)

20
app/Views/payroll/empinfoview.php
Unescape Escape View File

@ -13,6 +13,10 @@
<link rel="stylesheet" href="/adminlte/plugins/select2/css/select2.min.css">
<link rel="stylesheet" href="/adminlte/plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css">
<!-- DataTables -->
<link rel="stylesheet" href="<?= base_url() ?>adminlte/plugins/datatables-bs4/css/dataTables.bootstrap4.min.css">
<link rel="stylesheet" href="<?= base_url() ?>adminlte/plugins/datatables-responsive/css/responsive.bootstrap4.min.css">
<?= $this->endSection() ?>
<!-- .CSS -->
@ -332,6 +336,12 @@
<!-- Select2 -->
<script src="/adminlte/plugins/select2/js/select2.full.min.js"></script>
<!-- DataTables & Plugins -->
<script src="<?= base_url() ?>adminlte/plugins/datatables/jquery.dataTables.min.js"></script>
<script src="<?= base_url() ?>adminlte/plugins/datatables-bs4/js/dataTables.bootstrap4.min.js"></script>
<script src="<?= base_url() ?>adminlte/plugins/datatables-responsive/js/dataTables.responsive.min.js"></script>
<script src="<?= base_url() ?>adminlte/plugins/datatables-responsive/js/responsive.bootstrap4.min.js"></script>
<script>
$(document).ready(function() {
@ -345,6 +355,16 @@ $(document).ready(function() {
$('.select2bs4').select2({
theme: 'bootstrap4'
});
$('#tblEmployeeInfo').DataTable({
"paging": true,
"lengthChange": false,
"searching": true,
"ordering": true,
"info": true,
"autoWidth": false,
"responsive": true,
});
});
function computeBasicPay(fromSource)

20
app/Views/payroll/emppaytransactionview.php
Unescape Escape View File

@ -235,6 +235,7 @@
</div>
<!-- Payroll Group selection -->
<div class="row">
<div class="col-12">
<div class="card">
@ -244,7 +245,7 @@
<div class="card-body">
<div class="row">
<div class="col-12">
<form action="/payroll/emppaytrans/<?= $paytransid ?>" method="get">
<form action="/payroll/emppaytrans/<?= $payTrans->paytrans_id ?>" method="get">
<div class="form-group">
<label>Payroll Group</label>
<div class="input-group mb-3">
@ -256,7 +257,7 @@
<?php endforeach; ?>
</select>
<span class="input-group-append">
<button type="submit" class="btn btn-info btn-flat">Select this Group</button>
<button type="submit" class="btn btn-info btn-flat">View from this Group</button>
</span>
</div>
</div>
@ -523,10 +524,12 @@
<p>Please select payroll group.</p>
<?php else: ?>
<div class="card-body table-responsive p-0">
<?php if($showInitBtn): ?>
<?php if($transactionStatus == 'INIT'): ?>
<p>You may change the working days for this payroll cutoff. Deduct days off or absences on <strong>working days</strong> field.</p>
<?php else: ?>
<?php elseif($transactionStatus == 'OPEN'): ?>
<p>Adjust entry of each employee by clicking on <strong>Edit</strong> icon</p>
<?php else: ?>
<p>Transactions for this payroll group has been <strong>POSTED</strong>.</p>
<?php endif; ?>
<?= $tblEmpPayTrans ?>
@ -535,8 +538,13 @@
<?php endif; ?>
</div>
<div class="card-footer">
<?php if($showInitBtn): ?>
<a class="btn btn-warning" href="/payroll/emppaytransinit/<?= $initURL ?>">Initialize Payroll</a>
<?php if($transactionStatus == 'INIT'): ?>
<a class="btn btn-warning" href="/payroll/emppaytransinit/<?= $payTrans->paytrans_id.'/'.$paygroupid.'/'.$payTrans->paytype_id ?>">Initialize Payroll</a>
<?php elseif($transactionStatus == 'OPEN'): ?>
<a class="btn btn-primary" href="/payroll/emppaytransinit">View Report Summary</a>
<a class="btn btn-warning" href="/payroll/emppaytransviewempinit/<?= $payTrans->paytrans_id.'/'.$paygroupid ?>">Initialize Employee</a>
<?php else: ?>
<a class="btn btn-danger" href="/payroll/emppaytransinit/">Re-open Payroll</a>
<?php endif; ?>
</div>
</div>

112
app/Views/payroll/emppaytransinitempview.php
Unescape Escape View File

@ -0,0 +1,112 @@
<!-- Extend area where template is defined -->
<?= $this->extend('templates/adminlte/generalcontent') ?>
<!-- .Extend -->
<!-- Title of the page -->
<?= $this->section('title') ?>Employee Payroll Initialization<?= $this->endSection() ?>
<!-- .Title -->
<!-- CSS of the page -->
<?= $this->section('css') ?>
<!-- Select2 -->
<link rel="stylesheet" href="<?= base_url() ?>adminlte/plugins/select2/css/select2.min.css">
<link rel="stylesheet" href="<?= base_url() ?>adminlte/plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css">
<?= $this->endSection() ?>
<!-- .CSS -->
<!-- body attribute - class definition -->
<?= $this->section('bodyclass') ?>sidebar-mini<?= $this->endSection() ?>
<!-- .body attribute -->
<!-- Container title -->
<?= $this->section('containertitle') ?>Employee Payroll Initialization<?= $this->endSection() ?>
<!-- .Container title -->
<!-- Active breadcrumb -->
<?= $this->section('breadcrumbs') ?>
<li class="breadcrumb-item"><a href="/payroll/paytrans">Payroll Transaction</a></li>
<li class="breadcrumb-item"><a href="/payroll/emppaytrans/<?= $payTrans->paytrans_id ?>">Employee Payroll Transaction</a></li>
<li class="breadcrumb-item active">Employee Payroll Initialization</li>
<?= $this->endSection() ?>
<!-- .Active breadcrumb -->
<!-- Main content -->
<?= $this->section('main') ?>
<!-- List of Employee for Payroll -->
<div class="row">
<div class="col-12">
<div class="card">
<div class="card-header">
<h3 class="card-title">List of Employee for Initial</h3>
</div>
<div class="card-body">
<?= $tblEmpPayTrans ?>
</div>
<div class="card-footer">
<a class="btn btn-secondary" href="/payroll/emppaytrans/<?= $payTrans->paytrans_id ?>?grpid=<?= $payGroup->pay_group_id ?>">Back to Payroll Transaction</a>
</div>
</div>
</div>
</div>
<?= $this->endSection() ?>
<!-- .Main content -->
<!-- Javascript -->
<?= $this->section('js') ?>
<!-- Select2 -->
<script src="<?= base_url() ?>adminlte/plugins/select2/js/select2.full.min.js"></script>
<script>
$(document).ready(function() {
//Initialize Select2 Elements
$('.select2').select2();
});
function showEmpPayTransDetails(emppaytransid)
{
$("div[id^='payrollTabInfo']" ).hide();
$("#payrollTabInfo"+emppaytransid).toggle();
$("#txtInEmpPayTransId").val(emppaytransid);
$("#txtDedEmpPayTransId").val(emppaytransid);
}
function editIncomeDeduction(element)
{
$('#hdnEditInDedEmpPayTransInDedId').val($(element).data("emppaytransinded_id"));
$('#hdnEditInDedEmpPayTransId').val($(element).data("emppaytrans_id"));
$('#hdnEditInDedInDedId').val($(element).data("inded_id"));
$('#txtEditInDedName').val($(element).data('inded_name'));
$('[name="amount_type"][value="' + ($(element).data('is_fixed_amt') ? 'fixed' : ($(element).data('is_percent_amt') ? 'perc' : 'daysbased')) + '"]').prop('checked', true);
if($(element).data('worked_days_based'))
{
$('#txtEditInDedAmount').val($(element).data('base_amount'));
$('#lblEditInDed_daysbased').html('Computed amount is ' + $(element).data('amount'))
}
else
{
$('#txtEditInDedAmount').val($(element).data('amount'));
$('#lblEditInDed_daysbased').html('');
}
$('#chkEditInDedIsOverride').prop('checked', $(element).data('is_override'));
$('#mdlEditIncomeDeduction').modal('show');
}
</script>
<?= $this->endSection() ?>
<!-- .Javascript -->
Write Preview
Loading…
Cancel
Save