add incentives field in emppay
This commit is contained in:
gandhimathi
parent
e13d6313cf
commit
4f5da582a0
@ -86,6 +86,8 @@ class emppaydate extends BaseController
|
||||
$this->form_validation->set_rules('PF_Rate','PF_Rate','trim|required');
|
||||
$this->form_validation->set_rules('ESI_Rate','ESI_Rate','trim|required');
|
||||
$this->form_validation->set_rules('Food_Allowances','Food_Allowances','trim|required');
|
||||
$this->form_validation->set_rules('Incentives','Incentives','trim|required');
|
||||
|
||||
|
||||
|
||||
if($this->form_validation->run() == FALSE || $EmpID == -1)
|
||||
@ -105,6 +107,7 @@ class emppaydate extends BaseController
|
||||
$PF_Rate=$this->input->post('PF_Rate');
|
||||
$ESI_Rate=$this->input->post('ESI_Rate');
|
||||
$Food_Allowances=$this->input->post('Food_Allowances');
|
||||
$Incentives=$this->input->post('Incentives');
|
||||
|
||||
$Loan_Amount=$this->input->post('Loan_Amount');
|
||||
$Load_Issued_date=$this->input->post('loan_issued_date');
|
||||
@ -129,7 +132,7 @@ class emppaydate extends BaseController
|
||||
$chked = $this->input->post('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,'Created_By'=>$CreateBy);
|
||||
$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);
|
||||
|
||||
|
||||
@ -202,6 +205,9 @@ class emppaydate extends BaseController
|
||||
$this->form_validation->set_rules('PF_Rate','PF_Rate','trim|required');
|
||||
$this->form_validation->set_rules('ESI_Rate','ESI_Rate','trim|required');
|
||||
$this->form_validation->set_rules('Food_Allowances','Food_Allowances','trim|required');
|
||||
$this->form_validation->set_rules('Incentives','Incentives','trim|required');
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -249,11 +255,13 @@ class emppaydate extends BaseController
|
||||
$Last_Mod_By=$this->session->userdata('userId');
|
||||
$Last_Mod_Time=date('d-m-Y h:i:sa');
|
||||
$Food_Allowances=$this->input->post('Food_Allowances');
|
||||
$Incentives=$this->input->post('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,'Last_Mod_By'=>$Last_Mod_By);
|
||||
$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);
|
||||
|
||||
|
||||
|
||||
@ -66,7 +66,7 @@ class emppaydate_model extends CI_Model
|
||||
}
|
||||
function getUserInfo($paydataid)
|
||||
{
|
||||
$sql = 'select T_Emp_Pay_Data.Pay_Data_ID,T_Emp_Pay_Data.EmpID as PAYEMPID,T_Emp_Pay_Data.Basic_Pay,T_Emp_Pay_Data.HRA_Rate,T_Emp_Pay_Data.Allowances,T_Emp_Pay_Data.Food_Allowances,T_Emp_Pay_Data.PF_Rate,T_Emp_Pay_Data.ESI_Rate,T_Emp_Pay_Data.HRA_Amount,T_Emp_Pay_Data.TotalSalary,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Loan_Master.*from T_Emp_Pay_Data
|
||||
$sql = 'select T_Emp_Pay_Data.Pay_Data_ID,T_Emp_Pay_Data.EmpID as PAYEMPID,T_Emp_Pay_Data.Basic_Pay,T_Emp_Pay_Data.HRA_Rate,T_Emp_Pay_Data.Allowances,T_Emp_Pay_Data.Food_Allowances,T_Emp_Pay_Data.Incentives,T_Emp_Pay_Data.PF_Rate,T_Emp_Pay_Data.ESI_Rate,T_Emp_Pay_Data.HRA_Amount,T_Emp_Pay_Data.TotalSalary,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Loan_Master.*from T_Emp_Pay_Data
|
||||
join T_Employee_Details on T_Emp_Pay_Data.EmpID=T_Employee_Details.EmpID
|
||||
left join T_Loan_Master on T_Emp_Pay_Data.EmpID=T_Loan_Master.EmpID and T_Loan_Master.is_Active = 1
|
||||
where T_Emp_Pay_Data.Pay_Data_ID = ?;';
|
||||
|
||||
@ -210,13 +210,34 @@ $("#due_started").datepicker({
|
||||
<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 4 Digit');
|
||||
$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><!--row completed 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">
|
||||
|
||||
@ -59,6 +59,7 @@ $("#due_started").datepicker({
|
||||
$ESI_Rate='';
|
||||
$is_Active='';
|
||||
$Food_Allowances='';
|
||||
$Incentives='';
|
||||
$Created_By='';
|
||||
$Created_Time='';
|
||||
$Last_Mod_By='';
|
||||
@ -78,7 +79,8 @@ $("#due_started").datepicker({
|
||||
|
||||
if(!empty($emppay))
|
||||
{
|
||||
// print_r($emppay);
|
||||
// print_r($emppay);
|
||||
// die();
|
||||
foreach ($emppay as $ep)
|
||||
{
|
||||
|
||||
@ -97,6 +99,7 @@ if(!empty($emppay))
|
||||
$ESI_Rate=$ep->ESI_Rate;
|
||||
$is_Active=$ep->is_Active;
|
||||
$Food_Allowances=$ep->Food_Allowances;
|
||||
$Incentives=$ep->Incentives;
|
||||
$Loan_Amount=$ep->Loan_Amount;
|
||||
if(empty($Loan_Amount)){$Loan_Amount = 0.00;}
|
||||
if( !empty($ep->Loan_Issued_Date) ){
|
||||
@ -273,6 +276,16 @@ if(!empty($emppay))
|
||||
</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">
|
||||
@ -426,7 +439,7 @@ if(!empty($emppay))
|
||||
{
|
||||
?>
|
||||
<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"><EFBFBD></button>
|
||||
<?php echo $this->session->flashdata('error'); ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
@ -436,14 +449,14 @@ if(!empty($emppay))
|
||||
{
|
||||
?>
|
||||
<div class="alert alert-success 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"><EFBFBD></button>
|
||||
<?php echo $this->session->flashdata('success'); ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<?php echo validation_errors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'); ?>
|
||||
<?php echo validation_errors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true"><EFBFBD></button></div>'); ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -556,7 +569,7 @@ function finalCheck()
|
||||
}
|
||||
}
|
||||
|
||||
if($('#Total_Salary').val() == '' || $('#HRA_Rate').val() == '' || $('#Allowances').val() == '' ||$('#PF_Rate').val() == '' ||$('#ESI_Rate').val() == '' || $('#Food_Allowances').val() == '')
|
||||
if($('#Total_Salary').val() == '' || $('#HRA_Rate').val() == '' || $('#Allowances').val() == '' ||$('#PF_Rate').val() == '' ||$('#ESI_Rate').val() == '' || $('#Food_Allowances').val() == ''|| $('#Incentives').val()=='')
|
||||
{
|
||||
|
||||
alert("Please Enter All Information Correctly..!");
|
||||
@ -567,7 +580,7 @@ function finalCheck()
|
||||
$("#deleteemp").click(function(){
|
||||
var empid = "<?php echo $EmpID;?>";
|
||||
var i = confirm("Do You want to delete "+empid+" from Pay Master?");
|
||||
//alert(i);
|
||||
//alert(i);s
|
||||
if(i)
|
||||
{
|
||||
$('#content').loader('show');
|
||||
|
||||
Loading…
Reference in New Issue
Block a user