e2cf3fecdd
fix term1 no service charge
...
fix navbar extra </li>
2018-07-20 11:12:20 +08:00
aea6323a66
fix other loading button not working
2018-07-20 10:59:32 +08:00
f6c0d6aab3
Added navigation notice in user home page
...
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug
# Conflicts:
# resources/assets/js/pages/home.vue
2018-07-20 10:55:55 +08:00
a18f00c29f
added production env sample
2018-07-20 10:26:18 +08:00
a3717a19e2
complete orders/admin/refreshbutton
2018-07-19 16:16:27 +08:00
a322b8b798
fix unwanted line removal
2018-07-19 12:32:48 +08:00
fef401d76c
fix conflict
2018-07-19 12:20:54 +08:00
bd3f106e05
fix/loading for user done
2018-07-19 11:48:14 +08:00
37fdf32af1
fixed admin refresh button with loading
2018-07-19 10:11:31 +08:00
1a7dc820a9
fix production frontend issue
2018-07-19 09:51:35 +08:00
8cf011c59c
test with app env check
2018-07-19 09:49:44 +08:00
67c5b0c97b
fix webpackjson not found
2018-07-19 09:47:09 +08:00
b0071d1000
updated production frontend error
2018-07-18 22:20:49 +08:00
888519f546
removed db:seed at docker
...
update timezone
fixed production and staging frontend not showing issue
2018-07-18 11:57:36 +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
3410008dd4
final commit
2018-07-17 16:52:30 +08:00
040cc5afc0
temporary remove the notification from navbar
2018-07-16 22:03:35 +08:00
fb102df36c
Fixed Merge Conflicts
2018-07-16 19:32:56 +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
278d62b5a9
modify messaage to become json
2018-07-16 16:13:15 +08:00
81278c4273
add notification icon in navbar component
2018-07-16 14:19:00 +08:00
b21eaf4522
add new branch for booking flow for x2_chequeand x2_ba
2018-07-14 17:31:21 +08:00
62e8a9b9b6
close loading only when all resource load finish
2018-07-12 22:59:16 +08:00
19ea22141e
dynamically show chinabank in supplier report
2018-07-12 22:42:16 +08:00
1535b54f04
revert back changes during debug
2018-07-12 01:09:49 +08:00
39d5646155
dynamically show malaysia bank acc for booking step
2018-07-12 00:52:46 +08:00
d38d801638
Showing Completed Orders Task Done
2018-07-11 16:24:55 +08:00
b6e278a49a
Merge branch 'too/fixsettingvalidationbug' into 'master'
...
Too/fixsettingvalidationbug
See merge request CIEFWorldwideSdnBhd/exchange!67
2018-07-11 04:12:54 +00:00
1bc2ab91c0
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/fixsettingvalidationbug
2018-07-11 01:43:42 +08:00
6a892e093c
fix validation at register page
2018-07-11 01:42:58 +08:00
edbd8887c5
fix bug for validation. Remove nullable for malaysia bank table
2018-07-11 01:39:35 +08:00
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
28a6f43b0a
Showing Completed Orders To Admin Done Except Making Table Sortable
2018-07-10 18:08:59 +08:00
a35e4fd3c8
Showing Completed Orders To Admin
2018-07-10 15:32:22 +08:00
97453bb084
add marking setting page and integrate it
2018-07-09 20:47:55 +08:00
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
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
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
33ca8471c0
fix inline update rate dialog
2018-07-05 13:39:28 +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
Jack Goh
lonetrinity
Mouhamed Lamine
weiweitoo
Nazri Hamzah