Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ccxt-dev/ccxt
Browse files Browse the repository at this point in the history
  • Loading branch information
kroitor committed Jun 5, 2018
2 parents 43b8212 + d0b442c commit 95fd1f6
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 15 deletions.
11 changes: 7 additions & 4 deletions build/ccxt.browser.js

Large diffs are not rendered by default.

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

const version = '1.14.128'
const version = '1.14.129'

Exchange.ccxtVersion = version

Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "ccxt",
"version": "1.14.128",
"version": "1.14.129",
"description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 100+ exchanges",
"main": "./ccxt.js",
"unpkg": "build/ccxt.browser.js",
Expand Down
2 changes: 1 addition & 1 deletion php/Exchange.php
Expand Up @@ -30,7 +30,7 @@

namespace ccxt;

$version = '1.14.128';
$version = '1.14.129';

// rounding mode
const TRUNCATE = 0;
Expand Down
7 changes: 5 additions & 2 deletions php/gateio.php
Expand Up @@ -355,9 +355,12 @@ public function parse_order ($order, $market = null) {
}
if ($market !== null)
$symbol = $market['symbol'];
$datetime = null;
$timestamp = $this->safe_integer($order, 'timestamp');
if ($timestamp !== null)
if ($timestamp !== null) {
$timestamp *= 1000;
$datetime = $this->iso8601 ($timestamp);
}
$status = $this->safe_string($order, 'status');
if ($status !== null)
$status = $this->parse_order_status($status);
Expand All @@ -379,7 +382,7 @@ public function parse_order ($order, $market = null) {
}
return array (
'id' => $id,
'datetime' => $this->iso8601 ($timestamp),
'datetime' => $datetime,
'timestamp' => $timestamp,
'status' => $status,
'symbol' => $symbol,
Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/__init__.py
Expand Up @@ -22,7 +22,7 @@

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

__version__ = '1.14.128'
__version__ = '1.14.129'

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

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/__init__.py
Expand Up @@ -4,7 +4,7 @@

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

__version__ = '1.14.128'
__version__ = '1.14.129'

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

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/base/exchange.py
Expand Up @@ -2,7 +2,7 @@

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

__version__ = '1.14.128'
__version__ = '1.14.129'

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

Expand Down
4 changes: 3 additions & 1 deletion python/ccxt/async/gateio.py
Expand Up @@ -342,9 +342,11 @@ def parse_order(self, order, market=None):
market = self.markets_by_id[marketId]
if market is not None:
symbol = market['symbol']
datetime = None
timestamp = self.safe_integer(order, 'timestamp')
if timestamp is not None:
timestamp *= 1000
datetime = self.iso8601(timestamp)
status = self.safe_string(order, 'status')
if status is not None:
status = self.parse_order_status(status)
Expand All @@ -363,7 +365,7 @@ def parse_order(self, order, market=None):
feeCurrency = self.currencies_by_id[feeCurrency]['code']
return {
'id': id,
'datetime': self.iso8601(timestamp),
'datetime': datetime,
'timestamp': timestamp,
'status': status,
'symbol': symbol,
Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/base/exchange.py
Expand Up @@ -4,7 +4,7 @@

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

__version__ = '1.14.128'
__version__ = '1.14.129'

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

Expand Down
4 changes: 3 additions & 1 deletion python/ccxt/gateio.py
Expand Up @@ -342,9 +342,11 @@ def parse_order(self, order, market=None):
market = self.markets_by_id[marketId]
if market is not None:
symbol = market['symbol']
datetime = None
timestamp = self.safe_integer(order, 'timestamp')
if timestamp is not None:
timestamp *= 1000
datetime = self.iso8601(timestamp)
status = self.safe_string(order, 'status')
if status is not None:
status = self.parse_order_status(status)
Expand All @@ -363,7 +365,7 @@ def parse_order(self, order, market=None):
feeCurrency = self.currencies_by_id[feeCurrency]['code']
return {
'id': id,
'datetime': self.iso8601(timestamp),
'datetime': datetime,
'timestamp': timestamp,
'status': status,
'symbol': symbol,
Expand Down

0 comments on commit 95fd1f6

Please sign in to comment.