FIIX_Documents added : ps

This commit is contained in:
VE10-Sanjeev 2024-06-28 07:16:20 +00:00
parent 62bde8af4f
commit 4ded903ae3
5 changed files with 226 additions and 112 deletions

View File

@ -200,7 +200,7 @@ class Supplier extends BaseController
$EmailAddress = $this->request->getPost('emailid'); $EmailAddress = $this->request->getPost('emailid');
$PAN = (is_string($PAN)) ? strtoupper($PAN) : null ; $PAN = (is_string($PAN)) ? strtoupper($PAN) : null ;
$GSTNo = (is_string($GSTNo)) ? strtoupper($GSTNo) : null ; $GSTNo = (is_string($GSTNo)) ? strtoupper($GSTNo) : null ;
$MSMENo = $this->request->getPost('MSMENo'); $MSMENo = $this->request->getPost('MSME');
$accno = $this->request->getPost('accno'); $accno = $this->request->getPost('accno');
$ifsc = $this->request->getPost('ifsc'); $ifsc = $this->request->getPost('ifsc');
$branchname = $this->request->getPost('branchname'); $branchname = $this->request->getPost('branchname');
@ -214,6 +214,40 @@ class Supplier extends BaseController
$supplier = array('SupplierName' => $SupplierName, 'Address' => $Address, 'ContactNumber' => $ContactNumber, 'AlternateContactNumber' => $AlternateContactNumber, 'EmailAddress' => $EmailAddress, 'PAN' => $PAN, 'GSTNo' => $GSTNo, 'PaymentID' => $PaymentId, 'Cert_MSME' => $MSMENo, 'BankAcNumber' => $accno, 'IFSCCode' => $ifsc, 'BranchName' => $branchname, 'BankAddress' => $bankaddress, 'Createdby' => $Createdby, 'IsService' => $service, 'IsMaintanance' => $maintenance, 'IsRawMaterial' => $rawmaterial); //,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$Payment,'PayableAT'=>$PayableAT); $supplier = array('SupplierName' => $SupplierName, 'Address' => $Address, 'ContactNumber' => $ContactNumber, 'AlternateContactNumber' => $AlternateContactNumber, 'EmailAddress' => $EmailAddress, 'PAN' => $PAN, 'GSTNo' => $GSTNo, 'PaymentID' => $PaymentId, 'Cert_MSME' => $MSMENo, 'BankAcNumber' => $accno, 'IFSCCode' => $ifsc, 'BranchName' => $branchname, 'BankAddress' => $bankaddress, 'Createdby' => $Createdby, 'IsService' => $service, 'IsMaintanance' => $maintenance, 'IsRawMaterial' => $rawmaterial); //,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$Payment,'PayableAT'=>$PayableAT);
$file1 = $this->request->getFile('Cert_MSME');
$file2 = $this->request->getFile('Cert_GST');
$file3 = $this->request->getFile('Cert_BANK');
$path = ROOTPATH.'public/uploads/images/';
if ($file2 && $file2->isValid() && !$file2->hasMoved()) {
if(!is_dir($path)) { mkdir($path, 0777, true); }
$GST_DOC = $file2->getName();
$file2->move($path,$GST_DOC);
$supplier['Cert_GST'] = $GST_DOC;
}
else{
$supplier['Cert_GST'] = NULL;
}
if ($file1 && $file1->isValid() && !$file1->hasMoved()) {
if(!is_dir($path)) { mkdir($path, 0777, true); }
$MSME_DOC = $file1->getName();
$file1->move($path,$MSME_DOC);
$supplier['Cert_MSME'] = $MSME_DOC;
}
else{
$supplier['Cert_MSME'] = NULL;
}
if ($file3 && $file3->isValid() && !$file3->hasMoved()) {
if(!is_dir($path)) { mkdir($path, 0777, true); }
$BANK_DOC = $file3->getName();
$file3->move($path,$BANK_DOC);
$supplier['Cert_BANK'] = $BANK_DOC;
}
else{
$supplier['Cert_BANK'] = NULL;
}
$result = $this->supplier_model->addNewsupplier($supplier); $result = $this->supplier_model->addNewsupplier($supplier);
if ($result > 0) { if ($result > 0) {
@ -262,8 +296,42 @@ class Supplier extends BaseController
$PaymentId = $this->request->getPost('paymentid'); $PaymentId = $this->request->getPost('paymentid');
$supplier = array(); $supplier = array();
$supplier = array('SupplierName' => $SupplierName, 'Address' => $Address, 'ContactNumber' => $ContactNumber, 'AlternateContactNumber' => $AlternateContactNumber, 'EmailAddress' => $EmailAddress, 'PaymentID' => $PaymentId, 'Cert_MSME' => $MSMENo, 'BankAcNumber' => $accno, 'IFSCCode' => $ifsc, 'BranchName' => $branchname, 'BankAddress' => $bankaddress, 'UpdatedBy' => $UpdatedBy, 'IsActive' => $IsActive, 'IsService' => $service, 'IsMaintanance' => $maintanance, 'IsRawMaterial' => $rawmaterial); //'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$Payment); $supplier = array('SupplierName' => $SupplierName, 'Address' => $Address, 'ContactNumber' => $ContactNumber, 'AlternateContactNumber' => $AlternateContactNumber, 'EmailAddress' => $EmailAddress, 'PaymentID' => $PaymentId, 'MSME' => $MSMENo, 'BankAcNumber' => $accno, 'IFSCCode' => $ifsc, 'BranchName' => $branchname, 'BankAddress' => $bankaddress, 'UpdatedBy' => $UpdatedBy, 'IsActive' => $IsActive, 'IsService' => $service, 'IsMaintanance' => $maintanance, 'IsRawMaterial' => $rawmaterial); //'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$Payment);
//SupplierID, SupplierName, Address, ContactNumber, AlternateContactNumber, EmailAddress, Exiseregistration, TIN, PAN, CSTNO, CSTDate, GSTNO, GSTRange, CollectrateAddress, UANumber, PaymentTerms, PaymentDays, PayableAT, Cert_EMS, Cert_TS, Cert_IMS, Cert_ISO, Cert_OSHAS, BankAcNumber, IFSCCode, BranchName, BankAddress, Createdby, UpdatedBy, Updatedon, CreatedOn, IsActive); //SupplierID, SupplierName, Address, ContactNumber, AlternateContactNumber, EmailAddress, Exiseregistration, TIN, PAN, CSTNO, CSTDate, GSTNO, GSTRange, CollectrateAddress, UANumber, PaymentTerms, PaymentDays, PayableAT, Cert_EMS, Cert_TS, Cert_IMS, Cert_ISO, Cert_OSHAS, BankAcNumber, IFSCCode, BranchName, BankAddress, Createdby, UpdatedBy, Updatedon, CreatedOn, IsActive);
$file1 = $this->request->getFile('Cert_MSME');
$file2 = $this->request->getFile('Cert_GST');
$file3 = $this->request->getFile('Cert_BANK');
$path = ROOTPATH.'public/uploads/images/';
if ($file2 && $file2->isValid() && !$file2->hasMoved()) {
if(!is_dir($path)) { mkdir($path, 0777, true); }
$GST_DOC = $file2->getName();
$file2->move($path,$GST_DOC);
$supplier['Cert_GST'] = $GST_DOC;
}
else{
$supplier['Cert_GST'] = $this->request->getPost('hidden_Cert_GST') ? $this->request->getPost('hidden_Cert_GST') : NULL;
}
if ($file1 && $file1->isValid() && !$file1->hasMoved()) {
if(!is_dir($path)) { mkdir($path, 0777, true); }
$MSME_DOC = $file1->getName();
$file1->move($path,$MSME_DOC);
$supplier['Cert_MSME'] = $MSME_DOC;
}
else{
$supplier['Cert_MSME'] = $this->request->getPost('hidden_Cert_MSME') ? $this->request->getPost('hidden_Cert_MSME') : NULL;
}
if ($file3 && $file3->isValid() && !$file3->hasMoved()) {
if(!is_dir($path)) { mkdir($path, 0777, true); }
$BANK_DOC = $file3->getName();
$file3->move($path,$BANK_DOC);
$supplier['Cert_BANK'] = $BANK_DOC;
}
else{
$supplier['Cert_BANK'] = $this->request->getPost('hidden_Cert_BANK') ? $this->request->getPost('hidden_Cert_BANK') : NULL;
}
$result = $this->supplier_model->UpdateSupplier($supplier, $SupplierID); $result = $this->supplier_model->UpdateSupplier($supplier, $SupplierID);

View File

@ -127,7 +127,7 @@ class Supplier_model extends Model
function getSupplierInfo($supplierID = '') function getSupplierInfo($supplierID = '')
{ {
//->select('SD.SupplierID, SD.SupplierName, SD.Address, SD.ContactNumber, SD.AlternateContactNumber, SD.EmailAddress, SD.Exiseregistration, SD.TIN, SD.PAN, SD.CSTNO, SD.CSTDate, SD.GSTNO, SD.GSTRange, SD.CollectrateAddress, SD.UANumber, SD.Cert_EMS, SD.Cert_TS, SD.Cert_IMS, SD.Cert_ISO, SD.Cert_OSHAS, SD.BankAcNumber, SD.IsService, SD.IsMaintanance, SD.IsRawMaterial, SD.IFSCCode, SD.BranchName, SD.BankAddress, SD.IsActive, SD.PaymentID,PT.PaymentTerms'); //->select('SD.SupplierID, SD.SupplierName, SD.Address, SD.ContactNumber, SD.AlternateContactNumber, SD.EmailAddress, SD.Exiseregistration, SD.TIN, SD.PAN, SD.CSTNO, SD.CSTDate, SD.GSTNO, SD.GSTRange, SD.CollectrateAddress, SD.UANumber, SD.BankAcNumber, SD.IsService, SD.IsMaintanance, SD.IsRawMaterial, SD.IFSCCode, SD.BranchName, SD.BankAddress, SD.IsActive, SD.PaymentID,PT.PaymentTerms');
$builder = $this->db->table('T_SupplierDetailsN SD')->select('SD.*,PT.PaymentTerms') $builder = $this->db->table('T_SupplierDetailsN SD')->select('SD.*,PT.PaymentTerms')
->join('T_PaymentTerms PT', 'PT.PaymentID = SD.PaymentID', 'left') ->join('T_PaymentTerms PT', 'PT.PaymentID = SD.PaymentID', 'left')
->where('SD.SupplierID', $supplierID); ->where('SD.SupplierID', $supplierID);
@ -172,7 +172,7 @@ class Supplier_model extends Model
{ {
$builder = $this->db->table('T_SupplierDetailsN as det') $builder = $this->db->table('T_SupplierDetailsN as det')
->select('det.SupplierID,SupplierName,det.Address,det.ContactNumber,det.AlternateContactNumber,det.EmailAddress, ->select('det.SupplierID,SupplierName,det.Address,det.ContactNumber,det.AlternateContactNumber,det.EmailAddress,
det.PAN,det.GSTNO,det.Cert_MSME, det.PAN,det.GSTNO,det.MSME,
CONCAT(det.BankAcNumber, "-", det.IFSCCode, "-", det.BranchName," ", det.BankAddress) AS ConcatenatedBankDetails, CONCAT(det.BankAcNumber, "-", det.IFSCCode, "-", det.BranchName," ", det.BankAddress) AS ConcatenatedBankDetails,
pmt.PaymentTerms,det.IsService,det.IsMaintanance,det.IsRawMaterial,emp.firstname ,emp1.firstname as Update_by,det.IsActive') pmt.PaymentTerms,det.IsService,det.IsMaintanance,det.IsRawMaterial,emp.firstname ,emp1.firstname as Update_by,det.IsActive')
->join('tbl_users as tbl', ' det.createdby = tbl.userid', 'left') ->join('tbl_users as tbl', ' det.createdby = tbl.userid', 'left')

View File

@ -204,18 +204,15 @@
</script> </script>
<style> <style>
/* legend { legend {
color: #00c0ef ! important; border-bottom: 2px solid #FFF !important;
} */ margin-left: -2%;
}
.form-group { .form-group {
padding-bottom: 4%; padding-bottom: 4%;
} }
.pad {
padding-bottom: 1%;
}
.badge { .badge {
color: red; color: red;
background-color: #fff; background-color: #fff;
@ -253,23 +250,19 @@
<!-- form start --> <!-- form start -->
<div class="row" style="padding-left:11px;"> <div class="row" style="font-size:11px; padding-left:38px;">
<div class="col-md-12"><br /> <div class="col-md-12"><br />
<form class="form-horizontal" role="form" id="addsupplier" action="<?php echo base_url() ?>addNewsupplier" method="post" role="form"> <form class="form-horizontal" role="form" id="addsupplier" action="<?php echo base_url() ?>addNewsupplier" method="post" role="form" enctype="multipart/form-data">
<div class="box-body"> <div class="box-body">
<!-- Form Name --> <!-- Form Name -->
<legend>Supplier Information</legend> <legend>Supplier Information</legend>
<div class="col-md-12"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-3"> <div class="col-md-3">
<span for="SupplierName">Supplier Name</span><span class="badge">*</span> <span for="SupplierName">Supplier Name</span><span class="badge">*</span>
<input type="text" name="SupplierName" onkeypress="return onlyAlphabets(event);" maxlength="100" id="supplierName" class="form-control" required> <input type="text" name="SupplierName" onkeypress="return onlyAlphabets(event);" maxlength="100" id="supplierName" class="form-control" required>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<span for="ContactNumber">Contact Number</span><span class="badge">*</span> <span for="ContactNumber">Contact Number</span><span class="badge">*</span>
<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();" id="ContactNumber" required maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number" onkeypress="return isNumberKey(event)"> <input type="text" name="ContactNumber" onchange="return getContactNumberValidation();" id="ContactNumber" required maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number" onkeypress="return isNumberKey(event)">
@ -278,13 +271,12 @@
<span for="AlternateContactNumber">Alternate Contact Number</span> <span for="AlternateContactNumber">Alternate Contact Number</span>
<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();" id="AlternateContactNumber" maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number" onkeypress="return isNumberKey(event)"> <input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();" id="AlternateContactNumber" maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number" onkeypress="return isNumberKey(event)">
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<span for="EmailAddress">Email ID</span><span class="badge">*</span> <span for="EmailAddress">Email ID</span><span class="badge">*</span>
<input type="email" name="emailid" id="emailid" required maxlength="100" class="form-control"> <input type="email" name="emailid" id="emailid" required maxlength="100" class="form-control">
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-12"><span for="SupplierType">Supplier Type</span><!--<span class="badge">*</span>--> <div class="col-md-12"><span for="SupplierType">Supplier Type</span><!--<span class="badge">*</span>-->
&ensp; &ensp;
<input type="checkbox" id="service" name="service" value="<?php echo $service = (isset($_POST['service'])) ? 0 : 1; ?>"> <b>SERVICE &ensp;</b> <input type="checkbox" id="service" name="service" value="<?php echo $service = (isset($_POST['service'])) ? 0 : 1; ?>"> <b>SERVICE &ensp;</b>
@ -292,42 +284,47 @@
<input type="checkbox" id="maintanance" name="maintanance" value="<?php echo $maintanance = (isset($_POST['maintanance'])) ? 0 : 1; ?>"> <b>MAINTENANCE &ensp;</b> <input type="checkbox" id="maintanance" name="maintanance" value="<?php echo $maintanance = (isset($_POST['maintanance'])) ? 0 : 1; ?>"> <b>MAINTENANCE &ensp;</b>
</div> </div>
</div> </div>
<!-- Address Section --> <!-- Address Section -->
<!-- Form Name --> <!-- Form Name -->
<legend>Address Details</legend> <legend>Address Details</legend>
<!-- Text input--> <!-- Text input-->
<div class="col-md-12"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-12"><span for="Address2">Address</span><span class="badge">*</span> <div class="col-md-12"><span for="Address2">Address</span><span class="badge">*</span>
<input type="text" class="form-control required" id="Address" name="Address" maxlength="500" required> <input type="text" class="form-control required" id="Address" name="Address" maxlength="500" required>
</div> </div>
</div> </div>
<legend>Tax Related Data</legend> <legend>Tax Related Data</legend>
<!-- Text input--> <!-- Text input-->
<div class="col-md-12"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-3 pad"> <div class="col-md-3">
<span for="GSTNo">GST Number</span><!--<span class="badge">*</span> --> <span for="GSTNo">GST Number</span><!--<span class="badge">*</span> -->
<input type="text" id="GSTNo" name="GSTNo" class="form-control" maxlength="15" onchange="validateGST();" style="text-transform:uppercase;" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' and 1 Number or Character" onkeypress="return alphaNumberic(event)"> <input type="text" id="GSTNo" name="GSTNo" class="form-control" maxlength="15" onchange="validateGST();" style="text-transform:uppercase;" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' and 1 Number or Character" onkeypress="return alphaNumberic(event)">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3">
<span for="PAN">PAN</span> <!--<span class="badge">*</span>--> <span for="PAN">PAN</span> <!--<span class="badge">*</span>-->
<input type="text" id="panno" maxlength="10" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" name="panno" style="text-transform:uppercase;" onchange="validatePAN();" class="form-control" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character should be in caps)" onkeypress="return alphaNumberic(event)"> <input type="text" id="panno" maxlength="10" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" name="panno" style="text-transform:uppercase;" onchange="validatePAN();" class="form-control" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character should be in caps)" onkeypress="return alphaNumberic(event)">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3">
<input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_GST" name="Cert_GST"/>
<label for="Cert_GST">Select GST Document<br/><small>(only .pdf, .doc, .png, .jpg)</small></label>
</div>
</div>
<div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-6">
<span for="MSME">MSME</span> <span for="MSME">MSME</span>
<input type="text" id="MSMENo" name="MSMENo" style="text-transform:uppercase;" class="form-control" onkeypress="return alphaNumberic(event)"> <input type="text" id="MSMENo" name="MSME" class="form-control" maxlength="30">
</div>
<div class="col-md-3">
<input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_MSME" name="Cert_MSME"/>
<label for="Cert_MSME">Select MSME Document<br/><small>(only .pdf, .doc, .png, .jpg)</small></label>
</div> </div>
</div> </div>
<!-- Text input--> <!-- Text input-->
<legend>Bank Details</legend> <legend>Bank Details</legend>
<!-- Text input--> <!-- Text input-->
<div class="col-md-12"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-3"><span>Account Number</span><span class="badge">*</span> <div class="col-md-3"><span>Account Number</span><span class="badge">*</span>
<input type="text" id="accno" name="accno" maxlength="20" class="form-control" onkeypress="return isNumberKey(event)" required> <input type="text" id="accno" name="accno" maxlength="20" class="form-control" onkeypress="return isNumberKey(event)" required>
</div> </div>
@ -341,12 +338,18 @@
<input type="text" id="bankaddress" name="bankaddress" maxlength="200" class="form-control"> <input type="text" id="bankaddress" name="bankaddress" maxlength="200" class="form-control">
</div> </div>
</div> </div>
<div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-3">
<input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_BANK" name="Cert_BANK"/>
<label for="Cert_BANK">Select Bank Document<br/><small>(only .pdf, .doc, .png, .jpg)</small></label>
</div>
</div>
<legend>Payment Details</legend> <legend>Payment Details</legend>
<!-- Text input--> <!-- Text input-->
<div class="col-md-12"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-3"> <div class="col-md-3">
<span for="payablefrom">Payable Terms</span> <span for="payablefrom">Payable Terms</span>
<select class="form-control required select2" id="Payment" name="Payment" onchange="payment_hidden();"> <!-- onchange="storeVal(this,'hiddenVal');"> --> <select class="form-control required select2" id="Payment" name="Payment" onchange="payment_hidden();"> <!-- onchange="storeVal(this,'hiddenVal');"> -->
@ -365,12 +368,11 @@
<!--<input type="hidden" id="paymentname" name="paymentname" value=""> --> <!--<input type="hidden" id="paymentname" name="paymentname" value=""> -->
</div> </div>
</div> </div>
</div> <div class="col-md-12 text-right">
<div class="box-footer" style="text-align:right">
<input type="reset" id="reset" class="btn btn-success" value="Reset" /> <input type="reset" id="reset" class="btn btn-success" value="Reset" />
<input type="submit" onclick="return Validate();" value="Submit" class="btn btn-success"> <input type="submit" onclick="return Validate();" value="Submit" class="btn btn-success">
</div> </div>
</div>
</form> </form>
</div><!-- /.col-lg-12 --> </div><!-- /.col-lg-12 -->
</div><!-- /.row --> </div><!-- /.row -->
@ -487,21 +489,20 @@
success: function(data) { success: function(data) {
if(data){ if(data){
var answer = confirm(data + " supplier details already exist in the database. Do you want to change the supplier details?"); var answer = confirm(data + " supplier details already exist in the database. Do you want to change the supplier details?");
if (answer) if (answer) {
{
$('#panno').val(''); $('#panno').val('');
$('#panno').focus(); $('#panno').focus();
return false; return false;
} } else {
else
{
alert('Please edit the supplier details in the Edit screen and change the supplier status to Active'); alert('Please edit the supplier details in the Edit screen and change the supplier status to Active');
window.location = 'supplierlisting'; window.location = '<?= site_url('supplierlisting') ?>'; // Use site_url() to generate the correct URL for redirection
} }
} }
}, },
error: function() { error: function() {
alert("error"); alert('Error occurred while checking PAN number.');
$('#panno').val('');
$('#panno').focus();
} }
}); });
@ -530,13 +531,15 @@
return false; return false;
} else { } else {
alert('Please edit the supplier details in the Edit screen and change the supplier status to Active'); alert('Please edit the supplier details in the Edit screen and change the supplier status to Active');
window.location = 'supplierlisting'; window.location = '<?= site_url('supplierlisting') ?>'; // Use site_url() to generate the correct URL for redirection
} }
} }
}, },
error: function() { error: function() {
alert("error"); alert('Error occurred while checking GST number.');
$('#GSTNo').val(''); // Clear GSTNo field
$('#GSTNo').focus(); // Focus on GSTNo field
} }
}); });
@ -576,7 +579,7 @@
}, },
error: function() { error: function() {
$('#content').loader('hide'); $('#content').loader('hide');
alert("Error Occur"); // alert("Error Occur");
} }
}); });
}); });

