Commit Graph

315 Commits

Author SHA1 Message Date
Jack Goh 0c7cd0b201 fix slice error in user transfer page 2018-08-13 14:46:23 +08:00
Jack Goh b5c8688a56 fix unknow column when testing 2018-08-13 12:40:08 +08:00
Jack Goh 356b1e5267 remove complete order nav from admin
updated name of the tab
2018-08-13 12:27:55 +08:00
Jack Goh 796e8bf6df fix marking bug - when typing chinese 2018-08-13 12:07:15 +08:00
lonetrinity 326ef7dd5f fix/mergeConflicts 2018-08-11 10:30:16 +08:00
lonetrinity 98db669a64 fix/discussionResolved 2018-08-11 10:23:15 +08:00
lonetrinity 385cd33211 resolved discussion 2018-08-10 18:15:55 +08:00
lonetrinity 3f38fef845 fixPaginationAdmin_and_user 2018-08-10 17:45:01 +08:00
Jack Goh 6442a58746 remove remember me because it does nothing 2018-08-10 17:41:23 +08:00
Jack Goh 144b57bc52 fix upload user bankslip page bug 2018-08-10 09:49:34 +08:00
Mohd Arief 615dff66fc fixed the marking bug 2018-08-09 16:47:04 +08:00
Jack Goh a9b30e2bb9 added supplier booking report to complete page at admin side 2018-08-09 12:08:03 +08:00
Jack Goh 5eb1771ae1 added supplier booking report to upload china bankslip at admin side 2018-08-09 11:30:31 +08:00
Jack Goh 45391317ef added supplier booking report to upload invoice at admin side 2018-08-09 11:24:15 +08:00
Jack Goh e67dabfb5b fix user track status bug 2018-08-09 10:55:05 +08:00
Jack Goh 5d3ab327ca fix progress track bug for admin side 2018-08-09 10:50:59 +08:00
Jack Goh 2f3b9baf9b added x2 progress track 2018-08-09 10:44:21 +08:00
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
lonetrinity 63f8584455 fix/adminbookingcompletetable 2018-08-08 11:48:03 +08:00
Jack Goh ae081ddddf fix booking internal server error due to db not accepting null value
fixed copy right on booking form
update notification seeder
2018-08-08 10:41:29 +08:00
lonetrinity 80d90d680b fix display booking complete table 2018-08-07 19:14:25 +08:00
lonetrinity 8ad9966695 display completed table 2018-08-03 18:15:37 +08:00
lonetrinity 93cc423091 categorise multitable/lingges 2018-08-02 18:02:05 +08:00
lonetrinity 1b7ea3785c categorizeTable 2018-08-01 19:59:35 +08:00
Jack Goh f789127c57 added bank branch to supplier booking report 2018-07-31 17:01:40 +08:00
Jack Goh ec7964face fix credit setting error 2018-07-31 16:54:03 +08:00
Jack Goh 2cc5c50745 removed accept file type to fix no action can be perform in wechat inapp browser 2018-07-31 14:28:16 +08:00
Jack Goh 3fdaa12a78 fix upload user bankslip with indicator and allow single imageo nly 2018-07-31 13:54:19 +08:00
Jack Goh 6dd391544b change account_num data type to string since have to allow user to enter space 2018-07-30 16:32:04 +08:00
Jack Goh cc2539d44c update max upload file size to 10mb 2018-07-30 14:48:48 +08:00
Jack Goh 1d3b8c2af7 temporary fix register page 2018-07-30 13:49:35 +08:00
Jack Goh 27dce5b114 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/fix-bug2
# Conflicts:
#	public/mix-manifest.json
2018-07-28 09:54:39 +08:00
Jack Goh 61066c4366 removed ali pay / wechat pay at place holder
removed mix-manifest.json from git
2018-07-28 09:49:57 +08:00
weiweitoo a707977ab2 fix bug 2018-07-27 17:44:32 +08:00
lonetrinity 78fbe3151c Fix_orderNo/RefNoPArt2 2018-07-27 17:35:10 +08:00
lonetrinity f1d49ef82c Fix-OrderNo/RefNo 2018-07-27 17:24:37 +08:00
Jack Goh 3c70fc22e5 fix empty supplier, china, malaysia bank setting page due to vee-validate 2018-07-27 15:36:43 +08:00
Jack Goh 68add5f1a2 disable cache in caddy 2018-07-27 14:10:34 +08:00
lonetrinity 05757911b1 Lingges/Fix_no_refNo 2018-07-27 11:30:19 +08:00
Jack Goh 8128a3ba24 Merge branch 'fix/bug' into 'master'
Fix/bug

See merge request CIEFWorldwideSdnBhd/exchange!89
2018-07-27 03:27:28 +00:00
Jack Goh ba45091cf7 removed logo in supplier report 2018-07-27 11:19:10 +08:00
Jack Goh af1f85e662 Merge branch 'Lingges/Fix_user_refresh_rae_loading' into 'master'
Lingges/fix user refresh rae loading

See merge request CIEFWorldwideSdnBhd/exchange!87
2018-07-27 03:09:09 +00:00
Jack Goh 438d9fa602 temporary added po format link in upload po page
added back costing rate in supplier booking page
2018-07-27 10:53:20 +08:00
Jack Goh f6cfd9a188 updat the login session to be 12 hours
fix status description not showing
update user booking confirmation china beneficiary acc into one row
2018-07-27 10:41:57 +08:00
Jack Goh 0aae3a8e76 fix syntax error 2018-07-27 10:18:59 +08:00
Jack Goh a6567b47b2 Merge branch 'too/notificationpagination' into 'master'
Too/notificationpagination

See merge request CIEFWorldwideSdnBhd/exchange!86
2018-07-27 02:02:00 +00:00
lonetrinity ebe5d06114 lingges/fix/user_refresh_rate_loading 2018-07-27 10:01:33 +08:00
Jack Goh 6df48f6a4f updated payment for options in booking form 2018-07-27 09:46:33 +08:00
weiweitoo 91c37778dc add load more pagination of notificaiton 2018-07-26 22:58:22 +08:00