dc

application/models/Api_model.php

@@ -394,7 +394,7 @@ class Api_model extends CI_Model {
 				$sql = "SELECT ODR.order_id,ODR.order_type,ODR.booking_id 
 						FROM orders AS ODR
  						INNER JOIN booking AS BOK ON (ODR.booking_id=BOK.bookId)
-						WHERE ODR.customer_id='$user_id' AND ODR.order_type='1' AND BOK.status IN (0,1,2,3,5,6)
+						WHERE ODR.customer_id='$user_id' AND ODR.order_type='1' AND BOK.status IN (0,1,2,5,6)
 	 					GROUP BY ODR.order_id 
  						ORDER BY ODR.order_id DESC $cond";
 

application/models/Organizer_model.php

@@ -473,20 +473,12 @@ class Organizer_model extends CI_Model {
  	public function organiserSignUp($data){
  		try{
  			$userNameChk = $this->db->query("SELECT * FROM users 
- 									     	 WHERE user_type='2' AND status!='2' AND 
+ 									     	 WHERE status!='2' AND 
  									     		   username='".$data['username']."'");
 	 		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');
-	 			return $res;
-	 		}	
  			$data['contact_no'] = preg_replace('/\D/', '', $data['contact_no']);
 	 		$phoneChk = $this->db->query("SELECT * FROM provider AS PRV 
 	 									  INNER JOIN users AS USR ON (USR.id=PRV.provider_id)
@@ -515,7 +507,7 @@ class Organizer_model extends CI_Model {
  				$sql = $this->db->query("SELECT USR.* FROM users AS USR 
  										 INNER JOIN provider AS PDR ON (PDR.provider_id = USR.id) 
  										 WHERE USR.password='".md5($data['password'])."' AND 
- 										       ( PDR.email='".$data['email_id']."' OR USR.username='".$data['email_id']."') AND 
+ 										       USR.username='".$data['email_id']."' AND 
  										       USR.user_type='".$data['user_type']."' AND 
  										       USR.status='1'");
  			}else{