From 3b4d52834c14f9873723034bb9fc449cc3a13de4 Mon Sep 17 00:00:00 2001 From: Amam Mustofa Date: Tue, 14 May 2019 11:58:40 +0800 Subject: [PATCH] exlude barrier for even odd --- src/trade/tradeDialog.es6 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/trade/tradeDialog.es6 b/src/trade/tradeDialog.es6 index 879686730c..137055478c 100644 --- a/src/trade/tradeDialog.es6 +++ b/src/trade/tradeDialog.es6 @@ -829,15 +829,16 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) { }; state.proposal.onchange = function () { - var unit = state.duration_unit.value; - var expiry_type = _(['seconds', 'minutes', 'hours']).includes(unit) ? 'intraday' : unit === 'days' ? 'daily' : 'tick'; + const unit = state.duration_unit.value; + let expiry_type = _(['seconds', 'minutes', 'hours']).includes(unit) ? 'intraday' : unit === 'days' ? 'daily' : 'tick'; + const subcat = state.category_displays.selected.sentiment; if(state.categories.value.contract_category === 'spreads') expiry_type = 'intraday'; - var row = _(available).filter({ + const row = _(available).filter({ 'contract_category_display': state.categories.value.contract_category_display, 'contract_display': state.category_displays.selected.name, 'expiry_type': expiry_type }).head(); - var request = { + const request = { proposal: 1, subscribe: 1, contract_type: row.contract_type, @@ -862,7 +863,7 @@ function init_state(available,root, dialog, symbol, contracts_for_spot) { add_barriers_to_request(state, request); set_is_barrier_offset(state); - if (state.categories.value.contract_category === 'digits') { + if (state.categories.value.contract_category === 'digits' && !(subcat === 'odd' || subcat === 'even')) { request.barrier = state.digits.value + ''; } if (state.date_start.value !== 'now') {