From a707977ab27368fbd542f7ed9d43ef0df3c76894 Mon Sep 17 00:00:00 2001
From: weiweitoo <sengweitoo@gmail.com>
Date: Fri, 27 Jul 2018 17:44:32 +0800
Subject: [PATCH] fix bug

---
 .../admin/booking/uploadChinaBankslip.vue     | 10 ++++------
 resources/assets/js/pages/admin/home.vue      |  8 +++++++-
 .../js/pages/booking/uploadUserBankSlip.vue   |  2 +-
 resources/assets/js/pages/home.vue            | 20 +++++++++----------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
index 5ac9ede6..6a81f8c6 100644
--- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
+++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
@@ -221,7 +221,7 @@
                   </el-date-picker>
                 </el-form-item> -->
                 <el-form-item prop="actual_transfer_amount">
-                  <el-input v-model="chinaSlipForm.actual_transfer_amount" type="text" placeholder="Amount" style="width: 80%" />
+                  <el-input v-model.number="chinaSlipForm.actual_transfer_amount" type="text" placeholder="Amount" style="width: 80%" />
                 </el-form-item>
 
                 <el-form-item prop="details">
@@ -273,11 +273,9 @@
           details: null,
         },
         rules: {
-          actual_transfer_amount: [{
-            required: true,
-            message: 'Please input transfer amount',
-            trigger: 'change'
-          }],
+          actual_transfer_amount: [
+          { required: true, message: 'Please input amount',trigger: 'change'},
+          { type: 'number', message: 'Amount must be a number',trigger: 'change'}],
           // date: [{
           //   required: true,
           //   message: 'Please input date',
diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue
index 167a4daf..e01db5f1 100644
--- a/resources/assets/js/pages/admin/home.vue
+++ b/resources/assets/js/pages/admin/home.vue
@@ -57,7 +57,13 @@
   <!-- Booking Table-end -->
   </div>
 </template>
-
+<style type="text/css">
+  .el-table__column-filter-trigger i {
+    font-size: 18px;
+    font-weight: 900;
+    vertical-align: sub;
+  }
+</style>
 <script>
 import axios from 'axios'
 
diff --git a/resources/assets/js/pages/booking/uploadUserBankSlip.vue b/resources/assets/js/pages/booking/uploadUserBankSlip.vue
index 67090f97..534c66c3 100644
--- a/resources/assets/js/pages/booking/uploadUserBankSlip.vue
+++ b/resources/assets/js/pages/booking/uploadUserBankSlip.vue
@@ -10,7 +10,7 @@
 		<br>
 	</div>
 	<div v-else align="center">
-		<h1>Waiting For Payment</h1>
+		<h1>Please Upload Bankslip</h1>
 	</div>
 
 	<div class="row">
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index 0842ba43..820625ac 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -152,7 +152,7 @@
             <el-input v-model="bookingForm.order_no" placeholder="Order No." style="width: 80%" required="true" />
           </el-form-item>
             <el-form-item prop="account_name">
-              <el-input v-model="bookingForm.account_name" placeholder="China Beneficiary Account" style="width: 80%" required="true" />
+              <el-input v-model="bookingForm.account_name" placeholder="China Beneficiary Name" style="width: 80%" required="true" />
             </el-form-item>
             <el-form-item prop="bank_name">
               <el-input v-model="bookingForm.bank_name" type="text" placeholder="Bank Name / AliPay / WechatPay" style="width: 80%" />
@@ -161,7 +161,7 @@
               <el-input v-model="bookingForm.bank_branch" type="text" placeholder="Branch / 分行/支行" style="width: 80%" />
             </el-form-item>
             <el-form-item prop="account_num">
-              <el-input v-model="bookingForm.account_num" type="text" placeholder="Account Number / AliPay_ID / WechatPay_ID" style="width: 80%"
+              <el-input v-model="bookingForm.account_num" type="text" placeholder="Account Number" style="width: 80%"
               />
             </el-form-item>
             <el-form-item>
@@ -186,7 +186,7 @@
             <td>Customer Marking : </td>
             <td> {{ bookingConfirmTable.marking }}</td>
           </tr>
-          <tr>
+          <tr v-if="bookingConfirmTable.order_no != null">
             <td>Payment for (Order No.) : </td>
             <td> {{ bookingConfirmTable.order_no }}</td>
           </tr>
@@ -268,13 +268,13 @@
             <td></td>
             <td></td>
           </tr>
-          <tr>
+<!--           <tr>
             <td align="center" colspan="2">
               <b>CIEF WORLDWIDE SDN. BHD.(1134596-M)</b>
               <br/>
               <b>MBB 568603010762</b>
             </td>
-          </tr>
+          </tr> -->
         </tbody>
       </table>
       <span slot="footer" class="dialog-footer">
@@ -385,11 +385,11 @@ export default {
         account_num: ''
       },
       rules: {
-          order_no: [{
-            required: true,
-            message: 'Please input order number',
-            trigger: 'change'
-          }],
+          // order_no: [{
+          //   required: true,
+          //   message: 'Please input order number',
+          //   trigger: 'change'
+          // }],
           payment_for: [{
             required: true,
             message: 'Please input payment for',