GWM : merge loan module

This commit is contained in:
bitbucket 2024-08-20 16:41:38 +05:30
parent f257210241
commit 7f4461ae98
8 changed files with 247 additions and 632 deletions

View File

@ -56,13 +56,9 @@ class Emppaydate extends BaseController
*/ */
function emppayListing() function emppayListing()
{ {
$data['userRecords'] = $this->emppaydate_model->emppayListing(); $data['userRecords'] = $this->emppaydate_model->emppayListing();
// dd($data['userRecords']);
$this->global['pageTitle'] = 'Employee Pay List'; $this->global['pageTitle'] = 'Employee Pay List';
$this->loadViews("emppayListing", $this->global, $data, NULL); $this->loadViews("emppayListing", $this->global, $data, NULL);
} }
@ -71,12 +67,8 @@ class Emppaydate extends BaseController
*/ */
function addemppaydate() function addemppaydate()
{ {
$q = "addemppaydate";
$result['empdetails'] = $this->payroll_model->getEmpID();
$result['empdetails'] = $this->payroll_model->getEmpID($q);
$this->global['pageTitle'] = 'Add Employee Pay'; $this->global['pageTitle'] = 'Add Employee Pay';
@ -90,69 +82,27 @@ class Emppaydate extends BaseController
helper('form'); //$this->load->library('form_validation'); helper('form'); //$this->load->library('form_validation');
$EmpID = $this->request->getPost('EmpID'); $EmpID = $this->request->getPost('EmpID');
// $this->validator->setRules([
// 'ContactNumber'=> 'trim|required|min_length[10]|max_length[10]',
// 'EmpID'=> 'trim|required',
// 'HRA_Rate'=> 'trim|required',
// 'HRA_Amount'=> 'trim|required',
// 'Basic_Pay'=> 'trim|required',
// 'Total_salary'=> 'trim|required',
// 'Allowances'=> 'trim|required',
// 'PF_Rate'=> 'trim|required',
// 'ESI_Rate'=> 'trim|required',
// 'Food_Allowances'=> 'trim|required',
// 'Incentives'=> 'trim|required']);
// if ($this->validator->run() == FALSE || $EmpID == -1) {
// $this->addemppaydate();
// } else {
$EmpID = $this->request->getPost('EmpID'); $EmpID = $this->request->getPost('EmpID');
$Total_Salary = $this->request->getPost('Total_salary');
$Basic_Pay = $this->request->getPost('Basic_Pay');
$HRA_Rate = $this->request->getPost('HRA_Rate');
$HRA_Amount = $this->request->getPost('HRA_Amount');
$Allowances = $this->request->getPost('Allowances');
$PF_Rate = $this->request->getPost('PF_Rate');
$ESI_Rate = $this->request->getPost('ESI_Rate');
$Food_Allowances = $this->request->getPost('Food_Allowances');
$Incentives = $this->request->getPost('Incentives');
$Loan_Amount = $this->request->getPost('Loan_Amount'); $Loan_Amount = $this->request->getPost('Loan_Amount');
$Load_Issued_date = $this->request->getPost('loan_issued_date'); $Load_Issued_date = $this->request->getPost('loan_issued_date');
if (!empty($Load_Issued_date)) { if (!empty($Load_Issued_date)) { $Load_Issued_date = format_date($Load_Issued_date); } else { $Load_Issued_date = null; }
$Load_Issued_date = $Load_Issued_date = format_date($Load_Issued_date);
} else {
$Load_Issued_date = null;
}
$Due_Amount = $this->request->getPost('monthly_due'); $Due_Amount = $this->request->getPost('monthly_due');
$Due_Started = $this->request->getPost('due_started'); $Due_Started = $this->request->getPost('due_started');
if (!empty($Due_Started)) { if (!empty($Due_Started)) {$Due_Started = format_date($Due_Started);} else { $Due_Started = null; }
$Due_Started = $Due_Started = format_date($Due_Started);
} else {
$Due_Started = null;
}
$No_Of_Dues = $this->request->getPost('no_of_due'); $No_Of_Dues = $this->request->getPost('no_of_due');
$Paid_due = $this->request->getPost('paid_due'); $Paid_due = $this->request->getPost('paid_due');
$Remaining_Due = $this->request->getPost('remaining_due'); $Remaining_Due = $this->request->getPost('remaining_due');
$Paid_Amount = $this->request->getPost('Paid_Amount'); $Paid_Amount = $this->request->getPost('Paid_Amount');
$CreateBy = $this->session->get('userId'); $CreateBy = $this->session->get('userId');
$chked = $this->request->getPost('is_Active');
$IsActive = '1';
$emppay = array('EmpID' => $EmpID, 'TotalSalary' => $Total_Salary, 'Basic_Pay' => $Basic_Pay, 'HRA_Rate' => $HRA_Rate, 'HRA_Amount' => $HRA_Amount, 'Allowances' => $Allowances, 'PF_Rate' => $PF_Rate, 'ESI_Rate' => $ESI_Rate, 'Food_Allowances' => $Food_Allowances, 'Incentives' => $Incentives, 'Created_By' => $CreateBy);
$loandetails = array('EmpID' => $EmpID, 'Loan_Amount' => $Loan_Amount, 'Loan_Issued_Date' => $Load_Issued_date, 'Monthly_Due' => $Due_Amount, 'Due_Start_Date' => $Due_Started, 'No_of_Dues' => $No_Of_Dues, 'Paid_Due' => $Paid_due, 'Remaining_Due' => $Remaining_Due, 'Paid_Amount' => $Paid_Amount, 'is_Active' => 1, 'Created_By' => $CreateBy); $loandetails = array('EmpID' => $EmpID, 'Loan_Amount' => $Loan_Amount, 'Loan_Issued_Date' => $Load_Issued_date, 'Monthly_Due' => $Due_Amount, 'Due_Start_Date' => $Due_Started, 'No_of_Dues' => $No_Of_Dues, 'Paid_Due' => $Paid_due, 'Remaining_Due' => $Remaining_Due, 'Paid_Amount' => $Paid_Amount, 'is_Active' => 1, 'Created_By' => $CreateBy);
$result = $this->emppaydate_model->addNewemppay($emppay);
if ($Loan_Amount != 0) { if ($Loan_Amount != 0) {
$result2 = $this->emppaydate_model->addLoanInfo($loandetails, 'add'); $result2 = $this->emppaydate_model->addLoanInfo($loandetails, 'add');
if ($result2 > 0) { if ($result2 > 0) {
@ -161,17 +111,8 @@ class Emppaydate extends BaseController
echo "<script>alert('Something Went Wrong..! Loan Information Not Saved. Try later..!');</script>"; echo "<script>alert('Something Went Wrong..! Loan Information Not Saved. Try later..!');</script>";
} }
} }
if ($result > 0) {
echo "<script type='text/javascript'>alert('Employee Pay List Created successfully!');
window.location = '".base_url()."emppayListings';</script>";
} else {
echo "<script type='text/javascript'>alert('Employee Pay List Not Created!');
window.location = '".base_url()."emppayListings';</script>";
}
//}
// }
} }
/** /**
@ -197,72 +138,26 @@ class Emppaydate extends BaseController
{ {
helper('form'); //$this->load->library('form_validation');
$Pay_Data_ID = $this->request->getPost('Pay_Data_ID');
//'Pay_Data_ID'=>'trim|required';
// $this->validator->setRules([
// 'EmpID'=> 'trim|required',
// 'Total_Salary'=> 'trim|required',
// 'Basic_Pay'=> 'trim|required',
// 'HRA_Rate'=> 'trim|required',
// 'Allowances'=> 'trim|required',
// 'PF_Rate'=> 'trim|required',
// 'ESI_Rate'=> 'trim|required',
// 'Food_Allowances'=> 'trim|required',
// 'Incentives'=> 'trim|required']);
// if ($this->validator->run() == FALSE) {
// $this->editOldemppay($Pay_Data_ID);
// } else {
$Pay_Data_ID = $this->request->getPost('Pay_Data_ID');
$EmpID = $this->request->getPost('EmpID'); $EmpID = $this->request->getPost('EmpID');
$TotalSalary = $this->request->getPost('Total_Salary');
$Basic_Pay = $this->request->getPost('Basic_Pay');
$HRA_Rate = $this->request->getPost('HRA_Rate');
$HRA_Amount = $this->request->getPost('HRA_Amount');
$Allowances = $this->request->getPost('Allowances');
$PF_Rate = $this->request->getPost('PF_Rate');
$ESI_Rate = $this->request->getPost('ESI_Rate');
$loan_ID = $this->request->getPost('loanid'); $loan_ID = $this->request->getPost('loanid');
$Loan_Amount = $this->request->getPost('Loan_Amount'); $Loan_Amount = $this->request->getPost('Loan_Amount');
$Load_Issued_date = $this->request->getPost('loan_issued_date'); $Load_Issued_date = $this->request->getPost('loan_issued_date');
if (!empty($Load_Issued_date)) { if (!empty($Load_Issued_date)) {$Load_Issued_date = format_date($Load_Issued_date);} else { $Load_Issued_date = null; }
$Load_Issued_date = format_date($Load_Issued_date);
} else {
$Load_Issued_date = null;
}
$Due_Amount = $this->request->getPost('monthly_due'); $Due_Amount = $this->request->getPost('monthly_due');
$Due_Started = $this->request->getPost('due_started'); $Due_Started = $this->request->getPost('due_started');
if (!empty($Due_Started)) { if (!empty($Due_Started)) {$Due_Started = format_date($Due_Started); } else { $Due_Started = null; }
$Due_Started = format_date($Due_Started);
} else {
$Due_Started = null;
}
//echo $Load_Issued_date. "-" . $Due_Started;die();
$No_Of_Dues = $this->request->getPost('no_of_due'); $No_Of_Dues = $this->request->getPost('no_of_due');
$Paid_due = $this->request->getPost('paid_due'); $Paid_due = $this->request->getPost('paid_due');
$Remaining_Due = $this->request->getPost('remaining_due'); $Remaining_Due = $this->request->getPost('remaining_due');
$Paid_Amount = $this->request->getPost('Paid_Amount'); $Paid_Amount = $this->request->getPost('Paid_Amount');
$is_Active = $this->request->getPost('is_Active');
$Last_Mod_By = $this->session->get('userId'); $Last_Mod_By = $this->session->get('userId');
$Last_Mod_Time = date('d-m-Y h:i:sa');
$Food_Allowances = $this->request->getPost('Food_Allowances');
$Incentives = $this->request->getPost('Incentives');
$emppay = array('Pay_Data_ID' => $Pay_Data_ID, 'EmpID' => $EmpID, 'TotalSalary' => $TotalSalary, 'Basic_Pay' => $Basic_Pay, 'HRA_Rate' => $HRA_Rate, 'HRA_Amount' => $HRA_Amount, 'Allowances' => $Allowances, 'PF_Rate' => $PF_Rate, 'ESI_Rate' => $ESI_Rate, 'Food_Allowances' => $Food_Allowances, 'Incentives' => $Incentives, 'Last_Mod_By' => $Last_Mod_By);
$loandetails = array('Loan_ID' => $loan_ID, 'EmpID' => $EmpID, 'Loan_Amount' => $Loan_Amount, 'Loan_Issued_Date' => $Load_Issued_date, 'Monthly_Due' => $Due_Amount, 'Due_Start_Date' => $Due_Started, 'No_of_Dues' => $No_Of_Dues, 'Paid_Due' => $Paid_due, 'Remaining_Due' => $Remaining_Due, 'Paid_Amount' => $Paid_Amount, 'is_Active' => 1, 'Last_Mod_By' => $Last_Mod_By); $loandetails = array('Loan_ID' => $loan_ID, 'EmpID' => $EmpID, 'Loan_Amount' => $Loan_Amount, 'Loan_Issued_Date' => $Load_Issued_date, 'Monthly_Due' => $Due_Amount, 'Due_Start_Date' => $Due_Started, 'No_of_Dues' => $No_Of_Dues, 'Paid_Due' => $Paid_due, 'Remaining_Due' => $Remaining_Due, 'Paid_Amount' => $Paid_Amount, 'is_Active' => 1, 'Last_Mod_By' => $Last_Mod_By);
@ -284,18 +179,8 @@ class Emppaydate extends BaseController
} }
$result = $this->emppaydate_model->editemppay($emppay);
if ($result == true) {
echo "<script type='text/javascript'>alert('Employee Status Updated Sucessfully..!');
window.location = '".base_url()."emppayListings';</script>";
} else {
echo "<script type='text/javascript'>alert('Update Failed..!';
window.location = '".base_url()."emppayListings';</script>";
}
// redirect('emppaydate/emppayListing');
// }
} }

View File

@ -601,7 +601,6 @@ class Payslip extends BaseController
} }
//$totalSalary = $currentDayBasic + $currentDayHra + $totSalayOT;
if ($value->esi_applicable == 1) { $esiAmount = $currentDayBasic * $ESI_Rate / 100; } else { $esiAmount = 0; } if ($value->esi_applicable == 1) { $esiAmount = $currentDayBasic * $ESI_Rate / 100; } else { $esiAmount = 0; }
@ -633,8 +632,7 @@ class Payslip extends BaseController
$data['pf'] = $pf; $data['pf'] = $pf;
$data['over_time'] = $ot; $data['over_time'] = $ot;
// dd($data);
//echo sizeof($data['fresh'])."-".sizeof($data['empSalary']);die;
$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);
} }

View File

@ -15,9 +15,10 @@ class Emppaydate_model extends Model
*/ */
function emppayListing() function emppayListing()
{ {
$builder = $this->db->table('t_emp_pay_data') $builder = $this->db->table('t_loan_master')
->select('t_emp_pay_data.*,t_employee_details.FirstName,t_employee_details.LastName') ->select('t_loan_master.*,t_emp_pay_data.*,t_employee_details.FirstName')
->join('t_employee_details','t_emp_pay_data.EmpID=t_employee_details.EmpID'); ->join('t_employee_details','t_loan_master.EmpID = t_employee_details.EmpID')
->join('t_emp_pay_data','t_loan_master.EmpID = t_emp_pay_data.EmpID');
$query =$builder->get(); $query =$builder->get();
$result = $query->getResult(); $result = $query->getResult();
return $result; return $result;

View File

@ -373,14 +373,12 @@ class Payroll_model extends Model
$this->db->table('t_payroll')->delete(['PayOn' => $PayOn]); $this->db->table('t_payroll')->delete(['PayOn' => $PayOn]);
} }
function getEmpID($q = '') function getEmpID()
{ {
$builder = $this->db->table('t_employee_details') $builder = $this->db->table('t_employee_details')
->select('EmpID,FirstName,LastName'); ->select('EmpID,FirstName,LastName');
if ($q == "addemppaydate") {
$builder->where('EmpID NOT IN (SELECT EmpID from t_emp_pay_data)', NULL, FALSE);
}
$query = $builder->get(); $query = $builder->get();
return $query->getResult(); return $query->getResult();
} }

