From 18a1b270e5bccd826d48499dc26b2ded17c3d55b Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 18 Apr 2019 12:15:59 +0800
Subject: [PATCH] fix 2x steps and service charge

---
 app/Http/Controllers/BookingController.php    |  4 +-
 .../js/pages/admin/booking/bookingDetail.vue  |  2 +-
 .../js/pages/admin/booking/completed.vue      |  2 +-
 .../pages/admin/booking/supplierBooking.vue   |  2 +-
 .../js/pages/admin/booking/supplierReport.vue |  2 +-
 .../admin/booking/uploadChinaBankslip.vue     |  2 +-
 .../js/pages/admin/booking/uploadInvoice.vue  |  2 +-
 .../js/pages/admin/booking/verification.vue   |  2 +-
 .../js/pages/admin/booking/x2Completed.vue    |  2 +-
 resources/assets/js/pages/admin/home.vue      | 14 ++---
 .../assets/js/pages/booking/completed.vue     |  2 +-
 .../assets/js/pages/booking/confirmation.vue  |  2 +-
 resources/assets/js/pages/booking/po.vue      |  2 +-
 .../assets/js/pages/booking/poComplete.vue    |  2 +-
 .../assets/js/pages/booking/transfer.vue      |  2 +-
 .../assets/js/pages/booking/uploadPo.vue      |  2 +-
 .../assets/js/pages/booking/x2Completed.vue   |  2 +-
 resources/assets/js/pages/home.vue            | 59 +++++++++----------
 18 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index cc93195d..f5a7ca43 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -720,10 +720,10 @@ class BookingController extends Controller
              break;
          }
  
