diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php index 35f1ac7c..c55f832e 100644 --- a/application/controllers/supplier.php +++ b/application/controllers/supplier.php @@ -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); diff --git a/application/models/supplier_model.php b/application/models/supplier_model.php index b9170f18..1169b89a 100644 --- a/application/models/supplier_model.php +++ b/application/models/supplier_model.php @@ -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); diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php index a2a72400..a038c00e 100644 --- a/application/views/addsupplier.php +++ b/application/views/addsupplier.php @@ -32,7 +32,7 @@
- +
@@ -56,13 +56,13 @@
- +
- +
@@ -83,7 +83,7 @@
- +
@@ -100,7 +100,7 @@
- +
@@ -113,7 +113,7 @@
- +
@@ -160,7 +160,8 @@
- + +
@@ -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 != "") diff --git a/application/views/editOldsupplier.php b/application/views/editOldsupplier.php index b2b71aa1..b0bbfc65 100644 --- a/application/views/editOldsupplier.php +++ b/application/views/editOldsupplier.php @@ -56,14 +56,15 @@ function demo(){

-
Supplier Details
- +
ADD SUPPLIER
+

+
-
- Back +
+ Back

@@ -75,78 +76,78 @@ function demo(){
-

Edit Supplier Details

+

Add Supplier Details

-
+
-
+
- +
- - - + +
-
+ +
- +
- + + +
- +
- +
- - + +
- +
- +
- +
- - +
+
- - + +
@@ -154,20 +155,20 @@ function demo(){
- - + +
- +
- +
@@ -181,7 +182,7 @@ function demo(){
+ + +
-
+ +
- - + +
@@ -259,6 +263,7 @@ function demo(){
+ diff --git a/application/views/viewsupplier.php b/application/views/viewsupplier.php index f63463d7..2557c507 100644 --- a/application/views/viewsupplier.php +++ b/application/views/viewsupplier.php @@ -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(); + + + + + + + +