diff --git a/MtApi5/Mt5CommandType.cs b/MtApi5/Mt5CommandType.cs index f4540199..2a0cc27e 100755 --- a/MtApi5/Mt5CommandType.cs +++ b/MtApi5/Mt5CommandType.cs @@ -5,7 +5,7 @@ //NoCommand = 0 //trade operations - OrderSend = 1, + //OrderSend = 1, OrderCalcMargin = 2, OrderCalcProfit = 3, OrderCheck = 4, diff --git a/MtApi5/MtApi5Client.cs b/MtApi5/MtApi5Client.cs index 8a746d0d..193099b2 100755 --- a/MtApi5/MtApi5Client.cs +++ b/MtApi5/MtApi5Client.cs @@ -123,15 +123,6 @@ namespace MtApi5 result = response?.Value?.TradeResult; return response?.Value != null && response.Value.RetVal; - - - //var commandParameters = request.ToArrayList(); - - //var strResult = SendCommand(Mt5CommandType.OrderSend, commandParameters); - - //Log.Debug($"OrderSend: strResult = {strResult}"); - - //return strResult.ParseResult(ParamSeparator, out result); } /// @@ -205,7 +196,7 @@ namespace MtApi5 var commandParameters = request.ToArrayList(); - var strResult = SendCommand(Mt5CommandType.OrderSend, commandParameters); + var strResult = SendCommand(Mt5CommandType.OrderCheck, commandParameters); return strResult.ParseResult(ParamSeparator, out result); } diff --git a/TestClients/MtApi5TestClient/MainWindow.xaml b/TestClients/MtApi5TestClient/MainWindow.xaml index 6cf14510..c0cf3dff 100755 --- a/TestClients/MtApi5TestClient/MainWindow.xaml +++ b/TestClients/MtApi5TestClient/MainWindow.xaml @@ -247,10 +247,10 @@ SelectedItem="{Binding TradeRequest.Type_time}" Margin="5,0,0,0"/> - + - + diff --git a/mq5/MtApi5.ex5 b/mq5/MtApi5.ex5 index e50b4d47..7f4f8dd1 100755 Binary files a/mq5/MtApi5.ex5 and b/mq5/MtApi5.ex5 differ diff --git a/mq5/MtApi5.mq5 b/mq5/MtApi5.mq5 index 10c389fc..cb2bc99e 100755 --- a/mq5/MtApi5.mq5 +++ b/mq5/MtApi5.mq5 @@ -39,7 +39,7 @@ bool getBooleanValue(int expertHandle, int paramIndex, bool& res, string& err); #import -#define __DEBUG_LOG__ +//#define __DEBUG_LOG__ input int Port = 8228; @@ -5833,8 +5833,8 @@ bool JsonToMqlTradeRequest(JSONObject *jo, MqlTradeRequest& request) CHECK_JSON_VALUE(jo, "Type_time", false); request.type_time = (ENUM_ORDER_TYPE_TIME)jo.getInt("Type_time"); - //Expiration - CHECK_JSON_VALUE(jo, "Expiration", false); + //MtExpiration + CHECK_JSON_VALUE(jo, "MtExpiration", false); request.expiration = (datetime)jo.getInt("MtExpiration"); //Comment