Commit Graph

36 Commits

Author SHA1 Message Date
Too 83dfca2ae1 fix conflit 2018-06-14 16:02:33 +08:00
Too 5ce817cd33 remove duplicate getting banksli_url. add user bank slip into database in uploadbankslip. save image_url in uploadpurchaseorder 2018-06-14 15:08:00 +08:00
Jack Goh 993ac2817f rollback reset password 2018-06-13 16:44:57 +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 90fcbcda73 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking
# Conflicts:
#	app/Http/Controllers/Auth/ResetPasswordController.php
#	vendor/composer/autoload_classmap.php
#	vendor/composer/autoload_static.php
2018-06-13 14:43:30 +08:00
Mohd Arief ec4d72c316 solve merge conflict 2018-06-12 12:05:07 +08:00
Jack Goh a3cb5344ee updated readme 2018-06-12 09:46:42 +08:00
Mouhamed Lamine 337f1d3733 Forgot Password 2018-06-08 19:09:58 +08:00
Mouhamed Lamine 65225369ca Forgot Password 2018-06-08 18:13:36 +08:00
Mohd Arief 08ea62c411 booking page done except upload 2018-06-08 11:55:39 +08:00
Jack Goh 929266a09c updated only booking belongs to user can update or delete the booking
phpfmt booking controller
removed example test
moved booking test to feature
2018-06-07 17:30:54 +08:00
Nazri 6e54771ca2 upload po test 2018-06-05 10:15:43 +08:00
Nazri d7025b7f86 update logic 2018-05-31 10:38:45 +08:00
Nazri cc3ea574f8 add logic, test 2018-05-30 16:33:11 +08:00
Nazri 7381252c57 fix discussion 2 2018-05-30 13:24:22 +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 54f79b74dc new booking controller update 2018-05-24 15:45:55 +08:00
Nazri 7e0a0aefa9 booking controller update 2018-05-24 15:14:33 +08:00
Nazri 90e88039f4 add verification status 2018-05-22 17:29:12 +08:00
jack 8f3a6d82e5 updated booking to create for current user
updated test to pass
2018-05-19 16:11:19 +08:00
Mohd Arief 315ed64520 added booking seeder
updated booking controller
added test for booking
2018-05-19 12:33:48 +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 bc6f948314 added unit testing 2018-05-15 10:59:26 +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 a1db64d1c1 integrated frontend 2018-05-07 15:26:23 +08:00
Mohd Arief 0a13822716 update api and controller 2018-05-02 11:13:14 +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
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