cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 12:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
361 Commits 33 Branches 0 Tags
b8fd5d08c479289561ba076e2fb2e795c9e29efb
Commit Graph

361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Goh b8fd5d08c4 Merge branch 'frontend/error-handling-for-axios-in-admin-booking-vues' into 'master' 
Frontend/error handling for axios in  booking vues

See merge request CIEFWorldwideSdnBhd/exchange!52
 2018-07-03 10:17:58 +00:00
Mouhamed Lamine 3d9e7054d7 Final changes 2018-07-03 18:14:45 +08:00
Jack Goh 2bc7542e10 Merge branch 'feature/rate-integration' into 'master' 
Feature/rate integration

See merge request CIEFWorldwideSdnBhd/exchange!54
 2018-07-03 09:36:59 +00:00
Jack Goh bac71e1980 fix typo for x2 rate 2018-07-03 17:13:14 +08:00
Jack Goh 6402d2cf28 updated dynamic rate for x2 2018-07-03 17:12:08 +08:00
Jack Goh c902c8db82 hide rate id from model 
fixed DB not found in rate controller
 2018-07-03 17:11:30 +08:00
Mouhamed Lamine b731226f18 Merge conflict saved 2018-07-03 16:53:34 +08:00
Mouhamed Lamine 27c5c14373 GitIgnored my package-lock.json 2018-07-03 16:43:17 +08:00
Mouhamed Lamine e073bfdba8 GitIgnored my package-lock.json 2018-07-03 16:36:55 +08:00
Jack Goh 3aab1506c4 Merge branch 'feature/booking-refresh-button' into 'master' 
added the refresh button

See merge request CIEFWorldwideSdnBhd/exchange!53
 2018-07-03 08:17:02 +00:00
Mohd Arief 63e26622bd added the refresh button 2018-07-03 16:11:50 +08:00
Mouhamed Lamine 884b8b4099 Error handling done for the whole process 2018-07-03 15:20:30 +08:00
Jack Goh c3d7aa800f Merge branch 'feature/supplier-report' into 'master' 
Feature/supplier report

See merge request CIEFWorldwideSdnBhd/exchange!51
 2018-07-03 06:33:40 +00:00
Jack Goh 4b3957704f fix upload invoice page, user_po_path exist issue 2018-07-03 12:57:29 +08:00
Jack Goh e32e908b8f updated banklogo at supplier report 2018-07-03 12:39:15 +08:00
Jack Goh 457f0de312 changed booking supplier date format 2018-07-03 11:32:39 +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 4da5cfd7be added relationship between marking and user 
added billing_amount and salestax_amount to supplierbooking table
 2018-07-03 09:58:06 +08:00
Jack Goh 647c42a30e renamed booking supplier book_id to booking_id 
updated bookingSupplier to supplierBooking
updated get supplier api in supplier report
added download button to download report
 2018-07-02 21:26:12 +08:00
Jack Goh bd55d385f7 successfully integrated canvas to vuejs 2018-07-02 18:26:02 +08:00
Jack Goh da962f77ce Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/supplier-report 2018-07-02 18:04:49 +08:00
Jack Goh bb2373abb5 make welcome page to be login page 2018-07-02 18:04: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 6262054880 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/supplier-report 2018-07-01 20:50:27 +08:00
Jack Goh 2ae8ce7384 added canva2image package 
upgraded webpack
 2018-07-01 20:49:04 +08: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