24f6273028
added booking pagination. (havent write test)
2018-06-28 00:06:23 +08:00
206a637a88
Add test for setting supplier
2018-06-27 23:34:35 +08:00
819da14684
revert back changes during debug
2018-06-26 22:24:47 +08:00
436b284a3b
Add file size checking. Rename bankslip_url to china_bank_slip_path in chinabankslip table
2018-06-26 22:23:10 +08:00
fdcaa31ffe
Add upload file maxsize checking in booking controller
2018-06-26 21:39:24 +08:00
dec9ba9405
fix typo add_eta_ser_bank_slip_table. remove eta from bookingcontroller
2018-06-26 12:28:17 +08:00
a498d370cf
remove eta from booking
2018-06-26 12:21:53 +08:00
428660a91d
Merge branch 'too/ETA' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/ETA
2018-06-26 12:19:52 +08:00
c6ef6219a3
fix conflit
2018-06-26 12:19:08 +08:00
0a6bd2c405
Add eta
2018-06-26 12:17:12 +08:00
ec6db69373
Add ETA for booking table
2018-06-26 11:28:53 +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
b715663d47
updated adminshow function
2018-06-25 16:56:36 +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
1e7f076335
updated booking status on upload user bankslip
...
revert back the correct routes for user
update user path names
2018-06-25 15:45:02 +08:00
bf40262994
added admin booking list controller
2018-06-23 00:40:50 +08:00
b9c0bc53fd
added booking table to admin home
...
integrate booking list to admin home
2018-06-21 17:35:08 +08:00
9acf2a773e
fix admin routes on vuejs
2018-06-21 16:35:09 +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
de7161369c
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into bug/bookinglist-timeout-countdown
2018-06-21 14:48:48 +08:00
453852c7ea
rename image_url to image_path in user_bank_slip,invoice,purchase_order
2018-06-21 14:36:33 +08:00
3c263b56ea
fix 404 not found for upload user bankslip
...
added display term on booking table
2018-06-21 14:31:53 +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
23b024c2fb
fixed status description not found
...
removed timeout on home page
added timeout handling in upload user bankslip
2018-06-21 12:45:05 +08:00
5a4c4b14ee
updated create booking status to 2
2018-06-21 10:58:47 +08:00
6bbf271a36
added status tracking in booking
2018-06-21 10:58:16 +08:00
a650879977
completed list booking
...
TBD implement status feature
2018-06-21 10:43:52 +08:00
7eb8c7bafc
create booking with rate
2018-06-20 22:55:29 +08:00
385372e3dd
added rate to booking table
2018-06-20 22:54:31 +08:00
a30fd2a0b1
added booking list controller
2018-06-20 22:21:45 +08:00
bc637adcab
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange
...
# Conflicts:
# routes/api.php
2018-06-20 18:41:31 +08:00
498fafd502
added booking lists controller and routes
2018-06-20 18:39:55 +08:00
93d866f432
Revert back changes during debug. Remove Auto login after register.
2018-06-20 17:30:53 +08:00
e6d58004bc
fix error response code
2018-06-20 17:04:50 +08:00
e3c104f902
Done checking marking before register user
2018-06-20 16:57:47 +08:00
3959c8c8b2
pull from master
2018-06-20 15:56:08 +08:00
a2dad37758
Check marking before create user
2018-06-20 15:43:04 +08:00
b1843c0b9b
Revert back unnessary changes during debug
2018-06-20 02:04:05 +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
64d8ffed7c
Fix variable name
2018-06-19 00:15:28 +08:00
7398ce73d6
updated timeout from 60 seconds to 10 minutes
2018-06-18 22:51:33 +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
Too
Jack Goh