diff --git a/package-lock.json b/package-lock.json index 084250428a..bbfc0ce41b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1743,6 +1743,11 @@ "resolved": "https://registry.npmjs.org/chosen-js/-/chosen-js-1.8.7.tgz", "integrity": "sha512-eVdrZJ2U5ISdObkgsi0od5vIJdLwq1P1Xa/Vj/mgxkMZf14DlgobfB6nrlFi3kW4kkvKLsKk4NDqZj1MU1DCpw==" }, + "chownr": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==" + }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -2784,9 +2789,9 @@ "dev": true }, "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true }, "esutils": { @@ -3321,6 +3326,14 @@ "rimraf": "^2.2.8" } }, + "fs-minipass": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", + "requires": { + "minipass": "^2.2.1" + } + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -3654,9 +3667,9 @@ "optional": true }, "grunt": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.3.tgz", - "integrity": "sha512-/JzmZNPfKorlCrrmxWqQO4JVodO+DVd5XX4DkocL/1WlLlKVLE9+SdEIempOAxDhWPysLle6afvn/hg7Ck2k9g==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.4.tgz", + "integrity": "sha512-PYsMOrOC+MsdGEkFVwMaMyc6Ob7pKmq+deg1Sjr+vvMWp35sztfwKE7qoN51V+UEtHsyNuMcGdgMLFkBHvMxHQ==", "dev": true, "requires": { "coffeescript": "~1.10.0", @@ -3670,7 +3683,7 @@ "grunt-legacy-log": "~2.0.0", "grunt-legacy-util": "~1.1.1", "iconv-lite": "~0.4.13", - "js-yaml": "~3.5.2", + "js-yaml": "~3.13.0", "minimatch": "~3.0.2", "mkdirp": "~0.5.1", "nopt": "~3.0.6", @@ -5081,9 +5094,9 @@ } }, "jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz", + "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==" }, "jquery-mousewheel": { "version": "3.1.13", @@ -5133,13 +5146,13 @@ "dev": true }, "js-yaml": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz", - "integrity": "sha1-A3fDgBfKvHMisNH7zSWkkWQfL74=", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "dev": true, "requires": { - "argparse": "^1.0.2", - "esprima": "^2.6.0" + "argparse": "^1.0.7", + "esprima": "^4.0.0" } }, "jsbn": { @@ -5327,24 +5340,6 @@ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" }, - "lodash.assign": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", - "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", - "dev": true - }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, - "lodash.mergewith": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", - "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", - "dev": true - }, "logalot": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz", @@ -5569,6 +5564,30 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, + "minipass": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", + "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + }, + "dependencies": { + "yallist": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" + } + } + }, + "minizlib": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", + "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", + "requires": { + "minipass": "^2.2.1" + } + }, "mixin-deep": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", @@ -5632,9 +5651,9 @@ "dev": true }, "nan": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.1.tgz", - "integrity": "sha512-I6YB/YEuDeUZMmhscXKxGgZlFnhsn5y0hgOZBadkzfTRrZBtJDZeg6eQf7PYMIEclwmorTKK8GztsyOUSVBREA==", + "version": "2.13.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz", + "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==", "dev": true }, "nanomatch": { @@ -5700,7 +5719,7 @@ "request": "^2.87.0", "rimraf": "2", "semver": "~5.3.0", - "tar": "^2.0.0", + "tar": "^4.4.2", "which": "1" }, "dependencies": { @@ -5713,9 +5732,9 @@ } }, "node-sass": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz", - "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz", + "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==", "dev": true, "requires": { "async-foreach": "^0.1.3", @@ -5725,12 +5744,10 @@ "get-stdin": "^4.0.1", "glob": "^7.0.3", "in-publish": "^2.0.0", - "lodash.assign": "^4.2.0", - "lodash.clonedeep": "^4.3.2", - "lodash.mergewith": "^4.6.0", + "lodash": "^4.17.11", "meow": "^3.7.0", "mkdirp": "^0.5.1", - "nan": "^2.10.0", + "nan": "^2.13.2", "node-gyp": "^3.8.0", "npmlog": "^4.0.0", "request": "^2.88.0", @@ -7507,17 +7524,10 @@ "supports-color": "^5.3.0" } }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "optional": true - }, "js-yaml": { - "version": "3.12.2", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz", - "integrity": "sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "dev": true, "optional": true, "requires": { @@ -7538,14 +7548,24 @@ } }, "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", - "dev": true, - "requires": { - "block-stream": "*", - "fstream": "^1.0.2", - "inherits": "2" + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz", + "integrity": "sha512-BfkE9CciGGgDsATqkikUHrQrraBCO+ke/1f6SFAEMnxyyfN9lxC+nW1NFWMpqH865DhHIy9vQi682gk1X7friw==", + "requires": { + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.2.4", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.2" + }, + "dependencies": { + "yallist": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" + } } }, "tar-stream": { diff --git a/package.json b/package.json index fdf6bf68d6..7c665d7d71 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "babel-preset-stage-0": "^6.5.0", "concurrently": "^3.3.0", "connect": "^3.6.1", - "grunt": "^1.0.1", + "grunt": "^1.0.4", "grunt-babel": "^6.0.0", "grunt-bump": "^0.3.0", "grunt-cli": "^1.2.0", @@ -39,9 +39,10 @@ "grunt-shell": "^1.1.2", "grunt-text-replace": "^0.4.0", "lodash": "^4.17.5", - "node-sass": "^4.11.0" + "node-sass": "^4.12.0" }, "scripts": { + "deploy-branch": "grunt deploy-branch", "deploy-gh-pages": "grunt deploy", "start": "grunt && concurrently -k \"grunt watch\" \"grunt connect\"", "watch": "grunt watch", @@ -80,7 +81,7 @@ "datatables.net-jqui": "^1.10.15", "es6-promise": "^4.1.1", "highstock-release": "^5.0.10", - "jquery": "^3.2.1", + "jquery": "^3.4.1", "jquery-sparkline": "^2.4.0", "jquery-ui-dist": "1.12.0", "jquery-ui-iconfont": "^2.1.0", diff --git a/src/accountstatus/accountstatus.es6 b/src/accountstatus/accountstatus.es6 index 66dc70a60b..c354b9325f 100644 --- a/src/accountstatus/accountstatus.es6 +++ b/src/accountstatus/accountstatus.es6 @@ -64,7 +64,7 @@ class AccountStatus { return Promise.all([ liveapi.send({ get_account_status: 1 }), liveapi.cached.send({ website_status: 1 }), - liveapi.send({ 'get_settings': 1 }), + liveapi.cached.send({ 'get_settings': 1 }), liveapi.cached.send({ get_financial_assessment: 1 }), liveapi.send({ mt5_login_list: 1 }) ]); diff --git a/src/cashier/deposit.es6 b/src/cashier/deposit.es6 index 47991f0843..771b254924 100644 --- a/src/cashier/deposit.es6 +++ b/src/cashier/deposit.es6 @@ -154,7 +154,7 @@ function init_state(root) { }); /* get the residence field and its states */ - var residence_promise = liveapi.send({ get_settings: 1 }) + var residence_promise = liveapi.cached.send({ get_settings: 1 }) .then(function(data) { state.user.residence = data.get_settings.country_code; state.user.residence_name = data.get_settings.country; diff --git a/src/cashier/withdraw.es6 b/src/cashier/withdraw.es6 index 9e5300a757..76e616d599 100644 --- a/src/cashier/withdraw.es6 +++ b/src/cashier/withdraw.es6 @@ -297,7 +297,6 @@ class Withdraw { transfer.submit = () => { if (transfer.account === '' || transfer.amount === '') { - console.log(transfer); empty_fields.show(); return; } @@ -344,7 +343,7 @@ class Withdraw { } } - liveapi.send({ get_settings: 1 }) + liveapi.cached.send({ get_settings: 1 }) .then(data => { agent.residence = data.get_settings.country_code; const currency = local_storage.get('currency'); diff --git a/src/copytrade/copytrade.es6 b/src/copytrade/copytrade.es6 index 39a060223e..04062c1286 100644 --- a/src/copytrade/copytrade.es6 +++ b/src/copytrade/copytrade.es6 @@ -331,6 +331,7 @@ const initConfigWindow = () => { state.allowCopy.allow_copiers = 0; } else { liveapi + .cached .send({ get_settings: 1 }) .then((settings) => { state.is_loading = false; diff --git a/src/instruments/instruments.es6 b/src/instruments/instruments.es6 index 12ee7193b1..087d47a47a 100755 --- a/src/instruments/instruments.es6 +++ b/src/instruments/instruments.es6 @@ -8,6 +8,7 @@ import "common/util"; function refresh_active_symbols() { liveapi + .cached .send({ active_symbols: 'brief' }) .then(function(data) { local_storage.set('active_symbols', data.active_symbols); diff --git a/src/selfexclusion/selfexclusion.css b/src/selfexclusion/selfexclusion.css deleted file mode 100644 index 9d3ac885b6..0000000000 --- a/src/selfexclusion/selfexclusion.css +++ /dev/null @@ -1,44 +0,0 @@ -.self-exclusion .webtrader-dialog { - width: auto !important; -} - -.selfexclusion { - padding-bottom: 20px; -} - -.selfexclusion_headerContent { - padding: 10px; -} - -.selfexclusion_bodyContent { - margin: auto; - padding: 10px; - border: solid 1px #E5E5E5; - display: table; -} - -.selfexclusion_row { - display: table-row; -} - -.selfexclusion_col { - display: table-cell; - padding: 5px 5px 10px 5px; -} - -.selfexclusion_inputHint { - font-size: 11px; -} - -.selfexclusion .text-vertical-align { - line-height:2em; -} - -.selfexclusion_input { - width : 270px; -} - -.selfexclusion_updateBtnContainer { - text-align: center; - margin-top: 5px; -} diff --git a/src/selfexclusion/selfexclusion.es6 b/src/selfexclusion/selfexclusion.es6 index f240462498..35c0f2b3ca 100644 --- a/src/selfexclusion/selfexclusion.es6 +++ b/src/selfexclusion/selfexclusion.es6 @@ -85,6 +85,9 @@ const settingsData = { max_open_bets: null, session_duration_limit: null, exclude_until: null, + has_exclude_until: null, + is_iom_malta: null, + is_gamstop_client: null, timeout_until_date: null, timeout_until_time: null, binary_url_contact: getBinaryUrl('contact.html'), @@ -109,7 +112,6 @@ const settingsData = { const time = moment(scope.timeout_until_time, "HH:mm"); time_out.add(time.format('HH'), 'hours') .add(time.format('mm'), 'minutes'); - console.log(time_out, time.format('HH'),time.format('mm')); } if (time_out.isAfter(moment().add(6, "weeks"))) { message.push("Please enter a value less than 6 weeks for time out until.".i18n()); @@ -156,7 +158,7 @@ const settingsData = { if (message.length > 0) { message.forEach(function(msg, i) { - $.growl.error({ message: msg }); + $.growl.error({ message: msg, fixed: true }); }) return; } @@ -172,10 +174,10 @@ const settingsData = { $.growl.notice({ message: 'Your changes have been updated'.i18n() }); logoutBasedOnExcludeDateAndTimeOut(); setOrRefreshTimer(); + refreshData(); }) .catch(function(err) { - $.growl.error({ message: err.message }); - console.error(err); + $.growl.error({ message: err.message, fixed: true }); }); } }; @@ -245,16 +247,27 @@ const refreshData = function() { limits[index].set = true; } }); - + settingsData.has_exclude_until = response.get_self_exclusion.exclude_until; + const country_status = getCountryStatus(); + settingsData.is_iom_malta = country_status.has_iom_malta; + settingsData.is_gamstop_client = country_status.has_uk && country_status.has_iom_malta; logoutBasedOnExcludeDateAndTimeOut(); } }) .catch(function(err) { - $.growl.error({ message: err.message }); + $.growl.error({ message: err.message, fixed: true }); console.error(err); }); }; +const getCountryStatus = function() { + const authorize = local_storage.get('authorize'); + return { + has_iom_malta: /iom|malta/.test(authorize.landing_company_name), + has_uk: /gb/.test(authorize.country), + }; +} + const setOrRefreshTimer = function() { if (_.isUndefined(settingsData.session_duration_limit) || _.isNull(settingsData.session_duration_limit) || !_.isFinite(_.toNumber(settingsData.session_duration_limit))) return; diff --git a/src/selfexclusion/selfexclusion.html b/src/selfexclusion/selfexclusion.html index f736bdf5bf..1408880d94 100644 --- a/src/selfexclusion/selfexclusion.html +++ b/src/selfexclusion/selfexclusion.html @@ -1,108 +1,118 @@ -
-
+
+
Online trading can become addictive. Fill in the form below to limit your participation on the website or send a signed letter or fax to our customer support team. Once set, you can only tighten your limits. Limits - will only be removed or loosened after 7 days with the exception of the self- - exclusion date, which cannot be removed or altered once you have confirmed it. + will only be removed or loosened after 7 days with the exception of the + self-exclusion date, which cannot be removed or altered once you have confirmed it. To remove or increase your limits, please contact customer support.
-
-
-
Maximum account cash balance
-
- +
+

If you are considering self-exclusion, you may wish to register with GAMSTOP.

+

GAMSTOP is a free service that enables you to self-exclude from all online gambling companies licensed in Great Britain.

+

To find out more and to sign up with GAMSTOP, please visit www.gamstop.co.uk.

+
+
+
+
Maximum account cash balance
+
+
- Once this limit is reached, you may no longer deposit. + Once this limit is reached, you may no longer deposit.
-
-
Daily turnover limit
-
- +
+
Daily turnover limit
+
+
- Maximum aggregate contract purchases per day + Maximum aggregate contract purchases per day
-
-
Daily limit on losses
-
- +
+
Daily limit on losses
+
+
- Maximum aggregate loss per day + Maximum aggregate loss per day
-
-
7-day turnover limit
-
- +
+
7-day turnover limit
+
+
- Maximum aggregate contract purchases over a 7-day period + Maximum aggregate contract purchases over a 7-day period
-
-
7-day limit on losses
-
- +
+
7-day limit on losses
+
+
- Maximum aggregate contract purchases over a 7-day period + Maximum aggregate contract purchases over a 7-day period
-
-
30-day turnover limit
-
- +
+
30-day turnover limit
+
+
- Maximum aggregate contract purchases over a 30-day period + Maximum aggregate contract purchases over a 30-day period
-
-
30-day limit on losses
-
- +
+
30-day limit on losses
+
+
- Maximum aggregate loss over a 30-day period + Maximum aggregate loss over a 30-day period
-
-
Maximum number of open positions
-
- +
+
Maximum number of open positions
+
+
-
-
Session duration limit, in minutes
-
- +
+
Session duration limit, in minutes
+
+
- You will be automatically logged out after such time + You will be automatically logged out after such time
-
-
Time out until
-
- +
+
Time out until
+
+
- Please enter date in the format YYYY-MM-DD + Please enter date in the format YYYY-MM-DD
-
- - Please enter time in the format HH:MM +
+ + Please enter time in the format HH:MM
-
-
Exclude me from the website until
-
- +
+
Exclude me from the website until
+
+
- Please enter date in the format YYYY-MM-DD + Please enter date in the format YYYY-MM-DD
-
- +
+ +
+
+

Self-exclusion on this website only applies to your Binary.com account and does not include other companies or websites.

+

Since you feel the need to self-exclude, we strongly encourage you to exclude yourself from similar services that you may have signed up for.

+

To self-exclude from all online gambling companies licensed in Great Britain, you may go to www.gamstop.co.uk.

diff --git a/src/selfexclusion/selfexclusion.scss b/src/selfexclusion/selfexclusion.scss new file mode 100644 index 0000000000..baed4ca4d9 --- /dev/null +++ b/src/selfexclusion/selfexclusion.scss @@ -0,0 +1,51 @@ +.self-exclusion { + padding-bottom: 20px; + + .webtrader-dialog { + width: auto !important; + } + .text-vertical-align { + line-height: 2em; + } + &_header { + padding: 10px; + + p { + margin-top: 0; + } + } + &_body { + margin: auto; + padding: 10px; + border: solid 1px #E5E5E5; + display: table; + } + &_row { + display: table-row; + } + &_col { + display: table-cell; + padding: 5px 5px 10px 5px; + } + &_input { + width : 270px; + + &-hint { + font-size: 11px; + } + } + &_update-btn { + &-container { + text-align: center; + margin-top: 20px; + } + } + &_notice { + margin: 10px auto; + color: #000; + background-color: #fef1cf; + padding: 10px; + overflow: hidden; + font-size: 16px; + } +} diff --git a/src/statement/statement.es6 b/src/statement/statement.es6 index 3ae934b8f5..c9560ce194 100644 --- a/src/statement/statement.es6 +++ b/src/statement/statement.es6 @@ -84,7 +84,8 @@ const refreshTable = (yyy_mm_dd) => { if(!loading) { loading = true; - liveapi.send(request) + liveapi + .send(request) .then(refresh) .catch((err) => { refresh({}); diff --git a/src/trade/tradeDialog.es6 b/src/trade/tradeDialog.es6 index 4b47ac63f3..879686730c 100644 --- a/src/trade/tradeDialog.es6 +++ b/src/trade/tradeDialog.es6 @@ -440,7 +440,7 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) { var update_currency = function() { /* change currency on user login */ if(liveapi.is_authenticated()) { - liveapi.send({payout_currencies: 1}) + liveapi.send({ payout_currencies: 1 }) .then(function(data){ state.currency.value = data.payout_currencies[0]; state.currency.array = data.payout_currencies; diff --git a/src/trade/tradeMenu.es6 b/src/trade/tradeMenu.es6 index f14216cbb8..2a5dde0e10 100644 --- a/src/trade/tradeMenu.es6 +++ b/src/trade/tradeMenu.es6 @@ -10,6 +10,7 @@ const show_error = (err) => { }; const refresh_active_symbols = () => { liveapi + .cached .send({ active_symbols: 'brief' }) .then((data) => { /* clean up the data! */ diff --git a/src/viewtransaction/viewTransaction.es6 b/src/viewtransaction/viewTransaction.es6 index fdb744e3e4..a22f7387f7 100644 --- a/src/viewtransaction/viewTransaction.es6 +++ b/src/viewtransaction/viewTransaction.es6 @@ -57,7 +57,7 @@ const initChart = (root, state, options) => { for (let i = 0; i < times.length; ++i) { data.push([times[i] * 1000, prices[i] * 1]); - display_decimals = Math.max(display_decimals, prices[i].substring(prices[i].indexOf('.') + 1).length); + display_decimals = Math.max(display_decimals, prices[i].toString().substring(prices[i].toString().indexOf('.') + 1).length); } } diff --git a/src/websitestatus/websitestatus.es6 b/src/websitestatus/websitestatus.es6 index c38e54ee9f..118d7fd469 100644 --- a/src/websitestatus/websitestatus.es6 +++ b/src/websitestatus/websitestatus.es6 @@ -32,4 +32,4 @@ const set_currency_config = (website_status) => { }; liveapi.events.on('website_status', website_status); -liveapi.cached.send({ website_status: 1 }).then(website_status); \ No newline at end of file +liveapi.cached.send({ website_status: 1 }).then(website_status); diff --git a/translations/i18n/it.po b/translations/i18n/it.po index 1df0efb0be..17443f4827 100644 --- a/translations/i18n/it.po +++ b/translations/i18n/it.po @@ -7,10 +7,10 @@ msgstr "" "X-Crowdin-File: /development/translations/i18n/messages.pot\n" "Project-Id-Version: webtrader\n" "Content-Type: text/plain; charset=UTF-8\n" -"Last-Translator: binarycom \n" +"Last-Translator: binarycom\n" "Language-Team: Italian\n" "Language: it_IT\n" -"PO-Revision-Date: 2019-03-20 16:02\n" +"PO-Revision-Date: 2019-04-22 02:40\n" msgid "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" msgstr "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" @@ -802,16 +802,16 @@ msgid "In order to properly apply theme, a full refresh of page is required. Are msgstr "Per poter applicare lo sfondo in modo adeguato, è richiesto l'aggiornamento della pagina. Sei sicuro di voler procedere?" msgid "In the EU, financial products are offered by Binary Investments (Europe) Ltd., Mompalao Building, Suite 2, Tower Road, Msida MSD1825, Malta, licensed and regulated as a Category 3 Investment Services provider by the Malta Financial Services Authority ([_1]licence no. IS/70156[_2])." -msgstr "" +msgstr "Nell'UE, i prodotti finanziari sono offerti da Binary Investments (Europe) Ltd., Mompalao Building, Suite 2, Tower Road, Msida MSD1825, Malta, autorizzata e regolamentata come appartenente alla Categoria 3 dei fornitori di servizi di investimento dalla Malta Financial Services Authority ([_1]licenza n. IS/70156[_2])." msgid "In the EU, financial products are offered by Binary Investments (Europe) Ltd., Mompalao Building, Suite 2, Tower Road, Msida MSD1825, Malta, regulated as a Category 3 Investment Services provider by the Malta Financial Services Authority ([_1]licence no. IS/70156[_2])." -msgstr "" +msgstr "Nell'UE, i prodotti finanziari sono offerti da Binary Investments (Europe) Ltd., Mompalao Building, Suite 2, Tower Road, Msida MSD1825, Malta, regolamentata come appartenente alla Categoria 3 dei fornitori di servizi di investimento dalla Malta Financial Services Authority ([_1]licenza n. IS/70156[_2])." msgid "In the Isle of Man and the UK, Volatility Indices are offered by Binary (IOM) Ltd., First Floor, Millennium House, Victoria Road, Douglas, IM2 4RW, Isle of Man, British Isles; licensed and regulated respectively by (1) the Gambling Supervision Commission in the Isle of Man (current licence issued on 31 August 2017) and by (2) the Gambling Commission in the UK (licence [_1]reference no: 39172[_2])." msgstr "Nell'Isola di Man e nel Regno Unito, gli indici di volatilità sono offerti da Binary (IOM) Ltd., primo piano, Millennium House, Victoria Road, Douglas, IM2 4RW, Isola di Man, Isole Britanniche; autorizzata e regolamentata rispettivamente dalla (1) Gambling Supervision Commission dell'Isola di Man (licenza attuale emessa il 31 agosto 2017) e dalla (2) Gambling Commission del Regno Unito ([_1]licenza n. 39172[_2])." msgid "In the rest of the EU, Volatility Indices are offered by Binary (Europe) Ltd., Mompalao Building, Suite 2, Tower Road, Msida MSD1825, Malta; licensed and regulated by (1) the Malta Gaming Authority in Malta (licence no. MGA/B2C/102/2000 issued on 01 August 2018), for UK clients by (2) the UK Gambling Commission (licence [_1]reference no: 39495[_2]), and for Irish clients by (3) the Revenue Commissioners in Ireland (Remote Bookmaker's Licence no. 1010285 issued on 1 July 2017). View complete [_3]Regulatory Information[_4]." -msgstr "" +msgstr "Nel resto dell'UE, gli indici di volatilità sono offerti dalla Binary (Europe) Ltd., Mompalao Building, Suite 2, Tower Road, Msida MSD1825, Malta, autorizzata e regolamentata dalla (1) Malta Gaming Authority di Malta (licenza n. MGA/B2C/102/2000 rilasciata il 01 agosto 2018); per i clienti nel Regno Unito dalla (2) UK Gambling Commission (licenza [_1]n. 39495[_2]) e per i clienti in Irlanda dalla (3) Revenue Commissioners irlandese (licenza del Remote Bookmaker n. 1010285 emessa l'1 luglio 2017). Consulta le [_3]informazioni complete sulla regolamentazione[_4]." msgid "In/Out" msgstr "In/Out" @@ -928,16 +928,16 @@ msgid "Loading Statement Table ..." msgstr "Caricamento dell'estratto conto..." msgid "Loading Token management ..." -msgstr "" +msgstr "Caricamento della gestione dei token ..." msgid "Loading Trading Times ..." -msgstr "" +msgstr "Caricamento degli orari di trading ..." msgid "Loading chart and trade menus ..." -msgstr "" +msgstr "Caricamento dei menu grafici e di trading ..." msgid "Loading custom theme configuration..." -msgstr "" +msgstr "Caricamento della configurazione dello sfondo personalizzata..." msgid "Loading portfolio ..." msgstr "Caricamento del portafoglio..." @@ -1171,7 +1171,7 @@ msgid "Other" msgstr "Altro" msgid "Outside the EU, financial products are offered by Binary (C.R.) S.A., 5th Floor, Building 6 Centro Ejecutivo La Sabana, Sabana Sur, San José, Costa Rica, Binary (V) Ltd, Govant Building, Port Vila, PO Box 1276, Vanuatu, regulated by the Vanuatu Financial Services Commission ([_1]view licence[_2]), Binary (BVI) Ltd, 2nd Floor, O’Neal Marketing Associates Building, Wickham’s Cay II, P.O. Box 3174, Road Town, Tortola VB1110, British Virgin Islands, regulated by the British Virgin Islands Financial Services Commission ([_3]licence no. SIBA/L/18/1114[_4]), and Binary (FX) Ltd., Lot No. F16, First Floor, Paragon Labuan, Jalan Tun Mustapha, 87000 Labuan, Malaysia, regulated by the Labuan Financial Services Authority to carry on a money-broking business ([_5]licence no. MB/18/0024[_6])" -msgstr "" +msgstr "Al di fuori dell'UE, i prodotti finanziari vengono offerti da Binary (C.R.) S.A., quinto piano, Building 6 Centro Ejecutivo La Sabana, Sabana Sur, San José, Costa Rica, Binary (V) Ltd, Govant Building, Port Vila, PO Box 1276, Vanuatu, regolamentata dalla Vanuatu Financial Services Commission ([_1]visualizza licenza[_2]); Binary (BVI) Ltd, secondo piano, O’Neal Marketing Associates Building, Wickham’s Cay II, P.O. Box 3174, Road Town, Tortola VB1110, Isole Vergini britanniche, regolamentata dalla British Virgin Islands Financial Services Commission ([_3]licenza n. SIBA/L/18/1114[_4]) e Binary (FX) Ltd., lotto n. F16, primo piano, Paragon Labuan, Jalan Tun Mustapha, 87000 Labuan, Malaysia, regolamentata dalla Labuan Financial Services Authority per eseguire attività di intermediazione nel mercato finanziario ([_5]licenza n. MB/18/0024[_6])" msgid "Over" msgstr "Su" @@ -1183,7 +1183,7 @@ msgid "Overlap Studies" msgstr "Studi sovrapposti" msgid "PM" -msgstr "" +msgstr "PM" msgid "Password successfully updated." msgstr "La password è stata aggiornata." @@ -1453,7 +1453,7 @@ msgid "Self-Exclusion" msgstr "Auto esclusione" msgid "Self-Exclusion Facilities" -msgstr "" +msgstr "Funzioni di auto esclusione" msgid "Sell At Market" msgstr "Vendere sul mercato" @@ -1606,7 +1606,7 @@ msgid "The company holds customer funds in separate bank accounts to the operati msgstr "La società detiene i fondi dei clienti in conti bancari separati da quelli operativi, i quali non faranno parte, in caso di insolvenza, dell'asset della Società. Ciò rispecchia i requisiti della Commissione sul gioco d'azzardo per la segregazione dei fondi dei clienti a livello" msgid "The financial products offered via this website include binary options, contracts for difference (\"CFDs\") and other complex derivatives and financial products. Trading binary options may not be suitable for everyone. Trading CFDs carries a high level of risk since leverage can work both to your advantage and disadvantage. As a result, the products offered on this website may not be suitable for all investors because of the risk of losing all of your invested capital. You should never invest money that you cannot afford to lose, and never trade with borrowed money. Before trading in the complex financial products offered, please be sure to understand the risks involved and learn about [_1]Responsible Trading[_2]." -msgstr "" +msgstr "I prodotti finanziari offerti tramite il presente sito web includono opzioni binarie, contratti per differenza (CFD) e altri complessi strumenti derivati e prodotti finanziari. Il trading di opzioni binarie potrebbe non essere adatto a tutti. Il trading di CFD implica un elevato livello di rischio, poiché la leva finanziaria può agire sia a vantaggio che a svantaggio del Cliente. Di conseguenza, i prodotti finanziari offerti su questo sito web potrebbero non essere idonei per tutti gli investitori a causa del rischio di perdere l'intero capitale investito. È raccomandabile che i clienti non investano denaro che non possono permettersi di perdere e non effettuino trade con denaro prestato. Prima di fare trading con i complessi strumenti finanziari offerti, suggeriamo di accertarsi di comprendere i rischi potenziali e approfondire il tema del [_1]Trading Responsabile[_2]." msgid "There was a market data disruption during the contract period. For real-money accounts we will attempt to correct this and settle the contract properly, otherwise the contract will be cancelled and refunded. Virtual-money contracts will be cancelled and refunded." msgstr "" @@ -1627,7 +1627,7 @@ msgid "This field is required" msgstr "Questo campo è obbligatorio" msgid "This website’s services are not made available in certain countries such as the USA, Canada, Costa Rica, Hong Kong, Japan, or to persons under age 18." -msgstr "" +msgstr "I servizi di questo sito web non vengono resi disponibili in alcuni paesi come USA, Canada, Costa Rica, Hong Kong e Giappone, e agli individui di età inferiore ai 18 anni." msgid "Thu" msgstr "Gio" @@ -2101,5 +2101,5 @@ msgid "| Return" msgstr "| Rendimento" msgid "" -msgstr "" +msgstr "" diff --git a/translations/i18n/zh_cn.po b/translations/i18n/zh_cn.po index 80b60f7d46..4c10283ec2 100644 --- a/translations/i18n/zh_cn.po +++ b/translations/i18n/zh_cn.po @@ -7,10 +7,10 @@ msgstr "" "X-Crowdin-File: /development/translations/i18n/messages.pot\n" "Project-Id-Version: webtrader\n" "Content-Type: text/plain; charset=UTF-8\n" -"Last-Translator: binarycom \n" +"Last-Translator: binarycom\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" -"PO-Revision-Date: 2019-04-05 14:40\n" +"PO-Revision-Date: 2019-04-25 02:50\n" msgid "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" msgstr "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" @@ -187,7 +187,7 @@ msgid "Account token not found." msgstr "找不到账户令牌。" msgid "Action" -msgstr "操作" +msgstr "交易" msgid "Active" msgstr "活跃" diff --git a/translations/i18n/zh_tw.po b/translations/i18n/zh_tw.po index 8725b6a20c..62a55eaa7d 100644 --- a/translations/i18n/zh_tw.po +++ b/translations/i18n/zh_tw.po @@ -7,10 +7,10 @@ msgstr "" "X-Crowdin-File: /development/translations/i18n/messages.pot\n" "Project-Id-Version: webtrader\n" "Content-Type: text/plain; charset=UTF-8\n" -"Last-Translator: binarycom \n" +"Last-Translator: binarycom\n" "Language-Team: Chinese Traditional\n" "Language: zh_TW\n" -"PO-Revision-Date: 2019-04-05 14:40\n" +"PO-Revision-Date: 2019-04-25 02:50\n" msgid "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" msgstr "\"http://www.gamblingcommission.gov.uk/Consumers/Protection-of-customer-funds.aspx\"" @@ -187,7 +187,7 @@ msgid "Account token not found." msgstr "找不到帳戶權杖。" msgid "Action" -msgstr "動作" +msgstr "交易" msgid "Active" msgstr "活躍"