fix 2x steps and service charge

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
          }
         

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">

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">

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">

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">

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" />
 

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">

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">

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">

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 }

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">

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">

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">

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>

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>

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>

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>

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;
       }
     }
   }