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
71e6c3358f
added reject reason dialog
2018-06-29 10:59:41 +08:00
79cad74ee0
Merge branch 'nazri/admin-frontend-setting-fix' into 'master'
...
Nazri/admin frontend setting fix
See merge request CIEFWorldwideSdnBhd/exchange!44
2018-06-29 01:32:00 +00: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
f2784c47ed
Merge branch 'integration/upload-invoice' into 'master'
...
Integration/upload invoice
See merge request CIEFWorldwideSdnBhd/exchange!43
2018-06-28 08:01:07 +00: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
a19415357b
Merge branch 'too/bookingpagination' into 'master'
...
Too/bookingpagination
See merge request CIEFWorldwideSdnBhd/exchange!41
2018-06-28 06:17:26 +00:00
4ba48abf1a
Merge branch 'master' into 'too/bookingpagination'
...
# Conflicts:
# routes/api.php
2018-06-28 06:17:17 +00:00
4f39b268ab
Merge branch 'too/testsettingsuppliers' into 'master'
...
Add test for setting supplier
See merge request CIEFWorldwideSdnBhd/exchange!39
2018-06-28 06:13:26 +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
fd5883c747
Merge branch 'integration/upload-invoice' into 'master'
...
Integration/upload invoice
See merge request CIEFWorldwideSdnBhd/exchange!40
2018-06-28 03:41:54 +00:00
2ddd9704bd
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into integration/upload-invoice
...
# Conflicts:
# resources/assets/js/router/routes.js
2018-06-28 11:41:39 +08:00
e8b22841bd
Merge branch 'arief/admin-top-nav-content' into 'master'
...
Arief/admin top nav content
See merge request CIEFWorldwideSdnBhd/exchange!37
2018-06-28 02:46:31 +00:00
0e212f2751
added waiting po page
2018-06-28 10:33:21 +08:00
1d740a08ea
added waiting invoice and po frontend
2018-06-28 10:33:00 +08:00
7996450ab1
change rate to data variable
2018-06-28 10:31:49 +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
06974f039b
revert back changes during debug
2018-06-27 23:37:29 +08:00
206a637a88
Add test for setting supplier
2018-06-27 23:34:35 +08:00
9432cdaaad
updated upload invoice UI
2018-06-27 18:28:58 +08:00
534ad41fd3
fix conflict
2018-06-27 17:25:11 +08:00
540d8cfc15
Merge branch 'integration/upload-cnbankslip' into 'master'
...
Integration/upload cnbankslip
See merge request CIEFWorldwideSdnBhd/exchange!38
2018-06-27 09:15:29 +00:00
cc86e2272b
updated get booking status for admin
2018-06-27 17:15:04 +08:00
32b0eda067
fix merge conflict
2018-06-27 16:54:40 +08:00
a5ea991a8d
changed routes name for update china bankslip
2018-06-27 16:54:02 +08:00
addd89ceb8
added relantionship in chinabankslip model
...
added update chinabankslip feature
2018-06-27 16:37:48 +08:00
73000a9818
update route for admin top nav content
2018-06-27 16:33:41 +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
631472be50
comeplted upload china slip frontend
2018-06-27 15:47:47 +08:00
5e62b3e90d
complete the top nav content
2018-06-27 15:42:16 +08:00
781c78b942
Merge branch 'integration/book-supplier' into 'master'
...
Integration/book supplier
See merge request CIEFWorldwideSdnBhd/exchange!36
2018-06-27 07:32:36 +00: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
3ce9fdf9db
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into integration/book-supplier
...
# Conflicts:
# resources/assets/js/pages/admin/booking/supplierBooking.vue
2018-06-27 14:24:48 +08:00
aa528cfa39
Merge branch 'feature/admin-home-frontend' into 'master'
...
Feature/admin home frontend
See merge request CIEFWorldwideSdnBhd/exchange!35
2018-06-27 06:23:36 +00:00
Jack Goh
Nazri Hamzah
Mohd Arief
Too