From 80d90d680b39609c4025a66416fcc3707d80cbed Mon Sep 17 00:00:00 2001
From: lonetrinity <psychixkilax@com>
Date: Tue, 7 Aug 2018 19:14:25 +0800
Subject: [PATCH] fix display booking complete table

---
 app/Http/Controllers/BookingController.php | 19 ++++++++++---------
 resources/assets/js/pages/home.vue         |  9 ++++-----
 routes/api.php                             |  6 +++---
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index ae167374..161010d8 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -24,7 +24,7 @@ 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')
-                                    ->where('user_id', $user->id)
+                                    ->where('status', '<', '7') 
                                     ->orderby('updated_at','desc')
                                     ->paginate(10);
 
@@ -80,12 +80,12 @@ class BookingController extends Controller
     
 
 
-
+ 
     
-    public function bookingTableComplete(){
+    public function complete(){
 		$user = Auth::user();
         $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
-                                    ->where('status', 7)
+                                    ->where('status', '=', '7')
                                     ->orderby('updated_at','desc')
                                     ->paginate(10);
 
@@ -211,16 +211,17 @@ class BookingController extends Controller
     public function show($id)
     {   
         $booking = Booking::where('user_id',Auth::user()->id)->where('id', $id)->first();
-       
-        $user_bankslip = $booking->userBankSlip()->first();
-        $china_bankslip = $booking->chinaBankSlip()->get();
-        $po = $booking->purchaseOrder()->first();
-        $invoice = $booking->invoice()->first();
+
 
 		if($booking){
 
             $date1 = new DateTime($booking->created_at);
             
+            $user_bankslip = $booking->userBankSlip()->first();
+            $china_bankslip = $booking->chinaBankSlip()->get();
+            $po = $booking->purchaseOrder()->first();
+            $invoice = $booking->invoice()->first();
+
             if ($user_bankslip){
                 $booking->user_bankslip_path = Storage::url($user_bankslip->bankslip_path);
                 $booking->reject_reason = $user_bankslip->reject_reason;
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index fa346694..ec8dad36 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -324,7 +324,7 @@
   <el-tab-pane label="Booking Completed Table">
   <el-row :gutter="20">
       <div>
-        <el-table :data="bookingCompleteTable">
+        <el-table :data="bookingTableComplete">
           <el-table-column label="Ref No." width="100">
             <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">Update</el-button>
             <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.status, scope.row.id) }"> {{ scope.row.id }}</el-button>
@@ -489,9 +489,8 @@ export default {
       dialogFormVisible: false,
       dialogFormVisible1: false,
       formLabelWidth: '0px',
-      bookingTable: [
-      ],
-      bookingCompleteTable: [],
+      bookingTable: [],
+      bookingTableComplete: [],
       url: 'api/booking',
       pagination: [],
       bookingConfirmTable: {
@@ -523,7 +522,7 @@ export default {
     },
     getbookingTableComplete(){
       let $this = this
-      axios.get('api/booking/complete').then(response => {
+      axios.get('api/complete-booking').then(response => {
         this.bookingTableComplete = response.data.data
         $this.makePagination(response.data)
       })
diff --git a/routes/api.php b/routes/api.php
index 4dc0e574..1321274e 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -32,7 +32,7 @@ Route::group(['middleware' => 'auth:api'], function () {
 	Route::get('booking/{book_id}', 'BookingController@show');
 	Route::put('booking/{book_id}', 'BookingController@update');
 	Route::delete('booking/{book_id}', 'BookingController@delete');
-	Route::post('booking', 'BookingController@store');
+	Route::post('booking/', 'BookingController@store');
 	Route::post('booking/calculation', 'BookingController@calculation');
 	Route::post('booking/{book_id}/cancel', 'BookingController@cancel');
 	Route::post('booking/{id}/upload-user-bankslip', 'BookingController@uploadbankslip');
@@ -42,8 +42,8 @@ Route::group(['middleware' => 'auth:api'], function () {
 	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/complete', 'BookingController@bookingTableComplete');
+	Route::get('booking/', 'BookingController@index'); 
+	Route::get('complete-booking', 'BookingController@complete');
 
 	Route::get('user', 'UserController@show');
 	Route::patch('settings/profile', 'Settings\ProfileController@update');