From 18a51396fdd7f6fae287069c363a571587ec0d58 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 9 Sep 2017 19:10:05 +0530 Subject: [PATCH] company details and supplier details UA number format --- application/controllers/employeedetails.php | 4 +-- application/views/addemployee.php | 4 +-- application/views/addsupplier.php | 39 ++++++++++++++++----- application/views/companyview.php | 24 +++++++++++-- application/views/editEmployee.php | 4 +-- application/views/editOldcost.php | 20 +++++++++++ application/views/editSupplier.php | 23 +++++++++++- application/views/includes/header.php | 6 ++-- 8 files changed, 104 insertions(+), 20 deletions(-) diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php index 7101eda3..52e15ff9 100755 --- a/application/controllers/employeedetails.php +++ b/application/controllers/employeedetails.php @@ -630,9 +630,9 @@ echo "";redirect('employeeListing',' else { //echo 'Exists But Replace'; - $Picture = $ModifyPictureName; + //$Picture = $ModifyPictureName; //$Picture = $this->editimage($ModifyPictureName); - //$Picture = $this->add($ModifyPictureName); + $Picture = $this->add($ModifyPictureName); } } else diff --git a/application/views/addemployee.php b/application/views/addemployee.php index 5037a973..df6bca39 100755 --- a/application/views/addemployee.php +++ b/application/views/addemployee.php @@ -236,7 +236,7 @@ function validatecomEmail() { function validateDriverLicense() { - var reg = /^[A-Z]{2}[0-9]{2}\s[0-9]{11}$/; + var reg = /^[a-zA-Z]{2}[0-9]{2}\s[0-9]{11}$/; // alert(); var VehicleNo = $('#Driverlicense').val(); if(VehicleNo != "") @@ -761,7 +761,7 @@ function validateESI() {
-
Nominee +
Nominee reference
diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php index 291ee57a..9c73edfb 100755 --- a/application/views/addsupplier.php +++ b/application/views/addsupplier.php @@ -53,7 +53,7 @@ function alpha(e) { //PAN Validate function validatePAN() { - var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}$/; +var reg = /^([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){1}?$/; var PAN = $('#panno').val(); @@ -77,8 +77,30 @@ function validatePAN() { } +function validateUA() { + + var reguano = /^([a-zA-Z]){5}([0-9]){10}?$/; + var UA = $('#UANumber').val(); + + if(UA != '') + { + if (reguano.test(UA) == false) + { + alert('Please Enter Valid UA Number'); + return (false); + } + else + { + return true; + } + } + + } + + function validateGST() { - 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}$/; + // 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}$/; + 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(); @@ -104,7 +126,8 @@ function validateGST() { function validateECCNumber() { - var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}$/; + // var reg = /(?=.*[A-Za-z]).{5,}(?=.*[0-9]).{4,}(?=.*[A-Za-z]).{1,}(?=.*[A-Za-z]).{2,}(?=.*[0-9]).{3,}$/; + var reg = /^([a-zA-Z]){5}([0-9]){4}([a-zA-Z]){3}([0-9]){3}?$/; var ECC = $('#Exciseregistration').val(); @@ -380,20 +403,20 @@ $(function() {
PAN - -
+
TIN*
UA Number - + +
Excise Registration - +
@@ -406,7 +429,7 @@ $(function() {
GST Number* - +
GST Range diff --git a/application/views/companyview.php b/application/views/companyview.php index ad9bb75a..e66ec26b 100755 --- a/application/views/companyview.php +++ b/application/views/companyview.php @@ -342,6 +342,26 @@ function ValidateAlternateContact(){ } + +function ValidateUA() { + + var reguano = /^([a-zA-Z]){5}([0-9]){10}?$/; + var UA = $('#UANumber').val(); + + if(UA != '') + { + if (reguano.test(UA) == false) + { + alert('Please Enter Valid UA Number'); + return (false); + } + else + { + return true; + } + } + + }