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

  • 544d414dee remove destroy function for bookingsupplier Jack Goh 2018-06-27 10:30:56 +08:00
  • b7f258f6a9 refactor BookingsupplierController fix booking supplier model updated fields for bookg supplier frontend Jack Goh 2018-06-27 10:30:01 +08:00
  • 5f053577df removed viewCustomerBookingDetails, it was done in bookingController Jack Goh 2018-06-27 10:12:35 +08:00
  • f078be408d fix migration errors Jack Goh 2018-06-27 10:09:06 +08:00
  • 299597ed16 update book supplier routes to admin routes Jack Goh 2018-06-27 09:58:09 +08:00
  • fdb474ccc7 fix conflict booking controller Nazri Hamzah 2018-06-27 09:58:04 +08:00
  • d362d947a3 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into nazri/userbankslip Jack Goh 2018-06-27 09:56:35 +08:00
  • c59aac1e4d Merge branch 'feature/admin-home-frontend' into 'master' Jack Goh 2018-06-27 01:36:22 +00:00
  • 2b4f1c6ddc rge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend Jack Goh 2018-06-27 09:29:35 +08:00
  • b802a91e18 Merge branch 'too/validatefilesize' into 'master' Jack Goh 2018-06-26 14:32:18 +00:00
  • 819da14684 revert back changes during debug Too 2018-06-26 22:24:47 +08:00
  • 436b284a3b Add file size checking. Rename bankslip_url to china_bank_slip_path in chinabankslip table Too 2018-06-26 22:23:10 +08:00
  • fdcaa31ffe Add upload file maxsize checking in booking controller Too 2018-06-26 21:39:24 +08:00
  • 2ed9f51ffd update top nav only admin can see Jack Goh 2018-06-26 18:30:41 +08:00
  • a17a692549 fix conflict Nazri Hamzah 2018-06-26 18:23:00 +08:00
  • 1f91cddda5 show top navigation only if user already login Jack Goh 2018-06-26 18:21:40 +08:00
  • acfd8eeb48 supplier booking (multiple booking removed) Nazri Hamzah 2018-06-26 18:17:38 +08:00
  • e1c931efed Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend Jack Goh 2018-06-26 18:09:27 +08:00
  • f108d7ee51 updated axios booking supplier form Jack Goh 2018-06-26 18:09:11 +08:00
  • 21338401c4 update supplierbooking frontend Jack Goh 2018-06-26 17:56:51 +08:00
  • f262830b1b Merge branch 'arief/admin-settings-content' into 'master' Jack Goh 2018-06-26 09:42:24 +00:00
  • fd03f5b248 updated approvebankslip booking not found updated update status upon userbankslip approved updated update status upon userbankslip rejected updated supplier index to display value and label for input select updated supplierBooking frontend completed booking accept and reject integration Jack Goh 2018-06-26 17:40:44 +08:00
  • 045c137dab update dialog name Mohd Arief 2018-06-26 17:28:22 +08:00
  • 2bf0df8b62 Merge branch 'arief/admin-setting-frontend' into 'master' Jack Goh 2018-06-26 09:08:15 +00:00
  • c8ff54f79a completed the setting content Mohd Arief 2018-06-26 16:55:31 +08:00
  • 2023050218 fix conflict Jack Goh 2018-06-26 14:44:48 +08:00
  • 66b0c14f5e Merge branch 'feature/admin-home-frontend' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend Jack Goh 2018-06-26 14:43:53 +08:00
  • ee59dc69d5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend Jack Goh 2018-06-26 14:41:45 +08:00
  • 5366353484 updated loading button param Jack Goh 2018-06-26 14:41:37 +08:00
  • 41a265e1a0 Merge branch 'too/ETA' into 'master' Jack Goh 2018-06-26 06:32:48 +00:00
  • 366f91352b Merge branch 'too/timelimit' into 'master' Jack Goh 2018-06-26 06:31:53 +00:00
  • dec9ba9405 fix typo add_eta_ser_bank_slip_table. remove eta from bookingcontroller Too 2018-06-26 12:28:17 +08:00
  • 852c64f35b completed display user bankslip in verification frontend Jack Goh 2018-06-26 12:27:09 +08:00
  • a498d370cf remove eta from booking Too 2018-06-26 12:21:53 +08:00
  • 428660a91d Merge branch 'too/ETA' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/ETA Too 2018-06-26 12:19:52 +08:00
  • c6ef6219a3 fix conflit Too 2018-06-26 12:19:08 +08:00
  • 0a6bd2c405 Add eta Too 2018-06-26 12:17:12 +08:00
  • ae85886365 updated user bankslip path in verification frontend Jack Goh 2018-06-26 12:12:02 +08:00
  • 9fff113250 updated dockerfile to add storage symlink Jack Goh 2018-06-26 12:08:43 +08:00
  • 20923d8f4a updated upload path Jack Goh 2018-06-26 12:07:27 +08:00
  • f31f39caec Add seeder and test for setting_credit Too 2018-06-26 11:47:48 +08:00
  • ec6db69373 Add ETA for booking table Too 2018-06-26 11:28:53 +08:00
  • 6f510c93cc solved merge conflict Mohd Arief 2018-06-26 10:40:35 +08:00
  • 3a7edc8401 update admin setting Mohd Arief 2018-06-26 10:30:57 +08:00
  • 3129da5df4 get_time_limit Too 2018-06-25 18:16:20 +08:00
  • 89f5e34aa8 update booking status on stage 2 Jack Goh 2018-06-25 17:52:41 +08:00
  • ffe1023bba added credit limit seeder, it causes error when creating booking Jack Goh 2018-06-25 17:48:51 +08:00
  • 62d0d83cb6 attempt to fetch user bankslip Jack Goh 2018-06-25 17:34:34 +08:00
  • a3d8eff9e0 Merge branch 'feature/admin-home-frontend' into 'master' Jack Goh 2018-06-25 08:57:41 +00:00
  • 1683f5bed5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend Jack Goh 2018-06-25 16:57:20 +08:00
  • 069883deeb complete the admin setting navbar Mohd Arief 2018-06-25 16:57:18 +08:00
  • b715663d47 updated adminshow function Jack Goh 2018-06-25 16:56:36 +08:00
  • 2c6128c564 changed admin status default to 1 added show one booking for admin added booking details for verification page Jack Goh 2018-06-25 16:41:31 +08:00
  • 0db893d07b Merge branch 'too/creditlimit' into 'master' Jack Goh 2018-06-25 08:32:22 +00:00
  • 9aea239c52 add handle for exceed credit limit Too 2018-06-25 16:03:24 +08:00
  • 1e7f076335 updated booking status on upload user bankslip revert back the correct routes for user update user path names Jack Goh 2018-06-25 15:45:02 +08:00
  • cf894dd9b7 updated basemiddleware import path revertback jwtauth provider too/gitlabciTest Jack Goh 2018-06-23 01:32:53 +08:00
  • 3f8419e53a updated provider Jack Goh 2018-06-23 01:23:21 +08:00
  • b01c7ad9ce removed publish jwtauth Jack Goh 2018-06-23 01:15:29 +08:00
  • e74ce96faf added few other composer command to clear class map Jack Goh 2018-06-23 01:11:06 +08:00
  • dd98bc912b added dumpautoload Jack Goh 2018-06-23 01:04:29 +08:00
  • 3b24a31816 removed some unsed apt-get install package removed some docker php ext updated install composer to bin path Jack Goh 2018-06-23 00:58:52 +08:00
  • 08b69f8379 updated php version to match our docker version Jack Goh 2018-06-23 00:55:53 +08:00
  • feae2c164b added composer update on gitlabci Jack Goh 2018-06-23 00:53:16 +08:00
  • bf40262994 added admin booking list controller Jack Goh 2018-06-23 00:40:50 +08:00
  • b8883d5a9e remove wrong symbol inside bash command Too 2018-06-23 00:39:19 +08:00
  • 3f3df93259 add Tymon\JWTAuth\Providers\LaravelServiceProvider::class Too 2018-06-23 00:32:58 +08:00
  • 2c14410a8f add publish bash command for jwt-auth Too 2018-06-23 00:25:10 +08:00
  • 37766083fa config some jwt stuff Too 2018-06-23 00:16:26 +08:00
  • 19d53139ac change jwt-auth version to dev-develop Too 2018-06-23 00:12:00 +08:00
  • a46dbc9d17 composer update and install Too 2018-06-23 00:00:42 +08:00
  • 76b0667250 clean reset setting for gitlab ci Too 2018-06-22 23:49:04 +08:00
  • dfc896debb generate jwt key Too 2018-06-22 23:22:57 +08:00
  • ef989ea1ac config jwt Too 2018-06-22 23:13:54 +08:00
  • eba8171588 revert back previous changes. Add tymon to config/app.php Too 2018-06-22 22:52:06 +08:00
  • 9485f02b63 fix kernel.php for basemiddleware Too 2018-06-22 22:41:47 +08:00
  • 52cbf9a0bb after composer update Too 2018-06-22 22:32:40 +08:00
  • 30b72fe2cb uncomment failed test Too 2018-06-22 22:18:06 +08:00
  • 0a0d8e1046 revert changes on docker Too 2018-06-22 22:06:09 +08:00
  • 4d46288fff Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange into too/gitlabci sengweitoo 2018-06-22 21:26:09 +08:00
  • 87778241eb fix .env.testing sengweitoo 2018-06-22 21:14:31 +08:00
  • c0e722bca8 add .env.testing sengweitoo 2018-06-22 17:35:26 +08:00
  • 1bad5dbd8e Small Updates to Package.Json Mouhamed Lamine 2018-06-22 16:53:53 +08:00
  • 620e496f0e update route.js Mohd Arief 2018-06-22 16:53:14 +08:00
  • b5862e4c4a add db_port sengweitoo 2018-06-22 16:50:02 +08:00
  • 3281aeb43c add dbhost sengweitoo 2018-06-22 16:35:18 +08:00
  • 72f9aee7c8 solved conflict Mohd Arief 2018-06-22 16:31:56 +08:00
  • a72485b6db remove php artisan optimize sengweitoo 2018-06-22 16:20:34 +08:00
  • 496ce622dd rename .env.testing to .env-example sengweitoo 2018-06-22 16:14:30 +08:00
  • 4acc51a9c9 remove mcrypt since deprecated in 7.1 and removed in 7.2 sengweitoo 2018-06-22 16:07:55 +08:00
  • e2b3d133f6 change php version in gitlab-ci.yml sengweitoo 2018-06-22 16:02:17 +08:00
  • cc95347a40 install php7.2 sengweitoo 2018-06-22 15:57:22 +08:00
  • 0447481f33 install php7.2-cli Too 2018-06-22 15:32:11 +08:00
  • b5e0059874 manually install php7.2 Too 2018-06-22 15:23:08 +08:00
  • fad9bcf115 Use jack's version setting Too 2018-06-22 15:14:11 +08:00
  • 518647ed08 create dummy user at before_Script Too 2018-06-22 15:07:36 +08:00
  • 0fa439c185 change rootpassword in gitlab-ci.yml Too 2018-06-22 15:02:58 +08:00
  • 2543b963f0 change db in gitlab-ci.yml Too 2018-06-22 14:58:20 +08:00
  • d998d49171 modify db variable Too 2018-06-22 14:47:55 +08:00
  • a1becfab70 edit gitlab-ci.sh and gitlab-ci.yml Too 2018-06-22 14:41:47 +08:00