Merge branch 'fix-bitz-numberover' of https://github.com/zjhmale/ccxt …

…into zjhmale-fix-bitz-numberover
ccxt · May 28, 2018 · cbc88f5 · cbc88f5
2 parents 963e1e2 + 9870e9f
commit cbc88f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/python/ccxt/async/bitz.py b/python/ccxt/async/bitz.py
@@ -298,11 +298,11 @@ def parse_order(self, order, market=None):
             if side is None:
                 side = self.safe_string(order, 'flag')
         amount = self.safe_float(order, 'number')
-        filled = self.safe_float(order, 'numberover')
-        remaining = None
+        remaining = self.safe_float(order, 'numberover')
+        filled = None
         if amount is not None:
-            if filled is not None:
-                remaining = amount - filled
+            if remaining is not None:
+                filled = amount - remaining
         timestamp = None
         iso8601 = None
         if 'datetime' in order:

diff --git a/python/ccxt/bitz.py b/python/ccxt/bitz.py
@@ -298,11 +298,11 @@ def parse_order(self, order, market=None):
             if side is None:
                 side = self.safe_string(order, 'flag')
         amount = self.safe_float(order, 'number')
-        filled = self.safe_float(order, 'numberover')
-        remaining = None
+        remaining = self.safe_float(order, 'numberover')
+        filled = None
         if amount is not None:
-            if filled is not None:
-                remaining = amount - filled
+            if remaining is not None:
+                filled = amount - remaining
         timestamp = None
         iso8601 = None
         if 'datetime' in order: