 Jack Goh
|
ec7964face
|
fix credit setting error
|
2018-07-31 16:54:03 +08:00 |
|
|
Jack Goh
|
12fd167618
|
Merge branch 'too/fix-bug2' into 'master'
removed accept file type to fix no action can be perform in wechat inapp browser
See merge request CIEFWorldwideSdnBhd/exchange!98
|
2018-07-31 06:28:37 +00: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
|
161ab294fa
|
Merge branch 'too/fix-bug2' into 'master'
fix upload user bankslip with indicator and allow single imageo nly
See merge request CIEFWorldwideSdnBhd/exchange!97
|
2018-07-31 05:56:46 +00: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
|
efa9ed6c91
|
Merge branch 'too/fix-bug2' into 'master'
change account_num data type to string since have to allow user to enter space
See merge request CIEFWorldwideSdnBhd/exchange!96
|
2018-07-30 08:55:21 +00: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
|
bac4e63e55
|
Merge branch 'too/fix-bug2' into 'master'
update max upload file size to 10mb
See merge request CIEFWorldwideSdnBhd/exchange!95
|
2018-07-30 06:49:05 +00:00 |
|
|
Jack Goh
|
cc2539d44c
|
update max upload file size to 10mb
|
2018-07-30 14:48:48 +08:00 |
|
|
Jack Goh
|
d8eda0bc81
|
Merge branch 'too/fix-bug2' into 'master'
temporary fix register page
See merge request CIEFWorldwideSdnBhd/exchange!94
|
2018-07-30 05:50:24 +00:00 |
|
|
Jack Goh
|
1d3b8c2af7
|
temporary fix register page
|
2018-07-30 13:49:35 +08:00 |
|
|
Jack Goh
|
1571dd3da4
|
Merge branch 'too/fix-bug2' into 'master'
fix bug
See merge request CIEFWorldwideSdnBhd/exchange!92
|
2018-07-28 01:54:56 +00: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 |
|
|
Jack Goh
|
b239f13344
|
Merge branch 'Lingges/Fix_orderNo/RefNo' into 'master'
Lingges/Fix_no_refNo
See merge request CIEFWorldwideSdnBhd/exchange!90
|
2018-07-27 09:39:17 +00: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
|
390c6064a5
|
Merge branch 'deployment/staging' into 'master'
Deployment/staging
See merge request CIEFWorldwideSdnBhd/exchange!91
|
2018-07-27 07:37:58 +00: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 |
|
|
Jack Goh
|
e0a3969d3e
|
fix caddy build error
|
2018-07-27 12:39:06 +08:00 |
|
|
Jack Goh
|
3afa7bd539
|
fix 404 error for storage
|
2018-07-27 12:37:10 +08:00 |
|
|
Jack Goh
|
5bb7a2d652
|
fix 404 for storage folder in staging site
|
2018-07-27 12:34:43 +08:00 |
|
|
Jack Goh
|
69f6598c89
|
update root folder for caddy
|
2018-07-27 12:27:35 +08:00 |
|
|
Jack Goh
|
cedc7dfc1b
|
removed cache controll in caddy
|
2018-07-27 12:25:33 +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
|
727374abb8
|
added back rate in supplierbooking
changed back to 9000 in caddy server
|
2018-07-27 11:02:06 +08: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
|
54bb797b63
|
Merge branch 'fix/bug' into 'master'
fix syntax error
See merge request CIEFWorldwideSdnBhd/exchange!88
|
2018-07-27 02:20:01 +00: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 |
|
|
Jack Goh
|
b0b7b22dad
|
added public folder to caddy
|
2018-07-26 23:57:46 +08:00 |
|
|
Jack Goh
|
a3aee3e152
|
update for deployment to fix public storage not found
|
2018-07-26 23:41:35 +08:00 |
|
|
weiweitoo
|
580bc30929
|
fix css of loadmore button
|
2018-07-26 23:02:22 +08:00 |
|
|
weiweitoo
|
91c37778dc
|
add load more pagination of notificaiton
|
2018-07-26 22:58:22 +08:00 |
|
|
Jack Goh
|
8d450fb65e
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange
|
2018-07-26 19:33:27 +08:00 |
|
|
Jack Goh
|
d16a7f97d8
|
update caddy file to support other extension
|
2018-07-26 19:29:10 +08:00 |
|
|
Jack Goh
|
a0522200c8
|
Merge branch 'fix/bug' into 'master'
Fix/bug
See merge request CIEFWorldwideSdnBhd/exchange!84
|
2018-07-26 10:43:15 +00:00 |
|
|
lonetrinity
|
4f3d225084
|
fix/Admin/Settings
|
2018-07-26 17:55:55 +08:00 |
|
|
Jack Goh
|
fcfecb83d3
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug
# Conflicts:
# app/Http/Controllers/BookingController.php
# resources/assets/js/pages/home.vue
|
2018-07-26 15:50:49 +08:00 |
|
|
Jack Goh
|
6b050b4b79
|
Merge branch 'too/notification' into 'master'
Too/notification
See merge request CIEFWorldwideSdnBhd/exchange!82
|
2018-07-26 07:44:02 +00:00 |
|
|
Jack Goh
|
fa049bfa7e
|
fixed incorrect calculation when storing booking
|
2018-07-26 15:15:18 +08:00 |
|
|
Jack Goh
|
665a4faa91
|
fix beneficiary name and acc number display on booking confirmation
|
2018-07-26 14:47:48 +08:00 |
|