t : organizer username and email id conflict : uat

application/models/Organizer_model.php

@@ -416,18 +416,9 @@ class Organizer_model extends CI_Model {
  		try{
  			$userNameChk = $this->db->query("SELECT * FROM users 
  									     	 WHERE user_type='2' AND status!='2' AND 
- 									     		   username='".$data['username']."'");
+ 									     		   username='".$data['email_id']."'");
 	 		if(!empty($userNameChk) && $userNameChk->num_rows() > 0){
-	 			$res = array('status'=>0,'message'=>'Username Already Exist','code'=>'ER07');
-	 			return $res;
-	 		}
-
-	 		$emailChk = $this->db->query("SELECT * FROM provider AS PRV 
-	 									  INNER JOIN users AS USR ON (USR.id=PRV.provider_id)
-									      WHERE USR.user_type='2' AND USR.status!='2' AND 
-									      		PRV.email='".$data['email_id']."'");
-	 		if(!empty($emailChk) && $emailChk->num_rows() > 0){
-	 			$res = array('status'=>0,'message'=>'Email Id Already Exist','code'=>'ER08');
+	 			$res = array('status'=>0,'message'=>'Email ID Already Exist','code'=>'ER07');
 	 			return $res;
 	 		}
 
@@ -440,7 +431,7 @@ class Organizer_model extends CI_Model {
 	 			return $res;
 	 		}
  			
-			$this->db->insert('users',array('username'=>$data['username'],'display_name'=>$data['username'],
+			$this->db->insert('users',array('username'=>$data['email_id'],'display_name'=>$data['username'],
 							  'password'=>md5($data['password']),'user_type'=>'2','status'=>'3'));
 
  			$last_id = $this->db->insert_id();