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
b23502af45
Merge branch 'too/activebank' into 'master'
...
make acc_no unique in malaysiabank and china bank. integrate active bank page.…
See merge request CIEFWorldwideSdnBhd/exchange!63
2018-07-08 02:44:59 +00:00
bb633916a2
revert back changes during debug
2018-07-08 01:57:19 +08:00
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
71e11fa034
added marking to admin booking index
...
hide roles in user model
hide user from booking model
2018-07-07 12:12:27 +08:00
59fc234ea0
updated user has many booking to bookings
...
added index booking with user marking
added turncate marking when seeding
added turncate settingmalaysiabank when seeding
added marking to user seeder
2018-07-07 12:06:21 +08:00
2a8f5c0b3c
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/marking
2018-07-07 10:32:43 +08:00
77a2168832
fix update bug at activebankcontroller when empty record
2018-07-07 01:57:30 +08:00
af1fe2f3d1
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/activebank
2018-07-07 01:53:10 +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
781f3db9f2
Merge branch 'too/malaysiabank' into 'master'
...
Too/malaysiabank
See merge request CIEFWorldwideSdnBhd/exchange!62
2018-07-06 06:13:18 +00:00
3752de2347
Add setting malaysia bank seeder
2018-07-06 14:07:07 +08:00
84fc15adce
fix update and delete at settingmalaysiacontroller
2018-07-06 13:22:44 +08:00
36917cbd60
add malaysia bank page and integrate it with backend
2018-07-06 13:12:18 +08:00
38515c055b
Add setting malaysia bank table and controller
2018-07-05 19:10:17 +08:00
503e3aec5b
added marking to user table
...
added marking on registration
2018-07-05 17:56:49 +08:00
9a257257fb
Merge branch 'feature/credit-setting' into 'master'
...
gitignored autoload_classmap
See merge request CIEFWorldwideSdnBhd/exchange!60
2018-07-05 07:53:43 +00: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
577e3d95b7
Merge branch 'too/registerpage' into 'master'
...
Too/registerpage
See merge request CIEFWorldwideSdnBhd/exchange!48
2018-07-05 06:11:17 +00: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
5dcf9e2469
Merge branch 'nazri/integrate-frontend-backend-for-update-rate' into 'master'
...
Nazri/integrate frontend backend for update rate
See merge request CIEFWorldwideSdnBhd/exchange!59
2018-07-05 05:45:29 +00:00
098d9ba22d
fix conflict
2018-07-05 13:43:43 +08:00
33ca8471c0
fix inline update rate dialog
2018-07-05 13:39:28 +08:00
07c4f9ed92
fixed register issue
2018-07-05 13:37:00 +08:00
d5c7597307
added back name field to user table
...
fixed unable to login issue
2018-07-05 13:27:38 +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
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
340381d0b3
half fix registration page
2018-07-05 10:09:30 +08:00
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
c6ffc886f9
fix conflict
2018-07-05 01:06:53 +08:00
e462ebb78b
integrated frontend/backend for show/update rate
2018-07-05 01:03:05 +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
cfa20eac16
Merge branch 'too/suppliersetting' into 'master'
...
Too/suppliersetting
See merge request CIEFWorldwideSdnBhd/exchange!57
2018-07-04 10:27:26 +00:00
9805fd04d0
move axios configuration from external file to inline
2018-07-04 18:04:55 +08:00
ab3cba389d
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/suppliersetting
2018-07-04 17:31:21 +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
0f9a9581fd
Removing gitignore mess
2018-07-04 15:14:55 +08:00
43306d8c36
Uploaded Images made responsive
2018-07-04 15:06:44 +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
232baf76cd
fix validation error
2018-07-04 12:01:32 +08:00
54f6722472
fix npm issue
...
added name validation to register controller
fixed register frontend validator issue
2018-07-04 11:54:28 +08:00
d352cf8696
error
2018-07-04 11:46:42 +08:00
678197d40a
fix conflit
2018-07-04 11:19:33 +08:00
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
7a0d11247d
integrate add setting supplier
2018-07-04 11:17:29 +08:00
Jack Goh
Too
Nazri Hamzah
Mouhamed Lamine