Merge pull request #576 from sptgps/573-zhuangmiao-trial_end-days

Bugfix: in subscriptions.create, trial_days using timezone naive utcnow() and add test
pinax · Nov 26, 2021 · 4bc2904 · 4bc2904
2 parents a263211 + 9ee3c7f
commit 4bc2904
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pinax/stripe/actions/subscriptions.py b/pinax/stripe/actions/subscriptions.py
@@ -48,7 +48,7 @@ def create(customer, plan, quantity=None, trial_days=None, token=None, coupon=No
 
     subscription_params = {}
     if trial_days:
-        subscription_params["trial_end"] = datetime.datetime.utcnow() + datetime.timedelta(days=trial_days)
+        subscription_params["trial_end"] = timezone.now() + datetime.timedelta(days=trial_days)
     if token:
         subscription_params["source"] = token
 

diff --git a/pinax/stripe/tests/test_actions.py b/pinax/stripe/tests/test_actions.py
@@ -1091,7 +1091,10 @@ def test_subscription_create_with_trial(self, SubscriptionCreateMock, SyncMock):
         subscriptions.create(self.customer, "the-plan", trial_days=3)
         self.assertTrue(SubscriptionCreateMock.called)
         _, kwargs = SubscriptionCreateMock.call_args
-        self.assertEqual(kwargs["trial_end"].date(), (datetime.datetime.utcnow() + datetime.timedelta(days=3)).date())
+        self.assertEquals(kwargs["trial_end"].date(),
+                          (timezone.now() + datetime.timedelta(days=3)).date())
+        self.assertEquals(kwargs["trial_end"].tzname(),
+                          (timezone.now() + datetime.timedelta(days=3)).tzname())
 
     @patch("pinax.stripe.actions.subscriptions.sync_subscription_from_stripe_data")
     @patch("stripe.Subscription.create")