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
266 Commits 33 Branches 0 Tags
2b4ddadfcb3a115a175ebfecf931ad335f315d52
Commit Graph

266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Nazri Hamzah acfd8eeb48 supplier booking (multiple booking removed) 2018-06-26 18:17:38 +08:00
Jack Goh e1c931efed Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend 2018-06-26 18:09:27 +08:00
Jack Goh f108d7ee51 updated axios booking supplier form 2018-06-26 18:09:11 +08:00
Jack Goh 21338401c4 update supplierbooking frontend 2018-06-26 17:56:51 +08:00
Jack Goh f262830b1b Merge branch 'arief/admin-settings-content' into 'master' 
completed the setting content

See merge request CIEFWorldwideSdnBhd/exchange!32
 2018-06-26 09:42:24 +00:00
Jack Goh 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
Mohd Arief 045c137dab update dialog name 2018-06-26 17:28:22 +08:00
Jack Goh 2bf0df8b62 Merge branch 'arief/admin-setting-frontend' into 'master' 
Arief/admin setting frontend

See merge request CIEFWorldwideSdnBhd/exchange!29
 2018-06-26 09:08:15 +00:00
Mohd Arief c8ff54f79a completed the setting content 2018-06-26 16:55:31 +08:00
Jack Goh 2023050218 fix conflict 2018-06-26 14:44:48 +08:00
Jack Goh 66b0c14f5e Merge branch 'feature/admin-home-frontend' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend 
# Conflicts:
#	app/Http/Controllers/BookingController.php
#	database/seeds/DatabaseSeeder.php
#	resources/assets/js/pages/admin/booking/verification.vue
 2018-06-26 14:43:53 +08:00
Jack Goh ee59dc69d5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend 2018-06-26 14:41:45 +08:00
Jack Goh 5366353484 updated loading button param 2018-06-26 14:41:37 +08:00
Jack Goh 41a265e1a0 Merge branch 'too/ETA' into 'master' 
Too/eta

See merge request CIEFWorldwideSdnBhd/exchange!31
 2018-06-26 06:32:48 +00:00
Jack Goh 366f91352b Merge branch 'too/timelimit' into 'master' 
get_time_limit

See merge request CIEFWorldwideSdnBhd/exchange!30
 2018-06-26 06:31:53 +00:00