cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 20:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
379 Commits 33 Branches 0 Tags
45c81597bdbd86efa16ec0acbccb4a2aeeeaeba9
Commit Graph

379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Too 45c81597bd git pull origin master 2018-07-04 23:30:14 +08:00
Too 4959de9dd5 done integrate for cief bank setting page 2018-07-04 23:28:07 +08:00
Jack Goh cfa20eac16 Merge branch 'too/suppliersetting' into 'master' 
Too/suppliersetting

See merge request CIEFWorldwideSdnBhd/exchange!57
 2018-07-04 10:27:26 +00:00
Too 9805fd04d0 move axios configuration from external file to inline 2018-07-04 18:04:55 +08:00
Too ab3cba389d Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/suppliersetting 2018-07-04 17:31:21 +08:00
Too 42476f9b57 move vee-validate to index.js 2018-07-04 17:30:06 +08:00
Too aa7c665d9c add validation for supplier form 2018-07-04 17:27:44 +08:00
Too bfae59bf1e integrate edit feature 2018-07-04 16:30:34 +08:00
Too 55455b89d7 integrate delete supplier 2018-07-04 14:35:42 +08:00
Too 080851675c integrate index in suplier page 2018-07-04 13:31:10 +08:00
Too 678197d40a fix conflit 2018-07-04 11:19:33 +08:00
Too 7a0d11247d integrate add setting supplier 2018-07-04 11:17:29 +08:00
Jack Goh 35dfa58a14 Merge branch 'fix/bug' into 'master' 
Fix/bug

See merge request CIEFWorldwideSdnBhd/exchange!55
 2018-07-04 03:13:33 +00:00
Jack Goh 9ae80ed013 fix migration down database integrity contraints 2018-07-04 10:56:43 +08:00
Too d18deb2866 git pull origin master 2018-07-03 23:19:42 +08:00
Too fca8b7fccf reset from master 2018-07-03 23:17:29 +08:00
Jack Goh 9badd33d81 commented out some undone feature navigation bar 2018-07-03 18:23:26 +08:00
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 6c1cd5500a added credit limit exceed check 2018-07-03 18:12:40 +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