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

changes in purchase modue -vadivel J

Browse Source
This commit is contained in:
vadivel J 2024-10-10 15:14:53 +05:30
parent 54e927f0b2
commit 91f3f9dc08
5 changed files with 87 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Controllers/Employeedetails.php
View File

@ -268,6 +268,10 @@ class Employeedetails extends BaseController
$Nominee = $this->request->getPost('nomineename'); $Nominee = $this->request->getPost('nomineename');
$createdby = $this->session->get('userId'); $createdby = $this->session->get('userId');
$is_management_team = $this->request->getPost('is_management_team'); $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'); $esi_applicable = $this->request->getPost('esi_applicable');
$pf_applicable = $this->request->getPost('pf_applicable'); $pf_applicable = $this->request->getPost('pf_applicable');
$work_location = $this->request->getPost('work_location'); $work_location = $this->request->getPost('work_location');
@ -329,6 +333,8 @@ class Employeedetails extends BaseController
'VoterID' => $VoterID, 'VoterID' => $VoterID,
'PFNO' => $PFno, 'PFNO' => $PFno,
'ESI' => $ESIno, 'ESI' => $ESIno,
'TDS_Rate' => $TDS_Rate,
'tds_applicable' => $tds_applicable,
'NomineeDetails' => $Nominee, 'NomineeDetails' => $Nominee,
'is_management_team' => $is_management_team, 'is_management_team' => $is_management_team,
'esi_applicable' => $esi_applicable, 'esi_applicable' => $esi_applicable,

51
app/Views/addEmployeenew.php
View File

