From f108d7ee51d94f86fd13030722f9d8aa5146ecc8 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Tue, 26 Jun 2018 18:09:11 +0800 Subject: [PATCH 1/3] updated axios booking supplier form --- .../pages/admin/booking/supplierBooking.vue | 43 +++++++++---------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue index 095440a9..98134bde 100644 --- a/resources/assets/js/pages/admin/booking/supplierBooking.vue +++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue @@ -336,30 +336,27 @@ 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) => { - // this.loading = false - // console.log(response) - // this.bookingConfirmTable.date = response.data.date - // this.bookingConfirmTable.marking = response.data.marking - // this.bookingConfirmTable.payment_method = response.data.payment_method - // this.bookingConfirmTable.amount = response.data.amount - // this.bookingConfirmTable.service_charge = response.data.service_charge - // this.bookingConfirmTable.rate = response.data.rate - // this.bookingConfirmTable.bankin_amount = response.data.bankin_amount - // this.bookingConfirmTable.account_name = this.bookingForm.account_name - // this.dialogFormVisible = false - // this.dialogFormVisible1 = true - // }) - // .catch((error) => { - // this.loading = false - // console.log(error) - // }) + axios.post('/api/supplier-booking', newSupplierBooking) + .then((response) => { + this.loading = false + console.log(response) + // this.bookingConfirmTable.date = response.data.date + // this.bookingConfirmTable.marking = response.data.marking + // this.bookingConfirmTable.payment_method = response.data.payment_method + // this.bookingConfirmTable.amount = response.data.amount + // this.bookingConfirmTable.service_charge = response.data.service_charge + // this.bookingConfirmTable.rate = response.data.rate + // this.bookingConfirmTable.bankin_amount = response.data.bankin_amount + // this.bookingConfirmTable.account_name = this.bookingForm.account_name + // this.dialogFormVisible = false + // this.dialogFormVisible1 = true + }) + .catch((error) => { + this.loading = false + console.log(error) + }) } else{ From 1f91cddda54769d64c88b0de88683c6089583dce Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Tue, 26 Jun 2018 18:21:40 +0800 Subject: [PATCH 2/3] show top navigation only if user already login --- resources/assets/js/components/LocaleDropdown.vue | 15 ++++++++------- resources/assets/js/router/routes.js | 14 +++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue index f4b0d5c3..fb6f762c 100644 --- a/resources/assets/js/components/LocaleDropdown.vue +++ b/resources/assets/js/components/LocaleDropdown.vue @@ -1,7 +1,7 @@ @@ -28,7 +28,8 @@ import { loadMessages } from '~/plugins/i18n' export default { computed: mapGetters({ locale: 'lang/locale', - locales: 'lang/locales' + locales: 'lang/locales', + user: 'auth/user' }), methods: { diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js index 116f0d7f..e6b8f8de 100644 --- a/resources/assets/js/router/routes.js +++ b/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 }, From 2ed9f51ffd2c4253001fc76befc6fa13c9f5a368 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Tue, 26 Jun 2018 18:30:41 +0800 Subject: [PATCH 3/3] update top nav only admin can see --- resources/assets/js/components/LocaleDropdown.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue index fb6f762c..f5102e23 100644 --- a/resources/assets/js/components/LocaleDropdown.vue +++ b/resources/assets/js/components/LocaleDropdown.vue @@ -13,10 +13,10 @@ --> -
  • Update Rate
    • -
  • Complete Order
    • -
  • Transaction History
    • -
  • Upload Supplier Bank Slip to System
    • +
  • Update Rate
    • +
  • Complete Order
    • +
  • Transaction History
    • +
  • Upload Supplier Bank Slip to System
    • @@ -29,7 +29,8 @@ export default { computed: mapGetters({ locale: 'lang/locale', locales: 'lang/locales', - user: 'auth/user' + user: 'auth/user', + role: 'auth/role' }), methods: {