7229d71109
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug
...
# Conflicts:
# resources/assets/js/components/LocaleDropdown.vue
# resources/assets/js/pages/home.vue
2018-07-22 15:39:35 +08:00
c4962e4655
git pull origin master
2018-07-20 22:12:48 +08:00
14a1090263
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug
2018-07-20 17:45:47 +08:00
5814c999d6
updated update rate input to be wider
2018-07-20 11:18:05 +08:00
e2cf3fecdd
fix term1 no service charge
...
fix navbar extra </li>
2018-07-20 11:12:20 +08:00
d01f14d9f7
Remove some unnessary console.log
2018-07-19 18:01:16 +08:00
9670454c61
Almost Done
2018-07-18 21:48:34 +08:00
812040a433
fix timezone issue. Add refresh rate button. Add success message for all refresh button. Fix typo in user step 4
2018-07-18 15:38:06 +08:00
fb8951265d
Merge branch 'frontend/making-uploaded-images-responsive' into 'master'
...
Showing Completed Orders Task Done
See merge request CIEFWorldwideSdnBhd/exchange!68
2018-07-17 08:53:22 +00:00
d2337953a6
Halfway through the task
2018-07-17 16:41:09 +08:00
040cc5afc0
temporary remove the notification from navbar
2018-07-16 22:03:35 +08:00
fb102df36c
Fixed Merge Conflicts
2018-07-16 19:32:56 +08:00
d29d3c49eb
Adding Completed Orders Link on Admin Nav Bar
2018-07-16 19:15:01 +08:00
278d62b5a9
modify messaage to become json
2018-07-16 16:13:15 +08:00
81278c4273
add notification icon in navbar component
2018-07-16 14:19:00 +08:00
b21eaf4522
add new branch for booking flow for x2_chequeand x2_ba
2018-07-14 17:31:21 +08:00
0180694d72
gitignored autoload_classmap
...
removed setting-credit for post, delete and get one routes
completed admin credit limit and time out update feature
fixed drop down rate issue
fixed the controller show and update issue
2018-07-05 15:47:19 +08:00
33ca8471c0
fix inline update rate dialog
2018-07-05 13:39:28 +08:00
e462ebb78b
integrated frontend/backend for show/update rate
2018-07-05 01:03:05 +08:00
d352cf8696
error
2018-07-04 11:46:42 +08:00
9badd33d81
commented out some undone feature navigation bar
2018-07-03 18:23:26 +08:00
4b3957704f
fix upload invoice page, user_po_path exist issue
2018-07-03 12:57:29 +08:00
ca74cfae23
updated admin booking show function with user, china, po, invoice slip
...
removed one step from admin tracking
integrated admin booking complete
changed admin complete order component name
2018-06-29 19:18:54 +08:00
ee7fe28f74
added new status for user tracking nav bar
...
fixed top nav for admin only
2018-06-28 12:08:12 +08:00
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
1d740a08ea
added waiting invoice and po frontend
2018-06-28 10:33:00 +08:00
7996450ab1
change rate to data variable
2018-06-28 10:31:49 +08:00
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
fb6f3e398e
update rate function done
2018-06-27 12:34:19 +08:00
2ed9f51ffd
update top nav only admin can see
2018-06-26 18:30:41 +08:00
1f91cddda5
show top navigation only if user already login
2018-06-26 18:21:40 +08:00
6f510c93cc
solved merge conflict
2018-06-26 10:40:35 +08:00
069883deeb
complete the admin setting navbar
2018-06-25 16:57:18 +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
ee66f7614f
added admin progress track component
2018-06-21 17:51:47 +08:00
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
415f8bb437
updated dynamic progress status
2018-06-14 17:25:54 +08:00
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
274ebe3490
added progress tracker
2018-06-14 11:56:22 +08:00
a1db64d1c1
integrated frontend
2018-05-07 15:26:23 +08:00
a5534004b8
added vuejs simple login register template
2018-04-30 14:16:53 +08:00
cd217f9db8
init
2018-04-20 14:03:37 +08:00
Jack Goh
weiweitoo
Mouhamed Lamine
Nazri Hamzah
Mohd Arief
jack