Merge branch 'feature/admin-home-frontend' into 'master'

Feature/admin home frontend

See merge request CIEFWorldwideSdnBhd/exchange!35

resources/assets/js/components/LocaleDropdown.vue

@@ -1,7 +1,7 @@
 <template>
 <div>
   <ul class="nav navbar-nav">
-    <li class="nav-item dropdown">
+    <!-- <li class="nav-item dropdown">
       <a class="nav-link dropdown-toggle" href="#" role="button"
         data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         {{ locales[locale] }}
@@ -12,11 +12,11 @@
           {{ value }}
         </a>
       </div>
-    </li>
-    <li><a class="nav-link" href="#" role="button">Update Rate</a></li>
-    <li><a class="nav-link" href="#" role="button">Complete Order</a></li>
-    <li><a class="nav-link" href="#" role="button">Transaction History</a></li>
-    <li><a class="nav-link" href="#" role="button">Upload Supplier Bank Slip to System</a></li>
+    </li> -->
+    <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Update Rate</a></li>
+    <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Complete Order</a></li>
+    <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Transaction History</a></li>
+    <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Upload Supplier Bank Slip to System</a></li>
   </ul>
  </div> 
 </template>
@@ -28,7 +28,9 @@ import { loadMessages } from '~/plugins/i18n'
 export default {
   computed: mapGetters({
     locale: 'lang/locale',
-    locales: 'lang/locales'
+    locales: 'lang/locales',
+    user: 'auth/user',
+    role: 'auth/role'
   }),
 
   methods: {

resources/assets/js/pages/admin/booking/supplierBooking.vue

@@ -329,10 +329,7 @@
 
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            let newConfirmation = {
-              amount: this.booking.amount,
-              term: this.term
-            }
+            let newSupplierBooking = this.supplierBookingForm
 
             // axios.post('api/booking/calculation', newConfirmation)
             // .then((response) => {

resources/assets/js/router/routes.js

@@ -62,13 +62,13 @@ export default [
   { path: '/booking/:id/po-complete', name: 'booking.user.pocomplete', component: PoComplete },
   { path: '/booking/:id/complete', name: 'booking.complete', component: Completed },
 
-  { path: '/admin',
-    component: Admin,
-    children: [
-      { path: '', redirect: { name: 'admin.index' } },
-      { path: 'index', name: 'admin.index', component: Admin },
-      { path: 'home', name: 'admin.home', component: AdminHome }
-    ] },
+  // { path: '/admin',
+  //   component: Admin,
+  //   children: [
+  //     { path: '', redirect: { name: 'admin.index' } },
+  //     { path: 'index', name: 'admin.index', component: Admin },
+  //     { path: 'home', name: 'admin.home', component: AdminHome }
+  //   ] },
   // Admin booking
   { path: '/booking/:id/verification', name: 'booking.admin.verification', component: Verification },
   { path: '/booking/:id/supplier', name: 'booking.admin.supplier', component: Supplier },