Commit Graph

11 Commits

Author SHA1 Message Date
Nazri Hamzah d1d5aaf694 fixed bug admin setting frontend 2018-06-29 00:56:00 +08:00
Nazri Hamzah fe07b7cd64 first commit 2018-06-28 22:26:06 +08:00
Jack Goh 2ddd9704bd Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into integration/upload-invoice
# Conflicts:
#	resources/assets/js/router/routes.js
2018-06-28 11:41:39 +08:00
Jack Goh 2b4ddadfcb rename book_id in po table to booking_id to perform ORM relantionship
added relationship between booking and po
updated settings shows for different role
added function to display po for admin
2018-06-28 10:06:26 +08:00
Mohd Arief 5e62b3e90d complete the top nav content 2018-06-27 15:42:16 +08:00
Mohd Arief 045c137dab update dialog name 2018-06-26 17:28:22 +08:00
Mohd Arief c8ff54f79a completed the setting content 2018-06-26 16:55:31 +08:00
Mohd Arief 069883deeb complete the admin setting navbar 2018-06-25 16:57:18 +08:00
Mohd Arief 620e496f0e update route.js 2018-06-22 16:53:14 +08:00
jack 06aa931eb5 added wait for mysql to start in docker
fix role not found on register/login
2018-05-14 12:45:30 +08:00
jack a1db64d1c1 integrated frontend 2018-05-07 15:26:23 +08:00