Merge pull request #244 from MJMortimer/f/PayrollUpdates

MJMortimer · web-flow · commit e93e117e6e9a · 2017-01-30T01:05:37.000Z
Payroll updates
diff --git a/PayrollTests.AU/Integration/ValidationErrors/AUPayrollValidationErrors.cs b/PayrollTests.AU/Integration/ValidationErrors/AUPayrollValidationErrors.cs
@@ -0,0 +1,29 @@
+﻿using System.Linq;
+using NUnit.Framework;
+using Xero.Api.Infrastructure.Exceptions;
+using Xero.Api.Payroll.Australia.Model;
+
+namespace PayrollTests.AU.Integration.ValidationErrors
+{
+    public class AUPayrollValidationErrors : ApiWrapperTest
+    {
+        [Test]
+        public void Validation_errors_are_returned_from_the_AU_payroll_api()
+        {
+            var employee = new Employee() {FirstName = "Jimmy"};
+
+            try
+            {
+                Api.Employees.Create(employee);
+            }
+            catch (ValidationException e)
+            {
+                Assert.True(e.ValidationErrors.Any(p => p.Message == "The Last Name is required."));
+                Assert.True(e.ValidationErrors.Any(p => p.Message == "The Home Address is required."));
+                return;
+            }
+
+            throw new AssertionException("Expected validation errors");
+        }
+    }
+}
diff --git a/PayrollTests.AU/PayrollTests.AU.csproj b/PayrollTests.AU/PayrollTests.AU.csproj
@@ -69,6 +69,7 @@
     <Compile Include="Integration\TimeSheets\Create.cs" />
     <Compile Include="Integration\TimeSheets\Find.cs" />
     <Compile Include="Integration\TimeSheets\TimesheetTest.cs" />
+    <Compile Include="Integration\ValidationErrors\AUPayrollValidationErrors.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Xero.Api.Example.MVC/Web.config b/Xero.Api.Example.MVC/Web.config
@@ -59,6 +59,10 @@
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="4.0.0.0-4.0.0.1" newVersion="4.0.0.1" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <entityFramework>
diff --git a/Xero.Api.Example.MVC/Xero.Api.Example.MVC.csproj b/Xero.Api.Example.MVC/Xero.Api.Example.MVC.csproj
@@ -20,7 +20,9 @@
     <IISExpressAnonymousAuthentication />
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>    <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>
+    <TargetFrameworkProfile />
+    <UseGlobalApplicationHostFile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -45,8 +47,8 @@
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/Xero.Api.Example.MVC/packages.config b/Xero.Api.Example.MVC/packages.config
@@ -8,5 +8,5 @@
   <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net40" />
   <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="4.5.6" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
 </packages>
diff --git a/Xero.Api/Infrastructure/Http/XeroHttpClient.cs b/Xero.Api/Infrastructure/Http/XeroHttpClient.cs
@@ -3,9 +3,11 @@
 using System.Collections.Specialized;
 using System.Linq;
 using System.Net;
+using Newtonsoft.Json.Linq;
 using Xero.Api.Common;
 using Xero.Api.Infrastructure.Exceptions;
 using Xero.Api.Infrastructure.Interfaces;
+using Xero.Api.Infrastructure.Model;
 using Xero.Api.Infrastructure.RateLimiter;
 
 namespace Xero.Api.Infrastructure.Http
@@ -109,6 +111,16 @@ internal void HandleErrors(Response response)
                     throw new ValidationException(data);
                 }
 
+                //CHeck for inline errors
+                var jsonObject = JObject.Parse(response.Body);
+                var inlineValidationErrors = jsonObject.SelectTokens("$..ValidationErrors..Message").Select(p => new ValidationError { Message = p.ToString() }).ToList();
+
+                if (inlineValidationErrors.Any())
+                {
+                    data.Elements = new List<DataContractBase> { new DataContractBase {ValidationErrors = inlineValidationErrors } };
+                    throw new ValidationException(data);
+                }
+
                 throw new BadRequestException(data);
             }
 
diff --git a/Xero.Api/Payroll/Australia/Model/DeductionLine.cs b/Xero.Api/Payroll/Australia/Model/DeductionLine.cs
@@ -14,7 +14,7 @@ public class DeductionLine
         public decimal? Amount { get; set; }
 
         [DataMember(EmitDefaultValue = false)]
-        public DeductionCalculationType CalculationType { get; set; }
+        public DeductionCalculationType? CalculationType { get; set; }
 
         [DataMember(EmitDefaultValue = false)]
         public decimal NumberOfUnits { get; set; }
