Commit Graph

14 Commits

Author SHA1 Message Date
Jack Goh c59aac1e4d Merge branch 'feature/admin-home-frontend' into 'master'
Feature/admin home frontend

See merge request CIEFWorldwideSdnBhd/exchange!34
2018-06-27 01:36:22 +00:00
Too fdcaa31ffe Add upload file maxsize checking in booking controller 2018-06-26 21:39:24 +08:00
Jack Goh 2023050218 fix conflict 2018-06-26 14:44:48 +08:00
Jack Goh 66b0c14f5e Merge branch 'feature/admin-home-frontend' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend
# Conflicts:
#	app/Http/Controllers/BookingController.php
#	database/seeds/DatabaseSeeder.php
#	resources/assets/js/pages/admin/booking/verification.vue
2018-06-26 14:43:53 +08:00
Too f31f39caec Add seeder and test for setting_credit 2018-06-26 11:47:48 +08:00
Jack Goh ffe1023bba added credit limit seeder, it causes error when creating booking 2018-06-25 17:48:51 +08:00
jack 2783e874bf Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into arief/booking
# Conflicts:
#	database/seeds/DatabaseSeeder.php
2018-05-19 13:03:09 +08:00
jack 3a9b949245 changed ordertest to bookingtest
updated databaseseeder to use class
updated booking seeder
2018-05-19 12:59:28 +08:00
jack d23d1defda added user role seeder
updated user seeder for better memorization name
2018-05-19 10:54:14 +08:00
Mohd Arief 18d2ba4543 input data inside database using seeder 2018-05-17 15:13:29 +08:00
Mohd Arief 204af7cf5e merge master 2018-05-15 12:35:52 +08:00
jack 8da0cbceec added seeder
added user to return role
2018-05-07 17:38:31 +08:00
jack 3373524bc1 added entrust role based permission 2018-05-07 16:25:42 +08:00
jack cd217f9db8 init 2018-04-20 14:03:37 +08:00