diff --git a/app/Controllers/Payslip.php b/app/Controllers/Payslip.php index 52e84ee8..2560f3ff 100755 --- a/app/Controllers/Payslip.php +++ b/app/Controllers/Payslip.php @@ -69,8 +69,9 @@ class Payslip extends BaseController $EmpId = $this->request->getPost('employee'); $res = $this->payroll_model->getMonthlyPayDetails($EmpId, $PayOn); - // print_r($res);die; + $result = $res[0]; + $loan = []; $loanHistory = []; $loan_id = 0; @@ -127,7 +128,6 @@ class Payslip extends BaseController 'ESINumber' => $result->ESINO, 'UANNO' => $result->PFNO, ]; - $insert = $this->payroll_model->insertPayroll($data); if($insert){ diff --git a/app/Models/Payroll_model.php b/app/Models/Payroll_model.php index aebe4db9..51e22f3a 100755 --- a/app/Models/Payroll_model.php +++ b/app/Models/Payroll_model.php @@ -494,7 +494,7 @@ class Payroll_model extends Model function getMonthlyPayDetails($EmpId, $PayOn) { $builder = $this->db->table('t_monthly_pay_inputs MonthlyPay ') - ->select('MonthlyPay.*, E.BankAccountNo , E.PFNO , E.ESI as ESINO , L.*') + ->select('MonthlyPay.*, E.BankAccountNo , E.PFNO , E.ESI as ESINO , L.Loan_ID, L.Loan_Amount, L.Loan_Issued_Date, L.Monthly_Due, L.Due_Start_Date, L.No_of_Dues, L.Paid_Due, L.Remaining_Due, L.Paid_Amount') ->join('t_employee_details as E', 'MonthlyPay.EmpID = E.EmpID', 'left') ->join('t_loan_master as L', 'MonthlyPay.EmpID = L.EmpID and L.is_Active = 1', 'left') ->where('MonthlyPay.EmpID', $EmpId) diff --git a/app/Views/payslipgenerate.php b/app/Views/payslipgenerate.php index b755df28..b311749b 100755 --- a/app/Views/payslipgenerate.php +++ b/app/Views/payslipgenerate.php @@ -16,7 +16,7 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr $('#PayOn').change(function() { var id = $('#PayOn').val(); if (id != '-1') { - // $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { id1: id @@ -26,7 +26,7 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr success: function(result) { if (result) { $("#Employee").empty(); - // $('#content').loader('hide'); + $('#loader').hide(); $("#Employee").append(result); } } @@ -49,7 +49,7 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr $('#Employee').find('option').each(function() { c++; var employee = $(this).val(); - // $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { payon: payon, @@ -68,7 +68,8 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr type: "POST", url: "payslip/callsp", success: function(result) { - // $('#content').loader('hide'); + console.log(result); + $('#loader').hide(); } }); } @@ -81,11 +82,11 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr alert(c + '-Employees Salary Added Successfully!'); $('form#PayslipGenerator').submit(); alert("Please wait while Payslip Downloading...!"); - // $('#content').loader('hide'); + $('#loader').hide(); }, time); } // else for select all not selected else { - // $('#content').loader('show'); + $('#loader').show(); $.ajax({ data: { payon: payon, @@ -100,7 +101,7 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr if (result == 1) { $('form#PayslipGenerator').submit(); - // $('#content').loader('hide'); + $('#loader').hide(); alert("Payslip Downloaded Successfully..!"); } else { @@ -113,7 +114,7 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr url: "payslip/callsp", success: function(result) { $('form#PayslipGenerator').submit(); - // $('#content').loader('hide'); + $('#loader').hide(); alert("Salary Calculated Successfully..!"); } });