SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

supplier details

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-08-02 12:54:21 +05:30
parent 29c3d98e7d
commit d452308f72
3 changed files with 414 additions and 342 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/controllers/supplier.php
View File

@ -179,7 +179,7 @@ class supplier extends BaseController
$this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]'); $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]');
$this->form_validation->set_rules('emailid','emailid', 'valid_email|max_length[128]|required'); $this->form_validation->set_rules('emailid','emailid', 'valid_email|max_length[128]|required');
$this->form_validation->set_rules('TIN','TIN','trim|required|max_length[11]'); $this->form_validation->set_rules('TIN','TIN','trim|required|max_length[11]');
$this->form_validation->set_rules('panno', 'panno', 'trim|required|max_length[10]|callback_checkPanValidate'); $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]|callback_checkPanValidate');
$this->form_validation->set_rules('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidate'); $this->form_validation->set_rules('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidate');
if($this->form_validation->run() == FALSE) if($this->form_validation->run() == FALSE)
@ -273,7 +273,7 @@ class supplier extends BaseController
$this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]'); $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|max_length[13]');
$this->form_validation->set_rules('emailid','emailid','valid_email|max_length[128]|required'); $this->form_validation->set_rules('emailid','emailid','valid_email|max_length[128]|required');
$this->form_validation->set_rules('TIN','TIN','trim|required|max_length[11]'); $this->form_validation->set_rules('TIN','TIN','trim|required|max_length[11]');
$this->form_validation->set_rules('panno', 'panno', 'trim|required|max_length[10]|callback_checkPanValidateSupplier'); $this->form_validation->set_rules('panno', 'panno', 'trim|max_length[10]|callback_checkPanValidateSupplier');
$this->form_validation->set_rules('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidateSupplier'); $this->form_validation->set_rules('GSTNo','GSTNo','trim|requried|max_length[15]|callback_checkGstValidateSupplier');

76
application/views/addsupplier.php
View File

