Skip to content

T
TimeOutAdmin
Commit 1ea93e08 by Tobin
Options

Merge branch 'master' into 'dev_production'

dc See merge request !332
parents c25e2e37 0dd3bdd2
Showing with 3 additions and 3 deletions
application/models/Webservice_model.php
...@@ -2118,10 +2118,10 @@ class Webservice_model extends CI_Model { ...@@ -2118,10 +2118,10 @@ class Webservice_model extends CI_Model {
$toCustData = $this->db->get_where('customer',array('customer_id'=>$toUser))->row_array(); $toCustData = $this->db->get_where('customer',array('customer_id'=>$toUser))->row_array();
$frmCustData = $this->db->get_where('customer',array('customer_id'=>$user_id))->row_array(); $frmCustData = $this->db->get_where('customer',array('customer_id'=>$user_id))->row_array();
$fcmData = array('id'=>$toUser,'param'=>'friend_id', $fcmData = array('id'=>$user_id,'param'=>'friend_id',
'title'=>'New Chat Request', 'title'=>'New Chat Request',
'message'=>'You got a New Chat Request from '.$toCustData['name']); 'message'=>'You got a New Chat Request from '.$frmCustData['name']);
push_sent_cancel(1,$frmCustData['fcm_token'],$fcmData); push_sent_cancel(1,$toCustData['fcm_token'],$fcmData);
} else if (!empty($result) && $result['type'] == '0'){ } else if (!empty($result) && $result['type'] == '0'){
$this->db->update('chats',array('type'=>'1'),array('chat_id'=>$result['chat_id'])); $this->db->update('chats',array('type'=>'1'),array('chat_id'=>$result['chat_id']));
} }
......
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