From ae6e787e60a9b2438e1da577ed79b53a037c84b4 Mon Sep 17 00:00:00 2001
From: paulcortez <pbeldia@outlook.com>
Date: Thu, 16 Jan 2025 14:54:28 +0800
Subject: [PATCH 1/2] changing order of income and deduction

changing order of income and deduction
---
 app/Views/payroll/emppaytransactionview.php | 37 +++++++++++----------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/app/Views/payroll/emppaytransactionview.php b/app/Views/payroll/emppaytransactionview.php
index 9946ee7..a45a17c 100644
--- a/app/Views/payroll/emppaytransactionview.php
+++ b/app/Views/payroll/emppaytransactionview.php
@@ -63,18 +63,18 @@
                   </div>
                   <div class="form-group">
                     <div class="form-check">
-                        <input class="form-check-input" type="radio" id="rdoInFixedAmount" name="amount_type" value="fixed" checked>
+                        <input class="form-check-input" type="radio" id="rdoInDaysBasedAmount" name="amount_type" value="daysbased" checked>
+                        <label for="rdoInDaysBasedAmount" class="form-check-label">Daily based amount.</label>
+                        <p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
+                    </div>
+                    <div class="form-check">
+                        <input class="form-check-input" type="radio" id="rdoInFixedAmount" name="amount_type" value="fixed">
                         <label for="rdoInFixedAmount" class="form-check-label">Fixed amount.</label>
                     </div>
                     <div class="form-check">
                         <input class="form-check-input" type="radio" id="rdoInPercentageAmount" name="amount_type" value="perc">
                         <label for="rdoInPercentageAmount" class="form-check-label">Amount is in percentage.</label>
                     </div>
-                    <div class="form-check">
-                        <input class="form-check-input" type="radio" id="rdoInDaysBasedAmount" name="amount_type" value="daysbased">
-                        <label for="rdoInDaysBasedAmount" class="form-check-label">Daily based amount.</label>
-                        <p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
-                    </div>
                   </div>
                   <div class="form-group">
                     <label for="txtInAmount">Amount</label>
@@ -130,18 +130,19 @@
                   </div>
                   <div class="form-group">
                     <div class="form-check">
-                        <input class="form-check-input" type="radio" id="rdoDedFixedAmount" name="amount_type" value="fixed" checked>
+                        <input class="form-check-input" type="radio" id="rdoDedDaysBasedAmount" name="amount_type" value="daysbased" checked>
+                        <label for="rdoDedDaysBasedAmount" class="form-check-label">Daily based amount.</label>
+                        <p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
+                    </div>
+                    <div class="form-check">
+                        <input class="form-check-input" type="radio" id="rdoDedFixedAmount" name="amount_type" value="fixed">
                         <label for="rdoDedFixedAmount" class="form-check-label">Fixed amount.</label>
                     </div>
                     <div class="form-check">
                         <input class="form-check-input" type="radio" id="rdoDedPercentageAmount" name="amount_type" value="perc">
                         <label for="rdoDedPercentageAmount" class="form-check-label">Amount is in percentage.</label>
                     </div>
-                    <div class="form-check">
-                        <input class="form-check-input" type="radio" id="rdoDedDaysBasedAmount" name="amount_type" value="daysbased">
-                        <label for="rdoDedDaysBasedAmount" class="form-check-label">Daily based amount.</label>
-                        <p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
-                    </div>
+                    
                   </div>
                   <div class="form-group">
                     <label for="txtDedAmount">Amount</label>
@@ -195,18 +196,18 @@
                   </div>
                   <div class="form-group">
                     <div class="form-check">
-                        <input class="form-check-input" type="radio" id="rdoEditInDedFixedAmount" name="amount_type" value="fixed" checked>
+                        <input class="form-check-input" type="radio" id="rdoEditInDedDaysBasedAmount" name="amount_type" value="daysbased" checked>
+                        <label for="rdoEditInDedDaysBasedAmount" class="form-check-label">Daily based amount.</label>
+                        <p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
+                    </div>
+                    <div class="form-check">
+                        <input class="form-check-input" type="radio" id="rdoEditInDedFixedAmount" name="amount_type" value="fixed">
                         <label for="rdoEditInDedFixedAmount" class="form-check-label">Fixed amount.</label>
                     </div>
                     <div class="form-check">
                         <input class="form-check-input" type="radio" id="rdoEditInDedPercentageAmount" name="amount_type" value="perc">
                         <label for="rdoEditInDedPercentageAmount" class="form-check-label">Amount is in percentage.</label>
                     </div>
