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

Add source to invoice criteria. Modify invoice rules to get service fees from... #1701

Merged
arcticzero merged 217 commits from 746-resq-2-0-final into master 2023-11-22 08:54:48 +00:00
Conversation 2 Commits 217 Files changed 179 +27
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0b3b5eb0bb - Show all commits

27
src/Controller/CustomerAppAPI/JobOrderController.php
View file

@ -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