Bug Fixes : ps
This commit is contained in:
parent
b6567d1801
commit
9ef36dca9b
@ -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;
|
||||
|
||||
@ -1092,12 +1092,12 @@
|
||||
<div class="row">
|
||||
<div class="col-md-4"></div>
|
||||
<div class="col-md-4">
|
||||
<label>Bank PassBok Name</label>
|
||||
<label>Bank PassBook Name</label>
|
||||
<input type="text" id="file_name" name="file_name4" maxlength="255"
|
||||
class="form-control" value="Bank Passbook" readonly>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label>Select Bank PassBok File</label><br>
|
||||
<label>Select Bank PassBook File</label><br>
|
||||
<input type="file" name="emp_file4" class="">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1136,7 +1136,7 @@ if (!empty($EmpDetails)) {
|
||||
<div class="row">
|
||||
<div class="col-md-4"></div>
|
||||
<div class="col-md-3">
|
||||
<label>Bank PassBok Name</label>
|
||||
<label>Bank PassBook Name</label>
|
||||
<input type="text" id="file_name" name="file_name4"
|
||||
maxlength="255" class="form-control"
|
||||
value="Bank Passbook" readonly>
|
||||
@ -1154,7 +1154,7 @@ if (!empty($EmpDetails)) {
|
||||
<?php } ?>
|
||||
|
||||
<div class="col-md-4">
|
||||
<label>Update Bank PassBok File</label><br>
|
||||
<label>Update Bank PassBook File</label><br>
|
||||
<input type="file" name="emp_file4" class="">
|
||||
</div>
|
||||
|
||||
|
||||
@ -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);
|
||||
?>
|
||||
<tr class="lastvalue">
|
||||
<td style="text-align:right;" style="background-color:blue;">
|
||||
@ -568,21 +570,21 @@
|
||||
|
||||
<td style="max-width:80px;text-align:right;">
|
||||
<!-- $record->driver_salary_amount -->
|
||||
<?php echo number_format($record->driver_basic, 2, '.', ''); ?>
|
||||
<?php echo number_format($sum_of_amount, 2, '.', ''); ?>
|
||||
</td>
|
||||
|
||||
<td style="max-width:80px;text-align:right;">
|
||||
<?php $basicWorked = ($record->driver_basic) * 70 / 100;
|
||||
echo number_format($basicWorked, 2, '.', ''); ?>
|
||||
<?php
|
||||
echo number_format($basic_worked, 2, '.', ''); ?>
|
||||
</td>
|
||||
|
||||
<td style="max-width:80px;text-align:right;">
|
||||
<?php $hraWorked = ($record->driver_basic) * 30 / 100;
|
||||
echo number_format($hraWorked, 2, '.', ''); ?>
|
||||
<?php
|
||||
echo number_format($hra_worked, 2, '.', ''); ?>
|
||||
</td>
|
||||
|
||||
<td style="max-width:80px;text-align:right;">
|
||||
<?php echo number_format($basicWorked + $hraWorked, 2, '.', ''); ?>
|
||||
<?php echo number_format($basic_worked + $hra_worked, 2, '.', ''); ?>
|
||||
</td>
|
||||
|
||||
<td id="esiAmt<?php echo $inx ?>" style="max-width:80px;text-align:right;"> <?php echo $record->esi_amount; ?> </td>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user