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

  • 0afeb0d1ea Merge branch 'feature/booking-pagination' into 'master' Jack Goh 2018-07-02 08:52:34 +00:00
  • 3e2170277a fix conflict Mohd Arief 2018-07-02 16:46:52 +08:00
  • d3f8d1b190 Merge branch 'frontend/booking-confirm-error' into 'master' Jack Goh 2018-07-02 07:35:33 +00:00
  • 09181b22ee completed the pagination function for user booking list Mohd Arief 2018-07-02 15:27:47 +08:00
  • 8fa5faec90 Merge conflict fix Mouhamed Lamine 2018-07-02 15:19:21 +08:00
  • 27877e8a65 Merge conflict fix Mouhamed Lamine 2018-07-02 15:13:32 +08:00
  • b26c6a68da Merge conflict fix Mouhamed Lamine 2018-07-02 14:58:27 +08:00
  • fede18cc90 add marking Too 2018-07-02 11:16:15 +08:00
  • c5b8103142 add marking in form Too 2018-07-02 11:02:18 +08:00
  • 2c2c3928e9 remove username from controller and migration Too 2018-07-02 10:31:42 +08:00
  • e5b63e2c98 fix typo at confirm_password Too 2018-07-02 09:59:53 +08:00
  • c47c507963 Update DatabaseSeeder.php Mouhamed Lamine Bah 2018-07-02 01:56:04 +00:00
  • c1d7289564 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage Too 2018-07-02 09:55:37 +08:00
  • d232fad601 remove username and icon Too 2018-07-02 09:50:03 +08:00
  • 6262054880 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/supplier-report Jack Goh 2018-07-01 20:50:27 +08:00
  • 2ae8ce7384 added canva2image package upgraded webpack Jack Goh 2018-07-01 20:49:04 +08:00
  • e23d2ef346 Merge branch 'nazri/show-current-rate-api' into 'master' Jack Goh 2018-07-01 08:53:11 +00:00
  • b9b19f292d Show marking message when empty input Too 2018-07-01 01:18:07 +08:00
  • 5237f4d94c git pull origin master Too 2018-07-01 01:00:11 +08:00
  • 5151f9163f Register page, add marking input. Register page, change text to icon. Register page, add password visibility toggle function. Too 2018-07-01 00:56:21 +08:00
  • 7a10f39e70 fix conflict Nazri Hamzah 2018-06-30 16:16:08 +08:00
  • 94b664bb45 show current rate api Nazri Hamzah 2018-06-30 16:13:26 +08:00
  • 278d543bcf Merge branch 'integration/bookinginfo-allpage' into 'master' Jack Goh 2018-06-30 02:52:06 +00:00
  • 9d3e08889c fix booking status on upload invoice Jack Goh 2018-06-30 10:51:05 +08:00
  • 43809bc478 fix wrong update status on upload po fix validation message for upload china bankslip removed get po api on upload invoice Jack Goh 2018-06-30 10:47:35 +08:00
  • d827b0a1ba fix supplier booking required field validation updated header text for transfer page Jack Goh 2018-06-30 10:33:40 +08:00
  • eec356f22d fix wrong timeout fix seeder info to newer info Jack Goh 2018-06-30 10:29:03 +08:00
  • b36c133818 fix loading forever on upload china bankslip Jack Goh 2018-06-30 10:00:41 +08:00
  • d2fd140f74 fixed loading forever on upload chinabankslip Jack Goh 2018-06-30 09:55:54 +08:00
  • ca74cfae23 updated admin booking show function with user, china, po, invoice slip removed one step from admin tracking integrated admin booking complete changed admin complete order component name Jack Goh 2018-06-29 19:18:54 +08:00
  • d80f048f5a added po and invoice into show booking return integrated complete page frontend integrated po page frontend integrated po complete page frontend removed ETA for transfer page frontend Jack Goh 2018-06-29 19:01:15 +08:00
  • 30a210324e booking confirm error Mouhamed Lamine 2018-06-29 18:21:08 +08:00
  • b212858eba commit before pull Mouhamed Lamine 2018-06-29 18:10:12 +08:00
  • 0a9dd6a338 added reject reason on user slip reject Jack Goh 2018-06-29 18:08:19 +08:00
  • 3d05dbb755 added chinabankslip return on show booking query updated upload po page with booking info, china bankslip and user bankslip Jack Goh 2018-06-29 17:40:28 +08:00
  • 7aba4e2b05 fix edit supplier booking fix done supplier booking report button loading Jack Goh 2018-06-29 15:48:26 +08:00
  • 9d0aadb5c3 added reject reason response for getting booking updated bankslip reject screen for user Jack Goh 2018-06-29 15:37:44 +08:00
  • 0544e23ee6 fix timeout for rejected user bankslip fix is_rejected able to accept again Jack Goh 2018-06-29 15:21:27 +08:00
  • 9f9f72dbe5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking-pagination Mohd Arief 2018-06-29 12:09:44 +08:00
  • 6c5dd60654 update the booking controller Mohd Arief 2018-06-29 12:09:01 +08:00
  • 691bd1c91a updated reject booking status added reject reason on verification page Jack Goh 2018-06-29 11:05:27 +08:00
  • 71e6c3358f added reject reason dialog Jack Goh 2018-06-29 10:59:41 +08:00
  • 83d630de1e commit before pull Mouhamed Lamine 2018-06-29 10:57:57 +08:00
  • 79cad74ee0 Merge branch 'nazri/admin-frontend-setting-fix' into 'master' Jack Goh 2018-06-29 01:32:00 +00:00
  • d1d5aaf694 fixed bug admin setting frontend Nazri Hamzah 2018-06-29 00:56:00 +08:00
  • fe07b7cd64 first commit Nazri Hamzah 2018-06-28 22:26:06 +08:00
  • cabf43cfdc add bookingcontroller@report, still in testing too/supplierbookingreport Too 2018-06-28 20:52:47 +08:00
  • 30816ba449 Commit before merge Mouhamed Lamine 2018-06-28 16:15:35 +08:00
  • 722dbacd00 updated home frontend to cope with pagination Jack Goh 2018-06-28 16:15:10 +08:00
  • e36c2a52af new branch Too 2018-06-28 16:14:21 +08:00
  • 63dce18675 Fix some error due to update migration Too 2018-06-28 16:11:49 +08:00
  • f2784c47ed Merge branch 'integration/upload-invoice' into 'master' Jack Goh 2018-06-28 08:01:07 +00:00
  • 536c67bbc6 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into integration/upload-invoice Jack Goh 2018-06-28 15:55:58 +08:00
  • 265887f0d7 Merge branch 'integration/confirmation-n-transfer' into 'master' Jack Goh 2018-06-28 07:51:03 +00:00
  • 385623f6a2 update status upon user upload purchase order fix admin complete page not found fixed admin completed page tracking Jack Goh 2018-06-28 15:49:46 +08:00
  • 651f762237 update confirmation and transfer page - update booking controller Mohd Arief 2018-06-28 15:40:27 +08:00
  • 6d2c83d912 temporary added default amount value fixed no file detected bug Jack Goh 2018-06-28 15:38:15 +08:00
  • 4e448afc60 added relationship for invoice and booking added confirm invoice feature (after user upload the image) Jack Goh 2018-06-28 15:22:25 +08:00
  • 105b61eab3 fixed retrive po path in booking controller updated chinabankslip error message to be more clear fixed supplier booking report loading button updated upload invoice frontend to show user po image Jack Goh 2018-06-28 15:07:41 +08:00
  • 0cf92b9936 added confirmSupplier booking removed droptable due to database contraints issue fixed rename booking foreight key in po table issue added supplierstable seeder updated supplierreport frontend updated upload po frontend Jack Goh 2018-06-28 14:46:30 +08:00
  • a19415357b Merge branch 'too/bookingpagination' into 'master' Jack Goh 2018-06-28 06:17:26 +00:00
  • 4ba48abf1a Merge branch 'master' into 'too/bookingpagination' Jack Goh 2018-06-28 06:17:17 +00:00
  • 4f39b268ab Merge branch 'too/testsettingsuppliers' into 'master' Jack Goh 2018-06-28 06:13:26 +00:00
  • 81a5a46d36 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/bookingpagination Too 2018-06-28 12:46:42 +08:00
  • 7fc0696099 fix conflit Too 2018-06-28 12:45:02 +08:00
  • d054703170 fix wrong status for user after book supplier Jack Goh 2018-06-28 12:13:09 +08:00
  • ee7fe28f74 added new status for user tracking nav bar fixed top nav for admin only Jack Goh 2018-06-28 12:08:12 +08:00
  • fd5883c747 Merge branch 'integration/upload-invoice' into 'master' Jack Goh 2018-06-28 03:41:54 +00:00
  • 2ddd9704bd Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into integration/upload-invoice Jack Goh 2018-06-28 11:41:39 +08:00
  • e8b22841bd Merge branch 'arief/admin-top-nav-content' into 'master' Jack Goh 2018-06-28 02:46:31 +00:00
  • 0e212f2751 added waiting po page Jack Goh 2018-06-28 10:33:21 +08:00
  • 1d740a08ea added waiting invoice and po frontend Jack Goh 2018-06-28 10:33:00 +08:00
  • 7996450ab1 change rate to data variable Mohd Arief 2018-06-28 10:31:49 +08:00
  • 2b4ddadfcb rename book_id in po table to booking_id to perform ORM relantionship added relationship between booking and po updated settings shows for different role added function to display po for admin Jack Goh 2018-06-28 10:06:26 +08:00
  • 24f6273028 added booking pagination. (havent write test) Too 2018-06-28 00:06:23 +08:00
  • 06974f039b revert back changes during debug Too 2018-06-27 23:37:29 +08:00
  • 206a637a88 Add test for setting supplier Too 2018-06-27 23:34:35 +08:00
  • 9432cdaaad updated upload invoice UI Jack Goh 2018-06-27 18:28:58 +08:00
  • 534ad41fd3 fix conflict Mohd Arief 2018-06-27 17:25:11 +08:00
  • 540d8cfc15 Merge branch 'integration/upload-cnbankslip' into 'master' Jack Goh 2018-06-27 09:15:29 +00:00
  • cc86e2272b updated get booking status for admin Jack Goh 2018-06-27 17:15:04 +08:00
  • 32b0eda067 fix merge conflict Mohd Arief 2018-06-27 16:54:40 +08:00
  • a5ea991a8d changed routes name for update china bankslip Jack Goh 2018-06-27 16:54:02 +08:00
  • addd89ceb8 added relantionship in chinabankslip model added update chinabankslip feature Jack Goh 2018-06-27 16:37:48 +08:00
  • 73000a9818 update route for admin top nav content Mohd Arief 2018-06-27 16:33:41 +08:00
  • cea2857d0f added booking foreign key to china bankslip updated upload china bankslip routes Jack Goh 2018-06-27 16:16:48 +08:00
  • edc3dbaa35 fixed upload chinabankslip removed unused code in bookingcontroller updated upload chinabankslip frontend moved some routes into authenticated route list Jack Goh 2018-06-27 16:01:52 +08:00
  • 631472be50 comeplted upload china slip frontend Jack Goh 2018-06-27 15:47:47 +08:00
  • 5e62b3e90d complete the top nav content Mohd Arief 2018-06-27 15:42:16 +08:00
  • 781c78b942 Merge branch 'integration/book-supplier' into 'master' Jack Goh 2018-06-27 07:32:36 +00:00
  • 390862a8be removed multiple booking on supplier booking controller WIP supplier booking report in image file WIP edit report page WIP upload chinabankslip Jack Goh 2018-06-27 15:32:01 +08:00
  • 3ce9fdf9db Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into integration/book-supplier Jack Goh 2018-06-27 14:24:48 +08:00
  • aa528cfa39 Merge branch 'feature/admin-home-frontend' into 'master' Jack Goh 2018-06-27 06:23:36 +00:00
  • 298da7d24b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend Jack Goh 2018-06-27 14:23:19 +08:00
  • 6e8c81f285 added logic if supplierbooking already exist prevent user from creating Jack Goh 2018-06-27 14:21:55 +08:00
  • fb6f3e398e update rate function done Mohd Arief 2018-06-27 12:34:19 +08:00
  • d1ce576109 changed model from bookingsupplier to supplier booking fix supplier booking controller make payment method nullable for supplier booking Jack Goh 2018-06-27 12:01:49 +08:00
  • 5dfc6ddeb2 Merge branch 'nazri/userbankslip' into 'master' Jack Goh 2018-06-27 02:55:44 +00:00
  • 5e63be02a9 erge branch 'nazri/userbankslip' of gitlab.com:CIEFWorldwideSdnBhd/exchange into nazri/userbankslip Jack Goh 2018-06-27 10:46:53 +08:00
  • b3cf440c4b updated supplier booking controller Jack Goh 2018-06-27 10:46:15 +08:00