supplier pages changed

This commit is contained in:
sriramv 2017-04-01 10:25:34 +05:30
parent 5a06c90c46
commit f113216790
5 changed files with 98 additions and 54 deletions

View File

@ -145,10 +145,11 @@ class supplier extends BaseController
$PaymentTerms = $this->input->post('PaymentTerms');
$PaymentDays = $this->input->post('PaymentDays');
$PayableAT = $this->input->post('PayableAT');
$Createdby = $this->input->post('Createdby');
$supplier = array('SupplierName'=>$SupplierName, 'Address'=>$Address, 'ContactNumber'=>$ContactNumber, 'AlternateContactNumber'=> $AlternateContactNumber,'EmailAddress'=>$EmailAddress,'Exiseregistration'=>$Exiseregistration,'TIN'=>$TIN,'PAN'=>$PAN,'GSTNo'=>$GSTNo,'GSTRange'=>$GSTRange,'CollectrateAddress'=>$CollectrateAddress,'UANumber'=>$UANumber,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$PaymentDays,'PayableAT'=>$PayableAT,'createdDate'=>date('Y-m-d H:i:sa'));
$supplier = array('SupplierName'=>$SupplierName, 'Address'=>$Address, 'ContactNumber'=>$ContactNumber, 'AlternateContactNumber'=> $AlternateContactNumber,'EmailAddress'=>$EmailAddress,'Exiseregistration'=>$Exiseregistration,'TIN'=>$TIN,'PAN'=>$PAN,'GSTNo'=>$GSTNo,'GSTRange'=>$GSTRange,'CollectrateAddress'=>$CollectrateAddress,'UANumber'=>$UANumber,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$PaymentDays,'PayableAT'=>$PayableAT,'Createdby'=>$Createdby,'createdDate'=>date('Y-m-d H:i:sa'));
$this->load->model('supplier_model');
$result = $this->supplier_model->addNewsupplier($supplier);
@ -237,6 +238,7 @@ class supplier extends BaseController
$PaymentTerms = $this->input->post('PaymentTerms');
$PaymentDays = $this->input->post('PaymentDays');
$PayableAT = $this->input->post('PayableAT');
$UpdatedBy = $this->input->post('UpdatedBy');
$supplier = array();
@ -245,10 +247,10 @@ class supplier extends BaseController
if(empty($ContactNumber))
{
$supplier = array('SupplierName'=>$SupplierName, 'Address'=>$Address, 'ContactNumber'=>$ContactNumber, 'AlternateContactNumber'=> $AlternateContactNumber,'EmailAddress'=>$EmailAddress,'TIN'=>$TIN,'Exiseregistration'=>$Exiseregistration,'PAN'=>$PAN,'GSTNo'=>$GSTNo,'GSTRange'=>$GSTRange,'CollectrateAddress'=>$CollectrateAddress,'UANumber'=>$UANumber,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$PaymentDays,'PayableAT'=>$PayableAT,'createdDate'=>date('Y-m-d H:i:sa'));
$supplier = array('SupplierName'=>$SupplierName, 'Address'=>$Address, 'ContactNumber'=>$ContactNumber, 'AlternateContactNumber'=> $AlternateContactNumber,'EmailAddress'=>$EmailAddress,'TIN'=>$TIN,'Exiseregistration'=>$Exiseregistration,'PAN'=>$PAN,'GSTNo'=>$GSTNo,'GSTRange'=>$GSTRange,'CollectrateAddress'=>$CollectrateAddress,'UANumber'=>$UANumber,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$PaymentDays,'PayableAT'=>$PayableAT,'UpdatedBy'=>$UpdatedBy,'createdDate'=>date('Y-m-d H:i:sa'));
}
else{
$supplier = array('SupplierName'=>$SupplierName, 'Address'=>$Address, 'ContactNumber'=>$ContactNumber, 'AlternateContactNumber'=> $AlternateContactNumber,'EmailAddress'=>$EmailAddress,'TIN'=>$TIN,'Exiseregistration'=>$Exiseregistration,'PAN'=>$PAN,'GSTNo'=>$GSTNo,'GSTRange'=>$GSTRange,'CollectrateAddress'=>$CollectrateAddress,'UANumber'=>$UANumber,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$PaymentDays,'PayableAT'=>$PayableAT,'createdDate'=>date('Y-m-d H:i:sa'));
$supplier = array('SupplierName'=>$SupplierName, 'Address'=>$Address, 'ContactNumber'=>$ContactNumber, 'AlternateContactNumber'=> $AlternateContactNumber,'EmailAddress'=>$EmailAddress,'TIN'=>$TIN,'Exiseregistration'=>$Exiseregistration,'PAN'=>$PAN,'GSTNo'=>$GSTNo,'GSTRange'=>$GSTRange,'CollectrateAddress'=>$CollectrateAddress,'UANumber'=>$UANumber,'PaymentTerms'=>$PaymentTerms,'PaymentDays'=>$PaymentDays,'PayableAT'=>$PayableAT,'UpdatedBy'=>$UpdatedBy,'createdDate'=>date('Y-m-d H:i:sa'));
}
$result = $this->supplier_model->editsupplier($supplier, $supplierID);

