f31f39caec
Add seeder and test for setting_credit
2018-06-26 11:47:48 +08:00
3129da5df4
get_time_limit
2018-06-25 18:16:20 +08:00
1683f5bed5
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend
...
# Conflicts:
# app/Http/Controllers/BookingController.php
2018-06-25 16:57:20 +08:00
2c6128c564
changed admin status default to 1
...
added show one booking for admin
added booking details for verification page
2018-06-25 16:41:31 +08:00
9aea239c52
add handle for exceed credit limit
2018-06-25 16:03:24 +08:00
bc49e39df7
added admin status to booking table
...
updated admin progress track steps
added dummy template in admin booking
2018-06-22 12:31:51 +08:00
aaf0decd97
removed amount from uploadpo
...
added confirmpo after user upload their po
completed uploadpo integration
2018-06-21 15:48:24 +08:00
453852c7ea
rename image_url to image_path in user_bank_slip,invoice,purchase_order
2018-06-21 14:36:33 +08:00
de45782ae3
fix conflit with master
2018-06-21 13:26:18 +08:00
db7e30ea95
add upload invoice and test
2018-06-21 13:15:36 +08:00
d06b8ac359
added status column to booking table
2018-06-21 10:49:45 +08:00
385372e3dd
added rate to booking table
2018-06-20 22:54:31 +08:00
a2dad37758
Check marking before create user
2018-06-20 15:43:04 +08:00
3f2d9fbfb8
Add controller and table for marking
2018-06-20 00:38:32 +08:00
95f4f25dd3
Add test for settingcredit and rate
2018-06-19 18:56:31 +08:00
6a025a6bac
Fix conflit of variable name with master branch.
2018-06-19 13:32:09 +08:00
a019ae2616
Fix conflit
2018-06-19 02:52:21 +08:00
e7c63bb4e9
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/booking-integration
...
# Conflicts:
# app/Http/Controllers/BookingController.php
# routes/api.php
2018-06-18 22:42:16 +08:00
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
012fef948e
Reject user bank slip with reason. Add migration for userbankslip.
2018-06-18 18:57:27 +08:00
39c30065f1
Approved user bankslip
2018-06-18 14:05:08 +08:00
8f431ed090
New Route for booking cancel. Fix bookingTest hardcoded link. Add Cancel function to bookingcontroller. Get Latest Rate for bookingController@store.
2018-06-16 14:40:39 +08:00
3b2b4617cc
Fix conflit
2018-06-14 23:02:24 +08:00
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
a3cb5344ee
updated readme
2018-06-12 09:46:42 +08:00
cc3ea574f8
add logic, test
2018-05-30 16:33:11 +08:00
11ccbd6a91
fix discussion
2018-05-30 12:24:30 +08:00
4210cdc19d
upload purchase order
2018-05-28 17:24:13 +08:00
5c1a4d28c4
customer booking bank slip
2018-05-28 10:58:40 +08:00
6fe24714a3
booking test updated
2018-05-23 12:11:28 +08:00
f84951f973
booking test
2018-05-23 11:49:32 +08:00
90e88039f4
add verification status
2018-05-22 17:29:12 +08:00
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
3a9b949245
changed ordertest to bookingtest
...
updated databaseseeder to use class
updated booking seeder
2018-05-19 12:59:28 +08:00
315ed64520
added booking seeder
...
updated booking controller
added test for booking
2018-05-19 12:33:48 +08:00
d23d1defda
added user role seeder
...
updated user seeder for better memorization name
2018-05-19 10:54:14 +08:00
18d2ba4543
input data inside database using seeder
2018-05-17 15:13:29 +08:00
204af7cf5e
merge master
2018-05-15 12:35:52 +08:00
254077476e
edit the unit test
2018-05-15 11:18:06 +08:00
06aa931eb5
added wait for mysql to start in docker
...
fix role not found on register/login
2018-05-14 12:45:30 +08:00
47975d6de2
fix conflict
2018-05-14 10:45:15 +08:00
f56a858e18
new upload china bankslip
2018-05-08 15:24:21 +08:00
8da0cbceec
added seeder
...
added user to return role
2018-05-07 17:38:31 +08:00
3373524bc1
added entrust role based permission
2018-05-07 16:25:42 +08:00
a1db64d1c1
integrated frontend
2018-05-07 15:26:23 +08:00
805d357048
add model,controller,migration,api
2018-04-27 18:03:16 +08:00
021a5e46b4
update controller
2018-04-24 15:03:01 +08:00
5d0cf138b8
removed vendor fixed docker
2018-04-23 17:28:22 +08:00
87653b2863
add migration
2018-04-23 15:01:18 +08:00
4f417f54c9
first commit
2018-04-23 14:57:30 +08:00
Too
Jack Goh
Nazri
jack
Mohd Arief