From 50f565dc6139e4f6318c573370657cc3bbaa2d5d Mon Sep 17 00:00:00 2001
From: paulcortez <pbeldia@outlook.com>
Date: Wed, 23 Oct 2024 11:06:02 +0800
Subject: [PATCH] change formatting of income and deduction

change formatting of income and deduction
---
 app/Controllers/PayrollController.php         |  3 +-
 .../EmpPayTransIncomeDeductionModel.php       | 11 +++
 app/Views/payroll/emppaytransactionview.php   | 81 +++++++++++++++----
 3 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/app/Controllers/PayrollController.php b/app/Controllers/PayrollController.php
index e7cc59d..1a64a21 100644
--- a/app/Controllers/PayrollController.php
+++ b/app/Controllers/PayrollController.php
@@ -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();
diff --git a/app/Models/EmpPayTransIncomeDeductionModel.php b/app/Models/EmpPayTransIncomeDeductionModel.php
index 0c637ff..ea1addd 100644
--- a/app/Models/EmpPayTransIncomeDeductionModel.php
+++ b/app/Models/EmpPayTransIncomeDeductionModel.php
@@ -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');
diff --git a/app/Views/payroll/emppaytransactionview.php b/app/Views/payroll/emppaytransactionview.php
index 7182ad2..6a452a8 100644
--- a/app/Views/payroll/emppaytransactionview.php
+++ b/app/Views/payroll/emppaytransactionview.php
@@ -411,34 +411,83 @@
                               &nbsp;
                             </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">
-- 
2.39.2