From 28a6f43b0ae0eaf21eca4fd35f1e83ef8289fb7e Mon Sep 17 00:00:00 2001
From: Mouhamed Lamine <mouhamedlaminebah@gmail.com>
Date: Tue, 10 Jul 2018 18:08:59 +0800
Subject: [PATCH] Showing Completed Orders To Admin Done Except Making Table
 Sortable

---
 app/Http/Controllers/BookingController.php         | 14 +++++++-------
 resources/assets/js/pages/admin/complete-order.vue |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 49436178..18ec3746 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -756,19 +756,19 @@ class BookingController extends Controller
 
     public function adminShowCompletedOrders()
     {
-        $user = Auth::user();
-        $bookings = Booking::select('id', 'company_name','created_at', 'amount', 'admin_status')
+        $bookings = Booking::select('id', 'company_name','company_address','created_at', 'rmb_book_amount', 'admin_status')
                ->where('admin_status', 1)
                ->orderBy('id', 'desc')
                ->take(10)
                ->get();
                
         foreach ($bookings as $booking) {
-            $booking->id = $id;
-            $booking->company_name = $company_name;
-            $booking->created_at = $created_at;
-            $booking->amount = $amount;
-            $booking->admin_status = $admin_status;
+            $booking->id;
+            $booking->company_name;
+            $booking->company_address;
+            $booking->created_at;
+            $booking->rmb_book_amount;
+            $booking->admin_status;
         }
         return $bookings;
     }
diff --git a/resources/assets/js/pages/admin/complete-order.vue b/resources/assets/js/pages/admin/complete-order.vue
index 9e5a6839..9a15a8b2 100644
--- a/resources/assets/js/pages/admin/complete-order.vue
+++ b/resources/assets/js/pages/admin/complete-order.vue
@@ -15,8 +15,9 @@
     <el-table :data="tableData" stripe style="width: 100%">
         <el-table-column label="Order No" prop="id"></el-table-column>
         <el-table-column label="Company Name"  prop="company_name"></el-table-column>
+        <el-table-column label="Company Address"  prop="company_address"></el-table-column>
         <el-table-column label="Order Date"  prop="created_at"></el-table-column>
-        <el-table-column label="Transfer Amount (RMB)" prop="amount"></el-table-column>
+        <el-table-column label="Transfer Amount (RMB)" prop="rmb_book_amount"></el-table-column>
         <el-table-column label="Status" prop="admin_status"></el-table-column>
     </el-table>
     <div align="right">
@@ -31,7 +32,7 @@
       data() {
         return {
           tableData: [],
-          url: 'api/admin/complete-order',
+          url: '/api/admin/complete-order',
         }
       },
       mounted () {