cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 12:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 068cdb18e7 added back service charge updated change log Jack Goh 2018-08-20 17:56:10 +08:00
  • 89890e93b3 Merge branch 'fix/bank-setting' into 'master' Jack Goh 2018-08-20 09:37:19 +00:00
  • f15dbe44db fix bank setting cannot be null error Jack Goh 2018-08-20 17:31:25 +08:00
  • 9891d1fde1 Merge branch 'admin_Completed_Order' into 'master' Jack Goh 2018-08-20 09:25:47 +00:00
  • 9a3bd8dade Merge branch 'fix/notification' into 'master' Jack Goh 2018-08-20 09:25:17 +00:00
  • b26727e5e6 fixed admin and user normal booking table with completed booking bug Jack Goh 2018-08-20 17:18:39 +08:00
  • a85b8eb41e fixBookingTable lonetrinity 2018-08-17 14:57:33 +08:00
  • 408be5d367 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into admin_Completed_Order lonetrinity 2018-08-17 12:13:43 +08:00
  • 67cce6e91e Merge branch 'fix/refresh-button' into 'master' Jack Goh 2018-08-17 03:33:18 +00:00
  • 9740392d4c fixed conflict Mohd Arief 2018-08-17 11:26:14 +08:00
  • 16e7efa108 updated the refresh button function Mohd Arief 2018-08-17 11:21:41 +08:00
  • d6eb6576d3 updated refresh button Mohd Arief 2018-08-17 11:13:17 +08:00
  • 249894d5b2 fixAdminCommit lonetrinity 2018-08-17 11:12:15 +08:00
  • df068d8c71 Revert "fixed the refresh button for completed order" Mohd Arief 2018-08-17 11:07:26 +08:00
  • 7d1155651b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into admin_Completed_Order lonetrinity 2018-08-17 11:04:51 +08:00
  • 5db9908a57 prepare to merge lonetrinity 2018-08-17 11:04:44 +08:00
  • 424097e035 fixed the refresh button for completed order fix/importer-notification Mohd Arief 2018-08-17 11:00:35 +08:00
  • 94d770bcba fix migration error fix/notification Jack Goh 2018-08-17 10:55:40 +08:00
  • 02c393184c Merge branch 'fix/notification' into 'master' Jack Goh 2018-08-17 01:41:30 +00:00
  • 37a22322f4 updated pusher to use environtment key Jack Goh 2018-08-17 09:36:08 +08:00
  • 98d98a29c7 Merge branch 'fix/notification' into 'master' Jack Goh 2018-08-16 09:58:11 +00:00
  • f7c0fdc690 fix test Jack Goh 2018-08-16 17:52:37 +08:00
  • 57331363c0 update realtime rate on user home page Jack Goh 2018-08-16 17:11:39 +08:00
  • d295b5d9b4 removed some .env-example duplication config updated rate updated event added listener to user home page Jack Goh 2018-08-16 17:08:15 +08:00
  • 330fd3336b added laravel-echo and pusher library to frontend Jack Goh 2018-08-16 11:00:46 +08:00
  • 2ad56b02a6 removed notification seeder updated boardcasting config added rate updated notification file Jack Goh 2018-08-16 10:58:54 +08:00
  • 2fff081268 remove notification Jack Goh 2018-08-16 10:23:52 +08:00
  • 5bc4f5929d removed all notifications code Jack Goh 2018-08-16 10:23:03 +08:00
  • e03dc2e562 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/notification Jack Goh 2018-08-16 10:12:20 +08:00
  • f6bd74ed5e removed unused code Jack Goh 2018-08-16 10:12:05 +08:00
  • 5671d1ceeb Merge branch 'fix/importer-notification' into 'master' Jack Goh 2018-08-16 02:09:25 +00:00
  • 117f2cdaee fixed the notification bug on importer side Mohd Arief 2018-08-16 10:01:44 +08:00
  • 7bbe69638c fix unauthorized booking access Jack Goh 2018-08-16 09:52:40 +08:00
  • 232edde8e4 fix unauthorized booking access Jack Goh 2018-08-16 09:40:54 +08:00
  • df8c0312c9 Merge branch 'fix/bank-setting' into 'master' Jack Goh 2018-08-15 09:41:51 +00:00
  • bc43a2ee1e removed "please key in the data in chinese" label Jack Goh 2018-08-15 17:10:18 +08:00
  • 6e9f2b2d10 removed "please key in the data in chinese" label in footer Jack Goh 2018-08-15 17:07:25 +08:00
  • 0e5ed8f7f6 removed v-validate updated some required field to non required field Jack Goh 2018-08-15 17:06:31 +08:00
  • 1d41c651b9 removed some required field on malaysia bank field Jack Goh 2018-08-15 17:02:19 +08:00
  • 53ce807aec remove v-validate from admin malaysia bank setting Jack Goh 2018-08-15 16:58:34 +08:00
  • 84358ce452 updated with no service charge Jack Goh 2018-08-15 16:38:03 +08:00
  • 7b1541a57f fix typo Jack Goh 2018-08-15 16:36:41 +08:00
  • 3c88ea09d3 fix active bank save error removed phpmyadmin proxy from caddyfile Jack Goh 2018-08-15 16:03:38 +08:00
  • 1ee5b6952f added bank name to bank setting select label Jack Goh 2018-08-15 15:21:55 +08:00
  • d42a59bc33 Merge branch 'admin_Completed_Order' into 'master' Jack Goh 2018-08-15 06:47:26 +00:00
  • 3a39f7407c lingges fix_Status lonetrinity 2018-08-15 14:35:26 +08:00
  • e41e664325 paused the fixing progress fix/register-error-message Mohd Arief 2018-08-15 09:32:42 +08:00
  • cbcb727099 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into admin_Completed_Order lonetrinity 2018-08-14 10:58:41 +08:00
  • 0e5293327d update x2 complete booking status Jack Goh 2018-08-14 10:48:13 +08:00
  • daa73f6cf2 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into admin_Completed_Order lonetrinity 2018-08-14 10:29:24 +08:00
  • 05e2846780 merge master lonetrinity 2018-08-14 10:29:03 +08:00
  • 70ef164ebc updated change log Jack Goh 2018-08-13 18:07:18 +08:00
  • e86ce45689 Merge branch 'fix/slice-error' into 'master' Jack Goh 2018-08-13 08:40:27 +00:00
  • 0bf62c00dc fix admin index table dont show completed fix/slice-error Jack Goh 2018-08-13 16:33:33 +08:00
  • b07c44324a fix bank_branch error Jack Goh 2018-08-13 16:30:55 +08:00
  • 651690d275 fix bank branch error Jack Goh 2018-08-13 16:25:51 +08:00
  • e55b3b9300 fix supplier booking error Jack Goh 2018-08-13 16:22:45 +08:00
  • 1201107b22 drop billing_amount column in supplier booking Jack Goh 2018-08-13 16:20:07 +08:00
  • c2d93d9ae0 fix phpmyadmin network error Jack Goh 2018-08-13 16:13:54 +08:00
  • ec04c76bbe Merge branch 'fix/slice-error' into 'master' Jack Goh 2018-08-13 07:55:00 +00:00
  • 25f42e9636 fix caddy error Jack Goh 2018-08-13 15:49:26 +08:00
  • 5821ec80b2 Merge branch 'fix/slice-error' into 'master' Jack Goh 2018-08-13 07:39:16 +00:00
  • 4e81548b12 remove build to speed up deploy process added phpmyadmin to production added phpmyadmin proxy to caddy Jack Goh 2018-08-13 15:33:10 +08:00
  • ff9db8e6ff fix user completed table Jack Goh 2018-08-13 15:12:31 +08:00
  • 35cfdfeaa9 Merge branch 'fix/slice-error' into 'master' Jack Goh 2018-08-13 07:10:26 +00:00
  • a68095f203 fix booking not found bug Jack Goh 2018-08-13 15:04:36 +08:00
  • f35bb1c43c Merge branch 'fix/slice-error' into 'master' Jack Goh 2018-08-13 06:52:14 +00:00
  • 0c7cd0b201 fix slice error in user transfer page Jack Goh 2018-08-13 14:46:23 +08:00
  • a938aab8fe Merge branch 'fix/frontend-marking' into 'master' Jack Goh 2018-08-13 06:09:28 +00:00
  • 1337c1cd4e fix marking factory to make marking capital letter Jack Goh 2018-08-13 14:03:49 +08:00
  • b5c8688a56 fix unknow column when testing Jack Goh 2018-08-13 12:40:08 +08:00
  • 356b1e5267 remove complete order nav from admin updated name of the tab Jack Goh 2018-08-13 12:27:55 +08:00
  • 92fe8d99f7 fix bankslip aprrove bug Jack Goh 2018-08-13 12:22:26 +08:00
  • 2910a9037a fix upload user bankslip error Jack Goh 2018-08-13 12:18:44 +08:00
  • 796e8bf6df fix marking bug - when typing chinese Jack Goh 2018-08-13 12:07:15 +08:00
  • 40b3b8b680 Merge branch 'fix/bookingtable-bankname' into 'master' Jack Goh 2018-08-13 03:41:46 +00:00
  • 91c0bec289 added bank name and bank branch to booking calcualation fix/bookingtable-bankname Jack Goh 2018-08-13 11:36:26 +08:00
  • 148f771098 Merge branch 'fix/bookingTable/Lingges' into 'master' Jack Goh 2018-08-13 03:02:25 +00:00
  • 326ef7dd5f fix/mergeConflicts lonetrinity 2018-08-11 10:30:16 +08:00
  • 98db669a64 fix/discussionResolved lonetrinity 2018-08-11 10:23:15 +08:00
  • 385cd33211 resolved discussion lonetrinity 2018-08-10 18:15:55 +08:00
  • 3f38fef845 fixPaginationAdmin_and_user lonetrinity 2018-08-10 17:45:01 +08:00
  • 6442a58746 remove remember me because it does nothing Jack Goh 2018-08-10 17:41:23 +08:00
  • 144b57bc52 fix upload user bankslip page bug Jack Goh 2018-08-10 09:49:34 +08:00
  • 37ade40cdd added change log Jack Goh 2018-08-09 18:02:37 +08:00
  • 9a07a11a2d Merge branch 'fix/marking' into 'master' Jack Goh 2018-08-09 09:42:57 +00:00
  • 6fe1fc4257 fix password reset link not found bug Jack Goh 2018-08-09 17:37:01 +08:00
  • e6b987358f Merge branch 'fix/marking' into 'master' Jack Goh 2018-08-09 09:10:55 +00:00
  • 615dff66fc fixed the marking bug Mohd Arief 2018-08-09 16:47:04 +08:00
  • de0c9fabc4 update send reset link success message Jack Goh 2018-08-09 16:16:45 +08:00
  • 77abcb7a1d fix symlink not found Jack Goh 2018-08-09 15:55:39 +08:00
  • e1e8ea2cfc fix app/public/storage not found Jack Goh 2018-08-09 15:45:52 +08:00
  • 1b6284bad9 Merge branch 'fix/forgot-password' into 'master' Jack Goh 2018-08-09 07:32:38 +00:00
  • c2b1c9aa38 fix storage link error fix/forgot-password Jack Goh 2018-08-09 15:20:26 +08:00
  • c4ff2684de remove debug on chinabankslip test Jack Goh 2018-08-09 15:05:23 +08:00
  • 9b78b8c669 temporary fix bank_branch not null Jack Goh 2018-08-09 15:04:03 +08:00
  • c09fdabe5a fix bank_branch not found Jack Goh 2018-08-09 14:49:34 +08:00
  • 114aab975b fix forgot-password Jack Goh 2018-08-09 14:37:47 +08:00
  • caf58ac4cf Merge branch 'fix/green-report' into 'master' Jack Goh 2018-08-09 04:13:04 +00:00
  • a9b30e2bb9 added supplier booking report to complete page at admin side Jack Goh 2018-08-09 12:08:03 +08:00