Merge branch 'jansa' into 'master'

application/models/Api_model.php

@@ -42,7 +42,7 @@ class Api_model extends CI_Model {
  	function register($data) {
  		try{
  			$email = $data['email_id'];
- 			$phone = $data['phone'];
+ 			$phone = preg_replace('/\D/', '', $data['phone']);
  			$res_count = 
  				$this->db->query("SELECT * FROM customer 
 								  INNER JOIN `users` ON users.id=customer.customer_id AND users.user_type='3' 

application/models/Webservice_model.php

@@ -103,6 +103,7 @@ class Webservice_model extends CI_Model {
 		try{
 			$is_email_available = "true";
 			$is_phone_available = "true";
+			$data['phone'] = preg_replace('/\D/', '', $data['phone']);
 			$res_count = $this->db->where('email',$data['email'])->or_where('phone',$data['phone'])->get('customer')->result();
 			if(count($res_count) > 0) {
 				foreach ($res_count as $rs) {
@@ -130,7 +131,7 @@ class Webservice_model extends CI_Model {
 	function register($data) {
 		try{
 			$email = $data['email'];
-			$phone = $data['phone'];
+			$phone = preg_replace('/\D/', '', $data['phone']);
 			$res_count = $this->db->query("SELECT * FROM customer 
 								  INNER JOIN `users` ON users.id=customer.customer_id AND users.user_type='3' 
 								  WHERE users.status!='2' AND 
@@ -1759,25 +1760,27 @@ class Webservice_model extends CI_Model {
 
 	public function sync_contacts($data){
 		$user_id = $this->auth_token_get($data['auth_token']);
-		$respArr = array('status'=>0,'code'=>'918','message'=>'Something Went Wrong..Try Again');
+		$respArr = array('status'=>0,'code'=>'918','message'=>'Data Missing');
 		if(empty($data)){
 			return $respArr;	
 		}
 		$phNumbers = '';
 		foreach($data['contacts'] AS $key => $number) {
+			$number = preg_replace('/\D/', '', $number);
 			$eCond = ($key != count($data['contacts'])-1)?' OR ':'';
-			if(strlen($number) > 10){
-				$phNumbers .= " phone LIKE '%".substr($number, strlen($number)-10)."' ".$eCond;
+			if(strlen($number) > 9){
+				$phNumbers .= " phone LIKE '%".substr($number, strlen($number)-9)."' ".$eCond;
 			} else {
 				$phNumbers .= " phone LIKE '%".$number."' ".$eCond;
 			}
-
 		}
-		$result = $this->db->query("SELECT name,phone,profile_image FROM customer WHERE (".$phNumbers.") AND customer_id NOT IN (SELECT from_user FROM chats WHERE (from_user=$user_id AND type='2') OR (to_user =$user_id AND type='2')) AND customer_id NOT IN (SELECT to_user FROM chats WHERE (from_user=$user_id AND type='2') OR (to_user =$user_id AND type='2'))");
+		$result = $this->db->query("SELECT customer_id,name,phone,profile_image FROM customer WHERE (".$phNumbers.") AND customer_id NOT IN (SELECT from_user FROM chats WHERE (from_user=$user_id AND type='2') OR (to_user =$user_id AND type='2')) AND customer_id NOT IN (SELECT to_user FROM chats WHERE (from_user=$user_id AND type='2') OR (to_user =$user_id AND type='2'))");
 
-		if(!empty($result) && !empty($result = $result->result_array())){
 		$respArr['status'] = 1;
+		if(!empty($result) && !empty($result = $result->result_array())){			
 			$respArr['data'] = $result;
+		}else{
+			$respArr['message'] = 'No Data Found';
 		}
 		return $respArr;
 	}
@@ -1809,7 +1812,7 @@ class Webservice_model extends CI_Model {
 	public function get_friend_requests($data){
 		$respArr = array('status'=>0,'code'=>'918','message'=>'No Request for you');
 		$user_id = $this->auth_token_get($data['auth_token']);
-		$this->db->select("name,phone,profile_image");
+		$this->db->select("name,phone,profile_image,customer_id");
 		$this->db->join('customer','customer.customer_id = chats.to_user');
 		$result=$this->db->get_where('chats',array('to_user'=>$user_id,'type'=>'0'))->result_array();
 		if(!empty($result)){
@@ -1828,7 +1831,7 @@ class Webservice_model extends CI_Model {
 				if($value['to_user'] == $user_id && $value['type'] == 0){
 					continue;
 				}
-				$this->db->select("name,phone,profile_image");
+				$this->db->select("name,phone,profile_image,customer_id");
 				$cust = $this->db->get_where('customer',array('customer_id'=>$value['to_user']));
 				if(!empty($cust) && !empty($cust = $cust->row_array())){
 					$custData[] = $cust;