cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 12:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Showing Completed Orders To Admin Done Except Making Table Sortable

Browse Source
This commit is contained in:
Mouhamed Lamine
2018-07-10 18:08:59 +08:00
parent a35e4fd3c8
commit 28a6f43b0a
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
+7 -7
View File
@@ -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;
}
resources/assets/js/pages/admin/complete-order.vue
+3 -2
View File
@@ -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 () {