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

Commit Graph

  • 1eb0060f31 Merge conflicts fixed frontend/making-every-admin-page-responsive Mouhamed Lamine 2018-07-28 12:09:05 +08:00
  • d220464627 Commit before switch Mouhamed Lamine 2018-07-28 11:48:28 +08:00
  • 1571dd3da4 Merge branch 'too/fix-bug2' into 'master' Jack Goh 2018-07-28 01:54:56 +00:00
  • 27dce5b114 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/fix-bug2 Jack Goh 2018-07-28 09:54:39 +08:00
  • 61066c4366 removed ali pay / wechat pay at place holder removed mix-manifest.json from git Jack Goh 2018-07-28 09:49:57 +08:00
  • a707977ab2 fix bug weiweitoo 2018-07-27 17:44:32 +08:00
  • b239f13344 Merge branch 'Lingges/Fix_orderNo/RefNo' into 'master' Jack Goh 2018-07-27 09:39:17 +00:00
  • 78fbe3151c Fix_orderNo/RefNoPArt2 lonetrinity 2018-07-27 17:35:10 +08:00
  • f1d49ef82c Fix-OrderNo/RefNo lonetrinity 2018-07-27 17:24:37 +08:00
  • 353d830985 Merge conflicts fixed Mouhamed Lamine 2018-07-27 16:18:00 +08:00
  • a3aa98884d Merge conflicts fixed Mouhamed Lamine 2018-07-27 16:15:03 +08:00
  • 390c6064a5 Merge branch 'deployment/staging' into 'master' Jack Goh 2018-07-27 07:37:58 +00:00
  • 3c70fc22e5 fix empty supplier, china, malaysia bank setting page due to vee-validate deployment/staging Jack Goh 2018-07-27 15:36:43 +08:00
  • 06c4333247 Fixing merge conflicts in another branch Mouhamed Lamine 2018-07-27 15:01:55 +08:00
  • 68add5f1a2 disable cache in caddy Jack Goh 2018-07-27 14:10:34 +08:00
  • e0a3969d3e fix caddy build error Jack Goh 2018-07-27 12:39:06 +08:00
  • 3afa7bd539 fix 404 error for storage Jack Goh 2018-07-27 12:37:10 +08:00
  • 5bb7a2d652 fix 404 for storage folder in staging site Jack Goh 2018-07-27 12:34:43 +08:00
  • 69f6598c89 update root folder for caddy Jack Goh 2018-07-27 12:27:35 +08:00
  • cedc7dfc1b removed cache controll in caddy Jack Goh 2018-07-27 12:25:33 +08:00
  • 05757911b1 Lingges/Fix_no_refNo lonetrinity 2018-07-27 11:30:19 +08:00
  • 8128a3ba24 Merge branch 'fix/bug' into 'master' Jack Goh 2018-07-27 03:27:28 +00:00
  • ba45091cf7 removed logo in supplier report fix/bug Jack Goh 2018-07-27 11:19:10 +08:00
  • af1f85e662 Merge branch 'Lingges/Fix_user_refresh_rae_loading' into 'master' Jack Goh 2018-07-27 03:09:09 +00:00
  • 727374abb8 added back rate in supplierbooking changed back to 9000 in caddy server Jack Goh 2018-07-27 11:02:06 +08:00
  • 438d9fa602 temporary added po format link in upload po page added back costing rate in supplier booking page Jack Goh 2018-07-27 10:53:20 +08:00
  • f6cfd9a188 updat the login session to be 12 hours fix status description not showing update user booking confirmation china beneficiary acc into one row Jack Goh 2018-07-27 10:41:57 +08:00
  • 54bb797b63 Merge branch 'fix/bug' into 'master' Jack Goh 2018-07-27 02:20:01 +00:00
  • 0aae3a8e76 fix syntax error Jack Goh 2018-07-27 10:18:59 +08:00
  • a6567b47b2 Merge branch 'too/notificationpagination' into 'master' Jack Goh 2018-07-27 02:02:00 +00:00
  • ebe5d06114 lingges/fix/user_refresh_rate_loading lonetrinity 2018-07-27 10:01:33 +08:00
  • 6df48f6a4f updated payment for options in booking form Jack Goh 2018-07-27 09:46:33 +08:00
  • b0b7b22dad added public folder to caddy Jack Goh 2018-07-26 23:57:46 +08:00
  • a3aee3e152 update for deployment to fix public storage not found Jack Goh 2018-07-26 23:41:35 +08:00
  • 580bc30929 fix css of loadmore button weiweitoo 2018-07-26 23:02:22 +08:00
  • 91c37778dc add load more pagination of notificaiton weiweitoo 2018-07-26 22:58:22 +08:00
  • 8d450fb65e Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange Jack Goh 2018-07-26 19:33:27 +08:00
  • d16a7f97d8 update caddy file to support other extension Jack Goh 2018-07-26 19:29:10 +08:00
  • a0522200c8 Merge branch 'fix/bug' into 'master' Jack Goh 2018-07-26 10:43:15 +00:00
  • 4f3d225084 fix/Admin/Settings lonetrinity 2018-07-26 17:55:55 +08:00
  • fcfecb83d3 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug Jack Goh 2018-07-26 15:50:49 +08:00
  • 6b050b4b79 Merge branch 'too/notification' into 'master' Jack Goh 2018-07-26 07:44:02 +00:00
  • fa049bfa7e fixed incorrect calculation when storing booking Jack Goh 2018-07-26 15:15:18 +08:00
  • 665a4faa91 fix beneficiary name and acc number display on booking confirmation Jack Goh 2018-07-26 14:47:48 +08:00
  • cd1e8678e3 Merge conflicts fixed Mouhamed Lamine 2018-07-26 14:30:30 +08:00
  • a06f57712d fix user booking calculation Jack Goh 2018-07-26 12:26:34 +08:00
  • 4ae97df8c5 fixed term1 fixed charge bug Jack Goh 2018-07-26 11:42:17 +08:00
  • 81be224fca update currency note in booking calculation Jack Goh 2018-07-26 11:39:18 +08:00
  • 8f7a4ee6b6 changed get active bank from backend instead of frontend Jack Goh 2018-07-26 11:22:03 +08:00
  • 2f63c27e67 Uodate store calculation weiweitoo 2018-07-26 11:06:28 +08:00
  • 74b84acf36 add time_interval feature in notification weiweitoo 2018-07-26 10:58:56 +08:00
  • 45e8ce8620 updated supplier calculation with latest format Jack Goh 2018-07-26 10:56:28 +08:00
  • 293dfd6cd2 temporary commented out rate and transfer amount from supplier booking Jack Goh 2018-07-25 22:33:14 +08:00
  • f2f43d8ac3 Done. Issue with the navbar on user side. I think theres a problem with rendering Mouhamed Lamine 2018-07-25 20:49:52 +08:00
  • 7e49714be6 70%done lonetrinity 2018-07-25 17:43:38 +08:00
  • 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 Jack Goh 2018-07-25 16:22:53 +08:00
  • d9a818c05a Fix notification frontend weiweitoo 2018-07-25 15:02:43 +08:00
  • 336e5e4ed3 create notification for each step done. Make unread message bold. weiweitoo 2018-07-25 10:05:18 +08:00
  • add9ef9fd4 Done. Review tomorrow then push Mouhamed Lamine 2018-07-24 20:45:52 +08:00
  • ad5a9970ea git pull origin master weiweitoo 2018-07-24 17:05:38 +08:00
  • 563c0d42d7 Update UI and migration,seeder for notification. weiweitoo 2018-07-24 17:02:45 +08:00
  • c8af387546 Merge branch 'PaginationAdminBTable' into 'master' Jack Goh 2018-07-24 06:18:28 +00:00
  • 978df88b0a fixTWo pagination for admin booking table lonetrinity 2018-07-24 14:15:01 +08:00
  • 74e602836b fix pagination for admin booking table lonetrinity 2018-07-24 14:10:31 +08:00
  • ae7bf422de pagination for admin booking table lonetrinity 2018-07-24 12:30:03 +08:00
  • 77dc6bc89f Almost done Mouhamed Lamine 2018-07-23 20:06:59 +08:00
  • 017f70391e fix admin completed order function not found error Jack Goh 2018-07-22 18:30:23 +08:00
  • 01fa0d07c3 fix active bank error Jack Goh 2018-07-22 18:28:45 +08:00
  • 621fcc09e8 update seed for malaysia bank Jack Goh 2018-07-22 18:25:06 +08:00
  • 46b349b189 added order_no and payment_for in booking controller store function Jack Goh 2018-07-22 18:09:28 +08:00
  • c3d50a776b fix user booking form Jack Goh 2018-07-22 15:54:18 +08:00
  • 1d23e913d5 added order_no and patment_for to calculation controller function Jack Goh 2018-07-22 15:42:48 +08:00
  • 7229d71109 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug Jack Goh 2018-07-22 15:39:35 +08:00
  • 5772a3c540 changed bookingtable data to null Jack Goh 2018-07-22 14:53:15 +08:00
  • 51e4072a00 Merge branch 'too/fix-bug' into 'master' Jack Goh 2018-07-22 06:22:41 +00:00
  • 7aa22bf804 fixed internal error on booking confirmation Jack Goh 2018-07-22 14:21:40 +08:00
  • df8ae0a931 Merge branch 'too/fix-bug' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/fix-bug Jack Goh 2018-07-22 14:08:20 +08:00
  • 6799db199e no message Jack Goh 2018-07-21 16:50:48 +08:00
  • a0f80aa41b fix booking confirmation weiweitoo 2018-07-21 14:16:39 +08:00
  • 81bf3ac585 add migration for notification. update booking confirmation weiweitoo 2018-07-21 14:15:42 +08:00
  • 1b874d0800 Fix conflit weiweitoo 2018-07-21 01:43:10 +08:00
  • 3e60ec8e86 fix conflit weiweitoo 2018-07-21 00:15:43 +08:00
  • c4962e4655 git pull origin master weiweitoo 2018-07-20 22:12:48 +08:00
  • 65c65ef257 Fix calculation weiweitoo 2018-07-20 21:47:23 +08:00
  • 21c13d3e60 change billingcharge rate and tax rate table to double. Modify Customer calculation table weiweitoo 2018-07-20 21:16:36 +08:00
  • 73c36dd8e3 Add setting for taxrate and billingcharge weiweitoo 2018-07-20 18:47:19 +08:00
  • 026ac66257 added default field for select field Jack Goh 2018-07-20 18:08:39 +08:00
  • 32278095bf beautified user home page added order number and payment for field in user booking Jack Goh 2018-07-20 18:04:30 +08:00
  • 14a1090263 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug Jack Goh 2018-07-20 17:45:47 +08:00
  • 1497c50da5 changed payment voucher in supplier booking report to Ref No. added dynamic marking to supplier booking Jack Goh 2018-07-20 17:45:39 +08:00
  • d3a995c6b5 Merge branch 'frontend/making-every-user-page-responsive' into 'master' Jack Goh 2018-07-20 09:44:31 +00:00
  • 1cccefdb8a Discussion Fixed Mouhamed Lamine 2018-07-20 17:42:27 +08:00
  • 4bb40e3643 display china beneficiary information in all order detail weiweitoo 2018-07-20 17:20:02 +08:00
  • 20cc501f0e make beneficiary nullable Jack Goh 2018-07-20 15:08:48 +08:00
  • b971fc79ce added a option to let admin choose to use customer's beneficiary in supplier report Jack Goh 2018-07-20 14:54:52 +08:00
  • 5814c999d6 updated update rate input to be wider Jack Goh 2018-07-20 11:18:05 +08:00
  • e2cf3fecdd fix term1 no service charge fix navbar extra </li> Jack Goh 2018-07-20 11:12:20 +08:00
  • aea6323a66 fix other loading button not working Jack Goh 2018-07-20 10:59:32 +08:00
  • f6c0d6aab3 Added navigation notice in user home page Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug Jack Goh 2018-07-20 10:55:55 +08:00
  • a18f00c29f added production env sample Jack Goh 2018-07-20 10:26:18 +08:00