View File

@ -12,7 +12,7 @@ $PaymentTerms = '';
$IsActive = ''; $IsActive = '';
$CSTNO = ''; $CSTNO = '';
$CSTDate = ''; $CSTDate = '';
$MSMENo = ''; $MSME = '';
$accno = ''; $accno = '';
$ifsc = ''; $ifsc = '';
$branchname = ''; $branchname = '';
@ -21,6 +21,9 @@ $IsService = '';
$IsMaintanance = ''; $IsMaintanance = '';
$IsRawMaterial = ''; $IsRawMaterial = '';
$PaymentId = ''; $PaymentId = '';
$hidden_Cert_MSME = '';
$hidden_Cert_GST = '';
$hidden_Cert_BANK = '';
if (!empty($supplier)) { if (!empty($supplier)) {
foreach ($supplier as $uf) { foreach ($supplier as $uf) {
@ -41,12 +44,15 @@ if (!empty($supplier)) {
$IsMaintanance = ($mt == 1) ? 'checked' : ''; $IsMaintanance = ($mt == 1) ? 'checked' : '';
$rm = $uf->IsRawMaterial; $rm = $uf->IsRawMaterial;
$IsRawMaterial = ($rm == 1) ? 'checked' : ''; $IsRawMaterial = ($rm == 1) ? 'checked' : '';
$MSMENo = $uf->Cert_MSME; $MSME = $uf->MSME;
$accno = $uf->BankAcNumber; $accno = $uf->BankAcNumber;
$IFSCCode = $uf->IFSCCode; $IFSCCode = $uf->IFSCCode;
$branchname = $uf->BranchName; $branchname = $uf->BranchName;
$bankaddress = $uf->BankAddress; $bankaddress = $uf->BankAddress;
$PaymentId = $uf->PaymentID; $PaymentId = $uf->PaymentID;
$hidden_Cert_MSME = $uf->Cert_MSME;
$hidden_Cert_GST = $uf->Cert_GST;
$hidden_Cert_BANK = $uf->Cert_BANK;
} }
} }
@ -226,12 +232,12 @@ if (!empty($supplier)) {
<style> <style>
legend { legend {
/* color: #00c0ef ! important; */ border-bottom: 2px solid #FFF !important;
margin-left: -2%; margin-left: -2%;
} }
.pad { .text-right {
padding-bottom: 1%; text-align: right;
} }
.badge { .badge {
@ -243,7 +249,7 @@ if (!empty($supplier)) {
<!-- Content Header (Page header) --> <!-- Content Header (Page header) -->
<section class="content-header"> <section class="content-header">
<h1> <h1>
<center> Edit <?php echo $SupplierID; ?> DETAILS</center> <center> Edit <?php echo $SupplierName; ?> Details</center>
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<a class="btn btn-success" href="<?php echo base_url(); ?>supplierlisting">&nbsp;&nbsp;<span class="bold">Back</span></a> <a class="btn btn-success" href="<?php echo base_url(); ?>supplierlisting">&nbsp;&nbsp;<span class="bold">Back</span></a>
@ -257,36 +263,38 @@ if (!empty($supplier)) {
<div class="box box-success"> <div class="box box-success">
<div class="row" style="font-size:11px; padding-left:38px;"> <div class="row" style="font-size:11px; padding-left:38px;">
<div class="col-md-12"><br/> <div class="col-md-12">
<form class="form-horizontal" role="form" id="UpdateSupplier" action="<?php echo base_url() ?>editsupplier" method="post" role="form"> <form class="form-horizontal" role="form" id="UpdateSupplier" action="<?php echo base_url() ?>editsupplier" method="post" role="form" enctype="multipart/form-data">
<div class="box-body"> <div class="box-body">
<div class="col-md-12 text-right">
<input type="checkbox" id="isactive" <?php echo $IsActive; ?> name="isactive"> IsActive
</div>
<!-- Form Name --> <!-- Form Name -->
<legend>Supplier Information</legend> <legend>Supplier Information</legend>
<div class="col-md-12"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-2 pad"> <div class="col-md-2">
<span for="SupplierID">Supplier ID</span> <span for="SupplierID">Supplier ID</span>
<input type="text" name="SupplierID" id="SupplierID" class="form-control" readonly value="<?php echo $SupplierID; ?>"> <input type="text" name="SupplierID" id="SupplierID" class="form-control" readonly value="<?php echo $SupplierID; ?>">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3">
<span for="SupplierName">Supplier Name</span><span class="badge">*</span> <span for="SupplierName">Supplier Name</span><span class="badge">*</span>
<input type="text" name="SupplierName" onkeypress="return onlyAlphabets(event);" maxlength="100" id="supplierName" class="form-control" required value="<?php echo $SupplierName; ?>"> <input type="text" name="SupplierName" onkeypress="return onlyAlphabets(event);" maxlength="100" id="supplierName" class="form-control" required value="<?php echo $SupplierName; ?>">
</div> </div>
<div class="col-md-2 pad"> <div class="col-md-2">
<span for="ContactNumber">Contact Number</span><span class="badge">*</span> <span for="ContactNumber">Contact Number</span><span class="badge">*</span>
<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();" id="ContactNumber" required maxlength="13" class="form-control" value="<?php echo $ContactNumber; ?>" title="Please Enter Contact Number (or) Telephone Number" onkeypress="return isNumberKey(event)"> <input type="text" name="ContactNumber" onchange="return getContactNumberValidation();" id="ContactNumber" required maxlength="13" class="form-control" value="<?php echo $ContactNumber; ?>" title="Please Enter Contact Number (or) Telephone Number" onkeypress="return isNumberKey(event)">
</div> </div>
<div class="col-md-2 pad"> <div class="col-md-2">
<span for="AlternateContactNumber">Alternate Contact Number</span> <span for="AlternateContactNumber">Alternate Contact Number</span>
<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();" id="AlternateContactNumber" maxlength="13" class="form-control" value="<?php echo $AlternateContactNumber; ?>" title="Please Enter Contact Number (or) Telephone Number" onkeypress="return isNumberKey(event)"> <input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();" id="AlternateContactNumber" maxlength="13" class="form-control" value="<?php echo $AlternateContactNumber; ?>" title="Please Enter Contact Number (or) Telephone Number" onkeypress="return isNumberKey(event)">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3">
<span for="EmailAddress">Email ID</span><span class="badge">*</span> <span for="EmailAddress">Email ID</span><span class="badge">*</span>
<input type="email" name="emailid" id="emailid" pattern="([A-Z0-9_\-\.])+\@([A-Z0-9_\-\.])+\.([A-Z]{2,4})" required maxlength="100" class="form-control" value="<?php echo $EmailAddress; ?>" title="Please Enter valid mail address" onchange="validateEmail();"> <input type="email" name="emailid" id="emailid" pattern="([A-Z0-9_\-\.])+\@([A-Z0-9_\-\.])+\.([A-Z]{2,4})" required maxlength="100" class="form-control" value="<?php echo $EmailAddress; ?>" title="Please Enter valid mail address" onchange="validateEmail();">
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-6"><span for="SupplierType">Supplier Type :</span><!--<span class="badge">*</span>--> <div class="col-md-6"><span for="SupplierType">Supplier Type :</span><!--<span class="badge">*</span>-->
&ensp; &ensp;
<input type="checkbox" id="service" <?php echo $IsService; ?> name="service" value="1"> <b>SERVICE &ensp;</b> <input type="checkbox" id="service" <?php echo $IsService; ?> name="service" value="1"> <b>SERVICE &ensp;</b>
@ -294,14 +302,13 @@ if (!empty($supplier)) {
<input type="checkbox" id="maintanance" <?php echo $IsMaintanance; ?> name="maintanance" value="1"> <b>MAINTENANCE &ensp;</b> <input type="checkbox" id="maintanance" <?php echo $IsMaintanance; ?> name="maintanance" value="1"> <b>MAINTENANCE &ensp;</b>
</div> </div>
<div class="col-md-5"><input type="checkbox" id="isactive" <?php echo $IsActive; ?> name="isactive"> IsActive </div>
</div> </div>
<!-- Address Section --> <!-- Address Section -->
<!-- Form Name --> <!-- Form Name -->
<legend>Address Details</legend> <legend>Address Details</legend>
<!-- Text input--> <!-- Text input-->
<div class="col-md-12"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-12"> <div class="col-md-12">
<span for="Address2">Address</span><span class="badge">*</span> <span for="Address2">Address</span><span class="badge">*</span>
<input type="text" class="form-control required" id="Address" name="Address" maxlength="500" required value="<?php echo $Address; ?>"> <input type="text" class="form-control required" id="Address" name="Address" maxlength="500" required value="<?php echo $Address; ?>">
@ -312,22 +319,44 @@ if (!empty($supplier)) {
<legend>Tax Related Data</legend> <legend>Tax Related Data</legend>
<!-- Text input--> <!-- Text input-->
<div class="col-md-12"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-3 pad"><span for="GSTNo">GST Number</span><!--<span class="badge">*</span>--> <div class="col-md-3"><span for="GSTNo">GST Number</span><!--<span class="badge">*</span>-->
<input type="text" id="GSTNo" name="GSTNo" onchange="validateGST();" maxlength="15" class="form-control" value="<?php echo $GSTNO; ?>" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" style="text-transform:uppercase;" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' Character and 1 Number (or) Character " onkeypress="return alphaNumberic(event)"> <input type="text" id="GSTNo" name="GSTNo" onchange="validateGST();" maxlength="15" class="form-control" value="<?php echo $GSTNO; ?>" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" style="text-transform:uppercase;" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' Character and 1 Number (or) Character " onkeypress="return alphaNumberic(event)">
</div> </div>
<div class="col-md-3 pad"><span for="PAN">PAN</span> <!--<span class="badge">*</span>--> <div class="col-md-3"><span for="PAN">PAN</span> <!--<span class="badge">*</span>-->
<input type="text" id="panno" maxlength="10" name="panno" onchange="validatePAN();" class="form-control" value="<?php echo $PAN; ?>" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character must be in caps format)" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" onkeypress="return alphaNumberic(event)" style="text-transform:uppercase;"> <input type="text" id="panno" maxlength="10" name="panno" onchange="validatePAN();" class="form-control" value="<?php echo $PAN; ?>" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character must be in caps format)" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" onkeypress="return alphaNumberic(event)" style="text-transform:uppercase;">
</div> </div>
<div class="col-md-6 pad"><span for="MSMENo">MSME Number</span> <div class="col-md-3">
<input type="text" class="form-control " id="MSMENo" name="EMSNo" value="<?php echo $MSMENo; ?>" maxlength="15"> <input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_GST" name="Cert_GST"/>
<label for="Cert_GST">Select GST Document<br/><small>(only .pdf, .doc, .png, .jpg)</small></label>
<input type="hidden" id="hidden_Cert_GST" name="hidden_Cert_GST" value="<?php echo $hidden_Cert_GST; ?>"/>
</div> </div>
<?php if($hidden_Cert_GST){ ?>
<div class="col-md-3">
<u><a title="previously uploaded GST Document" href="<?php echo base_url().'public/uploads/images/' . $hidden_Cert_GST ?>"><span>previously uploaded GST Document - </span><small><?= $hidden_Cert_GST; ?></small></a></u>
</div>
<?php } ?>
</div> </div>
<div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-6"><span for="MSMENo">MSME Number</span>
<input type="text" id="MSMENo" name="MSME" class="form-control" value="<?php echo $MSME; ?>" maxlength="30">
</div>
<div class="col-md-3">
<input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_MSME" name="Cert_MSME"/>
<label for="Cert_MSME">Select MSME Document<br/><small>(only .pdf, .doc, .png, .jpg)</small></label>
<input type="hidden" id="hidden_Cert_MSME" name="hidden_Cert_MSME" value="<?php echo $hidden_Cert_MSME; ?>"/>
</div>
<?php if($hidden_Cert_MSME){ ?>
<div class="col-md-3">
<u> <a title="previously uploaded MSME Document" href="<?php echo base_url().'public/uploads/images/' . $hidden_Cert_MSME ?>"><span>previously uploaded MSME Document - </span><small><?= $hidden_Cert_MSME; ?></small></a></u>
</div>
<?php } ?>
</div>
<legend>Bank Details</legend> <legend>Bank Details</legend>
<!-- Text input--> <!-- Text input-->
<div class="col-md-12"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-3"><span>Account Number</span><span class="badge">*</span> <div class="col-md-3"><span>Account Number</span><span class="badge">*</span>
<input type="text" id="accno" maxlength="20" name="accno" value="<?php echo $accno; ?>" class="form-control" onkeypress="return isNumberKey(event)" required> <input type="text" id="accno" maxlength="20" name="accno" value="<?php echo $accno; ?>" class="form-control" onkeypress="return isNumberKey(event)" required>
</div> </div>
@ -341,12 +370,25 @@ if (!empty($supplier)) {
<input type="text" id="bankaddress" name="bankaddress" value="<?php echo $bankaddress; ?>" class="form-control" maxlength="200"> <input type="text" id="bankaddress" name="bankaddress" value="<?php echo $bankaddress; ?>" class="form-control" maxlength="200">
</div> </div>
</div> </div>
<div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-3">
<input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_BANK" name="Cert_BANK"/>
<label for="Cert_BANK">Select Bank Document<br/><small>(only .pdf, .doc, .png, .jpg)</small></label>
<input type="hidden" id="hidden_Cert_BANK" name="hidden_Cert_BANK" value="<?php echo $hidden_Cert_BANK; ?>"/>
</div>
<?php if($hidden_Cert_BANK){ ?>
<div class="col-md-3">
<u><a title="previously uploaded Bank Document" href="<?php echo base_url().'public/uploads/images/' . $hidden_Cert_BANK ?>"><span>previously uploaded BANK Document - </span><small><?= $hidden_Cert_BANK; ?></small></a></u>
</div>
<?php } ?>
</div>
<!-- Text input--> <!-- Text input-->
<legend>Payment Details</legend> <legend>Payment Details</legend>
<!-- Text input--> <!-- Text input-->
<div class="col-md-12"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-3"> <div class="col-md-3">
<span for="payablefrom">Payable Terms</span> <span for="payablefrom">Payable Terms</span>
<select class="form-control required select2" id="PaymentTerms" name="PaymentTerms" onchange="payment_hidden();"><!-- placeholder="Select ">--> <select class="form-control required select2" id="PaymentTerms" name="PaymentTerms" onchange="payment_hidden();"><!-- placeholder="Select ">-->
@ -368,11 +410,10 @@ if (!empty($supplier)) {
</div> </div>
</div> </div>
<div class="col-md-12 text-right">
<input type="submit" onclick="validate();" value="Submit" class="btn btn-success">
<a href="<?php echo base_url() ?>supplierlisting" class="btn btn-success" value="Cancel" />Cancel</a>
</div> </div>
<div class="box-footer" style="text-align:right">
<input type="submit" onclick="validate();" value="Submit" class="btn btn-success">
<a href="<?php echo base_url() ?>supplierlisting" class="btn btn-success" value="Cancel" />Cancel</a>
</div> </div>
</form> </form>
</div><!-- /.col-lg-12 --> </div><!-- /.col-lg-12 -->
@ -485,7 +526,8 @@ if (id != '') {
} }
}, },
error: function() { error: function() {
alert("error"); // alert("error");
console.log("an error occur supplierPANExist")
} }
}); });
@ -509,18 +551,19 @@ if (id != '') {
if (data) { if (data) {
var answer = confirm(data + " " + " supplier details is already exists in the database.Do you want to change the SUPPLIER details?") var answer = confirm(data + " " + " supplier details is already exists in the database.Do you want to change the SUPPLIER details?")
if (answer) { if (answer) {
$('#GSTNo').val(''); $('#GSTNo').val('');
$('#GSTNo').focus(); $('#GSTNo').focus();
return false; return false;
} else { } else {
alert('Please edit the supplier details in the Edit screen and change the supplier status to Active'); alert('Please edit the supplier details in the Edit screen and change the supplier status to Active');
window.location = 'supplierlisting'; window.location = '<?= site_url('supplierlisting') ?>'; // Use site_url() to generate the correct URL for redirection
} }
} }
}, },
error: function() { error: function() {
alert("error"); alert('Error occurred while checking GST number.');
$('#GSTNo').val(''); // Clear GSTNo field
$('#GSTNo').focus(); // Focus on GSTNo field
} }
}); });
@ -559,7 +602,9 @@ if (id != '') {
}, },
error: function() { error: function() {
$('#content').loader('hide'); $('#content').loader('hide');
alert("Error Occur"); // alert("Error Occur");
console.log("an error occur supplierExist")
} }
}); });
}); });

