Skip to content

Commit

Permalink
1.10.692
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
Travis CI committed Jan 13, 2018
1 parent 059c9ea commit ab98fc3
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 21 deletions.
14 changes: 9 additions & 5 deletions build/ccxt.browser.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ccxt.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const errors = require ('./js/base/errors')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.10.691'
const version = '1.10.692'

Exchange.ccxtVersion = version

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ccxt",
"version": "1.10.691",
"version": "1.10.692",
"description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 90+ exchanges",
"main": "./ccxt.js",
"unpkg": "build/ccxt.browser.js",
Expand Down
2 changes: 1 addition & 1 deletion php/Exchange.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

namespace ccxt;

$version = '1.10.691';
$version = '1.10.692';

abstract class Exchange {

Expand Down
10 changes: 7 additions & 3 deletions php/kucoin.php
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,13 @@ public function parse_order ($order, $market = null) {
$price = $this->safe_value($order, 'price');
if ($price === null)
$price = $this->safe_value($order, 'dealPrice');
$filled = $order['dealAmount'];
$remaining = $order['pendingAmount'];
$amount = $this->sum ($filled, $remaining);
$amount = $this->safe_value($order, 'amount');
$filled = $this->safe_value($order, 'dealAmount', 0);
$remaining = $this->safe_value($order, 'pendingAmount');
if ($amount === null)
if ($filled !== null)
if ($remaining !== null)
$amount = $this->sum ($filled, $remaining);
$side = strtolower ($order['direction']);
$fee = null;
if (is_array ($order) && array_key_exists ('fee', $order)) {
Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

# ----------------------------------------------------------------------------

__version__ = '1.10.691'
__version__ = '1.10.692'

# ----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# -----------------------------------------------------------------------------

__version__ = '1.10.691'
__version__ = '1.10.692'

# -----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/base/exchange.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# -----------------------------------------------------------------------------

__version__ = '1.10.691'
__version__ = '1.10.692'

# -----------------------------------------------------------------------------

Expand Down
10 changes: 7 additions & 3 deletions python/ccxt/async/kucoin.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,13 @@ def parse_order(self, order, market=None):
price = self.safe_value(order, 'price')
if price is None:
price = self.safe_value(order, 'dealPrice')
filled = order['dealAmount']
remaining = order['pendingAmount']
amount = self.sum(filled, remaining)
amount = self.safe_value(order, 'amount')
filled = self.safe_value(order, 'dealAmount', 0)
remaining = self.safe_value(order, 'pendingAmount')
if amount is None:
if filled is not None:
if remaining is not None:
amount = self.sum(filled, remaining)
side = order['direction'].lower()
fee = None
if 'fee' in order:
Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/base/exchange.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# -----------------------------------------------------------------------------

__version__ = '1.10.691'
__version__ = '1.10.692'

# -----------------------------------------------------------------------------

Expand Down
10 changes: 7 additions & 3 deletions python/ccxt/kucoin.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,9 +296,13 @@ def parse_order(self, order, market=None):
price = self.safe_value(order, 'price')
if price is None:
price = self.safe_value(order, 'dealPrice')
filled = order['dealAmount']
remaining = order['pendingAmount']
amount = self.sum(filled, remaining)
amount = self.safe_value(order, 'amount')
filled = self.safe_value(order, 'dealAmount', 0)
remaining = self.safe_value(order, 'pendingAmount')
if amount is None:
if filled is not None:
if remaining is not None:
amount = self.sum(filled, remaining)
side = order['direction'].lower()
fee = None
if 'fee' in order:
Expand Down

0 comments on commit ab98fc3

Please sign in to comment.