View File

@ -1,25 +1,30 @@
<script> <script>
$(document).ready(function(){ $(document).ready(function() {
$("#loan_issued_date").datepicker({ $("#loan_issued_date").datepicker({
minDate : 'now', minDate: 'now',
// maxDate : 'now', // maxDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'dd-mm-yy',
}); changeMonth: true,
changeYear: true,
$("#due_started").datepicker({ yearRange: '-100:+0'
minDate :'now', });
//maxDate : 'now',
dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '-100:+1' $("#due_started").datepicker({
}); minDate: 'now',
//maxDate : 'now',
dateFormat: 'dd-mm-yy',
changeMonth: true,
changeYear: true,
yearRange: '-100:+1'
});
}); });
</script> </script>
<style type="text/css"> <style type="text/css">
.num { .num {
text-align:right; text-align: right;
} }
</style> </style>
@ -27,293 +32,151 @@ $("#due_started").datepicker({
<div class="content-wrapper"> <div class="content-wrapper">
<!-- Content Header (Page header) --> <!-- Content Header (Page header) -->
<section class="content-header"> <section class="content-header">
<center><b><h3 class="box-title">Add Employee Pay</h3></b></center> <center><b>
<h3 class="box-title">Add Employee Pay</h3>
</b></center>
</section> </section>
<section class="content"> <section class="content">
<div style="text-align:right;"> <div style="text-align:right;">
<a href="<?php echo base_url() ?>emppayListings" class="btn btn-success" value="Back"/>Back</a> <a href="<?php echo base_url() ?>emppayListings" class="btn btn-success" value="Back" />Back</a>
</div> </div>
<br> <br>
<div class="row"> <div class="row">
<!-- left column --> <!-- left column -->
<div class="col-md-12"> <div class="col-md-12">
<!-- general form elements --> <!-- general form elements -->
<div class="box box-success"> <div class="box box-success">
<!-- form start --> <!-- form start -->
<form role="form" id="addemppaydate" action="<?php echo base_url() ?>emppaydate/addNewemppay" method="post" name="addform" > <form role="form" id="addemppaydate" action="<?php echo base_url() ?>emppaydate/addNewemppay"
method="post" name="addform">
<div class="box-body"> <div class="box-body">
<div class="col-md-12">
<legend>Pay Details</legend>
</div>
<div class="row">
<!--<div class="col-md-4">
<div class="form-group">
<label for="Pay_Data_ID">Pay Data ID:</label><font color="Red">*</font>
<div class="form-group">
<?php
$data = array('name' => 'Pay_Data_ID','value' => set_value('Pay_Data_ID'), 'class' => 'form-control' ,'style'=>'text-transform:uppercase;');
echo form_input($data);
?>
</div>
</div>
</div>-->
<div class="col-md-12">
<legend>Loan Details</legend>
</div>
<div class="row">
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<span for="EmpID">Employee ID</span><font color="Red">*</font> <span for="EmpID">Employee ID</span>
<font color="Red">*</font>
<div class="form-group"> <div class="form-group">
<?php <?php
$Employee = array("-1"=>'Select Employee'); $Employee = array("-1"=>'Select Employee');
if(!empty($empdetails)){ if(!empty($empdetails)){
foreach($empdetails as $emp){ foreach($empdetails as $emp){
$EmpID=$emp->EmpID; $EmpID=$emp->EmpID;
$Employee+= array($EmpID => $emp->EmpID . "-" . $emp->FirstName . "-" . $emp->LastName); $Employee+= array($EmpID => $emp->EmpID . "-" . $emp->FirstName);
// $Employee = array_merge($Employee,$Employee1);
} }
} }
//$data=array('name'=>'EmpID','value'=>$Employee,'id'=>'EmpID','class' => 'form-control');
$js = array('id'=> 'emp'); $js = array('id'=> 'emp');
echo form_dropdown('EmpID', $Employee,set_value('EmpID'),'class="form-control"',$js); echo form_dropdown('EmpID', $Employee,set_value('EmpID'),'class="form-control"',$js);
//echo form_dropdown($data);
?>
?> </div>
</div>
</div> </div>
</div> </div>
<div class="col-md-3">
<div class="form-group">
<span for="Basic_Pay">Total Salary</span><font color="Red">*</font>
<div class="form-group">
<?php
$data = array('name' => 'Total_salary','id' => 'Total_salary','value' => set_value('Total_salary'),'pattern' => '([0-9]{1,8}([.][0-9]{1,2})?)', 'class' => 'form-control num', 'style'=>'text-transform:uppercase;','title' => 'Enter Valid Total salary Amount,Minimum Four Digit Positive Number','onchange'=>'calculalteHRA();');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<span for="Basic_Pay">Basic Pay</span><font color="Red">*</font>
<div class="form-group">
<?php
$data = array('name' => 'Basic_Pay','id' => 'Basic_Pay','value' => set_value('Basic_Pay'),'pattern' => '[0-9]{4,6}', 'class' => 'form-control num', 'style'=>'text-transform:uppercase;','title' => 'Enter Valid Basic Pay Amount,Minimum Four Digit Positive Number','readonly'=>'readonly');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<span for="HRA_Rate">HRA Rate(%)</span><font color="Red">*</font>
<div class="form-group">
<?php
$data = array('name' => 'HRA_Rate','id'=>'HRA_Rate','value' => set_value('HRA_Rate'), 'class' => 'form-control num','style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)', 'title'=>'Enter the Valid HRA Rate,Minimum 1 digit,Maximum 2 digit','onfocusout'=>'validateHRA();','onchange'=>'calculalteHRA();');
echo form_input($data);
?>
</div>
</div>
</div>
</div><!--row completed div-->
<div class="row">
<div class="col-md-3">
<div class="form-group">
<span for="HRA_Rate">HRA Amount</span><font color="Red">*</font>
<div class="form-group">
<?php
$data = array('name' => 'HRA_Amount','id'=>'HRA_Amount','value' => set_value('HRA_Amount'), 'class' => 'form-control num','style'=>'text-transform:uppercase;','readonly'=>'readonly');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<span for="Allowances">Allowances</span><font color="Red">*</font>
<div class="form-group">
<?php
$data = array('name' => 'Allowances','value' => set_value('Allowances'), 'class' => 'form-control num' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,5}([.][0-9]{1,2})?)','title'=>'Enter the Valid Allowances,Minimum 1 digit , Maximum 5 digit ');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<span for="PF_Rate">PF Rate(%)</span><font color="Red">*</font>
<div class="form-group">
<?php
$data = array('name' => 'PF_Rate','value' => set_value('PF_Rate'),'class' => 'form-control num' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)', 'title'=>'Enter the valid PF Rate,Minimum 1 digit,Maximum 2 digit');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<span for="ESI_Rate">ESI Rate(%)</span><font color="Red">*</font>
<div class="form-group">
<?php
$data = array('name' => 'ESI_Rate','value' => set_value('ESI_Rate'), 'class' => 'form-control num' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,2}([.][0-9]{1,2})?)','title'=>'Enter the Valid ESI Rate,Minimum 1 digit,Maximum 2 digit');
echo form_input($data);
?>
</div>
</div>
</div>
</div><!--row completed div-->
<div class="row">
<!--for food allowances-->
<div class="col-md-3">
<div class="form-group">
<span for="Food_Allowances">Food Allowances(Per Day)</span><font color="Red">*</font>
<div class="form-group">
<?php
$data = array('name' => 'Food_Allowances','value' => set_value('Food_Allowances'), 'class' => 'form-control num','pattern'=>'([0-9]{1,3}([.][0-9]{1,2})?)','onfocusout'=>'validateFood();', 'title'=>'Enter the Valid Food Allowances,Minimun 1 Digit,Maximum 3 Digit');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<span for="Incentives">Incentives</span><font color="Red">*</font>
<div class="form-group">
<?php
$data = array('name' => 'Incentives','value' => set_value('Incentives'), 'class' => 'form-control num' ,'style'=>'text-transform:uppercase;','pattern'=>'([0-9]{1,5}([.][0-9]{1,2})?)','title'=>'Enter the Valid Allowances,Minimum 1 digit , Maximum 5 digit ');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
<!--row completed div-->
<div class="col-md-12">
<legend>Loan Details</legend>
</div>
<div class="row">
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<div class="form-group"> <div class="form-group">
<span for="Pay_Data_ID">Loan Amount</span> <span for="Pay_Data_ID">Loan Amount</span>
<input type="text" class="form-control num" id="Loan_Amount" name="Loan_Amount" value="0.00" pattern="([0-9]{1,7}([.][0-9]{1,2})?)" title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();"> <input type="text" class="form-control num" id="Loan_Amount"
</div> name="Loan_Amount" value="0.00" pattern="([0-9]{1,7}([.][0-9]{1,2})?)"
title="Minimum 4 digit,Maximum 6 Digit" onchange="duecalculation();">
</div>
</div> </div>
</div> </div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<span for="EmpID">Loan Issue(d) Date</span>
<input type="text" class="form-control num" id="loan_issued_date" name="loan_issued_date" value="" onchange="dateCalulation();">
</div>
</div>
</div>
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<div class="form-group"> <div class="form-group">
<span for="Basic_Pay">Monthly Due</span> <span for="EmpID">Loan Issue(d) Date</span>
<input type="text" value="0.00" class="form-control num" id="monthly_due" name="monthly_due" value="" pattern="([0-9]{1,7}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 6 Digit" onchange="duecalculation();"> <input type="text" class="form-control num" id="loan_issued_date"
</div> name="loan_issued_date" value="" onchange="dateCalulation();">
</div>
</div> </div>
</div> </div>
<div class="col-md-3">
<div class="col-md-3">
<div class="form-group"> <div class="form-group">
<div class="form-group"> <div class="form-group">
<span for="Basic_Pay">Due Started</span> <span for="Basic_Pay">Monthly Due</span>
<input type="text" class="form-control requried num" id="due_started" name="due_started" value="" onchange="dateCalulation();"> <input type="text" value="0.00" class="form-control num" id="monthly_due"
</div> name="monthly_due" value="" pattern="([0-9]{1,7}([.][0-9]{1,2})?)"
title="Minimum 1 digit,Maximum 6 Digit" onchange="duecalculation();">
</div>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<div class="form-group"> <div class="form-group">
<span for="Basic_Pay">No Of Due(s)</span> <span for="Basic_Pay">Due Started</span>
<input type="text" value="0" class="form-control requried num" id="no_of_due" name="no_of_due" value="" pattern="[0-9]{1,2}" title="Minimum 1 digit,Maximum 2 Digit" readonly> <input type="text" class="form-control requried num" id="due_started"
</div> name="due_started" value="" onchange="dateCalulation();">
</div>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<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">No Of Due(s)</span>
<input type="text" value="0.00" class="form-control requried num" id="Paid_Amount" name="Paid_Amount" value="0" pattern="([0-9]{1,7}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit" readonly> <input type="text" value="0" class="form-control requried num"
</div> id="no_of_due" name="no_of_due" value="" pattern="[0-9]{1,2}"
title="Minimum 1 digit,Maximum 2 Digit" readonly>
</div>
</div> </div>
</div> </div>
<input type="hidden" id="remaining_due" name="remaining_due" value="0"> <div class="col-md-3">
<input type="hidden" id="paid_due" name="paid_due" value="0"> <div class="form-group">
<div class="form-group">
<span for="Basic_Pay">Paid Amount</span>
<input type="text" value="0.00" class="form-control requried num"
id="Paid_Amount" name="Paid_Amount" value="0"
pattern="([0-9]{1,7}([.][0-9]{1,2})?)"
title="Minimum 1 digit,Maximum 2 Digit" readonly>
</div>
</div>
</div> </div>
<div class="box-footer" style="text-align:right"> <input type="hidden" id="remaining_due" name="remaining_due" value="0">
<input type="submit" class="btn btn-success" value="Submit" onmouseover="finalCheck();"/> <input type="hidden" id="paid_due" name="paid_due" value="0">
<input type="reset" class="btn btn-success" value="Reset" /> </div>
</div> <div class="box-footer" style="text-align:right">
<input type="submit" class="btn btn-success" value="Submit"
onmouseover="finalCheck();" />
<input type="reset" class="btn btn-success" value="Reset" />
</div>
</div><!-- /.box-body --> </div><!-- /.box-body -->
</form><!-- form closed --> </form><!-- form closed -->
</div><!-- --> </div><!-- -->
</div><!-- --> </div><!-- -->
<div class="col-md-4"> <div class="col-md-4">
@ -325,7 +188,7 @@ $("#due_started").datepicker({
?> ?>
<div class="alert alert-danger alert-dismissable"> <div class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<?php echo session()->getFlashdata('error'); ?> <?php echo session()->getFlashdata('error'); ?>
</div> </div>
<?php } ?> <?php } ?>
<?php <?php
@ -338,119 +201,103 @@ $("#due_started").datepicker({
<?php echo session()->getFlashdata('success'); ?> <?php echo session()->getFlashdata('success'); ?>
</div> </div>
<?php } ?> <?php } ?>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<?php // \Config\Services::validation()->listErrors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'); ?> </div> <?php // \Config\Services::validation()->listErrors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'); ?>
</div>
</div> </div>
</div> </div>
</div> <!-- first row closed--> </div> <!-- first row closed-->
</section> </section>
</div><!--content-wrapper closed--> </div>
<script src="<?php echo base_url(); ?>public/assets/js/addUser.js" type="text/javascript"></script> <!--content-wrapper closed-->
<script src="<?php echo base_url(); ?>public/assets/js/addUser.js" type="text/javascript"></script>
<script> <script>
function calculalteHRA() function calculalteHRA() {
{ //var empid=document.getElementById('emp').value;
//var empid=document.getElementById('emp').value; //alert(empid);
//alert(empid);
var Totalsalary = document.getElementById('Total_salary').value; var Totalsalary = document.getElementById('Total_salary').value;
var HRA=document.getElementById('HRA_Rate').value; var HRA = document.getElementById('HRA_Rate').value;
//if(EmpID == -1){alert("Select Employee ID..!");} //if(EmpID == -1){alert("Select Employee ID..!");}
if(HRA==''){ if (HRA == '') {
alert("Please Enter HRA RATE.."); alert("Please Enter HRA RATE..");
document.getElementById('HRA_Rate').focus(); document.getElementById('HRA_Rate').focus();
}else if(Totalsalary==''){ } else if (Totalsalary == '') {
alert("Please Enter Total Salary.."); alert("Please Enter Total Salary..");
document.getElementById('total_salary').focus(); document.getElementById('total_salary').focus();
} } else {
else{ var temp = (Totalsalary * (HRA / 100));
var temp=(Totalsalary*(HRA/100)); var basic = Totalsalary - temp;
var basic=Totalsalary-temp; document.getElementById('Basic_Pay').value = basic;
document.getElementById('Basic_Pay').value=basic; document.getElementById('HRA_Amount').value = temp;
document.getElementById('HRA_Amount').value=temp; }
}
} }
function duecalculation() function duecalculation() {
{ var totaldue = 0;
var totaldue=0; var loan = document.getElementById('Loan_Amount').value;
var loan=document.getElementById('Loan_Amount').value; var due = document.getElementById('monthly_due').value;
var due=document.getElementById('monthly_due').value;
if (loan != 0) {
if(loan != 0) if (due == 0) {
{ alert("Enter Monthly Due Amount....!");
if(due == 0) $('#monthly_due').focus();
{ } else {
alert("Enter Monthly Due Amount....!");
$('#monthly_due').focus(); totaldue = loan / due;
}
else if (totaldue < 1) {
{ alert("Please Enter Correct Due Amount..!");
$('#monthly_due').focus();
totaldue=loan/due; } else {
document.getElementById('no_of_due').value = Math.ceil(totaldue);
if(totaldue < 1) var noofdues = document.getElementById('no_of_due').value;
{ $('#remaining_due').val(noofdues);
alert("Please Enter Correct Due Amount..!"); }
$('#monthly_due').focus();
} }
else{ } //else if(loan == "" || loan == 0)
document.getElementById('no_of_due').value=Math.ceil(totaldue); //alert(totaldue);
var noofdues=document.getElementById('no_of_due').value;
$('#remaining_due').val(noofdues); dateCalulation();
}
}
}//else if(loan == "" || loan == 0)
//alert(totaldue);
dateCalulation();
} }
function dateCalulation() function dateCalulation() {
{ //alert('j');
//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("");
{ $('#due_started').val("");
$('#loan_issued_date').val(""); $('#monthly_due').val("0.00");
$('#due_started').val(""); $('#remaining_due').val(0);
$('#monthly_due').val("0.00"); $('#no_of_due').val(0);
$('#remaining_due').val(0); $('#Loan_Amount').val("0.00");
$('#no_of_due').val(0); $('#paid_due').val(0);
$('#Loan_Amount').val("0.00"); $('#Paid_Amount').val("0.00");
$('#paid_due').val(0);
$('#Paid_Amount').val("0.00");
}
}
} }
function finalCheck() function finalCheck() {
{ var loanamount = document.getElementById('Loan_Amount').value;
var loanamount=document.getElementById('Loan_Amount').value; if (loanamount != "" && loanamount != 0.00) {
if(loanamount != "" && loanamount != 0.00) var idate = document.getElementById('loan_issued_date').value;
{ var due = document.getElementById('monthly_due').value;
var idate=document.getElementById('loan_issued_date').value; var dsdate = document.getElementById('due_started').value;
var due=document.getElementById('monthly_due').value; if (idate == "" || due == "" || due == 0.00 || dsdate == "") {
var dsdate=document.getElementById('due_started').value; alert("Enter All Loan Information Correctly...!");
if(idate == "" || due == "" || due == 0.00 || dsdate == ""){ }
alert("Enter All Loan Information Correctly...!"); }
}
}
} }
</script>
</script>

