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.

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

Changes from gocardless/gocardless-dotnet-template #118

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ artifacts/
*.pidb
*.svclog
*.scc
*.DS_Store

# Chutzpah Test files
_Chutzpah*
Expand Down
4 changes: 2 additions & 2 deletions GoCardless/GoCardless.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<PackageId>GoCardless</PackageId>
<PackageVersion>5.21.1</PackageVersion>
<PackageVersion>5.21.2</PackageVersion>
<Authors>GoCardless Ltd</Authors>
<Description>Client for the GoCardless API - a powerful, simple solution for the collection of recurring bank-to-bank payments</Description>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
Expand All @@ -11,7 +11,7 @@
<Copyright>GoCardless Ltd</Copyright>
<PackageTags>gocardless payments rest api direct debit</PackageTags>
<PackageLicenseUrl>https://github.com/gocardless/gocardless-dotnet/blob/master/LICENSE.txt</PackageLicenseUrl>
<PackageReleaseNotes>https://github.com/gocardless/gocardless-dotnet/releases/tag/v5.21.1</PackageReleaseNotes>
<PackageReleaseNotes>https://github.com/gocardless/gocardless-dotnet/releases/tag/v5.21.2</PackageReleaseNotes>
<TargetFrameworks>netstandard1.6;netstandard2.0;net46</TargetFrameworks>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
4 changes: 2 additions & 2 deletions GoCardless/GoCardlessClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,11 @@ private HttpRequestMessage BuildHttpRequestMessage<T>(string method, string path
runtimeFrameworkInformation = System.Runtime.InteropServices.RuntimeEnvironment.GetSystemVersion();
#endif

var userAgentInformation = $" gocardless-dotnet/5.21.1 {runtimeFrameworkInformation} {Helpers.CleanupOSDescriptionString(OSRunningOn)}";
var userAgentInformation = $" gocardless-dotnet/5.21.2 {runtimeFrameworkInformation} {Helpers.CleanupOSDescriptionString(OSRunningOn)}";

requestMessage.Headers.Add("User-Agent", userAgentInformation);
requestMessage.Headers.Add("GoCardless-Version", "2015-07-06");
requestMessage.Headers.Add("GoCardless-Client-Version", "5.21.1");
requestMessage.Headers.Add("GoCardless-Client-Version", "5.21.2");
requestMessage.Headers.Add("GoCardless-Client-Library", "gocardless-dotnet");
requestMessage.Headers.Authorization =
new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", _accessToken);
Expand Down
36 changes: 36 additions & 0 deletions GoCardless/Resources/BillingRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,20 @@ public class BillingRequestPaymentRequest
[JsonProperty("description")]
public string Description { get; set; }

/// <summary>
/// This field will decide how GoCardless handles settlement of funds
/// from the customer.
///
/// - `managed` will be moved through GoCardless' account, batched, and
/// payed out.
/// - `direct` will be a direct transfer from the payer's account to the
/// merchant where
/// invoicing will be handled separately.
///
/// </summary>
[JsonProperty("funds_settlement")]
public BillingRequestPaymentRequestFundsSettlement? FundsSettlement { get; set; }

/// <summary>
/// Resources linked to this BillingRequestPaymentRequest.
/// </summary>
Expand All @@ -870,6 +884,28 @@ public class BillingRequestPaymentRequest
public string Scheme { get; set; }
}

/// <summary>
/// This field will decide how GoCardless handles settlement of funds from the customer.
///
/// - `managed` will be moved through GoCardless' account, batched, and payed out.
/// - `direct` will be a direct transfer from the payer's account to the merchant where
/// invoicing will be handled separately.
///
/// </summary>
[JsonConverter(typeof(GcStringEnumConverter), (int)Unknown)]
public enum BillingRequestPaymentRequestFundsSettlement {
/// <summary>Unknown status</summary>
[EnumMember(Value = "unknown")]
Unknown = 0,

/// <summary>`funds_settlement` with a value of "managed"</summary>
[EnumMember(Value = "managed")]
Managed,
/// <summary>`funds_settlement` with a value of "direct"</summary>
[EnumMember(Value = "direct")]
Direct,
}

/// <summary>
/// Resources linked to this BillingRequestPaymentRequest
/// </summary>
Expand Down
15 changes: 9 additions & 6 deletions GoCardless/Services/BankDetailsLookupService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@ public BankDetailsLookupService(GoCardlessClient goCardlessClient)
}

/// <summary>
/// Performs a bank details lookup. As part of the lookup, a modulus
/// check and
/// reachability check are performed.
/// Performs a bank details lookup. As part of the lookup, some
/// validations are performed such as a modulus check for GBP accounts
/// and a reachability check for PayTo. These checks vary per scheme.
/// Please reach out to us if you require more information about the
/// checks.
///
/// If your request returns an [error](#api-usage-errors) or the
/// `available_debit_schemes`
Expand Down Expand Up @@ -79,9 +81,10 @@ public Task<BankDetailsLookupResponse> CreateAsync(BankDetailsLookupCreateReques


/// <summary>
/// Performs a bank details lookup. As part of the lookup, a modulus check
/// and
/// reachability check are performed.
/// Performs a bank details lookup. As part of the lookup, some validations
/// are performed such as a modulus check for GBP accounts and a
/// reachability check for PayTo. These checks vary per scheme. Please reach
/// out to us if you require more information about the checks.
///
/// If your request returns an [error](#api-usage-errors) or the
/// `available_debit_schemes`
Expand Down
36 changes: 36 additions & 0 deletions GoCardless/Services/BillingRequestService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -786,6 +786,42 @@ public class BillingRequestPaymentRequest
[JsonProperty("description")]
public string Description { get; set; }

/// <summary>
/// This field will decide how GoCardless handles settlement of
/// funds from the customer.
///
/// - `managed` will be moved through GoCardless' account, batched,
/// and payed out.
/// - `direct` will be a direct transfer from the payer's account to
/// the merchant where
/// invoicing will be handled separately.
///
/// </summary>
[JsonProperty("funds_settlement")]
public BillingRequestFundsSettlement? FundsSettlement { get; set; }
/// <summary>
/// This field will decide how GoCardless handles settlement of funds
/// from the customer.
///
/// - `managed` will be moved through GoCardless' account, batched, and
/// payed out.
/// - `direct` will be a direct transfer from the payer's account to the
/// merchant where
/// invoicing will be handled separately.
///
/// </summary>
[JsonConverter(typeof(StringEnumConverter))]
public enum BillingRequestFundsSettlement
{

/// <summary>`funds_settlement` with a value of "managed"</summary>
[EnumMember(Value = "managed")]
Managed,
/// <summary>`funds_settlement` with a value of "direct"</summary>
[EnumMember(Value = "direct")]
Direct,
}

/// <summary>
/// Key-value store of custom data. Up to 3 keys are permitted, with
/// key names up to 50 characters and values up to 500 characters.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ For full details of the GoCardless API, see the [API docs](https://developer.goc

To install `GoCardless`, run the following command in the [Package Manager Console](https://docs.microsoft.com/en-us/nuget/tools/package-manager-console)

`Install-Package GoCardless -Version 5.21.1`
`Install-Package GoCardless -Version 5.21.2`


## Usage
Expand Down
1 change: 1 addition & 0 deletions tmp-push-files-checkout
Submodule tmp-push-files-checkout added at ee6bb9
Loading