Added Function GetClientsPrducts

API.cs

@@ -26,7 +26,7 @@ namespace WHMCS_API
         /// <returns>Returns the result of the call
         /// The userid string for the session Session["uid"]
         /// The passwordhash for the session Session["upw"]</returns>
-        public ValidateLogin ValidateLogin(string Email, string Password)
+        public ValidateLogin.ValidateLogin ValidateLogin(string Email, string Password)
         {
             NameValueCollection data = new NameValueCollection()
             {
@@ -35,7 +35,7 @@ namespace WHMCS_API
                 { EnumUtil.GetString(APIEnums.ValidateLoginParams.Password), Password }
             };
 
-            return JsonConvert.DeserializeObject<ValidateLogin>(_call.MakeCall(data));
+            return JsonConvert.DeserializeObject<ValidateLogin.ValidateLogin>(_call.MakeCall(data));
         }
 
         /// <summary>
@@ -96,7 +96,7 @@ namespace WHMCS_API
         /// <param name="ClientEmail">The client Email to search</param>
         /// <param name="Stats">Get extended stats for the client</param>
         /// <returns>All details of the client</returns>
-        public GetClientsDetails GetClientsDetails(int ClientID = -1, string ClientEmail = "", bool Stats = false)
+        public GetClientsDetails.GetClientsDetails GetClientsDetails(int ClientID = -1, string ClientEmail = "", bool Stats = false)
         {
             if (ClientID == -1 && ClientEmail == "")
                 throw new Exception("ClientID or ClientEmail needed");
@@ -114,11 +114,10 @@ namespace WHMCS_API
             string req = _call.MakeCall(data);
             JObject result = JObject.Parse(req);
             if (result["result"].ToString() == "success")
-                return JsonConvert.DeserializeObject<GetClientsDetails>(req);
+                return JsonConvert.DeserializeObject<GetClientsDetails.GetClientsDetails>(req);
             else
                 throw new Exception("An API Error occurred", new Exception(result["message"].ToString()));
         }
-<<<<<<< HEAD
 
         /// <summary>
         /// Get the orders (for all clients/specific client/specific order/specific status)
@@ -129,7 +128,7 @@ namespace WHMCS_API
         /// <param name="UserID">Find orders for a specific client id</param>
         /// <param name="Status">Find orders for a specific status</param>
         /// <returns>In a modelm, total results, start number, the number of results returned</returns>
-        public GetOrders GetOrders(int LimitStart = 0, int LimitNumber = 25, int OrderID = -1, int UserID = -1, string Status = "")
+        public GetOrders.GetOrders GetOrders(int LimitStart = 0, int LimitNumber = 25, int OrderID = -1, int UserID = -1, string Status = "")
         {
             NameValueCollection data = new NameValueCollection()
             {
@@ -144,10 +143,10 @@ namespace WHMCS_API
             if (Status != "")
                 data.Add(EnumUtil.GetString(APIEnums.GetOrdersParams.Status), Status);
 
-            return JsonConvert.DeserializeObject<GetOrders>(_call.MakeCall(data));
+            return JsonConvert.DeserializeObject<GetOrders.GetOrders>(_call.MakeCall(data));
         }
 
-        public GetTransactions GetTransactions(int InvoiceID = -1, int ClientID = -1, string TransactionID = "")
+        public GetTransactions.GetTransactions GetTransactions(int InvoiceID = -1, int ClientID = -1, string TransactionID = "")
         {
             NameValueCollection data = new NameValueCollection()
             {
@@ -160,9 +159,31 @@ namespace WHMCS_API
             if (TransactionID != "")
                 data.Add(EnumUtil.GetString(APIEnums.GetTransactionsParams.TransactionID), TransactionID);
 
-            return JsonConvert.DeserializeObject<GetTransactions>(_call.MakeCall(data));
+            return JsonConvert.DeserializeObject<GetTransactions.GetTransactions>(_call.MakeCall(data));
+        }
+
+        public string GetClientsProducts(int LimitStart = 0, int LimitNum = 25, int ClientID = -1, int ServiceID = -1, int ProductID = -1, string Domain = "", string Username = "")
+        {
+            NameValueCollection data = new NameValueCollection()
+            {
+                { "action", APIEnums.Actions.GetClientsProducts.ToString() },
+                { EnumUtil.GetString(APIEnums.GetClientsProductsParams.ResultsStartOffset), LimitStart.ToString()},
+                { EnumUtil.GetString(APIEnums.GetClientsProductsParams.ResultsLimit), LimitNum.ToString()},
+            };
+
+            if (ClientID != -1)
+                data.Add(EnumUtil.GetString(APIEnums.GetClientsProductsParams.ClientID), ClientID.ToString());
+            if (ServiceID != -1)
+                data.Add(EnumUtil.GetString(APIEnums.GetClientsProductsParams.ServiceID), ServiceID.ToString());
+            if (ProductID != -1)
+                data.Add(EnumUtil.GetString(APIEnums.GetClientsProductsParams.ProductID), ProductID.ToString());
+            if (Domain != "")
+                data.Add(EnumUtil.GetString(APIEnums.GetClientsProductsParams.Domain), Domain);
+            if (Username != "")
+                data.Add(EnumUtil.GetString(APIEnums.GetClientsProductsParams.Username), Username);
+
+            return _call.MakeCall(data);
+            //return JsonConvert.DeserializeObject<DomainWhoIs>(_call.MakeCall(data));
         }
-=======
->>>>>>> origin/master
     }
 }

