Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

make digits contract's barrier to be integer #1316

Merged
morteza-binary merged 1 commit into from
Jun 25, 2019
Merged

make digits contract's barrier to be integer #1316

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions www/js/share/services/chart.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@ angular.module("binary").factory("chartService", $rootScope => {
return parseFloat(price) < parseFloat(barrier);
},
DIGITMATCH: function condition(barrier, price) {
return utils.lastDigit(barrier) === utils.lastDigit(price);
return utils.lastDigit(parseInt(barrier)) === utils.lastDigit(price);
},
DIGITDIFF: function condition(barrier, price) {
return utils.lastDigit(barrier) !== utils.lastDigit(price);
return utils.lastDigit(parseInt(barrier)) !== utils.lastDigit(price);
},
DIGITEVEN: function condition(barrier, price) {
return utils.lastDigit(price) % 2 === 0;
Expand Down Expand Up @@ -451,7 +451,8 @@ angular.module("binary").factory("chartService", $rootScope => {
if (utils.higherLowerTrade(contract)) {
contract.offset = contract.offset || contract.barrier;
barrier = Number(tickPrice) + Number(contract.offset);
barrier = barrier.toFixed(utils.fractionalLength(tickPrice));
barrier = utils.digitTrade(contract) ?
contract.barrier : barrier.toFixed(utils.fractionalLength(tickPrice));
}
utils.setObjValue(contract, "barrier", barrier, !utils.digitTrade(contract));
utils.setObjValue(contract, "entrySpotPrice", tickPrice, true);
Expand Down Expand Up @@ -511,7 +512,8 @@ angular.module("binary").factory("chartService", $rootScope => {
if (tickPriceList.length === 0) {
if (contract.entrySpotTime !== lastTime && betweenExistingSpots(lastTime)) {
const entrySpotPrice = parseFloat(contract.entrySpotPrice).toFixed(fractionalLength);
const barrier = parseFloat(contract.barrier).toFixed(fractionalLength);
const barrier = utils.digitTrade(contract) ?
contract.barrier : parseFloat(contract.barrier).toFixed(fractionalLength);
tickPriceList.push(entrySpotPrice);

if (utils.conditions[contract.type](barrier, entrySpotPrice,
Expand Down