796e8bf6df
fix marking bug - when typing chinese
2018-08-13 12:07:15 +08:00
615dff66fc
fixed the marking bug
2018-08-09 16:47:04 +08:00
ec7964face
fix credit setting error
2018-07-31 16:54:03 +08:00
78fbe3151c
Fix_orderNo/RefNoPArt2
2018-07-27 17:35:10 +08:00
f1d49ef82c
Fix-OrderNo/RefNo
2018-07-27 17:24:37 +08:00
3c70fc22e5
fix empty supplier, china, malaysia bank setting page due to vee-validate
2018-07-27 15:36:43 +08:00
68add5f1a2
disable cache in caddy
2018-07-27 14:10:34 +08:00
af1f85e662
Merge branch 'Lingges/Fix_user_refresh_rae_loading' into 'master'
...
Lingges/fix user refresh rae loading
See merge request CIEFWorldwideSdnBhd/exchange!87
2018-07-27 03:09:09 +00:00
4f3d225084
fix/Admin/Settings
2018-07-26 17:55:55 +08:00
7e49714be6
70%done
2018-07-25 17:43:38 +08:00
7229d71109
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug
...
# Conflicts:
# resources/assets/js/components/LocaleDropdown.vue
# resources/assets/js/pages/home.vue
2018-07-22 15:39:35 +08:00
c4962e4655
git pull origin master
2018-07-20 22:12:48 +08:00
21c13d3e60
change billingcharge rate and tax rate table to double. Modify Customer calculation table
2018-07-20 21:16:36 +08:00
73c36dd8e3
Add setting for taxrate and billingcharge
2018-07-20 18:47:19 +08:00
b971fc79ce
added a option to let admin choose to use customer's beneficiary in supplier report
2018-07-20 14:54:52 +08:00
34bc7a43c6
Add CRUD for marking setting
2018-07-20 00:58:47 +08:00
6e849b6145
Show download button for non-preview able file in the complete page.
2018-07-18 23:53:04 +08:00
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
040cc5afc0
temporary remove the notification from navbar
2018-07-16 22:03:35 +08:00
d29d3c49eb
Adding Completed Orders Link on Admin Nav Bar
2018-07-16 19:15:01 +08:00
1474f87488
change axios to normal axios
2018-07-16 17:36:55 +08:00
edbd8887c5
fix bug for validation. Remove nullable for malaysia bank table
2018-07-11 01:39:35 +08:00
97453bb084
add marking setting page and integrate it
2018-07-09 20:47:55 +08:00
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
36917cbd60
add malaysia bank page and integrate it with backend
2018-07-06 13:12:18 +08:00
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
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
098d9ba22d
fix conflict
2018-07-05 13:43:43 +08:00
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
1793a2ac8d
changed client to axios in supplier setting
2018-07-05 11:43:42 +08:00
45c81597bd
git pull origin master
2018-07-04 23:30:14 +08:00
4959de9dd5
done integrate for cief bank setting page
2018-07-04 23:28:07 +08:00
9805fd04d0
move axios configuration from external file to inline
2018-07-04 18:04:55 +08:00
42476f9b57
move vee-validate to index.js
2018-07-04 17:30:06 +08:00
aa7c665d9c
add validation for supplier form
2018-07-04 17:27:44 +08:00
bfae59bf1e
integrate edit feature
2018-07-04 16:30:34 +08:00
55455b89d7
integrate delete supplier
2018-07-04 14:35:42 +08:00
080851675c
integrate index in suplier page
2018-07-04 13:31:10 +08:00
7a0d11247d
integrate add setting supplier
2018-07-04 11:17:29 +08:00
c964e702a3
fix register page submit button. Check duplicated user register. Fix typo in register page.Add Marking seeder.
2018-07-02 22:44:41 +08:00
d1d5aaf694
fixed bug admin setting frontend
2018-06-29 00:56:00 +08:00
fe07b7cd64
first commit
2018-06-28 22:26:06 +08:00
2ddd9704bd
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into integration/upload-invoice
...
# Conflicts:
# resources/assets/js/router/routes.js
2018-06-28 11:41:39 +08:00
2b4ddadfcb
rename book_id in po table to booking_id to perform ORM relantionship
...
added relationship between booking and po
updated settings shows for different role
added function to display po for admin
2018-06-28 10:06:26 +08:00
5e62b3e90d
complete the top nav content
2018-06-27 15:42:16 +08:00
045c137dab
update dialog name
2018-06-26 17:28:22 +08:00
c8ff54f79a
completed the setting content
2018-06-26 16:55:31 +08:00
069883deeb
complete the admin setting navbar
2018-06-25 16:57:18 +08:00
620e496f0e
update route.js
2018-06-22 16:53:14 +08:00
06aa931eb5
added wait for mysql to start in docker
...
fix role not found on register/login
2018-05-14 12:45:30 +08:00
Jack Goh
Mohd Arief
lonetrinity
weiweitoo
Mouhamed Lamine
Nazri Hamzah
jack