From e3ac9e26efd537394559be5d60572834b95a602a Mon Sep 17 00:00:00 2001
From: gandhimathi Bharathirajan <gandhimathi.b@venbainfotech.com>
Date: Thu, 13 Apr 2017 16:36:52 +0530
Subject: [PATCH] Production fix

---
 .../controllers/rawmaterialdetails.php        | 25 ++++++++++---------
 application/controllers/supplier.php          |  4 +--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php
index 477fab51..d525733a 100644
--- a/application/controllers/rawmaterialdetails.php
+++ b/application/controllers/rawmaterialdetails.php
@@ -45,7 +45,7 @@ class rawmaterialdetails extends BaseController
            
             $count = $this->rawmaterialdetails_model->rawmaterialListingCount($searchText);
 
-			$returns = $this->paginationCompress ( "rawmaterialListing/", $count, 5 );
+			$returns = $this->paginationCompress ( "rawmaterialListing/", $count, 10 );
             
             $data['userRecords'] = $this->rawmaterialdetails_model->rawmaterialListing($searchText, $returns["page"], $returns["segment"]);
             
@@ -65,7 +65,7 @@ class rawmaterialdetails extends BaseController
             
             $this->global['pageTitle'] = 'siddharth : AddNew RawMaterial';
 
-            $this->loadViews("addRawmaterial", $this->global, $data, NULL);
+            $this->loadViews("addRawMaterial", $this->global, $data, NULL);
         
     }
 	/*
@@ -133,21 +133,22 @@ class rawmaterialdetails extends BaseController
 						$IsActive = '0';
 					}
 					
-					$Material = array('MaterialName'=>$MaterialName, 'MaterialType'=>$MaterialType, 'UOM'=>$UOM,'CreatedBy'=>$CreatedBy,'IsActive' => $IsActive);    
+					$RawMaterial = array('MaterialName'=>$MaterialName, 'MaterialType'=>$MaterialType, 'UOM'=>$UOM,'CreatedBy'=>$CreatedBy,'IsActive' => $IsActive);    
                 
-                $result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial);
+                   $result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial);
                 
                 if($result > 0)
                 {
-                    //$this->session->set_flashdata('success', 'New RawMaterial created successfully');
+                   
+                                   redirect('rawmaterialListing','refresh');
 					 echo "<script>alert('RawMaterial Created successfully!');</script>";
-					  redirect('rawmaterialListing','refresh');
+					
                 }
                 else
                 {
-                   // $this->session->set_flashdata('error', 'RawMaterial Not Create');
+                                    redirect('rawmaterialListing','refresh');
 				    echo "<script>alert('RawMaterial Not Created!');</script>";
-				   redirect('rawmaterialListing','refresh');
+				   
                 }       
                
             }        
@@ -187,14 +188,14 @@ class rawmaterialdetails extends BaseController
         }
         else
         {
-			$MaterialCode = $this->input->post('MaterialCode');
+	    $RawmaterialID = $this->input->post('MaterialCode');
             $this->form_validation->set_rules('MaterialName','Material Name','trim|required|');
             $this->form_validation->set_rules('MaterialType','MaterialType','trim');
             $this->form_validation->set_rules('UOM','UOM','trim');
             
             if($this->form_validation->run() == FALSE)
             {
-                $this->editRawmaterial($RawmaterialID);
+                $this->viewRawmaterial($RawmaterialID);
 				
             }
             else
@@ -223,14 +224,14 @@ class rawmaterialdetails extends BaseController
                 if($result == true)
                 {
 					redirect('rawmaterialListing','refresh');
-                   // $this->session->set_flashdata('success', 'RawMaterial updated successfully');
+                  
 					 echo "<script>alert('RawMaterial Updated successfully!');</script>";
                 }
                 else
                 {
 					redirect('rawmaterialListing','refresh');
 					echo "<script>alert('RawMaterial Record Not updated!');</script>";
-                   // $this->session->set_flashdata('error', 'RawMaterial updation failed');
+                   
                 }
                 
                
diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php
index af7f1905..a6b15e48 100644
--- a/application/controllers/supplier.php
+++ b/application/controllers/supplier.php
@@ -131,7 +131,7 @@ class supplier extends BaseController
            
             $this->form_validation->set_rules('ContactNumber','Contact Number','trim|required|numeric|max_length[10]');
             $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|numeric|max_length[10]');
-            $this->form_validation->set_rules('EmailAddress','Email Address|valid_email|xss_clean|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]');
 			
@@ -191,7 +191,7 @@ class supplier extends BaseController
 			//echo 'supID' . $supplierID ;
             $this->form_validation->set_rules('ContactNumber','Contact Number','trim|required|numeric|max_length[10]');
             $this->form_validation->set_rules('AlternateContactNumber','Alternate Contact Number','trim|numeric|max_length[10]');
-            $this->form_validation->set_rules('EmailAddress','Email Address|valid_email|xss_clean|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]');