cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-24 23:04:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
910 Commits 33 Branches 0 Tags
Lingges/Fix/uploadPictureInStep2User
Commit Graph

305 Commits

Author SHA1 Message Date
Too 0a6bd2c405 Add eta 2018-06-26 12:17:12 +08:00
Jack Goh 20923d8f4a updated upload path 2018-06-26 12:07:27 +08:00
Too 3129da5df4 get_time_limit 2018-06-25 18:16:20 +08:00
Jack Goh 1683f5bed5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend 
# Conflicts:
#	app/Http/Controllers/BookingController.php
 2018-06-25 16:57:20 +08:00
Jack Goh b715663d47 updated adminshow function 2018-06-25 16:56:36 +08:00
Jack Goh 2c6128c564 changed admin status default to 1 
added show one booking for admin
added booking details for verification page
 2018-06-25 16:41:31 +08:00
Too 9aea239c52 add handle for exceed credit limit 2018-06-25 16:03:24 +08:00
Jack Goh 1e7f076335 updated booking status on upload user bankslip 
revert back the correct routes for user
update user path names
 2018-06-25 15:45:02 +08:00
Jack Goh bf40262994 added admin booking list controller 2018-06-23 00:40:50 +08:00
Too ef989ea1ac config jwt 2018-06-22 23:13:54 +08:00
Too eba8171588 revert back previous changes. Add tymon to config/app.php 2018-06-22 22:52:06 +08:00
Too 9485f02b63 fix kernel.php for basemiddleware 2018-06-22 22:41:47 +08:00
Too 52cbf9a0bb after composer update 2018-06-22 22:32:40 +08:00
Too 30b72fe2cb uncomment failed test 2018-06-22 22:18:06 +08:00
sengweitoo 4d46288fff Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange into too/gitlabci 2018-06-22 21:26:09 +08:00
Jack Goh b9c0bc53fd added booking table to admin home 
integrate booking list to admin home
 2018-06-21 17:35:08 +08:00
Jack Goh 9acf2a773e fix admin routes on vuejs 2018-06-21 16:35:09 +08:00
Too f05dc41d45 temporary uncomment bookingcontroller@store to pass test 2018-06-21 16:24:18 +08:00
Jack Goh aaf0decd97 removed amount from uploadpo 
added confirmpo after user upload their po
completed uploadpo integration
 2018-06-21 15:48:24 +08:00
Jack Goh de7161369c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into bug/bookinglist-timeout-countdown 2018-06-21 14:48:48 +08:00
Too 453852c7ea rename image_url to image_path in user_bank_slip,invoice,purchase_order 2018-06-21 14:36:33 +08:00
Jack Goh 3c263b56ea fix 404 not found for upload user bankslip 
added display term on booking table
 2018-06-21 14:31:53 +08:00
Too de45782ae3 fix conflit with master 2018-06-21 13:26:18 +08:00
Too db7e30ea95 add upload invoice and test 2018-06-21 13:15:36 +08:00
Jack Goh 23b024c2fb fixed status description not found 
removed timeout on home page
added timeout handling in upload user bankslip
 2018-06-21 12:45:05 +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 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
Too 93d866f432 Revert back changes during debug. Remove Auto login after register. 2018-06-20 17:30:53 +08:00
Nazri Hamzah 3245497378 fix conflict 2018-06-20 17:19:58 +08:00
Nazri Hamzah a7970e2d72 fix conflict 2018-06-20 17:17:22 +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 a2dad37758 Check marking before create user 2018-06-20 15:43:04 +08:00
Nazri Hamzah 32bf2f4375 fix discussion 2 2018-06-20 12:15:33 +08: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
Nazri Hamzah a5633b7754 supplier booking 2018-06-19 17:26:37 +08: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 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