1.10.324

[ci skip]
rbianco3 · Dec 8, 2017 · 5599f78 · 5599f78
1 parent 1d5df23
commit 5599f78
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 18 deletions.
diff --git a/build/ccxt.browser.js b/build/ccxt.browser.js
diff --git a/ccxt.js b/ccxt.js
@@ -37,7 +37,7 @@ const errors    = require ('./js/base/errors')
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
 
-const version = '1.10.323'
+const version = '1.10.324'
 
 Exchange.ccxtVersion = version
 

diff --git a/ccxt.php b/ccxt.php
@@ -30,7 +30,7 @@
 
 namespace ccxt;
 
-$version = '1.10.323';
+$version = '1.10.324';
 
 const CLASSES_DIR = __DIR__ . DIRECTORY_SEPARATOR . 'php' . DIRECTORY_SEPARATOR;
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "1.10.323",
+  "version": "1.10.324",
   "description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 90+ exchanges",
   "main": "./ccxt.js",
   "unpkg": "build/ccxt.browser.js",

diff --git a/php/huobipro.php b/php/huobipro.php
@@ -313,23 +313,24 @@ public function fetch_orders ($symbol = null, $since = null, $limit = null, $par
             throw new ExchangeError ($this->id . ' fetchOrders() requires a $symbol parameter');
         $this->load_markets ();
         $market = $this->market ($symbol);
+        $status = null;
         if (array_key_exists ('type', $params)) {
-            status = $params['type'];
+            $status = $params['type'];
         } else if (array_key_exists ('status', $params)) {
-            status = $params['status']
+            $status = $params['status']
         } else {
-            throw new ExchangeError ($this->id . ' fetchOrders() requires type param or status param for spot $market ' . $symbol . '(0 or "open" for unfilled or partial filled orders, 1 or "closed" for filled orders)')
+            throw new ExchangeError ($this->id . ' fetchOrders() requires type param or $status param for spot $market ' . $symbol . '(0 or "open" for unfilled or partial filled orders, 1 or "closed" for filled orders)')
         }
-        if ((status == 0) || (status == 'open')) {
-            status = 'submitted,partial-filled';
-        } else if ((status == 1) || (status == 'closed')) {
-            status = 'filled,partial-canceled'
+        if (($status == 0) || ($status == 'open')) {
+            $status = 'submitted,partial-filled';
+        } else if (($status == 1) || ($status == 'closed')) {
+            $status = 'filled,partial-canceled'
         } else {
-            throw new ExchangeError ($this->id . ' fetchOrders() wrong type param or status param for spot $market ' . $symbol . '(0 or "open" for unfilled or partial filled orders, 1 or "closed" for filled orders)');
+            throw new ExchangeError ($this->id . ' fetchOrders() wrong type param or $status param for spot $market ' . $symbol . '(0 or "open" for unfilled or partial filled orders, 1 or "closed" for filled orders)');
         }
         $response = $this->privateGetOrderOrders (array_merge (array (
             'symbol' => $market['id'],
-            'states' => status,
+            'states' => $status,
         )));
         return $this->parse_orders($response['data'], $market);
     }

diff --git a/python/ccxt/__init__.py b/python/ccxt/__init__.py
@@ -28,7 +28,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '1.10.323'
+__version__ = '1.10.324'
 
 # ----------------------------------------------------------------------------
 

diff --git a/python/ccxt/async/__init__.py b/python/ccxt/async/__init__.py
@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.10.323'
+__version__ = '1.10.324'
 
 # -----------------------------------------------------------------------------
 

diff --git a/python/ccxt/async/base/exchange.py b/python/ccxt/async/base/exchange.py
@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.10.323'
+__version__ = '1.10.324'
 
 # -----------------------------------------------------------------------------
 

diff --git a/python/ccxt/async/huobipro.py b/python/ccxt/async/huobipro.py
@@ -294,6 +294,7 @@ async def fetch_orders(self, symbol=None, since=None, limit=None, params={}):
             raise ExchangeError(self.id + ' fetchOrders() requires a symbol parameter')
         self.load_markets()
         market = self.market(symbol)
+        status = None
         if 'type' in params:
             status = params['type']
         elif 'status' in params:

diff --git a/python/ccxt/base/exchange.py b/python/ccxt/base/exchange.py
@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.10.323'
+__version__ = '1.10.324'
 
 # -----------------------------------------------------------------------------
 

diff --git a/python/ccxt/huobipro.py b/python/ccxt/huobipro.py
@@ -294,6 +294,7 @@ def fetch_orders(self, symbol=None, since=None, limit=None, params={}):
             raise ExchangeError(self.id + ' fetchOrders() requires a symbol parameter')
         self.load_markets()
         market = self.market(symbol)
+        status = None
         if 'type' in params:
             status = params['type']
         elif 'status' in params: