Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nemt_backend
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
Tobin
nemt_backend
Commits
0927cbc6
Commit
0927cbc6
authored
Jul 22, 2019
by
Tobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dc
parent
ea56201b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
Ride_model.php
application/models/Ride_model.php
+4
-4
Webservices_driver_model.php
application/models/Webservices_driver_model.php
+2
-1
No files found.
application/models/Ride_model.php
View file @
0927cbc6
...
...
@@ -175,7 +175,7 @@ class Ride_model extends CI_Model {
$driverCond
=
''
;
if
(
!
empty
(
$prvDrivers
)
&&
$prvDrivers
->
num_rows
()
>
0
&&
!
empty
(
$prvDrivers
=
$prvDrivers
->
row_array
())
&&
isset
(
$prvDrivers
[
'assigned_drivers'
])
&&
!
empty
(
$prvDrivers
=
$prvDrivers
->
row_array
())
&&
isset
(
$prvDrivers
[
'assigned_drivers'
])
&&
!
empty
(
$prvDrivers
[
'assigned_drivers'
])){
$prvDrivers
=
explode
(
','
,
$prvDrivers
[
'assigned_drivers'
]);
$drivers
=
array_diff
(
$drivers
,
$prvDrivers
);
...
...
@@ -183,9 +183,9 @@ class Ride_model extends CI_Model {
if
(
!
empty
(
$drivers
)){
$drv_ids
=
implode
(
","
,
$drivers
);
$sql
=
"SELECT DRV.driver_id,DRV.fcm_token,
3956*2*ASIN(SQRT(POWER(SIN((
$locData['plat']
-DRV.active_loc_lat)*
pi()/180/2),2)+COS(
$locData['plat']
*pi()/180)*COS(DRV.active_loc_lat*
pi()/180)*POWER(SIN((
$locData['plng']
-DRV.active_loc_lng)*
3956*2*ASIN(SQRT(POWER(SIN((
"
.
$locData
[
'plat'
]
.
"
-DRV.active_loc_lat)*
pi()/180/2),2)+COS(
"
.
$locData
[
'plat'
]
.
"
*pi()/180)*COS(DRV.active_loc_lat*
pi()/180)*POWER(SIN((
"
.
$locData
[
'plng'
]
.
"
-DRV.active_loc_lng)*
pi()/180/2),2))) AS distance
FROM drivers AS DRV
WHERE DRV.status = 1 AND DRV.driver_id IN (
$drv_ids
) AND
...
...
application/models/Webservices_driver_model.php
View file @
0927cbc6
...
...
@@ -2442,7 +2442,8 @@ function booster_seat($request) {
$drvAuth
=
$this
->
db
->
where
(
'unique_id'
,
$data
[
'auth'
])
->
get
(
'driver_auth_table'
);
if
(
!
empty
(
$drvAuth
)
&&
$drvAuth
->
num_rows
()
>
0
&&
$drvData
=
$drvAuth
->
row
()
&&
!
empty
(
$driver_id
=
$drvData
->
driver_id
)){
!
empty
(
$drvData
=
$drvAuth
->
row
())
&&
isset
(
$drvData
->
driver_id
)
&&
!
empty
(
$driver_id
=
$drvData
->
driver_id
)){
$status
=
$this
->
db
->
update
(
'transport_details'
,
array
(
'status'
=>
4
),
array
(
'transport_id'
=>
$data
[
'trip_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