 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 |
|
|
Jack Goh
|
a06f57712d
|
fix user booking calculation
|
2018-07-26 12:26:34 +08:00 |
|
|
Jack Goh
|
4ae97df8c5
|
fixed term1 fixed charge bug
|
2018-07-26 11:42:17 +08:00 |
|
|
Jack Goh
|
81be224fca
|
update currency note in booking calculation
|
2018-07-26 11:39:18 +08:00 |
|
 weiweitoo
|
2f63c27e67
|
Uodate store calculation
|
2018-07-26 11:06:28 +08:00 |
|
|
weiweitoo
|
74b84acf36
|
add time_interval feature in notification
|
2018-07-26 10:58:56 +08:00 |
|
|
weiweitoo
|
d9a818c05a
|
Fix notification frontend
|
2018-07-25 15:02:43 +08:00 |
|
|
weiweitoo
|
336e5e4ed3
|
create notification for each step done. Make unread message bold.
|
2018-07-25 10:05:18 +08:00 |
|
|
weiweitoo
|
ad5a9970ea
|
git pull origin master
|
2018-07-24 17:05:38 +08:00 |
|
|
weiweitoo
|
563c0d42d7
|
Update UI and migration,seeder for notification.
|
2018-07-24 17:02:45 +08:00 |
|
|
Jack Goh
|
c8af387546
|
Merge branch 'PaginationAdminBTable' into 'master'
Pagination admin b table
See merge request CIEFWorldwideSdnBhd/exchange!81
|
2018-07-24 06:18:28 +00:00 |
|
 lonetrinity
|
978df88b0a
|
fixTWo pagination for admin booking table
|
2018-07-24 14:15:01 +08:00 |
|
|
lonetrinity
|
74e602836b
|
fix pagination for admin booking table
|
2018-07-24 14:10:31 +08:00 |
|
|
lonetrinity
|
ae7bf422de
|
pagination for admin booking table
|
2018-07-24 12:30:03 +08:00 |
|
|
Jack Goh
|
51e4072a00
|
Merge branch 'too/fix-bug' into 'master'
Too/fix bug
See merge request CIEFWorldwideSdnBhd/exchange!79
|
2018-07-22 06:22:41 +00:00 |
|
|
Jack Goh
|
7aa22bf804
|
fixed internal error on booking confirmation
|
2018-07-22 14:21:40 +08:00 |
|
|
Jack Goh
|
df8ae0a931
|
Merge branch 'too/fix-bug' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/fix-bug
|
2018-07-22 14:08:20 +08:00 |
|
|
Jack Goh
|
6799db199e
|
no message
|
2018-07-21 16:50:48 +08:00 |
|
|
weiweitoo
|
a0f80aa41b
|
fix booking confirmation
|
2018-07-21 14:16:39 +08:00 |
|
|
weiweitoo
|
81bf3ac585
|
add migration for notification. update booking confirmation
|
2018-07-21 14:15:42 +08:00 |
|
|
weiweitoo
|
1b874d0800
|
Fix conflit
|
2018-07-21 01:43:10 +08:00 |
|
|
weiweitoo
|
3e60ec8e86
|
fix conflit
|
2018-07-21 00:15:43 +08:00 |
|
|
weiweitoo
|
c4962e4655
|
git pull origin master
|
2018-07-20 22:12:48 +08:00 |
|
|
weiweitoo
|
65c65ef257
|
Fix calculation
|
2018-07-20 21:47:23 +08:00 |
|
|
weiweitoo
|
21c13d3e60
|
change billingcharge rate and tax rate table to double. Modify Customer calculation table
|
2018-07-20 21:16:36 +08:00 |
|
|
weiweitoo
|
73c36dd8e3
|
Add setting for taxrate and billingcharge
|
2018-07-20 18:47:19 +08:00 |
|
|
Jack Goh
|
d3a995c6b5
|
Merge branch 'frontend/making-every-user-page-responsive' into 'master'
Frontend/making every user page responsive
See merge request CIEFWorldwideSdnBhd/exchange!74
|
2018-07-20 09:44:31 +00:00 |
|
 Mouhamed Lamine
|
1cccefdb8a
|
Discussion Fixed
|
2018-07-20 17:42:27 +08:00 |
|
|
weiweitoo
|
4bb40e3643
|
display china beneficiary information in all order detail
|
2018-07-20 17:20:02 +08:00 |
|
|
weiweitoo
|
34bc7a43c6
|
Add CRUD for marking setting
|
2018-07-20 00:58:47 +08:00 |
|
|
weiweitoo
|
d97d7f4cb4
|
Fix user page pagination
|
2018-07-19 18:08:04 +08:00 |
|
|
weiweitoo
|
d01f14d9f7
|
Remove some unnessary console.log
|
2018-07-19 18:01:16 +08:00 |
|
|
weiweitoo
|
ef200257b3
|
revert back changes during debug
|
2018-07-19 17:49:02 +08:00 |
|
|
weiweitoo
|
16205404e1
|
Fix upload issue. allow po to upload multiple and display multiple. Display download link when the uploaded file is not image
|
2018-07-19 17:45:25 +08:00 |
|
|
Jack Goh
|
c63c4e6811
|
Merge branch 'fix/loadingButton' into 'master'
complete orders/admin/refreshbutton
See merge request CIEFWorldwideSdnBhd/exchange!77
|
2018-07-19 08:18:08 +00:00 |
|
|
lonetrinity
|
a3717a19e2
|
complete orders/admin/refreshbutton
|
2018-07-19 16:16:27 +08:00 |
|
|
Jack Goh
|
d87c45938d
|
Merge branch 'fix/loadingButton' into 'master'
Fix/loading button
See merge request CIEFWorldwideSdnBhd/exchange!76
|
2018-07-19 08:01:05 +00:00 |
|
|
lonetrinity
|
a322b8b798
|
fix unwanted line removal
|
2018-07-19 12:32:48 +08:00 |
|
|
lonetrinity
|
fef401d76c
|
fix conflict
|
2018-07-19 12:20:54 +08:00 |
|
|
lonetrinity
|
b2e9d6f0c6
|
removed unstacked files
|
2018-07-19 12:19:56 +08:00 |
|
|
lonetrinity
|
18932c03c5
|
fix conflig
|
2018-07-19 12:18:54 +08:00 |
|
|
lonetrinity
|
bd3f106e05
|
fix/loading for user done
|
2018-07-19 11:48:14 +08:00 |
|
|
Jack Goh
|
0bf30ac312
|
Merge branch 'deployment/staging' into 'master'
Deployment/staging
See merge request CIEFWorldwideSdnBhd/exchange!75
|
2018-07-19 03:31:05 +00:00 |
|
|
Jack Goh
|
6bb754ab9b
|
removed unuse dockerfile
|
2018-07-19 11:28:30 +08:00 |
|
|
Jack Goh
|
74fda30311
|
added network to db in dockercompose
|
2018-07-19 11:10:03 +08:00 |
|
|
Jack Goh
|
73c3e8654b
|
added mix-manifest to gitignore, because it differ from production and dev
|
2018-07-19 11:02:04 +08:00 |
|
|
Jack Goh
|
4469919950
|
fix db address error
|
2018-07-19 10:58:25 +08:00 |
|
|
Jack Goh
|
73d00d8d42
|
commited temp file
|
2018-07-19 10:53:35 +08:00 |
|