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
298 Commits 33 Branches 0 Tags
83d630de1eb65ecf13e8af7c884e6b5d463b13a6
Commit Graph

298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mouhamed Lamine 83d630de1e commit before pull 2018-06-29 10:57:57 +08:00
Mouhamed Lamine 30816ba449 Commit before merge 2018-06-28 16:15:35 +08:00
Jack Goh 722dbacd00 updated home frontend to cope with pagination 2018-06-28 16:15:10 +08:00
Jack Goh 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
Jack Goh 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
Jack Goh 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
Jack Goh 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
Mohd Arief 651f762237 update confirmation and transfer page 
- update booking controller
 2018-06-28 15:40:27 +08:00
Jack Goh 6d2c83d912 temporary added default amount value 
fixed no file detected bug
 2018-06-28 15:38:15 +08:00
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 a19415357b Merge branch 'too/bookingpagination' into 'master' 
Too/bookingpagination

See merge request CIEFWorldwideSdnBhd/exchange!41
 2018-06-28 06:17:26 +00:00
Jack Goh 4ba48abf1a Merge branch 'master' into 'too/bookingpagination' 
# Conflicts:
#   routes/api.php
 2018-06-28 06:17:17 +00:00
Jack Goh 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
Too 7fc0696099 fix conflit 2018-06-28 12:45:02 +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 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
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
Too 24f6273028 added booking pagination. (havent write test) 2018-06-28 00:06:23 +08:00
Too 06974f039b revert back changes during debug 2018-06-27 23:37:29 +08:00
Too 206a637a88 Add test for setting supplier 2018-06-27 23:34:35 +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