From 9ef36dca9b9d7ffcf1129853d74493166f70153d Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Sat, 1 Mar 2025 06:25:19 +0000 Subject: [PATCH] Bug Fixes : ps --- app/Controllers/Payslip.php | 60 +++++++++++++++++++--------------- app/Views/addEmployeenew.php | 4 +-- app/Views/editEmployeenew.php | 4 +-- app/Views/monthlypayinputs.php | 16 +++++---- 4 files changed, 46 insertions(+), 38 deletions(-) diff --git a/app/Controllers/Payslip.php b/app/Controllers/Payslip.php index 2c5fb4ff..7b6b79e6 100755 --- a/app/Controllers/Payslip.php +++ b/app/Controllers/Payslip.php @@ -766,10 +766,16 @@ class Payslip extends BaseController $PF_Rate = $load_driver_data[$i]->PF_Rate; $ESI_Rate = $load_driver_data[$i]->ESI_Rate; - $salary = isset($load_driver_data[$i]->monthly_salary_amount) ? (int)$load_driver_data[$i]->monthly_salary_amount : 0; - $food = isset($load_driver_data[$i]->monthly_food_amount) ? (int)$load_driver_data[$i]->monthly_food_amount : 0; + $monthly_salary_amount = isset($load_driver_data[$i]->monthly_salary_amount) ? (int)$load_driver_data[$i]->monthly_salary_amount : 0; + $monthly_food_amount = isset($load_driver_data[$i]->monthly_food_amount) ? (int)$load_driver_data[$i]->monthly_food_amount : 0; + $final_salary_amount = $monthly_salary_amount+$monthly_food_amount; + $shed = isset($load_driver_data[$i]->shed_amount) ? (int)$load_driver_data[$i]->shed_amount : 0; $diesel = isset($load_driver_data[$i]->diesel_amount) ? (int)$load_driver_data[$i]->diesel_amount : 0; + + $load_driver_data[$i]->driver_salary = $final_salary_amount; + $load_driver_data[$i]->driver_shed = $shed; + $load_driver_data[$i]->driver_diesel = $diesel; $Monthly_Due = $load_driver_data[$i]->Monthly_Due; // AUTO LOAN DUE $Loan_Recovered = $load_driver_data[$i]->Loan_Recovered; //MANUAL LOAN DUE @@ -788,7 +794,6 @@ class Payslip extends BaseController } } - $load_driver_data[$i]->driver_basic = $salary+$food; $Loan_amount = $load_driver_data[$i]->Loan_Amount; $Paid_Amount = $load_driver_data[$i]->Paid_Amount; $Balance_Amount = $Loan_amount - $Paid_Amount; @@ -796,47 +801,49 @@ class Payslip extends BaseController $loan = $Balance_Amount; } - $empSalaryAdd = $salary+$food; + $empSalaryAdd = $final_salary_amount+$shed+$diesel; $empSalarySub = $loan; $salaryInCurrentday = $empSalaryAdd - $empSalarySub; - $load_driver_data[$i]->driver_final_payment = $salaryInCurrentday+$shed+$diesel; + $load_driver_data[$i]->driver_final_payment = $salaryInCurrentday; - $load_driver_data[$i]->driver_salary = $salary; - $load_driver_data[$i]->driver_food = $food; - $load_driver_data[$i]->driver_shed = $shed; - $load_driver_data[$i]->driver_diesel = $diesel; - $load_driver_data[$i]->payroll_id = $monthly_pay_array[$driver_id]->payroll_id; $load_driver_data[$i]->Festival_Bonus = $monthly_pay_array[$driver_id]->Festival_Bonus; - $load_driver_data[$i]->esi_amount = ($load_driver_data[$i]->esi_applicable == 1) ? ($salary+$food) * $ESI_Rate / 100 : 0; - $load_driver_data[$i]->pf_amount = ($load_driver_data[$i]->pf_applicable == 1) ? ($salary+$food) * $PF_Rate / 100 : 0; - $load_driver_data[$i]->basic_worked = ($salary+$food) * 30 / 100; - $load_driver_data[$i]->hra_worked = ($salary+$food) * 70 / 100; + $basic = ($final_salary_amount+$shed+$diesel) * 70 / 100; + $hra = ($final_salary_amount+$shed+$diesel) * 30 / 100; + + $load_driver_data[$i]->basic_worked = $basic; + $load_driver_data[$i]->hra_worked = $hra; + + $load_driver_data[$i]->esi_amount = ($load_driver_data[$i]->esi_applicable == 1) ? ($basic) * $ESI_Rate / 100 : 0; + $load_driver_data[$i]->pf_amount = ($load_driver_data[$i]->pf_applicable == 1) ? ($basic) * $PF_Rate / 100 : 0; + }else { $PF_Rate = $load_driver_data[$i]->PF_Rate; $ESI_Rate = $load_driver_data[$i]->ESI_Rate; - $salary = isset($load_driver_data[$i]->monthly_salary_amount) ? (int)$load_driver_data[$i]->monthly_salary_amount : 0; - $food = isset($load_driver_data[$i]->monthly_food_amount) ? (int)$load_driver_data[$i]->monthly_food_amount : 0; + $monthly_salary_amount = isset($load_driver_data[$i]->monthly_salary_amount) ? (int)$load_driver_data[$i]->monthly_salary_amount : 0; + $monthly_food_amount = isset($load_driver_data[$i]->monthly_food_amount) ? (int)$load_driver_data[$i]->monthly_food_amount : 0; + $final_salary_amount = $monthly_salary_amount+$monthly_food_amount; $shed = isset($load_driver_data[$i]->shed_amount) ? (int)$load_driver_data[$i]->shed_amount : 0; $diesel = isset($load_driver_data[$i]->diesel_amount) ? (int)$load_driver_data[$i]->diesel_amount : 0; - - $load_driver_data[$i]->driver_basic = $salary+$food; - - $load_driver_data[$i]->driver_salary = $salary; - $load_driver_data[$i]->driver_food = $food; + + $load_driver_data[$i]->driver_salary = $final_salary_amount; $load_driver_data[$i]->driver_shed = $shed; $load_driver_data[$i]->driver_diesel = $diesel; $load_driver_data[$i]->payroll_id = ''; $load_driver_data[$i]->Festival_Bonus = 0; + + $basic = ($final_salary_amount+$shed+$diesel) * 70 / 100; + $hra = ($final_salary_amount+$shed+$diesel) * 30 / 100; + $load_driver_data[$i]->basic_worked = $basic; + $load_driver_data[$i]->hra_worked = $hra; - $load_driver_data[$i]->esi_amount = ($load_driver_data[$i]->esi_applicable == 1) ? ($salary+$food) * $ESI_Rate / 100 : 0; - $load_driver_data[$i]->pf_amount = ($load_driver_data[$i]->pf_applicable == 1) ? ($salary+$food) * $PF_Rate / 100 : 0; - $load_driver_data[$i]->basic_worked = ($salary+$food) * 30 / 100; - $load_driver_data[$i]->hra_worked = ($salary+$food) * 70 / 100; + $load_driver_data[$i]->esi_amount = ($load_driver_data[$i]->esi_applicable == 1) ? ($basic) * $ESI_Rate / 100 : 0; + $load_driver_data[$i]->pf_amount = ($load_driver_data[$i]->pf_applicable == 1) ? ($basic) * $PF_Rate / 100 : 0; + $Monthly_Due = $load_driver_data[$i]->Monthly_Due; // AUTO LOAN DUE $Loan_Recovered = $load_driver_data[$i]->Loan_Recovered; //MANUAL LOAN DUE @@ -855,7 +862,6 @@ class Payslip extends BaseController } } - $load_driver_data[$i]->driver_basic = $salary+$food; $Loan_amount = $load_driver_data[$i]->Loan_Amount; $Paid_Amount = $load_driver_data[$i]->Paid_Amount; $Balance_Amount = $Loan_amount - $Paid_Amount; @@ -863,7 +869,7 @@ class Payslip extends BaseController $loan = $Balance_Amount; } - $empSalaryAdd = $salary+$food; + $empSalaryAdd = $final_salary_amount; $empSalarySub = $loan; $salaryInCurrentday = $empSalaryAdd - $empSalarySub; $load_driver_data[$i]->driver_final_payment = $salaryInCurrentday+$shed+$diesel; diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php index d71e2506..9c28bd2c 100755 --- a/app/Views/addEmployeenew.php +++ b/app/Views/addEmployeenew.php @@ -1092,12 +1092,12 @@
- +
-
+
diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php index 5b216f6b..211c91c2 100755 --- a/app/Views/editEmployeenew.php +++ b/app/Views/editEmployeenew.php @@ -1136,7 +1136,7 @@ if (!empty($EmpDetails)) {
- + @@ -1154,7 +1154,7 @@ if (!empty($EmpDetails)) {
-
+
diff --git a/app/Views/monthlypayinputs.php b/app/Views/monthlypayinputs.php index fac621c9..4b5759f6 100755 --- a/app/Views/monthlypayinputs.php +++ b/app/Views/monthlypayinputs.php @@ -511,7 +511,9 @@ if(!empty($drivermonthinputs)){ foreach ($drivermonthinputs as $i => $record) { $inx++; - $sum_of_amount = ($record->driver_basic+$record->driver_shed+$record->driver_diesel); + $hra_worked = $record->hra_worked; + $basic_worked = $record->basic_worked; + $sum_of_amount = ($record->driver_salary+$record->driver_shed+$record->driver_diesel); ?> @@ -568,21 +570,21 @@ - driver_basic, 2, '.', ''); ?> + - driver_basic) * 70 / 100; - echo number_format($basicWorked, 2, '.', ''); ?> + - driver_basic) * 30 / 100; - echo number_format($hraWorked, 2, '.', ''); ?> + - + esi_amount; ?>