diff --git a/MtApi/MtApiClient.cs b/MtApi/MtApiClient.cs index 747cfb4d..0d88c19e 100755 --- a/MtApi/MtApiClient.cs +++ b/MtApi/MtApiClient.cs @@ -211,6 +211,12 @@ namespace MtApi return (TradeOperation)retVal; } + + [Obsolete("OrderSwap is deprecated, please use GetOrder instead.")] + public double OrderSwap() + { + return SendCommand(MtCommandType.OrderSwap, null); + } #endregion #region Trading functions @@ -440,11 +446,6 @@ namespace MtApi return SendCommand(MtCommandType.OrdersTotal, null); } - public double OrderSwap() - { - return SendCommand(MtCommandType.OrderSwap, null); - } - public bool OrderCloseAll() { return SendCommand(MtCommandType.OrderCloseAll, null); diff --git a/MtApi/MtOrder.cs b/MtApi/MtOrder.cs index da9da72b..b48c8b4a 100644 --- a/MtApi/MtOrder.cs +++ b/MtApi/MtOrder.cs @@ -16,6 +16,7 @@ namespace MtApi public string Comment { get; set; } public double Commission { get; set; } public int MagicNumber { get; set; } + public double Swap { get; set; } public DateTime OpenTime { diff --git a/TestApiClientUI/Form1.cs b/TestApiClientUI/Form1.cs index 349b284f..57028368 100755 --- a/TestApiClientUI/Form1.cs +++ b/TestApiClientUI/Form1.cs @@ -875,8 +875,8 @@ namespace TestApiClientUI { var result = string.Format( - "Order: Ticket = {0}, Symbol = {1}, Operation = {2}, OpenPrice = {3}, ClosePrice = {4}, Lots = {5}, Profit = {6}, Comment = {7}, Commission = {8}, MagicNumber = {9}, OpenTime = {10}, CloseTime = {11}", - order.Ticket, order.Symbol, order.Operation, order.OpenPrice, order.ClosePrice, order.Lots, order.Profit, order.Comment, order.Commission, order.MagicNumber, order.OpenTime, order.CloseTime); + "Order: Ticket = {0}, Symbol = {1}, Operation = {2}, OpenPrice = {3}, ClosePrice = {4}, Lots = {5}, Profit = {6}, Comment = {7}, Commission = {8}, MagicNumber = {9}, OpenTime = {10}, CloseTime = {11}, Swap = {12}", + order.Ticket, order.Symbol, order.Operation, order.OpenPrice, order.ClosePrice, order.Lots, order.Profit, order.Comment, order.Commission, order.MagicNumber, order.OpenTime, order.CloseTime, order.Swap); AddToLog(result); } } @@ -895,8 +895,8 @@ namespace TestApiClientUI { var result = string.Format( - "Order: Ticket = {0}, Symbol = {1}, Operation = {2}, OpenPrice = {3}, ClosePrice = {4}, Lots = {5}, Profit = {6}, Comment = {7}, Commission = {8}, MagicNumber = {9}, OpenTime = {10}, CloseTime = {11}", - order.Ticket, order.Symbol, order.Operation, order.OpenPrice, order.ClosePrice, order.Lots, order.Profit, order.Comment, order.Commission, order.MagicNumber, order.OpenTime, order.CloseTime); + "Order: Ticket = {0}, Symbol = {1}, Operation = {2}, OpenPrice = {3}, ClosePrice = {4}, Lots = {5}, Profit = {6}, Comment = {7}, Commission = {8}, MagicNumber = {9}, OpenTime = {10}, CloseTime = {11}, Swap = {12}", + order.Ticket, order.Symbol, order.Operation, order.OpenPrice, order.ClosePrice, order.Lots, order.Profit, order.Comment, order.Commission, order.MagicNumber, order.OpenTime, order.CloseTime, order.Swap); AddToLog(result); } } diff --git a/mq4/MtApi.ex4 b/mq4/MtApi.ex4 index 81b306db..3faed062 100755 Binary files a/mq4/MtApi.ex4 and b/mq4/MtApi.ex4 differ diff --git a/mq4/MtApi.mq4 b/mq4/MtApi.mq4 index 8ef216c2..0ee12994 100755 --- a/mq4/MtApi.mq4 +++ b/mq4/MtApi.mq4 @@ -3461,6 +3461,7 @@ JSONObject* GetOrderJson(int index, int select, int pool) int magicNumber = OrderMagicNumber(); datetime openTime = OrderOpenTime(); datetime closeTime = OrderCloseTime(); + double swap = OrderSwap(); JSONObject *joOrder = new JSONObject(); joOrder.put("Ticket", new JSONNumber(ticket)); @@ -3477,6 +3478,7 @@ JSONObject* GetOrderJson(int index, int select, int pool) joOrder.put("MagicNumber", new JSONNumber(magicNumber)); joOrder.put("MtOpenTime", new JSONNumber(openTime)); joOrder.put("MtCloseTime", new JSONNumber(closeTime)); + joOrder.put("Swap", new JSONNumber(swap)); return joOrder; }