-         if ($amount >= 10000 && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) {
+         if ($amount >= 20000 && ($term == 'x2_cash' || $term == 'x2_cheque' || $term == 'x2_ba')) {
              $svcharge = 0;
          } else {
-             $svcharge = 0;
+             $svcharge = 20;
              //$svcharge = 0; // UPDATE ON : 15-8-2018 from PM
          }
         
diff --git a/resources/assets/js/pages/admin/booking/bookingDetail.vue b/resources/assets/js/pages/admin/booking/bookingDetail.vue
index 0d50efdd..b5b17ec6 100644
--- a/resources/assets/js/pages/admin/booking/bookingDetail.vue
+++ b/resources/assets/js/pages/admin/booking/bookingDetail.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <x2-progress-track v-if="(booking_details.admin_status == 'x2_cash' || booking_details.admin_status == 'x2_cheque' || booking_details.admin_status == 'x2_ba')" v-model="trackerConfig" />
+    <x2-progress-track v-if="(trackerConfig.term == 'x2_cash' || trackerConfig.term == 'x2_cheque' || trackerConfig.term == 'x2_ba')" v-model="trackerConfig" />
     <progress-track v-else v-model="trackerConfig" />
 
     <div align="center">
diff --git a/resources/assets/js/pages/admin/booking/completed.vue b/resources/assets/js/pages/admin/booking/completed.vue
index 9deaab27..bd18687e 100644
--- a/resources/assets/js/pages/admin/booking/completed.vue
+++ b/resources/assets/js/pages/admin/booking/completed.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <x2-progress-track v-if="(booking_details.admin_status == 'x2_cash' || booking_details.admin_status == 'x2_cheque' || booking_details.admin_status == 'x2_ba')" v-model="trackerConfig" />
+    <x2-progress-track v-if="(trackerConfig.term == 'x2_cash' || trackerConfig.term == 'x2_cheque' || trackerConfig.term == 'x2_ba')" v-model="trackerConfig" />
     <progress-track v-else v-model="trackerConfig" />
 
     <div align="center">
diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue
index 319848ae..1cc0fed2 100644
--- a/resources/assets/js/pages/admin/booking/supplierBooking.vue
+++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <x2-progress-track v-if="(booking_details.admin_status == 'x2_cash' || booking_details.admin_status == 'x2_cheque' || booking_details.admin_status == 'x2_ba')" v-model="trackerConfig" />
+    <x2-progress-track v-if="(trackerConfig.term == 'x2_cash' || trackerConfig.term == 'x2_cheque' || trackerConfig.term == 'x2_ba')" v-model="trackerConfig" />
     <progress-track v-else v-model="trackerConfig" />
 
     <div align="center">
diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue
index a5d2c855..47b7cfc6 100644
--- a/resources/assets/js/pages/admin/booking/supplierReport.vue
+++ b/resources/assets/js/pages/admin/booking/supplierReport.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <x2-progress-track v-if="(booking_details.admin_status == 'x2_cash' || booking_details.admin_status == 'x2_cheque' || booking_details.admin_status == 'x2_ba')" v-model="trackerConfig" />
+    <x2-progress-track v-if="(trackerConfig.term == 'x2_cash' || trackerConfig.term == 'x2_cheque' || trackerConfig.term == 'x2_ba')" v-model="trackerConfig" />
     <progress-track v-else v-model="trackerConfig" />
 
     <div align="center">
diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
index d9a9eae4..9aadc374 100644
--- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
+++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <x2-progress-track v-if="(booking_details.admin_status == 'x2_cash' || booking_details.admin_status == 'x2_cheque' || booking_details.admin_status == 'x2_ba')"
+    <x2-progress-track v-if="(trackerConfig.term == 'x2_cash' || trackerConfig.term == 'x2_cheque' || trackerConfig.term == 'x2_ba')"
       v-model="trackerConfig" />
     <progress-track v-else v-model="trackerConfig" />
 
diff --git a/resources/assets/js/pages/admin/booking/uploadInvoice.vue b/resources/assets/js/pages/admin/booking/uploadInvoice.vue
index 8e071fb9..ecce2382 100644
--- a/resources/assets/js/pages/admin/booking/uploadInvoice.vue
+++ b/resources/assets/js/pages/admin/booking/uploadInvoice.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <x2-progress-track v-if="(booking_details.admin_status == 'x2_cash' || booking_details.admin_status == 'x2_cheque' || booking_details.admin_status == 'x2_ba')" v-model="trackerConfig" />
+    <x2-progress-track v-if="(trackerConfig.term == 'x2_cash' || trackerConfig.term == 'x2_cheque' || trackerConfig.term == 'x2_ba')" v-model="trackerConfig" />
     <progress-track v-else v-model="trackerConfig" />
 
     <div align="center">
diff --git a/resources/assets/js/pages/admin/booking/verification.vue b/resources/assets/js/pages/admin/booking/verification.vue
index 19c2b596..96671265 100644
--- a/resources/assets/js/pages/admin/booking/verification.vue
+++ b/resources/assets/js/pages/admin/booking/verification.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <x2-progress-track v-if="(booking_details.admin_status == 'x2_cash' || booking_details.admin_status == 'x2_cheque' || booking_details.admin_status == 'x2_ba')" v-model="trackerConfig" />
+    <x2-progress-track v-if="(trackerConfig.term == 'x2_cash' || trackerConfig.term == 'x2_cheque' || trackerConfig.term == 'x2_ba')" v-model="trackerConfig" />
     <progress-track v-else v-model="trackerConfig" />
 
     <div align="center">
diff --git a/resources/assets/js/pages/admin/booking/x2Completed.vue b/resources/assets/js/pages/admin/booking/x2Completed.vue
index c0e60ef3..9c69c0a6 100644
--- a/resources/assets/js/pages/admin/booking/x2Completed.vue
+++ b/resources/assets/js/pages/admin/booking/x2Completed.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <x2-progress-track v-if="(booking_details.admin_status == 'x2_cash' || booking_details.admin_status == 'x2_cheque' || booking_details.admin_status == 'x2_ba')" v-model="trackerConfig" />
+    <x2-progress-track v-if="(trackerConfig.term == 'x2_cash' || trackerConfig.term == 'x2_cheque' || trackerConfig.term == 'x2_ba')" v-model="trackerConfig" />
     <progress-track v-else v-model="trackerConfig" />
 
     <div align="center">
diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue
index fd5f9d36..a4d2ee06 100644
--- a/resources/assets/js/pages/admin/home.vue
+++ b/resources/assets/js/pages/admin/home.vue
@@ -317,38 +317,38 @@ 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',
@@ -362,7 +362,7 @@ export default {
           })
           break
 
