Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

When calling the Taxjar client DeleteOrder or DeleteRefund API routin… #1

Merged
merged 1 commit into from
Mar 2, 2017
Merged

When calling the Taxjar client DeleteOrder or DeleteRefund API routin… #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/Taxjar.Tests/TaxJar.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -73,14 +73,11 @@
<Compile Include="Client.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\taxjar-c#\TaxJar\TaxJar\TaxJar.csproj">
<ProjectReference Include="..\TaxJar\TaxJar.csproj">
<Project>{CE4FFA2A-801C-488A-BF28-0EAAB8877C2D}</Project>
<Name>TaxJar</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Fixtures\" />
<Folder Include="Infrastructure\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
94 changes: 47 additions & 47 deletions src/Taxjar/Entities/TaxjarOrder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,69 +4,69 @@

namespace Taxjar
{
public class OrdersRequest
{
[JsonProperty("orders")]
public List<String> Orders { get; set; }
}
public class OrdersRequest
{
[JsonProperty("orders")]
public List<String> Orders { get; set; }
}

public class OrderRequest
{
[JsonProperty("order")]
public Order Order { get; set; }
}
public class OrderRequest
{
[JsonProperty("order")]
public Order Order { get; set; }
}

public class Order
{
[JsonProperty("transaction_id")]
public string TransactionId { get; set; }
public class Order
{
[JsonProperty("transaction_id")]
public string TransactionId { get; set; }

[JsonProperty("user_id")]
public int UserId { get; set; }
[JsonProperty("user_id")]
public int UserId { get; set; }

[JsonProperty("transaction_date")]
public string TransactionDate { get; set; }
[JsonProperty("transaction_date")]
public string TransactionDate { get; set; }

[JsonProperty("from_country")]
public string FromCountry { get; set; }
[JsonProperty("from_country")]
public string FromCountry { get; set; }

[JsonProperty("from_zip")]
public string FromZip { get; set; }
[JsonProperty("from_zip")]
public string FromZip { get; set; }

[JsonProperty("from_state")]
public string FromState { get; set; }
[JsonProperty("from_state")]
public string FromState { get; set; }

[JsonProperty("from_city")]
public string FromCity { get; set; }
[JsonProperty("from_city")]
public string FromCity { get; set; }

[JsonProperty("from_street")]
public string FromStreet { get; set; }
[JsonProperty("from_street")]
public string FromStreet { get; set; }

[JsonProperty("to_country")]
public string ToCountry { get; set; }
[JsonProperty("to_country")]
public string ToCountry { get; set; }

[JsonProperty("to_zip")]
public string ToZip { get; set; }
[JsonProperty("to_zip")]
public string ToZip { get; set; }

[JsonProperty("to_state")]
public string ToState { get; set; }
[JsonProperty("to_state")]
public string ToState { get; set; }

[JsonProperty("to_city")]
public string ToCity { get; set; }
[JsonProperty("to_city")]
public string ToCity { get; set; }

[JsonProperty("to_street")]
public string ToStreet { get; set; }
[JsonProperty("to_street")]
public string ToStreet { get; set; }

[JsonProperty("amount")]
public decimal Amount { get; set; }
[JsonProperty("amount", NullValueHandling = NullValueHandling.Ignore)]
public decimal Amount { get; set; }

[JsonProperty("shipping")]
public decimal Shipping { get; set; }
[JsonProperty("shipping", NullValueHandling = NullValueHandling.Ignore)]
public decimal Shipping { get; set; }

[JsonProperty("sales_tax")]
public decimal SalesTax { get; set; }
[JsonProperty("sales_tax", NullValueHandling = NullValueHandling.Ignore)]
public decimal SalesTax { get; set; }

[JsonProperty("line_items")]
public List<LineItem> LineItems { get; set; }
}
[JsonProperty("line_items")]
public List<LineItem> LineItems { get; set; }
}
}
98 changes: 49 additions & 49 deletions src/Taxjar/Entities/TaxjarRefund.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,72 +4,72 @@

