Commit Graph

249 Commits

Author SHA1 Message Date
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
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
weiweitoo 6e849b6145 Show download button for non-preview able file in the complete page. 2018-07-18 23:53:04 +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
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
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
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
weiweitoo 97453bb084 add marking setting page and integrate it 2018-07-09 20:47:55 +08:00
Jack Goh 72a4f6645f Added marking to admin home page
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/marking

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-07-08 10:53:24 +08:00
Jack Goh 538adc7366 added marking to bookings api
changed hard coded marking in booking details to dynamic for frontend
2018-07-07 16:15:32 +08:00
Too bddef7d16f make acc_no unique in malaysiabank and china bank. integrate active bank page. add seeder for beneficiares and active bank. add table setting_active_bank 2018-07-07 01:52:35 +08:00
Too 36917cbd60 add malaysia bank page and integrate it with backend 2018-07-06 13:12:18 +08:00
Jack Goh 0180694d72 gitignored autoload_classmap
removed setting-credit for post, delete and get one routes
completed admin credit limit and time out update feature
fixed drop down rate issue
fixed the controller show and update issue
2018-07-05 15:47:19 +08:00
Jack Goh b48f3c8b1d Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage
# Conflicts:
#	package-lock.json
#	vendor/composer/autoload_static.php
2018-07-05 14:07:37 +08:00
Nazri Hamzah 098d9ba22d fix conflict 2018-07-05 13:43:43 +08:00
Nazri Hamzah 33ca8471c0 fix inline update rate dialog 2018-07-05 13:39:28 +08:00
Jack Goh d5c7597307 added back name field to user table
fixed unable to login issue
2018-07-05 13:27:38 +08:00
Jack Goh 560035be09 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage
# Conflicts:
#	package-lock.json
#	package.json
#	resources/assets/js/pages/settings/admin-supplier.vue
#	vendor/composer/autoload_static.php
2018-07-05 11:52:38 +08:00
Jack Goh 1793a2ac8d changed client to axios in supplier setting 2018-07-05 11:43:42 +08:00
Jack Goh 09f2dcf579 Merge branch 'too/chinabanksetting' into 'master'
done integrate for cief bank setting page

See merge request CIEFWorldwideSdnBhd/exchange!58
2018-07-05 03:05:56 +00:00
Jack Goh 340381d0b3 half fix registration page 2018-07-05 10:09:30 +08:00
Jack Goh 41012cf4b9 Merge branch 'frontend/making-uploaded-images-responsive' into 'master'
Frontend/making uploaded images responsive

See merge request CIEFWorldwideSdnBhd/exchange!56
2018-07-05 01:45:07 +00:00
Nazri Hamzah c6ffc886f9 fix conflict 2018-07-05 01:06:53 +08:00
Nazri Hamzah e462ebb78b integrated frontend/backend for show/update rate 2018-07-05 01:03:05 +08:00
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
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