View File

@ -145,7 +145,7 @@ if(!empty($emppay))
<section class="content-header"> <section class="content-header">
<h1> <h1>
<!--title--> <!--title-->
<center>Edit Salary Payment Details</center> <center>Edit Loan Details</center>
</h1> </h1>
</section> </section>
@ -165,15 +165,15 @@ if(!empty($emppay))
<form role="form" id="edit" action="<?php echo base_url() ?>emppaydate/editemppay" method="post"> <form role="form" id="edit" action="<?php echo base_url() ?>emppaydate/editemppay" method="post">
<div class="box-body"> <div class="box-body">
<div class="col-md-12">
<legend>Pay Details</legend>
<div class="col-md-12">
<legend>Loan Details</legend>
</div> </div>
<div class="row">
<div class="row">
<input type="hidden" readonly id="Pay_Data_ID" name="Pay_Data_ID" value="<?php echo $Pay_Data_ID; ?>">
<input type="hidden" readonly id="Pay_Data_ID" name="Pay_Data_ID" value="<?php echo $Pay_Data_ID; ?>">
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<div class="form-group"> <div class="form-group">
@ -182,117 +182,6 @@ if(!empty($emppay))
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<span for ="Employee">Employee Name</span>
<input type="text" class="form-control" id="Empname" name="Empname" value="<?php echo $Empname; ?>" readonly>
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<span for="Basic_Pay">Total Salary</span><font color="Red">*</font>
<input type="text" class="form-control requried num" id="Total_Salary" name="Total_Salary" value="<?php echo number_format($TotalSalary,0,'',''); ?>" pattern="([0-9]{1,8}([.][0-9]{1,2})?)" title="Minimum 4 digit,Maximum 6 Digit" onchange="calculateBasic();">
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<span for="Basic_Pay">Basic Pay</span><font color="Red">*</font>
<input type="text" class="form-control requried num" id="Basic_Pay" name="Basic_Pay" value="<?php echo $Basic_Pay; ?>" readonly>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<span for="HRA_Rate">HRA_Rate(%)</span><font color="Red">*</font>
<input type="text" class="form-control required num" id="HRA_Rate" name="HRA_Rate" value="<?php echo $HRA_Rate; ?>" pattern="([0-9]{1,2}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit" onchange="calculateBasic();">
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<span for="HRA_Rate">HRA_Amount</span><font color="Red">*</font>
<input type="text" class="form-control required num" id="HRA_Amount" name="HRA_Amount" value="<?php echo number_format($HRA_Amount,0,'',''); ?>" readonly>
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<span for="Allowances">Allowances</span><font color="Red">*</font>
<input type="text" class="form-control required num" id="Allowances" name="Allowances" value="<?php echo $Allowances; ?>" pattern="([0-9]{1,5}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 4 Digit">
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<span for="PF_Rate">PF_Rate(%)</span><font color="Red">*</font>
<input type="text" class="form-control required num" id="PF_Rate" name="PF_Rate" value="<?php echo $PF_Rate; ?>" pattern="([0-9]{1,2}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<span for="ESI_Rate">ESI_Rate(%)</span><font color="Red">*</font>
<input type="text" class="form-control required num" id="ESI_Rate" name="ESI_Rate" value="<?php echo $ESI_Rate; ?>" pattern="([0-9]{1,2}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 2 Digit">
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<span for ="Food_Allowances">Food Allowances(Per Day)</span><font color="Red">*</font>
<input type="text" class="form-control required num" id="Food_Allowances" name="Food_Allowances" value="<?php echo $Food_Allowances; ?>" pattern="([0-9]{1,3}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 3 Digit">
</div>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<div class="form-group">
<span for="Incentives">Incentives</span><font color="Red">*</font>
<input type="text" class="form-control required num" id="Incentives" name="Incentives" value="<?php echo ($Incentives) ?>" pattern="([0-9]{1,5}([.][0-9]{1,2})?)" title="Minimum 1 digit,Maximum 5 Digit">
</div>
</div>
</div>
</div>
<div class="col-md-12">
<legend>Loan Details</legend>
</div>
<div class="row">
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">

