From eda6aabecfb72fc9008edf0dd442fc35d3ac1717 Mon Sep 17 00:00:00 2001
From: weiweitoo <sengweitoo@gmail.com>
Date: Wed, 18 Jul 2018 17:31:11 +0800
Subject: [PATCH] Fix filter

---
 resources/assets/js/pages/admin/home.vue | 28 +++++++++++++++---------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue
index 5e4f2ab8..3c7d02a4 100644
--- a/resources/assets/js/pages/admin/home.vue
+++ b/resources/assets/js/pages/admin/home.vue
@@ -12,16 +12,16 @@
         </el-table-column>
         <el-table-column label="DateTime" prop="created_at" width="180" sortable/>
         <el-table-column label="Marking" width="120" prop="marking" />
-        <el-table-column :filters="[{text: 'X1', value: 'X1'}, {text: 'X2', value: 'X2'}]" :filter-method="filterHandler" label="Term" prop="term" width="100"/>
+        <el-table-column :filters="[{text: 'X1', value: 'X1'}, {text: 'X2', value: 'X2'}]" :filter-method="filterHandlerTerm" label="Term" prop="term" width="100"/>
         <el-table-column label="Rate" width="74" prop="rate" />
         <el-table-column label="Amount" prop="amount" justify="center" width="110" />
-        <el-table-column :filters="[{text: 'RMB', value: 'RMB'}, {text: 'USD', value: 'USD'}]" :filter-method="filterHandler" label="Transfer Amount"
+        <el-table-column :filters="[{text: 'RMB', value: 'RMB'}, {text: 'USD', value: 'USD'}]" :filter-method="filterHandlerTranferAmount" label="Transfer Amount"
                          prop="transfer_amount" width="170" />
         <!-- <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">
+        <el-table-column label="Status" width="106" :filters="[{ text: 'Success', value: 'Success' }, { text: 'Pending', value: 'Pending' }]" :filter-method="filterHandlerStatus" prop="status_desc">
           <template slot-scope="scope">
             <el-popover trigger="click" placement="top">
               <p>{{ scope.row.status_desc }}</p>
@@ -33,8 +33,7 @@
         </el-table-column>
         <!-- <el-table-column label="Balance" prop="transfer_amount" sortable width="100"/> -->
         <!-- <el-table-column prop="timeout" label="Bankin Timeout" /> -->
-        <el-table-column :filters="[{ text: 'Success', value: 'Success' }, { text: 'Pending', value: 'Pending' }]" :filter-method="filterTag"
-                         label="" width="180" filter-placement="bottom-end">
+        <el-table-column label="" width="180">
           <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.admin_status, scope.row.id) }"> View Status </el-button>
           <!-- <template slot-scope="scope">
               <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">View Status</el-button>
@@ -83,12 +82,21 @@ export default {
         })
       })
     },
-    filterTag (value, row) {
-      return row.tag === value
+    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)");
     },
-    filterHandler (value, row, column) {
-      const property = column['property']
-      return row[property] === value
+    filterHandlerTranferAmount (value, row, column) {
+      // Pending...lol
+      console.log(12);
+      return false;
+    },
+    filterHandlerTerm(value, row, column){
+      const term = row.term;
+      return value.toLowerCase() === term.substring(0,2);
     },
     BookingStatus (status, booking_id) {
       // TODO : Get booking status from server