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
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
Mouhamed Lamine
0f9a9581fd
Removing gitignore mess
2018-07-04 15:14:55 +08:00
Mouhamed Lamine
43306d8c36
Uploaded Images made responsive
2018-07-04 15:06:44 +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
Jack Goh
232baf76cd
fix validation error
2018-07-04 12:01:32 +08:00
Jack Goh
54f6722472
fix npm issue
...
added name validation to register controller
fixed register frontend validator issue
2018-07-04 11:54:28 +08:00
Nazri Hamzah
d352cf8696
error
2018-07-04 11:46:42 +08:00
Jack Goh
8798c83b97
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage
...
# Conflicts:
# package-lock.json
# package.json
# vendor/composer/autoload_static.php
# yarn.lock
2018-07-04 11:17:44 +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
Too
dae26ccb83
add validation of registeration form
2018-07-03 22:27:26 +08:00