omair/exchange
1
0
Fork 0
mirror of https://gitlab.com/omair-personal/exchange.git synced 2026-09-01 02:44:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
339 Commits 28 Branches 0 Tags
884b8b409993f23b0472050fe6a605d4580dd95e
Commit Graph

339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mouhamed Lamine 884b8b4099 Error handling done for the whole process 2018-07-03 15:20:30 +08:00
Mouhamed Lamine 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
Mouhamed Lamine 699827184d Resolved merge conflict 2018-07-03 11:25:42 +08:00
Jack Goh d46de18d00 Merge branch 'feature/booking-pagination' into 'master' 
add the bank account details

See merge request CIEFWorldwideSdnBhd/exchange!50
 2018-07-03 02:54:09 +00:00
Mohd Arief 9a8c1eee9f add the bank account details 2018-07-03 10:51:40 +08:00
Mouhamed Lamine 48f9a56230 Commit before pull 2018-07-03 10:43:29 +08:00
Jack Goh 0afeb0d1ea Merge branch 'feature/booking-pagination' into 'master' 
Feature/booking pagination

See merge request CIEFWorldwideSdnBhd/exchange!49
 2018-07-02 08:52:34 +00:00
Mohd Arief 3e2170277a fix conflict 2018-07-02 16:46:52 +08:00
Jack Goh d3f8d1b190 Merge branch 'frontend/booking-confirm-error' into 'master' 
Frontend/booking confirm button error

See merge request CIEFWorldwideSdnBhd/exchange!45
 2018-07-02 07:35:33 +00:00
Mohd Arief 09181b22ee completed the pagination function for user booking list 2018-07-02 15:27:47 +08:00
Mouhamed Lamine 8fa5faec90 Merge conflict fix 2018-07-02 15:19:21 +08:00
Mouhamed Lamine 27877e8a65 Merge conflict fix 2018-07-02 15:13:32 +08:00
Mouhamed Lamine b26c6a68da Merge conflict fix 2018-07-02 14:58:27 +08:00
Mouhamed Lamine Bah c47c507963 Update DatabaseSeeder.php 2018-07-02 01:56:04 +00:00
Jack Goh e23d2ef346 Merge branch 'nazri/show-current-rate-api' into 'master' 
nazri/show current rate api

See merge request CIEFWorldwideSdnBhd/exchange!47
 2018-07-01 08:53:11 +00:00
Nazri Hamzah 7a10f39e70 fix conflict 2018-06-30 16:16:08 +08:00
Nazri Hamzah 94b664bb45 show current rate api 2018-06-30 16:13:26 +08:00
Jack Goh 278d543bcf Merge branch 'integration/bookinginfo-allpage' into 'master' 
Integration/bookinginfo allpage

See merge request CIEFWorldwideSdnBhd/exchange!46
 2018-06-30 02:52:06 +00:00
Jack Goh 9d3e08889c fix booking status on upload invoice 2018-06-30 10:51:05 +08:00
Jack Goh 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
Jack Goh d827b0a1ba fix supplier booking required field validation 
updated header text for transfer page
 2018-06-30 10:33:40 +08:00
Jack Goh eec356f22d fix wrong timeout 
fix seeder info to newer info
 2018-06-30 10:29:03 +08:00
Jack Goh b36c133818 fix loading forever on upload china bankslip 2018-06-30 10:00:41 +08:00
Jack Goh d2fd140f74 fixed loading forever on upload chinabankslip 2018-06-30 09:55:54 +08:00
Jack Goh 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
Jack Goh 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
Mouhamed Lamine 30a210324e booking confirm error 2018-06-29 18:21:08 +08:00
Mouhamed Lamine b212858eba commit before pull 2018-06-29 18:10:12 +08:00
Jack Goh 0a9dd6a338 added reject reason on user slip reject 2018-06-29 18:08:19 +08:00
Jack Goh 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
Jack Goh 7aba4e2b05 fix edit supplier booking 
fix done supplier booking report button loading
 2018-06-29 15:48:26 +08:00
Jack Goh 9d0aadb5c3 added reject reason response for getting booking 
updated bankslip reject screen for user
 2018-06-29 15:37:44 +08:00
Jack Goh 0544e23ee6 fix timeout for rejected user bankslip 
fix is_rejected able to accept again
 2018-06-29 15:21:27 +08:00
Mohd Arief 9f9f72dbe5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking-pagination 2018-06-29 12:09:44 +08:00
Mohd Arief 6c5dd60654 update the booking controller 2018-06-29 12:09:01 +08:00
Jack Goh 691bd1c91a updated reject booking status 
added reject reason on verification page
 2018-06-29 11:05:27 +08:00
Jack Goh 71e6c3358f added reject reason dialog 2018-06-29 10:59:41 +08:00
Mouhamed Lamine 83d630de1e commit before pull 2018-06-29 10:57:57 +08:00
Jack Goh 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
Nazri Hamzah d1d5aaf694 fixed bug admin setting frontend 2018-06-29 00:56:00 +08:00
Nazri Hamzah fe07b7cd64 first commit 2018-06-28 22:26:06 +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