cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 04:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
281 Commits 33 Branches 0 Tags
4e448afc608bb66c3dfcaae6e5a08151f9aa536c
Commit Graph

281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Goh 4e448afc60 added relationship for invoice and booking 
added confirm invoice feature (after user upload the image)
 2018-06-28 15:22:25 +08:00
Jack Goh 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
Jack Goh 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 d054703170 fix wrong status for user after book supplier 2018-06-28 12:13:09 +08:00
Jack Goh ee7fe28f74 added new status for user tracking nav bar 
fixed top nav for admin only
 2018-06-28 12:08:12 +08:00
Jack Goh 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
Jack Goh 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
Jack Goh 0e212f2751 added waiting po page 2018-06-28 10:33:21 +08:00
Jack Goh 1d740a08ea added waiting invoice and po frontend 2018-06-28 10:33:00 +08:00
Mohd Arief 7996450ab1 change rate to data variable 2018-06-28 10:31:49 +08:00
Jack Goh 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
Jack Goh 9432cdaaad updated upload invoice UI 2018-06-27 18:28:58 +08:00
Mohd Arief 534ad41fd3 fix conflict 2018-06-27 17:25:11 +08:00
Jack Goh 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
Jack Goh cc86e2272b updated get booking status for admin 2018-06-27 17:15:04 +08:00
Mohd Arief 32b0eda067 fix merge conflict 2018-06-27 16:54:40 +08:00
Jack Goh a5ea991a8d changed routes name for update china bankslip 2018-06-27 16:54:02 +08:00
Jack Goh addd89ceb8 added relantionship in chinabankslip model 
added update chinabankslip feature
 2018-06-27 16:37:48 +08:00
Mohd Arief 73000a9818 update route for admin top nav content 2018-06-27 16:33:41 +08:00
Jack Goh cea2857d0f added booking foreign key to china bankslip 
updated upload china bankslip routes
 2018-06-27 16:16:48 +08:00
Jack Goh 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
Jack Goh 631472be50 comeplted upload china slip frontend 2018-06-27 15:47:47 +08:00
Mohd Arief 5e62b3e90d complete the top nav content 2018-06-27 15:42:16 +08:00
Jack Goh 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
Jack Goh 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
Jack Goh 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
Jack Goh 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 298da7d24b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend 
# Conflicts:
#	resources/assets/js/pages/admin/booking/supplierBooking.vue
 2018-06-27 14:23:19 +08:00
Jack Goh 6e8c81f285 added logic if supplierbooking already exist prevent user from creating 2018-06-27 14:21:55 +08:00
Mohd Arief fb6f3e398e update rate function done 2018-06-27 12:34:19 +08:00
Jack Goh 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
Jack Goh 5dfc6ddeb2 Merge branch 'nazri/userbankslip' into 'master' 
supplier booking

See merge request CIEFWorldwideSdnBhd/exchange!21
 2018-06-27 02:55:44 +00:00
Jack Goh 5e63be02a9 erge branch 'nazri/userbankslip' of gitlab.com:CIEFWorldwideSdnBhd/exchange into nazri/userbankslip 2018-06-27 10:46:53 +08:00
Jack Goh b3cf440c4b updated supplier booking controller 2018-06-27 10:46:15 +08:00
Jack Goh 544d414dee remove destroy function for bookingsupplier 2018-06-27 10:30:56 +08:00
Jack Goh b7f258f6a9 refactor BookingsupplierController 
fix booking supplier model
updated fields for bookg supplier frontend
 2018-06-27 10:30:01 +08:00
Jack Goh 5f053577df removed viewCustomerBookingDetails, it was done in bookingController 2018-06-27 10:12:35 +08:00
Jack Goh f078be408d fix migration errors 2018-06-27 10:09:06 +08:00
Jack Goh 299597ed16 update book supplier routes to admin routes 2018-06-27 09:58:09 +08:00
Nazri Hamzah fdb474ccc7 fix conflict booking controller 2018-06-27 09:58:04 +08:00
Jack Goh 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
Jack Goh 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
Jack Goh 2b4f1c6ddc rge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend 2018-06-27 09:29:35 +08:00
Jack Goh b802a91e18 Merge branch 'too/validatefilesize' into 'master' 
Too/validatefilesize

See merge request CIEFWorldwideSdnBhd/exchange!33
 2018-06-26 14:32:18 +00:00
Too 819da14684 revert back changes during debug 2018-06-26 22:24:47 +08:00
Too 436b284a3b Add file size checking. Rename bankslip_url to china_bank_slip_path in chinabankslip table 2018-06-26 22:23:10 +08:00
Too fdcaa31ffe Add upload file maxsize checking in booking controller 2018-06-26 21:39:24 +08:00
Jack Goh 2ed9f51ffd update top nav only admin can see 2018-06-26 18:30:41 +08:00
Nazri Hamzah a17a692549 fix conflict 2018-06-26 18:23:00 +08:00
Jack Goh 1f91cddda5 show top navigation only if user already login 2018-06-26 18:21:40 +08:00