Fix net pay calculation and tax logic in transactionClass

Kanechiii · web-flow · commit ee0ae253c016 · 2025-11-27T12:38:37.000+08:00
Corrected calculation for net pay and adjusted tax calculations.
diff --git a/src/pkg2darr_payrollsystem/transactionClass.java b/src/pkg2darr_payrollsystem/transactionClass.java
@@ -80,7 +80,7 @@ else if(numDepChoice >= 3)
 
             vat = dataEmployee[i][12] * taxRate;
             dataEmployee[i][15] = vat;
-            dataEmployee[i][13] = dataEmployee[i][12] - dataEmployee[i][9] - vat; //Net pay
+            dataEmployee[i][13] = (dataEmployee[i][12] * vat) - dataEmployee[i][9]; //Net pay
             totalPay += dataEmployee[i][13]; //total net pay of employees
         }
     }
@@ -96,3 +96,4 @@ public static void Deduction()
 
 
 
+

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ else if(numDepChoice >= 3)`
`80`	`80`
`81`	`81`	`vat = dataEmployee[i][12] * taxRate;`
`82`	`82`	`dataEmployee[i][15] = vat;`
`83`		`- dataEmployee[i][13] = dataEmployee[i][12] - dataEmployee[i][9] - vat; //Net pay`
	`83`	`+ dataEmployee[i][13] = (dataEmployee[i][12] * vat) - dataEmployee[i][9]; //Net pay`
`84`	`84`	`totalPay += dataEmployee[i][13]; //total net pay of employees`
`85`	`85`	`}`
`86`	`86`	`}`
`@@ -96,3 +96,4 @@ public static void Deduction()`
`96`	`96`
`97`	`97`
`98`	`98`
	`99`	`+`