Commit Graph

39 Commits

Author SHA1 Message Date
Jack Goh 594c6a74fe fix admin x2 status track 2018-08-08 17:11:08 +08:00
Jack Goh 06bacfcaf9 fixed x2 status for user side 2018-08-08 16:31:35 +08:00
weiweitoo c4962e4655 git pull origin master 2018-07-20 22:12:48 +08:00
weiweitoo 73c36dd8e3 Add setting for taxrate and billingcharge 2018-07-20 18:47:19 +08:00
weiweitoo a35c07a794 Add admin page 1. show error when upload wrong file in upload po and invoice 2018-07-18 14:35:05 +08:00
Mouhamed Lamine d29d3c49eb Adding Completed Orders Link on Admin Nav Bar 2018-07-16 19:15:01 +08:00
weiweitoo 97453bb084 add marking setting page and integrate it 2018-07-09 20:47:55 +08:00
Too 36917cbd60 add malaysia bank page and integrate it with backend 2018-07-06 13:12:18 +08:00
Jack Goh bb2373abb5 make welcome page to be login page 2018-07-02 18:04:29 +08:00
Jack Goh 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
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
Jack Goh 9432cdaaad updated upload invoice UI 2018-06-27 18:28:58 +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 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 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
Mohd Arief 620e496f0e update route.js 2018-06-22 16:53:14 +08:00
Mohd Arief 72f9aee7c8 solved conflict 2018-06-22 16:31:56 +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
Mohd Arief 1f757fc7b1 make changes in route.js 2018-06-22 11:33:07 +08:00
Jack Goh 8ff5abcc2b updated routes name 2018-06-21 19:12:17 +08:00
Jack Goh 401b016fe0 updated routes 2018-06-21 19:07:21 +08:00
Jack Goh 97062480d5 added get one booking function in controller
update routes with booking id pramas
fixed not found routes
fixed count down with real data
moved bookings routes into autenticated route
2018-06-18 17:34:20 +08:00
Jack Goh 19d69adad2 added po complete page 2018-06-14 21:23:34 +08:00
Jack Goh f47e9408a1 changed "bookings" folder name to "booking"
updated routes
2018-06-14 17:38:52 +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 b867474445 updated link for upload later 2018-06-13 22:23:36 +08:00
Jack Goh c0b9e446d5 changed upload to upload-user-bankslip 2018-06-13 22:17:01 +08:00
Mohd Arief 007d426f63 booking page done until upload
update the countdown function
2018-06-11 14:16:16 +08:00
jack 4278419aaa added SPA bootstrap frontend with login, register and admin routes 2018-05-07 19:13:38 +08:00
jack 8da0cbceec added seeder
added user to return role
2018-05-07 17:38:31 +08:00
jack 3373524bc1 added entrust role based permission 2018-05-07 16:25:42 +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