cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-22 22:04:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into admin_Completed_Order

Browse Source
This commit is contained in:
lonetrinity
2018-08-17 12:13:43 +08:00
parent 249894d5b2 67cce6e91e
commit 408be5d367
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/js/pages/admin/home.vue
+9 -1
View File
@@ -1,7 +1,7 @@
<template>
<div>
<div align="right">
<el-button :loading="loading_btn" type="primary" size="mini" @click="RefreshBooking()">Refresh</el-button>
<el-button :loading="loading_btn" type="primary" size="mini" @click="RefreshBooking(); RefreshBookingTableComplete()">Refresh</el-button>
</div>
<!-- Booking Table -->
@@ -176,6 +176,14 @@ export default {
})
})
},
RefreshBookingTableComplete() {
let $this = this
this.loading_btn = true
axios.get(this.completeBookingurl).then(response => {
this.loading_btn = false;
this.bookingTableComplete = response.data.data
})
},
makePagination(data){
let pagination ={
current_page: data.current_page,
resources/assets/js/pages/home.vue
+11 -4
View File
@@ -278,7 +278,7 @@
<br>
<hr>
<div align="right">
<el-button :loading="loading_btn" type="primary" size="mini" @click="RefreshBooking()">Refresh</el-button></div>
<el-button :loading="loading_btn" type="primary" size="mini" @click="RefreshBooking(); RefreshBookingTableComplete()">Refresh</el-button></div>
<!-- Booking Table -->
<el-tabs type="border-card" class="table-switch">
@@ -527,8 +527,7 @@ export default {
this.getBooking();
this.initBooking();
this.getRate();
this.getCompleteBooking();
this.listen();
this.getBookingTableComplete();
},
methods: {
// listen to update rate changes
@@ -568,7 +567,7 @@ export default {
$this.makePagination(response.data)
})
},
getCompleteBooking(){
getBookingTableComplete(){
let $this = this
axios.get(this.completeBookingurl).then(response => {
this.bookingTableComplete = response.data.data
@@ -615,6 +614,14 @@ export default {
})
})
},
RefreshBookingTableComplete() {
let $this = this
this.loading_btn = true
axios.get(this.completeBookingurl).then(response => {
this.loading_btn = false;
this.bookingTableComplete = response.data.data
})
},
makePagination(data){
let pagination ={
current_page: data.current_page,