diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index bed53474..2f906fd4 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -19,16 +19,9 @@ 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', $user->id) ->get(); - } // reformat to fit frontend structure foreach ($bookings as $booking) { @@ -67,18 +60,73 @@ class BookingController extends Controller $status_desc = "Processing invoice"; break; default: - $biastatus_desc = ""; + $status_desc = ""; } $booking->status_desc = $status_desc; } return $bookings; - } + } + + public function adminIndex(){ + $user = Auth::user(); + $bookings = Booking::select('id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status') + ->get(); + + // reformat to fit frontend structure + foreach ($bookings as $booking) { + // set timeout + $date1 = new DateTime($booking->created_at); + $date2 = new DateTime(); + $difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U')); + $booking->timeout = $difference_in_seconds; + + // TODO : you can make it better + if($difference_in_seconds < 0 ){ + $booking->timeout = 0; + } + + // TODO : transfer_amount change name to bia + $booking->transfer_amount = $booking->bia; + + $booking->track_status = "(". $booking->admin_status ."/6)"; + switch ($booking->admin_status) { + case 0: + $status_desc = "Waiting user to upload bankin slip"; + break; + case 1: + $status_desc = "Waiting for verification"; + break; + case 2: + $status_desc = "Bookg with supplier"; + break; + case 3: + $status_desc = "Supplier booking report. Please confirm with your booking."; + break; + case 4: + $status_desc = "Please update supplier booking status."; + break; + case 5: + $status_desc = "Customer has uploaded the invoice, please upload purchase order"; + break; + case 6: + $status_desc = "Booking completed"; + break; + default: + $status_desc = ""; + } + $booking->status_desc = $status_desc; + } + + return $bookings; + + } public function show($id) { $booking = Booking::where('user_id',Auth::user()->id)->where('id', $id)->first(); + if($booking){ $date1 = new DateTime($booking->created_at); $date2 = new DateTime(); $difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U')); @@ -88,7 +136,8 @@ class BookingController extends Controller if (!$booking){ return response()->json(['success'=>false, 'message'=>'not found'], 404); } - return $booking; + return $booking; + } } public function store(Request $request) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index da7a7f5c..a95cd23b 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -61,5 +61,6 @@ class Kernel extends HttpKernel 'ability' => 'App\Http\Middleware\TokenEntrustAbility', 'role' => \Zizaco\Entrust\Middleware\EntrustRole::class, 'permission' => \Zizaco\Entrust\Middleware\EntrustPermission::class, + 'ability' => 'App\Http\Middleware\TokenEntrustAbility' ]; } diff --git a/resources/assets/js/pages/admin/booking/verification.vue b/resources/assets/js/pages/admin/booking/verification.vue index e5d77ade..88843e9a 100644 --- a/resources/assets/js/pages/admin/booking/verification.vue +++ b/resources/assets/js/pages/admin/booking/verification.vue @@ -3,32 +3,38 @@
-

Waiting For Payment

+

+
+
Verify User Bankslip
+
+
- +
- - - - - - - - - - - -
Amount :    - RMB {{ booking.amount }} -
Bankin Amount :    - MYR {{ booking.bankin_amount }} -
+ +
+ Order Details + +
+ + + + + + + + + + + + + + +
-
- - +
BankinSlip @@ -41,32 +47,6 @@ - -
- Bankin Amount (RM) : - -
- - - - -
- Submit - - Upload Later - -
- -
- -
-
-
- -