cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 04:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
610 Commits 33 Branches 0 Tags
fix/bug
Commit Graph

610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Goh ba45091cf7 removed logo in supplier report 2018-07-27 11:19:10 +08: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 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
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
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
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
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
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 017f70391e fix admin completed order function not found error 2018-07-22 18:30:23 +08:00
Jack Goh 01fa0d07c3 fix active bank error 2018-07-22 18:28:45 +08:00
Jack Goh 621fcc09e8 update seed for malaysia bank 2018-07-22 18:25:06 +08:00
Jack Goh 46b349b189 added order_no and payment_for in booking controller store function 2018-07-22 18:09:28 +08:00
Jack Goh c3d50a776b fix user booking form 2018-07-22 15:54:18 +08:00
Jack Goh 1d23e913d5 added order_no and patment_for to calculation controller function 2018-07-22 15:42:48 +08:00
Jack Goh 7229d71109 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug 
# Conflicts:
#	resources/assets/js/components/LocaleDropdown.vue
#	resources/assets/js/pages/home.vue
 2018-07-22 15:39:35 +08:00
Jack Goh 5772a3c540 changed bookingtable data to null 2018-07-22 14:53:15 +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