diff --git a/Xero.Api/Payroll/Australia/Model/EarningsLine.cs b/Xero.Api/Payroll/Australia/Model/EarningsLine.cs
@@ -29,6 +29,6 @@ public class EarningsLine
         public decimal? NumberOfUnits { get; set; }
 
         [DataMember(EmitDefaultValue = false)]
-        public EarningsRateCalculationType EarningsRateCalculation { get; set; }
+        public EarningsRateCalculationType? CalculationType { get; set; }
     } 
 }
diff --git a/Xero.Api/Payroll/Australia/Model/LeaveLine.cs b/Xero.Api/Payroll/Australia/Model/LeaveLine.cs
@@ -11,7 +11,7 @@ public class LeaveLine
         public Guid LeaveTypeId { get; set; }
 
         [DataMember(EmitDefaultValue = false)]
-        public decimal NumberOfUnits { get; set; }
+        public decimal? NumberOfUnits { get; set; }
 
         [DataMember(EmitDefaultValue = false)]
         public decimal AnnualNumberOfUnits { get; set; }
diff --git a/Xero.Api/Payroll/Australia/Model/Payslip.cs b/Xero.Api/Payroll/Australia/Model/Payslip.cs
@@ -24,7 +24,7 @@ public class Payslip : PayNotice
         public decimal Wages { get; set; }
 
         [DataMember]
-        public List<EarningsLine> EarningsLines { get; set; }
+        public List<PayslipEarningsLine> EarningsLines { get; set; }
 
         [DataMember]
         public List<DeductionLine> DeductionLines { get; set; }
@@ -46,5 +46,9 @@ public class Payslip : PayNotice
 
         [DataMember]
         public List<TaxLine> TaxLines { get; set; }
+
+        [DataMember(EmitDefaultValue = false, Name = "PayRunID")]
+        public Guid PayRunId { get; set; }
+
     }
 }
diff --git a/Xero.Api/Payroll/Australia/Model/PayslipEarningsLine.cs b/Xero.Api/Payroll/Australia/Model/PayslipEarningsLine.cs
@@ -0,0 +1,28 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xero.Api.Payroll.Australia.Model
+{
+    using System.Runtime.Serialization;
+
+    /// <summary>
+    /// Earnings Line for a payslip
+    /// </summary>
+    [DataContract(Namespace = "", Name = "EarningsLine")]
+    public class PayslipEarningsLine
+    {
+        [DataMember(Name = "EarningsRateID")]
+        public Guid EarningsRateId { get; set; }
+
+        [DataMember()]
+        public decimal? RatePerUnit { get; set; }
+
+        [DataMember()]
+        public decimal? NumberOfUnits { get; set; }
+
+        [DataMember(EmitDefaultValue = true)]
+        public decimal? FixedAmount { get; set; }
+    }
+}
diff --git a/Xero.Api/Payroll/Australia/Model/SuperLine.cs b/Xero.Api/Payroll/Australia/Model/SuperLine.cs
@@ -11,10 +11,10 @@ public class SuperLine
         public Guid SuperMembershipId { get; set; }
 
         [DataMember(EmitDefaultValue = false)]
-        public SuperannuationCalculationType CalculationType { get; set; }
+        public SuperannuationCalculationType? CalculationType { get; set; }
 
         [DataMember(EmitDefaultValue = false)]
-        public SuperannuationContributionType ContributionType { get; set; }
+        public SuperannuationContributionType? ContributionType { get; set; }
 
         [DataMember(EmitDefaultValue = false)]
         public int ExpenseAccountCode { get; set; }
