resolve merge conflicts
This commit is contained in:
commit
52ea4eec49
23 changed files with 393 additions and 834 deletions
|
|
@ -144,9 +144,10 @@ class StripeCustomer(models.Model):
|
|||
|
||||
stripe_utils = StripeUtils()
|
||||
stripe_data = stripe_utils.create_customer(token, email)
|
||||
stripe_cus_id = stripe_data.get('response_object').get('id')
|
||||
|
||||
stripe_customer = StripeCustomer.objects. \
|
||||
create(user=user, stripe_id=stripe_data.get('id'))
|
||||
stripe_customer = StripeCustomer.objects.\
|
||||
create(user=user, stripe_id=stripe_cus_id)
|
||||
|
||||
return stripe_customer
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue