Add cis settings for contacts and orgs

Author: MJMortimer

Xero.Api/Core/Endpoints/ContactsEndpoint.cs

@@ -1,4 +1,6 @@
-using Xero.Api.Common;
+using System;
+using System.Linq;
+using Xero.Api.Common;
 using Xero.Api.Core.Endpoints.Base;
 using Xero.Api.Core.Model;
 using Xero.Api.Core.Request;
@@ -12,6 +14,7 @@ public interface IContactsEndpoint
         IPageableEndpoint<IContactsEndpoint>
     {
         IContactsEndpoint IncludeArchived(bool include);
+        ContactCisSetting GetCisSettings(Guid id);
     }
 
     public class ContactsEndpoint
@@ -29,12 +32,6 @@ public IContactsEndpoint Page(int page)
             return this;
         }
 
-        public override void ClearQueryString()
-        {
-            base.ClearQueryString();
-            Page(1);
-        }
-
         public IContactsEndpoint IncludeArchived(bool include)
         {
             if (include)
@@ -44,5 +41,17 @@ public IContactsEndpoint IncludeArchived(bool include)
 
             return this;
         }
+
+        public ContactCisSetting GetCisSettings(Guid id)
+        {
+            var contactCisSettings = Client.Get<ContactCisSetting, ContactCisSettingsResponse>(string.Format("/api.xro/2.0/contacts/{0}/cissettings", id));
+            return contactCisSettings.FirstOrDefault();
+        }
+
+        public override void ClearQueryString()
+        {
+            base.ClearQueryString();
+            Page(1);
+        }
     }
 }

Xero.Api/Core/Endpoints/OrganisationEndpoint.cs

@@ -1,4 +1,6 @@
-using Xero.Api.Common;
+using System;
+using System.Linq;
+using Xero.Api.Common;
 using Xero.Api.Core.Model;
 using Xero.Api.Core.Response;
 using Xero.Api.Infrastructure.Http;
@@ -7,6 +9,7 @@ namespace Xero.Api.Core.Endpoints
 {
     public interface IOrganisationEndpoint : IXeroReadEndpoint<OrganisationEndpoint, Organisation, OrganisationResponse>
     {
+        OrganisationCisSetting GetCisSettings(Guid id);
     }
 
     public class OrganisationEndpoint : XeroReadEndpoint<OrganisationEndpoint, Organisation, OrganisationResponse>, IOrganisationEndpoint
@@ -15,5 +18,12 @@ internal OrganisationEndpoint(XeroHttpClient client)
             : base(client, "/api.xro/2.0/Organisation")
         {
         }
+
+        public OrganisationCisSetting GetCisSettings(Guid id)
+        {
+            var organisationCisSettings = Client.Get<OrganisationCisSetting, OrganisationCisSettingsResponse>(string.Format("/api.xro/2.0/organisations/{0}/cissettings", id));
+
+            return organisationCisSettings.FirstOrDefault();
+        }
     }
 }

Xero.Api/Core/IXeroCoreApi.cs

@@ -29,6 +29,7 @@ public interface IXeroCoreApi
         IJournalsEndpoint Journals { get; }
         ILinkedTransactionsEndpoint LinkedTransactions { get; }
         IManualJournalsEndpoint ManualJournals { get; }
+        IOrganisationEndpoint Organisations { get; }
         IOverpaymentsEndpoint Overpayments { get; }
         IPaymentsEndpoint Payments { get; }
         PdfEndpoint PdfFiles { get; }

Xero.Api/Core/Model/ContactCisSetting.cs

@@ -0,0 +1,13 @@
+using System.Runtime.Serialization;
+
+namespace Xero.Api.Core.Model
+{
+    public class ContactCisSetting
+    {
+        [DataMember(Name = "CISEnabled")]
+        public bool CisEnabled { get; set; }
+
+        [DataMember]
+        public decimal Rate { get; set; }
+    }
+}

Xero.Api/Core/Model/OrganisationCisSetting.cs

@@ -0,0 +1,13 @@
+using System.Runtime.Serialization;
+
+namespace Xero.Api.Core.Model
+{
+    public class OrganisationCisSetting
+    {
+        [DataMember(Name = "CISContractorEnabled")]
+        public bool CisContractorEnabled { get; set; }
+
+        [DataMember(Name = "CISSubContractorEnabled")]
+        public bool CisSubContractorEnabled { get; set; }
+    }
+}

Xero.Api/Core/Response/ContactCisSettingsResponse.cs