-                    <div class="form-check">
-                        <input class="form-check-input" type="radio" id="rdoEditInDedDaysBasedAmount" name="amount_type" value="daysbased">
-                        <label for="rdoEditInDedDaysBasedAmount" class="form-check-label">Daily based amount.</label>
-                        <p class="text-muted"><small><i>Your amount entered multiplied by number of days</i></small></p>
-                    </div>
                   </div>
                   <div class="form-group">
                     <label for="txtEditInDedAmount">Amount</label>

From a4142e9936ecc1dc988dcf7bb0db7eb7223d4173 Mon Sep 17 00:00:00 2001
From: paulcortez <pbeldia@outlook.com>
Date: Thu, 16 Jan 2025 16:58:51 +0800
Subject: [PATCH 2/2] Added delete of employee transaction

Added delete of employee transaction
---
 app/Config/Routes.php                 |  1 +
 app/Controllers/PayrollController.php | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 4c0966e..0bad4c1 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -70,6 +70,7 @@ $routes->post('payroll/emppaytransupdateworkdays', 'PayrollController::employeeP
 $routes->get('payroll/emppaytransrecom/(:num)', 'PayrollController::employeePayrollTransactionsRecompute/$1');
 $routes->post('payroll/saveemppaytransaddinded', 'PayrollController::saveEmpPayTransIncomeDeduction');
 $routes->get('payroll/emppaytransdelinded/(:num)/(:num)', 'PayrollController::deleteEmpPayTransIncomeDeduction/$1/$2');
+$routes->get('payroll/emppaytransdel/(:num)', 'PayrollController::employeePayrollTransactionsDeleteEmp/$1');
 
 $routes->get('payroll/emppaytransreport/(:num)/(:num)', 'PayrollController::empPayransReport/$1/$2');
 
diff --git a/app/Controllers/PayrollController.php b/app/Controllers/PayrollController.php
index 6992739..35de5c1 100644
--- a/app/Controllers/PayrollController.php
+++ b/app/Controllers/PayrollController.php
@@ -599,8 +599,9 @@ class PayrollController extends BaseController
                 //$iconView = '<a href="#" class="ml-3" data-toggle="tooltip" title="View Information" onclick="showEmpPayTransDetails('.$trans->emppaytrans_id.')"><i class="fas fa-eye "></i></a>';
                 $iconCopy = '<a href="/payroll/emppaytransempreinitpay/' . $trans->emppaytrans_id . '/' . $trans->employee_id . '/' . $trans->paytype_id . '" class="ml-3" data-toggle="tooltip" title="Copy from Payroll Information" onclick="return confirm(\'This will copy payroll information to this record but income and deduction is not affected. Would you like to proceed?\')"><i class="fa fa-copy" aria-hidden="true"></i></a>';
                 $iconEdit = '<a href="#" class="ml-3" data-toggle="tooltip" title="Edit Information" onclick="showEmpPayTransDetails(' . $trans->emppaytrans_id . ')"><i class="fas fa-edit "></i></a>';
+                $iconDelete = '<a href="/payroll/emppaytransdelete/' . $trans->emppaytrans_id . '" class="ml-3" data-toggle="tooltip" title="Delete Information" onclick="return confirm(\'Are you sure you want to delete this record?\')"><i class="fas fa-trash"></i></a>';
 
-                $empPayTransHTMLTable->addRow($trans->employee_id, $trans->last_name . ', ' . $trans->first_name, $trans->branch_code, $trans->basic_pay, $trans->actual_work_days, $trans->gross_income, $trans->total_deduction, $trans->net_pay, $iconCopy . ' ' . $iconEdit);
+                $empPayTransHTMLTable->addRow($trans->employee_id, $trans->last_name . ', ' . $trans->first_name, $trans->branch_code, $trans->basic_pay, $trans->actual_work_days, $trans->gross_income, $trans->total_deduction, $trans->net_pay, $iconCopy . ' ' . $iconEdit . ' ' . $iconDelete);
 
                 // Get Emp Trans In Ded
                 $empPayTransInDedModel = new EmpPayTransIncomeDeductionModel();
@@ -648,6 +649,14 @@ class PayrollController extends BaseController
         return view('payroll/emppaytransinitempview', $data);
     }
 
+    public function employeePayrollTransactionsDeleteEmp($emppaytransid)
+    {
+        if((new EmployeePayTransactionModel())->delete($emppaytransid)) 
+            return redirect()->back()->with('message', 'Employee Payroll Transaction Deleted');
+        else
+            return redirect()->back()->with('error', 'Employee Payroll Transaction Deletion Failed');
+    }
+
     public function empPayTransFillArrayFromEmpPayInfo($paytransid, $empPayInfo, $empAttSum)
     {
         return [