View File

@ -4,14 +4,14 @@
<!-- Content Header (Page header) --> <!-- Content Header (Page header) -->
<section class="content-header"> <section class="content-header">
<h1> <h1>
<center>Employee Salary Details</center> <center>Employee Loan Details</center>
</h1> </h1>
</section> </section>
<section class="content"> <section class="content">
<div class="row"> <div class="row">
<div class="col-xs-12 text-right"> <div class="col-xs-12 text-right">
<div class="form-group"> <div class="form-group">
<a class="btn btn-success" href="<?php echo base_url(); ?>emppaydate/addemppaydate">Add New Employee Pay List</a> <a class="btn btn-success" href="<?php echo base_url(); ?>emppaydate/addemppaydate">Create New Loan</a>
</div> </div>
</div> </div>
</div> </div>
@ -25,17 +25,15 @@
<table id="datatable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;text-align: right;" > <table id="datatable" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;text-align: right;" >
<thead style="background-color: #ddd;"> <thead style="background-color: #ddd;">
<tr > <tr >
<th width="7%">Emp ID</th> <th width="15%">Employee</th>
<th width="8%">Emp Name</th> <th width="7%"> Total Sal in </th>
<th width="8%"> Total Sal in </th> <th width="7%"> Loan Amt in </th>
<th width="8%">Basic Pay in </th> <th width="7%"> Loan Issued Date</th>
<th width="8%">HRA Rate in %</th> <th width="7%"> Monthly Due Amt in </th>
<th width="8%">HRA Amt in </th> <th width="7%"> No Of Dues</th>
<th width="7%"> Paid Dues</th>
<th width="9%">Allowances in </th> <th width="7%"> Remaining Dues</th>
<th width="8%">PF Ratein %</th> <th width="7%"> Paid Amt in </th>
<th width="8%">ESI Rate in %</th>
<th width="8%">Food Allow in </th>
<th width="7%">Action</th> <th width="7%">Action</th>
</tr> </tr>
</thead> </thead>
@ -49,18 +47,17 @@
{ {
?> ?>
<tr> <tr>
<td style="text-align: left;"><?php echo $record->EmpID ?></td> <td style="text-align: left;"><?php echo $record->EmpID ?>-<?php echo $record->FirstName;?></td>
<td style="text-align: left;"><?php echo $record->FirstName ." ". $record->LastName?></td>
<td><?php echo $record->TotalSalary; ?></td> <td><?php echo $record->TotalSalary; ?></td>
<td><?php echo $record->Basic_Pay ?></td> <td><?php echo $record->Loan_Amount; ?></td>
<td><?php echo $record->HRA_Rate ?></td> <td><?php echo $record->Loan_Issued_Date; ?></td>
<td><?php echo $record->HRA_Amount; ?></td> <td><?php echo $record->Monthly_Due; ?></td>
<td><?php echo $record->No_of_Dues; ?></td>
<td><?php echo $record->Allowances ?></td> <td><?php echo $record->Paid_Due; ?></td>
<td><?php echo $record->PF_Rate ?></td> <td><?php echo $record->Remaining_Due; ?></td>
<td><?php echo $record->ESI_Rate ?></td> <td><?php echo $record->Paid_Amount; ?></td>
<td><?php echo $record->Food_Allowances ?></td>
<td> <td>
<a href="<?php echo base_url().'emppaydate/editOldemppay/'.$record->Pay_Data_ID; ?>"><i class="btn btn-success">EDIT</i></a> <a href="<?php echo base_url().'emppaydate/editOldemppay/'.$record->Pay_Data_ID; ?>"><i class="btn btn-success">EDIT</i></a>
</td> </td>
</tr> </tr>

View File

@ -270,7 +270,7 @@ $('html').bind('keypress', function(e)
<td id="loanRecd<?php echo $index?>" onkeypress="return isCheckKeyCode(event);" onkeyup="changeInput(event);"<?php if(empty($record->Key) && !empty($record->Loan_ID)){ echo "contenteditable='true'; style='background-color:#ffcccc;text-align:right' title='Loan Pending'"; } ?> <?php if(!empty($record->Key)){?> title="Payslip Calculated" style="text-align:right;color:blue;"<?php } else{?>style="text-align:right;"<?php }?> > <td id="loanRecd<?php echo $index?>" onkeypress="return isCheckKeyCode(event);" onkeyup="changeInput(event);"<?php if(empty($record->Key) && !empty($record->Loan_ID)){ echo "contenteditable='true'; style='background-color:#ffcccc;text-align:right' title='Loan Pending'"; } ?> <?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->Loan_Recovered)) <?php if(!empty($record->Loan_Recovered))
{if(is_numeric($record->Loan_Recovered)){echo number_format($record->Loan_Recovered,2,'.',''); $totalmanualoan[] = $record->Loan_Recovered;}else {echo $record->Loan_Recovered; $totalmanualoan[] = $record->Loan_Recovered;}}else{echo number_format(0.00,2,'.','');} ?> {if(is_numeric($record->Loan_Recovered)){echo number_format($record->Loan_Recovered,2,'.',''); $totalmanualoan[] = $record->Loan_Recovered;}else {echo $record->Loan_Recovered; $totalmanualoan[] = $record->Loan_Recovered;}}else{echo number_format(0.00,2,'.',''); $totalmanualoan[] = 0;} ?>