Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
TimeOutAdmin
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TimeOut
TimeOutAdmin
Commits
b3c2a009
You need to sign in or sign up before continuing.
Commit
b3c2a009
authored
Nov 20, 2019
by
Tobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
t : chat bug fix
parent
b5888c73
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
Webservice_model.php
application/models/Webservice_model.php
+3
-3
No files found.
application/models/Webservice_model.php
View file @
b3c2a009
...
...
@@ -1911,7 +1911,7 @@ class Webservice_model extends CI_Model {
if
(
$data
[
'add_as_friend'
]
==
1
){
$toCustData
=
$this
->
db
->
get_where
(
'customer'
,
array
(
'customer_id'
=>
$fromUser
))
->
row_array
();
$frmCustData
=
$this
->
db
->
get_where
(
'customer'
,
array
(
'customer_id'
=>
$user_id
))
->
row_array
();
$fcmData
=
array
(
'id'
=>
$
toUser
,
'param'
=>
'user_id'
,
$fcmData
=
array
(
'id'
=>
$
user_id
,
'param'
=>
'user_id'
,
'title'
=>
'Accepted Chat Request'
,
'message'
=>
$frmCustData
[
'name'
]
.
' has Accepted Your Chat Request'
);
push_sent_cancel
(
$toCustData
[
'fcm_token'
],
$fcmData
);
...
...
@@ -1936,8 +1936,8 @@ class Webservice_model extends CI_Model {
$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
();
$fcmData
=
array
(
'id'
=>
$toUser
,
'param'
=>
'user_id'
,
'title'
=>
'New
Friend
Request'
,
'message'
=>
'You got a New
Friend
Request from '
.
$toCustData
[
'name'
]);
'title'
=>
'New
Chat
Request'
,
'message'
=>
'You got a New
Chat
Request from '
.
$toCustData
[
'name'
]);
push_sent_cancel
(
$frmCustData
[
'fcm_token'
],
$fcmData
);
}
else
if
(
!
empty
(
$result
)
&&
$result
[
'type'
]
==
'0'
){
$this
->
db
->
update
(
'chats'
,
array
(
'type'
=>
'1'
),
array
(
'chat_id'
=>
$result
[
'chat_id'
]));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment