diff --git a/app/Controllers/Employeedetails.php b/app/Controllers/Employeedetails.php index e20da99c..ae941ba0 100755 --- a/app/Controllers/Employeedetails.php +++ b/app/Controllers/Employeedetails.php @@ -268,6 +268,10 @@ class Employeedetails extends BaseController $Nominee = $this->request->getPost('nomineename'); $createdby = $this->session->get('userId'); $is_management_team = $this->request->getPost('is_management_team'); + + $TDS_Rate = $this->request->getPost('TDS_Rate'); + $tds_applicable=$this->request->getPost('tds_applicable'); + $esi_applicable = $this->request->getPost('esi_applicable'); $pf_applicable = $this->request->getPost('pf_applicable'); $work_location = $this->request->getPost('work_location'); @@ -329,6 +333,8 @@ class Employeedetails extends BaseController 'VoterID' => $VoterID, 'PFNO' => $PFno, 'ESI' => $ESIno, + 'TDS_Rate' => $TDS_Rate, + 'tds_applicable' => $tds_applicable, 'NomineeDetails' => $Nominee, 'is_management_team' => $is_management_team, 'esi_applicable' => $esi_applicable, diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php index f9ab09cf..a87b77db 100755 --- a/app/Views/addEmployeenew.php +++ b/app/Views/addEmployeenew.php @@ -935,6 +935,39 @@
+ +
+ +
+ + + + +
+
+ +
+
+ + + + + + +
+
+
@@ -945,7 +978,7 @@ @@ -962,7 +995,7 @@ @@ -1261,10 +1294,6 @@ success: function(response) { $('#loader').hide(); // Hide the loader after a successful response - alert(response.message); - console.log(response.data[0]); - console.log(response); - let responseCheck = response.data[0]; let responseEmail=response.data[0].EmailId; @@ -1318,12 +1347,6 @@ url: "employeePANExist", success: function(response) { $('#loader').hide(); - - console.log(panNo); - alert(response.message); - console.log(response.data[0]); - console.log(response); - let responseCheck = response.data[0]; let responsePanNo=response.data[0].PANNo; @@ -1371,10 +1394,6 @@ success: function(response) { $('#loader').hide(); - console.log(aadharNo); - alert(response.message); - console.log(response.data[0]); - console.log(response); let responseCheck = response.data[0]; let responseAadharNo=response.data[0].AadharNo; diff --git a/app/Views/createPOfromRequistion.php b/app/Views/createPOfromRequistion.php index 67e67501..e3d89c08 100755 --- a/app/Views/createPOfromRequistion.php +++ b/app/Views/createPOfromRequistion.php @@ -327,7 +327,9 @@ echo $RequestedDate; ?> - ReqNo; ?> + ReqNo; ?> ReqType; ?> FirstName; ?> diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php index 36932061..bbe9dea6 100755 --- a/app/Views/editEmployeenew.php +++ b/app/Views/editEmployeenew.php @@ -59,6 +59,8 @@ $uano = ''; $is_management_team = 0; $esi_applicable = 0; $pf_applicable = 0; +$TDS_Rate=''; +$tds_apllicable=0; if (!empty($EmpDetails)) { foreach ($EmpDetails as $Emp) { @@ -96,6 +98,8 @@ if (!empty($EmpDetails)) { $IFSCCode = $Emp->IFSCCode; $BankBranchName = $Emp->BankBranchName; $BankAddress = $Emp->BankAddress; + $TDS_Rate=$Emp->TDS_Rate; + $tds_applicable =$Emp->tds_applicable; $PassportNo = $Emp->PassportNo; $Passport_Valid_till = $Emp->Passport_Valid_till; if ($Passport_Valid_till != '' && $Passport_Valid_till != '0000-00-00 00:00:00') { @@ -846,6 +850,40 @@ if (!empty($EmpDetails)) {
+ +
+ +
+ + + + +
+
+ +
+
+ + + + + + +
+
+
@@ -857,7 +895,7 @@ if (!empty($EmpDetails)) { @@ -875,7 +913,7 @@ if (!empty($EmpDetails)) { @@ -1595,10 +1633,6 @@ if (!empty($EmpDetails)) { url: "employeeEmailExist", success: function(response) { $('#loader').hide(); // Hide the loader after a successful response - - alert(response.message); - console.log(response.data[0]); - console.log(response); let responseCheck = response.data[0]; let responseEmail=response.data[0].EmailId; @@ -1636,13 +1670,7 @@ if (!empty($EmpDetails)) { url: "employeePANExist", success: function(response) { $('#loader').hide(); - - console.log(panNo); - alert(response.message); - console.log(response.data[0]); - console.log(response); - - + let responseCheck = response.data[0]; let responsePanNo=response.data[0].PANNo; @@ -1679,11 +1707,7 @@ if (!empty($EmpDetails)) { url: "employeecheckAadharNoExist", success: function(response) { $('#loader').hide(); - - console.log(aadharNo); - alert(response.message); - console.log(response.data[0]); - console.log(response); + let responseCheck = response.data[0]; let responseAadharNo=response.data[0].AadharNo; diff --git a/app/Views/porelease_view.php b/app/Views/porelease_view.php index b2963c4a..88b9db77 100755 --- a/app/Views/porelease_view.php +++ b/app/Views/porelease_view.php @@ -184,7 +184,7 @@ if (empty($Status)) { $PODate = $podt->format('d-m-Y'); echo $PODate; ?> - PONO ?> + PONO ?> RType ?> CostCenterName ?>