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
a8847f39
Commit
a8847f39
authored
5 years ago
by
Tobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dc
parent
9bc3bfd7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
Webservice_model.php
application/models/Webservice_model.php
+4
-3
No files found.
application/models/Webservice_model.php
View file @
a8847f39
...
...
@@ -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,
CHT.type AS friend_status
CUST.profile_image_qr,
CHT.type AS friend_status
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)
...
...
@@ -1841,7 +1841,8 @@ 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'
]);
$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
INNER JOIN chats AS CHT ON (CUST.customer_id = CHT.from_user)
WHERE type='0' AND to_user='"
.
$user_id
.
"'"
);
...
...
@@ -1870,7 +1871,7 @@ class Webservice_model extends CI_Model {
}
else
{
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
));
if
(
!
empty
(
$cust
)
&&
!
empty
(
$cust
=
$cust
->
row_array
())){
$custData
[]
=
$cust
;
...
...
This diff is collapsed.
Click to expand it.
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