omair/exchange
1
0
Fork 0
mirror of https://gitlab.com/omair-personal/exchange.git synced 2026-08-19 12:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
732 Commits 28 Branches 0 Tags
too/gitlabci
Commit Graph

338 Commits

Author SHA1 Message Date
Jack Goh 1061adc094 remove composer.lock 
fixed navbar error
 2018-08-07 12:43:21 +08:00
Mohd Arief 4b24363994 solved discussion 2018-08-07 12:22:14 +08:00
Mohd Arief 8b362044d3 fixed the notification bug 2018-08-07 12:16:31 +08:00
Jack Goh f789127c57 added bank branch to supplier booking report 2018-07-31 17:01:40 +08:00
Jack Goh ec7964face fix credit setting error 2018-07-31 16:54:03 +08: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 3fdaa12a78 fix upload user bankslip with indicator and allow single imageo nly 2018-07-31 13:54:19 +08: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 cc2539d44c update max upload file size to 10mb 2018-07-30 14:48:48 +08:00
Jack Goh 1d3b8c2af7 temporary fix register page 2018-07-30 13:49:35 +08: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
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 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
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 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
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
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
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 665a4faa91 fix beneficiary name and acc number display on booking confirmation 2018-07-26 14:47:48 +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 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
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
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
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 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 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