Skip to content
This repository was archived by the owner on Apr 23, 2021. It is now read-only.

From connect-api-specification: Merge pull request #53 from square/tr… #31

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ install:

script:
- export frameworkVersion=net45
- export releaseVersion="2.1.0"
- export releaseVersion="2.1.1"
- /bin/sh ./mono_nunit_test.sh

after_success:
Expand Down
2 changes: 1 addition & 1 deletion docs/V1Payment.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Name | Type | Description | Notes
**Id** | **string** | The payment's unique identifier. | [optional]
**MerchantId** | **string** | The unique identifier of the merchant that took the payment. | [optional]
**CreatedAt** | **string** | The time when the payment was created, in ISO 8601 format. | [optional]
**CreatorId** | **bool?** | The unique identifier of the Square account that took the payment. | [optional]
**CreatorId** | **string** | The unique identifier of the Square account that took the payment. | [optional]
**Device** | [**Device**](Device.md) | The device that took the payment. | [optional]
**PaymentUrl** | **string** | The URL of the payment's detail page in the merchant dashboard. The merchant must be signed in to the merchant dashboard to view this page. | [optional]
**ReceiptUrl** | **string** | The URL of the receipt for the payment. Note that for split tender payments, this URL corresponds to the receipt for the first tender listed in the payment's tender field. Each Tender object has its own receipt_url field you can use to get the other receipts associated with a split tender payment. | [optional]
Expand Down
6 changes: 3 additions & 3 deletions src/Square.Connect/Client/Configuration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public Configuration(ApiClient apiClient = null,
string tempFolderPath = null,
string dateTimeFormat = null,
int timeout = 100000,
string userAgent = "Square-Connect-CSharp/2.1.0"
string userAgent = "Square-Connect-CSharp/2.1.1"
)
{
setApiClientUsingDefault(apiClient);
Expand Down Expand Up @@ -81,7 +81,7 @@ public Configuration(ApiClient apiClient)
/// Version of the package.
/// </summary>
/// <value>Version of the package.</value>
public const string Version = "2.1.0";
public const string Version = "2.1.1";

/// <summary>
/// Gets or sets the default Configuration.
Expand Down Expand Up @@ -318,7 +318,7 @@ public static String ToDebugReport()
.GetReferencedAssemblies()
.Where(x => x.Name == "System.Core").First().Version.ToString() + "\n";
report += " Version of the API: 2.0\n";
report += " SDK Package Version: 2.1.0\n";
report += " SDK Package Version: 2.1.1\n";

return report;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Square.Connect/Model/V1Payment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public partial class V1Payment : IEquatable<V1Payment>, IValidatableObject
/// <param name="Tender">All of the additive taxes associated with the payment..</param>
/// <param name="Refunds">All of the refunds applied to the payment..</param>
/// <param name="Itemizations">The items purchased in the payment..</param>
public V1Payment(string Id = default(string), string MerchantId = default(string), string CreatedAt = default(string), bool? CreatorId = default(bool?), Device Device = default(Device), string PaymentUrl = default(string), string ReceiptUrl = default(string), V1Money InclusiveTaxMoney = default(V1Money), V1Money AdditiveTaxMoney = default(V1Money), V1Money TaxMoney = default(V1Money), V1Money TipMoney = default(V1Money), V1Money DiscountMoney = default(V1Money), V1Money TotalCollectedMoney = default(V1Money), V1Money ProcessingFeeMoney = default(V1Money), V1Money NetTotalMoney = default(V1Money), V1Money RefundedMoney = default(V1Money), V1Money SwedishRoundingMoney = default(V1Money), V1Money GrossSalesMoney = default(V1Money), V1Money NetSalesMoney = default(V1Money), List<V1PaymentTax> InclusiveTax = default(List<V1PaymentTax>), List<V1PaymentTax> AdditiveTax = default(List<V1PaymentTax>), List<V1Tender> Tender = default(List<V1Tender>), List<V1Refund> Refunds = default(List<V1Refund>), List<V1PaymentItemization> Itemizations = default(List<V1PaymentItemization>))
public V1Payment(string Id = default(string), string MerchantId = default(string), string CreatedAt = default(string), string CreatorId = default(string), Device Device = default(Device), string PaymentUrl = default(string), string ReceiptUrl = default(string), V1Money InclusiveTaxMoney = default(V1Money), V1Money AdditiveTaxMoney = default(V1Money), V1Money TaxMoney = default(V1Money), V1Money TipMoney = default(V1Money), V1Money DiscountMoney = default(V1Money), V1Money TotalCollectedMoney = default(V1Money), V1Money ProcessingFeeMoney = default(V1Money), V1Money NetTotalMoney = default(V1Money), V1Money RefundedMoney = default(V1Money), V1Money SwedishRoundingMoney = default(V1Money), V1Money GrossSalesMoney = default(V1Money), V1Money NetSalesMoney = default(V1Money), List<V1PaymentTax> InclusiveTax = default(List<V1PaymentTax>), List<V1PaymentTax> AdditiveTax = default(List<V1PaymentTax>), List<V1Tender> Tender = default(List<V1Tender>), List<V1Refund> Refunds = default(List<V1Refund>), List<V1PaymentItemization> Itemizations = default(List<V1PaymentItemization>))
{
this.Id = Id;
this.MerchantId = MerchantId;
Expand Down Expand Up @@ -107,7 +107,7 @@ public partial class V1Payment : IEquatable<V1Payment>, IValidatableObject
/// </summary>
/// <value>The unique identifier of the Square account that took the payment.</value>
[DataMember(Name="creator_id", EmitDefaultValue=false)]
public bool? CreatorId { get; set; }
public string CreatorId { get; set; }
/// <summary>
/// The device that took the payment.
/// </summary>
Expand Down
4 changes: 2 additions & 2 deletions src/Square.Connect/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.0")]
[assembly: AssemblyFileVersion("2.1.0")]
[assembly: AssemblyVersion("2.1.1")]
[assembly: AssemblyFileVersion("2.1.1")]
2 changes: 1 addition & 1 deletion src/Square.Connect/Square.Connect.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>Square.Connect</title>

<!-- The package version number that is used when resolving dependencies -->
<version>2.1.0</version>
<version>2.1.1</version>

<!-- Authors contain text that appears directly on the gallery -->
<authors>Square</authors>
Expand Down