Applied manual JWT check and restored all driver fields1

This commit is contained in:
Hamza-Ayed
2026-04-25 12:39:35 +03:00
parent b9e66772a4
commit e306217806
4 changed files with 34 additions and 3 deletions

View File

@@ -93,6 +93,28 @@ class InviteController extends Controller
}
}
/** GET /v2/invites/driver */
public function index(Request $request): JsonResponse
{
$driverId = $request->attributes->get('_jwt_user_id') ?? $request->input('driverId');
$invites = DB::connection('primary')->table('invites')
->where('driverId', $driverId)
->get()
->map(function ($invite) {
// V1 logic expects certain field names
$invite->invitorName = "Driver " . substr($invite->inviterDriverPhone, -4);
$invite->countOfInvitDriver = $invite->isInstall == 1 ? "100" : "0";
$invite->isGiftToken = $invite->isGiftToken ?? 0;
return $invite;
});
return response()->json([
'status' => 'success',
'message' => $invites
]);
}
/** POST /v2/invites/passenger */
public function invitePassenger(Request $request): JsonResponse
{

View File

@@ -616,8 +616,15 @@ class RideController extends Controller
$rides = $query->orderBy('id', 'desc')
->skip(($page - 1) * $limit)
->take($limit)
->get();
->get()
->map(function ($ride) {
$ride->order_id = $ride->id;
$ride->start_name = "Pickup point"; // Simplified for now
$ride->end_name = "Destination point";
$ride->price = (string) number_format($ride->price, 0, '.', '');
return $ride;
});
return response()->json(['status' => 'success', 'data' => $rides]);
return response()->json(['status' => 'success', 'data' => $rides, 'message' => $rides]);
}
}

View File

@@ -94,7 +94,7 @@ class Driver extends Model
public function scopeActive($query)
{
return $query->whereIn('status', ['notDeleted', 'active']);
return $query->whereIn('status', ['notDeleted', 'active', 'actives']);
}
public function scopeById($query, string $driverId)