Merge branch 'master' into dashboard3

* master:
  Don't cancel second most recent paypal subscription because it may be the current subscription.
This commit is contained in:
Samuel Clay 2021-03-02 17:59:59 -05:00
commit 5506e99e9a

View file

@ -1114,7 +1114,7 @@ def paypal_signup(sender, **kwargs):
pass
user.profile.activate_premium()
user.profile.cancel_premium_stripe()
user.profile.cancel_premium_paypal(second_most_recent_only=True)
# user.profile.cancel_premium_paypal(second_most_recent_only=True)
valid_ipn_received.connect(paypal_signup)
def paypal_payment_history_sync(sender, **kwargs):