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 May 25, 2018
2 parents 951dbb4 + c28b711 commit 3ee425e
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 21 deletions.
10 changes: 5 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 Exchange = require ('./js/base/Exchange')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.14.66'
const version = '1.14.67'

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.14.66",
"version": "1.14.67",
"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
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

namespace ccxt;

$version = '1.14.66';
$version = '1.14.67';

// rounding mode
const TRUNCATE = 0;
Expand Down
6 changes: 3 additions & 3 deletions php/paymium.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public function create_order ($symbol, $type, $side, $amount, $price = null, $pa
'direction' => $side,
'amount' => $amount,
);
if ($type === 'market')
if ($type !== 'market')
$order['price'] = $price;
$response = $this->privatePostUserOrders (array_merge ($order, $params));
return array (
Expand All @@ -176,8 +176,8 @@ public function create_order ($symbol, $type, $side, $amount, $price = null, $pa
}

public function cancel_order ($id, $symbol = null, $params = array ()) {
return $this->privatePostCancelOrder (array_merge (array (
'orderNumber' => $id,
return $this->privateDeleteUserOrdersUUIDCancel (array_merge (array (
'UUID' => $id,
), $params));
}

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

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

__version__ = '1.14.66'
__version__ = '1.14.67'

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

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.14.66'
__version__ = '1.14.67'

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

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.14.66'
__version__ = '1.14.67'

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

Expand Down
6 changes: 3 additions & 3 deletions python/ccxt/async/paymium.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ async def create_order(self, symbol, type, side, amount, price=None, params={}):
'direction': side,
'amount': amount,
}
if type == 'market':
if type != 'market':
order['price'] = price
response = await self.privatePostUserOrders(self.extend(order, params))
return {
Expand All @@ -168,8 +168,8 @@ async def create_order(self, symbol, type, side, amount, price=None, params={}):
}

async def cancel_order(self, id, symbol=None, params={}):
return await self.privatePostCancelOrder(self.extend({
'orderNumber': id,
return await self.privateDeleteUserOrdersUUIDCancel(self.extend({
'UUID': id,
}, params))

def sign(self, path, api='public', method='GET', params={}, headers=None, body=None):
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.14.66'
__version__ = '1.14.67'

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

Expand Down
6 changes: 3 additions & 3 deletions python/ccxt/paymium.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def create_order(self, symbol, type, side, amount, price=None, params={}):
'direction': side,
'amount': amount,
}
if type == 'market':
if type != 'market':
order['price'] = price
response = self.privatePostUserOrders(self.extend(order, params))
return {
Expand All @@ -168,8 +168,8 @@ def create_order(self, symbol, type, side, amount, price=None, params={}):
}

def cancel_order(self, id, symbol=None, params={}):
return self.privatePostCancelOrder(self.extend({
'orderNumber': id,
return self.privateDeleteUserOrdersUUIDCancel(self.extend({
'UUID': id,
}, params))

def sign(self, path, api='public', method='GET', params={}, headers=None, body=None):
Expand Down

0 comments on commit 3ee425e

Please sign in to comment.