View File

@ -1688,11 +1688,9 @@ CREATE TABLE `T_SupplierDetailsN` (
`UANumber` varchar(20) DEFAULT NULL, `UANumber` varchar(20) DEFAULT NULL,
`PaymentDays` varchar(20) DEFAULT NULL, `PaymentDays` varchar(20) DEFAULT NULL,
`PayableAT` varchar(20) DEFAULT NULL, `PayableAT` varchar(20) DEFAULT NULL,
`Cert_EMS` varchar(100) DEFAULT NULL, `Cert_MSME` varchar(100) DEFAULT NULL,
`Cert_TS` varchar(100) DEFAULT NULL, `Cert_GST` varchar(100) DEFAULT NULL,
`Cert_IMS` varchar(100) DEFAULT NULL, `Cert_BANK` varchar(100) DEFAULT NULL,
`Cert_ISO` varchar(100) DEFAULT NULL,
`Cert_OSHAS` varchar(100) DEFAULT NULL,
`BankAcNumber` varchar(20) DEFAULT NULL, `BankAcNumber` varchar(20) DEFAULT NULL,
`IsService` tinyint(1) DEFAULT '0', `IsService` tinyint(1) DEFAULT '0',
`IsMaintanance` tinyint(1) DEFAULT '0', `IsMaintanance` tinyint(1) DEFAULT '0',
@ -1705,7 +1703,7 @@ CREATE TABLE `T_SupplierDetailsN` (
`Updatedon` datetime DEFAULT CURRENT_TIMESTAMP, `Updatedon` datetime DEFAULT CURRENT_TIMESTAMP,
`CreatedOn` datetime DEFAULT CURRENT_TIMESTAMP, `CreatedOn` datetime DEFAULT CURRENT_TIMESTAMP,
`IsActive` tinyint(1) DEFAULT '1', `IsActive` tinyint(1) DEFAULT '1',
`Cert_MSME` varchar(100) DEFAULT NULL, `MSME` varchar(100) DEFAULT NULL,
`PaymentID` varchar(5) DEFAULT NULL, `PaymentID` varchar(5) DEFAULT NULL,
`PaymentOtherDescription` text, `PaymentOtherDescription` text,
`PaymentTerms` varchar(50) DEFAULT NULL, `PaymentTerms` varchar(50) DEFAULT NULL,