From 21793252b592aaebd55c289ebdcc894e3ab58fd2 Mon Sep 17 00:00:00 2001 From: lonetrinity Date: Thu, 25 Oct 2018 16:43:23 +0800 Subject: [PATCH] changeImageUploader --- app/Http/Controllers/BookingController.php | 40 +- public/mix-manifest.json | 6 +- .../js/pages/booking/uploadUserBankSlip.vue | 16 +- resources/assets/js/pages/home.vue | 9 + routes/api.php | 3 +- yarn.lock | 3010 ++++++++--------- 6 files changed, 1497 insertions(+), 1587 deletions(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index e9d291df..f6487581 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -102,8 +102,8 @@ class BookingController extends Controller } return $bookings; - } - + } + public function userComplete(){ $user = Auth::user(); $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') @@ -729,18 +729,30 @@ class BookingController extends Controller return response()->json($book_id, 204); } - public function cancel(Request $request, $book_id) - { - if (!$booking = Booking::where('user_id',Auth::user()->id)->where('id',$book_id)->first()) - { - return response()->json(['message'=>'Access denied'],403); - } - - $booking->is_cancel = true; - $booking->save(); - - return response()->json(['message'=>'Success'],200); - } + // public function userCanceledBooking(Request $request) + // { + // $user = Auth::user(); + // $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', 1) + // ->get(); + // return $bookings; + + // } + + // public function cancelBooking(Request $request, $book_id) + // { + // $user = Auth::user(); + // $bookings = DB::table('booking') + // ->where('user_id', Auth::user()->id); + + // $bookings->is_cancel = 1; + + // if($booking->save()){ + // return response()->json(['message'=> 'booking cancelled'], 200); + // } + + // } public function calculation(Request $request) { diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 1d42e6d0..b0502809 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,7 +1,7 @@ { - "/js/lang-zh-CN.489521629fd49ac7628e.js": "/js/lang-zh-CN.489521629fd49ac7628e.js", - "/js/lang-es.459dcb868aa54d488979.js": "/js/lang-es.459dcb868aa54d488979.js", - "/js/lang-en.31386792460363b93c17.js": "/js/lang-en.31386792460363b93c17.js", + "/js/lang-zh-CN.c0da3973e52421a8cfe5.js": "/js/lang-zh-CN.c0da3973e52421a8cfe5.js", + "/js/lang-es.f4a1a5b4a30e92527b46.js": "/js/lang-es.f4a1a5b4a30e92527b46.js", + "/js/lang-en.0f790217417404ecc662.js": "/js/lang-en.0f790217417404ecc662.js", "/js/app.js": "/js/app.js", "/css/app.css": "/css/app.css" } diff --git a/resources/assets/js/pages/booking/uploadUserBankSlip.vue b/resources/assets/js/pages/booking/uploadUserBankSlip.vue index 6c2c2af1..5c238472 100644 --- a/resources/assets/js/pages/booking/uploadUserBankSlip.vue +++ b/resources/assets/js/pages/booking/uploadUserBankSlip.vue @@ -70,7 +70,7 @@ --> - + --> + + + + + +