diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index ebf2f580..9f13be97 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -19,11 +19,11 @@ class BookingController extends Controller { public function index(){ - - $user = Auth::user(); - $bookings = Booking::select('id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') + $user = Auth::user(); + $bookings = Booking::select('id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') ->where('user_id', $user->id) - ->get(); + ->get() + ->paginate(10); // reformat to fit frontend structure diff --git a/routes/api.php b/routes/api.php index af74acf6..86fe8e53 100644 --- a/routes/api.php +++ b/routes/api.php @@ -42,10 +42,10 @@ Route::group(['middleware' => 'auth:api'], function () { Route::post('booking/{book_id}/reject-bank-slip','BookingController@rejectBankSlip'); Route::post('booking/{book_id}/approve-bank-slip','BookingController@approveBankSlip'); Route::post('booking/{book_id}/cancel', 'BookingController@cancel'); - + Route::get('/booking', 'BookingController@index'); Route::get('/user', 'UserController@show'); }); -Route::get('/booking', 'BookingController@index'); + Route::patch('settings/profile', 'Settings\ProfileController@update'); Route::patch('settings/password', 'Settings\PasswordController@update'); diff --git a/tests/Feature/BookingTest.php b/tests/Feature/BookingTest.php index 616b6b25..9dbc1b68 100644 --- a/tests/Feature/BookingTest.php +++ b/tests/Feature/BookingTest.php @@ -4,6 +4,7 @@ namespace Tests\Feature; use Tests\TestCase; use Illuminate\Foundation\Testing\WithoutMiddleware; +use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Database\Seeder; use Illuminate\Foundation\Testing\DatabaseMigrations; use Illuminate\Support\Facades\Storage;