 Mouhamed Lamine
|
353d830985
|
Merge conflicts fixed
|
2018-07-27 16:18:00 +08:00 |
|
|
Mouhamed Lamine
|
a3aa98884d
|
Merge conflicts fixed
|
2018-07-27 16:15:03 +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 |
|
|
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 |
|
|
Mouhamed Lamine
|
cd1e8678e3
|
Merge conflicts fixed
|
2018-07-26 14:30:30 +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 |
|
|
Jack Goh
|
8f7a4ee6b6
|
changed get active bank from backend instead of frontend
|
2018-07-26 11:22:03 +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 |
|
|
Jack Goh
|
45e8ce8620
|
updated supplier calculation with latest format
|
2018-07-26 10:56:28 +08:00 |
|
|
Jack Goh
|
293dfd6cd2
|
temporary commented out rate and transfer amount from supplier booking
|
2018-07-25 22:33:14 +08:00 |
|
|
Mouhamed Lamine
|
f2f43d8ac3
|
Done. Issue with the navbar on user side. I think theres a problem with rendering
|
2018-07-25 20:49:52 +08:00 |
|
|
lonetrinity
|
7e49714be6
|
70%done
|
2018-07-25 17:43:38 +08:00 |
|
|
Jack Goh
|
4e0f1dbe0a
|
removed vee-validate which causes cief bank details not showing in user upload bank slip
added exception if userbankslip not save show error
added tax rate to supplier booking
added order number and payment for to booking seeder
|
2018-07-25 16:22:53 +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 |
|
|
Mouhamed Lamine
|
add9ef9fd4
|
Done. Review tomorrow then push
|
2018-07-24 20:45:52 +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 |
|