From d452308f720fddc040efe27cd94c76d05521ec86 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 2 Aug 2017 12:54:21 +0530 Subject: [PATCH] supplier details --- application/controllers/supplier.php | 4 +- application/views/addsupplier.php | 680 ++++++++++++++------------- application/views/editSupplier.php | 72 ++- 3 files changed, 414 insertions(+), 342 deletions(-) diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php index 759a0521..94399b9b 100755 --- a/application/controllers/supplier.php +++ b/application/controllers/supplier.php @@ -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('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('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'); 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('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('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'); diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php index 2f66aa84..8222ea51 100755 --- a/application/views/addsupplier.php +++ b/application/views/addsupplier.php @@ -5,34 +5,34 @@ function validateEmail() { var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/; - var email = $('#EmailAddress').val(); - if(email != "") - { + var email = $('#EmailAddress').val(); + if(email != "") + { if (reg.test(email) == false) { alert('Please Enter Valid Email Address'); return (false); } - else - { - return true; - } - } + else + { + return true; + } + } } function blockKeyPress(evt) { - var charCode = (evt.which) ? evt.which : evt.keyCode; - alert(charCode); - if(charCode == 8 || charCode == 46 ) + var charCode = (evt.which) ? evt.which : evt.keyCode; + alert(charCode); + if(charCode == 8 || charCode == 46 ) - { - return false; - } - else - { - return false; - } + { + return false; + } + else + { + return false; + } } function isNumberKey(evt) @@ -44,77 +44,77 @@ function validateEmail() { return true; } - + //PAN Validate function validatePAN() { var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}$/; - var PAN = $('#panno').val(); - - if(PAN != '') - { - if (reg.test(PAN) == false) - { - alert('Please Enter Valid PAN Number'); - return (false); - } - else - { - return true; - } - } - else - { - alert('Please Enter PAN Number'); - return (false); - } - + var PAN = $('#panno').val(); + + if(PAN != '') + { + if (reg.test(PAN) == false) + { + alert('Please Enter Valid PAN Number'); + return (false); + } + else + { + return true; + } + } + else + { + alert('Please Enter PAN Number'); + return (false); + } + } 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'); - var GST = $('#GSTNo').val(); - - if(GST != '') - { - if (reg.test(GST) == false) - { - alert('Please Enter Valid GST Number Format should be 22AAAAA1111S1Z1'); - return (false); - } - else - { - return true; - } - } - else - { - alert('Please Enter GST Number'); - return (false); - } - + var GST = $('#GSTNo').val(); + + if(GST != '') + { + if (reg.test(GST) == false) + { + alert('Please Enter Valid GST Number Format should be 12ABCDE1234A1Z1 or 12ABCDE1234A1ZA'); + return (false); + } + else + { + return true; + } + } + else + { + alert('Please Enter GST Number'); + return (false); + } + } function validateECCNumber() { var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}$/; - var ECC = $('#Exciseregistration').val(); - - if(ECC != '') - { - if (reg.test(ECC) == false) - { - alert('Please Enter Valid Excise Control Code Number'); - return (false); - } - else - { - return true; - } - } - + var ECC = $('#Exciseregistration').val(); + + if(ECC != '') + { + if (reg.test(ECC) == false) + { + alert('Please Enter Valid Excise Control Code Number'); + return (false); + } + else + { + return true; + } + } + } @@ -128,7 +128,7 @@ function getContactNumberValidation(){ var mobilephone = /^[0-9]{10,12}$/.test(contactNumber); //alert('chennai telephone:'+telephone);//alert('other telephone:'+regex); - //alert('mobilephone:'+mobilephone);//alert('input value:'+contactNumber); + //alert('mobilephone:'+mobilephone);//alert('input value:'+contactNumber); if(contactNumber!=''){ @@ -148,7 +148,7 @@ function getContactNumberValidation(){ else{ alert('Please Enter valid Contact Number ex: 044 12345678 , 0444 1234567,04444 123456 and 9876543210');//alert('need to change:'+contactNumber); return false; - } + } } else{ @@ -158,7 +158,7 @@ function getContactNumberValidation(){ } } -function getValidAlternateNumber() +function getValidAlternateNumber() { var contactNumber = $('#AlternateContactNumber').val(); @@ -167,7 +167,7 @@ function getValidAlternateNumber() var mobilephone = /^[0-9]{10,12}$/.test(contactNumber); //alert('chennai telephone:'+telephone);//alert('other telephone:'+regex); - //alert('mobilephone:'+mobilephone);//alert('input value:'+contactNumber); + //alert('mobilephone:'+mobilephone);//alert('input value:'+contactNumber); if(contactNumber!=''){ @@ -187,7 +187,7 @@ function getValidAlternateNumber() else{ alert('Please Enter valid Contact Number ex: 044 12345678 , 0444 1234567,04444 123456 and 9876543210');//alert('need to change:'+contactNumber); return false; - } + } } else{ @@ -198,56 +198,56 @@ function getValidAlternateNumber() } // function getContactNumberValidation() { -// var contactNumber = $('#ContactNumber').val().length; -// if(contactNumber < 10) -// { -// alert('Please Enter valid Contact Number'); -// return false; -// } -// else -// { -// return true; -// } +// var contactNumber = $('#ContactNumber').val().length; +// if(contactNumber < 10) +// { +// alert('Please Enter valid Contact Number'); +// return false; +// } +// else +// { +// return true; +// } // } // function getValidAlternateNumber() // { -// var contactNumber = $('#AlternateContactNumber').val().length; -// if(!empty($('#AlternateContactNumber').val())) -// { -// if(contactNumber < 10) -// { -// alert('Please Enter valid Alternate Contact Number'); -// return false; -// } -// else -// { -// return true; -// } -// } +// var contactNumber = $('#AlternateContactNumber').val().length; +// if(!empty($('#AlternateContactNumber').val())) +// { +// if(contactNumber < 10) +// { +// alert('Please Enter valid Alternate Contact Number'); +// return false; +// } +// else +// { +// return true; +// } +// } // } function validateEmail() { - var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/; + var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/; - var email = $('#emailid').val(); - - if(email != '') - { + var email = $('#emailid').val(); + + if(email != '') + { if (reg.test(email) == false) { alert('Please Enter Valid Email Address'); return (false); } - else - { - return true; - } - } - else - { - alert('Please Enter email id'); - } - + else + { + return true; + } + } + else + { + alert('Please Enter email id'); + } + } @@ -269,24 +269,33 @@ function onlyAlphabets(evt) { return false; return true; } - + $(function() { - var d = new Date(); + var d = new Date(); + + var month = d.getMonth(); + var day = d.getDate(); + var year = d.getFullYear() ; + var SIAStartYear = year - 2015; + var mindt = year-70; + var maxdt = year-15; + + + $("#dateofCST").datepicker({ + minDate : new Date(mindt,1,1), + maxDate : 'now', + dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' - var month = d.getMonth(); - var day = d.getDate(); - var year = d.getFullYear() ; - var SIAStartYear = year - 2015; - var mindt = year-70; - var maxdt = year-15; - - $("#dateofCST").datepicker({ - //minDate : new Date(year-30,1,1), - maxDate :'now', - 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(){ $("#PaymentTerms").select2(); @@ -302,14 +311,14 @@ $(function() { } .form-group { - padding-bottom:4%; + padding-bottom:4%; } .pad{ - padding-bottom:1%; + padding-bottom:1%; } .badge { - color:red; background-color:#fff; + color:red; background-color:#fff; } @@ -322,14 +331,14 @@ $(function() {
Siddharth Industries - New Supplier Details
- +
Back -
-
+ +
@@ -344,42 +353,42 @@ $(function() {

-
+
Supplier Information - +
- +
- Supplier Name* + Supplier Name* - +
- +
- Contact Number* - + Contact Number* +
-
- Alternate Contact Number - +
+ Alternate Contact Number +
- -
- Email ID* - + +
+ Email ID* +
-
Supplier Type* - - SERVICE - RAW MATERIALS - MAINTENANCE -
- +
Supplier Type + + SERVICE + RAW MATERIALS + MAINTENANCE +
+
@@ -390,87 +399,87 @@ $(function() {
Address*
-
+
Tax Related Data -
-
- PAN * - -
-
- TIN* +
+
+ PAN + +
+
+ TIN* -
-
- UA Number - +
+
+ UA Number +
- -
- Excise Registration + +
+ Excise Registration
-
-
-
- CST Number +
+
+
+ CST Number
-
CST Registration Date +
CST Registration Date -
+
- GST Number* - -
-
- GST Range* - + GST Number* + +
+
+ GST Range +
- +
Collectrate Address
- -
+ +
- Certification Details -
-
-
EMS Number - -
-
TS Number - -
-
-
-
- IMS Number - -
-
- ISO Number - -
-
-
- OHSAS Number - - -
-
- Bank Details + Certification Details +
+
+
EMS Number + +
+
TS Number + +
+
+
+
+ IMS Number + +
+
+ ISO Number + +
+
+
+ OHSAS Number + + +
+
+ Bank Details - +
Account Number - +
IFSC Code @@ -478,38 +487,38 @@ $(function() {
Bank Branch Name
-
Bank Address +
Bank Address
- - Payment Details + + Payment Details - +
- Payable Terms - - - -
+ Payable Terms + + + +
-
-
+
+
@@ -558,7 +567,7 @@ $(function() { diff --git a/application/views/editSupplier.php b/application/views/editSupplier.php index 8e6870a0..c5c467be 100755 --- a/application/views/editSupplier.php +++ b/application/views/editSupplier.php @@ -331,7 +331,7 @@ function validateEmail() { } 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'); var GST = $('#GSTNo').val(); @@ -339,7 +339,7 @@ function validateGST() { { 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); } else @@ -463,7 +463,7 @@ function onlyAlphabets(evt) {
-
Supplier Type :* +
Supplier Type : name="service" value="1"> SERVICE    name="rawmaterial" value="1"> RAW MATERIALS    @@ -490,8 +490,8 @@ function onlyAlphabets(evt) {
- PAN * - + PAN +
TIN* @@ -499,7 +499,7 @@ function onlyAlphabets(evt) {
UA Number - +
@@ -518,12 +518,12 @@ function onlyAlphabets(evt) {
GST Number* - +
- GST Range* - + GST Range +
@@ -610,7 +610,8 @@ function onlyAlphabets(evt) {
- + Cancel +
@@ -667,16 +668,47 @@ function payment_hidden() function Validate() { - if(!validatePAN()) - { - return false; - $('#panno').focus(); - } - if(!validateGST()) - { - $('#GSTNo').focus(); - return false; - } + // if(!validatePAN()) + // { + // return false; + // $('#panno').focus(); + // } + if($("#supplierName").val().length < 1) + { + alert('Please Enter Supplier Name'); + $("#supplierName").focus(); + return false; + } +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(); + return false; +} + } //Call to ajax existing PAN