Enums.cs

@@ -59,7 +59,6 @@ namespace WHMCS_API
             [StringValue("stats")] Stats
         }
 
-<<<<<<< HEAD
         public enum GetOrdersParams
         {
             [StringValue("limitstart")] LimitStart,
@@ -76,8 +75,17 @@ namespace WHMCS_API
             [StringValue("transid")] TransactionID
         }
 
-=======
->>>>>>> origin/master
+        public enum GetClientsProductsParams
+        {
+            [StringValue("limitstart")] ResultsStartOffset,
+            [StringValue("limitnum")] ResultsLimit,
+            [StringValue("clientid")] ClientID,
+            [StringValue("serviceid")] ServiceID,
+            [StringValue("pid")] ProductID,
+            [StringValue("domain")] Domain,
+            [StringValue("username2")] Username
+        }
+
         /// <summary>
         /// Actions Supported by the WHMCS API that are implemented in this Wrapper
         /// </summary>
@@ -86,13 +94,10 @@ namespace WHMCS_API
             [StringValue("ValidateLogin")] ValidateLogin,
             [StringValue("DomainWhois")] DomainWhois,
             [StringValue("AddClient")] AddClient,
-<<<<<<< HEAD
             [StringValue("GetClientsDetails")] GetClientsDetails,
             [StringValue("GetOrders")] GetOrders,
-            [StringValue("GetTransactions")] GetTransactions
-=======
-            [StringValue("GetClientsDetails")] GetClientsDetails
->>>>>>> origin/master
+            [StringValue("GetTransactions")] GetTransactions,
+            [StringValue("GetClientsProducts")] GetClientsProducts
         }
     }
 

GetClientsDetails.cs