-        case 7:
+        case '7':
           this.$router.push({
             name: 'booking.admin.complete',
             params: {id: booking_id }
diff --git a/resources/assets/js/pages/booking/completed.vue b/resources/assets/js/pages/booking/completed.vue
index 8111b069..2d4dc588 100644
--- a/resources/assets/js/pages/booking/completed.vue
+++ b/resources/assets/js/pages/booking/completed.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <x2-progress-track v-if="(booking_details.status == 'x2_cash' || booking_details.status == 'x2_cheque' || booking_details.status == 'x2_ba')" v-model="trackerConfig" />
+    <x2-progress-track v-if="(trackerConfig.term == 'x2_cash' || trackerConfig.term == 'x2_cheque' || trackerConfig.term == 'x2_ba')" v-model="trackerConfig" />
     <progress-track v-else v-model="trackerConfig" />
     <h1>Order Completed</h1>
     <div class="goBackButton">
diff --git a/resources/assets/js/pages/booking/confirmation.vue b/resources/assets/js/pages/booking/confirmation.vue
index 5f304b96..e83e04b1 100644
--- a/resources/assets/js/pages/booking/confirmation.vue
+++ b/resources/assets/js/pages/booking/confirmation.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <x2-progress-track v-if="(booking_details.status == 'x2_cash' || booking_details.status == 'x2_cheque' || booking_details.status == 'x2_ba')" v-model="trackerConfig" />
+    <x2-progress-track v-if="(trackerConfig.term == 'x2_cash' || trackerConfig.term == 'x2_cheque' || trackerConfig.term == 'x2_ba')" v-model="trackerConfig" />
     <progress-track v-else v-model="trackerConfig" />
     <h1>Bankin Slip Verification in Progress</h1>
     <div class="goBackButton">
diff --git a/resources/assets/js/pages/booking/po.vue b/resources/assets/js/pages/booking/po.vue
index bc264ba5..1c2e6b4f 100644
--- a/resources/assets/js/pages/booking/po.vue
+++ b/resources/assets/js/pages/booking/po.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <x2-progress-track v-if="(booking_details.status == 'x2_cash' || booking_details.status == 'x2_cheque' || booking_details.status == 'x2_ba')" v-model="trackerConfig" />
+    <x2-progress-track v-if="(trackerConfig.term == 'x2_cash' || trackerConfig.term == 'x2_cheque' || trackerConfig.term == 'x2_ba')" v-model="trackerConfig" />
     <progress-track v-else v-model="trackerConfig" />
     <h1>Processing Invoice</h1>
     <div class="goBackButton">
diff --git a/resources/assets/js/pages/booking/poComplete.vue b/resources/assets/js/pages/booking/poComplete.vue
index 230604b0..d2ead9cc 100644
--- a/resources/assets/js/pages/booking/poComplete.vue
+++ b/resources/assets/js/pages/booking/poComplete.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <x2-progress-track v-if="(booking_details.status == 'x2_cash' || booking_details.status == 'x2_cheque' || booking_details.status == 'x2_ba')" v-model="trackerConfig" />
+    <x2-progress-track v-if="(trackerConfig.term == 'x2_cash' || trackerConfig.term == 'x2_cheque' || trackerConfig.term == 'x2_ba')" v-model="trackerConfig" />
     <progress-track v-else v-model="trackerConfig" />
     <div align="center">
       <h4 style="margin-top:5%;">Processing Invoice</h4>
diff --git a/resources/assets/js/pages/booking/transfer.vue b/resources/assets/js/pages/booking/transfer.vue
index abb37860..8ffb17b2 100644
--- a/resources/assets/js/pages/booking/transfer.vue
+++ b/resources/assets/js/pages/booking/transfer.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <x2-progress-track v-if="(booking_details.status == 'x2_cash' || booking_details.status == 'x2_cheque' || booking_details.status == 'x2_ba')" v-model="trackerConfig" />
+    <x2-progress-track v-if="(trackerConfig.term == 'x2_cash' || trackerConfig.term == 'x2_cheque' || trackerConfig.term == 'x2_ba')" v-model="trackerConfig" />
     <progress-track v-else v-model="trackerConfig" />
     <h1>Bankin Slip Approved</h1>
     <h2>Transfer In Progress</h2>
diff --git a/resources/assets/js/pages/booking/uploadPo.vue b/resources/assets/js/pages/booking/uploadPo.vue
index 685c1b2b..f290f2ab 100644
--- a/resources/assets/js/pages/booking/uploadPo.vue
+++ b/resources/assets/js/pages/booking/uploadPo.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <x2-progress-track v-if="(booking_details.status == 'x2_cash' || booking_details.status == 'x2_cheque' || booking_details.status == 'x2_ba')" v-model="trackerConfig" />
+    <x2-progress-track v-if="(trackerConfig.term == 'x2_cash' || trackerConfig.term == 'x2_cheque' || trackerConfig.term == 'x2_ba')" v-model="trackerConfig" />
     <progress-track v-else v-model="trackerConfig" />
     <h1>Transfer Completed</h1>
     <h2> Please upload your purchase order </h2>
diff --git a/resources/assets/js/pages/booking/x2Completed.vue b/resources/assets/js/pages/booking/x2Completed.vue
index 6bf26565..4a783f9c 100644
--- a/resources/assets/js/pages/booking/x2Completed.vue
+++ b/resources/assets/js/pages/booking/x2Completed.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <x2-progress-track v-if="(booking_details.status == 'x2_cash' || booking_details.status == 'x2_cheque' || booking_details.status == 'x2_ba')"
+    <x2-progress-track v-if="(trackerConfig.term == 'x2_cash' || trackerConfig.term == 'x2_cheque' || trackerConfig.term == 'x2_ba')"
       v-model="trackerConfig" />
     <progress-track v-else v-model="trackerConfig" />
     <h1>Order Completed</h1>
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index 317bd534..ad8e2ef0 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -153,7 +153,7 @@
           </el-form-item>  
             <br>
           <div align=center>
-            <h7>China's Supplier Details</h7>
+            <h6>China's Supplier Details</h6>
           </div>
             <br>
           <el-form-item prop="account_name">
@@ -782,67 +782,64 @@ export default {
             })
     },
     BookingStatus (status, booking_id, term) {
-      console.log(status)
       // TODO : Get booking status from server
-      this.status = status
-
-      switch (this.status) {
-        case 1:
+      // this.status = status;
+      switch (status) {
+        case '1':
           this.$router.push({
             name: 'booking.user.upload',
             params: {id: booking_id }
-          })
-          break
-        case 2:
+          });
+          break;
+        case '2':
           this.$router.push({
             name: 'booking.user.upload',
             params: {id: booking_id }
-          })
-          break
-        case 3:
+          });
+          break;
+        case '3':
           this.$router.push({
             name: 'booking.user.confirmation',
             params: {id: booking_id }
-          })
-          break
-        case 4:
+          });
+          break;
+        case '4':
           this.$router.push({
             name: 'booking.user.transfer',
             params: {id: booking_id }
-          })
-          break
+          });
+          break;
 
-        case 5:
-          console.log(term)
-          if(term == 'x2_cash' || term == 'x2_cheque' || term == 'x2_ba'){
+        case '5':
+          if(term === 'x2_cash' || term === 'x2_cheque' || term === 'x2_ba'){
               this.$router.push({
               name: 'booking.user.x2complete',
               params: {id: booking_id }
-            })
-            break
+            });
+            break;
           }
           this.$router.push({
             name: 'booking.user.uploadpo',
             params: {id: booking_id }
-          })
-          break
+          });
+          break;
 
-        case 6:
+        case '6':
           this.$router.push({
             name: 'booking.user.po',
             params: {id: booking_id }
-          })
-          break
+          });
+          break;
 
-        case 7:
+        case '7':
           this.$router.push({
             name: 'booking.user.complete',
             params: {id: booking_id }
-          })
-          break
+          });
+          break;
 
         default:
-          break
+          break;
       }
     }
   }