RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stock controller fix

Browse Source
This commit is contained in:
vadivelJ96 2025-05-07 09:11:21 +05:30
parent 1bada0fec3
commit 28e0a69aa1
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/StockController.php
View File

@ -2119,7 +2119,7 @@ class StockController extends BaseController
if(!empty($previousMonthCustomMachineCodes)){
$existingCustomMaterialCodes = $this->rawmaterialdetails_model
->getSelectedResinMaterialCode(array_column($previousMonthCustomMachineCodes, 'materialCode'));
->getSelectedBagMaterialCode(array_column($previousMonthCustomMachineCodes, 'materialCode'));
}else{
// inserting all active if no previous month present

50
app/Views/monthlypayinputs.php
View File

@ -316,7 +316,7 @@
style="text-align:center;color:blue;"
<?php } else { ?>style="text-align:center;" <?php } ?>>
<?php if (!empty($record->LOP_Days)) {
echo $record->LOP_Days;
echo round($record->LOP_Days);
} else {
echo "0.00";
} ?>
@ -330,9 +330,9 @@
style="text-align:center;color:blue;"
<?php } else { ?>style="text-align:center;" <?php } ?>>
<?php if (!empty($record->Paid_leave)) {
echo number_format($record->Paid_leave, 2, '.', '');
echo round($record->Paid_leave);
} else {
echo number_format(0.00, 2, '.', '');
echo round(0);
} ?>
</td>
@ -344,59 +344,59 @@
style="text-align:center;color:blue;"
<?php } else { ?>style="text-align:center;" <?php } ?>>
<?php if (!empty($record->OT_Hrs_Worked)) {
echo $record->OT_Hrs_Worked;
echo round($record->OT_Hrs_Worked);
} else {
echo number_format(0.00, 2, '.', '');
echo 0;
} ?>
</td>
<td id="ttlsalary<?php echo $index ?>" style="max-width:80px;text-align:right;">
<?php echo $record->TotalSalary; $totalsalary[] = $record->TotalSalary; ?>
<?php echo round($record->TotalSalary); $totalsalary[] = $record->TotalSalary; ?>
</td>
<td style="max-width:80px;text-align:right;">
<?php $perDaySalary = $record->TotalSalary / $record->NoofDays;
echo number_format($perDaySalary, 2, '.', ''); $totalperdaySalary[] = $perDaySalary; ?>
echo round($perDaySalary); $totalperdaySalary[] = $perDaySalary; ?>
</td>
<td style="max-width:80px;text-align:right;">
<?php $workedSalary = $perDaySalary * ($record->Days_worked);
echo number_format($workedSalary, 2, '.', ''); ?>
echo round($workedSalary); ?>
</td>
<td style="max-width:80px;text-align:right;">
<?php $perHrSalary = $perDaySalary / 8;
echo number_format($perHrSalary, 2); $totalperhrSalary[] = $perHrSalary; ?>
echo round($perHrSalary); $totalperhrSalary[] = $perHrSalary; ?>
</td>
<td style="max-width:80px;text-align:right;">
<?php echo number_format($workedSalary, 2, '.', ''); $totalworkedSalary[] = $workedSalary; ?>
<?php echo round($workedSalary); $totalworkedSalary[] = $workedSalary; ?>
</td>
<td id="bassalary<?php echo $index ?>" style="max-width:80px;text-align:right;">
<?php $basicWorked = $workedSalary * 70 / 100;
echo number_format($basicWorked, 2, '.', ''); $totalbasic[] = $basicWorked; ?>
echo round($basicWorked); $totalbasic[] = $basicWorked; ?>
</td>
<td id="hrasalary<?php echo $index ?>" style="max-width:80px;text-align:right;">
<?php $hraWorked = $workedSalary * 30 / 100;
echo number_format($hraWorked, 2, '.', ''); $totalhra[] = $hraWorked; ?>
echo round($hraWorked); $totalhra[] = $hraWorked; ?>
</td>
<td id="grosalary<?php echo $index ?>" style="max-width:80px;text-align:right;">
<?php echo number_format($basicWorked + $hraWorked, 2, '.', ''); $totalgross[] = $basicWorked + $hraWorked; ?>
<?php echo round($basicWorked + $hraWorked); $totalgross[] = $basicWorked + $hraWorked; ?>
</td>
<td id="esiAmt<?php echo $index ?>" style="max-width:80px;text-align:right;">
<?php echo $esi[$i]; $totalesi[] = $esi[$i]; ?>
<?php echo round($esi[$i]); $totalesi[] = $esi[$i]; ?>
</td>
<td id="pfAmt<?php echo $index ?>" style="max-width:80px;text-align:right;">
<?php echo $pf[$i]; $totalpf[] = $pf[$i]; ?>
<?php echo round($pf[$i]); $totalpf[] = $pf[$i]; ?>
</td>
<td style="max-width:80px;text-align:right;">
<?php echo $over_time[$i]; $totalovertime[] = $over_time[$i]; ?>
<?php echo round($over_time[$i]); $totalovertime[] = $over_time[$i]; ?>
</td>
<td id="monthDue<?php echo $index ?>" onkeypress="return isNumber(event);" onkeyup="changeInput(event);"
@ -406,10 +406,10 @@
<?php } else { ?>style="text-align:right;" <?php } ?>>
<?php if (!empty($record->Monthly_Due)) {
echo $record->Monthly_Due;
echo round($record->Monthly_Due);
$totalmonthloan[] = $record->Monthly_Due;
} else {
echo number_format(0.00, 2, '.', '');
echo 0;
} ?>
</td>
@ -423,10 +423,10 @@
<?php } else { ?>style="text-align:right;" <?php } ?>>
<?php if (!empty($record->Other_Deductions)) {
echo $record->Other_Deductions;
echo round($record->Other_Deductions);
$totalotherDet[] = $record->Other_Deductions;
} else {
echo number_format(0.00, 2, '.', '');
echo 0 ;
} ?>
</td>
@ -441,10 +441,10 @@
style="text-align:right;color:blue;"
<?php } else { ?>style="text-align:right;" <?php } ?>>
<?php if (!empty($record->Festival_Bonus)) {
echo $record->Festival_Bonus;
echo round($record->Festival_Bonus);
$totalfestival[] = $record->Festival_Bonus;
} else {
echo number_format(0.00, 2, '.', '');;
echo 0;
} ?>
</td>
@ -458,15 +458,15 @@
style="text-align:right;color:blue;" <?php }else{ ?>style="text-align:right;" <?php } ?>>
<!-- <?php if (!empty($record->Estimate)) {
echo $record->Estimate;
echo round($record->Estimate);
$estTotal[] = $record->Estimate;
} else {
echo $empSalary[$i];
echo round($empSalary[$i]);
$estTotal[] = $empSalary[$i];
}
?> -->
<?php echo $empSalary[$i]; $estTotal[] = $empSalary[$i]; ?>
<?php echo round($empSalary[$i]); $estTotal[] = $empSalary[$i]; ?>
</td>