Critical fix at square off

saurabhnolakha · May 21, 2021 · dc02aa7 · dc02aa7
1 parent bf20d6d
commit dc02aa7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/ordermgmt/OrderModifyParams.py b/src/ordermgmt/OrderModifyParams.py
@@ -7,6 +7,6 @@ def __init__(self):
     self.newOrderType = None # Ex: Can change LIMIT order to SL order or vice versa. Not supported by all brokers
 
   def __str__(self):
-    return + "newPrice=" + str(self.newPrice) + ", newTriggerPrice=" + str(self.newTriggerPrice) \
+    return "newPrice=" + str(self.newPrice) + ", newTriggerPrice=" + str(self.newTriggerPrice) \
       + ", newQty=" + str(self.newQty) + ", newOrderType=" + str(self.newOrderType)
 
diff --git a/src/trademgmt/TradeManager.py b/src/trademgmt/TradeManager.py
@@ -230,14 +230,13 @@ def fetchAndUpdateAllTradeOrders():
   def trackAndUpdateAllTrades():
     for trade in TradeManager.trades:
       if trade.tradeState == TradeState.ACTIVE:
+        TradeManager.trackEntryOrder(trade)
+        TradeManager.trackSLOrder(trade)
+        TradeManager.trackTargetOrder(trade)
         if trade.intradaySquareOffTimestamp != None:
           nowEpoch = Utils.getEpoch()
           if nowEpoch >= trade.intradaySquareOffTimestamp:
             TradeManager.squareOffTrade(trade, TradeExitReason.SQUARE_OFF)
-
-        TradeManager.trackEntryOrder(trade)
-        TradeManager.trackSLOrder(trade)
-        TradeManager.trackTargetOrder(trade)
 
   @staticmethod
   def trackEntryOrder(trade):