From 87dc08aabf91d6e422a16825960055250a24f898 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Mon, 3 Sep 2018 14:13:52 +0800
Subject: [PATCH 1/4] WIP changelog

---
 CHANGELOG.md             | 7 +++++++
 public/mix-manifest.json | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 public/mix-manifest.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2692af65..7f264b0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # Changelog
+### 1.0.5-alpha 2018-09-03 
+- Fixed 404 error on downloading PO format 
+- Fixed admin step 2 404 error 
+- Fixed all files 404 error 
+- Added marking column to admin completed table 
+- 
+
 ### 1.0.4-alpha 2018-08-27 
 - Updated bank setting dropdown list to [Beneficiary Name : bank name : bank account no]
 - Fixed some booking view status 404 error
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
deleted file mode 100644
index 774f9597..00000000
--- a/public/mix-manifest.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "/js/lang-zh-CN.c0da3973e52421a8cfe5.js": "/js/lang-zh-CN.c0da3973e52421a8cfe5.js",
-    "/js/lang-es.f4a1a5b4a30e92527b46.js": "/js/lang-es.f4a1a5b4a30e92527b46.js",
-    "/js/lang-en.0f790217417404ecc662.js": "/js/lang-en.0f790217417404ecc662.js",
-    "/js/app.js": "/js/app.js",
-    "/css/app.css": "/css/app.css"
-}
\ No newline at end of file

From 25d1dd4e9f4c15d52ed1786b95dad185f068965c Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Mon, 3 Sep 2018 14:19:36 +0800
Subject: [PATCH 2/4] temporary disable cancel booking button due to untested
 feature

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

diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index b649df4f..16ef6863 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -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>
           
           

From af9967a86471523a206e19220934c7f710d8a309 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Mon, 3 Sep 2018 14:39:38 +0800
Subject: [PATCH 3/4] remove USD sorting fixed term sorting

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

diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index 16ef6863..5b9c6562 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -291,11 +291,10 @@
             <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 :filters="[{text: 'X1 cash', value: 'x1_cash'}, {text: 'X1 ba', value: 'x1_ba'}, {text: 'X1 cheque', value: 'x1_cheque'}]" :filter-method="filterHandler" label="Term" prop="term" width="100"/> -->
+          <el-table-column label="Rate" width="100" prop="rate" sortable/>
           <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" />
+          <el-table-column label="Transfer Amount" prop="transfer_amount" width="170" 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> -->
@@ -322,12 +321,10 @@
               <el-button size="mini" type="danger" @click="BookingStatus(scope.$index, scope.row)">Cancel</el-button>
             </template> -->
           </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-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-table-column>
         </el-table>
         <div align="right">
       <el-button type="primary" size="mini" @click="fetchPaginateBooking(pagination.prev_page_url)" :disabled="!pagination.prev_page_url">
@@ -350,11 +347,10 @@
             <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 :filters="[{text: 'X1 cash', value: 'x1_cash'}, {text: 'X1 ba', value: 'x1_ba'}, {text: 'X1 cheque', value: 'x1_cheque'}]" :filter-method="filterHandler" label="Term" prop="term" width="100"/> -->
+          <el-table-column label="Rate" width="120" prop="rate" sortable/>
           <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" />
+          <el-table-column label="Transfer Amount" prop="transfer_amount" width="170" 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> -->
@@ -534,7 +530,6 @@ export default {
     this.getBooking();
     this.initBooking();
     this.getRate();
-    this.cancelBooking();
     this.getBookingTableComplete();
   },
   methods: {

From f8edb5c15954241361103fb84380648c8fbe35b0 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Mon, 3 Sep 2018 14:40:17 +0800
Subject: [PATCH 4/4] update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f264b0b..52c00e2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,8 @@
 - Fixed 404 error on downloading PO format 
 - Fixed admin step 2 404 error 
 - Fixed all files 404 error 
+- Updated sorting feature
 - Added marking column to admin completed table 
-- 
 
 ### 1.0.4-alpha 2018-08-27 
 - Updated bank setting dropdown list to [Beneficiary Name : bank name : bank account no]