diff --git a/Xero.Api/Payroll/Australia/Model/SuperannuationLine.cs b/Xero.Api/Payroll/Australia/Model/SuperannuationLine.cs
@@ -7,14 +7,14 @@ namespace Xero.Api.Payroll.Australia.Model
     [DataContract(Namespace = "")]
     public class SuperannuationLine
     {
-        [DataMember(Name = "SuperMembershipID")]
+        [DataMember(Name = "SuperMembershipID", EmitDefaultValue = false)]
         public Guid SuperMembershipId { get; set; }
 
         [DataMember]
-        public SuperannuationContributionType ContributionType { get; set; }
+        public SuperannuationContributionType? ContributionType { get; set; }
 
         [DataMember]
-        public SuperannuationCalculationType CalculationType { get; set; }
+        public SuperannuationCalculationType? CalculationType { get; set; }
 
         [DataMember]
         public decimal MinimumMonthlyEarnings { get; set; }
diff --git a/Xero.Api/Payroll/Australia/Model/TaxDeclaration.cs b/Xero.Api/Payroll/Australia/Model/TaxDeclaration.cs
@@ -24,14 +24,14 @@ public class TaxDeclaration : HasUpdatedDate
         public bool AustralianResidentForTaxPurposes { get; set; }
 
         [DataMember(EmitDefaultValue = false)]
-        public bool TaxFreeThresholdClaimed { get; set; }
+        public bool? TaxFreeThresholdClaimed { get; set; }
 
         [DataMember(Name = "HasHELPDebt", EmitDefaultValue = false)]
         public bool HasHigherEducationLoanProgramDebt { get; set; }
 
         [DataMember(Name = "HasSFSSDebt", EmitDefaultValue = false)]
         public bool HasStudentFinancialSupplementSchemeDebt { get; set; }
-        
+
         [DataMember(Name = "HasTSLDebt", EmitDefaultValue = false)]
         public bool HasTradeSupportLoan { get; set; }
 
@@ -51,5 +51,9 @@ public class TaxDeclaration : HasUpdatedDate
 
         [DataMember(EmitDefaultValue = false)]
         public decimal? UpwardVariationTaxWithholdingAmount { get; set; }
+
+
+        [DataMember(Name = "TFNExemptionType", EmitDefaultValue = false)]
+        public TaxFileNumberExemptionType? TaxFileNumberExemption { get; set; }
     }
 }
diff --git a/Xero.Api/Payroll/Australia/Model/Types/EarningsType.cs b/Xero.Api/Payroll/Australia/Model/Types/EarningsType.cs
@@ -5,17 +5,15 @@ namespace Xero.Api.Payroll.Australia.Model.Types
     [DataContract(Namespace = "")]
     public enum EarningsType
     {
+        [EnumMember(Value = "FIXED")]
+        Fixed,
         [EnumMember(Value = "ORDINARYTIMEEARNINGS")]
         OrdinaryTimeEarnings,
         [EnumMember(Value = "OVERTIMEEARNINGS")]
         OverTimeEarnings,
         [EnumMember(Value = "ALLOWANCE")]
         Allowance,
-        [EnumMember(Value = "COMMISSION")]
-        Commission,
-        [EnumMember(Value = "BONUS")]
-        Bonus,
-        [EnumMember(Value = "BACKPAY")]
-        BackPay
+        [EnumMember(Value = "LUMPSUMD")]
+        LumpSumD
     }
 }
diff --git a/Xero.Api/Payroll/Australia/Model/Types/SuperannuationCalculationType.cs b/Xero.Api/Payroll/Australia/Model/Types/SuperannuationCalculationType.cs
@@ -5,6 +5,8 @@ namespace Xero.Api.Payroll.Australia.Model.Types
     [DataContract(Namespace = "")]
     public enum SuperannuationCalculationType
     {
+        [EnumMember(Value = "STATUTORY")]
+        Statutory,
         [EnumMember(Value = "FIXEDAMOUNT")]
         FixedAmount,
         [EnumMember(Value = "PERCENTAGEOFEARNINGS")]
diff --git a/Xero.Api/Xero.Api.csproj b/Xero.Api/Xero.Api.csproj
@@ -33,6 +33,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Linq" />
@@ -258,6 +262,7 @@
     <Compile Include="Payroll\America\Response\TimesheetsResponse.cs" />
     <Compile Include="Payroll\Australia\Endpoints\TimesheetsEndpoint.cs" />
     <Compile Include="Payroll\Australia\Model\LeaveBalance.cs" />
+    <Compile Include="Payroll\Australia\Model\PayslipEarningsLine.cs" />
     <Compile Include="Payroll\Australia\Model\Settings.cs" />
     <Compile Include="Payroll\Australia\Model\Timesheet.cs" />
     <Compile Include="Payroll\Australia\Model\TimesheetLine.cs" />
@@ -554,6 +559,7 @@
     <Compile Include="Infrastructure\ThirdParty\ServiceStack.Text\XmlSerializer.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="README.md" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Xero.Api/packages.config b/Xero.Api/packages.config
@@ -0,0 +1,4 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40-client" />
+</packages>

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ public class EarningsLine`
`29`	`29`	`public decimal? NumberOfUnits { get; set; }`
`30`	`30`
`31`	`31`	`[DataMember(EmitDefaultValue = false)]`
`32`		`- public EarningsRateCalculationType EarningsRateCalculation { get; set; }`
	`32`	`+ public EarningsRateCalculationType? CalculationType { get; set; }`
`33`	`33`	`}`
`34`	`34`	`}`