omair/exchange
1
0
Fork 0
mirror of https://gitlab.com/omair-personal/exchange.git synced 2026-08-21 13:34:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
556 Commits 28 Branches 0 Tags
a999d92b055ee8803f577087023b2ec8756e2439
Commit Graph

264 Commits

Author SHA1 Message Date
lonetrinity a999d92b05 npmError 2018-09-12 20:35:28 +08:00
Jack Goh 7aa22bf804 fixed internal error on booking confirmation 2018-07-22 14:21:40 +08:00
Jack Goh df8ae0a931 Merge branch 'too/fix-bug' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/fix-bug 2018-07-22 14:08:20 +08:00
weiweitoo a0f80aa41b fix booking confirmation 2018-07-21 14:16:39 +08:00
weiweitoo 1b874d0800 Fix conflit 2018-07-21 01:43:10 +08:00
weiweitoo 3e60ec8e86 fix conflit 2018-07-21 00:15:43 +08:00
weiweitoo c4962e4655 git pull origin master 2018-07-20 22:12:48 +08:00
weiweitoo 21c13d3e60 change billingcharge rate and tax rate table to double. Modify Customer calculation table 2018-07-20 21:16:36 +08:00
weiweitoo 73c36dd8e3 Add setting for taxrate and billingcharge 2018-07-20 18:47:19 +08:00
Jack Goh d3a995c6b5 Merge branch 'frontend/making-every-user-page-responsive' into 'master' 
Frontend/making every user page responsive

See merge request CIEFWorldwideSdnBhd/exchange!74
 2018-07-20 09:44:31 +00:00
Mouhamed Lamine 1cccefdb8a Discussion Fixed 2018-07-20 17:42:27 +08:00
weiweitoo 4bb40e3643 display china beneficiary information in all order detail 2018-07-20 17:20:02 +08:00
weiweitoo 34bc7a43c6 Add CRUD for marking setting 2018-07-20 00:58:47 +08:00
weiweitoo d97d7f4cb4 Fix user page pagination 2018-07-19 18:08:04 +08:00
weiweitoo d01f14d9f7 Remove some unnessary console.log 2018-07-19 18:01:16 +08:00
weiweitoo ef200257b3 revert back changes during debug 2018-07-19 17:49:02 +08:00
weiweitoo 16205404e1 Fix upload issue. allow po to upload multiple and display multiple. Display download link when the uploaded file is not image 2018-07-19 17:45:25 +08:00
lonetrinity a3717a19e2 complete orders/admin/refreshbutton 2018-07-19 16:16:27 +08:00
lonetrinity a322b8b798 fix unwanted line removal 2018-07-19 12:32:48 +08:00
lonetrinity fef401d76c fix conflict 2018-07-19 12:20:54 +08:00
lonetrinity bd3f106e05 fix/loading for user done 2018-07-19 11:48:14 +08:00
lonetrinity 37fdf32af1 fixed admin refresh button with loading 2018-07-19 10:11:31 +08:00
weiweitoo 6e849b6145 Show download button for non-preview able file in the complete page. 2018-07-18 23:53:04 +08:00
Mouhamed Lamine 9670454c61 Almost Done 2018-07-18 21:48:34 +08:00
weiweitoo eda6aabecf Fix filter 2018-07-18 17:31:11 +08:00
weiweitoo 812040a433 fix timezone issue. Add refresh rate button. Add success message for all refresh button. Fix typo in user step 4 2018-07-18 15:38:06 +08:00
weiweitoo a35c07a794 Add admin page 1. show error when upload wrong file in upload po and invoice 2018-07-18 14:35:05 +08:00
Jack Goh fb8951265d Merge branch 'frontend/making-uploaded-images-responsive' into 'master' 
Showing Completed Orders Task Done

See merge request CIEFWorldwideSdnBhd/exchange!68
 2018-07-17 08:53:22 +00:00
Mouhamed Lamine 3410008dd4 final commit 2018-07-17 16:52:30 +08:00
Mouhamed Lamine d2337953a6 Halfway through the task 2018-07-17 16:41:09 +08:00
weiweitoo 8c31bcc420 remove date option in supplier report. upload china bankslip detail should be optional. make accept for uploadpurchaseorder - frontend only 2018-07-17 16:31:37 +08:00
Jack Goh 040cc5afc0 temporary remove the notification from navbar 2018-07-16 22:03:35 +08:00
Mouhamed Lamine fb102df36c Fixed Merge Conflicts 2018-07-16 19:32:56 +08:00
Mouhamed Lamine d29d3c49eb Adding Completed Orders Link on Admin Nav Bar 2018-07-16 19:15:01 +08:00
weiweitoo 1474f87488 change axios to normal axios 2018-07-16 17:36:55 +08:00
weiweitoo 278d62b5a9 modify messaage to become json 2018-07-16 16:13:15 +08:00
weiweitoo 81278c4273 add notification icon in navbar component 2018-07-16 14:19:00 +08:00
weiweitoo b21eaf4522 add new branch for booking flow for x2_chequeand x2_ba 2018-07-14 17:31:21 +08:00
weiweitoo 62e8a9b9b6 close loading only when all resource load finish 2018-07-12 22:59:16 +08:00
weiweitoo 19ea22141e dynamically show chinabank in supplier report 2018-07-12 22:42:16 +08:00
weiweitoo 1535b54f04 revert back changes during debug 2018-07-12 01:09:49 +08:00
weiweitoo 39d5646155 dynamically show malaysia bank acc for booking step 2018-07-12 00:52:46 +08:00
Mouhamed Lamine d38d801638 Showing Completed Orders Task Done 2018-07-11 16:24:55 +08:00
Jack Goh b6e278a49a Merge branch 'too/fixsettingvalidationbug' into 'master' 
Too/fixsettingvalidationbug

See merge request CIEFWorldwideSdnBhd/exchange!67
 2018-07-11 04:12:54 +00:00
weiweitoo 1bc2ab91c0 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/fixsettingvalidationbug 2018-07-11 01:43:42 +08:00
weiweitoo 6a892e093c fix validation at register page 2018-07-11 01:42:58 +08:00
weiweitoo edbd8887c5 fix bug for validation. Remove nullable for malaysia bank table 2018-07-11 01:39:35 +08:00
Jack Goh 0d687279e6 Merge branch 'too/markingsettingpage' into 'master' 
add marking setting page and integrate it

See merge request CIEFWorldwideSdnBhd/exchange!66
 2018-07-10 16:19:58 +00:00
Mouhamed Lamine 28a6f43b0a Showing Completed Orders To Admin Done Except Making Table Sortable 2018-07-10 18:08:59 +08:00
Mouhamed Lamine a35e4fd3c8 Showing Completed Orders To Admin 2018-07-10 15:32:22 +08:00