299597ed16
update book supplier routes to admin routes
2018-06-27 09:58:09 +08:00
d362d947a3
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into nazri/userbankslip
...
# Conflicts:
# app/Http/Controllers/BookingController.php
2018-06-27 09:56:35 +08:00
c59aac1e4d
Merge branch 'feature/admin-home-frontend' into 'master'
...
Feature/admin home frontend
See merge request CIEFWorldwideSdnBhd/exchange!34
2018-06-27 01:36:22 +00: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
a17a692549
fix conflict
2018-06-26 18:23:00 +08:00
acfd8eeb48
supplier booking (multiple booking removed)
2018-06-26 18:17:38 +08:00
fd03f5b248
updated approvebankslip booking not found
...
updated update status upon userbankslip approved
updated update status upon userbankslip rejected
updated supplier index to display value and label for input select
updated supplierBooking frontend
completed booking accept and reject integration
2018-06-26 17:40:44 +08:00
ee59dc69d5
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend
2018-06-26 14:41:45 +08:00
dec9ba9405
fix typo add_eta_ser_bank_slip_table. remove eta from bookingcontroller
2018-06-26 12:28:17 +08:00
852c64f35b
completed display user bankslip in verification frontend
2018-06-26 12:27:09 +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
20923d8f4a
updated upload path
2018-06-26 12:07:27 +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
3245497378
fix conflict
2018-06-20 17:19:58 +08:00
a7970e2d72
fix conflict
2018-06-20 17:17:22 +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
32bf2f4375
fix discussion 2
2018-06-20 12:15:33 +08:00
Jack Goh
Too
Nazri Hamzah