minor fix

support margin checking

src/comms/ibgw/tws_gateway_restapi.py

@@ -72,6 +72,8 @@ class WebConsole(Subscriber):
         WebConsole.api.add_resource(apiv2.AcctPosition_v2, '/v2/position', resource_class_kwargs={'webconsole': self})
         WebConsole.api.add_resource(apiv2.SystemStatus_v2, '/v2/system', resource_class_kwargs={'webconsole': self})
         WebConsole.api.add_resource(apiv2.ContractInfo_v2, '/v2/contract', resource_class_kwargs={'webconsole': self})
+        WebConsole.api.add_resource(apiv2.PreOrderMarginCheck_v2, '/v2/margin', resource_class_kwargs={'webconsole': self})
+        
         
 
     def set_stop(self):

src/ormdapi/v2/apiv2.py

@@ -492,7 +492,7 @@ class PreOrderMarginCheck_v2(Resource):
         '''
             set the margin check flag to true
         '''
-        contract = v2_helper.format_v2_str_to_contract(js_contract, True)
+        contract = v2_helper.format_v2_str_to_contract(js_contract)
         js_order_cond = args.get('order_condition')
         clordid = str(uuid.uuid4())
 
@@ -509,14 +509,14 @@ class PreOrderMarginCheck_v2(Resource):
             sleep(0.1)
         
         try:    
-            order = v2_helper.format_v2_str_to_order(js_order_cond)
+            order = v2_helper.format_v2_str_to_order(js_order_cond, True)
             OrderHelper.order_validation_ex(order)
             self.gw_conn.placeOrder(id['next_valid_id'], contract, order)
             i = 0
             while 1:
                  
                 ob = self.om.get_order_book()
-                status =  ob.get_order_status(id)
+                status =  ob.get_order_status(id['next_valid_id'])
                 if status:
                     return status, 201
                 sleep(0.1)