From 23b024c2fb15181ca44800df54f68441d6ac1b67 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 21 Jun 2018 12:45:05 +0800
Subject: [PATCH] fixed status description not found removed timeout on home
 page added timeout handling in upload user bankslip

---
 app/Http/Controllers/BookingController.php    | 22 ++++++++++++-------
 .../js/pages/booking/uploadUserBankSlip.vue   | 13 +++++++++++
 resources/assets/js/pages/home.vue            | 11 +++-------
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 1b319762..e34f43b9 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -38,23 +38,29 @@ class BookingController extends Controller
             $booking->transfer_amount = $booking->bia; 
  
             $booking->track_status = "(". $booking->status ."/6)";
-
             switch ($booking->status) {
                 case 1:
-                    $booking->status_desc = "Order in progress"; 
+                    $status_desc = "Order in progress"; 
+                    break;
                 case 2:
-                    $booking->status_desc = "Waiting for payment";      
+                    $status_desc = "Waiting for payment";  
+                    break;    
                 case 3:
-                    $booking->status_desc = "Waiting verification";      
+                    $status_desc = "Waiting verification";    
+                    break;  
                 case 4:
-                    $booking->status_desc = "Processing transfer"; 
+                    $status_desc = "Processing transfer"; 
+                    break;
                 case 5:
-                    $booking->status_desc = "Transfer Complete, please upload your PO"; 
+                    $status_desc = "Transfer Complete, please upload your PO"; 
+                    break;
                 case 6:
-                    $booking->status_desc = "Processing invoice"; 
+                    $status_desc = "Processing invoice"; 
+                    break;
                 default:
-                    $booking->status_desc = "";
+                    $biastatus_desc = "";
             }
+            $booking->status_desc = $status_desc; 
         }
 
         return $bookings;
diff --git a/resources/assets/js/pages/booking/uploadUserBankSlip.vue b/resources/assets/js/pages/booking/uploadUserBankSlip.vue
index f1af9485..72866171 100644
--- a/resources/assets/js/pages/booking/uploadUserBankSlip.vue
+++ b/resources/assets/js/pages/booking/uploadUserBankSlip.vue
@@ -140,6 +140,19 @@
           this.booking.timeout = response.data.timeout * 1000
           this.start = true;
           loading.close()
+
+          if(this.booking.timeout < 0 ){
+              this.$message({
+              showClose: true,
+              message: 'Booking timeout, please make another booking.',
+              type: 'error',
+              duration: 30000,
+            });
+            this.$router.push({
+              name: 'home'
+            })
+          }
+
         }).catch((error) => {
           console.log(error)
           loading.close()
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index 06308f43..c2303a69 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -265,7 +265,7 @@
             </template>
           </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 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">
             <template slot-scope="scope">
@@ -439,11 +439,7 @@
         .then((response) => {
           console.log(response)
           this.bookingTable = response.data
-          
-          // this.booking.amount = response.data.amount
-          // this.booking.bankin_amount = response.data.bia
-          // this.booking.timeout = response.data.timeout * 1000
-          // this.start = true;
+              
           //loading.close()
         }).catch((error) => {
           // console.log(error)
@@ -596,7 +592,6 @@
             break
         }
       }
-    }
-
+    },
   }
 </script>
\ No newline at end of file