Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

billing: Pass stripe_customer instead of Customer in upgrade functions.

This commit is contained in:
Vishnu Ks 2018-07-10 15:41:34 +05:30 committed by Rishi Gupta
parent aa5ca4e549
commit 377fac2864
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zilencer/lib/stripe.py
View File

@ -102,7 +102,7 @@ def payment_source(stripe_customer: stripe.Customer) -> Optional[stripe.Card]:
raise AssertionError("Default source not in sources.")
@catch_stripe_errors
def do_create_customer_with_payment_source(user: UserProfile, stripe_token: str) -> Customer:
def do_create_customer_with_payment_source(user: UserProfile, stripe_token: str) -> stripe.Customer:
realm = user.realm
stripe_customer = stripe.Customer.create(
description="%s (%s)" % (realm.string_id, realm.name),
@ -115,18 +115,19 @@ def do_create_customer_with_payment_source(user: UserProfile, stripe_token: str)
realm=user.realm, acting_user=user, event_type=RealmAuditLog.STRIPE_START, event_time=event_time)
RealmAuditLog.objects.create(
realm=user.realm, acting_user=user, event_type=RealmAuditLog.CARD_ADDED, event_time=event_time)
return Customer.objects.create(
Customer.objects.create(
realm=realm,
stripe_customer_id=stripe_customer.id,
billing_user=user)
return stripe_customer
@catch_stripe_errors
def do_subscribe_customer_to_plan(customer: Customer, stripe_plan_id: int,
def do_subscribe_customer_to_plan(stripe_customer: stripe.Customer, stripe_plan_id: int,
seat_count: int, tax_percent: float) -> None:
# TODO: check that there are no existing live Stripe subscriptions
# (canceled subscriptions are ok)
stripe_subscription = stripe.Subscription.create(
customer=customer.stripe_customer_id,
customer=stripe_customer.id,
billing='charge_automatically',
items=[{
'plan': stripe_plan_id,
@ -136,6 +137,7 @@ def do_subscribe_customer_to_plan(customer: Customer, stripe_plan_id: int,
tax_percent=tax_percent)
if PRINT_STRIPE_FIXTURE_DATA:
print(''.join(['"create_subscription": ', str(stripe_subscription), ','])) # nocoverage
customer = Customer.objects.get(stripe_customer_id=stripe_customer.id)
with transaction.atomic():
customer.realm.has_seat_based_plan = True
customer.realm.save(update_fields=['has_seat_based_plan'])

4
zilencer/views.py
View File

@ -162,13 +162,13 @@ def initial_upgrade(request: HttpRequest) -> HttpResponse:
return HttpResponseRedirect(reverse('zilencer.views.billing_home'))
if request.method == 'POST':
customer = do_create_customer_with_payment_source(user, request.POST['stripeToken'])
stripe_customer = do_create_customer_with_payment_source(user, request.POST['stripeToken'])
# TODO: the current way this is done is subject to tampering by the user.
seat_count = int(request.POST['seat_count'])
if seat_count < 1:
raise AssertionError('seat_count is less than 1')
do_subscribe_customer_to_plan(
customer=customer,
stripe_customer=stripe_customer,
stripe_plan_id=Plan.objects.get(nickname=request.POST['plan']).stripe_plan_id,
seat_count=seat_count,
# TODO: billing address details are passed to us in the request;