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

Change in UAN number pattern : GWM

Browse Source
This commit is contained in:
bitbucket 2024-08-21 14:19:01 +05:30
parent 2ccef97eb2
commit c3f406fbde
4 changed files with 785 additions and 745 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/Controllers/Payslip.php
View File

@ -778,7 +778,7 @@ class Payslip extends BaseController
$data['esi'] = $esi;
$data['pf'] = $pf;
$data['over_time'] = $ot;
// dd($data);
//echo sizeof($data['fresh'])."-".sizeof($data['empSalary']);die;
$this->global['pageTitle'] = 'Payroll Monthly Inputs';
$this->loadViews("monthlypayinputs", $this->global, $data, NULL);
@ -824,9 +824,9 @@ class Payslip extends BaseController
$ErrorFlag = 0;
$Emp = $j['Employee'];
$EmpID = substr($Emp, 0, 4);
$EmpID = $j['Emp ID'];
//$Name = $j['Employee Name'];
//echo $EmpID; die;
@ -838,7 +838,7 @@ class Payslip extends BaseController
$Loan_Recovered = $j['Manual Loan Due ₹'];
$Incentives = $j['Incentives in ₹'];
$Festival_Bonus = $j['Festival Bonus in ₹'];
$Other_Deductions = $j['Other Deductions in ₹'];
$Other_Deductions = $j['TDS Deductions in ₹'];
$Estimate = $j['Estimate in ₹'];
$Created_By = $this->session->get('userId');
@ -921,18 +921,13 @@ class Payslip extends BaseController
foreach ($json as $index => $j) {
$Emp = $j['Employee'];
// $EmpID = substr($Emp, 0, 4);
$parts = explode("-", $Emp);
$EmpID = $parts[0];
//$Name = $j['Employee'];
$EmpID = $j['Emp ID'];
$DaysWorked = $j['Days Worked'];
$LOP_Days = $j['LOP Days'];
$Paid_leave = $j['Paid Leave'];
$OT_Hrs_Worked = $j['OT Hrs'];
$LOP_Days = isset($j['LOP Days']) ? $j['LOP Days'] : 0.00;
$Paid_leave = isset($j['Paid Leave']) ? $j['Paid Leave'] : 0.00;
$OT_Hrs_Worked = isset($j['OT Hrs']) ? $j['OT Hrs'] : 0.00;
$Loan_Recovered = isset($j['Manual Loan Due ₹']) ? $j['Manual Loan Due ₹'] : 0.00;
if (is_string($Loan_Recovered)) {
$Loan_Recovered = strtoupper($Loan_Recovered);
@ -944,7 +939,7 @@ class Payslip extends BaseController
$Created_By = $this->session->get('userId');
$monthlypaydata = array('Month_Year' => $month, 'EmpID' => $EmpID, 'Days_worked' => $DaysWorked, 'LOP_Days' => $LOP_Days, 'Paid_leave' => $Paid_leave, 'OT_Hrs_Worked' => $OT_Hrs_Worked, 'Loan_Recovered' => $Loan_Recovered, 'Incentives' => $Incentives, 'Festival_Bonus' => $Festival_Bonus, 'Other_Deductions' => $Other_Deductions, 'Estimate' => $Estimate, 'Created_By' => $Created_By);
// print_r($monthlypaydata); die;
//print_r($monthlypaydata); die;
$result = $this->monthlypay_model->saveMonthlyData_model($monthlypaydata);
$total = $total + $result;
}
@ -993,8 +988,6 @@ class Payslip extends BaseController
$Data['Payon'] = $this->payroll_model->getPayOn();
$this->global['pageTitle'] = 'Payroll Generater';
$this->loadViews("payslipgenerate", $this->global, $Data, NULL);
@ -1015,6 +1008,7 @@ class Payslip extends BaseController
$id = $this->request->getPost('id1');
$result = $this->payroll_model->getEmployeelist2($id);
$HTML = "";
if (count($result) > 0) {

6
app/Views/addEmployee.php
View File

@ -394,7 +394,7 @@ function onlyAlphabets(evt) {
function validatePF() {
var regpf = /^([a-zA-Z]){5}([0-9]){17}$/;
var regpf = /^\d{12}$/;
var PF = $('#pfno').val();
@ -1005,8 +1005,8 @@ legend {
<input type="text" id="pfno" name="pfno" maxlength="22"
onchange="validatePF();" class="form-control"
style="text-transform:uppercase"
pattern="([a-zA-Z]){5}([0-9]){17}"
title=" 5 Character and 17 Digit number (ex:ABCDE12345678901234567)"
pattern="\d{12}"
title="12 Digit number"
onkeypress="return alpha(event);">
</div>
</div>

6
app/Views/editEmployee.php
View File

@ -494,7 +494,7 @@ function validateESI() {
}
function validatePF() {
var regpf = /^([a-zA-Z]){5}([0-9]){17}?$/;
var regpf = /^\d{12}$/;
var PF = $('#pfno').val();
@ -1307,8 +1307,8 @@ legend {
value="<?php echo $pfno; ?>"
onchange="validatePF();" class="form-control"
style="text-transform:uppercase"
pattern="([a-zA-Z]){5}([0-9]){17}"
title=" 5 Character and 17 Digit number (ex:ABCDE12345678901234567)"
pattern="\d{12}"
title="12 Digit number"
onkeypress="return alpha(event);">
</div>
</div>

1488
app/Views/monthlypayinputs.php
View File

File diff suppressed because it is too large Load Diff