Commit Graph

28 Commits

Author SHA1 Message Date
Too db7e30ea95 add upload invoice and test 2018-06-21 13:15:36 +08:00
Too 6a025a6bac Fix conflit of variable name with master branch. 2018-06-19 13:32:09 +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
Jack Goh 3d7016281b fix loading button after get calculation 2018-06-18 10:26:29 +08:00
Too 3060aa1c1f Fix wrong variable name. Add auth check before upload bankslip and PO. Optimize some code stlye 2018-06-15 17:13:53 +08:00
Too fb944428a5 fix conflit 2018-06-14 23:46:39 +08:00
Too 3b2b4617cc Fix conflit 2018-06-14 23:02:24 +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 84019bace1 ignore some vendorfiles 2018-06-13 14:44:41 +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
Mouhamed Lamine 65225369ca Forgot Password 2018-06-08 18:13:36 +08:00
Jack Goh f405f461dd fix view welcome not found
added env example
remove ignored files
2018-06-07 17:05:28 +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
Mohd Arief 1b64a3d744 user-dashboard completed 2018-05-24 16:23:06 +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 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 d5694be293 ignore files that listed in gitignore 2018-05-14 11:29:12 +08:00
Nazri f56a858e18 new upload china bankslip 2018-05-08 15:24:21 +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
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