Applied manual JWT check and restored all driver fields2
This commit is contained in:
@@ -164,7 +164,7 @@ class RideController extends Controller
|
||||
|
||||
return response()->json([
|
||||
'status' => 'success',
|
||||
'data' => $insertedId,
|
||||
'message' => $insertedId,
|
||||
], 200);
|
||||
|
||||
} catch (\Exception $e) {
|
||||
@@ -181,6 +181,7 @@ class RideController extends Controller
|
||||
public function accept(Request $request, int $rideId): JsonResponse
|
||||
{
|
||||
$driverId = $request->attributes->get('_jwt_user_id');
|
||||
$userType = $request->attributes->get('_jwt_user_type');
|
||||
$status = $request->input('status', 'Apply'); // Allow dynamic status but default to Apply
|
||||
|
||||
DB::connection('ride')->beginTransaction();
|
||||
@@ -291,8 +292,7 @@ class RideController extends Controller
|
||||
|
||||
return response()->json([
|
||||
'status' => 'success',
|
||||
'message' => 'Ride Accepted',
|
||||
'data' => $driverInfo
|
||||
'message' => $driverInfo
|
||||
]);
|
||||
|
||||
} catch (\Exception $e) {
|
||||
@@ -576,7 +576,7 @@ class RideController extends Controller
|
||||
if (!$ride) {
|
||||
return response()->json(['status' => 'failure', 'message' => 'Ride not found or access denied'], 404);
|
||||
}
|
||||
return response()->json(['status' => 'success', 'data' => $ride]);
|
||||
return response()->json(['status' => 'success', 'message' => $ride]);
|
||||
}
|
||||
|
||||
public function active(Request $request): JsonResponse
|
||||
@@ -595,7 +595,7 @@ class RideController extends Controller
|
||||
|
||||
return response()->json([
|
||||
'status' => 'success',
|
||||
'data' => $ride,
|
||||
'message' => $ride,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -625,6 +625,6 @@ class RideController extends Controller
|
||||
return $ride;
|
||||
});
|
||||
|
||||
return response()->json(['status' => 'success', 'data' => $rides, 'message' => $rides]);
|
||||
return response()->json(['status' => 'success', 'message' => $rides]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user