@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using Xero.Api.Common;
+using Xero.Api.Core.Model;
+
+namespace Xero.Api.Core.Response
+{
+    public class ContactCisSettingsResponse : XeroResponse<ContactCisSetting>
+    {
+        public List<ContactCisSetting> ContactCisSettings { get; set; }
+
+        public override IList<ContactCisSetting> Values
+        {
+            get { return ContactCisSettings; }
+        }
+    }
+}

Xero.Api/Core/Response/OrganisationCisSettingsResponse.cs

@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using Xero.Api.Common;
+using Xero.Api.Core.Model;
+
+namespace Xero.Api.Core.Response
+{
+    public class OrganisationCisSettingsResponse : XeroResponse<OrganisationCisSetting>
+    {
+        public List<OrganisationCisSetting> OrganisationCisSettings { get; set; }
+
+        public override IList<OrganisationCisSetting> Values
+        {
+            get { return OrganisationCisSettings; }
+        }
+    }
+}

Xero.Api/Core/XeroCoreApi.cs

@@ -14,8 +14,6 @@ namespace Xero.Api.Core
 {
     public class XeroCoreApi : XeroApi, IXeroCoreApi
     {
-        private IOrganisationEndpoint OrganisationEndpoint { get; set; }
-
         public XeroCoreApi(string baseUri, IAuthenticator auth, IConsumer consumer, IUser user,
             IJsonObjectMapper readMapper, IXmlObjectMapper writeMapper)
             : this(baseUri, auth, consumer, user, readMapper, writeMapper, null)
@@ -59,6 +57,7 @@ public XeroCoreApi(string baseUri, IAuthenticator auth, IConsumer consumer, IUse
         public IJournalsEndpoint Journals { get; protected set; }
         public ILinkedTransactionsEndpoint LinkedTransactions { get; private set; }
         public IManualJournalsEndpoint ManualJournals { get; private set; }
+        public IOrganisationEndpoint Organisations { get; private set; }
         public IOverpaymentsEndpoint Overpayments { get; private set; }
         public IPaymentsEndpoint Payments { get; private set; }
         public PdfEndpoint PdfFiles { get; private set; }
@@ -75,7 +74,7 @@ public XeroCoreApi(string baseUri, IAuthenticator auth, IConsumer consumer, IUse
 
         private void Connect()
         {
-            OrganisationEndpoint = new OrganisationEndpoint(Client);
+            Organisations = new OrganisationEndpoint(Client);
 
             Accounts = new AccountsEndpoint(Client);
             Allocations = new AllocationsEndpoint(Client);
@@ -116,7 +115,7 @@ public Organisation Organisation
         {
             get
             {
-                return OrganisationEndpoint.Find().FirstOrDefault();
+                return Organisations.Find().FirstOrDefault();
             }
         }
 

Xero.Api/Xero.Api.csproj

@@ -59,13 +59,15 @@
     <Compile Include="Core\Endpoints\FoldersEndpoint.cs" />
     <Compile Include="Core\Endpoints\InboxEndpoint.cs" />
     <Compile Include="Core\Endpoints\LinkedTransactionsEndpoint.cs" />
+    <Compile Include="Core\Model\ContactCisSetting.cs" />
     <Compile Include="Core\Model\EnumExtensions.cs" />
     <Compile Include="Core\Model\OnlineInvoice.cs" />
     <Compile Include="Core\IXeroCoreApi.cs" />
     <Compile Include="Core\Endpoints\PurchaseOrdersEndpoint.cs" />
     <Compile Include="Core\Model\Association.cs" />
     <Compile Include="Core\Model\ContactTrackingCategory.cs" />
     <Compile Include="Core\Model\LinkedTransaction.cs" />
+    <Compile Include="Core\Model\OrganisationCisSetting.cs" />
     <Compile Include="Core\Model\PurchaseOrder.cs" />
     <Compile Include="Core\Model\Status\LinkedTransactionStatus.cs" />
     <Compile Include="Core\Model\Status\PurchaseOrderStatus.cs" />
@@ -94,8 +96,10 @@
     <Compile Include="Core\Model\Types\OverpaymentType.cs" />
     <Compile Include="Common\CoreData.cs" />
     <Compile Include="Core\Model\Status\ValidationStatus.cs" />
+    <Compile Include="Core\Response\ContactCisSettingsResponse.cs" />
     <Compile Include="Core\Response\LinkedTransactionsResponse.cs" />
     <Compile Include="Core\Response\OnlineInvoicesResponse.cs" />
+    <Compile Include="Core\Response\OrganisationCisSettingsResponse.cs" />
     <Compile Include="Core\Response\OverpaymentsResponse.cs" />
     <Compile Include="Core\Response\PrepaymentsResponse.cs" />
     <Compile Include="Core\Model\Prepayment.cs" />