d80f048f5a
added po and invoice into show booking return
...
integrated complete page frontend
integrated po page frontend
integrated po complete page frontend
removed ETA for transfer page frontend
2018-06-29 19:01:15 +08:00
3d05dbb755
added chinabankslip return on show booking query
...
updated upload po page with booking info, china bankslip and user bankslip
2018-06-29 17:40:28 +08:00
9d0aadb5c3
added reject reason response for getting booking
...
updated bankslip reject screen for user
2018-06-29 15:37:44 +08:00
0544e23ee6
fix timeout for rejected user bankslip
...
fix is_rejected able to accept again
2018-06-29 15:21:27 +08:00
691bd1c91a
updated reject booking status
...
added reject reason on verification page
2018-06-29 11:05:27 +08:00
722dbacd00
updated home frontend to cope with pagination
2018-06-28 16:15:10 +08:00
536c67bbc6
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into integration/upload-invoice
...
# Conflicts:
# database/migrations/2018_06_28_011717_rename_booking_foreignkey_in_po_table.php
# database/seeds/DatabaseSeeder.php
2018-06-28 15:55:58 +08:00
265887f0d7
Merge branch 'integration/confirmation-n-transfer' into 'master'
...
update confirmation and transfer page
See merge request CIEFWorldwideSdnBhd/exchange!42
2018-06-28 07:51:03 +00:00
385623f6a2
update status upon user upload purchase order
...
fix admin complete page not found
fixed admin completed page tracking
2018-06-28 15:49:46 +08:00
651f762237
update confirmation and transfer page
...
- update booking controller
2018-06-28 15:40:27 +08:00
6d2c83d912
temporary added default amount value
...
fixed no file detected bug
2018-06-28 15:38:15 +08:00
4e448afc60
added relationship for invoice and booking
...
added confirm invoice feature (after user upload the image)
2018-06-28 15:22:25 +08:00
105b61eab3
fixed retrive po path in booking controller
...
updated chinabankslip error message to be more clear
fixed supplier booking report loading button
updated upload invoice frontend to show user po image
2018-06-28 15:07:41 +08:00
0cf92b9936
added confirmSupplier booking
...
removed droptable due to database contraints issue
fixed rename booking foreight key in po table issue
added supplierstable seeder
updated supplierreport frontend
updated upload po frontend
2018-06-28 14:46:30 +08:00
4ba48abf1a
Merge branch 'master' into 'too/bookingpagination'
...
# Conflicts:
# routes/api.php
2018-06-28 06:17:17 +00:00
7fc0696099
fix conflit
2018-06-28 12:45:02 +08:00
d054703170
fix wrong status for user after book supplier
2018-06-28 12:13:09 +08:00
ee7fe28f74
added new status for user tracking nav bar
...
fixed top nav for admin only
2018-06-28 12:08:12 +08:00
1d740a08ea
added waiting invoice and po frontend
2018-06-28 10:33:00 +08:00
2b4ddadfcb
rename book_id in po table to booking_id to perform ORM relantionship
...
added relationship between booking and po
updated settings shows for different role
added function to display po for admin
2018-06-28 10:06:26 +08:00
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
cc86e2272b
updated get booking status for admin
2018-06-27 17:15:04 +08:00
edc3dbaa35
fixed upload chinabankslip
...
removed unused code in bookingcontroller
updated upload chinabankslip frontend
moved some routes into authenticated route list
2018-06-27 16:01:52 +08:00
b7f258f6a9
refactor BookingsupplierController
...
fix booking supplier model
updated fields for bookg supplier frontend
2018-06-27 10:30:01 +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
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
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
0a6bd2c405
Add eta
2018-06-26 12:17:12 +08:00
20923d8f4a
updated upload path
2018-06-26 12:07:27 +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
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
Jack Goh
Mohd Arief
Too
Nazri Hamzah