diff --git a/app/Http/Controllers/InviteController.php b/app/Http/Controllers/InviteController.php index 402f9b5..f1a4e89 100644 --- a/app/Http/Controllers/InviteController.php +++ b/app/Http/Controllers/InviteController.php @@ -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 { diff --git a/app/Http/Controllers/RideController.php b/app/Http/Controllers/RideController.php index 4420eab..39bac7c 100644 --- a/app/Http/Controllers/RideController.php +++ b/app/Http/Controllers/RideController.php @@ -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]); } } diff --git a/app/Models/Driver.php b/app/Models/Driver.php index 836fdb5..4909f80 100644 --- a/app/Models/Driver.php +++ b/app/Models/Driver.php @@ -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) diff --git a/routes/api.php b/routes/api.php index 61719a0..671d7d8 100644 --- a/routes/api.php +++ b/routes/api.php @@ -152,6 +152,7 @@ Route::prefix('v2')->middleware(['hmac.auth', 'jwt.auth'])->group(function () { // ── Notifications ── Route::get('/notifications', [NotificationController::class, 'index']); + Route::get('/notifications/driver', [NotificationController::class, 'index']); Route::post('/notifications/update', [NotificationController::class, 'updateNotification']); Route::get('/notifications/token', [NotificationController::class, 'getToken']); Route::post('/notifications/token', [NotificationController::class, 'updateToken']); @@ -170,6 +171,7 @@ Route::prefix('v2')->middleware(['hmac.auth', 'jwt.auth'])->group(function () { Route::post('/misc/egypt-phones', [MiscController::class, 'saveEgyptPhones']); // ── Invites ── + Route::get('/invites/driver', [InviteController::class, 'index']); Route::post('/invites/driver', [InviteController::class, 'inviteDriver']); Route::post('/invites/passenger', [InviteController::class, 'invitePassenger']); Route::get('/invites/gift', [InviteController::class, 'checkGift']);