From ac9681956d2ecd47d6056c34fd568d796d77bc76 Mon Sep 17 00:00:00 2001
From: lonetrinity <psychixkilax@com>
Date: Mon, 27 Aug 2018 18:00:25 +0800
Subject: [PATCH 1/3] addMarkingcolumnToAdmin

---
 resources/assets/js/pages/admin/home.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue
index 64212410..d9a45106 100644
--- a/resources/assets/js/pages/admin/home.vue
+++ b/resources/assets/js/pages/admin/home.vue
@@ -67,6 +67,7 @@
             <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.admin_status, scope.row.id, scope.row.term) }"> {{ scope.row.id }}</el-button>
           </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="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" />

From fa752a087d8c61d2c0dc8f311b75ca90ab176300 Mon Sep 17 00:00:00 2001
From: lonetrinity <psychixkilax@com>
Date: Tue, 28 Aug 2018 11:01:23 +0800
Subject: [PATCH 2/3] column marking

---
 resources/assets/js/pages/admin/home.vue | 14 +++++++-------
 resources/assets/js/pages/home.vue       | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue
index d9a45106..3068a292 100644
--- a/resources/assets/js/pages/admin/home.vue
+++ b/resources/assets/js/pages/admin/home.vue
@@ -10,8 +10,8 @@
   <el-tab-pane label="Booking Table">
   <el-row :gutter="20">
     <div>
-      <el-table :data="bookingTable">
-        <el-table-column label="Ref No." width="100" sortable>
+      <el-table :data="bookingTable" :default-sort = "{prop: 'date', order: 'descending'}">
+        <el-table-column label="Ref No." width="100" >
           <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">Update</el-button>
           <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.admin_status, scope.row.id, scope.row.term) }"> {{ scope.row.id }}</el-button>
         </el-table-column>
@@ -19,9 +19,9 @@
         <el-table-column label="Marking" width="120" prop="marking" />
         <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 label="Amount" prop="amount" justify="center" width="110" sortable />
         <el-table-column :filters="[{text: 'RMB', value: 'RMB'}, {text: 'USD', value: 'USD'}]" :filter-method="filterHandlerTranferAmount" label="Transfer Amount"
-                         prop="transfer_amount" width="170" />
+                         prop="transfer_amount" width="180" sortable/>
         <!-- <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> -->
@@ -62,7 +62,7 @@
   <el-row :gutter="20">
       <div>
         <el-table :data="bookingTableComplete">
-          <el-table-column label="Ref No." width="100" sortable>
+          <el-table-column label="Ref No." width="100" >
             <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">Update</el-button>
             <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.admin_status, scope.row.id, scope.row.term) }"> {{ scope.row.id }}</el-button>
           </el-table-column>
@@ -70,9 +70,9 @@
           <el-table-column label="Marking" width="120" prop="marking" />
           <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 label="Amount" prop="amount" justify="center" width="110" sortable/>
           <el-table-column :filters="[{text: 'RMB', value: 'RMB'}, {text: 'USD', value: 'USD'}]" :filter-method="filterHandlerTranferAmount" label="Transfer Amount"
-                           prop="transfer_amount" width="170" />
+                           prop="transfer_amount" width="180" sortable/>
           <!-- <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> -->
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index b649df4f..791459e3 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -286,21 +286,21 @@
   <el-row :gutter="20">
       <div>
         <el-table :data="bookingTable">
-          <el-table-column label="Ref No." width="100" sortable>
+          <el-table-column label="Ref No." width="100" >
             <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">Update</el-button>
             <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.status, scope.row.id, scope.row.term) }"> {{ scope.row.id }}</el-button>
           </el-table-column>
           <el-table-column label="DateTime" prop="created_at" width="180" sortable/>
           <el-table-column :filters="[{text: 'X1', value: 'X1'}, {text: 'X2', value: 'X2'}]" :filter-method="filterHandler" label="Term" prop="term" width="100"/> -->
-          <el-table-column label="Rate" width="74" prop="rate" sortable/>
+          <el-table-column label="Rate" width="74" prop="rate" />
           <el-table-column label="Amount" prop="amount" justify="center" width="110" sortable/>
           <el-table-column :filters="[{text: 'RMB', value: 'RMB'}, {text: 'USD', value: 'USD'}]" :filter-method="filterHandler" label="Transfer Amount"
-                           prop="transfer_amount" width="170" />
+                           prop="transfer_amount" width="180" sortable/>
           <!-- <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" sortable>
+          <el-table-column label="Status" width="106" >
             <template slot-scope="scope">
               <el-popover trigger="click" placement="top">
                 <p>{{ scope.row.status_desc }}</p>
@@ -345,16 +345,16 @@
   <el-row :gutter="20">
       <div>
         <el-table :data="bookingTableComplete">
-          <el-table-column label="Ref No." width="100" sortable>
+          <el-table-column label="Ref No." width="100" >
             <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">Update</el-button>
             <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.status, scope.row.id) }"> {{ scope.row.id }}</el-button>
           </el-table-column>
           <el-table-column label="DateTime" prop="created_at" width="180" sortable/>
           <el-table-column :filters="[{text: 'X1', value: 'X1'}, {text: 'X2', value: 'X2'}]" :filter-method="filterHandler" label="Term" prop="term" width="100"/> -->
-          <el-table-column label="Rate" width="74" prop="rate" sortable/>
+          <el-table-column label="Rate" width="74" prop="rate" />
           <el-table-column label="Amount" prop="amount" justify="center" width="110" sortable />
           <el-table-column :filters="[{text: 'RMB', value: 'RMB'}, {text: 'USD', value: 'USD'}]" :filter-method="filterHandler" label="Transfer Amount"
-                           prop="transfer_amount" width="170" />
+                           prop="transfer_amount" width="180" sortable />
           <!-- <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> -->

From 994ef1b2616ac895b0b5086a26e37a7719e95c1e Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Mon, 3 Sep 2018 14:11:32 +0800
Subject: [PATCH 3/3] temporary disabled cancel button, due to not tested

---
 resources/assets/js/pages/home.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index 791459e3..759cc4c1 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -165,7 +165,7 @@
               />
             </el-form-item>
             <el-form-item>
-              <el-button @click="dialogFormVisible = false">Cancel</el-button>
+              <!-- <el-button @click="dialogFormVisible = false">Cancel</el-button> -->
 
               <el-button :loading="loading" type="primary" @click="getCalculationValue('bookingForm')">Book Now</el-button>
             </el-form-item>
@@ -324,7 +324,7 @@
           </el-table-column>
 <el-table-column :filters="[{ text: 'Success', value: 'Success' }, { text: 'Pending', value: 'Pending' }]" :filter-method="filterTag"
                            label="" width="180" filter-placement="bottom-end">
-            <el-button slot-scope="scope" type="text" @click="(event) => { cancelBooking(scope.row.id) }"> Cancel Booking </el-button>
+            <!-- <el-button slot-scope="scope" type="text" @click="(event) => { cancelBooking(scope.row.id) }"> Cancel Booking </el-button> -->
             </el-table-column>