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 @@