cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 04:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
175 Commits 33 Branches 0 Tags
too/gitlabciTest
Commit Graph

175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Goh cf894dd9b7 updated basemiddleware import path 
revertback jwtauth provider
 2018-06-23 01:32:53 +08:00
Jack Goh 3f8419e53a updated provider 2018-06-23 01:23:21 +08:00
Jack Goh b01c7ad9ce removed publish jwtauth 2018-06-23 01:15:29 +08:00
Jack Goh e74ce96faf added few other composer command to clear class map 2018-06-23 01:11:06 +08:00
Jack Goh dd98bc912b added dumpautoload 2018-06-23 01:04:29 +08:00
Jack Goh 3b24a31816 removed some unsed apt-get install package 
removed some docker php ext
updated install composer to bin path
 2018-06-23 00:58:52 +08:00
Jack Goh 08b69f8379 updated php version to match our docker version 2018-06-23 00:55:53 +08:00
Jack Goh feae2c164b added composer update on gitlabci 2018-06-23 00:53:16 +08:00
Too b8883d5a9e remove wrong symbol inside bash command 2018-06-23 00:39:19 +08:00
Too 3f3df93259 add Tymon\JWTAuth\Providers\LaravelServiceProvider::class 2018-06-23 00:32:58 +08:00
Too 2c14410a8f add publish bash command for jwt-auth 2018-06-23 00:25:10 +08:00
Too 37766083fa config some jwt stuff 2018-06-23 00:16:26 +08:00
Too 19d53139ac change jwt-auth version to dev-develop 2018-06-23 00:12:00 +08:00
Too a46dbc9d17 composer update and install 2018-06-23 00:00:42 +08:00
Too 76b0667250 clean reset setting for gitlab ci 2018-06-22 23:49:04 +08:00
Jack Goh 5a4c4b14ee updated create booking status to 2 2018-06-21 10:58:47 +08:00
Jack Goh 6bbf271a36 added status tracking in booking 2018-06-21 10:58:16 +08:00
Jack Goh d06b8ac359 added status column to booking table 2018-06-21 10:49:45 +08:00
Jack Goh a650879977 completed list booking 
TBD implement status feature
 2018-06-21 10:43:52 +08:00
Jack Goh 7eb8c7bafc create booking with rate 2018-06-20 22:55:29 +08:00
Jack Goh 385372e3dd added rate to booking table 2018-06-20 22:54:31 +08:00
Jack Goh a30fd2a0b1 added booking list controller 2018-06-20 22:21:45 +08:00
Jack Goh bc637adcab Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange 
# Conflicts:
#	routes/api.php
 2018-06-20 18:41:31 +08:00
Jack Goh 498fafd502 added booking lists controller and routes 2018-06-20 18:39:55 +08:00
Jack Goh c3558eb39b Merge branch 'too/registerwithmarking' into 'master' 
Too/registerwithmarking

See merge request CIEFWorldwideSdnBhd/exchange!23
 2018-06-20 09:37:21 +00:00
Too 93d866f432 Revert back changes during debug. Remove Auto login after register. 2018-06-20 17:30:53 +08:00
Too e6d58004bc fix error response code 2018-06-20 17:04:50 +08:00
Too e3c104f902 Done checking marking before register user 2018-06-20 16:57:47 +08:00
Too 3959c8c8b2 pull from master 2018-06-20 15:56:08 +08:00
Too 6e51b18058 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerwithmarking 2018-06-20 15:54:36 +08:00
Too a2dad37758 Check marking before create user 2018-06-20 15:43:04 +08:00
Jack Goh 40d6eb7ead Merge branch 'too/marking' into 'master' 
Too/marking

See merge request CIEFWorldwideSdnBhd/exchange!22
 2018-06-20 00:50:07 +00:00
Jack Goh 01f6c78619 Merge branch 'too/adminmiddleware' into 'master' 
Add admin auth middleware

See merge request CIEFWorldwideSdnBhd/exchange!20
 2018-06-20 00:48:46 +00:00
Too b1843c0b9b Revert back unnessary changes during debug 2018-06-20 02:04:05 +08:00
Too 3f2d9fbfb8 Add controller and table for marking 2018-06-20 00:38:32 +08:00
Too 95f4f25dd3 Add test for settingcredit and rate 2018-06-19 18:56:31 +08:00
Jack Goh 118ce0f819 fix tracking status number 2018-06-19 17:36:39 +08:00
Jack Goh f9e94cc148 added loading for upload user bankinslip 2018-06-19 17:33:17 +08:00
Jack Goh 77f861472a updated dynamic switch pages on dummny table data 2018-06-19 17:10:34 +08:00
Too 1b39ee8bda Add admin auth middleware 2018-06-19 16:46:32 +08:00
Jack Goh 5cb3d6a33d Merge branch 'too/rejectuserbankslip' into 'master' 
Reject user bank slip with reason. Add migration for userbankslip.

See merge request CIEFWorldwideSdnBhd/exchange!18
 2018-06-19 06:21:38 +00:00
Too 6a025a6bac Fix conflit of variable name with master branch. 2018-06-19 13:32:09 +08:00
Too a019ae2616 Fix conflit 2018-06-19 02:52:21 +08:00
Too 64d8ffed7c Fix variable name 2018-06-19 00:15:28 +08:00
Jack Goh 7398ce73d6 updated timeout from 60 seconds to 10 minutes 2018-06-18 22:51:33 +08:00
Jack Goh 44563624ee Merge branch 'fix/booking-integration' into 'master' 
Fix/booking integration

See merge request CIEFWorldwideSdnBhd/exchange!19
 2018-06-18 14:49:29 +00:00
Jack Goh e7c63bb4e9 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/booking-integration 
# Conflicts:
#	app/Http/Controllers/BookingController.php
#	routes/api.php
 2018-06-18 22:42:16 +08:00
Jack Goh cc881cc5c7 added updatebankslip test 2018-06-18 22:39:15 +08:00
Jack Goh 4a4e147072 fix running routes:cache error 
fix UserBankSlip class not found
fix undefined book_id
added loading when confirm booking
added confirm booking success redirect with correct page
added error handling for upload user bankslip
completed upload user bankslip flow
 2018-06-18 22:37:33 +08:00
Too 012fef948e Reject user bank slip with reason. Add migration for userbankslip. 2018-06-18 18:57:27 +08:00