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

Merge pull request 'change formatting of income and deduction' (#20) from paulcortezl5 into main

Browse Source 
Reviewed-on: #20
pull/21/head
paul 7 months ago
parent fdc984a3a8 50f565dc61
commit 748edd8c61
3 changed files with 78 additions and 17 deletions
Show Stats Download Patch File Download Diff File

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

@ -551,7 +551,8 @@ class PayrollController extends BaseController
// Get Emp Trans In Ded
$empPayTransInDedModel = new EmpPayTransIncomeDeductionModel();
$data['emppaytrans'][] = ["empPayTrans"=>$trans,
"empPayTransInDed"=>$empPayTransInDedModel->getEmpPayTransInDedxInDedByEmpTransId($trans->emppaytrans_id)];
"empPayTransInDedIncome"=>$empPayTransInDedModel->getEmpPayTransInDedxInDedByEmpTransIdIsIncome($trans->emppaytrans_id, true),
"empPayTransInDedDeduction"=>$empPayTransInDedModel->getEmpPayTransInDedxInDedByEmpTransIdIsIncome($trans->emppaytrans_id, false)];
}
$data['tblEmpPayTrans'] = $empPayTransHTMLTable->generate();

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

@ -75,6 +75,17 @@ class EmpPayTransIncomeDeductionModel extends Model
return $builder->get()->getResult();
}
public function getEmpPayTransInDedxInDedByEmpTransIdIsIncome($emptransid, $isincome)
{
$builder = $this->db->table('emp_pay_trans_inded');
$builder->select('*');
$builder->join('pay_income_deduction', 'pay_income_deduction.inded_id = emp_pay_trans_inded.inded_id');
$builder->where(['emp_pay_trans_inded.emppaytrans_id' => $emptransid,
'emp_pay_trans_inded.is_income' => $isincome,
'emp_pay_trans_inded.deleted_at' => null]);
return $builder->get()->getResult();
}
public function getTotalIncomeDeduction($emppaytransid, $isincome, $istaxable)
{
$builder = $this->db->table('emp_pay_trans_inded');

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

@ -411,34 +411,83 @@
 
</td>
</tr>
<?php foreach($empPayTransaction['empPayTransInDed'] as $empPayTransInDed): ?>
<?php
$grossIncome = $empPayTransaction['empPayTrans']->basic_pay;
$totalDeduction = 0;
foreach($empPayTransaction['empPayTransInDedIncome'] as $empPayTransInDedIncome):
?>
<tr>
<td>
<?= $empPayTransInDed->inded_name ?>
<?= $empPayTransInDedIncome->inded_name ?>
</td>
<td>
<?php if(!$empPayTransInDed->is_income) echo "-".number_format($empPayTransInDed->amount, 2, ".", ","); else echo "&nbsp;"; ?>
&nbsp;
</td>
<td>
<?php if($empPayTransInDed->is_income) echo number_format($empPayTransInDed->amount, 2, ".", ","); else echo "&nbsp;"; ?>
<?= number_format($empPayTransInDedIncome->amount, 2, ".", ",") ?>
</td>
<td>
<a href="#" class="ml-3" data-toggle="tooltip" title="Edit Income or Deduction"
data-emppaytransinded_id="<?= $empPayTransInDed->emppaytransinded_id ?>"
data-emppaytrans_id="<?= $empPayTransInDed->emppaytrans_id ?>"
data-inded_id="<?= $empPayTransInDed->inded_id ?>"
data-inded_name="<?= $empPayTransInDed->inded_name ?>"
data-is_fixed_amt="<?= $empPayTransInDed->is_fixed_amt ?>"
data-is_percent_amt="<?= $empPayTransInDed->is_percent_amt ?>"
data-worked_days_based="<?= $empPayTransInDed->worked_days_based ?>"
data-amount="<?= $empPayTransInDed->amount ?>"
data-base_amount="<?= $empPayTransInDed->base_amount ?>"
data-is_override="<?= $empPayTransInDed->is_override ?>"
data-emppaytransinded_id="<?= $empPayTransInDedIncome->emppaytransinded_id ?>"
data-emppaytrans_id="<?= $empPayTransInDedIncome->emppaytrans_id ?>"
data-inded_id="<?= $empPayTransInDedIncome->inded_id ?>"
data-inded_name="<?= $empPayTransInDedIncome->inded_name ?>"
data-is_fixed_amt="<?= $empPayTransInDedIncome->is_fixed_amt ?>"
data-is_percent_amt="<?= $empPayTransInDedIncome->is_percent_amt ?>"
data-worked_days_based="<?= $empPayTransInDedIncome->worked_days_based ?>"
data-amount="<?= $empPayTransInDedIncome->amount ?>"
data-base_amount="<?= $empPayTransInDedIncome->base_amount ?>"
data-is_override="<?= $empPayTransInDedIncome->is_override ?>"
onclick="editIncomeDeduction(this)"><i class="fas fa-edit "></i></a>
<a href="/payroll/emppaytransdelinded/<?= $empPayTransInDed->emppaytransinded_id.'/'.$empPayTransInDed->emppaytrans_id ?>" onclick="return confirm('Are you sure you want to delete this item?')" class="ml-3" data-toggle="tooltip" title="Delete Employee Information"><i class="fas fa-trash "></i></a>
<a href="/payroll/emppaytransdelinded/<?= $empPayTransInDedIncome->emppaytransinded_id.'/'.$empPayTransInDedIncome->emppaytrans_id ?>" onclick="return confirm('Are you sure you want to delete this item?')" class="ml-3" data-toggle="tooltip" title="Delete Employee Information"><i class="fas fa-trash "></i></a>
</td>
</tr>
<?php endforeach; ?>
<?php
$grossIncome += $empPayTransInDedIncome->amount;
endforeach;
?>
<tr>
<td><strong>Gross Income</strong></td><td>&nbsp;</td><td class="text-right"><strong><?= number_format($grossIncome, 2, ".", ",") ?></strong></td><td>&nbsp;</td>
</tr>
<?php foreach($empPayTransaction['empPayTransInDedDeduction'] as $empPayTransInDedDeduction): ?>
<tr>
<td>
<?= $empPayTransInDedDeduction->inded_name ?>
</td>
<td>
<?= "-".number_format($empPayTransInDedDeduction->amount, 2, ".", ",") ?>
</td>
<td>
&nbsp;
</td>
<td>
<a href="#" class="ml-3" data-toggle="tooltip" title="Edit Income or Deduction"
data-emppaytransinded_id="<?= $empPayTransInDedDeduction->emppaytransinded_id ?>"
data-emppaytrans_id="<?= $empPayTransInDedDeduction->emppaytrans_id ?>"
data-inded_id="<?= $empPayTransInDedDeduction->inded_id ?>"
data-inded_name="<?= $empPayTransInDedDeduction->inded_name ?>"
data-is_fixed_amt="<?= $empPayTransInDedDeduction->is_fixed_amt ?>"
data-is_percent_amt="<?= $empPayTransInDedDeduction->is_percent_amt ?>"
data-worked_days_based="<?= $empPayTransInDedDeduction->worked_days_based ?>"
data-amount="<?= $empPayTransInDedDeduction->amount ?>"
data-base_amount="<?= $empPayTransInDedDeduction->base_amount ?>"
data-is_override="<?= $empPayTransInDedDeduction->is_override ?>"
onclick="editIncomeDeduction(this)"><i class="fas fa-edit "></i></a>
<a href="/payroll/emppaytransdelinded/<?= $empPayTransInDedDeduction->emppaytransinded_id.'/'.$empPayTransInDedDeduction->emppaytrans_id ?>" onclick="return confirm('Are you sure you want to delete this item?')" class="ml-3" data-toggle="tooltip" title="Delete Employee Information"><i class="fas fa-trash "></i></a>
</td>
</tr>
<?php
$totalDeduction += $empPayTransInDedDeduction->amount;
endforeach;
?>
<tr>
<td><strong>Total Deduction</strong></td><td class="text-right"><strong>-<?= number_format($totalDeduction, 2, ".", ",") ?></strong></td><td>&nbsp;</td><td>&nbsp;</td>
</tr>
<tr>
<td><strong>Net Income</strong></td><td>&nbsp;</td><td class="text-right"><strong><?= number_format(($grossIncome - $totalDeduction), 2, ".", ",") ?></strong></td><td>&nbsp;</td>
</tr>
</table>
</div>
<div class="card-footer">

Write Preview
Loading…
Cancel
Save