Merge branch 'master' into 'dev_production'

application/models/Webservice_model.php

@@ -109,14 +109,15 @@ class Webservice_model extends CI_Model{
 
 
   $num = $this->db->where(array('username'=>$data['username'],'status'=>'1'))->get('users')->num_rows();
-  $num1 = $this->db->where(array('email',$data['email'],'status'=>'1'))->get('users')->num_rows();
-  $num2 = $this->db->where(array('phone_no',$data['phone_no'],'status'=>'1'))->get('users')->num_rows();
-
+  $num1 = $this->db->where(array('email'=>$data['email'],'status'=>'1'))->get('users')->num_rows();
+ // echo $this->db->last_query();
+  $num2 = $this->db->where(array('phone_no'=>$data['phone_no'],'status'=>'1'))->get('users')->num_rows();
+//echo $num."-".$num1."-".$num2;
   if($num>0){
     $result = array('status'=>'error','message'=>'username Already Exists');    
-  }elseif($num1>0){
+  }else if($num1>0){
     $result = array('status'=>'error','message'=>'Email Already Exists');
-  }elseif($num2>0){
+  }else if($num2>0){
     $result = array('status'=>'error','message'=>'Phone Number Already Exists');
 
   }else {