Commit a8847f39 by Tobin

dc

parent 9bc3bfd7
...@@ -1796,7 +1796,7 @@ class Webservice_model extends CI_Model { ...@@ -1796,7 +1796,7 @@ class Webservice_model extends CI_Model {
} }
} }
$result = $this->db->query("SELECT CUST.customer_id,CUST.name,CUST.phone,CUST.profile_image, $result = $this->db->query("SELECT CUST.customer_id,CUST.name,CUST.phone,CUST.profile_image,
CHT.type AS friend_status CUST.profile_image_qr,CHT.type AS friend_status
FROM customer AS CUST FROM customer AS CUST
LEFT JOIN chats AS CHT ON ((CUST.customer_id=CHT.from_user OR CUST.customer_id=CHT.to_user) AND CHT.type=1) LEFT JOIN chats AS CHT ON ((CUST.customer_id=CHT.from_user OR CUST.customer_id=CHT.to_user) AND CHT.type=1)
...@@ -1841,7 +1841,8 @@ class Webservice_model extends CI_Model { ...@@ -1841,7 +1841,8 @@ class Webservice_model extends CI_Model {
public function get_friend_requests($data){ public function get_friend_requests($data){
$respArr = array('status'=>0,'code'=>'918','message'=>'No Request for you'); $respArr = array('status'=>0,'code'=>'918','message'=>'No Request for you');
$user_id = $this->auth_token_get($data['auth_token']); $user_id = $this->auth_token_get($data['auth_token']);
$result = $this->db->query("SELECT CUST.name,CUST.phone,CUST.profile_image,CUST.customer_id $result = $this->db->query("SELECT CUST.name,CUST.phone,CUST.profile_image,CUST.profile_image_qr,
CUST.customer_id
FROM customer AS CUST FROM customer AS CUST
INNER JOIN chats AS CHT ON (CUST.customer_id = CHT.from_user) INNER JOIN chats AS CHT ON (CUST.customer_id = CHT.from_user)
WHERE type='0' AND to_user='".$user_id."'"); WHERE type='0' AND to_user='".$user_id."'");
...@@ -1870,7 +1871,7 @@ class Webservice_model extends CI_Model { ...@@ -1870,7 +1871,7 @@ class Webservice_model extends CI_Model {
} else { } else {
continue; continue;
} }
$this->db->select("name,phone,profile_image,customer_id"); $this->db->select("name,phone,profile_image,profile_image_qr,customer_id");
$cust = $this->db->get_where('customer',array('customer_id'=>$fromUsrId)); $cust = $this->db->get_where('customer',array('customer_id'=>$fromUsrId));
if(!empty($cust) && !empty($cust = $cust->row_array())){ if(!empty($cust) && !empty($cust = $cust->row_array())){
$custData[] = $cust; $custData[] = $cust;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment