omair/exchange
1
0
Fork 0
mirror of https://gitlab.com/omair-personal/exchange.git synced 2026-08-19 12:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into integration/book-supplier

Browse Source 
# Conflicts:
#	resources/assets/js/pages/admin/booking/supplierBooking.vue
This commit is contained in:
Jack Goh
2018-06-27 14:24:48 +08:00
parent 6e8c81f285 aa528cfa39
commit 3ce9fdf9db
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/js/components/LocaleDropdown.vue
+9 -7
View File
@@ -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: {