diff --git a/src/Controller/CustomerAppAPI/JobOrderController.php b/src/Controller/CustomerAppAPI/JobOrderController.php index 8d653f3a..6c20cf9b 100644 --- a/src/Controller/CustomerAppAPI/JobOrderController.php +++ b/src/Controller/CustomerAppAPI/JobOrderController.php @@ -1361,8 +1361,35 @@ class JobOrderController extends ApiController 'lat' => $coord->getLatitude() ] ]; + + // check if jo has rider rating set to true + $has_rider_rating = $jo->hasRiderRating(); + $rating = 0; + $comment = ''; + if ($rider != null) { + $jo_data['rider'] = $rider->getFullName(); + + // find the rider rating if any + if ($has_rider_rating) { + $jo_rating = $jo->getRating(); + if ($jo_rating != null) { + $rating = $jo_rating->getRating(); + + // get comment + $comment = $jo_rating->getComment(); + } + } + } + + // rider rating for jo + $jo_data['has_rider_rating'] = $has_rider_rating; + $jo_data['rider_rating'] = $rating; + $jo_data['comment'] = $comment; } else { $jo_data['rider'] = null; + $jo_data['has_rider_rating'] = null; + $jo_data['rider_rating'] = null; + $jo_data['comment'] = null; } // invoice items