From 03cbcc3542ebe1368ea58fe7cca7de4687939dd2 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 19 Apr 2019 14:56:57 +0800
Subject: [PATCH] fixing totals to include service charge for x2 payments

---
 resources/assets/js/pages/admin/home.vue | 26 +++++++++++++-----------
 resources/assets/js/pages/home.vue       | 14 ++++++-------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue
index a4d2ee06..ab1c9b03 100644
--- a/resources/assets/js/pages/admin/home.vue
+++ b/resources/assets/js/pages/admin/home.vue
@@ -317,52 +317,54 @@ export default {
       // TODO : Get booking status from server
       this.status = status
       switch (this.status) {
-        case '1':
+        case 1:
           this.$router.push({
             name: 'booking.admin.booking.detail',
             params: {id: booking_id }
           })
           break
-        case '2':
+        case 2:
           this.$router.push({
             name: 'booking.admin.verification',
             params: {id: booking_id }
           })
           break
-        case '3':
+        case 3:
           this.$router.push({
             name: 'booking.admin.supplier',
             params: {id: booking_id }
           })
           break
-        case '4':
+        case 4:
           this.$router.push({
             name: 'booking.admin.supplier.report',
             params: {id: booking_id }
           })
           break
-        case '5':
+        case 5:
           this.$router.push({
             name: 'booking.admin.cnslip',
             params: {id: booking_id }
           })
           break
 
-        case '6':
+        case 6:
           if(term == 'x2_cash' || term == 'x2_cheque' || term == 'x2_ba'){
             this.$router.push({
               name: 'booking.admin.x2complete',
               params: {id: booking_id }
             })
             break
+          } else {
+              this.$router.push({
+                  name: 'booking.admin.invoice',
+                  params: {id: booking_id }
+              })
+              break
           }
-          this.$router.push({
-            name: 'booking.admin.invoice',
-            params: {id: booking_id }
-          })
-          break
 
-        case '7':
+
+        case 7:
           this.$router.push({
             name: 'booking.admin.complete',
             params: {id: booking_id }
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index 60aeff61..b0e972ef 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -785,32 +785,32 @@ export default {
       // TODO : Get booking status from server
       // this.status = status;
       switch (status) {
-        case '1':
+        case 1:
           this.$router.push({
             name: 'booking.user.upload',
             params: {id: booking_id }
           });
           break;
-        case '2':
+        case 2:
           this.$router.push({
             name: 'booking.user.upload',
             params: {id: booking_id }
           });
           break;
-        case '3':
+        case 3:
           this.$router.push({
             name: 'booking.user.confirmation',
             params: {id: booking_id }
           });
           break;
-        case '4':
+        case 4:
           this.$router.push({
             name: 'booking.user.transfer',
             params: {id: booking_id }
           });
           break;
 
-        case '5':
+        case 5:
           if(term === 'x2_cash' || term === 'x2_cheque' || term === 'x2_ba'){
               this.$router.push({
               name: 'booking.user.x2complete',
@@ -827,14 +827,14 @@ export default {
 
 
 
-        case '6':
+        case 6:
           this.$router.push({
             name: 'booking.user.po',
             params: {id: booking_id }
           });
           break;
 
-        case '7':
+        case 7:
           this.$router.push({
             name: 'booking.user.complete',
             params: {id: booking_id }