namespace Taxjar
{
public class RefundsRequest
{
[JsonProperty("refunds")]
public List<String> Refunds { get; set; }
}
public class RefundsRequest
{
[JsonProperty("refunds")]
public List<String> Refunds { get; set; }
}

public class RefundRequest
{
[JsonProperty("refund")]
public Refund Refund { get; set; }
}
public class RefundRequest
{
[JsonProperty("refund")]
public Refund Refund { get; set; }
}

public class Refund
{
[JsonProperty("transaction_id")]
public string TransactionId { get; set; }
public class Refund
{
[JsonProperty("transaction_id")]
public string TransactionId { get; set; }

[JsonProperty("user_id")]
public int UserId { get; set; }
[JsonProperty("user_id")]
public int UserId { get; set; }

[JsonProperty("transaction_date")]
public string TransactionDate { get; set; }
[JsonProperty("transaction_date")]
public string TransactionDate { get; set; }

[JsonProperty("transaction_reference_id")]
public string TransactionReferenceId { get; set; }
[JsonProperty("transaction_reference_id")]
public string TransactionReferenceId { get; set; }

[JsonProperty("from_country")]
public string FromCountry { get; set; }
[JsonProperty("from_country")]
public string FromCountry { get; set; }

[JsonProperty("from_zip")]
public string FromZip { get; set; }
[JsonProperty("from_zip")]
public string FromZip { get; set; }

[JsonProperty("from_state")]
public string FromState { get; set; }
[JsonProperty("from_state")]
public string FromState { get; set; }

[JsonProperty("from_city")]
public string FromCity { get; set; }
[JsonProperty("from_city")]
public string FromCity { get; set; }

[JsonProperty("from_street")]
public string FromStreet { get; set; }
[JsonProperty("from_street")]
public string FromStreet { get; set; }

[JsonProperty("to_country")]
public string ToCountry { get; set; }
[JsonProperty("to_country")]
public string ToCountry { get; set; }

[JsonProperty("to_zip")]
public string ToZip { get; set; }
[JsonProperty("to_zip")]
public string ToZip { get; set; }

[JsonProperty("to_state")]
public string ToState { get; set; }
[JsonProperty("to_state")]
public string ToState { get; set; }

[JsonProperty("to_city")]
public string ToCity { get; set; }
[JsonProperty("to_city")]
public string ToCity { get; set; }

[JsonProperty("to_street")]
public string ToStreet { get; set; }
[JsonProperty("to_street")]
public string ToStreet { get; set; }

[JsonProperty("amount")]
public decimal Amount { get; set; }
[JsonProperty("amount", NullValueHandling = NullValueHandling.Ignore)]
public decimal Amount { get; set; }

[JsonProperty("shipping")]
public decimal Shipping { get; set; }
[JsonProperty("shipping", NullValueHandling = NullValueHandling.Ignore)]
public decimal Shipping { get; set; }

[JsonProperty("sales_tax")]
public decimal SalesTax { get; set; }
[JsonProperty("sales_tax", NullValueHandling = NullValueHandling.Ignore)]
public decimal SalesTax { get; set; }

[JsonProperty("line_items")]
public List<LineItem> LineItems { get; set; }
}
[JsonProperty("line_items")]
public List<LineItem> LineItems { get; set; }
}
}
13 changes: 5 additions & 8 deletions src/Taxjar/Taxjar.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -29,14 +29,14 @@
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="RestSharp">
<HintPath>..\packages\RestSharp.105.2.3\lib\net45\RestSharp.dll</HintPath>
</Reference>
<Reference Include="System.Configuration" />
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\..\taxjar-c#-shared\TaxJarShared\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand All @@ -58,8 +58,5 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="Entities\" />
<Folder Include="Infrastructure\" />
</ItemGroup>
<ItemGroup />
</Project>