Commit Graph

793 Commits

Author SHA1 Message Date
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 25f42e9636 fix caddy error 2018-08-13 15:49:26 +08: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 a68095f203 fix booking not found bug 2018-08-13 15:04:36 +08:00
Jack Goh 0c7cd0b201 fix slice error in user transfer page 2018-08-13 14:46:23 +08:00
Jack Goh 1337c1cd4e fix marking factory to make marking capital letter 2018-08-13 14:03:49 +08:00
Jack Goh b5c8688a56 fix unknow column when testing 2018-08-13 12:40:08 +08:00
Jack Goh 356b1e5267 remove complete order nav from admin
updated name of the tab
2018-08-13 12:27:55 +08:00
Jack Goh 92fe8d99f7 fix bankslip aprrove bug 2018-08-13 12:22:26 +08:00
Jack Goh 2910a9037a fix upload user bankslip error 2018-08-13 12:18:44 +08:00
Jack Goh 796e8bf6df fix marking bug - when typing chinese 2018-08-13 12:07:15 +08:00
Jack Goh 148f771098 Merge branch 'fix/bookingTable/Lingges' into 'master'
Fix/booking table/lingges

See merge request CIEFWorldwideSdnBhd/exchange!105
2018-08-13 03:02:25 +00:00
lonetrinity 326ef7dd5f fix/mergeConflicts 2018-08-11 10:30:16 +08:00
lonetrinity 98db669a64 fix/discussionResolved 2018-08-11 10:23:15 +08:00
lonetrinity 385cd33211 resolved discussion 2018-08-10 18:15:55 +08:00
lonetrinity 3f38fef845 fixPaginationAdmin_and_user 2018-08-10 17:45:01 +08:00
Jack Goh 6442a58746 remove remember me because it does nothing 2018-08-10 17:41:23 +08:00
Jack Goh 144b57bc52 fix upload user bankslip page bug 2018-08-10 09:49:34 +08:00
Jack Goh 37ade40cdd added change log 2018-08-09 18:02:37 +08:00
Jack Goh 9a07a11a2d Merge branch 'fix/marking' into 'master'
fix password reset link not found bug

See merge request CIEFWorldwideSdnBhd/exchange!110
2018-08-09 09:42:57 +00:00
Jack Goh 6fe1fc4257 fix password reset link not found bug 2018-08-09 17:37:01 +08:00
Jack Goh e6b987358f Merge branch 'fix/marking' into 'master'
fixed the marking bug

See merge request CIEFWorldwideSdnBhd/exchange!109
2018-08-09 09:10:55 +00:00
Mohd Arief 615dff66fc fixed the marking bug 2018-08-09 16:47:04 +08:00
Jack Goh de0c9fabc4 update send reset link success message 2018-08-09 16:16:45 +08:00
Jack Goh 77abcb7a1d fix symlink not found 2018-08-09 15:55:39 +08:00
Jack Goh e1e8ea2cfc fix app/public/storage not found 2018-08-09 15:45:52 +08:00
Jack Goh 1b6284bad9 Merge branch 'fix/forgot-password' into 'master'
fix forgot-password

See merge request CIEFWorldwideSdnBhd/exchange!108
2018-08-09 07:32:38 +00:00
Jack Goh c2b1c9aa38 fix storage link error 2018-08-09 15:20:26 +08:00
Jack Goh c4ff2684de remove debug on chinabankslip test 2018-08-09 15:05:23 +08:00
Jack Goh 9b78b8c669 temporary fix bank_branch not null 2018-08-09 15:04:03 +08:00
Jack Goh c09fdabe5a fix bank_branch not found 2018-08-09 14:49:34 +08:00
Jack Goh 114aab975b fix forgot-password 2018-08-09 14:37:47 +08:00
Jack Goh caf58ac4cf Merge branch 'fix/green-report' into 'master'
Fix/green report

See merge request CIEFWorldwideSdnBhd/exchange!107
2018-08-09 04:13:04 +00:00
Jack Goh a9b30e2bb9 added supplier booking report to complete page at admin side 2018-08-09 12:08:03 +08:00
Jack Goh 5eb1771ae1 added supplier booking report to upload china bankslip at admin side 2018-08-09 11:30:31 +08:00
Jack Goh 45391317ef added supplier booking report to upload invoice at admin side 2018-08-09 11:24:15 +08:00
Jack Goh e67dabfb5b fix user track status bug 2018-08-09 10:55:05 +08:00
Jack Goh 5d3ab327ca fix progress track bug for admin side 2018-08-09 10:50:59 +08:00
Jack Goh 2f3b9baf9b added x2 progress track 2018-08-09 10:44:21 +08:00
Jack Goh b2022c652b Merge branch 'fix/x2-status' into 'master'
Fix/x2 status

See merge request CIEFWorldwideSdnBhd/exchange!106
2018-08-09 02:01:21 +00:00
Jack Goh 594c6a74fe fix admin x2 status track 2018-08-08 17:11:08 +08:00
Jack Goh 06bacfcaf9 fixed x2 status for user side 2018-08-08 16:31:35 +08:00
lonetrinity 97f7041459 fix/adminBookingTableComplete 2018-08-08 11:55:14 +08:00
lonetrinity 63f8584455 fix/adminbookingcompletetable 2018-08-08 11:48:03 +08:00
Jack Goh 526486f95a fix supplier booking nullable
fix booking seeder wrong status
2018-08-08 10:55:41 +08:00
Jack Goh ae081ddddf fix booking internal server error due to db not accepting null value
fixed copy right on booking form
update notification seeder
2018-08-08 10:41:29 +08:00
Jack Goh 8999fac2e6 Merge branch 'fix/billing-charge' into 'master'
fix billing charge for x2 to 0

See merge request CIEFWorldwideSdnBhd/exchange!104
2018-08-08 02:24:29 +00:00