@ -72,7 +72,7 @@ function validatePAN() {
} }
function validateGST() { function validateGST() {
var reg = /(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}$/; var reg = /(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}$/;
//alert('gst'); //alert('gst');
var GST = $('#GSTNo').val(); var GST = $('#GSTNo').val();
@ -80,7 +80,7 @@ function validateGST() {
{ {
if (reg.test(GST) == false) if (reg.test(GST) == false)
{ {
alert('Please Enter Valid GST Number Format should be 22AAAAA1111S1Z1'); alert('Please Enter Valid GST Number Format should be 12ABCDE1234A1Z1 or 12ABCDE1234A1ZA');
return (false); return (false);
} }
else else
@ -158,7 +158,7 @@ function getContactNumberValidation(){
} }
} }
function getValidAlternateNumber() function getValidAlternateNumber() {
var contactNumber = $('#AlternateContactNumber').val(); var contactNumber = $('#AlternateContactNumber').val();
@ -280,13 +280,22 @@ $(function() {
var mindt = year-70; var mindt = year-70;
var maxdt = year-15; var maxdt = year-15;
$("#dateofCST").datepicker({ $("#dateofCST").datepicker({
//minDate : new Date(year-30,1,1), minDate : new Date(mindt,1,1),
maxDate :'now', maxDate : 'now',
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
}); });
}); });
//$("#dateofCST").datepicker({
//minDate : new Date(year-30,1,1),
// maxDate :'now',
// dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
//});
$(document).ready(function(){ $(document).ready(function(){
$("#PaymentTerms").select2(); $("#PaymentTerms").select2();
@ -360,11 +369,11 @@ $(function() {
<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="10" class="form-control" title="Please Enter Contact Number (or) Telephone Number"> <input type="text" name="ContactNumber" onchange="return getContactNumberValidation();" id="ContactNumber" required maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<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="10" class="form-control" title="Please Enter Contact Number (or) Telephone Number"> <input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();" id="AlternateContactNumber" maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
@ -373,7 +382,7 @@ $(function() {
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-6"><span for="CollectrateAddress">Supplier Type</span><span class="badge">*</span> <div class="col-md-6"><span for="SupplierType">Supplier Type</span><!--<span class="badge">*</span>-->
<input type="checkbox" id="service" name="service" value="<?php echo $service = (isset($_POST['service'])) ? 0 : 1;?>"> <b>SERVICE </b> <input type="checkbox" id="service" name="service" value="<?php echo $service = (isset($_POST['service'])) ? 0 : 1;?>"> <b>SERVICE </b>
<input type="checkbox" id="rawmaterial" name="rawmaterial" value="<?php echo $rawmaterial = (isset($_POST['rawmaterial'])) ? 0 : 1;?>"> <b>RAW MATERIALS </b> <input type="checkbox" id="rawmaterial" name="rawmaterial" value="<?php echo $rawmaterial = (isset($_POST['rawmaterial'])) ? 0 : 1;?>"> <b>RAW MATERIALS </b>
@ -399,8 +408,8 @@ $(function() {
<!-- Text input--> <!-- Text input-->
<div class="col-md-12" > <div class="col-md-12" >
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<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();" requried class="form-control" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character should be in caps)"> <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)">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="TIN">TIN</span><span class="badge">*</span> <span for="TIN">TIN</span><span class="badge">*</span>
@ -408,7 +417,7 @@ $(function() {
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="UANumber">UA Number</span> <span for="UANumber">UA Number</span>
<input type="text" class="form-control" onkeypress="return isNumberKey(event)" id="UANumber" name="UANumber" maxlength="12" title="Please Enter 12 digit Number" > <input type="text" class="form-control" id="UANumber" name="UANumber" maxlength="15" title="Please Enter Valid UA Number" >
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
@ -426,11 +435,11 @@ $(function() {
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<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" required onchange="validateGST();" style="text-transform:uppercase;" pattern="(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 1 Character and 1 Number"> <input type="text" id="GSTNo" name="GSTNo" class="form-control" maxlength="15" required 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">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="Range">GST Range</span><span class="badge">*</span> <span for="Range">GST Range</span><!--<span class="badge">*</span>-->
<input type="text" class="form-control " id="GSTRange" name="GSTRange" maxlength="10" required> <input type="text" class="form-control " id="GSTRange" name="GSTRange" maxlength="15">
</div> </div>
<!-- Text input--> <!-- Text input-->
<div class="col-md-6 pad"><span for="CollectrateAddress">Collectrate Address</span> <div class="col-md-6 pad"><span for="CollectrateAddress">Collectrate Address</span>
@ -568,25 +577,56 @@ function payment_hidden()
} }
function Validate() function Validate()
{ {
if(!validatePAN()) // if(!validatePAN())
{ // {
$('#panno').focus(); // $('#panno').focus();
// return false;
// }
if($("#supplierName").val().length < 1)
{
alert('Please Enter Supplier Name');
$("#supplierName").focus();
return false; return false;
} }
if(!validateEmail()) if(!getContactNumberValidation)
{
$("#ContactNumber").focus();
return false;
}
if(!validateEmail())
{ {
$('#emailid').focus(); $('#emailid').focus();
return false; return false;
} }
if($("#Address").val().length < 1)
{
alert('Please Enter Address');
$("#Address").focus();
return false;
}
if($("#TIN").val().length < 1)
{
alert('Please Enter TIN number');
$("#TIN").focus();
return false;
}
if(!validateGST()) if(!validateGST())
{ {
$('#GSTNo').focus(); $('#GSTNo').focus();
return false; return false;
} }
} }
if(!validateEmail())
{
$('#emailid').focus();
return false;
}
}
//Call to ajax existing PAN //Call to ajax existing PAN
$('#panno').change(function() { $('#panno').change(function() {

60
application/views/editSupplier.php
View File

@ -331,7 +331,7 @@ function validateEmail() {
} }
function validateGST() { function validateGST() {
var reg = /(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}$/; var reg = /(?=.*[0-9]).{2}(?=.*[A-Za-z]).{5}(?=.*[0-9]).{4}(?=.*[A-Za-z]).{1}(?=.*[0-9]).{1}(?=.*[Zz]).{1}(?=.*[A-Za-z0-9]).{1}$/;
//alert('gst'); //alert('gst');
var GST = $('#GSTNo').val(); var GST = $('#GSTNo').val();
@ -339,7 +339,7 @@ function validateGST() {
{ {
if (reg.test(GST) == false) if (reg.test(GST) == false)
{ {
alert('Please Enter Valid GST Number Format should be 22AAAAA1111S1Z1'); alert('Please Enter Valid GST Number Format should be 12ABCDE1234A1Z1 or 12ABCDE1234A1ZA');
return (false); return (false);
} }
else else
@ -463,7 +463,7 @@ function onlyAlphabets(evt) {
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-6"><span for="CollectrateAddress">Supplier Type :</span><span class="badge">*</span> <div class="col-md-6"><span for="SupplierType">Supplier Type :</span><!--<span class="badge">*</span>-->
<input type="checkbox" id="service" <?php echo $IsService;?> name="service" value="1"> <b>SERVICE &nbsp;&nbsp;</b> <input type="checkbox" id="service" <?php echo $IsService;?> name="service" value="1"> <b>SERVICE &nbsp;&nbsp;</b>
<input type="checkbox" id="rawmaterial" <?php echo $IsRawMaterial;?> name="rawmaterial" value="1"> <b>RAW MATERIALS &nbsp;&nbsp;</b> <input type="checkbox" id="rawmaterial" <?php echo $IsRawMaterial;?> name="rawmaterial" value="1"> <b>RAW MATERIALS &nbsp;&nbsp;</b>
@ -490,8 +490,8 @@ function onlyAlphabets(evt) {
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<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" name="panno" required pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]}).{1,}" 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)" style="text-transform:uppercase;"> <input type="text" id="panno" maxlength="10" name="panno" pattern="(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]}).{1,}" 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)" style="text-transform:uppercase;">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="TIN">TIN</span><span class="badge">*</span> <span for="TIN">TIN</span><span class="badge">*</span>
@ -499,7 +499,7 @@ function onlyAlphabets(evt) {
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="UANumber">UA Number</span> <span for="UANumber">UA Number</span>
<input type="text" class="form-control" pattern="^\d{12}$" onkeypress="return isNumberKey(event)" id="UANumber" name="UANumber" maxlength="12" value="<?php echo $UANumber;?>" title="Please Enter 12 digit Number"> <input type="text" class="form-control" id="UANumber" name="UANumber" maxlength="15" value="<?php echo $UANumber;?>" title="Please Enter Valid UA Number">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
@ -518,12 +518,12 @@ function onlyAlphabets(evt) {
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<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" onchange="validateGST();" required 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}(?=.*[A-Za-z]).{1}(?=.*[0-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 1 Character and 1 Number"> <input type="text" id="GSTNo" name="GSTNo" onchange="validateGST();" required 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 ">
</div> </div>
<div class="col-md-3 pad"> <div class="col-md-3 pad">
<span for="Range">GST Range</span><span class="badge">*</span> <span for="Range">GST Range</span><!--<span class="badge">*</span>-->
<input type="text" class="form-control " id="GSTRange" requried value="<?php echo $GSTRange;?>" name="GSTRange" maxlength="10"> <input type="text" class="form-control " id="GSTRange" value="<?php echo $GSTRange;?>" name="GSTRange" maxlength="10">
</div> </div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
@ -610,7 +610,8 @@ function onlyAlphabets(evt) {
</div> </div>
<div class="box-footer" style="text-align:right"> <div class="box-footer" style="text-align:right">
<input type="submit" onclick="validate();" value="Submit" class="btn btn-primary"> <input type="submit" onclick="validate();" value="Submit" class="btn btn-primary">
<input type="reset" class="btn btn-primary" value="Cancel" /> <a href="<?php echo base_url() ?>supplierListing" class="btn btn-primary" value="Cancel"/>Cancel</a>
</div> </div>
</form> </form>
</div><!-- /.col-lg-12 --> </div><!-- /.col-lg-12 -->
@ -667,16 +668,47 @@ function payment_hidden()
function Validate() function Validate()
{ {
if(!validatePAN()) // if(!validatePAN())
// {
// return false;
// $('#panno').focus();
// }
if($("#supplierName").val().length < 1)
{ {
alert('Please Enter Supplier Name');
$("#supplierName").focus();
return false; return false;
$('#panno').focus();
} }
if(!validateGST()) if(!getContactNumberValidation)
{ {
$("#ContactNumber").focus();
return false;
}
if(!validateEmail())
{
$('#emailid').focus();
return false;
}
if($("#Address").val().length < 1)
{
alert('Please Enter Address');
$("#Address").focus();
return false;
}
if($("#TIN").val().length < 1)
{
alert('Please Enter TIN number');
$("#TIN").focus();
return false;
}
if(!validateGST())
{
$('#GSTNo').focus(); $('#GSTNo').focus();
return false; return false;
} }
} }
//Call to ajax existing PAN //Call to ajax existing PAN