Commit Graph

30 Commits

Author SHA1 Message Date
Too 83dfca2ae1 fix conflit 2018-06-14 16:02:33 +08:00
Jack Goh 87442520a9 Fix test
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking

# Conflicts:
#	app/Http/Controllers/BookingController.php
#	vendor/composer/autoload_classmap.php
#	vendor/composer/autoload_static.php
2018-06-13 15:57:08 +08:00
Jack Goh a3cb5344ee updated readme 2018-06-12 09:46:42 +08:00
Nazri cc3ea574f8 add logic, test 2018-05-30 16:33:11 +08:00
Nazri 11ccbd6a91 fix discussion 2018-05-30 12:24:30 +08:00
Nazri 4210cdc19d upload purchase order 2018-05-28 17:24:13 +08:00
Nazri 5c1a4d28c4 customer booking bank slip 2018-05-28 10:58:40 +08:00
Nazri 6fe24714a3 booking test updated 2018-05-23 12:11:28 +08:00
Nazri f84951f973 booking test 2018-05-23 11:49:32 +08:00
Nazri 90e88039f4 add verification status 2018-05-22 17:29:12 +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
Mohd Arief 315ed64520 added booking seeder
updated booking controller
added test for booking
2018-05-19 12:33:48 +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
Mohd Arief 254077476e edit the unit test 2018-05-15 11:18:06 +08:00
jack 06aa931eb5 added wait for mysql to start in docker
fix role not found on register/login
2018-05-14 12:45:30 +08:00
Nazri 47975d6de2 fix conflict 2018-05-14 10:45:15 +08:00
Nazri f56a858e18 new upload china bankslip 2018-05-08 15:24:21 +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 a1db64d1c1 integrated frontend 2018-05-07 15:26:23 +08:00
Nazri Hamzah 805d357048 add model,controller,migration,api 2018-04-27 18:03:16 +08:00
Mohd Arief 021a5e46b4 update controller 2018-04-24 15:03:01 +08:00
jack 5d0cf138b8 removed vendor fixed docker 2018-04-23 17:28:22 +08:00
Nazri Hamzah 87653b2863 add migration 2018-04-23 15:01:18 +08:00
Nazri Hamzah 4f417f54c9 first commit 2018-04-23 14:57:30 +08:00
Mohd Arief 8e3e4cc4d1 added migration, model 2018-04-23 14:54:06 +08:00
jack cd217f9db8 init 2018-04-20 14:03:37 +08:00