Merge branch 'develop'

stripe · Mar 25, 2016 · 69a5ccb · 69a5ccb
2 parents e6dd413 + 71529df
commit 69a5ccb
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 29 deletions.
diff --git a/src/Stripe/Entities/StripeSubscription.cs b/src/Stripe/Entities/StripeSubscription.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Stripe.Infrastructure;
-using Newtonsoft.Json.Linq;
 
 namespace Stripe
 {
@@ -11,9 +10,24 @@ public class StripeSubscription : StripeObject
         [JsonProperty("object")]
         public string Object { get; set; }
 
+        [JsonProperty("application_fee_percent")]
+        public decimal? ApplicationFeePercent { get; set; }
+
         [JsonProperty("cancel_at_period_end")]
         public bool CancelAtPeriodEnd { get; set; }
 
+        [JsonProperty("canceled_at")]
+        [JsonConverter(typeof(StripeDateTimeConverter))]
+        public DateTime? CanceledAt { get; set; }
+
+        [JsonProperty("current_period_end")]
+        [JsonConverter(typeof(StripeDateTimeConverter))]
+        public DateTime? CurrentPeriodEnd { get; set; }
+
+        [JsonProperty("current_period_start")]
+        [JsonConverter(typeof(StripeDateTimeConverter))]
+        public DateTime? CurrentPeriodStart { get; set; }
+
         #region Expandable Customer
         public string CustomerId { get; set; }
 
@@ -30,6 +44,16 @@ internal object InternalCustomer
         }
         #endregion
 
+        [JsonProperty("discount")]
+        public StripeDiscount StripeDiscount { get; set; }
+
+        [JsonProperty("ended_at")]
+        [JsonConverter(typeof(StripeDateTimeConverter))]
+        public DateTime? EndedAt { get; set; }
+
+        [JsonProperty("metadata")]
+        public Dictionary<string, string> Metadata { get; set; }
+
         [JsonProperty("plan")]
         public StripePlan StripePlan { get; set; }
 
@@ -43,34 +67,9 @@ internal object InternalCustomer
         [JsonProperty("status")]
         public string Status { get; set; }
 
-        [JsonProperty("application_fee_percent")]
-        public decimal? ApplicationFeePercent { get; set; }
-
         [JsonProperty("tax_percent")]
         public decimal? TaxPercent { get; set; }
 
-        [JsonProperty("canceled_at")]
-        [JsonConverter(typeof(StripeDateTimeConverter))]
-        public DateTime? CanceledAt { get; set; }
-
-        [JsonProperty("current_period_end")]
-        [JsonConverter(typeof(StripeDateTimeConverter))]
-        public DateTime? PeriodEnd { get; set; }
-
-        [JsonProperty("current_period_start")]
-        [JsonConverter(typeof(StripeDateTimeConverter))]
-        public DateTime? PeriodStart { get; set; }
-
-        [JsonProperty("discount")]
-        public StripeDiscount StripeDiscount { get; set; }
-
-        [JsonProperty("ended_at")]
-        [JsonConverter(typeof(StripeDateTimeConverter))]
-        public DateTime? EndedAt { get; set; }
-
-        [JsonProperty("metadata")]
-        public Dictionary<string, string> Metadata { get; set; }
-
         [JsonProperty("trial_end")]
         [JsonConverter(typeof(StripeDateTimeConverter))]
         public DateTime? TrialEnd { get; set; }

diff --git a/src/Stripe/Infrastructure/StripeConfiguration.cs b/src/Stripe/Infrastructure/StripeConfiguration.cs
@@ -3,7 +3,7 @@
     public static class StripeConfiguration
     {
         private static string _apiKey;
-        internal const string SupportedApiVersion = "2015-03-24";
+        internal const string SupportedApiVersion = "2015-07-28";
 
         static StripeConfiguration()
         {

diff --git a/src/Stripe/Services/Account/StripeAccountSharedOptions.cs b/src/Stripe/Services/Account/StripeAccountSharedOptions.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace Stripe