@@ -5,7 +5,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 
-namespace WHMCS_API
+namespace WHMCS_API.GetClientsDetails
 {
     public class Client
     {

GetClientsProducts.cs

+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WHMCS_API.GetClientsProducts
+{
+    public class Customfields
+    {
+
+        [JsonProperty("customfield")]
+        public IList<object> CustomField { get; set; }
+    }
+
+    public class Configoptions
+    {
+
+        [JsonProperty("configoption")]
+        public IList<object> ConfigOption { get; set; }
+    }
+
+    public class Product
+    {
+
+        [JsonProperty("id")]
+        public string ID { get; set; }
+
+        [JsonProperty("clientid")]
+        public string ClientID { get; set; }
+
+        [JsonProperty("orderid")]
+        public string OrderID { get; set; }
+
+        [JsonProperty("pid")]
+        public string ProductID { get; set; }
+
+        [JsonProperty("regdate")]
+        public string RegistryDate { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("translated_name")]
+        public string TranslatedName { get; set; }
+
+        [JsonProperty("groupname")]
+        public string GroupName { get; set; }
+
+        [JsonProperty("translated_groupname")]
+        public string TranslatedGroupName { get; set; }
+
+        [JsonProperty("domain")]
+        public string Domain { get; set; }
+
+        [JsonProperty("dedicatedip")]
+        public string DedicatedIP { get; set; }
+
+        [JsonProperty("serverid")]
+        public string ServerID { get; set; }
+
+        [JsonProperty("servername")]
+        public string ServerName { get; set; }
+
+        [JsonProperty("serverip")]
+        public string ServerIP { get; set; }
+
+        [JsonProperty("serverhostname")]
+        public string ServerHostname { get; set; }
+
+        [JsonProperty("suspensionreason")]
+        public string SuspensionReason { get; set; }
+
+        [JsonProperty("firstpaymentamount")]
+        public string FirstPaymentAmount { get; set; }
+
+        [JsonProperty("recurringamount")]
+        public string RecurringAmount { get; set; }
+
+        [JsonProperty("paymentmethod")]
+        public string PaymentMethod { get; set; }
+
+        [JsonProperty("paymentmethodname")]
+        public string PaymentMethodName { get; set; }
+
+        [JsonProperty("billingcycle")]
+        public string BillingCycle { get; set; }
+
+        [JsonProperty("nextduedate")]
+        public string NextDueDate { get; set; }
+
+        [JsonProperty("status")]
+        public string Status { get; set; }
+
+        [JsonProperty("username")]
+        public string username { get; set; }
+
+        [JsonProperty("password")]
+        public string Username { get; set; }
+
+        [JsonProperty("subscriptionid")]
+        public string Subscription { get; set; }
+
+        [JsonProperty("promoid")]
+        public string PromotionID { get; set; }
+
+        [JsonProperty("overideautosuspend")]
+        public string OverideAutoSuspend { get; set; }
+
+        [JsonProperty("overidesuspenduntil")]
+        public string OverideSuspendUntil { get; set; }
+
+        [JsonProperty("ns1")]
+        public string Nameserver1 { get; set; }
+
+        [JsonProperty("ns2")]
+        public string Nameserver2 { get; set; }
+
+        [JsonProperty("assignedips")]
+        public string AssignedIPs { get; set; }
+
+        [JsonProperty("notes")]
+        public string Notes { get; set; }
+
+        [JsonProperty("diskusage")]
+        public string DiskUsage { get; set; }
+
+        [JsonProperty("disklimit")]
+        public string DiskLimit { get; set; }
+
+        [JsonProperty("bwusage")]
+        public string BandwithUsage { get; set; }
+
+        [JsonProperty("bwlimit")]
+        public string BandwithLimit { get; set; }
+
+        [JsonProperty("lastupdate")]
+        public string LastUpdate { get; set; }
+
+        [JsonProperty("customfields")]
+        public Customfields CustomFields { get; set; }
+
+        [JsonProperty("configoptions")]
+        public Configoptions ConfigOptions { get; set; }
+    }
+
+    public class Products
+    {
+
+        [JsonProperty("product")]
+        public IList<Product> Product { get; set; }
+    }
+
+    public class GetClientsProducts
+    {
+
+        [JsonProperty("result")]
+        public string Result { get; set; }
+
+        [JsonProperty("clientid")]
+        public string ClientID { get; set; }
+
+        [JsonProperty("serviceid")]
+        public object ServiceID { get; set; }
+
+        [JsonProperty("pid")]
+        public object ProductID { get; set; }
+
+        [JsonProperty("domain")]
+        public object Domain { get; set; }
+
+        [JsonProperty("totalresults")]
+        public string TotalResults { get; set; }
+
+        [JsonProperty("startnumber")]
+        public int StartNumber { get; set; }
+
+        [JsonProperty("numreturned")]
+        public int NumberReturned { get; set; }
+
+        [JsonProperty("products")]
+        public Products Products { get; set; }
+    }
+}

GetOrders.cs

@@ -5,160 +5,160 @@ using System.IO;
 using System.Linq;
 using System.Text;
 
-namespace WHMCS_API
+namespace WHMCS_API.GetOrders
 {
     public class Lineitem
     {
 
         [JsonProperty("type")]
-        public string type { get; set; }
+        public string Type { get; set; }
 
         [JsonProperty("relid")]
         public string relid { get; set; }
 
         [JsonProperty("producttype")]
-        public string producttype { get; set; }
+        public string ProductType { get; set; }
 
         [JsonProperty("product")]
-        public string product { get; set; }
+        public string Product { get; set; }
 
         [JsonProperty("domain")]
-        public string domain { get; set; }
+        public string Domain { get; set; }
 
         [JsonProperty("billingcycle")]
-        public string billingcycle { get; set; }
+        public string BillingCycle { get; set; }
 
         [JsonProperty("amount")]
-        public string amount { get; set; }
+        public string Amount { get; set; }
 
         [JsonProperty("status")]
-        public string status { get; set; }
+        public string Status { get; set; }
 
         [JsonProperty("dnsmanagement")]
-        public string dnsmanagement { get; set; }
+        public string DNSManagment { get; set; }
 
         [JsonProperty("emailforwarding")]
-        public string emailforwarding { get; set; }
+        public string EmailFowarding { get; set; }
 
         [JsonProperty("idprotection")]
-        public string idprotection { get; set; }
+        public string IDProtection { get; set; }
     }
 
     public class Lineitems
     {
 
         [JsonProperty("lineitem")]
-        public IList<Lineitem> lineitem { get; set; }
+        public IList<Lineitem> LineItem { get; set; }
     }
 
     public class Order
     {
 
         [JsonProperty("id")]
-        public string id { get; set; }
+        public string ID { get; set; }
 
         [JsonProperty("ordernum")]
-        public string ordernum { get; set; }
+        public string OrderNumber { get; set; }
 
         [JsonProperty("userid")]
-        public string userid { get; set; }
+        public string UserID { get; set; }
 
         [JsonProperty("contactid")]
-        public string contactid { get; set; }
+        public string ContactID { get; set; }
 
         [JsonProperty("date")]
-        public string date { get; set; }
+        public string Date { get; set; }
 
         [JsonProperty("nameservers")]
-        public string nameservers { get; set; }
+        public string NameServers { get; set; }
 
         [JsonProperty("transfersecret")]
-        public string transfersecret { get; set; }
+        public string TransfererSecret { get; set; }
 
         [JsonProperty("renewals")]
-        public string renewals { get; set; }
+        public string RenewalsSecret { get; set; }
 
         [JsonProperty("promocode")]
-        public string promocode { get; set; }
+        public string PromoCode { get; set; }
 
         [JsonProperty("promotype")]
-        public string promotype { get; set; }
+        public string PromoType { get; set; }
 
         [JsonProperty("promovalue")]
-        public string promovalue { get; set; }
+        public string PromoValue { get; set; }
 
         [JsonProperty("orderdata")]
-        public string orderdata { get; set; }
+        public string OrderData { get; set; }
 
         [JsonProperty("amount")]
-        public string amount { get; set; }
+        public string Amount { get; set; }
 
         [JsonProperty("paymentmethod")]
-        public string paymentmethod { get; set; }
+        public string PaymentMethod { get; set; }
 
         [JsonProperty("invoiceid")]
-        public string invoiceid { get; set; }
+        public string InvoiceID { get; set; }
 
         [JsonProperty("status")]
-        public string status { get; set; }
+        public string Status { get; set; }
 
         [JsonProperty("ipaddress")]
-        public string ipaddress { get; set; }
+        public string IPAddress { get; set; }
 
         [JsonProperty("fraudmodule")]
-        public string fraudmodule { get; set; }
+        public string FraudModule { get; set; }
 
         [JsonProperty("fraudoutput")]
-        public string fraudoutput { get; set; }
+        public string FraudOutput { get; set; }
 
         [JsonProperty("notes")]
-        public string notes { get; set; }
+        public string Notes { get; set; }
 
         [JsonProperty("paymentmethodname")]
-        public string paymentmethodname { get; set; }
+        public string PaymentMethodName { get; set; }
 
         [JsonProperty("paymentstatus")]
-        public object paymentstatus { get; set; }
+        public object PaymentStatus { get; set; }
 
         [JsonProperty("name")]
-        public string name { get; set; }
+        public string Name { get; set; }
 
         [JsonProperty("currencyprefix")]
-        public string currencyprefix { get; set; }
+        public string CurrencyPrefix { get; set; }
 
         [JsonProperty("currencysuffix")]
-        public string currencysuffix { get; set; }
+        public string CurrencySuffix { get; set; }
 
         [JsonProperty("frauddata")]
-        public string frauddata { get; set; }
+        public string FraudData { get; set; }
 
         [JsonProperty("lineitems")]
-        public Lineitems lineitems { get; set; }
+        public Lineitems LineItems { get; set; }
     }
 
     public class Orders
     {
 
         [JsonProperty("order")]
-        public IList<Order> order { get; set; }
+        public IList<Order> Order { get; set; }
     }
 
     public class GetOrders
     {
 
         [JsonProperty("result")]
-        public string result { get; set; }
+        public string Result { get; set; }
 
         [JsonProperty("totalresults")]
-        public string totalresults { get; set; }
+        public string TotalResults { get; set; }
 
         [JsonProperty("startnumber")]
-        public int startnumber { get; set; }
+        public int StartNumber { get; set; }
 
         [JsonProperty("numreturned")]
-        public int numreturned { get; set; }
+        public int NumberReturned { get; set; }
 
         [JsonProperty("orders")]
-        public Orders orders { get; set; }
+        public Orders Orders { get; set; }
     }
 }
\ No newline at end of file

GetTransactions.cs

@@ -5,75 +5,75 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace WHMCS_API
+namespace WHMCS_API.GetTransactions
 {
     public class Transaction
     {
 
         [JsonProperty("id")]
-        public string id { get; set; }
+        public string ID { get; set; }
 
         [JsonProperty("userid")]
-        public string userid { get; set; }
+        public string UserID { get; set; }
 
         [JsonProperty("currency")]
-        public string currency { get; set; }
+        public string Currency { get; set; }
 
         [JsonProperty("gateway")]
-        public string gateway { get; set; }
+        public string PaymentGateway { get; set; }
 
         [JsonProperty("date")]
-        public string date { get; set; }
+        public string Date { get; set; }
 
         [JsonProperty("description")]
-        public string description { get; set; }
+        public string Description { get; set; }
 
         [JsonProperty("amountin")]
-        public string amountin { get; set; }
+        public string AmountIn { get; set; }
 
         [JsonProperty("fees")]
-        public string fees { get; set; }
+        public string Fees { get; set; }
 
         [JsonProperty("amountout")]
-        public string amountout { get; set; }
+        public string AmountOut { get; set; }
 
         [JsonProperty("rate")]
-        public string rate { get; set; }
+        public string Rate { get; set; }
 
         [JsonProperty("transid")]
-        public string transid { get; set; }
+        public string TransactionID { get; set; }
 
         [JsonProperty("invoiceid")]
-        public string invoiceid { get; set; }
+        public string InvoiceID { get; set; }
 
         [JsonProperty("refundid")]
-        public string refundid { get; set; }
+        public string RefundID { get; set; }
     }
 
     public class Transactions
     {
 
         [JsonProperty("transaction")]
-        public IList<Transaction> transaction { get; set; }
+        public IList<Transaction> Transaction { get; set; }
     }
 
     public class GetTransactions
     {
 
         [JsonProperty("result")]
-        public string result { get; set; }
+        public string Result { get; set; }
 
         [JsonProperty("totalresults")]
-        public int totalresults { get; set; }
+        public int TotalResults { get; set; }
 
         [JsonProperty("startnumber")]
-        public int startnumber { get; set; }
+        public int StartNumber { get; set; }
 
         [JsonProperty("numreturned")]
-        public int numreturned { get; set; }
+        public int NumberReturned { get; set; }
 
         [JsonProperty("transactions")]
-        public Transactions transactions { get; set; }
+        public Transactions Transactions { get; set; }
     }
 
 }

ValidateLogin.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace WHMCS_API
+namespace WHMCS_API.ValidateLogin
 {
     public class ValidateLogin
     {

WHMCS API.csproj

@@ -44,20 +44,14 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AddClient.cs" />
-<<<<<<< HEAD
     <Compile Include="GetClientsDetails.cs" />
-=======
-    <Compile Include="AddClientsDetails.cs" />
->>>>>>> origin/master
     <Compile Include="API.cs" />
     <Compile Include="Call.cs" />
     <Compile Include="DomainWhoIs.cs" />
     <Compile Include="Enums.cs" />
-<<<<<<< HEAD
+    <Compile Include="GetClientsProducts.cs" />
     <Compile Include="GetOrders.cs" />
     <Compile Include="GetTransactions.cs" />
-=======
->>>>>>> origin/master
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ValidateLogin.cs" />
   </ItemGroup>

obj/Debug/CoreCompileInputs.cache

-a9211ff72989fdd7a0227985eee9222a9f5fb034
+8d323b1218d18e3b2547d1c60e0ba30d4b3090ea

obj/Debug/WHMCS API.csproj.FileListAbsolute.txt

@@ -4,4 +4,3 @@ C:\Users\pmcav\Source\Repos\PCDev\WHMCS API\bin\Debug\Newtonsoft.Json.dll
 C:\Users\pmcav\Source\Repos\PCDev\WHMCS API\bin\Debug\Newtonsoft.Json.xml
 C:\Users\pmcav\Source\Repos\PCDev\WHMCS API\obj\Debug\WHMCS API.dll
 C:\Users\pmcav\Source\Repos\PCDev\WHMCS API\obj\Debug\WHMCS API.pdb
-C:\Users\pmcav\Source\Repos\PCDev\WHMCS API\obj\Debug\WHMCS API.csprojResolveAssemblyReference.cache

obj/Release/CoreCompileInputs.cache

-<<<<<<< HEAD
-6c3f1616b75e387981e8bc28f6eca8ccfc0bd29b
-=======
-5eb4fb84540e61ea2545bd966a0bb918182bb6f4
->>>>>>> origin/master
+67d26d3f8e599944ac917887812327b96760ec4f