From 98db669a6422d1f7c86c0da4e252aa16b2535e29 Mon Sep 17 00:00:00 2001 From: lonetrinity Date: Sat, 11 Aug 2018 10:23:15 +0800 Subject: [PATCH] fix/discussionResolved --- app/Http/Controllers/BookingController.php | 4 ++-- resources/assets/js/pages/home.vue | 2 +- routes/api.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 4b9042ee..8f482726 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -82,7 +82,7 @@ class BookingController extends Controller - public function complete(){ + public function userComplete(){ $user = Auth::user(); $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') ->where('status', '=', '7') @@ -209,7 +209,7 @@ class BookingController extends Controller return $bookings; } - public function bookcomplete(){ + public function adminBookComplete(){ $user = Auth::user(); $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') ->where('status', '=', '7') diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index 2647ede5..f57d934a 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -500,7 +500,7 @@ export default { bookingTable: [], bookingTableComplete: [], url: 'api/booking', - completeBookingurl : "api/complete-booking", + completeBookingurl : "api/user-complete-booking", pagination: [], completePagination: [], bookingConfirmTable: { diff --git a/routes/api.php b/routes/api.php index 8a399f37..18c5851a 100644 --- a/routes/api.php +++ b/routes/api.php @@ -43,7 +43,7 @@ Route::group(['middleware' => 'auth:api'], function () { 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('complete-booking', 'BookingController@complete'); + Route::get('user-complete-booking', 'BookingController@userComplete'); Route::get('user', 'UserController@show'); Route::patch('settings/profile', 'Settings\ProfileController@update'); @@ -70,7 +70,7 @@ Route::group(['middleware' => 'guest:api'], function () { Route::group(['middleware' => ['role:admin']], function() { Route::get('admin/booking/', 'BookingController@adminIndex'); - Route::get('admin-complete-booking', 'BookingController@bookcomplete'); + Route::get('admin-complete-booking', 'BookingController@adminBookComplete'); Route::get('admin/booking/{id}', 'BookingController@adminShow'); Route::post('update-rate', 'RateController@store'); Route::put('update-rate/{rate}', 'RateController@update');