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
3d9e7054d7
Final changes
2018-07-03 18:14:45 +08:00
bac71e1980
fix typo for x2 rate
2018-07-03 17:13:14 +08:00
6402d2cf28
updated dynamic rate for x2
2018-07-03 17:12:08 +08: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
3aab1506c4
Merge branch 'feature/booking-refresh-button' into 'master'
...
added the refresh button
See merge request CIEFWorldwideSdnBhd/exchange!53
2018-07-03 08:17:02 +00:00
63e26622bd
added the refresh button
2018-07-03 16:11:50 +08:00
884b8b4099
Error handling done for the whole process
2018-07-03 15:20:30 +08:00
c3d7aa800f
Merge branch 'feature/supplier-report' into 'master'
...
Feature/supplier report
See merge request CIEFWorldwideSdnBhd/exchange!51
2018-07-03 06:33:40 +00:00
4b3957704f
fix upload invoice page, user_po_path exist issue
2018-07-03 12:57:29 +08:00
e32e908b8f
updated banklogo at supplier report
2018-07-03 12:39:15 +08:00
457f0de312
changed booking supplier date format
2018-07-03 11:32:39 +08:00
4152b58ef4
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange into frontend/error-handling-for-axios-in-admin-booking-vues
2018-07-03 11:25:57 +08:00
699827184d
Resolved merge conflict
2018-07-03 11:25:42 +08:00
9a8c1eee9f
add the bank account details
2018-07-03 10:51:40 +08:00
48f9a56230
Commit before pull
2018-07-03 10:43:29 +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
bd55d385f7
successfully integrated canvas to vuejs
2018-07-02 18:26:02 +08:00
da962f77ce
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/supplier-report
2018-07-02 18:04:49 +08:00
bb2373abb5
make welcome page to be login page
2018-07-02 18:04:29 +08:00
3e2170277a
fix conflict
2018-07-02 16:46:52 +08:00
09181b22ee
completed the pagination function for user booking list
2018-07-02 15:27:47 +08:00
27877e8a65
Merge conflict fix
2018-07-02 15:13:32 +08:00
b26c6a68da
Merge conflict fix
2018-07-02 14:58:27 +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
d827b0a1ba
fix supplier booking required field validation
...
updated header text for transfer page
2018-06-30 10:33:40 +08:00
b36c133818
fix loading forever on upload china bankslip
2018-06-30 10:00:41 +08:00
d2fd140f74
fixed loading forever on upload chinabankslip
2018-06-30 09:55:54 +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
b212858eba
commit before pull
2018-06-29 18:10:12 +08:00
0a9dd6a338
added reject reason on user slip reject
2018-06-29 18:08:19 +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
9f9f72dbe5
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking-pagination
2018-06-29 12:09:44 +08:00
6c5dd60654
update the booking controller
2018-06-29 12:09:01 +08:00
691bd1c91a
updated reject booking status
...
added reject reason on verification page
2018-06-29 11:05:27 +08:00
71e6c3358f
added reject reason dialog
2018-06-29 10:59:41 +08:00
d1d5aaf694
fixed bug admin setting frontend
2018-06-29 00:56:00 +08:00
fe07b7cd64
first commit
2018-06-28 22:26:06 +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
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
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
Jack Goh
Mouhamed Lamine
Mohd Arief
Nazri Hamzah