Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
a7d880d
New translations en.json (Spanish)
ashkanx May 22, 2019
3062f19
New translations en.json (Spanish)
ashkanx May 22, 2019
b44706c
New translations en.json (Spanish)
ashkanx May 22, 2019
77028ae
New translations en.json (Spanish)
ashkanx May 22, 2019
cc603d1
New translations en.json (Spanish)
ashkanx May 22, 2019
b5cfa3b
New translations en.json (Spanish)
ashkanx May 22, 2019
2f060d5
New translations en.json (Spanish)
ashkanx May 22, 2019
7f3fdcd
New translations en.json (Spanish)
ashkanx May 22, 2019
885089a
New translations en.json (Spanish)
ashkanx May 22, 2019
996a964
New translations en.json (Spanish)
ashkanx May 22, 2019
4c6292e
New translations en.json (Spanish)
ashkanx May 22, 2019
9d905fd
New translations en.json (Spanish)
ashkanx May 22, 2019
bf55102
New translations en.json (Spanish)
ashkanx May 22, 2019
d5729e0
New translations en.json (Spanish)
ashkanx May 22, 2019
32d4648
New translations en.json (Spanish)
ashkanx May 22, 2019
5739c5d
New translations en.json (Spanish)
ashkanx May 22, 2019
a20c095
New translations en.json (Spanish)
ashkanx May 22, 2019
4af0dc5
New translations en.json (Spanish)
ashkanx May 22, 2019
9a2a43b
New translations en.json (Spanish)
ashkanx May 22, 2019
76b9314
New translations en.json (German)
ashkanx May 24, 2019
091ef2e
New translations en.json (Italian)
ashkanx May 28, 2019
16f25a9
New translations en.json (Russian)
ashkanx Jun 9, 2019
bb6da4b
Merge pull request #1307 from binary-com/CrowdIn
ashkanx Jun 11, 2019
f1e4528
fix issue of decimal placed in chart
nazaninreihani Jun 14, 2019
f5a3d34
refactor
nazaninreihani Jun 14, 2019
2c692c8
show spots in transaction details with correct decimals
nazaninreihani Jun 14, 2019
626b6a7
Merge pull request #1313 from nazaninreihani/fix_price
ashkanx Jun 16, 2019
3c48703
Merge branch 'master' into dev
morteza-binary Jun 17, 2019
9bb5a06
Merge pull request #1314 from morteza-binary/dev
morteza-binary Jun 17, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions www/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -387,11 +387,11 @@
"not_zero": "Wert kann nicht 0 sein",
"error": "Leider ist während der Bearbeitung Ihrer Anfrage ein Fehler aufgetreten.",
"customer_support": "kundenunterstützung",
"info": "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. To remove or increase your limits, please contact",
"info": "Onlinehandel kann abhängig machen. Füllen Sie das Formular im Anschluss aus, um Ihre Teilnahme auf der Website zu begrenzen oder schicken Sie einen unterschriebenen Brief oder ein Fax an unser Kundenbetreuungsteam. Einmal eingerichtet, können Ihre Limits nur herabgesetzt werden. Die Limits, mit Ausnahme des Datums für den Selbstausschluss, das nicht aufgehoben oder geändert werden kann, sobald Sie dies bestätigt haben, können nur nach Ablauf von 7 Tagen aufgehoben oder gelockert werden. Um Ihre Limits zu löschen oder zu erhöhen, setzen Sie sich bitte in Verbindung mit",
"ukgc_info_1": "Wenn Sie einen Selbstausschluss erwägen, können Sie sich bei GAMSTOP registrieren.",
"ukgc_info_2": "GAMSTOP ist ein kostenloser Service, der es Ihnen ermöglicht, sich aus allen Online-Glücksspiel-Unternehmen, die in Großbritannien zugelassen sind, selbst auszuschließen.",
"ukgc_info_3": "Um mehr zu erfahren und um sich mit GAMSTOP zu registrieren, besuchen Sie bitte",
"info_bottom_1": "Self-exclusion on this website only applies to your Binary.com account and does not include other companies or websites.",
"info_bottom_1": "Der Selbstausschluss auf dieser Website gilt nur für Ihr Binary.com Konto und enthält keine anderen Unternehmen oder Webseiten.",
"info_bottom_2": "Da Sie das Bedürfnis haben, sich selbst auszuschließen, empfehlen wir Ihnen sich von ähnlichen Diensten, für die Sie sich eventuell angemeldet haben, abzumelden.",
"info_bottom_3": "Um sich von allen Online-Glücksspiel-Unternehmen, die in Großbritannien lizenziert sind, selbst auszuschließen, gehen Sie bitte zu "
},
Expand Down
154 changes: 77 additions & 77 deletions www/i18n/es.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions www/i18n/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -753,10 +753,10 @@
"title": "Installa Binary TickTrade",
"close": "Chiudi",
"installation_text": "Installa Binary TickTrade sullo schermo della home per accedere velocemente e con facilità in qualsiasi momento.",
"installation_help": "Just tab {{icon}} then 'Add to Home Screen'"
"installation_help": "Clicca su {{icon}} e poi su \"Aggiungi a schermata iniziale\""
},
"professional-client-information": {
"professional_client": "What is Professional Client?",
"professional_client": "Chi è un cliente professionista?",
"clients_need_to_satisfy": "I Clienti devono soddisfare almeno due dei seguenti criteri al fine di ricevere lo status di Cliente Professionale:",
"significant_transactions": "Tu hai già eseguito operazioni significative su mercati simili a quelli che offriamo, con una media di 10 operazioni al trimestre nei quattro trimestri precedenti",
"size_of_instrument": "La dimensione del tuo portafoglio di strumenti supera 500.000 EUR o il suo equivalente",
Expand All @@ -767,15 +767,15 @@
"employment": "Prova della tua attività lavorativa"
},
"pep-information": {
"pep": "What is PEP?",
"pep": "Cosa significa PEP?",
"what_is_pep": "Una Persona Esposta Politicamente (PEP) è un individuo a cui è o è stata affidata una funzione pubblica di spicco, compresi i suoi familiari diretti o persone note per essere stretti collaboratori di tali persone, ma non include funzionari di grado medio o inferiore. Tali persone comprendono capi di Stato, ministri, segretari parlamentari, membri del parlamento, giudici, ambasciatori, alti funzionari governativi, alti ufficiali delle Forze Armate, comitati di audit dei consigli di amministrazione delle banche centrali e direttori di società di proprietà statale. Anche i \"familiari stretti\" delle figure sopra citate saranno considerati come PEP, e questi includono i loro coniugi / partner, genitori e figli. Inoltre, \"le persone note per essere stretti collaboratori\" dei PEP includono i loro partner commerciali, che saranno a loro volta considerati tali. Come regola generale, una persona considerata PEP e che ha cessato di essere incaricata di una funzione pubblica di rilievo per un periodo di almeno dodici mesi non è da considerarsi più come PEP."
},
"what-is-tax-information": {
"tax_information_title": "Informazioni Aggiuntive",
"required_by": "Questo requisito è espressamente richiesto dal Common Reporting Standard (CRS) e dal Foreign Account Tax Compliance Act (FATCA).",
"please_enter": "Please enter your ",
"please_enter": "Inserisci le ",
"tax_information": "informazioni fiscali",
"to_continue": "to continue.",
"to_continue": "continua.",
"information_will_be_safe": "Garantiamo che le informazioni dei clienti verranno utilizzate solo ai fini della segnalazione CRS/FATCA e saranno mantenute riservate.",
"contact_for_clarification": "Se abbiamo motivo di ritenere che i tuoi dati fiscali siano incompleti, potremmo contattarti per chiarimenti."
},
Expand Down
6 changes: 3 additions & 3 deletions www/i18n/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"up_down": "Вверх/Вниз",
"higher_lower": "Выше/Ниже",
"rise_fall": "Повышение/Падение",
"high_low_ticks": "High/Low Ticks",
"high_low_ticks": "Наибольш./наименьш. тик",
"markets_are_closed": "Извините, все рынки в данное время закрыты. Повторите попытку позже.",
"cancel": "Отмена",
"select_market": "Выберите рынок",
Expand Down Expand Up @@ -387,11 +387,11 @@
"not_zero": "Значение не может быть равно 0",
"error": "Извините, при обработке Вашего запроса произошла ошибка.",
"customer_support": "служба поддержки",
"info": "Онлайн торговля может перерасти в зависимость. Заполните форму для ограничения Вашей работы на сайте или отправьте службе поддержки подписанное письмо (в отсканированном виде или по факсу). После установления ограничений Вы можете только усилить их. Ограничения могут быть сняты или смягчены по истечении 7 дней, за исключением даты самоисключения, которая не может быть изменена или отменена после её подтверждения. Для снятия или увеличения лимитов ограничения, пожалуйста, свяжитесь со следующим отделом:",
"info": "Онлайн торговля может перерасти в зависимость. Заполните форму для ограничения Вашей работы на сайте или отправьте службе поддержки подписанное письмо (в отсканированном виде или по факсу). После установления ограничений Вы можете только усилить их. Ограничения могут быть сняты или смягчены по истечении 7 дней, за исключением даты самоисключения, которая не может быть изменена или отменена после её подтверждения. Для снятия или увеличения ограничений, пожалуйста, свяжитесь со следующим отделом:",
"ukgc_info_1": "Если Вы планируете самоисключение, рекомендуем зарегистрироваться в GAMSTOP.",
"ukgc_info_2": "GAMSTOP − это бесплатный сервис, позволяющий Вам самоисключаться из торговли на сайтах любых компаний, лицензированных в Великобритании.",
"ukgc_info_3": "Чтобы узнать больше и зарегистрироваться на GAMSTOP, посетите",
"info_bottom_1": "Самоисключение на данном сайте применимо лишь к Вашему счёту на Binary.com и не распространяется на другие сайты компании.",
"info_bottom_1": "Самоисключение на данном сайте применимо лишь к Вашему счёту на Binary.com и не распространяется на другие сайты и компании.",
"info_bottom_2": "Если Вы считаете, что настало время для самоисключения, рекомендуем исключить себя со схожих сервисов и сайтов, на которых Вы зарегистрированы.",
"info_bottom_3": "Чтобы произвести самоисключение во всех компаниях, предоставляющих услуги онлайн торговли и лицензированных в Великобритании, Вы можете обратиться в следующий сервис:"
},
Expand Down
20 changes: 17 additions & 3 deletions www/js/pages/transaction-detail/transaction-detail.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,20 @@
function TransactionDetail($scope, $timeout, appStateService, websocketService) {
const vm = this;
vm.currency = sessionStorage.getItem("currency");
vm.fractionalLength = 2;
const activeSymbols = JSON.parse(sessionStorage.getItem("all_active_symbols"));
const id = sessionStorage.getItem("id");
const contractId = parseInt(id);
const extraParams = {
req_id: contractId
};

const getFractionalLength = (floatNumber) => {
const stringNumber = floatNumber.toString();
const decimalLength = stringNumber.indexOf(".");
return stringNumber.length - decimalLength - 1;
};

const sendDetailsRequest = () => {
if (appStateService.isLoggedin) {
websocketService.sendRequestFor.openContract(id, extraParams);
Expand All @@ -32,10 +41,15 @@
$scope.$on("proposal:open-contract", (e, proposal_open_contract, req_id) => {
const proposalOpenContract = proposal_open_contract;
const reqId = req_id;

if (reqId === contractId) {
$scope.$applyAsync(() => {
vm.contract = proposalOpenContract;
});
const activeSymbol =
activeSymbols.find((activeSymbol) => activeSymbol.symbol === proposalOpenContract.underlying);
const pip = activeSymbol.pip || 0.01;
vm.fractionalLength = getFractionalLength(pip);
vm.contract = proposalOpenContract;
$scope.$apply();

}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ <h1 class="reference">
<li class="list" ng-if="vm.contract.entry_spot">
<ul class="statement-list">
<li class="statement-element">{{'transaction-details.entry_spot' | translate}}</li>
<li class="statement-element last-statement-element right">{{vm.contract.entry_spot}}</li>
<li class="statement-element last-statement-element right"
ng-bind="vm.contract.entry_spot | number : vm.fractionalLength"></li>
</ul>
</li>
<li class="list" ng-if="vm.contract.barrier">
Expand All @@ -87,7 +88,9 @@ <h1 class="reference">
<li class="list" ng-if="vm.contract.exit_tick">
<ul class="statement-list">
<li class="statement-element">{{'transaction-details.exit_spot' | translate}}</li>
<li class="statement-element last-statement-element right">{{vm.contract.exit_tick}}</li>
<li class="statement-element last-statement-element right"
ng-bind="vm.contract.exit_tick | number : vm.fractionalLength">
</li>
</ul>
</li>
<li class="list" ng-if="vm.contract.exit_tick_time">
Expand Down
29 changes: 21 additions & 8 deletions www/js/share/services/chart.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,13 @@ angular.module("binary").factory("chartService", $rootScope => {
let historyData = [];

const addTick = function addTick(tick) {
const options = JSON.parse(localStorage.options);
const pip = options.underlying.pip;
const fractionalLength = utils.fractionalLength(pip);
if (parseInt(tick.epoch) > parseInt(historyData.slice(-1)[0].time)) {
historyData.push({
time : tick.epoch,
price: tick.quote
price: parseFloat(tick.quote).toFixed(fractionalLength)
});
historyData.shift();
}
Expand Down Expand Up @@ -500,33 +503,43 @@ angular.module("binary").factory("chartService", $rootScope => {
};

const addRegions = function addRegions(lastTime, lastPrice) {
const options = JSON.parse(localStorage.options);
const pip = options.underlying.pip;
const fractionalLength = utils.fractionalLength(pip);

if (hasEntrySpot() && broadcastable) {
if (tickPriceList.length === 0) {
if (contract.entrySpotTime !== lastTime && betweenExistingSpots(lastTime)) {
tickPriceList.push(parseFloat(contract.entrySpotPrice));
if (utils.conditions[contract.type](contract.barrier, contract.entrySpotPrice,
const entrySpotPrice = parseFloat(contract.entrySpotPrice).toFixed(fractionalLength);
const barrier = parseFloat(contract.barrier).toFixed(fractionalLength);
tickPriceList.push(entrySpotPrice);

if (utils.conditions[contract.type](barrier, entrySpotPrice,
tickPriceList, contract.selectedTick)) {
contract.result = "win";
} else {
contract.result = "lose";
}
$rootScope.$broadcast("contract:spot", contract, contract.entrySpotPrice);
$rootScope.$broadcast("contract:spot", contract, entrySpotPrice);
} else {
tickPriceList.push(parseFloat(lastPrice));
tickPriceList.push(parseFloat(lastPrice).toFixed(fractionalLength));
}
} else {
tickPriceList.push(parseFloat(lastPrice));
tickPriceList.push(parseFloat(lastPrice).toFixed(fractionalLength));
}

if (betweenExistingSpots(lastTime)) {
if (utils.conditions[contract.type](contract.barrier, lastPrice,
const barrier = parseFloat(contract.barrier).toFixed(fractionalLength);
const lastPriceFloat = parseFloat(lastPrice).toFixed(fractionalLength);

if (utils.conditions[contract.type](barrier, lastPriceFloat,
tickPriceList, contract.selectedTick)) {
contract.result = "win";
} else {
contract.result = "lose";
}

$rootScope.$broadcast("contract:spot", contract, lastPrice);
$rootScope.$broadcast("contract:spot", contract, lastPriceFloat);

if (isFinished() && broadcastable) {
tickPriceList = [];
Expand Down