Commit Graph

22 Commits

Author SHA1 Message Date
Jack Goh ee7fe28f74 added new status for user tracking nav bar
fixed top nav for admin only
2018-06-28 12:08:12 +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 1d740a08ea added waiting invoice and po frontend 2018-06-28 10:33:00 +08:00
Mohd Arief 7996450ab1 change rate to data variable 2018-06-28 10:31:49 +08:00
Mohd Arief 534ad41fd3 fix conflict 2018-06-27 17:25:11 +08:00
Mohd Arief 32b0eda067 fix merge conflict 2018-06-27 16:54:40 +08:00
Mohd Arief 73000a9818 update route for admin top nav content 2018-06-27 16:33:41 +08:00
Mohd Arief 5e62b3e90d complete the top nav content 2018-06-27 15:42:16 +08:00
Mohd Arief fb6f3e398e update rate function done 2018-06-27 12:34:19 +08:00
Jack Goh 2ed9f51ffd update top nav only admin can see 2018-06-26 18:30:41 +08:00
Jack Goh 1f91cddda5 show top navigation only if user already login 2018-06-26 18:21:40 +08:00
Mohd Arief 6f510c93cc solved merge conflict 2018-06-26 10:40:35 +08:00
Mohd Arief 069883deeb complete the admin setting navbar 2018-06-25 16:57:18 +08:00
Jack Goh 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
Jack Goh ee66f7614f added admin progress track component 2018-06-21 17:51:47 +08:00
Jack Goh dc56029522 changed step two from "waiting payment" to "payment"
added few empty page component
updated confirmation routes
2018-06-14 17:35:37 +08:00
Jack Goh 415f8bb437 updated dynamic progress status 2018-06-14 17:25:54 +08:00
Jack Goh 053ea0e874 added transfer amount and exchange amount to upload user bank slip
added complete steps for user
added empty get booking status
2018-06-14 15:32:24 +08:00
Jack Goh 274ebe3490 added progress tracker 2018-06-14 11:56:22 +08:00
jack a1db64d1c1 integrated frontend 2018-05-07 15:26:23 +08:00
jack a5534004b8 added vuejs simple login register template 2018-04-30 14:16:53 +08:00
jack cd217f9db8 init 2018-04-20 14:03:37 +08:00