From b9c0bc53fdf32e0b53dec4c1afcc761f862f6a72 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Thu, 21 Jun 2018 17:35:08 +0800 Subject: [PATCH] added booking table to admin home integrate booking list to admin home --- app/Http/Controllers/BookingController.php | 12 +++++++-- resources/assets/js/pages/admin/home.vue | 29 +++++++++++++++++++++- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 89c78366..bed53474 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -18,9 +18,17 @@ class BookingController extends Controller { public function index(){ + $user = Auth::user(); + + if ($user->roles->first()->name == 'admin'){ + $bookings = Booking::select('id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') + ->get(); + } + else{ $bookings = Booking::select('id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') - ->where('user_id',Auth::user()->id) - ->get(); + ->where('user_id', $user->id) + ->get(); + } // reformat to fit frontend structure foreach ($bookings as $booking) { diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue index 841b541b..56a63f93 100644 --- a/resources/assets/js/pages/admin/home.vue +++ b/resources/assets/js/pages/admin/home.vue @@ -45,6 +45,8 @@