Commit Graph

888 Commits

Author SHA1 Message Date
Jack Goh 94d770bcba fix migration error 2018-08-17 10:55:40 +08:00
Jack Goh 02c393184c Merge branch 'fix/notification' into 'master'
updated pusher to use environtment key

See merge request CIEFWorldwideSdnBhd/exchange!122
2018-08-17 01:41:30 +00:00
Jack Goh 37a22322f4 updated pusher to use environtment key 2018-08-17 09:36:08 +08:00
Jack Goh 98d98a29c7 Merge branch 'fix/notification' into 'master'
Fix/notification

See merge request CIEFWorldwideSdnBhd/exchange!121
2018-08-16 09:58:11 +00:00
Jack Goh f7c0fdc690 fix test 2018-08-16 17:52:37 +08:00
Jack Goh 57331363c0 update realtime rate on user home page 2018-08-16 17:11:39 +08:00
Jack Goh d295b5d9b4 removed some .env-example duplication config
updated rate updated event
added listener to user home page
2018-08-16 17:08:15 +08:00
Jack Goh 330fd3336b added laravel-echo and pusher library to frontend 2018-08-16 11:00:46 +08:00
Jack Goh 2ad56b02a6 removed notification seeder
updated boardcasting config
added rate updated notification file
2018-08-16 10:58:54 +08:00
Jack Goh 2fff081268 remove notification 2018-08-16 10:23:52 +08:00
Jack Goh 5bc4f5929d removed all notifications code 2018-08-16 10:23:03 +08:00
Jack Goh e03dc2e562 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/notification 2018-08-16 10:12:20 +08:00
Jack Goh f6bd74ed5e removed unused code 2018-08-16 10:12:05 +08:00
Jack Goh 5671d1ceeb Merge branch 'fix/importer-notification' into 'master'
fixed the notification bug on importer side

See merge request CIEFWorldwideSdnBhd/exchange!120
2018-08-16 02:09:25 +00:00
Mohd Arief 117f2cdaee fixed the notification bug on importer side 2018-08-16 10:01:44 +08:00
Jack Goh 7bbe69638c fix unauthorized booking access 2018-08-16 09:52:40 +08:00
Jack Goh 232edde8e4 fix unauthorized booking access 2018-08-16 09:40:54 +08:00
Jack Goh df8c0312c9 Merge branch 'fix/bank-setting' into 'master'
Fix/bank setting

See merge request CIEFWorldwideSdnBhd/exchange!119
2018-08-15 09:41:51 +00:00
Jack Goh bc43a2ee1e removed "please key in the data in chinese" label 2018-08-15 17:10:18 +08:00
Jack Goh 6e9f2b2d10 removed "please key in the data in chinese" label in footer 2018-08-15 17:07:25 +08:00
Jack Goh 0e5ed8f7f6 removed v-validate
updated some required field to non required field
2018-08-15 17:06:31 +08:00
Jack Goh 1d41c651b9 removed some required field on malaysia bank field 2018-08-15 17:02:19 +08:00
Jack Goh 53ce807aec remove v-validate from admin malaysia bank setting 2018-08-15 16:58:34 +08:00
Jack Goh 84358ce452 updated with no service charge 2018-08-15 16:38:03 +08:00
Jack Goh 7b1541a57f fix typo 2018-08-15 16:36:41 +08:00
Jack Goh 3c88ea09d3 fix active bank save error
removed phpmyadmin proxy from caddyfile
2018-08-15 16:03:38 +08:00
Jack Goh 1ee5b6952f added bank name to bank setting select label 2018-08-15 15:21:55 +08:00
Jack Goh d42a59bc33 Merge branch 'admin_Completed_Order' into 'master'
Admin completed order

See merge request CIEFWorldwideSdnBhd/exchange!118
2018-08-15 06:47:26 +00:00
lonetrinity 3a39f7407c lingges fix_Status 2018-08-15 14:35:26 +08:00
lonetrinity cbcb727099 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into admin_Completed_Order 2018-08-14 10:58:41 +08:00
Jack Goh 0e5293327d update x2 complete booking status 2018-08-14 10:48:13 +08:00
lonetrinity daa73f6cf2 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into admin_Completed_Order 2018-08-14 10:29:24 +08:00
lonetrinity 05e2846780 merge master 2018-08-14 10:29:03 +08:00
Jack Goh 70ef164ebc updated change log 2018-08-13 18:07:18 +08:00
Jack Goh e86ce45689 Merge branch 'fix/slice-error' into 'master'
Fix/slice error

See merge request CIEFWorldwideSdnBhd/exchange!117
2018-08-13 08:40:27 +00:00
Jack Goh 0bf62c00dc fix admin index table dont show completed 2018-08-13 16:33:33 +08:00
Jack Goh b07c44324a fix bank_branch error 2018-08-13 16:30:55 +08:00
Jack Goh 651690d275 fix bank branch error 2018-08-13 16:25:51 +08:00
Jack Goh e55b3b9300 fix supplier booking error 2018-08-13 16:22:45 +08:00
Jack Goh 1201107b22 drop billing_amount column in supplier booking 2018-08-13 16:20:07 +08:00
Jack Goh c2d93d9ae0 fix phpmyadmin network error 2018-08-13 16:13:54 +08:00
Jack Goh ec04c76bbe Merge branch 'fix/slice-error' into 'master'
fix caddy error

See merge request CIEFWorldwideSdnBhd/exchange!116
2018-08-13 07:55:00 +00:00
Jack Goh 25f42e9636 fix caddy error 2018-08-13 15:49:26 +08:00
Jack Goh 5821ec80b2 Merge branch 'fix/slice-error' into 'master'
Fix/slice error

See merge request CIEFWorldwideSdnBhd/exchange!115
2018-08-13 07:39:16 +00:00
Jack Goh 4e81548b12 remove build to speed up deploy process
added phpmyadmin to production
added phpmyadmin proxy to caddy
2018-08-13 15:33:10 +08:00
Jack Goh ff9db8e6ff fix user completed table 2018-08-13 15:12:31 +08:00
Jack Goh 35cfdfeaa9 Merge branch 'fix/slice-error' into 'master'
fix booking not found bug

See merge request CIEFWorldwideSdnBhd/exchange!114
2018-08-13 07:10:26 +00:00
Jack Goh a68095f203 fix booking not found bug 2018-08-13 15:04:36 +08:00
Jack Goh f35bb1c43c Merge branch 'fix/slice-error' into 'master'
fix slice error in user transfer page

See merge request CIEFWorldwideSdnBhd/exchange!113
2018-08-13 06:52:14 +00:00
Jack Goh 0c7cd0b201 fix slice error in user transfer page 2018-08-13 14:46:23 +08:00