Commit Graph

80 Commits

Author SHA1 Message Date
Jack Goh 9eed12bc3d added switch case for booking status
TBD step 2-6 page
beautified code from home
2018-06-14 16:25:34 +08:00
Jack Goh 053ea0e874 added transfer amount and exchange amount to upload user bank slip
added complete steps for user
added empty get booking status
2018-06-14 15:32:24 +08:00
Jack Goh 274ebe3490 added progress tracker 2018-06-14 11:56:22 +08:00
Jack Goh 9ba6b2aba8 fix bookingconfirmation data 2018-06-14 11:35:45 +08:00
Jack Goh 09a2fe36e8 make booking number and status clickable 2018-06-14 11:26:12 +08:00
Jack Goh a2b58b6d10 updated table structure 2018-06-14 10:45:21 +08:00
Jack Goh 5d1e7ffd7b added tooltips for X1 and X2 2018-06-14 10:09:30 +08:00
Jack Goh b867474445 updated link for upload later 2018-06-13 22:23:36 +08:00
Jack Goh c0b9e446d5 changed upload to upload-user-bankslip 2018-06-13 22:17:01 +08:00
Jack Goh fde70b744f fix login loading screen 2018-06-13 21:50:06 +08:00
Jack Goh b622d81d94 added prevent user from book if amount is empty
fixed some variable duplication
added getcalculationvalue function
2018-06-13 18:27:36 +08:00
Jack Goh 9fa55b3394 Merge branch 'feature/booking' into 'master'
Feature/booking

See merge request CIEFWorldwideSdnBhd/exchange!12
2018-06-13 09:06:41 +00:00
Jack Goh 993ac2817f rollback reset password 2018-06-13 16:44:57 +08:00
Jack Goh d2ca59eb96 fix loading screen on login 2018-06-13 16:09:47 +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
Jack Goh d71fff0b9d Merge branch 'arief/user-frontend' into 'master'
Arief/user frontend

See merge request CIEFWorldwideSdnBhd/exchange!11
2018-06-12 08:31:33 +00:00
Mohd Arief ec4d72c316 solve merge conflict 2018-06-12 12:05:07 +08:00
Jack Goh bdb6ebcb2f rollback readme 2018-06-12 09:48:11 +08:00
Jack Goh dac3e600db Update readme.md 2018-06-12 01:47:30 +00:00
Jack Goh a3cb5344ee updated readme 2018-06-12 09:46:42 +08:00
Mohd Arief a2262ee3c9 Update loading features to login page 2018-06-11 16:29:30 +08:00
Mohd Arief 007d426f63 booking page done until upload
update the countdown function
2018-06-11 14:16:16 +08:00
Jack Goh 6c089b5989 Merge branch 'feature/forgot-password' into 'master'
Feature/forgot password

See merge request CIEFWorldwideSdnBhd/exchange!8
2018-06-09 01:57:18 +00: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
Jack Goh f405f461dd fix view welcome not found
added env example
remove ignored files
2018-06-07 17:05:28 +08:00
Mohd Arief 372fa49794 added booking confirmation (frontend) 2018-05-31 09:42:52 +08:00
Mohd Arief ce20c2b68f booking popup done 2018-05-25 15:06:00 +08:00
Mohd Arief 1b64a3d744 user-dashboard completed 2018-05-24 16:23:06 +08:00
Jack Goh d8a45377b9 Merge branch 'arief/booking' into 'master'
booking test merge request

See merge request CIEFWorldwideSdnBhd/exchange!4
2018-05-24 07:49:13 +00: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 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
Mohd Arief b2fc9f8605 fix test 2018-05-21 12:45:54 +08:00
jack 97f00bf724 .env in gitignore 2018-05-21 11:40:31 +08:00
jack 0d6beb81cf added element ui
updated user frontend
2018-05-19 18:37:48 +08:00
jack 8f3a6d82e5 updated booking to create for current user
updated test to pass
2018-05-19 16:11:19 +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 e539e0b388 fixed login and register frontend 2018-05-19 12:01:26 +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
jack 40830f327d added dockerignore
added wait for db before app started
2018-05-17 12:26:32 +08:00