 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
|
026ac66257
|
added default field for select field
|
2018-07-20 18:08:39 +08:00 |
|
|
Jack Goh
|
32278095bf
|
beautified user home page
added order number and payment for field in user booking
|
2018-07-20 18:04:30 +08:00 |
|
|
Jack Goh
|
14a1090263
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug
|
2018-07-20 17:45:47 +08:00 |
|
|
Jack Goh
|
1497c50da5
|
changed payment voucher in supplier booking report to Ref No.
added dynamic marking to supplier booking
|
2018-07-20 17:45:39 +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 |
|
|
Jack Goh
|
20cc501f0e
|
make beneficiary nullable
|
2018-07-20 15:08:48 +08:00 |
|
|
Jack Goh
|
b971fc79ce
|
added a option to let admin choose to use customer's beneficiary in supplier report
|
2018-07-20 14:54:52 +08:00 |
|
|
Jack Goh
|
5814c999d6
|
updated update rate input to be wider
|
2018-07-20 11:18:05 +08:00 |
|
|
Jack Goh
|
e2cf3fecdd
|
fix term1 no service charge
fix navbar extra </li>
|
2018-07-20 11:12:20 +08:00 |
|
|
Jack Goh
|
aea6323a66
|
fix other loading button not working
|
2018-07-20 10:59:32 +08:00 |
|
|
Jack Goh
|
f6c0d6aab3
|
Added navigation notice in user home page
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug
# Conflicts:
# resources/assets/js/pages/home.vue
|
2018-07-20 10:55:55 +08:00 |
|
|
Jack Goh
|
a18f00c29f
|
added production env sample
|
2018-07-20 10:26:18 +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 |
|
|
lonetrinity
|
37fdf32af1
|
fixed admin refresh button with loading
|
2018-07-19 10:11:31 +08:00 |
|
|
Jack Goh
|
f3118454b1
|
fix mysql setting on docker compose
|
2018-07-19 09:55:23 +08:00 |
|
|
Jack Goh
|
1a7dc820a9
|
fix production frontend issue
|
2018-07-19 09:51:35 +08:00 |
|
|
Jack Goh
|
8cf011c59c
|
test with app env check
|
2018-07-19 09:49:44 +08:00 |
|
|
Jack Goh
|
67c5b0c97b
|
fix webpackjson not found
|
2018-07-19 09:47:09 +08:00 |
|
|
weiweitoo
|
6e849b6145
|
Show download button for non-preview able file in the complete page.
|
2018-07-18 23:53:04 +08:00 |
|
|
Jack Goh
|
b0071d1000
|
updated production frontend error
|
2018-07-18 22:20:49 +08:00 |
|
|
Mouhamed Lamine
|
9670454c61
|
Almost Done
|
2018-07-18 21:48:34 +08:00 |
|