Merge branch 'discounts' of github.com:otistamp/pinax-stripe

pinax · Mar 7, 2017 · dceb089 · dceb089
2 parents 433881f + 1800a9b
commit dceb089
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pinax/stripe/actions/subscriptions.py b/pinax/stripe/actions/subscriptions.py
@@ -169,8 +169,8 @@ def sync_subscription_from_stripe_data(customer, subscription):
     )
     sub = utils.update_with_defaults(sub, defaults, created)
     if subscription.get("discount", None):
-        start = subscription["discount"]["start"]
-        end = subscription["discount"]["end"]
+        start = utils.convert_tstamp(subscription["discount"]["start"])
+        end = utils.convert_tstamp(subscription["discount"]["end"]) if subscription["discount"]["end"] else None
         models.Discount.objects.get_or_create(subscription=sub, start=start, end=end)
     return sub