rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Add delivery_address and delivery_instructions to rider status user api call #162

Browse source
This commit is contained in:
Kendrick Chan 2018-08-09 03:36:27 +08:00
parent f2d83dca43
commit df709aa353
1 changed files with 28 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/Controller/APIController.php
View file

@ -1088,29 +1088,26 @@ class APIController extends Controller
$jo = $ongoing_jos[0]; $jo = $ongoing_jos[0];
$dest = $jo->getCoordinates(); $dest = $jo->getCoordinates();
$data = [
'jo_id' => $jo->getID(),
'service_type' => $jo->getServiceType(),
'destination' => [
'long' => $dest->getLongitude(),
'lat' => $dest->getLatitude(),
],
'delivery_address' => $jo->getDeliveryAddress(),
'delivery_instructions' => $jo->getDeliveryInstructions(),
];
switch ($jo->getStatus()) switch ($jo->getStatus())
{ {
case JOStatus::PENDING: case JOStatus::PENDING:
$res->setData([ $data['status'] = APIRiderStatus::OUTLET_ASSIGN;
'status' => APIRiderStatus::OUTLET_ASSIGN, $res->setData($data);
'jo_id' => $jo->getID(),
'service_type' => $jo->getServiceType(),
'destination' => [
'long' => $dest->getLongitude(),
'lat' => $dest->getLatitude(),
],
]);
return $res->getReturnResponse(); return $res->getReturnResponse();
case JOStatus::RIDER_ASSIGN: case JOStatus::RIDER_ASSIGN:
$res->setData([ $data['status'] = APIRiderStatus::RIDER_ASSIGN;
'status' => APIRiderStatus::RIDER_ASSIGN, $res->setData($data);
'jo_id' => $jo->getID(),
'service_type' => $jo->getServiceType(),
'destination' => [
'long' => $dest->getLongitude(),
'lat' => $dest->getLatitude(),
],
]);
return $res->getReturnResponse(); return $res->getReturnResponse();
case JOStatus::ASSIGNED: case JOStatus::ASSIGNED:
case JOStatus::IN_TRANSIT: case JOStatus::IN_TRANSIT:
@ -1123,27 +1120,20 @@ class APIController extends Controller
$image_url = $url_prefix . '/assets/images/user.gif'; $image_url = $url_prefix . '/assets/images/user.gif';
if ($rider->getImageFile() != null) if ($rider->getImageFile() != null)
$image_url = $url_prefix . '/uploads/' . $rider->getImageFile(); $image_url = $url_prefix . '/uploads/' . $rider->getImageFile();
$res->setData([
'status' => APIRiderStatus::RIDER_PICK_UP, $data['status'] = APIRiderStatus::RIDER_PICK_UP;
'jo_id' => $jo->getID(), // TODO: fix this to actual location of rider
'service_type' => $jo->getServiceType(), $data['rider'] = [
'destination' => [ 'id' => $rider->getID(),
'long' => $dest->getLongitude(), 'name' => $rider->getFullName(),
'lat' => $dest->getLatitude(), 'plate_num' => $rider->getPlateNumber(),
], 'contact_num' => $rider->getContactNumber(),
// TODO: fix this to actual location of rider 'image_url' => $image_url,
'rider' => [ 'location' => [
'id' => $rider->getID(), 'long' => $coord->getLongitude(),
'name' => $rider->getFullName(), 'lat' => $coord->getLatitude()
'plate_num' => $rider->getPlateNumber(),
'contact_num' => $rider->getContactNumber(),
'image_url' => $image_url,
'location' => [
'long' => $coord->getLongitude(),
'lat' => $coord->getLatitude()
]
] ]
]); ];
return $res->getReturnResponse(); return $res->getReturnResponse();
} }