534ad41fd3
fix conflict
2018-06-27 17:25:11 +08:00
32b0eda067
fix merge conflict
2018-06-27 16:54:40 +08:00
73000a9818
update route for admin top nav content
2018-06-27 16:33:41 +08:00
5e62b3e90d
complete the top nav content
2018-06-27 15:42:16 +08:00
390862a8be
removed multiple booking on supplier booking controller
...
WIP supplier booking report in image file
WIP edit report page
WIP upload chinabankslip
2018-06-27 15:32:01 +08:00
3ce9fdf9db
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into integration/book-supplier
...
# Conflicts:
# resources/assets/js/pages/admin/booking/supplierBooking.vue
2018-06-27 14:24:48 +08:00
298da7d24b
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend
...
# Conflicts:
# resources/assets/js/pages/admin/booking/supplierBooking.vue
2018-06-27 14:23:19 +08:00
6e8c81f285
added logic if supplierbooking already exist prevent user from creating
2018-06-27 14:21:55 +08:00
fb6f3e398e
update rate function done
2018-06-27 12:34:19 +08:00
d1ce576109
changed model from bookingsupplier to supplier booking
...
fix supplier booking controller
make payment method nullable for supplier booking
2018-06-27 12:01:49 +08:00
b7f258f6a9
refactor BookingsupplierController
...
fix booking supplier model
updated fields for bookg supplier frontend
2018-06-27 10:30:01 +08:00
d362d947a3
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into nazri/userbankslip
...
# Conflicts:
# app/Http/Controllers/BookingController.php
2018-06-27 09:56:35 +08:00
c59aac1e4d
Merge branch 'feature/admin-home-frontend' into 'master'
...
Feature/admin home frontend
See merge request CIEFWorldwideSdnBhd/exchange!34
2018-06-27 01:36:22 +00:00
2ed9f51ffd
update top nav only admin can see
2018-06-26 18:30:41 +08:00
a17a692549
fix conflict
2018-06-26 18:23:00 +08:00
1f91cddda5
show top navigation only if user already login
2018-06-26 18:21:40 +08:00
e1c931efed
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend
2018-06-26 18:09:27 +08:00
f108d7ee51
updated axios booking supplier form
2018-06-26 18:09:11 +08:00
21338401c4
update supplierbooking frontend
2018-06-26 17:56:51 +08:00
fd03f5b248
updated approvebankslip booking not found
...
updated update status upon userbankslip approved
updated update status upon userbankslip rejected
updated supplier index to display value and label for input select
updated supplierBooking frontend
completed booking accept and reject integration
2018-06-26 17:40:44 +08:00
045c137dab
update dialog name
2018-06-26 17:28:22 +08:00
c8ff54f79a
completed the setting content
2018-06-26 16:55:31 +08:00
2023050218
fix conflict
2018-06-26 14:44:48 +08:00
66b0c14f5e
Merge branch 'feature/admin-home-frontend' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend
...
# Conflicts:
# app/Http/Controllers/BookingController.php
# database/seeds/DatabaseSeeder.php
# resources/assets/js/pages/admin/booking/verification.vue
2018-06-26 14:43:53 +08:00
5366353484
updated loading button param
2018-06-26 14:41:37 +08:00
ae85886365
updated user bankslip path in verification frontend
2018-06-26 12:12:02 +08:00
6f510c93cc
solved merge conflict
2018-06-26 10:40:35 +08:00
62d0d83cb6
attempt to fetch user bankslip
2018-06-25 17:34:34 +08:00
069883deeb
complete the admin setting navbar
2018-06-25 16:57:18 +08:00
2c6128c564
changed admin status default to 1
...
added show one booking for admin
added booking details for verification page
2018-06-25 16:41:31 +08:00
1e7f076335
updated booking status on upload user bankslip
...
revert back the correct routes for user
update user path names
2018-06-25 15:45:02 +08:00
bf40262994
added admin booking list controller
2018-06-23 00:40:50 +08:00
620e496f0e
update route.js
2018-06-22 16:53:14 +08:00
72f9aee7c8
solved conflict
2018-06-22 16:31:56 +08:00
bc49e39df7
added admin status to booking table
...
updated admin progress track steps
added dummy template in admin booking
2018-06-22 12:31:51 +08:00
1f757fc7b1
make changes in route.js
2018-06-22 11:33:07 +08:00
47b2c34bf9
update booking status redirection
2018-06-21 21:55:38 +08:00
8ff5abcc2b
updated routes name
2018-06-21 19:12:17 +08:00
401b016fe0
updated routes
2018-06-21 19:07:21 +08:00
81a8505fb1
added nessasary files for the admin pages
2018-06-21 18:02:08 +08:00
ee66f7614f
added admin progress track component
2018-06-21 17:51:47 +08:00
b9c0bc53fd
added booking table to admin home
...
integrate booking list to admin home
2018-06-21 17:35:08 +08:00
b5d8fd4e72
added bookingtable
2018-06-21 16:38:59 +08:00
9acf2a773e
fix admin routes on vuejs
2018-06-21 16:35:09 +08:00
aaf0decd97
removed amount from uploadpo
...
added confirmpo after user upload their po
completed uploadpo integration
2018-06-21 15:48:24 +08:00
46873c7107
added handlecountdowned function
2018-06-21 14:48:17 +08:00
3c263b56ea
fix 404 not found for upload user bankslip
...
added display term on booking table
2018-06-21 14:31:53 +08:00
23b024c2fb
fixed status description not found
...
removed timeout on home page
added timeout handling in upload user bankslip
2018-06-21 12:45:05 +08:00
a650879977
completed list booking
...
TBD implement status feature
2018-06-21 10:43:52 +08:00
385372e3dd
added rate to booking table
2018-06-20 22:54:31 +08:00
Mohd Arief
Jack Goh
Nazri Hamzah