Jack Goh
629b00d8a5
change login expire to 10 minutes
...
revert back to local build
2018-07-16 21:55:29 +08:00
Jack Goh
e4fa43ae0b
updated procfile
2018-07-16 15:35:05 +08:00
Jack Goh
4a83cebad8
added back composer lock because it required by deployment
2018-07-16 14:47:28 +08:00
Jack Goh
f25de1ec6b
updated composer app description name and keywords
2018-07-16 14:39:45 +08:00
Jack Goh
3c1c123bd4
added heroku post build
...
added build with manifest in local since it's not building manifest
2018-07-16 14:37:01 +08:00
Jack Goh
3f0efd4634
heroku deployment
2018-07-16 14:22:37 +08:00
Jack Goh
dcca2d62f6
Merge branch 'too/bookingflowforx2' into 'master'
...
Too/bookingflowforx2
See merge request CIEFWorldwideSdnBhd/exchange!70
2018-07-16 01:50:14 +00:00
Jack Goh
aab0ecd18e
Merge branch 'too/dynamicshowmalaysiaacc' into 'master'
...
Too/dynamicshowmalaysiaacc
See merge request CIEFWorldwideSdnBhd/exchange!69
2018-07-16 01:47:05 +00:00
weiweitoo
b21eaf4522
add new branch for booking flow for x2_chequeand x2_ba
2018-07-14 17:31:21 +08:00
weiweitoo
1c9a9aca20
missing change beneficiaries to beneficiary in seeder
2018-07-13 18:31:29 +08:00
weiweitoo
d9dfe84c2e
rename beneficiaries tobeneficiary
2018-07-13 09:58:32 +08:00
weiweitoo
440d05c900
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/dynamicshowmalaysiaacc
2018-07-12 23:00:29 +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
ad5f8df8af
revert back changes during debug
2018-07-12 01:12:26 +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
Jack Goh
b6e278a49a
Merge branch 'too/fixsettingvalidationbug' into 'master'
...
Too/fixsettingvalidationbug
See merge request CIEFWorldwideSdnBhd/exchange!67
2018-07-11 04:12:54 +00: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
7b638766e4
Merge branch 'fix/marking' into 'master'
...
fix seed contraints error
See merge request CIEFWorldwideSdnBhd/exchange!65
2018-07-08 03:55:44 +00:00
Jack Goh
766316572c
fix seed contraints error
2018-07-08 11:50:36 +08:00
Jack Goh
30bd80fb6c
Merge branch 'fix/marking' into 'master'
...
Fix/marking
See merge request CIEFWorldwideSdnBhd/exchange!64
2018-07-08 02:59:04 +00: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
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
Too
bb633916a2
revert back changes during debug
2018-07-08 01:57:19 +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
Jack Goh
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
Jack Goh
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
Jack Goh
2a8f5c0b3c
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/marking
2018-07-07 10:32:43 +08:00
Too
77a2168832
fix update bug at activebankcontroller when empty record
2018-07-07 01:57:30 +08:00
Too
af1fe2f3d1
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/activebank
2018-07-07 01:53:10 +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
Jack Goh
781f3db9f2
Merge branch 'too/malaysiabank' into 'master'
...
Too/malaysiabank
See merge request CIEFWorldwideSdnBhd/exchange!62
2018-07-06 06:13:18 +00:00
Too
3752de2347
Add setting malaysia bank seeder
2018-07-06 14:07:07 +08:00
Too
84fc15adce
fix update and delete at settingmalaysiacontroller
2018-07-06 13:22:44 +08:00
Too
36917cbd60
add malaysia bank page and integrate it with backend
2018-07-06 13:12:18 +08:00
Too
38515c055b
Add setting malaysia bank table and controller
2018-07-05 19:10:17 +08:00
Jack Goh
503e3aec5b
added marking to user table
...
added marking on registration
2018-07-05 17:56:49 +08:00
Jack Goh
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
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
577e3d95b7
Merge branch 'too/registerpage' into 'master'
...
Too/registerpage
See merge request CIEFWorldwideSdnBhd/exchange!48
2018-07-05 06:11:17 +00: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
Jack Goh
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
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
07c4f9ed92
fixed register issue
2018-07-05 13:37:00 +08:00