diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 24120d7..503176c 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -58,10 +58,10 @@ $routes->get('payroll/emppaytrans/(:num)', 'PayrollController::employeePayrollTr
$routes->get('payroll/emppaytransinit/(:num)/(:num)/(:num)', 'PayrollController::empPayTransInitializePayroll/$1/$2/$3');
$routes->post('payroll/emppaytransupdateworkdays', 'PayrollController::employeePayrollTransactionsEditDaysWorked');
$routes->post('payroll/emppaytransaddinded', 'PayrollController::addEmpPayTransIncomeDeduction');
-$routes->get('payroll/emppaytransdelinded/(:num)', 'PayrollController::deleteEmpPayTransIncomeDeduction/$1');
+$routes->get('payroll/emppaytransdelinded/(:num)/(:num)', 'PayrollController::deleteEmpPayTransIncomeDeduction/$1/$2');
-//$routes->get('t/(:num)/(:num)', 'PayrollController::computeEmployeePayroll/$1/$2');
+//$routes->post('t', 'PayrollController::test');
// Administrator Routes
diff --git a/app/Controllers/PayrollController.php b/app/Controllers/PayrollController.php
index 83f47ef..708a0df 100644
--- a/app/Controllers/PayrollController.php
+++ b/app/Controllers/PayrollController.php
@@ -87,7 +87,7 @@ class PayrollController extends BaseController
private function printRaw($label, $data)
{
echo $label.": ";
- print_r($empPayTrans->net_pay);
+ print_r($data);
echo "
";
}
@@ -675,17 +675,23 @@ class PayrollController extends BaseController
);
if($empPayTransInDedModel->save($empPayTransInDed))
+ {
+ $this->computeEmployeePayroll($rawData['emppaytrans_id'], true, $empPayTransactionModel, $empPayTransInDedModel);
return redirect()->back()->with('message', 'Income or Deduction Added');
+ }
else
return redirect()->back()->withInput()->with('error', 'Failed to add income or deduction');
}
- public function deleteEmpPayTransIncomeDeduction($emppaytransindedid)
+ public function deleteEmpPayTransIncomeDeduction($emppaytransindedid, $emppaytransid)
{
$empPayTransInDedModel = new EmpPayTransIncomeDeductionModel();
if($empPayTransInDedModel->delete($emppaytransindedid))
+ {
+ $this->computeEmployeePayroll($emppaytransid, true, null, $empPayTransInDedModel);
return redirect()->back()->with('message', 'Income or Deduction Deleted');
+ }
else
return redirect()->back()->with('error', 'Failed to delete income or deduction');
}
diff --git a/app/Models/EmpPayTransIncomeDeductionModel.php b/app/Models/EmpPayTransIncomeDeductionModel.php
index f95c3b6..0c3b5de 100644
--- a/app/Models/EmpPayTransIncomeDeductionModel.php
+++ b/app/Models/EmpPayTransIncomeDeductionModel.php
@@ -9,11 +9,17 @@ class EmpPayTransIncomeDeductionModel extends Model
protected $table = 'emp_pay_trans_inded';
protected $primaryKey = 'emppaytransinded_id';
protected $useAutoIncrement = true;
- protected $returnType = 'array';
+ protected $returnType = \App\Entities\EmpPayTransIncomeDeduction::class;
protected $useSoftDeletes = false;
protected $protectFields = true;
protected $allowedFields = ['emppaytrans_id',
'inded_id',
+ 'payslip_display',
+ 'inded_name',
+ 'coa_code',
+ 'is_income',
+ 'is_taxable',
+ 'include_in_gross',
'is_fixed_amt',
'is_percent_amt',
'amount',
diff --git a/app/Views/payroll/emppaytransactionview.php b/app/Views/payroll/emppaytransactionview.php
index 6275c6e..03a9398 100644
--- a/app/Views/payroll/emppaytransactionview.php
+++ b/app/Views/payroll/emppaytransactionview.php
@@ -311,10 +311,10 @@
Description