@ -935,6 +935,39 @@
<div class="col-md-11"> <div class="col-md-11">
<div class="row"> <div class="row">
<div class="col-md-3">
<div class="form-group">
<label for="PF_Rate">TDS Rate(%)</label>
<input type="text" name="TDS_Rate"
value=""
class="form-control num"
title="Enter the valid TDS Rate, Minimum 1 digit"
/>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label class="switch">
<input type="checkbox" name="tds_applicable"
onchange="updateSwitchValue(this)" value="0"
/>
<span class="slider"></span>
</label>
<label
class="mt-4">TDS
Applicable</label>
</div>
</div>
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
@ -945,7 +978,7 @@
</label> </label>
<label <label
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">ESI class="mt-4">ESI
Applicable</label> Applicable</label>
@ -962,7 +995,7 @@
</label> </label>
<label <label
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">PF class="mt-4">PF
Applicable</label> Applicable</label>
@ -1261,10 +1294,6 @@
success: function(response) { success: function(response) {
$('#loader').hide(); // Hide the loader after a successful 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 responseCheck = response.data[0];
let responseEmail=response.data[0].EmailId; let responseEmail=response.data[0].EmailId;
@ -1318,12 +1347,6 @@
url: "<?php echo base_url(); ?>employeePANExist", url: "<?php echo base_url(); ?>employeePANExist",
success: function(response) { success: function(response) {
$('#loader').hide(); $('#loader').hide();
console.log(panNo);
alert(response.message);
console.log(response.data[0]);
console.log(response);
let responseCheck = response.data[0]; let responseCheck = response.data[0];
let responsePanNo=response.data[0].PANNo; let responsePanNo=response.data[0].PANNo;
@ -1371,10 +1394,6 @@
success: function(response) { success: function(response) {
$('#loader').hide(); $('#loader').hide();
console.log(aadharNo);
alert(response.message);
console.log(response.data[0]);
console.log(response);
let responseCheck = response.data[0]; let responseCheck = response.data[0];
let responseAadharNo=response.data[0].AadharNo; let responseAadharNo=response.data[0].AadharNo;

4
app/Views/createPOfromRequistion.php
View File

@ -327,7 +327,9 @@
echo $RequestedDate; echo $RequestedDate;
?> ?>
</td> </td>
<td align="center"><a data-toggle="modal" data-target="#RequisitionDtlsModal" data-id="<%=index%>" data-userid="<?php echo $record->ReqNo ?>"><u><?php echo $record->ReqNo; ?> </u></a></td> <td align="center"><span data-toggle="modal"
style="cursor: pointer; color: #039985; text-decoration: none;"
data-target="#RequisitionDtlsModal" data-id="<%=index%>" data-userid="<?php echo $record->ReqNo ?>"><?php echo $record->ReqNo; ?></span></td>
<td align="center"><?php echo $record->ReqType; ?></td> <td align="center"><?php echo $record->ReqType; ?></td>
<td><?php echo $record->FirstName; ?></td> <td><?php echo $record->FirstName; ?></td>

60
app/Views/editEmployeenew.php
View File

@ -59,6 +59,8 @@ $uano = '';
$is_management_team = 0; $is_management_team = 0;
$esi_applicable = 0; $esi_applicable = 0;
$pf_applicable = 0; $pf_applicable = 0;
$TDS_Rate='';
$tds_apllicable=0;
if (!empty($EmpDetails)) { if (!empty($EmpDetails)) {
foreach ($EmpDetails as $Emp) { foreach ($EmpDetails as $Emp) {
@ -96,6 +98,8 @@ if (!empty($EmpDetails)) {
$IFSCCode = $Emp->IFSCCode; $IFSCCode = $Emp->IFSCCode;
$BankBranchName = $Emp->BankBranchName; $BankBranchName = $Emp->BankBranchName;
$BankAddress = $Emp->BankAddress; $BankAddress = $Emp->BankAddress;
$TDS_Rate=$Emp->TDS_Rate;
$tds_applicable =$Emp->tds_applicable;
$PassportNo = $Emp->PassportNo; $PassportNo = $Emp->PassportNo;
$Passport_Valid_till = $Emp->Passport_Valid_till; $Passport_Valid_till = $Emp->Passport_Valid_till;
if ($Passport_Valid_till != '' && $Passport_Valid_till != '0000-00-00 00:00:00') { if ($Passport_Valid_till != '' && $Passport_Valid_till != '0000-00-00 00:00:00') {
@ -846,6 +850,40 @@ if (!empty($EmpDetails)) {
<div class="col-md-1"></div> <div class="col-md-1"></div>
<div class="col-md-11"> <div class="col-md-11">
<div class="row"> <div class="row">
<div class="col-md-3">
<div class="form-group">
<label for="PF_Rate">TDS Rate(%)</label>
<input type="text" name="TDS_Rate"
value="<?php echo $TDS_Rate; ?>"
class="form-control num"
title="Enter the valid TDS Rate, Minimum 1 digit"
readonly />
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label class="switch">
<input type="checkbox" name="tds_applicable"
value="<?= $tds_applicable; ?>" <?php echo $tds_applicable == '1' ? 'checked' : ''; ?>
onchange="updateSwitchValue(this)"
/>
<span class="slider"></span>
</label>
<label
class="mt-4">TDS
Applicable</label>
</div>
</div>
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
@ -857,7 +895,7 @@ if (!empty($EmpDetails)) {
</label> </label>
<label <label
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">ESI class="mt-4">ESI
Applicable</label> Applicable</label>
@ -875,7 +913,7 @@ if (!empty($EmpDetails)) {
</label> </label>
<label <label
style="display: inline-block; vertical-align: bottom; margin-right: 10px; margin-bottom: 10px;">PF class="mt-4">PF
Applicable</label> Applicable</label>
@ -1595,10 +1633,6 @@ if (!empty($EmpDetails)) {
url: "<?php echo base_url(); ?>employeeEmailExist", url: "<?php echo base_url(); ?>employeeEmailExist",
success: function(response) { success: function(response) {
$('#loader').hide(); // Hide the loader after a successful 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 responseCheck = response.data[0];
let responseEmail=response.data[0].EmailId; let responseEmail=response.data[0].EmailId;
@ -1636,13 +1670,7 @@ if (!empty($EmpDetails)) {
url: "<?php echo base_url(); ?>employeePANExist", url: "<?php echo base_url(); ?>employeePANExist",
success: function(response) { success: function(response) {
$('#loader').hide(); $('#loader').hide();
console.log(panNo);
alert(response.message);
console.log(response.data[0]);
console.log(response);
let responseCheck = response.data[0]; let responseCheck = response.data[0];
let responsePanNo=response.data[0].PANNo; let responsePanNo=response.data[0].PANNo;
@ -1679,11 +1707,7 @@ if (!empty($EmpDetails)) {
url: "<?php echo base_url(); ?>employeecheckAadharNoExist", url: "<?php echo base_url(); ?>employeecheckAadharNoExist",
success: function(response) { success: function(response) {
$('#loader').hide(); $('#loader').hide();
console.log(aadharNo);
alert(response.message);
console.log(response.data[0]);
console.log(response);
let responseCheck = response.data[0]; let responseCheck = response.data[0];
let responseAadharNo=response.data[0].AadharNo; let responseAadharNo=response.data[0].AadharNo;

2
app/Views/porelease_view.php
View File

@ -184,7 +184,7 @@ if (empty($Status)) {
$PODate = $podt->format('d-m-Y'); $PODate = $podt->format('d-m-Y');
echo $PODate; echo $PODate;
?></td> ?></td>
<td><a target="_blank" href="<?php echo base_url() ?>purchaseorder/CreatePOPrint?PONO=<?php echo $record->PONO ?>&ReqType=<?php echo $record->RType ?>" data-id="<%=index%>" data-userid="<?php echo $record->PONO ?>"><u><?php echo $record->PONO ?> </td> <td><a style="cursor: pointer; color: #039985; text-decoration: none;" target="_blank" href="<?php echo base_url() ?>purchaseorder/CreatePOPrint?PONO=<?php echo $record->PONO ?>&ReqType=<?php echo $record->RType ?>" data-id="<%=index%>" data-userid="<?php echo $record->PONO ?>"><?php echo $record->PONO ?> </td>
<td><?php echo $record->RType ?> </td> <td><?php echo $record->RType ?> </td>
<td><?php echo $record->CostCenterName ?> </td> <td><?php echo $record->CostCenterName ?> </td>
<!-- <td><?php // echo $record->CostCenterCode <!-- <td><?php // echo $record->CostCenterCode