Applied manual JWT check and restored all driver fields68j2

This commit is contained in:
Hamza-Ayed
2026-04-25 15:07:51 +03:00
parent da590e7fc0
commit 61212b60af
5 changed files with 52 additions and 7 deletions

View File

@@ -613,15 +613,24 @@ class RideController extends Controller
$query->forPassenger($userId);
}
$rides = $query->orderBy('id', 'desc')
$rides = $query->with('passenger')->orderBy('id', 'desc')
->skip(($page - 1) * $limit)
->take($limit)
->get()
->map(function ($ride) {
$ride->order_id = $ride->id;
$ride->start_name = "Pickup point"; // Simplified for now
$ride->start_name = "Pickup point";
$ride->end_name = "Destination point";
$ride->price = (string) number_format($ride->price, 0, '.', '');
if ($ride->passenger) {
$p = $ride->passenger;
$fname = !empty($p->first_name) ? $this->encryption->decrypt($p->first_name) : '';
$lname = !empty($p->last_name) ? $this->encryption->decrypt($p->last_name) : '';
$ride->passenger_name = trim($fname . ' ' . $lname);
$ride->passenger_phone = !empty($p->phone) ? $this->encryption->decrypt($p->phone) : '';
}
return $ride;
});