From a88fdb62ae4852e7a353bfaddfb80ec8c3fd1a74 Mon Sep 17 00:00:00 2001 From: lonetrinity Date: Fri, 24 Aug 2018 16:07:09 +0800 Subject: [PATCH 01/18] merge --- app/Http/Controllers/BookingController.php | 5 +++-- resources/assets/js/pages/home.vue | 17 ++++++++++++++++- routes/api.php | 5 ++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 7a44da9a..35a3f1e8 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -34,6 +34,7 @@ class BookingController extends Controller }) ->orderby('updated_at','desc') ->paginate(10); + @@ -734,10 +735,10 @@ class BookingController extends Controller { return response()->json(['message'=>'Access denied'],403); } - + $booking->is_cancel = true; $booking->save(); - + return response()->json(['message'=>'Success'],200); } diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index 70cb0171..1106764d 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -307,7 +307,7 @@
{{ scope.row.track_status }}
- + @@ -315,11 +315,18 @@ View Status + + + + Cancel Booking + +
@@ -527,6 +534,7 @@ export default { this.getBooking(); this.initBooking(); this.getRate(); + this.cancelBooking(); this.getBookingTableComplete(); }, methods: { @@ -567,6 +575,13 @@ export default { $this.makePagination(response.data) }) }, + cancelBooking(id){ + console.log(id) + let $this = this + axios.post("api/booking/"+id+"/cancel").then(response => { + this.getBooking(); + }) + }, getBookingTableComplete(){ let $this = this axios.get(this.completeBookingurl).then(response => { diff --git a/routes/api.php b/routes/api.php index 46836995..cb0e904d 100644 --- a/routes/api.php +++ b/routes/api.php @@ -34,15 +34,14 @@ Route::group(['middleware' => 'auth:api'], function () { Route::delete('booking/{book_id}', 'BookingController@delete'); Route::post('booking/', 'BookingController@store'); Route::post('booking/calculation', 'BookingController@calculation'); - Route::post('booking/{book_id}/cancel', 'BookingController@cancel'); + Route::post('booking/{id}/cancel', 'BookingController@cancel'); Route::post('booking/{id}/upload-user-bankslip', 'BookingController@uploadbankslip'); Route::post('booking/{id}/upload-po', 'BookingController@uploadPurchaseOrder'); Route::post('booking/{id}/confirm-po', 'BookingController@confirmPurchaseOrder'); Route::patch('booking/{id}/bankslip-amount', 'BookingController@updateBankSlipAmount'); 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('booking/', 'BookingController@index'); Route::get('user-complete-booking', 'BookingController@userComplete'); Route::get('user', 'UserController@show'); From 81112e4080f2071314e08d35a282840df98a5377 Mon Sep 17 00:00:00 2001 From: lonetrinity Date: Sat, 25 Aug 2018 11:55:01 +0800 Subject: [PATCH 02/18] cancelationBooking --- app/Http/Controllers/BookingController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 60221343..6ebf8a08 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -23,8 +23,9 @@ class BookingController extends Controller public function index(){ $user = Auth::user(); - $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') + $bookings = Booking::select('user_id', 'id', 'created_at', 'is_cancel', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') ->where('user_id', Auth::user()->id) + ->where('is_cancel', 0) ->where(function ($query) { $query->where(function($query){ $query->where('status', '<', '5') From 31653556f511c02ccc27a61237f2d612ff141987 Mon Sep 17 00:00:00 2001 From: lonetrinity Date: Sat, 25 Aug 2018 13:04:48 +0800 Subject: [PATCH 03/18] lingges/featureSorting --- resources/assets/js/pages/home.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index 1106764d..b649df4f 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -286,21 +286,21 @@
- + Update {{ scope.row.id }} --> - - + + - +