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

fix step no 4, and add filter for the bookings list

Browse Source
This commit is contained in:
Omair Saleh
2018-12-07 16:12:48 +08:00
parent 540dca24de
commit 344c854792
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
+1 -1
View File
@@ -89,7 +89,7 @@ class BookingController extends Controller
$status_desc = "Transfer Complete, please upload your PO";
break;
case 6:
$status_desc = "Processing invoice";
$status_desc = "Processing invoice";
break;
case 7:
$status_desc = "Order Completed";
resources/assets/js/pages/admin/home.vue
+8 -7
View File
@@ -25,8 +25,8 @@
<!-- <el-table-column label="ETA" sortable width="100"/> -->
<!-- <el-table-column label="Payment Method" :filters="[{text: 'Cash', value: 'Cash'}, {text: 'Cheque', value: 'Cheque'}, {text: 'BA', value: 'BA'}]" :filter-method="filterHandler">
</el-table-column> -->
<!-- <el-table-column :filters="[{text: '(1/6)', value: '(1/6) Order Done'}, {text: '(2/6)', value: '(2/6) Waiting for Upload Bank in Slip'}, {text: '(3/6)', value: '(3/6) Order Confirmation'}, {text: '(4/6)', value: '(4/6) Processing Transfer'}, {text: '(5/6)', value: '(5/6) Waiting for Upload PO'}, {text: '(6/6)', value: '(6/6) Order Complete'}]" :filter-method="filterHandler" prop="status" label="Status"/> -->
<el-table-column label="Status" width="106" :filters="[{ text: 'Success', value: 'Success' }, { text: 'Pending', value: 'Pending' }]" :filter-method="filterHandlerStatus" prop="status_desc">
<!--<el-table-column :filters="[{text: '1', value: '1'}, {text: '2', value: '2'}, {text: '3', value: '3'}, {text: '4', value: '4'}, {text: '5', value: '5'}, {text: '6', value: '6'}, {text: '7', value: '7'}]" :filter-method="filterHandlerStatus" prop="status" label="Status"/>-->
<el-table-column label="Status" width="106" :filters="[{text: '1', value: 1}, {text: '2', value: 2}, {text: '3', value: 3}, {text: '4', value: 4}, {text: '5', value: 5}, {text: '6', value: 6}, {text: '7', value: 7}]" :filter-method="filterHandlerStatus" prop="admin_status">
<template slot-scope="scope">
<el-popover trigger="click" placement="top">
<p>{{ scope.row.status_desc }}</p>
@@ -215,11 +215,12 @@ export default {
this.getBookingTableComplete()
},
filterHandlerStatus (value, row, column) {
const status = row.track_status;
if(value ==="Success")
return status === "(5/5)" || status === "(7/7)";
else
return !(status === "(5/5)" || status === "(7/7)");
const status = row.admin_status;
return value === status;
// if(value ==="Success")
// return status === "(5/5)" || status === "(7/7)";
// else
// return !(status === "(5/5)" || status === "(7/7)");
},
filterHandlerTranferAmount (value, row, column) {
// Pending...lol