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

CHANGE_SANJEEV_ISSUE_TRACK_ISSUE_CLEAR_CONFLIT_MERGE

Browse Source
This commit is contained in:
aadhavan valli 2024-09-24 17:37:29 +05:30
commit 511e2e6eea
6 changed files with 4117 additions and 4073 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/Emergencypurchaseorder.php
View File

@ -372,7 +372,9 @@ class Emergencypurchaseorder extends BaseController
// redirect('purchaseorder/PurchaseOrderList', 'refresh'); // redirect('purchaseorder/PurchaseOrderList', 'refresh');
// } // }
if ($POStatus == REQ_DRAFT) { if ($POStatus == REQ_DRAFT) {
echo "<script>alert('You Have Successfully Saved the Purchase order! $PONO');</script>";
$this->session->setFlashdata('success', 'You Have Successfully Saved the Purchase order! '.$PONO); $this->session->setFlashdata('success', 'You Have Successfully Saved the Purchase order! '.$PONO);
} else { } else {
$this->session->setFlashdata('success', 'You Have Successfully Created the Purchase order! '.$PONO); $this->session->setFlashdata('success', 'You Have Successfully Created the Purchase order! '.$PONO);
} }

10
app/Controllers/Payslip.php
View File

@ -83,10 +83,13 @@ class Payslip extends BaseController
{ {
$loan_id = $result->Loan_ID; $loan_id = $result->Loan_ID;
if($result->Remaining_Due - 1 == 0){ $is_Active = 0; }else{ $is_Active = 1; }
$loan = [ $loan = [
'Paid_Due' => $result->Paid_Due + 1, 'Paid_Due' => $result->Paid_Due + 1,
'Remaining_Due' => $result->Remaining_Due - 1, 'Remaining_Due' => $result->Remaining_Due - 1,
'Paid_Amount' => $result->Paid_Amount + $result->Loan_Recovered, 'Paid_Amount' => $result->Paid_Amount + $result->Loan_Recovered,
'is_Active' => $is_Active
]; ];
$loanHistory = [ $loanHistory = [
@ -130,11 +133,16 @@ class Payslip extends BaseController
'ESINumber' => $result->ESINO, 'ESINumber' => $result->ESINO,
'UANNO' => $result->PFNO, 'UANNO' => $result->PFNO,
]; ];
// print_r($result); // print_r($result);
// print_r($loan); // print_r($loan);
// print_r($loanHistory); // print_r($loanHistory);
// print_r($data); // print_r($data);
// die; // die;
$insert = $this->payroll_model->insertPayroll($data); $insert = $this->payroll_model->insertPayroll($data);
if($insert){ if($insert){
if(count($loan)){ if(count($loan)){
@ -703,7 +711,7 @@ class Payslip extends BaseController
$data['pf'] = $pf; $data['pf'] = $pf;
$data['over_time'] = $ot; $data['over_time'] = $ot;
// dd($data);
$this->global['pageTitle'] = 'Payroll Monthly Inputs'; $this->global['pageTitle'] = 'Payroll Monthly Inputs';
$this->loadViews("monthlypayinputs", $this->global, $data, NULL); $this->loadViews("monthlypayinputs", $this->global, $data, NULL);
} }

19
app/Views/EditservicePurchaseorder.php
View File

@ -3262,10 +3262,18 @@ if (!empty($getlogpodtl)) {
$("#EditMaterialCode").empty(); $("#EditMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>; $("#EditMaterialCode").append($('<option></option>')
// For Binding Material list center for the selected Requistion Number .val($('#materialCode' + userid).val())
.html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val())
.prop('selected', true)
);
// Make the select element read-only (disable it)
$("#EditMaterialCode").prop('disabled', true);
// $("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
// For Binding Material list center for the selected Requistion Number
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
var isAdded = "0"; var isAdded = "0";
for (i = 0; i < Material.length; i++) { for (i = 0; i < Material.length; i++) {
@ -3302,6 +3310,11 @@ if (!empty($getlogpodtl)) {
} }
}); });
$("#VIEWSERVICE").on("shown.bs.modal", function(e) { $("#VIEWSERVICE").on("shown.bs.modal", function(e) {
userid = $(e.relatedTarget).data('userid'); userid = $(e.relatedTarget).data('userid');

574
app/Views/alterpurchaseorder.php
View File

File diff suppressed because it is too large Load Diff

64
app/Views/editOldemppay.php
View File

@ -246,17 +246,30 @@ if (!empty($emppay)) {
<div class="form-group"> <div class="form-group">
<div class="form-group"> <div class="form-group">
<span for="Basic_Pay">Paid Amount</span> <span for="Basic_Pay">Paid Amount</span>
<input type="text" class="form-control requried num" id="Paid_Amount" name="Paid_Amount" value="<?php echo $Paid_Amount; ?>" pattern="([0-9]{1,7}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit" readonly> <input type="text" class="form-control requried num" id="Paid_Amount" name="Paid_Amount" value="<?php echo $Paid_Amount; ?>" readonly>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-3">
<div class="form-group">
<span for="">Paid Due</span>
<input type="text" class="form-control requried num" id="paid_due" name="paid_due" value="<?php echo $Paid_Due; ?>" readonly>
</div> </div>
<input type="hidden" id="remaining_due" name="remaining_due" value="<?php echo $Remaining_Due; ?>"> </div>
<input type="hidden" id="paid_due" name="paid_due" value="<?php echo $Paid_Due; ?>"> <div class="col-md-3">
<div class="form-group">
<span for="">Remaining Due</span>
<input type="text" class="form-control requried num" id="remaining_due" name="remaining_due" value="<?php echo $Remaining_Due; ?>" readonly>
</div>
</div>
</div>
<!-- <input type="hidden" id="remaining_due" name="remaining_due" value="<?php echo $Remaining_Due; ?>">
<input type="hidden" id="paid_due" name="paid_due" value="<?php echo $Paid_Due; ?>"> -->
</div> </div>
</div> </div>
<div class="col-md-12 text-right"> <div class="col-md-12 text-right">
<input type="button" class="btn btn-success" value="Delete" id="deleteemp" style="background-color:red ;color: white; margin-right: 15px;width: 80px;border:none;" /> <input type="button" class="btn btn-success" value="Delete" id="deleteemp" style="background-color:#ee4d4d;color:white;margin-right:15px;width:80px;border:none;" />
<input type="submit" onmouseover="finalCheck();" value="Submit" class="btn btn-success"> <input type="submit" onmouseover="finalCheck();" value="Submit" class="btn btn-success">
</div> </div>
</div> </div>
@ -308,27 +321,7 @@ if (!empty($emppay)) {
</div> <!-- content --> </div> <!-- content -->
<script> <script>
function calculateBasic()
{
var Totalsalary = document.getElementById('Total_Salary').value;;
var HRA = document.getElementById('HRA_Rate').value;
if (HRA == '') {
alert("Please Enter HRA RATE..");
document.getElementById('HRA_Rate').focus();
} else if (Totalsalary == '') {
alert("Please Enter Total Salary..");
document.getElementById('Total_Salary').focus();
} else {
var temp = (Totalsalary * (HRA / 100));
var basic = Totalsalary - temp;
document.getElementById('Basic_Pay').value = basic;
document.getElementById('HRA_Amount').value = temp;
}
//alert(basic);
}
@ -351,14 +344,13 @@ if (!empty($emppay)) {
} else { } else {
document.getElementById('no_of_due').value = Math.ceil(totaldue); document.getElementById('no_of_due').value = Math.ceil(totaldue);
var noofdues = document.getElementById('no_of_due').value; var noofdues = document.getElementById('no_of_due').value;
$('#remaining_due').val(noofdues); $('#remaining_due').val(noofdues - $('#paid_due').val());
$('#Paid_Amount').val("0.00"); // $('#Paid_Amount').val("0.00");
$('#paid_due').val(0); // $('#paid_due').val(0);
} }
} }
} //else if(loan == "" || loan == 0) }
//alert(totaldue);
dateCalulation(); dateCalulation();
@ -366,7 +358,7 @@ if (!empty($emppay)) {
} }
function dateCalulation() { function dateCalulation() {
//alert('j');
var loanamount = document.getElementById('Loan_Amount').value; var loanamount = document.getElementById('Loan_Amount').value;
if (loanamount == 0.00 || loanamount == "") { if (loanamount == 0.00 || loanamount == "") {
$('#loan_issued_date').val(""); $('#loan_issued_date').val("");
@ -377,16 +369,11 @@ if (!empty($emppay)) {
$('#Loan_Amount').val("0.00"); $('#Loan_Amount').val("0.00");
$('#paid_due').val(0); $('#paid_due').val(0);
$('#Paid_Amount').val("0.00"); $('#Paid_Amount').val("0.00");
} }
} }
function finalCheck() { function finalCheck() {
//alert("final check");
var loanamount = document.getElementById('Loan_Amount').value; var loanamount = document.getElementById('Loan_Amount').value;
if (loanamount != "" && loanamount != 0.00) { if (loanamount != "" && loanamount != 0.00) {
@ -413,9 +400,10 @@ if (!empty($emppay)) {
echo $emppay[0]->Loan_ID; echo $emppay[0]->Loan_ID;
} ?>"; } ?>";
var i = confirm("Do You want to delete " + loanid + " from Loan Master?"); var i = confirm("Do You want to delete " + loanid + " from Loan Master?");
// alert(i);s
if (i) { if (i) {
// $('#content').loader('show');
$('#loader').show();
$.ajax({ $.ajax({
data: { data: {
id: loanid id: loanid
@ -426,7 +414,7 @@ if (!empty($emppay)) {
if (result) { if (result) {
alert(result); alert(result);
// $('#content').loader('hide'); $('#loader').hide();
window.location.href = "<?php echo base_url(); ?>emppayListings"; window.location.href = "<?php echo base_url(); ?>emppayListings";
} }

423
app/Views/monthlypayinputs.php
View File

@ -1,20 +1,16 @@
<?php
// $sample = array_merge($month, $fresh);
// $show_hide_column_value = true;
// echo '<pre>';
// print_r($month);
// print_r($fresh);
// print_r($sample);
// echo '<pre>';
// foreach ($sample as $s) { <style>
// if (!empty($s->Key)) { .celda_encabezado_general {
// $show_hide_column_value = false; background-color: #00a65a;
// } else { border: 1px solid #ccc;
// $show_hide_column_value = true; color: #ffffff;
// } font-weight: bold;
// break; padding: 2px 4px;
// } text-align: center;
}
</style>
<?php
$sample = $fresh; $sample = $fresh;
$ex = explode('-', $dropdownvalue); $ex = explode('-', $dropdownvalue);
@ -173,42 +169,35 @@
<div style="overflow-x:scroll;"> <div style="overflow-x:scroll;">
<table id="monthlylistings" class="table table-bordered table-hover" <table id="monthlylistings" class="table table-bordered table-hover"
style="background-color:#fff;font-size:12px"> style="background-color:#fff;font-size:12px;white-space: nowrap;">
<thead style="background-color: #ddd;"> <thead style="background-color: #ddd;">
<tr> <tr>
<th>S.No</th> <th class="celda_encabezado_general">S.No</th>
<th>Emp ID </th> <th class="celda_encabezado_general">Emp ID </th>
<th>Employee </th> <th class="celda_encabezado_general">Employee </th>
<th>DOJ</th> <th class="celda_encabezado_general">DOJ</th>
<th>Designation</th> <th class="celda_encabezado_general">Designation</th>
<th>Total Days</th> <th class="celda_encabezado_general">Total Days</th>
<th>Days Worked</th> <th class="celda_encabezado_general">Days Worked</th>
<th>LOP Days</th> <th class="celda_encabezado_general">LOP Days</th>
<th>Paid Leave</th> <th class="celda_encabezado_general">Paid Leave</th>
<th>OT Hrs</th> <th class="celda_encabezado_general">OT Hrs</th>
<th class="celda_encabezado_general">Total Salary</th>
<th>Basic Salary</th> <th class="celda_encabezado_general">Per Day Salary</th>
<th>Pre Day Salary</th> <th class="celda_encabezado_general">Worked Salary</th>
<th>Worked Salary</th> <th class="celda_encabezado_general">Per hr Salary</th>
<th>Pre hr Salary</th> <th class="celda_encabezado_general">Earned Salary</th>
<th>Earned Salary</th> <th class="celda_encabezado_general">Basic Salary(0.7)</th>
<th>Basic Salary(0.7)</th> <th class="celda_encabezado_general">HRA Salary(0.3)</th>
<th>HRA Salary(0.3)</th> <th class="celda_encabezado_general">Gross Salary</th>
<th>Gross Salary</th> <th class="celda_encabezado_general">ESI</th>
<th>ESI</th> <th class="celda_encabezado_general">PF</th>
<th>PF</th> <th class="celda_encabezado_general">Over Time</th>
<th>Over Time</th> <th class="celda_encabezado_general">Auto Loan Due ₹</th>
<th class="celda_encabezado_general">TDS Deductions in ₹</th>
<th class="celda_encabezado_general">Festival Bonus in ₹</th>
<th class="celda_encabezado_general">Estimate in ₹</th>
<th>Auto Loan Due ₹</th>
<th>TDS Deductions in ₹</th>
<th>Festival Bonus in ₹</th>
<th>Estimate in ₹</th>
</tr> </tr>
@ -237,63 +226,72 @@
<td style="text-align:right;" style="background-color:blue;"> <td style="text-align:right;" style="background-color:blue;">
<?php echo $index; ?></td> <?php echo $index; ?></td>
<td style="max-width:80px"><?php echo $record->EmpID; ?></td> <td style="max-width:80px"><?php echo $record->EmpID; ?></td>
<td style="max-width:80px"><?php echo $record->FirstName; ?></td> <td <?php if($record->is_management_team == 1){ ?> style="max-width:150px;background-color: #d8d8ea;" <?php }else{ ?> style="max-width:150px;" <?php } ?> >
<td style="max-width:80px"> <?php echo $record->FirstName; ?>
</td>
<td style="max-width: 100px;">
<?php <?php
echo $record->DateofJoining; $date = DateTime::createFromFormat('Y-m-d H:i:s', $record->DateofJoining);
// $date = DateTime::createFromFormat('Y-m-d H:i:s', $record->DateofJoining); $newDateFormat = $date->format('d-m-Y');
// $newDateFormat = $date->format('d-m-Y'); echo $newDateFormat;
// echo $newDateFormat;
?> ?>
</td> </td>
<td style="max-width:80px"><?php echo $record->Designation; ?></td>
<td style="max-width:80px"><?php echo $record->NoofDays; ?></td> <td style="max-width: 150px;overflow: hidden;text-overflow: ellipsis;">
<?php echo $record->Designation; ?>
</td>
<td style="max-width:80px;text-align:center;"><?php echo $record->NoofDays; ?></td>
<td id="dayWork<?php echo $index ?>" <td id="dayWork<?php echo $index ?>"
<?php if (empty($record->Key)) { <?php if (empty($record->Key)) {
echo "contenteditable='false';"; echo "contenteditable='false';";
} ?> } ?>
<?php if (!empty($record->Key)) { ?> title="Payslip Calculated" <?php if (!empty($record->Key)) { ?> title="Payslip Calculated"
style="text-align:right;color:blue;" style="text-align:center;color:blue;"
<?php } else { ?>style="text-align:right;" <?php } ?>> <?php } else { ?>style="text-align:center;" <?php } ?>>
<?php if (!empty($record->Days_worked)) { <?php if (!empty($record->Days_worked)) {
echo $record->Days_worked + $record->sunday_count; echo $record->Days_worked + $record->sunday_count;
} else { } else {
echo "0.00"; echo "0.00";
} ?> } ?>
</td> </td>
<td id="lopDay<?php echo $index ?>" <td id="lopDay<?php echo $index ?>"
<?php if (empty($record->Key)) { <?php if (empty($record->Key)) {
echo "contenteditable='false';"; echo "contenteditable='false';";
} ?> } ?>
<?php if (!empty($record->Key)) { ?> title="Payslip Calculated" <?php if (!empty($record->Key)) { ?> title="Payslip Calculated"
style="text-align:right;color:blue;" style="text-align:center;color:blue;"
<?php } else { ?>style="text-align:right;" <?php } ?>> <?php } else { ?>style="text-align:center;" <?php } ?>>
<?php if (!empty($record->LOP_Days)) { <?php if (!empty($record->LOP_Days)) {
echo $record->LOP_Days; echo $record->LOP_Days;
} else { } else {
echo "0.00"; echo "0.00";
} ?> } ?>
</td> </td>
<td id="paidLeave<?php echo $index ?>" <td id="paidLeave<?php echo $index ?>"
<?php if (empty($record->Key)) { <?php if (empty($record->Key)) {
echo "contenteditable='false';"; echo "contenteditable='false';";
} ?> } ?>
<?php if (!empty($record->Key)) { ?> title="Payslip Calculated" <?php if (!empty($record->Key)) { ?> title="Payslip Calculated"
style="text-align:right;color:blue;" style="text-align:center;color:blue;"
<?php } else { ?>style="text-align:right;" <?php } ?>> <?php } else { ?>style="text-align:center;" <?php } ?>>
<?php if (!empty($record->Paid_leave)) { <?php if (!empty($record->Paid_leave)) {
echo number_format($record->Paid_leave, 2, '.', ''); echo number_format($record->Paid_leave, 2, '.', '');
} else { } else {
echo number_format(0.00, 2, '.', ''); echo number_format(0.00, 2, '.', '');
} ?> } ?>
</td> </td>
<td id="otHrsWork<?php echo $index ?>" <td id="otHrsWork<?php echo $index ?>"
<?php if (empty($record->Key)) { <?php if (empty($record->Key)) {
echo "contenteditable='false';"; echo "contenteditable='false';";
} ?> } ?>
<?php if (!empty($record->Key)) { ?> title="Payslip Calculated" <?php if (!empty($record->Key)) { ?> title="Payslip Calculated"
style="text-align:right;color:blue;" style="text-align:center;color:blue;"
<?php } else { ?>style="text-align:right;" <?php } ?>> <?php } else { ?>style="text-align:center;" <?php } ?>>
<?php if (!empty($record->OT_Hrs_Worked)) { <?php if (!empty($record->OT_Hrs_Worked)) {
echo $record->OT_Hrs_Worked; echo $record->OT_Hrs_Worked;
} else { } else {
@ -301,60 +299,47 @@
} ?> } ?>
</td> </td>
<td style="max-width:80px"><?php echo $record->TotalSalary; ?></td> <td style="max-width:80px;text-align:right;"><?php echo $record->TotalSalary; ?></td>
<td style="max-width:80px">
<td style="max-width:80px;text-align:right;">
<?php $perDaySalary = $record->TotalSalary / $record->NoofDays; <?php $perDaySalary = $record->TotalSalary / $record->NoofDays;
echo number_format($perDaySalary, 2, '.', ''); ?> echo number_format($perDaySalary, 2, '.', ''); ?>
</td> </td>
<td style="max-width:80px">
<td style="max-width:80px;text-align:right;">
<?php $workedSalary = $perDaySalary * ($record->Days_worked + $record->sunday_count); <?php $workedSalary = $perDaySalary * ($record->Days_worked + $record->sunday_count);
echo number_format($workedSalary, 2, '.', ''); ?> echo number_format($workedSalary, 2, '.', ''); ?>
</td> </td>
<td style="max-width:80px">
<td style="max-width:80px;text-align:right;">
<?php $perHrSalary = $perDaySalary / 8; <?php $perHrSalary = $perDaySalary / 8;
echo number_format($perHrSalary, 2); ?> echo number_format($perHrSalary, 2); ?>
</td> </td>
<td style="max-width:80px"><?php echo number_format($workedSalary, 2, '.', ''); ?></td>
<td style="max-width:80px"> <td style="max-width:80px;text-align:right;"><?php echo number_format($workedSalary, 2, '.', ''); ?></td>
<td style="max-width:80px;text-align:right;">
<?php $basicWorked = $workedSalary * 70 / 100; <?php $basicWorked = $workedSalary * 70 / 100;
echo number_format($basicWorked, 2, '.', ''); ?> echo number_format($basicWorked, 2, '.', ''); ?>
</td> </td>
<td style="max-width:80px">
<td style="max-width:80px;text-align:right;">
<?php $hraWorked = $workedSalary * 30 / 100; <?php $hraWorked = $workedSalary * 30 / 100;
echo number_format($hraWorked, 2, '.', ''); ?> echo number_format($hraWorked, 2, '.', ''); ?>
</td> </td>
<td style="max-width:80px">
<?php echo number_format($basicWorked + $hraWorked, 2, '.', ''); ?></td>
<td id="esiAmt<?php echo $index ?>" style="max-width:80px"> <?php echo $esi[$i]; ?> </td>
<td id="pfAmt<?php echo $index ?>" style="max-width:80px"> <?php echo $pf[$i]; ?> </td>
<td style="max-width:80px"> <?php echo $over_time[$i]; ?> </td>
<td style="max-width:80px;text-align:right;">
<?php echo number_format($basicWorked + $hraWorked, 2, '.', ''); ?>
</td>
<td id="esiAmt<?php echo $index ?>" style="max-width:80px;text-align:right;"> <?php echo $esi[$i]; ?> </td>
<td id="pfAmt<?php echo $index ?>" style="max-width:80px;text-align:right;"> <?php echo $pf[$i]; ?> </td>
<td style="max-width:80px;text-align:right;"> <?php echo $over_time[$i]; ?> </td>
<!-- <td id="monthDue<?php echo $index ?>" onkeypress="return isNumber(event);" onkeyup="changeInput(event);"
<?php if (empty($record->Key)) {
echo "contenteditable='false';";
} ?>
<?php if (!empty($record->Key)) { ?> title="Payslip Calculated"
style="text-align:right;color:blue;"
<?php } else { ?>style="text-align:right;" <?php } ?>>
<?php if (!empty($record->Monthly_Due)) {
echo $record->Monthly_Due;
$totalmonthloan[] = $record->Monthly_Due;
} else {
echo number_format(0.00, 2, '.', '');
} ?>
</td> -->
<td id="monthDue<?php echo $index ?>" onkeypress="return isNumber(event);" onkeyup="changeInput(event);" <td id="monthDue<?php echo $index ?>" onkeypress="return isNumber(event);" onkeyup="changeInput(event);"
<?php if (empty($record->Key)) { <?php if (empty($record->Key)) { echo "contenteditable='true';"; } ?>
echo "contenteditable='true';";
} ?>
<?php if (!empty($record->Key)) { ?> title="Payslip Calculated" <?php if (!empty($record->Key)) { ?> title="Payslip Calculated"
style="text-align:right;color:blue;" style="text-align:right;color:blue;"
<?php } else { ?>style="text-align:right;" <?php } ?>> <?php } else { ?>style="text-align:right;" <?php } ?>>
@ -368,7 +353,6 @@
</td> </td>
<td id="otherDet<?php echo $index ?>" onkeypress="return isNumber(event);" onkeyup="changeInput(event);" <td id="otherDet<?php echo $index ?>" onkeypress="return isNumber(event);" onkeyup="changeInput(event);"
<?php if (empty($record->Key)) { <?php if (empty($record->Key)) {
echo "contenteditable='true';"; echo "contenteditable='true';";
@ -410,7 +394,7 @@
echo "contenteditable='false';"; echo "contenteditable='false';";
} ?> } ?>
<?php if (!empty($record->Key)) { ?> title="Payslip Calculated" <?php if (!empty($record->Key)) { ?> title="Payslip Calculated"
style="text-align:right;color:blue;" <?php } ?>> style="text-align:right;color:blue;" <?php }else{ ?>style="text-align:right;" <?php } ?>>
<?php if (!empty($record->Estimate)) { <?php if (!empty($record->Estimate)) {
echo $record->Estimate; echo $record->Estimate;
$estTotal[] = $record->Estimate; $estTotal[] = $record->Estimate;
@ -478,20 +462,19 @@
<tfoot> <tfoot>
<tr> <tr>
<th colspan="20"></th> <th colspan="20"></th>
<th>Total</th> <th>Total</th>
<th id="monthloan" style="text-align:right;">
<th id="monthloan">
<?php echo isset($totalmonthloan) ? array_sum($totalmonthloan) : ''; ?> <?php echo isset($totalmonthloan) ? array_sum($totalmonthloan) : ''; ?>
</th> </th>
<th id="other" style="text-align:right;">
<th id="other"> <?php echo isset($totalotherDet) ? array_sum($totalotherDet) : ''; ?>
<?php echo isset($totalotherDet) ? array_sum($totalotherDet) : ''; ?></th> </th>
<th id="fest"> <th id="fest" style="text-align:right;">
<?php echo isset($totalfestival) ? array_sum($totalfestival) : ''; ?></th> <?php echo isset($totalfestival) ? array_sum($totalfestival) : ''; ?>
<th id="estsal"><?php echo isset($estTotal) ? array_sum($estTotal) : ''; ?></th> </th>
<th id="estsal" style="text-align:right;">
<?php echo isset($estTotal) ? array_sum($estTotal) : ''; ?>
</th>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
@ -530,21 +513,21 @@
var totalmonthloan = []; var totalmonthloan = [];
$(function() { // $(function() {
var i = 0; // var i = 0;
$('tr.lastvalue').each(function() { // $('tr.lastvalue').each(function() {
i = i + 1; // i = i + 1;
estTotal[i] = $(this).find('td').eq(11).text(); // estTotal[i] = $(this).find('td').eq(11).text();
}); // });
var i = 0; // var i = 0;
$('tr.lastvalue').each(function() { // $('tr.lastvalue').each(function() {
i = i + 1; // i = i + 1;
totalotherDet[i] = $(this).find('td').eq(9).text(); // totalotherDet[i] = $(this).find('td').eq(9).text();
}); // });
@ -553,29 +536,29 @@
var i = 0; // var i = 0;
$('tr.lastvalue').each(function() { // $('tr.lastvalue').each(function() {
i = i + 1; // i = i + 1;
totalmonthloan[i] = $(this).find('td').eq(7).text(); // totalmonthloan[i] = $(this).find('td').eq(7).text();
}); // });
t.on('order.dt search.dt', function() { // t.on('order.dt search.dt', function() {
t.column(0, { // t.column(0, {
search: 'applied', // search: 'applied',
order: 'applied' // order: 'applied'
}).nodes().each(function(cell, i) { // }).nodes().each(function(cell, i) {
cell.innerHTML = i + 1; // cell.innerHTML = i + 1;
}); // });
}).draw(); // }).draw();
var s = "<?php echo $drop; ?>"; // var s = "<?php echo $drop; ?>";
$('#monthyear').val(s); // $('#monthyear').val(s);
savebuttonvalidation(); // savebuttonvalidation();
}); // });
function isNumber(evt) { function isNumber(evt) {
@ -606,7 +589,7 @@
alldata = JSON.stringify(alldata) alldata = JSON.stringify(alldata)
// Parse the JSON string back into an array of objects // Parse the JSON string back into an array of objects
alldata = JSON.parse(alldata); alldata = JSON.parse(alldata);
console.log(alldata);
// Filter out objects where "Emp ID" is empty // Filter out objects where "Emp ID" is empty
alldata = alldata.filter(function(item) { alldata = alldata.filter(function(item) {
return item["Emp ID"].trim() !== ""; return item["Emp ID"].trim() !== "";
@ -626,14 +609,10 @@ console.log(alldata);
type: "POST", type: "POST",
url: "<?php echo base_url() ?>payslip/saveMonthlyData", url: "<?php echo base_url() ?>payslip/saveMonthlyData",
success: function(data) { success: function(data) {
console.log(data);
if (data) { if (data) {
$('#loader').hide(); $('#loader').hide();
alert(data); alert(data);
//console.log(data);
} }
@ -703,14 +682,8 @@ console.log(alldata);
var grandtotal = []; var grandtotal = [];
function changeInput(event, k) { function changeInput(event, k) {
var str = event.target.id; var str = event.target.id;
var sno = str.substr(8); var sno = str.substr(8);
var dayWorks = parseFloat(document.getElementById('dayWork' + sno).textContent); var dayWorks = parseFloat(document.getElementById('dayWork' + sno).textContent);
var lopDay = parseFloat(document.getElementById('lopDay' + sno).textContent); var lopDay = parseFloat(document.getElementById('lopDay' + sno).textContent);
var paidLeave = parseFloat(document.getElementById('paidLeave' + sno).textContent); var paidLeave = parseFloat(document.getElementById('paidLeave' + sno).textContent);
@ -766,18 +739,18 @@ console.log(alldata);
var dayWorkPaid = dayWorks + paidLeave; var dayWorkPaid = dayWorks + paidLeave;
} }
console.log("day" + dayWorkPaid);
var NoofDays = dayWorks + paidLeave + lopDay; var NoofDays = dayWorks + paidLeave + lopDay;
console.log("monthday" + NoofDays);
var Food_Allowances = fAllow * dayWorks; var Food_Allowances = fAllow * dayWorks;
// console.log("workedFA"+Food_Allowances);
var daySalary = bpay / NoofDays; var daySalary = bpay / NoofDays;
console.log("1daysalary " + daySalary);
var dayHra = hraAmt / NoofDays; var dayHra = hraAmt / NoofDays;
console.log("1dayHRA" + dayHra);
var onehoursSalary = (daySalary + dayHra) / 8; var onehoursSalary = (daySalary + dayHra) / 8;
console.log("onehours " + onehoursSalary);
var totSalayOT = 0; var totSalayOT = 0;
@ -786,21 +759,23 @@ console.log(alldata);
} else { } else {
totSalayOT = 0; totSalayOT = 0;
} }
console.log(totSalayOT);
var currentDaySalary = daySalary * dayWorkPaid; var currentDaySalary = daySalary * dayWorkPaid;
console.log("11days salary" + currentDaySalary);
var currentDayHra = dayHra * dayWorkPaid; var currentDayHra = dayHra * dayWorkPaid;
console.log("11days hra" + currentDayHra);
var current_loan_amt = 0; var current_loan_amt = 0;
var autoLoan = parseFloat(monthDue); var autoLoan = parseFloat(monthDue);
var Balance_Amount = loanamt - paidamt; var Balance_Amount = loanamt - paidamt;
if (autoLoan > Balance_Amount) { if (autoLoan > Balance_Amount) {
if (duedate <= finalpaydate) { if (duedate <= finalpaydate) {
current_loan_amt = Balance_Amount; current_loan_amt = Balance_Amount;
@ -813,14 +788,14 @@ console.log(alldata);
if (parseFloat(Festival) == parseFloat(Festival)) { if (parseFloat(Festival) == parseFloat(Festival)) {
var Festivals = parseFloat(Festival); var Festivals = parseFloat(Festival);
//console.log("Festivals"+Festivals);
} }
if (parseFloat(otherDet) == parseFloat(otherDet)) { if (parseFloat(otherDet) == parseFloat(otherDet)) {
var otherDets = parseFloat(otherDet); var otherDets = parseFloat(otherDet);
//console.log("otherDets"+ otherDets);
} }
@ -845,12 +820,9 @@ console.log(alldata);
var empSalaryAdd = currentDaySalary + totSalayOT + currentDayHra + Festivals; var empSalaryAdd = currentDaySalary + totSalayOT + currentDayHra + Festivals;
console.log("empSalaryAdd " + empSalaryAdd);
var empSalarySub = current_loan_amt + esiAmount + pfAmount + otherDets; var empSalarySub = current_loan_amt + esiAmount + pfAmount + otherDets;
console.log("current_loan_amt " + current_loan_amt);
console.log("esiAmount " + esiAmount);
console.log("pfAmount " + pfAmount);
console.log("otherDets " + otherDets);
var empMonthSalary = empSalaryAdd - empSalarySub var empMonthSalary = empSalaryAdd - empSalarySub
@ -864,19 +836,16 @@ console.log(alldata);
document.getElementById("empsal" + sno).innerHTML = cals; document.getElementById("empsal" + sno).innerHTML = cals;
$.each(estTotal, function(i, value) { // $.each(estTotal, function(i, value) {
if (sno == i) { // if (sno == i) {
estTotal[i] = cals; // estTotal[i] = cals;
} // }
}); // });
// $.each(totalotherDet, function(i, value) {
// if (sno == i) {
$.each(totalotherDet, function(i, value) { // totalotherDet[i] = otherDet;
if (sno == i) { // }
totalotherDet[i] = otherDet; // });
}
});
// $.each(totalmonthloan, function(i, value) { // $.each(totalmonthloan, function(i, value) {
// if (sno == i) { // if (sno == i) {
// totalmonthloan[i] = loanRecd; // totalmonthloan[i] = loanRecd;
@ -887,85 +856,47 @@ console.log(alldata);
calculategrandtotal(); calculategrandtotal();
} }
var tempTotal = [];
function calculategrandtotal() { function calculategrandtotal()
{
var AutoLoanDueIndex = 21;
var AutoLoanDue = 0;
var sum = 0; $('#monthlylistings tbody tr').each(function() {
var value = $(this).find('td').eq(AutoLoanDueIndex).text();
for (var i = 0; i < tempTotal.length; i++) { AutoLoanDue += parseFloat(value) || 0;
sum += tempTotal[i] << 0;
}
$('#inst').text(parseFloat(sum).toFixed(2));
$.each(totalotherDet, function(index, value) {
//var res2 = value.split('-');
tempTotal[index] = parseFloat(value);
}); });
$('#monthloan').text(AutoLoanDue);
var sum = 0; var TDSDeductionsIndex = 22;
var TDSDeductions = 0;
for (var i = 0; i < tempTotal.length; i++) { $('#monthlylistings tbody tr').each(function() {
sum += tempTotal[i] << 0; var value = $(this).find('td').eq(TDSDeductionsIndex).text();
} TDSDeductions += parseFloat(value) || 0;
$('#other').text(parseFloat(sum).toFixed(2));
$.each(totalfestival, function(index, value) {
//var res2 = value.split('-');
tempTotal[index] = parseFloat(value);
}); });
$('#other').text(TDSDeductions);
var sum = 0; var FestivalBonusIndex = 23;
var FestivalBonus = 0;
for (var i = 0; i < tempTotal.length; i++) { $('#monthlylistings tbody tr').each(function() {
sum += tempTotal[i] << 0; var value = $(this).find('td').eq(FestivalBonusIndex).text();
} FestivalBonus += parseFloat(value) || 0;
$('#fest').text(parseFloat(sum).toFixed(2));
$.each(estTotal, function(index, value) {
//var res2 = value.split('-');
tempTotal[index] = parseFloat(value);
}); });
$('#fest').text(FestivalBonus);
var sum = 0; var EstimateIndex = 24;
var Estimate = 0;
for (var i = 0; i < tempTotal.length; i++) { $('#monthlylistings tbody tr').each(function() {
sum += tempTotal[i] << 0; var value = $(this).find('td').eq(EstimateIndex).text();
} Estimate += parseFloat(value) || 0;
$('#estsal').text(parseFloat(sum).toFixed(2));
$.each(totalmonthloan, function(index, value) {
tempTotal[index] = parseFloat(value);
}); });
$('#estsal').text(Estimate);
var sum = 0;
for (var i = 0; i < tempTotal.length; i++) {
sum += tempTotal[i] << 0;
}
$('#monthloan').text(parseFloat(sum).toFixed(2));
} }
function show_hide_column(col_no, do_show) {
var rows = document.getElementById('monthlylistings').rows;
for (var row = 0; row < rows.length; row++) {
var cols = rows[row].cells;
if (col_no >= 0 && col_no < cols.length) {
cols[col_no].style.display = do_show ? '' : 'none';
}
}
}
</script> </script>