Hamza/intaleq_v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allplmmpliedl manual JWT check and restored all driver fields68j2

Browse Source
This commit is contained in:
Hamza-Ayed
2026-04-25 21:52:03 +03:00
parent fadb373d42
commit d20e041009
4 changed files with 127 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
app/Http/Controllers/RideController.php
View File

@@ -118,6 +118,29 @@ class RideController extends Controller
$priceForDriver = (float) $request->input('price_for_driver', $price);
$kazan = $price - $priceForDriver;
// Sync with waitingRides table (Marketplace visibility)
DB::connection('primary')->table('waitingRides')->insert([
'id' => (string)$insertedId,
'start_location' => $request->input('start_name', 'Pickup point'),
'end_location' => $request->input('end_name', 'Destination'),
'date' => $rideData['date'],
'time' => $rideData['time'],
'price' => $rideData['price'],
'passenger_id' => $passengerId,
'status' => 'waiting',
'carType' => $rideData['carType'],
'passengerRate' => $request->input('passenger_rating', '5.0'),
'distance' => $rideData['distance'],
'duration' => $request->input('duration_text', '0'),
'start_lat' => $startLat,
'start_lng' => $startLng,
'end_lat' => $endLat,
'end_lng' => $endLng,
'payment_method' => $request->input('is_wallet', '0') == '1' ? 'wallet' : 'cash',
'passenger_wallet' => $request->input('passenger_wallet', '0'),
'created_at' => now(),
]);
$payloadTemplate = [];
$payloadTemplate[0] = (string)$startLat;
$payloadTemplate[1] = (string)$startLng;
@@ -636,4 +659,73 @@ class RideController extends Controller
return response()->json(['status' => 'success', 'message' => $rides]);
}
public function availableRides(Request $request): JsonResponse
{
$lat = (float) $request->input('lat');
$lng = (float) $request->input('lng');
$radius = (float) $request->input('radius', 50); // km
$driverId = $request->attributes->get('_jwt_user_id');
// Get driver car type for hierarchical matching
$driverCarType = DB::connection('primary')->table('driver as d')
->leftJoin('CarRegistration as c', 'c.driverID', '=', 'd.id')
->where('d.id', $driverId)
->value('c.make') ?? 'Speed';
$rides = DB::connection('primary')->table('waitingRides as wr')
->select([
'wr.id', 'wr.start_location as startName', 'wr.end_location as endName',
'wr.date', 'wr.time', 'wr.price', 'wr.passenger_id', 'wr.status', 'wr.carType',
'wr.passengerRate', 'wr.created_at', 'wr.price_for_passenger',
'wr.distance', 'wr.duration', 'wr.start_lat', 'wr.start_lng',
'wr.end_lat', 'wr.end_lng', 'wr.payment_method', 'wr.passenger_wallet',
'p.email', 'p.first_name', 'p.phone', 'p.id as passengerId', 't.token as passengerToken',
DB::raw("( 6371 * acos( cos( radians($lat) ) * cos( radians( wr.start_lat ) ) * cos( radians( wr.start_lng ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( wr.start_lat ) ) ) ) AS driver_distance_km")
])
->join('passengers as p', 'p.id', '=', 'wr.passenger_id')
->leftJoin('tokens as t', 't.passengerID', '=', 'wr.passenger_id')
->whereIn('wr.status', ['wait', 'waiting'])
->where('wr.created_at', '>=', now()->subHours(24))
->having('driver_distance_km', '<=', $radius)
->orderBy('driver_distance_km')
->get()
->filter(function($ride) use ($driverCarType) {
return $this->isCarTypeMatch($driverCarType, $ride->carType);
})
->map(function($ride) {
$ride->first_name = !empty($ride->first_name) ? $this->encryption->decrypt($ride->first_name) : 'Passenger';
$ride->phone = !empty($ride->phone) ? $this->encryption->decrypt($ride->phone) : '';
$ride->email = !empty($ride->email) ? $this->encryption->decrypt($ride->email) : '';
$ride->passengerToken = !empty($ride->passengerToken) ? $this->encryption->decrypt($ride->passengerToken) : '';
$ride->start_location = $ride->start_lat . ',' . $ride->start_lng;
$ride->end_location = (!empty($ride->end_lat))
? $ride->end_lat . ',' . $ride->end_lng
: $ride->endName;
$ride->id = (string)$ride->id;
$ride->driver_distance_km = number_format((float)$ride->driver_distance_km, 1);
return $ride;
})
->values();
return response()->json([
'status' => 'success',
'message' => $rides
]);
}
private function isCarTypeMatch(string $driverType, ?string $rideType): bool
{
if (!$rideType) return true;
return match ($driverType) {
'Comfort' => in_array($rideType, ['Speed', 'Comfort', 'Fixed Price']),
'Lady' => in_array($rideType, ['Comfort', 'Speed', 'Lady']),
'Speed', 'Scooter', 'Awfar Car' => $rideType === $driverType,
default => true,
};
}
}