3aca31cdeb
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into deployment/staging
2018-07-17 17:31:09 +08:00
ba78c313b2
fix application not found in bootstrap app.php
2018-07-17 17:29:22 +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
d2337953a6
Halfway through the task
2018-07-17 16:41:09 +08:00
8c31bcc420
remove date option in supplier report. upload china bankslip detail should be optional. make accept for uploadpurchaseorder - frontend only
2018-07-17 16:31:37 +08:00
e92e9b551f
updated readme
2018-07-17 11:28:14 +08:00
31ee05cbe9
added .env-example
2018-07-17 11:21:58 +08:00
e81b9d1f20
Merge branch 'too/frontend-notification' into 'master'
...
temporary remove the notification from navbar
See merge request CIEFWorldwideSdnBhd/exchange!73
2018-07-16 14:06:12 +00:00
040cc5afc0
temporary remove the notification from navbar
2018-07-16 22:03:35 +08:00
934de5d7a2
Merge branch 'too/frontend-notification' into 'master'
...
Too/frontend notification
See merge request CIEFWorldwideSdnBhd/exchange!72
2018-07-16 14:03:10 +00:00
629b00d8a5
change login expire to 10 minutes
...
revert back to local build
2018-07-16 21:55:29 +08:00
fb102df36c
Fixed Merge Conflicts
2018-07-16 19:32:56 +08:00
e868c99440
Added the track status thing
2018-07-16 19:26:09 +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
e4fa43ae0b
updated procfile
2018-07-16 15:35:05 +08:00
4a83cebad8
added back composer lock because it required by deployment
2018-07-16 14:47:28 +08:00
f25de1ec6b
updated composer app description name and keywords
2018-07-16 14:39:45 +08:00
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
3f0efd4634
heroku deployment
2018-07-16 14:22:37 +08:00
81278c4273
add notification icon in navbar component
2018-07-16 14:19:00 +08:00
dcca2d62f6
Merge branch 'too/bookingflowforx2' into 'master'
...
Too/bookingflowforx2
See merge request CIEFWorldwideSdnBhd/exchange!70
2018-07-16 01:50:14 +00:00
aab0ecd18e
Merge branch 'too/dynamicshowmalaysiaacc' into 'master'
...
Too/dynamicshowmalaysiaacc
See merge request CIEFWorldwideSdnBhd/exchange!69
2018-07-16 01:47:05 +00:00
b21eaf4522
add new branch for booking flow for x2_chequeand x2_ba
2018-07-14 17:31:21 +08:00
1c9a9aca20
missing change beneficiaries to beneficiary in seeder
2018-07-13 18:31:29 +08:00
d9dfe84c2e
rename beneficiaries tobeneficiary
2018-07-13 09:58:32 +08:00
440d05c900
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/dynamicshowmalaysiaacc
2018-07-12 23:00:29 +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
ad5f8df8af
revert back changes during debug
2018-07-12 01:12:26 +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
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
766316572c
fix seed contraints error
2018-07-08 11:50:36 +08:00
30bd80fb6c
Merge branch 'fix/marking' into 'master'
...
Fix/marking
See merge request CIEFWorldwideSdnBhd/exchange!64
2018-07-08 02:59:04 +00: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
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
Jack Goh
Mouhamed Lamine
weiweitoo