diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 05ce2205..6efd7281 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -80,7 +80,7 @@ class BookingController extends Controller
$user = Auth::user();
$bookings = Booking::select('user_id', 'id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status')
->orderby('updated_at','desc')
- ->get();
+ ->paginate(10);
// reformat to fit frontend structure
foreach ($bookings as $booking) {
diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue
index 501256b5..8c689d93 100644
--- a/resources/assets/js/pages/admin/home.vue
+++ b/resources/assets/js/pages/admin/home.vue
@@ -47,6 +47,15 @@
+
+
+ Previous
+
+ Page {{pagination.current_page}} of {{pagination.last_page}}
+
+ Next
+
+
@@ -59,9 +68,9 @@ export default {
data () {
return {
status: null,
- bookingTable: [
- ],
- url: 'api/admin/booking',
+ bookingTable: [],
+ url: 'api/admin/booking',
+ pagination: {prev_page_url: null},
loading_btn: false,
}
},
@@ -69,10 +78,12 @@ export default {
this.getBooking()
},
methods: {
- getBooking() {
+ getBooking(){
let $this = this
axios.get(this.url).then(response => {
- this.bookingTable = response.data
+ this.bookingTable = response.data.data
+ $this.makePagination(response.data)
+ console.log(response)
})
},
RefreshBooking() {
@@ -80,7 +91,7 @@ export default {
this.loading_btn = true
axios.get(this.url).then(response => {
this.loading_btn = false;
- this.bookingTable = response.data
+ this.bookingTable = response.data.data
this.$message({
showClose: true,
message: 'Booking is updated',
@@ -89,6 +100,20 @@ export default {
})
})
},
+ makePagination(data){
+ let pagination ={
+ current_page: data.current_page,
+ last_page: data.last_page,
+ next_page_url: data.next_page_url,
+ prev_page_url: data.prev_page_url
+ }
+ this.pagination = pagination
+ console.log(this.pagination)
+ },
+ fetchPaginateBooking(url) {
+ this.url = url
+ this.getBooking()
+ },
filterHandlerStatus (value, row, column) {
const status = row.track_status;
if(value ==="Success")
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index 99e8f9fe..bd411ed4 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -203,31 +203,31 @@
| + Service Charges : |
- RM {{ bookingConfirmTable.service_charge }}
+ RM {{ bookingConfirmTable.service_charge }}
|
| / Rate : |
- {{ bookingConfirmTable.rate }}
+ {{ bookingConfirmTable.rate }}
|
|
- RM {{ bookingConfirmTable.subtotal }}
+ RM {{ bookingConfirmTable.subtotal }}
|
| + Tax : |
- RM {{ bookingConfirmTable.taxAmount }}
+ RM {{ bookingConfirmTable.taxAmount }}
|
| + Billing Charge : |
- RM {{ bookingConfirmTable.billingChargeAmount }}
+ RM {{ bookingConfirmTable.billingChargeAmount }}
|
@@ -330,7 +330,6 @@
-