Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
joyride phase2
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
Jansa Jose
joyride phase2
Commits
9644680a
Commit
9644680a
authored
Dec 06, 2018
by
Jansa Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mail
parent
5d20300d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
Webservices.php
application/controllers/Webservices.php
+6
-6
Webservice_model.php
application/models/Webservice_model.php
+3
-3
index.php
index.php
+1
-1
No files found.
application/controllers/Webservices.php
View file @
9644680a
...
...
@@ -2453,12 +2453,12 @@ public function end_ride_update_post(){
$include_player_ids
=
array
(
$res
->
player_id
);
$id
=
''
;
$res
=
$this
->
send_Message
(
$content
,
$headings
,
$include_player_ids
,
$res
,
$type
,
$id
);
$res
s
=
$this
->
send_Message
(
$content
,
$headings
,
$include_player_ids
,
$res
,
$type
,
$id
);
$data
[
'email'
]
=
$res
->
email
;
$data
[
'subject'
]
=
'Booking Rejected'
;
$data
[
'msg'
]
=
'Hi '
.
$res
->
first_name
.
', Your Request is Rejected.'
;
$this
->
send_mails
(
$data
);
$return
=
$res
;
$return
=
$res
s
;
// print($return);
// $return = json_encode($return);
...
...
@@ -2472,7 +2472,7 @@ public function end_ride_update_post(){
public
function
approve_send_alert
(
$request
){
$res
=
$this
->
Webservice_model
->
approve_send_details
(
$request
->
booking_id
);
//print_r($res->email);exit();
$content
=
array
(
"en"
=>
'Ride Accepted '
...
...
@@ -2484,15 +2484,15 @@ public function end_ride_update_post(){
// var_dump($content);
$type
=
'ride_approve_alert'
;
//die;
$include_player_ids
=
array
(
$res
->
player_id
);
$include_player_ids
=
array
(
isset
(
$res
->
device_id
)
&&
!
empty
(
$res
->
device_id
)
?
$res
->
device_id
:
''
);
$id
=
''
;
$res
=
$this
->
send_Message
(
$content
,
$headings
,
$include_player_ids
,
$res
,
$type
,
$id
);
$res
s
=
$this
->
send_Message
(
$content
,
$headings
,
$include_player_ids
,
$res
,
$type
,
$id
);
$data
[
'email'
]
=
$res
->
email
;
$data
[
'subject'
]
=
'Booking Approved'
;
$data
[
'msg'
]
=
'Hi '
.
$res
->
first_name
.
', Your Request is Approved.'
;
$this
->
send_mails
(
$data
);
$return
=
$res
;
$return
=
$res
s
;
// print($return);
// $return = json_encode($return);
...
...
application/models/Webservice_model.php
View file @
9644680a
...
...
@@ -2173,7 +2173,7 @@ function get_push_notification_details($request){
}
function
reject_send_details
(
$request
){
$this
->
db
->
where
(
'booking.
booking_
id'
,
$request
);
$this
->
db
->
where
(
'booking.id'
,
$request
);
$this
->
db
->
select
(
'booking.*,users.*'
);
$this
->
db
->
from
(
'booking'
);
$this
->
db
->
join
(
'users'
,
'booking.user_id=users.id'
,
'left'
);
...
...
@@ -2184,12 +2184,12 @@ function reject_send_details($request){
}
function
approve_send_details
(
$request
){
$this
->
db
->
where
(
'booking.
booking_
id'
,
$request
);
$this
->
db
->
where
(
'booking.id'
,
$request
);
$this
->
db
->
select
(
'booking.*,users.*'
);
$this
->
db
->
from
(
'booking'
);
$this
->
db
->
join
(
'users'
,
'booking.user_id=users.id'
,
'left'
);
$query
=
$this
->
db
->
get
();
//
echo $this->db->last_query();
//
echo $this->db->last_query();
return
$query
->
row
();
...
...
index.php
View file @
9644680a
...
...
@@ -55,7 +55,7 @@ date_default_timezone_set("Asia/Kolkata");
*
* NOTE: If you change these, also change the error_reporting() code below
*/
define
(
'ENVIRONMENT'
,
isset
(
$_SERVER
[
'CI_ENV'
])
?
$_SERVER
[
'CI_ENV'
]
:
'
production
'
);
define
(
'ENVIRONMENT'
,
isset
(
$_SERVER
[
'CI_ENV'
])
?
$_SERVER
[
'CI_ENV'
]
:
'
development
'
);
/*
*---------------------------------------------------------------
...
...
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