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

  • 6a892e093c fix validation at register page weiweitoo 2018-07-11 01:42:58 +08:00
  • edbd8887c5 fix bug for validation. Remove nullable for malaysia bank table weiweitoo 2018-07-11 01:39:35 +08:00
  • 0d687279e6 Merge branch 'too/markingsettingpage' into 'master' Jack Goh 2018-07-10 16:19:58 +00:00
  • 28a6f43b0a Showing Completed Orders To Admin Done Except Making Table Sortable Mouhamed Lamine 2018-07-10 18:08:59 +08:00
  • a35e4fd3c8 Showing Completed Orders To Admin Mouhamed Lamine 2018-07-10 15:32:22 +08:00
  • 97453bb084 add marking setting page and integrate it weiweitoo 2018-07-09 20:47:55 +08:00
  • 7b638766e4 Merge branch 'fix/marking' into 'master' Jack Goh 2018-07-08 03:55:44 +00:00
  • 766316572c fix seed contraints error Jack Goh 2018-07-08 11:50:36 +08:00
  • 30bd80fb6c Merge branch 'fix/marking' into 'master' Jack Goh 2018-07-08 02:59:04 +00:00
  • 72a4f6645f Added marking to admin home page Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/marking Jack Goh 2018-07-08 10:53:24 +08:00
  • b23502af45 Merge branch 'too/activebank' into 'master' Jack Goh 2018-07-08 02:44:59 +00:00
  • bb633916a2 revert back changes during debug Too 2018-07-08 01:57:19 +08:00
  • 538adc7366 added marking to bookings api changed hard coded marking in booking details to dynamic for frontend Jack Goh 2018-07-07 16:15:32 +08:00
  • 71e11fa034 added marking to admin booking index hide roles in user model hide user from booking model Jack Goh 2018-07-07 12:12:27 +08:00
  • 59fc234ea0 updated user has many booking to bookings added index booking with user marking added turncate marking when seeding added turncate settingmalaysiabank when seeding added marking to user seeder Jack Goh 2018-07-07 12:06:21 +08:00
  • 2a8f5c0b3c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/marking Jack Goh 2018-07-07 10:32:43 +08:00
  • 77a2168832 fix update bug at activebankcontroller when empty record Too 2018-07-07 01:57:30 +08:00
  • af1fe2f3d1 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/activebank Too 2018-07-07 01:53:10 +08:00
  • bddef7d16f make acc_no unique in malaysiabank and china bank. integrate active bank page. add seeder for beneficiares and active bank. add table setting_active_bank Too 2018-07-07 01:52:35 +08:00
  • 781f3db9f2 Merge branch 'too/malaysiabank' into 'master' Jack Goh 2018-07-06 06:13:18 +00:00
  • 3752de2347 Add setting malaysia bank seeder Too 2018-07-06 14:07:07 +08:00
  • 84fc15adce fix update and delete at settingmalaysiacontroller Too 2018-07-06 13:22:44 +08:00
  • 36917cbd60 add malaysia bank page and integrate it with backend Too 2018-07-06 13:12:18 +08:00
  • 38515c055b Add setting malaysia bank table and controller Too 2018-07-05 19:10:17 +08:00
  • 503e3aec5b added marking to user table added marking on registration Jack Goh 2018-07-05 17:56:49 +08:00
  • 9a257257fb Merge branch 'feature/credit-setting' into 'master' Jack Goh 2018-07-05 07:53:43 +00:00
  • 0180694d72 gitignored autoload_classmap removed setting-credit for post, delete and get one routes completed admin credit limit and time out update feature fixed drop down rate issue fixed the controller show and update issue Jack Goh 2018-07-05 15:47:19 +08:00
  • 577e3d95b7 Merge branch 'too/registerpage' into 'master' Jack Goh 2018-07-05 06:11:17 +00:00
  • b48f3c8b1d Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage Jack Goh 2018-07-05 14:07:37 +08:00
  • e3b4986f78 update pages fix/user-responsive-page Mohd Arief 2018-07-05 14:01:50 +08:00
  • 5dcf9e2469 Merge branch 'nazri/integrate-frontend-backend-for-update-rate' into 'master' Jack Goh 2018-07-05 05:45:29 +00:00
  • 098d9ba22d fix conflict Nazri Hamzah 2018-07-05 13:43:43 +08:00
  • 33ca8471c0 fix inline update rate dialog Nazri Hamzah 2018-07-05 13:39:28 +08:00
  • 07c4f9ed92 fixed register issue Jack Goh 2018-07-05 13:37:00 +08:00
  • d5c7597307 added back name field to user table fixed unable to login issue Jack Goh 2018-07-05 13:27:38 +08:00
  • 0485ae3e48 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/user-responsive-page Mohd Arief 2018-07-05 12:04:24 +08:00
  • b891f6432a update pages until processing transfer Mohd Arief 2018-07-05 12:02:19 +08:00
  • 560035be09 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage Jack Goh 2018-07-05 11:52:38 +08:00
  • 1793a2ac8d changed client to axios in supplier setting Jack Goh 2018-07-05 11:43:42 +08:00
  • 09f2dcf579 Merge branch 'too/chinabanksetting' into 'master' Jack Goh 2018-07-05 03:05:56 +00:00
  • 340381d0b3 half fix registration page Jack Goh 2018-07-05 10:09:30 +08:00
  • 41012cf4b9 Merge branch 'frontend/making-uploaded-images-responsive' into 'master' Jack Goh 2018-07-05 01:45:07 +00:00
  • c6ffc886f9 fix conflict Nazri Hamzah 2018-07-05 01:06:53 +08:00
  • e462ebb78b integrated frontend/backend for show/update rate Nazri Hamzah 2018-07-05 01:03:05 +08:00
  • 45c81597bd git pull origin master Too 2018-07-04 23:30:14 +08:00
  • 4959de9dd5 done integrate for cief bank setting page Too 2018-07-04 23:28:07 +08:00
  • cfa20eac16 Merge branch 'too/suppliersetting' into 'master' Jack Goh 2018-07-04 10:27:26 +00:00
  • 9805fd04d0 move axios configuration from external file to inline Too 2018-07-04 18:04:55 +08:00
  • ab3cba389d Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/suppliersetting Too 2018-07-04 17:31:21 +08:00
  • 42476f9b57 move vee-validate to index.js Too 2018-07-04 17:30:06 +08:00
  • aa7c665d9c add validation for supplier form Too 2018-07-04 17:27:44 +08:00
  • bfae59bf1e integrate edit feature Too 2018-07-04 16:30:34 +08:00
  • 0f9a9581fd Removing gitignore mess Mouhamed Lamine 2018-07-04 15:14:55 +08:00
  • 43306d8c36 Uploaded Images made responsive Mouhamed Lamine 2018-07-04 15:06:44 +08:00
  • 55455b89d7 integrate delete supplier Too 2018-07-04 14:35:42 +08:00
  • 080851675c integrate index in suplier page Too 2018-07-04 13:31:10 +08:00
  • 232baf76cd fix validation error Jack Goh 2018-07-04 12:01:32 +08:00
  • 54f6722472 fix npm issue added name validation to register controller fixed register frontend validator issue Jack Goh 2018-07-04 11:54:28 +08:00
  • d352cf8696 error Nazri Hamzah 2018-07-04 11:46:42 +08:00
  • 678197d40a fix conflit Too 2018-07-04 11:19:33 +08:00
  • 8798c83b97 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage Jack Goh 2018-07-04 11:17:44 +08:00
  • 7a0d11247d integrate add setting supplier Too 2018-07-04 11:17:29 +08:00
  • 35dfa58a14 Merge branch 'fix/bug' into 'master' Jack Goh 2018-07-04 03:13:33 +00:00
  • 9ae80ed013 fix migration down database integrity contraints Jack Goh 2018-07-04 10:56:43 +08:00
  • d18deb2866 git pull origin master Too 2018-07-03 23:19:42 +08:00
  • fca8b7fccf reset from master Too 2018-07-03 23:17:29 +08:00
  • 29576dcc60 comment name column in oauthctroller Too 2018-07-03 23:08:34 +08:00
  • dae26ccb83 add validation of registeration form Too 2018-07-03 22:27:26 +08:00
  • 9badd33d81 commented out some undone feature navigation bar Jack Goh 2018-07-03 18:23:26 +08:00
  • b8fd5d08c4 Merge branch 'frontend/error-handling-for-axios-in-admin-booking-vues' into 'master' Jack Goh 2018-07-03 10:17:58 +00:00
  • 3d9e7054d7 Final changes Mouhamed Lamine 2018-07-03 18:14:45 +08:00
  • 6c1cd5500a added credit limit exceed check Jack Goh 2018-07-03 18:12:40 +08:00
  • 2bc7542e10 Merge branch 'feature/rate-integration' into 'master' Jack Goh 2018-07-03 09:36:59 +00:00
  • bac71e1980 fix typo for x2 rate Jack Goh 2018-07-03 17:13:14 +08:00
  • 6402d2cf28 updated dynamic rate for x2 Jack Goh 2018-07-03 17:12:08 +08:00
  • c902c8db82 hide rate id from model fixed DB not found in rate controller Jack Goh 2018-07-03 17:11:30 +08:00
  • 07950c8252 fix register duplicate user error response message Too 2018-07-03 17:03:26 +08:00
  • b731226f18 Merge conflict saved Mouhamed Lamine 2018-07-03 16:53:34 +08:00
  • 27c5c14373 GitIgnored my package-lock.json Mouhamed Lamine 2018-07-03 16:43:17 +08:00
  • e073bfdba8 GitIgnored my package-lock.json Mouhamed Lamine 2018-07-03 16:36:55 +08:00
  • 3aab1506c4 Merge branch 'feature/booking-refresh-button' into 'master' Jack Goh 2018-07-03 08:17:02 +00:00
  • 63e26622bd added the refresh button Mohd Arief 2018-07-03 16:11:50 +08:00
  • d082918d37 GitIgnored my package-lock.json Mouhamed Lamine 2018-07-03 15:56:29 +08:00
  • 884b8b4099 Error handling done for the whole process Mouhamed Lamine 2018-07-03 15:20:30 +08:00
  • c3d7aa800f Merge branch 'feature/supplier-report' into 'master' Jack Goh 2018-07-03 06:33:40 +00:00
  • 4b3957704f fix upload invoice page, user_po_path exist issue Jack Goh 2018-07-03 12:57:29 +08:00
  • e32e908b8f updated banklogo at supplier report Jack Goh 2018-07-03 12:39:15 +08:00
  • 457f0de312 changed booking supplier date format Jack Goh 2018-07-03 11:32:39 +08:00
  • 4152b58ef4 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange into frontend/error-handling-for-axios-in-admin-booking-vues Mouhamed Lamine 2018-07-03 11:25:57 +08:00
  • 699827184d Resolved merge conflict Mouhamed Lamine 2018-07-03 11:25:42 +08:00
  • d46de18d00 Merge branch 'feature/booking-pagination' into 'master' Jack Goh 2018-07-03 02:54:09 +00:00
  • 9a8c1eee9f add the bank account details Mohd Arief 2018-07-03 10:51:40 +08:00
  • 48f9a56230 Commit before pull Mouhamed Lamine 2018-07-03 10:43:29 +08:00
  • 4da5cfd7be added relationship between marking and user added billing_amount and salestax_amount to supplierbooking table Jack Goh 2018-07-03 09:58:06 +08:00
  • 2726d8c71d git pull origin master Too 2018-07-02 23:25:49 +08:00
  • c964e702a3 fix register page submit button. Check duplicated user register. Fix typo in register page.Add Marking seeder. Too 2018-07-02 22:43:46 +08:00
  • 647c42a30e renamed booking supplier book_id to booking_id updated bookingSupplier to supplierBooking updated get supplier api in supplier report added download button to download report Jack Goh 2018-07-02 21:26:12 +08:00
  • bd55d385f7 successfully integrated canvas to vuejs Jack Goh 2018-07-02 18:26:02 +08:00
  • da962f77ce Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/supplier-report Jack Goh 2018-07-02 18:04:49 +08:00
  • bb2373abb5 make welcome page to be login page Jack Goh 2018-07-02 18:04:29 +08:00