Merge pull request #50 from bitshares/36-open-orders

36-open-orders
bitshares · Nov 29, 2018 · d04102d · d04102d
2 parents f01eada + 5d2c91a
commit d04102d
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/src/modules/acc/getters.js b/src/modules/acc/getters.js
@@ -21,7 +21,7 @@ const getters = {
     return nonZeroBalances;
   },
   isLocked: state => {
-    return !state.wallet.aesPrivate && (!state.keys.active || !state.keys.owner);;
+    return !state.wallet.aesPrivate && (!state.keys.active || !state.keys.owner);
   },
   isLoggedIn: state => !!state.userId,
   isValidPassword: state => {

diff --git a/src/modules/operations.js b/src/modules/operations.js
@@ -98,6 +98,33 @@ const actions = {
 
 const getters = {
   getOperations: state => state.list,
+  getActiveOrders: state => {
+    const openedOrder = state.list.filter(x => x.type === 'limit_order_create');
+    const canceledOrders = state.list.filter(x => x.type === 'limit_order_cancel');
+    const filledOrders = state.list.filter(x => x.type === 'fill_order');
+    const notCanceledOrders = openedOrder.filter(x => !canceledOrders.some(y => y.orderId === x.orderId));
+    notCanceledOrders.forEach(notCancelOrder => {
+      let percentFilled = 0;
+      filledOrders.forEach(filledOrder => {
+        if (filledOrder.orderId === notCancelOrder.orderId) {
+          const remain = notCancelOrder.payload.amount_to_sell.amount - filledOrder.payload.pays.amount;
+          percentFilled = +(
+            ((notCancelOrder.payload.amount_to_sell.amount - remain)
+              / notCancelOrder.payload.amount_to_sell.amount)
+              * 100);
+        }
+      });
+      if (percentFilled < 100) {
+        notCancelOrder.percentFilled = percentFilled;
+      }
+    });
+
+
+    const activeOrders = notCanceledOrders.filter(
+      x => Object.prototype.hasOwnProperty.call(x, 'percentFilled')
+    );
+    return activeOrders;
+  },
   isFetching: state => state.pending,
   isError: state => state.error,
   isSubscribed: state => state.subscribed

diff --git a/src/services/api/operations.js b/src/services/api/operations.js
@@ -57,10 +57,23 @@ const Operations = {
     let isBid = false;
     let otherUserName = null;
 
+    let orderId;
     if (operationType === 'fill_order' || operationType === 'limit_order_create') {
       isBid = await Operations._checkIfBidOperation(operation);
     }
 
+    if (operationType === 'limit_order_create') {
+      [, orderId] = operation.result;
+    }
+
+    if (operationType === 'limit_order_cancel') {
+      orderId = operation.op[1].order;
+    }
+
+    if (operationType === 'fill_order') {
+      orderId = operation.op[1].order_id;
+    }
+
     if (operationType === 'transfer') {
       otherUserName = await Operations._getOperationOtherUserName(userId, payload);
     }
@@ -71,7 +84,8 @@ const Operations = {
       payload,
       date,
       buyer: isBid,
-      otherUserName
+      otherUserName,
+      orderId
     };
   },