omair/exchange
1
0
Fork 0
mirror of https://gitlab.com/omair-personal/exchange.git synced 2026-08-19 12:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed status description not found

Browse Source 
removed timeout on home page
added timeout handling in upload user bankslip
This commit is contained in:
Jack Goh
2018-06-21 12:45:05 +08:00
parent 5a4c4b14ee
commit 23b024c2fb
3 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
+14 -8
View File
@@ -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;
resources/assets/js/pages/booking/uploadUserBankSlip.vue
+13
View File
@@ -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()
resources/assets/js/pages/home.vue
+3 -8
View File
@@ -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>