CHANGE_SANJEEV_ISSUE_TRACK_ISSUE_CLEAR_CONFLIT_MERGE
This commit is contained in:
aadhavan valli
commit
511e2e6eea
@ -372,7 +372,9 @@ class Emergencypurchaseorder extends BaseController
|
||||
// redirect('purchaseorder/PurchaseOrderList', 'refresh');
|
||||
// }
|
||||
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);
|
||||
|
||||
} else {
|
||||
$this->session->setFlashdata('success', 'You Have Successfully Created the Purchase order! '.$PONO);
|
||||
}
|
||||
|
||||
@ -67,7 +67,7 @@ class Payslip extends BaseController
|
||||
|
||||
$PayOn = $this->request->getPost('payon');
|
||||
$EmpId = $this->request->getPost('employee');
|
||||
|
||||
|
||||
$res = $this->payroll_model->getMonthlyPayDetails($EmpId, $PayOn);
|
||||
|
||||
$result = $res[0];
|
||||
@ -83,10 +83,13 @@ class Payslip extends BaseController
|
||||
{
|
||||
$loan_id = $result->Loan_ID;
|
||||
|
||||
if($result->Remaining_Due - 1 == 0){ $is_Active = 0; }else{ $is_Active = 1; }
|
||||
|
||||
$loan = [
|
||||
'Paid_Due' => $result->Paid_Due + 1,
|
||||
'Remaining_Due' => $result->Remaining_Due - 1,
|
||||
'Paid_Amount' => $result->Paid_Amount + $result->Loan_Recovered,
|
||||
'is_Active' => $is_Active
|
||||
];
|
||||
|
||||
$loanHistory = [
|
||||
@ -130,11 +133,16 @@ class Payslip extends BaseController
|
||||
'ESINumber' => $result->ESINO,
|
||||
'UANNO' => $result->PFNO,
|
||||
];
|
||||
|
||||
|
||||
// print_r($result);
|
||||
// print_r($loan);
|
||||
// print_r($loanHistory);
|
||||
// print_r($data);
|
||||
// die;
|
||||
|
||||
|
||||
|
||||
$insert = $this->payroll_model->insertPayroll($data);
|
||||
if($insert){
|
||||
if(count($loan)){
|
||||
@ -703,7 +711,7 @@ class Payslip extends BaseController
|
||||
$data['pf'] = $pf;
|
||||
$data['over_time'] = $ot;
|
||||
|
||||
// dd($data);
|
||||
|
||||
$this->global['pageTitle'] = 'Payroll Monthly Inputs';
|
||||
$this->loadViews("monthlypayinputs", $this->global, $data, NULL);
|
||||
}
|
||||
|
||||
@ -3259,13 +3259,21 @@ if (!empty($getlogpodtl)) {
|
||||
tinyMCE.get('EdittxtSpcialInstruction').setContent($('#ItemDescription' + userid).val());
|
||||
RequistQuantity = $('#quantity' + userid).val();
|
||||
|
||||
|
||||
|
||||
|
||||
$("#EditMaterialCode").empty();
|
||||
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
|
||||
// For Binding Material list center for the selected Requistion Number
|
||||
$("#EditMaterialCode").append($('<option></option>')
|
||||
.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";
|
||||
for (i = 0; i < Material.length; i++) {
|
||||
@ -3302,6 +3310,11 @@ if (!empty($getlogpodtl)) {
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
$("#VIEWSERVICE").on("shown.bs.modal", function(e) {
|
||||
|
||||
userid = $(e.relatedTarget).data('userid');
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -246,17 +246,30 @@ if (!empty($emppay)) {
|
||||
<div class="form-group">
|
||||
<div class="form-group">
|
||||
<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 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>
|
||||
<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; ?>">
|
||||
<!-- <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 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">
|
||||
</div>
|
||||
</div>
|
||||
@ -308,27 +321,7 @@ if (!empty($emppay)) {
|
||||
</div> <!-- content -->
|
||||
|
||||
<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 {
|
||||
document.getElementById('no_of_due').value = Math.ceil(totaldue);
|
||||
var noofdues = document.getElementById('no_of_due').value;
|
||||
$('#remaining_due').val(noofdues);
|
||||
$('#Paid_Amount').val("0.00");
|
||||
$('#paid_due').val(0);
|
||||
$('#remaining_due').val(noofdues - $('#paid_due').val());
|
||||
// $('#Paid_Amount').val("0.00");
|
||||
// $('#paid_due').val(0);
|
||||
}
|
||||
|
||||
}
|
||||
} //else if(loan == "" || loan == 0)
|
||||
//alert(totaldue);
|
||||
}
|
||||
|
||||
dateCalulation();
|
||||
|
||||
@ -366,7 +358,7 @@ if (!empty($emppay)) {
|
||||
}
|
||||
|
||||
function dateCalulation() {
|
||||
//alert('j');
|
||||
|
||||
var loanamount = document.getElementById('Loan_Amount').value;
|
||||
if (loanamount == 0.00 || loanamount == "") {
|
||||
$('#loan_issued_date').val("");
|
||||
@ -377,17 +369,12 @@ if (!empty($emppay)) {
|
||||
$('#Loan_Amount').val("0.00");
|
||||
$('#paid_due').val(0);
|
||||
$('#Paid_Amount').val("0.00");
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function finalCheck() {
|
||||
//alert("final check");
|
||||
|
||||
|
||||
|
||||
|
||||
var loanamount = document.getElementById('Loan_Amount').value;
|
||||
if (loanamount != "" && loanamount != 0.00) {
|
||||
var idate = document.getElementById('loan_issued_date').value;
|
||||
@ -413,9 +400,10 @@ if (!empty($emppay)) {
|
||||
echo $emppay[0]->Loan_ID;
|
||||
} ?>";
|
||||
var i = confirm("Do You want to delete " + loanid + " from Loan Master?");
|
||||
// alert(i);s
|
||||
|
||||
if (i) {
|
||||
// $('#content').loader('show');
|
||||
|
||||
$('#loader').show();
|
||||
$.ajax({
|
||||
data: {
|
||||
id: loanid
|
||||
@ -426,7 +414,7 @@ if (!empty($emppay)) {
|
||||
if (result) {
|
||||
|
||||
alert(result);
|
||||
// $('#content').loader('hide');
|
||||
$('#loader').hide();
|
||||
window.location.href = "<?php echo base_url(); ?>emppayListings";
|
||||
|
||||
}
|
||||
|
||||
@ -1,20 +1,16 @@
|
||||
|
||||
<style>
|
||||
.celda_encabezado_general {
|
||||
background-color: #00a65a;
|
||||
border: 1px solid #ccc;
|
||||
color: #ffffff;
|
||||
font-weight: bold;
|
||||
padding: 2px 4px;
|
||||
text-align: center;
|
||||
}
|
||||
</style>
|
||||
<?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) {
|
||||
// if (!empty($s->Key)) {
|
||||
// $show_hide_column_value = false;
|
||||
// } else {
|
||||
// $show_hide_column_value = true;
|
||||
// }
|
||||
// break;
|
||||
// }
|
||||
$sample = $fresh;
|
||||
|
||||
$ex = explode('-', $dropdownvalue);
|
||||
@ -173,42 +169,35 @@
|
||||
|
||||
<div style="overflow-x:scroll;">
|
||||
<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;">
|
||||
<tr>
|
||||
|
||||
<th>S.No</th>
|
||||
<th>Emp ID </th>
|
||||
<th>Employee </th>
|
||||
<th>DOJ</th>
|
||||
<th>Designation</th>
|
||||
<th>Total Days</th>
|
||||
<th>Days Worked</th>
|
||||
<th>LOP Days</th>
|
||||
<th>Paid Leave</th>
|
||||
<th>OT Hrs</th>
|
||||
|
||||
<th>Basic Salary</th>
|
||||
<th>Pre Day Salary</th>
|
||||
<th>Worked Salary</th>
|
||||
<th>Pre hr Salary</th>
|
||||
<th>Earned Salary</th>
|
||||
<th>Basic Salary(0.7)</th>
|
||||
<th>HRA Salary(0.3)</th>
|
||||
<th>Gross Salary</th>
|
||||
<th>ESI</th>
|
||||
<th>PF</th>
|
||||
<th>Over Time</th>
|
||||
|
||||
|
||||
|
||||
<th>Auto Loan Due ₹</th>
|
||||
|
||||
|
||||
<th>TDS Deductions in ₹</th>
|
||||
<th>Festival Bonus in ₹</th>
|
||||
|
||||
<th>Estimate in ₹</th>
|
||||
<th class="celda_encabezado_general">S.No</th>
|
||||
<th class="celda_encabezado_general">Emp ID </th>
|
||||
<th class="celda_encabezado_general">Employee </th>
|
||||
<th class="celda_encabezado_general">DOJ</th>
|
||||
<th class="celda_encabezado_general">Designation</th>
|
||||
<th class="celda_encabezado_general">Total Days</th>
|
||||
<th class="celda_encabezado_general">Days Worked</th>
|
||||
<th class="celda_encabezado_general">LOP Days</th>
|
||||
<th class="celda_encabezado_general">Paid Leave</th>
|
||||
<th class="celda_encabezado_general">OT Hrs</th>
|
||||
<th class="celda_encabezado_general">Total Salary</th>
|
||||
<th class="celda_encabezado_general">Per Day Salary</th>
|
||||
<th class="celda_encabezado_general">Worked Salary</th>
|
||||
<th class="celda_encabezado_general">Per hr Salary</th>
|
||||
<th class="celda_encabezado_general">Earned Salary</th>
|
||||
<th class="celda_encabezado_general">Basic Salary(0.7)</th>
|
||||
<th class="celda_encabezado_general">HRA Salary(0.3)</th>
|
||||
<th class="celda_encabezado_general">Gross Salary</th>
|
||||
<th class="celda_encabezado_general">ESI</th>
|
||||
<th class="celda_encabezado_general">PF</th>
|
||||
<th class="celda_encabezado_general">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>
|
||||
|
||||
|
||||
</tr>
|
||||
@ -231,69 +220,78 @@
|
||||
$index--;
|
||||
} else {
|
||||
array_push($testarray, $record->EmpID);
|
||||
?>
|
||||
?>
|
||||
|
||||
<tr class="lastvalue">
|
||||
<td style="text-align:right;" style="background-color:blue;">
|
||||
<?php echo $index; ?></td>
|
||||
<td style="max-width:80px"><?php echo $record->EmpID; ?></td>
|
||||
<td style="max-width:80px"><?php echo $record->FirstName; ?></td>
|
||||
<td style="max-width:80px">
|
||||
<td <?php if($record->is_management_team == 1){ ?> style="max-width:150px;background-color: #d8d8ea;" <?php }else{ ?> style="max-width:150px;" <?php } ?> >
|
||||
<?php echo $record->FirstName; ?>
|
||||
</td>
|
||||
<td style="max-width: 100px;">
|
||||
<?php
|
||||
echo $record->DateofJoining;
|
||||
// $date = DateTime::createFromFormat('Y-m-d H:i:s', $record->DateofJoining);
|
||||
// $newDateFormat = $date->format('d-m-Y');
|
||||
// echo $newDateFormat;
|
||||
$date = DateTime::createFromFormat('Y-m-d H:i:s', $record->DateofJoining);
|
||||
$newDateFormat = $date->format('d-m-Y');
|
||||
echo $newDateFormat;
|
||||
?>
|
||||
</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 ?>"
|
||||
<?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 } ?>>
|
||||
style="text-align:center;color:blue;"
|
||||
<?php } else { ?>style="text-align:center;" <?php } ?>>
|
||||
<?php if (!empty($record->Days_worked)) {
|
||||
echo $record->Days_worked + $record->sunday_count;
|
||||
} else {
|
||||
echo "0.00";
|
||||
} ?>
|
||||
</td>
|
||||
|
||||
<td id="lopDay<?php echo $index ?>"
|
||||
<?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 } ?>>
|
||||
style="text-align:center;color:blue;"
|
||||
<?php } else { ?>style="text-align:center;" <?php } ?>>
|
||||
<?php if (!empty($record->LOP_Days)) {
|
||||
echo $record->LOP_Days;
|
||||
} else {
|
||||
echo "0.00";
|
||||
} ?>
|
||||
</td>
|
||||
|
||||
<td id="paidLeave<?php echo $index ?>"
|
||||
<?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 } ?>>
|
||||
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, '.', '');
|
||||
} else {
|
||||
echo number_format(0.00, 2, '.', '');
|
||||
} ?>
|
||||
</td>
|
||||
|
||||
<td id="otHrsWork<?php echo $index ?>"
|
||||
<?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 } ?>>
|
||||
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;
|
||||
} else {
|
||||
@ -301,60 +299,47 @@
|
||||
} ?>
|
||||
</td>
|
||||
|
||||
<td style="max-width:80px"><?php echo $record->TotalSalary; ?></td>
|
||||
<td style="max-width:80px">
|
||||
<td style="max-width:80px;text-align:right;"><?php echo $record->TotalSalary; ?></td>
|
||||
|
||||
<td style="max-width:80px;text-align:right;">
|
||||
<?php $perDaySalary = $record->TotalSalary / $record->NoofDays;
|
||||
echo number_format($perDaySalary, 2, '.', ''); ?>
|
||||
</td>
|
||||
<td style="max-width:80px">
|
||||
|
||||
<td style="max-width:80px;text-align:right;">
|
||||
<?php $workedSalary = $perDaySalary * ($record->Days_worked + $record->sunday_count);
|
||||
echo number_format($workedSalary, 2, '.', ''); ?>
|
||||
</td>
|
||||
<td style="max-width:80px">
|
||||
|
||||
<td style="max-width:80px;text-align:right;">
|
||||
<?php $perHrSalary = $perDaySalary / 8;
|
||||
echo number_format($perHrSalary, 2); ?>
|
||||
</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;
|
||||
echo number_format($basicWorked, 2, '.', ''); ?>
|
||||
</td>
|
||||
<td style="max-width:80px">
|
||||
|
||||
<td style="max-width:80px;text-align:right;">
|
||||
<?php $hraWorked = $workedSalary * 30 / 100;
|
||||
echo number_format($hraWorked, 2, '.', ''); ?>
|
||||
</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 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 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='true';";
|
||||
} ?>
|
||||
<?php if (empty($record->Key)) { echo "contenteditable='true';"; } ?>
|
||||
<?php if (!empty($record->Key)) { ?> title="Payslip Calculated"
|
||||
style="text-align:right;color:blue;"
|
||||
<?php } else { ?>style="text-align:right;" <?php } ?>>
|
||||
@ -368,7 +353,6 @@
|
||||
</td>
|
||||
|
||||
|
||||
|
||||
<td id="otherDet<?php echo $index ?>" onkeypress="return isNumber(event);" onkeyup="changeInput(event);"
|
||||
<?php if (empty($record->Key)) {
|
||||
echo "contenteditable='true';";
|
||||
@ -410,7 +394,7 @@
|
||||
echo "contenteditable='false';";
|
||||
} ?>
|
||||
<?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)) {
|
||||
echo $record->Estimate;
|
||||
$estTotal[] = $record->Estimate;
|
||||
@ -478,20 +462,19 @@
|
||||
<tfoot>
|
||||
<tr>
|
||||
<th colspan="20"></th>
|
||||
|
||||
|
||||
<th>Total</th>
|
||||
|
||||
<th id="monthloan">
|
||||
<th id="monthloan" style="text-align:right;">
|
||||
<?php echo isset($totalmonthloan) ? array_sum($totalmonthloan) : ''; ?>
|
||||
</th>
|
||||
|
||||
<th id="other">
|
||||
<?php echo isset($totalotherDet) ? array_sum($totalotherDet) : ''; ?></th>
|
||||
<th id="fest">
|
||||
<?php echo isset($totalfestival) ? array_sum($totalfestival) : ''; ?></th>
|
||||
<th id="estsal"><?php echo isset($estTotal) ? array_sum($estTotal) : ''; ?></th>
|
||||
|
||||
<th id="other" style="text-align:right;">
|
||||
<?php echo isset($totalotherDet) ? array_sum($totalotherDet) : ''; ?>
|
||||
</th>
|
||||
<th id="fest" style="text-align:right;">
|
||||
<?php echo isset($totalfestival) ? array_sum($totalfestival) : ''; ?>
|
||||
</th>
|
||||
<th id="estsal" style="text-align:right;">
|
||||
<?php echo isset($estTotal) ? array_sum($estTotal) : ''; ?>
|
||||
</th>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
@ -530,21 +513,21 @@
|
||||
var totalmonthloan = [];
|
||||
|
||||
|
||||
$(function() {
|
||||
var i = 0;
|
||||
$('tr.lastvalue').each(function() {
|
||||
i = i + 1;
|
||||
estTotal[i] = $(this).find('td').eq(11).text();
|
||||
});
|
||||
// $(function() {
|
||||
// var i = 0;
|
||||
// $('tr.lastvalue').each(function() {
|
||||
// i = i + 1;
|
||||
// estTotal[i] = $(this).find('td').eq(11).text();
|
||||
// });
|
||||
|
||||
|
||||
|
||||
|
||||
var i = 0;
|
||||
$('tr.lastvalue').each(function() {
|
||||
i = i + 1;
|
||||
totalotherDet[i] = $(this).find('td').eq(9).text();
|
||||
});
|
||||
// var i = 0;
|
||||
// $('tr.lastvalue').each(function() {
|
||||
// i = i + 1;
|
||||
// totalotherDet[i] = $(this).find('td').eq(9).text();
|
||||
// });
|
||||
|
||||
|
||||
|
||||
@ -553,29 +536,29 @@
|
||||
|
||||
|
||||
|
||||
var i = 0;
|
||||
$('tr.lastvalue').each(function() {
|
||||
i = i + 1;
|
||||
totalmonthloan[i] = $(this).find('td').eq(7).text();
|
||||
});
|
||||
// var i = 0;
|
||||
// $('tr.lastvalue').each(function() {
|
||||
// i = i + 1;
|
||||
// totalmonthloan[i] = $(this).find('td').eq(7).text();
|
||||
// });
|
||||
|
||||
|
||||
|
||||
t.on('order.dt search.dt', function() {
|
||||
t.column(0, {
|
||||
search: 'applied',
|
||||
order: 'applied'
|
||||
}).nodes().each(function(cell, i) {
|
||||
cell.innerHTML = i + 1;
|
||||
});
|
||||
}).draw();
|
||||
// t.on('order.dt search.dt', function() {
|
||||
// t.column(0, {
|
||||
// search: 'applied',
|
||||
// order: 'applied'
|
||||
// }).nodes().each(function(cell, i) {
|
||||
// cell.innerHTML = i + 1;
|
||||
// });
|
||||
// }).draw();
|
||||
|
||||
var s = "<?php echo $drop; ?>";
|
||||
$('#monthyear').val(s);
|
||||
// var s = "<?php echo $drop; ?>";
|
||||
// $('#monthyear').val(s);
|
||||
|
||||
savebuttonvalidation();
|
||||
// savebuttonvalidation();
|
||||
|
||||
});
|
||||
// });
|
||||
|
||||
function isNumber(evt) {
|
||||
|
||||
@ -606,7 +589,7 @@
|
||||
alldata = JSON.stringify(alldata)
|
||||
// Parse the JSON string back into an array of objects
|
||||
alldata = JSON.parse(alldata);
|
||||
console.log(alldata);
|
||||
|
||||
// Filter out objects where "Emp ID" is empty
|
||||
alldata = alldata.filter(function(item) {
|
||||
return item["Emp ID"].trim() !== "";
|
||||
@ -626,15 +609,11 @@ console.log(alldata);
|
||||
type: "POST",
|
||||
url: "<?php echo base_url() ?>payslip/saveMonthlyData",
|
||||
success: function(data) {
|
||||
console.log(data);
|
||||
|
||||
|
||||
if (data) {
|
||||
|
||||
$('#loader').hide();
|
||||
alert(data);
|
||||
//console.log(data);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -703,14 +682,8 @@ console.log(alldata);
|
||||
var grandtotal = [];
|
||||
|
||||
function changeInput(event, k) {
|
||||
|
||||
|
||||
|
||||
|
||||
var str = event.target.id;
|
||||
var sno = str.substr(8);
|
||||
|
||||
|
||||
var dayWorks = parseFloat(document.getElementById('dayWork' + sno).textContent);
|
||||
var lopDay = parseFloat(document.getElementById('lopDay' + sno).textContent);
|
||||
var paidLeave = parseFloat(document.getElementById('paidLeave' + sno).textContent);
|
||||
@ -766,18 +739,18 @@ console.log(alldata);
|
||||
var dayWorkPaid = dayWorks + paidLeave;
|
||||
}
|
||||
|
||||
console.log("day" + dayWorkPaid);
|
||||
|
||||
var NoofDays = dayWorks + paidLeave + lopDay;
|
||||
console.log("monthday" + NoofDays);
|
||||
|
||||
var Food_Allowances = fAllow * dayWorks;
|
||||
// console.log("workedFA"+Food_Allowances);
|
||||
|
||||
|
||||
var daySalary = bpay / NoofDays;
|
||||
console.log("1daysalary " + daySalary);
|
||||
|
||||
var dayHra = hraAmt / NoofDays;
|
||||
console.log("1dayHRA" + dayHra);
|
||||
|
||||
var onehoursSalary = (daySalary + dayHra) / 8;
|
||||
console.log("onehours " + onehoursSalary);
|
||||
|
||||
|
||||
|
||||
var totSalayOT = 0;
|
||||
@ -786,21 +759,23 @@ console.log(alldata);
|
||||
} else {
|
||||
totSalayOT = 0;
|
||||
}
|
||||
console.log(totSalayOT);
|
||||
|
||||
|
||||
|
||||
|
||||
var currentDaySalary = daySalary * dayWorkPaid;
|
||||
console.log("11days salary" + currentDaySalary);
|
||||
|
||||
|
||||
var currentDayHra = dayHra * dayWorkPaid;
|
||||
console.log("11days hra" + currentDayHra);
|
||||
|
||||
|
||||
|
||||
|
||||
var current_loan_amt = 0;
|
||||
var autoLoan = parseFloat(monthDue);
|
||||
|
||||
var Balance_Amount = loanamt - paidamt;
|
||||
|
||||
if (autoLoan > Balance_Amount) {
|
||||
if (duedate <= finalpaydate) {
|
||||
current_loan_amt = Balance_Amount;
|
||||
@ -808,19 +783,19 @@ console.log(alldata);
|
||||
} else {
|
||||
current_loan_amt = autoLoan;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (parseFloat(Festival) == parseFloat(Festival)) {
|
||||
|
||||
var Festivals = parseFloat(Festival);
|
||||
//console.log("Festivals"+Festivals);
|
||||
|
||||
|
||||
}
|
||||
|
||||
if (parseFloat(otherDet) == parseFloat(otherDet)) {
|
||||
|
||||
var otherDets = parseFloat(otherDet);
|
||||
//console.log("otherDets"+ otherDets);
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -845,12 +820,9 @@ console.log(alldata);
|
||||
|
||||
|
||||
var empSalaryAdd = currentDaySalary + totSalayOT + currentDayHra + Festivals;
|
||||
console.log("empSalaryAdd " + empSalaryAdd);
|
||||
|
||||
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
|
||||
@ -864,19 +836,16 @@ console.log(alldata);
|
||||
document.getElementById("empsal" + sno).innerHTML = cals;
|
||||
|
||||
|
||||
$.each(estTotal, function(i, value) {
|
||||
if (sno == i) {
|
||||
estTotal[i] = cals;
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
$.each(totalotherDet, function(i, value) {
|
||||
if (sno == i) {
|
||||
totalotherDet[i] = otherDet;
|
||||
}
|
||||
});
|
||||
|
||||
// $.each(estTotal, function(i, value) {
|
||||
// if (sno == i) {
|
||||
// estTotal[i] = cals;
|
||||
// }
|
||||
// });
|
||||
// $.each(totalotherDet, function(i, value) {
|
||||
// if (sno == i) {
|
||||
// totalotherDet[i] = otherDet;
|
||||
// }
|
||||
// });
|
||||
// $.each(totalmonthloan, function(i, value) {
|
||||
// if (sno == i) {
|
||||
// totalmonthloan[i] = loanRecd;
|
||||
@ -887,85 +856,47 @@ console.log(alldata);
|
||||
calculategrandtotal();
|
||||
|
||||
}
|
||||
var tempTotal = [];
|
||||
|
||||
function calculategrandtotal()
|
||||
{
|
||||
var AutoLoanDueIndex = 21;
|
||||
var AutoLoanDue = 0;
|
||||
$('#monthlylistings tbody tr').each(function() {
|
||||
var value = $(this).find('td').eq(AutoLoanDueIndex).text();
|
||||
AutoLoanDue += parseFloat(value) || 0;
|
||||
});
|
||||
$('#monthloan').text(AutoLoanDue);
|
||||
|
||||
function calculategrandtotal() {
|
||||
|
||||
|
||||
|
||||
var sum = 0;
|
||||
|
||||
for (var i = 0; i < tempTotal.length; i++) {
|
||||
sum += tempTotal[i] << 0;
|
||||
}
|
||||
|
||||
$('#inst').text(parseFloat(sum).toFixed(2));
|
||||
|
||||
$.each(totalotherDet, function(index, value) {
|
||||
//var res2 = value.split('-');
|
||||
tempTotal[index] = parseFloat(value);
|
||||
});
|
||||
|
||||
var sum = 0;
|
||||
|
||||
for (var i = 0; i < tempTotal.length; i++) {
|
||||
sum += tempTotal[i] << 0;
|
||||
}
|
||||
$('#other').text(parseFloat(sum).toFixed(2));
|
||||
|
||||
$.each(totalfestival, function(index, value) {
|
||||
//var res2 = value.split('-');
|
||||
tempTotal[index] = parseFloat(value);
|
||||
});
|
||||
|
||||
var sum = 0;
|
||||
|
||||
for (var i = 0; i < tempTotal.length; i++) {
|
||||
sum += tempTotal[i] << 0;
|
||||
}
|
||||
$('#fest').text(parseFloat(sum).toFixed(2));
|
||||
|
||||
|
||||
|
||||
$.each(estTotal, function(index, value) {
|
||||
//var res2 = value.split('-');
|
||||
tempTotal[index] = parseFloat(value);
|
||||
});
|
||||
|
||||
var sum = 0;
|
||||
|
||||
for (var i = 0; i < tempTotal.length; i++) {
|
||||
sum += tempTotal[i] << 0;
|
||||
}
|
||||
$('#estsal').text(parseFloat(sum).toFixed(2));
|
||||
|
||||
|
||||
|
||||
|
||||
$.each(totalmonthloan, function(index, value) {
|
||||
tempTotal[index] = parseFloat(value);
|
||||
});
|
||||
|
||||
var sum = 0;
|
||||
|
||||
for (var i = 0; i < tempTotal.length; i++) {
|
||||
sum += tempTotal[i] << 0;
|
||||
}
|
||||
$('#monthloan').text(parseFloat(sum).toFixed(2));
|
||||
var TDSDeductionsIndex = 22;
|
||||
var TDSDeductions = 0;
|
||||
$('#monthlylistings tbody tr').each(function() {
|
||||
var value = $(this).find('td').eq(TDSDeductionsIndex).text();
|
||||
TDSDeductions += parseFloat(value) || 0;
|
||||
});
|
||||
$('#other').text(TDSDeductions);
|
||||
|
||||
var FestivalBonusIndex = 23;
|
||||
var FestivalBonus = 0;
|
||||
$('#monthlylistings tbody tr').each(function() {
|
||||
var value = $(this).find('td').eq(FestivalBonusIndex).text();
|
||||
FestivalBonus += parseFloat(value) || 0;
|
||||
});
|
||||
$('#fest').text(FestivalBonus);
|
||||
|
||||
var EstimateIndex = 24;
|
||||
var Estimate = 0;
|
||||
$('#monthlylistings tbody tr').each(function() {
|
||||
var value = $(this).find('td').eq(EstimateIndex).text();
|
||||
Estimate += parseFloat(value) || 0;
|
||||
});
|
||||
$('#estsal').text(Estimate);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
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>
|
||||
Loading…
Reference in New Issue
Block a user