b8fd5d08c4
Merge branch 'frontend/error-handling-for-axios-in-admin-booking-vues' into 'master'
...
Frontend/error handling for axios in booking vues
See merge request CIEFWorldwideSdnBhd/exchange!52
2018-07-03 10:17:58 +00:00
c902c8db82
hide rate id from model
...
fixed DB not found in rate controller
2018-07-03 17:11:30 +08:00
b731226f18
Merge conflict saved
2018-07-03 16:53:34 +08:00
457f0de312
changed booking supplier date format
2018-07-03 11:32:39 +08:00
699827184d
Resolved merge conflict
2018-07-03 11:25:42 +08:00
48f9a56230
Commit before pull
2018-07-03 10:43:29 +08:00
4da5cfd7be
added relationship between marking and user
...
added billing_amount and salestax_amount to supplierbooking table
2018-07-03 09:58:06 +08:00
647c42a30e
renamed booking supplier book_id to booking_id
...
updated bookingSupplier to supplierBooking
updated get supplier api in supplier report
added download button to download report
2018-07-02 21:26:12 +08:00
b26c6a68da
Merge conflict fix
2018-07-02 14:58:27 +08:00
7a10f39e70
fix conflict
2018-06-30 16:16:08 +08:00
94b664bb45
show current rate api
2018-06-30 16:13:26 +08:00
9d3e08889c
fix booking status on upload invoice
2018-06-30 10:51:05 +08:00
43809bc478
fix wrong update status on upload po
...
fix validation message for upload china bankslip
removed get po api on upload invoice
2018-06-30 10:47:35 +08:00
eec356f22d
fix wrong timeout
...
fix seeder info to newer info
2018-06-30 10:29:03 +08:00
ca74cfae23
updated admin booking show function with user, china, po, invoice slip
...
removed one step from admin tracking
integrated admin booking complete
changed admin complete order component name
2018-06-29 19:18:54 +08:00
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
30a210324e
booking confirm error
2018-06-29 18:21:08 +08:00
b212858eba
commit before pull
2018-06-29 18:10:12 +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
7aba4e2b05
fix edit supplier booking
...
fix done supplier booking report button loading
2018-06-29 15:48:26 +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
addd89ceb8
added relantionship in chinabankslip model
...
added update chinabankslip feature
2018-06-27 16:37:48 +08:00
cea2857d0f
added booking foreign key to china bankslip
...
updated upload china bankslip routes
2018-06-27 16:16:48 +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
390862a8be
removed multiple booking on supplier booking controller
...
WIP supplier booking report in image file
WIP edit report page
WIP upload chinabankslip
2018-06-27 15:32:01 +08:00
6e8c81f285
added logic if supplierbooking already exist prevent user from creating
2018-06-27 14:21:55 +08:00
d1ce576109
changed model from bookingsupplier to supplier booking
...
fix supplier booking controller
make payment method nullable for supplier booking
2018-06-27 12:01:49 +08:00
b3cf440c4b
updated supplier booking controller
2018-06-27 10:46:15 +08:00
544d414dee
remove destroy function for bookingsupplier
2018-06-27 10:30:56 +08:00
b7f258f6a9
refactor BookingsupplierController
...
fix booking supplier model
updated fields for bookg supplier frontend
2018-06-27 10:30:01 +08:00
Jack Goh
Mouhamed Lamine
Nazri Hamzah
Mohd Arief
Too