View File

@ -137,7 +137,7 @@ function addNewsupplier($supplier)
*/
function getuserInfo($supplierID)
{
$this->db->select('SupplierID, SupplierName,Address,ContactNumber,AlternateContactNumber,Exiseregistration,EmailAddress,TIN,PAN,,GSTNO,GSTRange,CollectrateAddress,UANumber,PaymentTerms,PaymentDays,PayableAT,CreatedDate');
$this->db->select('SupplierID, SupplierName,Address,ContactNumber,AlternateContactNumber,Exiseregistration,EmailAddress,TIN,PAN,,GSTNO,GSTRange,CollectrateAddress,UANumber,PaymentTerms,PaymentDays,PayableAT,Createdby,UpdatedBy');
$this->db->from('T_SupplierDetailsN');
//$this->db->where('isDeleted', 0);
//$this->db->where('roleId !=', 1);

View File

@ -32,7 +32,7 @@
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="PAN">PAN</label>
<input type="text" class="form-control" id="PAN" name="PAN" onchange="validatePAN()"title="please correct enter the pan number"maxlength="10">
<input type="text" class="form-control" id="PAN" name="PAN" style="text-transform:uppercase" onchange="validatePAN()"title="please correct enter the pan number"maxlength="10">
</div>
</div>
<div class="col-md-6 col-xs-6">
@ -56,13 +56,13 @@
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="ContactNumber">Contact Number</label>
<input type="text" class="form-control" onchange="validatenumbers()" id="number" title="please enter valid phone number" name="ContactNumber" minlength="10" maxlength="11">
<input type="text" class="form-control" pattern="^\d{10,11}$" id="number" title="please enter valid phone number" name="ContactNumber" minlength="10" maxlength="11">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="AlternateContactNumber">Alternate Contact Number</label>
<input type="tel" class="form-control" pattern="[0-9]{11}" id="Number" name="AlternateContactNumber" minlength="10" maxlength="11">
<input type="tel" class="form-control" pattern="^\d{10,11}$" id="Number" name="AlternateContactNumber" minlength="10" maxlength="11">
</div>
</div>
@ -83,7 +83,7 @@
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="TIN">TIN</label>
<input type="text" class="form-control required" id="TIN" name="TIN" minlength="10" maxlength="10">
<input type="text" class="form-control required" id="TIN" pattern="^\d{2}-\d{7}$"name="TIN" minlength="10" maxlength="10">
</div>
</div>
@ -100,7 +100,7 @@
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="Range">Range</label>
<label for="Range">GSTRange</label>
<input type="text" class="form-control " id="Range" name="GSTRange" "maxlength="10">
</div>
</div>
@ -113,7 +113,7 @@
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="UANumber">UA Number</label>
<input type="text" class="form-control " id="UANumber" name="UANumber" maxlength="10">
<input type="text" class="form-control " pattern="^\d{12}$" id="UANumber" name="UANumber" maxlength="12">
</div>
</div>
@ -160,7 +160,8 @@
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="PayableAT">Payable AT</label>
<input type="text" class="form-control required" id="PayableAT" name="PayableAT" maxlength="10">
<input type="text" class="form-control required" id="PayableAT" name="PayableAT" >
<input type="text" value="<?php echo $name;?>" class="form-control required" id="Createdby" name="Createdby" >
</div>
</div>
</div>
@ -257,7 +258,7 @@ function validateEmail() {
}
//PAN Validate
function validatePAN() {
var reg = /^(?=.*[A-Z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Z]).{1,}$/;
var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}$/;
var PAN = $('#PAN').val();
if(PAN != "")
@ -292,7 +293,7 @@ function validatesuppliername() {
}
}
function validatenumbers() {
var reg = /^[0-9]{10,11}$/
var reg = /^(\([0-9]{10}\)/;
var number = $('#number').val();
if(number != "")

View File

@ -56,14 +56,15 @@ function demo(){
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center>Supplier Details</center>
<center> ADD SUPPLIER </center>
</h1>
</section>
<section class="content">
<div style="text-align:left;">
<a href="<?php echo base_url() ?>supplierListing" class="btn btn-primary" value="Back"/>Back</a>
<div style="text-align:left;">
<a href="<?php echo base_url() ?>supplierListing" class="btn btn-primary" value="Back"/>Back</a>
</div>
<br/>
<div class="row">
@ -75,78 +76,78 @@ function demo(){
<div class="box box-primary">
<div class="box-header">
<center><h3 class="box-title">Edit Supplier Details</h3></center>
<center> <h3 class="box-title">Add Supplier Details</h3></center>
</div><!-- /.box-header -->
<!-- form start -->
<form role="form" action="<?php echo base_url() ?>editsupplier" method="post" id="editsupplier" role="form">
<form role="form" id="editsupplier" action="<?php echo base_url() ?>editsupplier" method="post" role="form">
<div class="box-body">
<div class="row">
<div class="col-md-6 col-xs-6">
<div class="form-group">
<div class="form">
<label for="PAN">PAN</label>
<input type="text" class="form-control required" id="PAN" name="PAN" maxlength="15"value="<?php echo $PAN; ?>">
<input type="text" class="form-control" id="PAN" name="PAN"style="text-transform:uppercase" onchange="validatePAN()"title="please correct enter the pan number"maxlength="10" value="<?php echo $PAN;?>">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="SupplierName">Supplier Name</label>
<input type="text" class="form-control required" id="SupplierName" name="SupplierName" maxlength="128"value="<?php echo $SupplierName; ?>">
<input type="hidden" value="<?php echo $SupplierID; ?>" name="SupplierID" id="SupplierID" readonly>
<input type="hidden" class="form control" name="SupplierID" value="<?php echo $SupplierID;?>">
<input type="text" class="form-control " id="SupplierName" onchange="validatesuppliername()"name="SupplierName" maxlength="128" value="<?php echo $SupplierName;?>"value="<?php echo $SupplierName;?>" >
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="Address">Address</label>
<input type="text" class="form-control required" id="Address" name="Address" maxlength="250" value="<?php echo $Address; ?>"></textarea>
<input type="text" class="form-control required" id="Address" name="Address" value="<?php echo $Address;?>"maxlength="250"></textarea>
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="ContactNumber">Contact Number</label>
<input type="text" class="form-control required digits" id="ContactNumber" onchange="validatenumbers()" name="ContactNumber" minlegth="10"maxlength="10" value="<?php echo $ContactNumber?>">
<input type="text" class="form-control" pattern="^\d{10}$""onchange="validatenumbers()" id="number" title="please enter valid phone number" name="ContactNumber" value="<?php echo $ContactNumber;?>">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="AlternateContactNumber">Alternate Contact Number</label>
<input type="tel" class="form-control required digits" pattern="[0-9]{11}"id="AlternateContactNumber" name="AlternateContactNumber" minlength="10"
maxlength="10" value="<?php echo $AlternateContactNumber?>">
<input type="tel" class="form-control" pattern="^\d{10}$"value="<?php echo $AlternateContactNumber;?>" id="Number" name="AlternateContactNumber" minlength="10" maxlength="11">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="EmailAddress">Email Address</label>
<input type="email" class="form-control email required" id="EmailAddress" onchange="validateEmail()" name="EmailAddress" maxlength="128" value="<?php echo $EmailAddress?>">
<input type="email" class="form-control required email" value="<?php echo $EmailAddress;?>"id="EmailAddress" onchange="validateEmail()"name="EmailAddress" maxlength="128">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="Exiseregistration">Exise Registration</label>
<input type="text" class="form-control required" id="Exiseregistration" name="Exiseregistration" maxlength="50" value="<?php echo $Exiseregistration; ?>">
<input type="text" class="form-control required"value="<?php echo $Exiseregistration;?>" id="Exiseregistration" name="Exiseregistration" minlength="10" maxlength="10">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form-group">
<label for="TIN">TIN</label>
<input type="text" class="form-control required" id="TIN" name="TIN" maxlength="50" value="<?php echo $TIN; ?>">
<input type="text" class="form-control required" pattern="^\d{2}-\d{7}$"value="<?php echo $TIN;?>" onchange="validateTIN"id="TIN" title="ex:xx-xxxxxxx"name="TIN" minlength="10" maxlength="10">
</div>
</div>
</div>
<div class="row">
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="GSTNo">GST No</label>
<input type="text" class="form-control " id="GSTNo" name="GSTNo" value="<?php echo $GSTNO; ?>"maxlength="10">
<label for="GSTNO">GST No</label>
<input type="text" class="form-control " value="<?php echo $GSTNO;?>"id="GSTNo" name="GSTNo" maxlength="10">
</div>
</div>
@ -154,20 +155,20 @@ function demo(){
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="GSTRange">Range</label>
<input type="text" class="form-control " id="GSTRange" value="<?php echo $GSTRange;?>"name="GSTRange" "maxlength="10">
<label for="Range">Range</label>
<input type="text" class="form-control " value="<?php echo $GSTRange;?>"id="Range" name="GSTRange" "maxlength="10">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="CollectrateAddress">Colletrate Address</label>
<input type="text" class="form-control " id="CollectrateAddress"value="<?php echo $CollectrateAddress;?>" name="CollectrateAddress" maxlength="255">
<input type="text" class="form-control " value="<?php echo $CollectrateAddress;?>"id="CollectrateAddress" name="CollectrateAddress" maxlength="255">
</div>
</div>
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="UANumber">UA Number</label>
<input type="text" class="form-control " id="UANumber"value="<?php echo $UANumber;?>" name="UANumber" maxlength="10">
<input type="text" class="form-control " pattern="^\d{10,11}$"value="<?php echo $UANumber;?>" id="UANumber" name="UANumber" maxlength="10">
</div>
</div>
@ -181,7 +182,7 @@ function demo(){
<div class="col-md-6 col-xs-6">
<label for="payablefrom">Payable From</label>
<select class="form-control required" id="PaymentTerms" name="PaymentTerms">
<option value="<?php echo $PaymentTerms; ?>"><?php echo $PaymentTerms;?></option>
<option value="<?php echo $PaymentTerms;?>"><?php echo $PaymentTerms;?></option>
<?php
if(!empty($payment))
{
@ -196,7 +197,7 @@ function demo(){
</select>
</div>
<div class="col-md-3 col-xs-6">
<div class="col-md-3 col-xs-6">
<div class="form">
<label for="PaymentDays" >Payment Date</label><br/>
<span> Before</span>
@ -214,16 +215,19 @@ function demo(){
<div class="col-md-6 col-xs-6">
<div class="form">
<label for="PayableAT">Payable AT</label>
<input type="text" class="form-control required" value="<?php echo $PayableAT;?>"id="PayableAT" name="PayableAT" maxlength="10">
<input type="text" value="<?php echo $PayableAT;?>"class="form-control required" id="PayableAT" name="PayableAT" >
<input type="hidden" value="<?php echo $name;?>"class="form-control required" id="UpdatedBy" name="UpdatedBy" >
</div>
</div>
</div>
</div>
</div><!-- /.box-body -->
<div class="box-footer" style="text-align:right">
<input type="submit" class="btn btn-primary" onclick="demo()" value="Submit" />
<input type="reset" class="btn btn-primary" value="Cancel" />
<input type="submit" class="btn btn-primary" value="Submit" />
<input type="reset" class="btn btn-primary" value="Reset" />
</div>
</form>
</div>
@ -259,6 +263,7 @@ function demo(){
</div>
</div>
</section>
</div>
<script>
@ -309,7 +314,7 @@ function validateEmail() {
}
//PAN Validate
function validatePAN() {
var reg = /^(?=.*[A-Z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Z]).{1,}$/;
var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}$/;
var PAN = $('#PAN').val();
if(PAN != "")
@ -343,8 +348,8 @@ function validatesuppliername() {
}
}
}
function validatenumbers() {
var reg = /^[0-9]{10,11}$/
function validatenumbers() {
var reg = /^(?=.*?[0-9])$/;
var number = $('#number').val();
if(number != "")
@ -359,6 +364,26 @@ function validatenumbers() {
return true;
}
}
}
}
function validateTIN() {
var reg = /^d{2}-\d{7}$/;
var TIN = $('#TIN').val();
if(TIN != "")
{
if (reg.test(TIN) == false)
{
alert('Please Enter Valid Number');
return (false);
}
else
{
return true;
}
}
}
</script>

View File

@ -15,6 +15,12 @@ $UANumber = '';
$PaymentTerms = '';
$PaymentDays = '';
$PayableAT = '';
$Createdby = '';
$UpdatedBy = '';
if(!empty($supplier))
{
foreach ($supplier as $uf)
@ -34,6 +40,8 @@ if(!empty($supplier))
$PaymentTerms = $uf->PaymentTerms;
$PaymentDays = $uf->PaymentDays;
$PayableAT = $uf->PayableAT;
$Createdby = $uf->Createdby;
$UpdatedBy = $uf->UpdatedBy;
}
}
@ -157,6 +165,14 @@ window.print();
<tr>
<td> <label for="PayableAT">Payable AT</label></td>
<td><?php echo $PayableAT; ?></td>
</tr>
<tr>
<td> <label for="PayableAT">Created By</label></td>
<td><?php echo $Createdby; ?></td>
</tr>
<tr>
<td> <label for="PayableAT">Updated By</label></td>
<td><?php echo $UpdatedBy; ?></td>
</tr>