Merge master

README.md

@@ -6,6 +6,7 @@
 [![](https://img.shields.io/badge/license-MIT-blue.svg)](https://pypi.python.org/pypi/pinax-stripe/)
 
 [![Codecov](https://img.shields.io/codecov/c/github/pinax/pinax-stripe.svg)](https://codecov.io/gh/pinax/pinax-stripe)
+[![CircleCI](https://circleci.com/gh/pinax/pinax-stripe.svg?style=svg)](https://circleci.com/gh/pinax/pinax-stripe)
 ![](https://img.shields.io/github/contributors/pinax/pinax-stripe.svg)
 ![](https://img.shields.io/github/issues-pr/pinax/pinax-stripe.svg)
 ![](https://img.shields.io/github/issues-pr-closed/pinax/pinax-stripe.svg)
@@ -52,21 +53,20 @@ Then:
 ```
 $ CFLAGS="-I$(xcrun --show-sdk-path)/usr/include -I$(brew --prefix openssl)/include" \
 LDFLAGS="-L$(brew --prefix openssl)/lib" \
-pyenv install 2.7.10 3.2.6 3.3.6 3.4.3 3.5.0
+pyenv install 2.7.14 3.4.7 3.5.4 3.6.3
 
-$ pyenv virtualenv 2.7.10 test-2.7.10
-$ pyenv virtualenv 3.2.6 test-3.2.6
-$ pyenv virtualenv 3.3.6 test-3.3.6
-$ pyenv virtualenv 3.4.3 test-3.4.3
-$ pyenv virtualenv 3.5.0 test-3.5.0
-$ pyenv global 2.7.10 test-2.7.10 test-3.2.6 test-3.2.6 test-3.3.6 test-3.4.3 test-3.5.0
+$ pyenv virtualenv 2.7.14
+$ pyenv virtualenv 3.4.7
+$ pyenv virtualenv 3.5.4
+$ pyenv virtualenv 3.6.3
+$ pyenv global 2.7.14 3.4.7 3.5.4 3.6.3
 
 $ pip install detox
 ```
 
 To run test suite:
 
-Make sure you are not inside a `virtualenv` and then:
+Make sure you are NOT inside a `virtualenv` and then:
 
 ```
 $ detox

docs/reference/actions.md

@@ -142,7 +142,6 @@ Args:
 - api_version: the version of the Stripe API used.
 - request_id: the id of the request that initiated the webhook.
 - pending_webhooks: the number of pending webhooks. Defaults to `0`.
-- stripe_account: the stripe_id of a Connect account
 
 #### pinax.stripe.actions.events.dupe_event_exists
 
@@ -228,7 +227,7 @@ This assumes line items from a Stripe invoice.lines property and not through
 the invoicesitems resource calls. At least according to the documentation
 the data for an invoice item is slightly different between the two calls.
 
-For example, going through the invoiceitems resource you don't get a "type"
+For example, going through the invoiceitems resource you do not get a "type"
 field on the object.
 
 Args:

docs/reference/commands.md

@@ -2,12 +2,12 @@
 
 #### pinax.stripe.management.commands.init_customers
 
-Create `pinax.stripe.models.Customer` objects for existing users that don't 
+Create `pinax.stripe.models.Customer` objects for existing users that do not
 have one.
 
 #### pinax.stripe.management.commands.sync_customers
 
-Synchronizes customer data from the Stripe API
+Synchronizes customer data from the Stripe API.
 
 Utilizes the following actions:
 
@@ -17,6 +17,6 @@ Utilizes the following actions:
 
 #### pinax.stripe.management.commands.sync_plans
 
-Make sure your Stripe account has the plans
+Make sure your Stripe account has the plans.
 
 Utilizes `pinax.stripe.actions.plans.sync_plans`.

docs/reference/webhooks.md

@@ -1,6 +1,6 @@
 # Webhooks
 
-Stripe sends a events for just about everything that happens in it's system as
+Stripe sends a events for just about everything that happens in its system as
 a JSON payload to a webhook.
 
 A webhook is an endpoint running your site that accepts `POST` requests. You
@@ -32,18 +32,16 @@ pictured above is:
 
     https://yourdomain.com/payments/webhook/
 
-
 ## Security
 
-Since this is a wide open URL we don't want to record and react to any data
+Since this is a wide open URL we do not want to record and react to any data
 sent our way.  Therefore, we actually record the data that is sent, but then
 before processing it, we validate it against the Stripe API.  If it validates
 as untampered data, then we continue the processing.
 
 If validation fails, then `Event.valid` will be set to `False` enabling at
 least some data to try and hunt down any malicious activity.
 
-
 ## Signals
 
 `pinax-stripe` handles certain events in the webhook processing that are

pinax/stripe/actions/charges.py

@@ -4,6 +4,7 @@
 from django.db.models import Q
 
 import stripe
+from six import string_types
 
 from .. import hooks, models, utils
 
@@ -40,7 +41,9 @@ def capture(charge, amount=None):
     sync_charge_from_stripe_data(stripe_charge)
 
 
-def _validate_create_params(amount, application_fee, destination_account, destination_amount, on_behalf_of):
+def _validate_create_params(customer, source, amount, application_fee, destination_account, destination_amount, on_behalf_of):
+    if not customer and not source:
+        raise ValueError("Must provide `customer` or `source`.")
     if not isinstance(amount, decimal.Decimal):
         raise ValueError(
             "You must supply a decimal value for `amount`."
@@ -63,18 +66,23 @@ def _validate_create_params(amount, application_fee, destination_account, destin
 
 
 def create(
-    amount, customer, source=None, currency="usd", description=None,
+    amount, customer=None, source=None, currency="usd", description=None,
     send_receipt=settings.PINAX_STRIPE_SEND_EMAIL_RECEIPTS, capture=True,
     email=None, destination_account=None, destination_amount=None,
     application_fee=None, on_behalf_of=None,
 ):
     """
-    Create a charge for the given customer.
+    Create a charge for the given customer or source.
+
+    If both customer and source are provided, the source must belong to the
+    customer.
+
+    See https://stripe.com/docs/api#create_charge-customer.
 
     Args:
         amount: should be a decimal.Decimal amount
         customer: the Stripe id of the customer to charge
-        source: the Stripe id of the source belonging to the customer
+        source: the Stripe id of the source to charge
         currency: the currency with which to charge the amount in
         description: a description of the charge
         send_receipt: send a receipt upon successful charge
@@ -87,7 +95,7 @@ def create(
     Returns:
         a pinax.stripe.models.Charge object
     """
-    _validate_create_params(amount, application_fee, destination_account, destination_amount, on_behalf_of)
+    _validate_create_params(customer, source, amount, application_fee, destination_account, destination_amount, on_behalf_of)
     kwargs = dict(
         amount=utils.convert_amount_for_api(amount, currency),  # find the final amount
         currency=currency,
@@ -175,7 +183,7 @@ def sync_charge_from_stripe_data(data):
     if data["refunded"]:
         obj.amount_refunded = obj.amount
     balance_transaction = data.get("balance_transaction")
-    if balance_transaction and not isinstance(balance_transaction, str):
+    if balance_transaction and not isinstance(balance_transaction, string_types):
         obj.available = balance_transaction["status"] == "available"
         obj.available_on = utils.convert_tstamp(
             balance_transaction, "available_on"

pinax/stripe/actions/events.py

@@ -3,7 +3,7 @@
 
 
 def add_event(stripe_id, kind, livemode, message, api_version="",
-              request_id="", pending_webhooks=0, stripe_account=None):
+              request_id="", pending_webhooks=0):
     """
     Adds and processes an event from a received webhook
 
@@ -15,8 +15,14 @@ def add_event(stripe_id, kind, livemode, message, api_version="",
         api_version: the version of the Stripe API used
         request_id: the id of the request that initiated the webhook
         pending_webhooks: the number of pending webhooks
-        stripe_account: the stripe_id of a Connect account
     """
+    stripe_account_id = message.get("account")
+    if stripe_account_id:
+        stripe_account, _ = models.Account.objects.get_or_create(
+            stripe_id=stripe_account_id
+        )
+    else:
+        stripe_account = None
     event = models.Event.objects.create(
         stripe_account=stripe_account,
         stripe_id=stripe_id,
@@ -38,9 +44,9 @@ def dupe_event_exists(stripe_id):
     Checks if a duplicate event exists
 
     Args:
-        stripe_id: the Stripe ID of the event to Checks
+        stripe_id: the Stripe ID of the event to check
 
     Returns:
-        True, if the event already exists, otherwise, False
+        True if the event already exists, False otherwise
     """
     return models.Event.objects.filter(stripe_id=stripe_id).exists()

pinax/stripe/management/commands/init_customers.py

@@ -6,7 +6,7 @@
 
 class Command(BaseCommand):
 
-    help = "Create customer objects for existing users that don't have one"
+    help = "Create customer objects for existing users that do not have one"
 
     def handle(self, *args, **options):
         User = get_user_model()

pinax/stripe/middleware.py

@@ -6,21 +6,21 @@
 
 try:
     from django.urls import resolve
-except ImportError:  # coverage: omit
-    from django.core.urlresolvers import resolve  # coverage: omit
+except ImportError:
+    from django.core.urlresolvers import resolve
 
 try:
     from django.utils.deprecation import MiddlewareMixin as MixinorObject
-except ImportError:  # coverage: omit
-    MixinorObject = object  # coverage: omit
+except ImportError:
+    MixinorObject = object
 
 
 class ActiveSubscriptionMiddleware(MixinorObject):
 
     def process_request(self, request):
         is_authenticated = request.user.is_authenticated
-        if django.VERSION < (1, 10):  # coverage: omit
-            is_authenticated = is_authenticated()  # coverage: omit
+        if django.VERSION < (1, 10):
+            is_authenticated = is_authenticated()
 
         if is_authenticated and not request.user.is_staff:
             url_name = resolve(request.path).url_name

pinax/stripe/migrations/0011_account_publishable_key.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2017-10-24 09:13
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pinax_stripe', '0010_connect'),
+    ]
+
+    operations = [
+        # migrations.AddField(
+        #     model_name='account',
+        #     name='stripe_publishable_key',
+        #     field=models.CharField(blank=True, max_length=100, null=True),
+        # ),
+    ]

pinax/stripe/migrations/0013_auto_20171025_2153.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2017-10-26 02:53
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pinax_stripe', '0012_merge_20171025_1443'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='account',
+            name='user',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='stripe_accounts', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

pinax/stripe/migrations/0014_merge_20171030_1554.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2017-10-30 14:54
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pinax_stripe', '0011_account_publishable_key'),
+        ('pinax_stripe', '0013_auto_20171025_2153'),
+    ]
+
+    operations = [
+    ]

pinax/stripe/migrations/0015_merge_20171030_1852.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2017-10-30 17:52
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pinax_stripe', '0013_auto_20171027_1443'),
+        ('pinax_stripe', '0014_merge_20171030_1554'),
+    ]
+
+    operations = [
+    ]

pinax/stripe/migrations/0024_merge_20171030_1941.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2017-10-30 18:41
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pinax_stripe', '0023_merge_20171027_1626'),
+        ('pinax_stripe', '0015_merge_20171030_1852'),
+    ]
+
+    operations = [
+    ]

pinax/stripe/models.py

@@ -56,7 +56,7 @@ def stripe_account_stripe_id(self):
 @python_2_unicode_compatible
 class Plan(AccountRelatedStripeObject):
     amount = models.DecimalField(decimal_places=2, max_digits=9)
-    currency = models.CharField(max_length=15)
+    currency = models.CharField(max_length=15, blank=False)
     interval = models.CharField(max_length=15)
     interval_count = models.IntegerField()
     name = models.CharField(max_length=150)
@@ -171,6 +171,15 @@ def message(self):
     def __str__(self):
         return "{} - {}".format(self.kind, self.stripe_id)
 
+    def __repr__(self):
+        return "Event(pk={!r}, kind={!r}, customer={!r}, valid={!r}, stripe_id={!r})".format(
+            self.pk,
+            str(self.kind),
+            self.customer,
+            self.valid,
+            str(self.stripe_id),
+        )
+
 
 class Transfer(AccountRelatedStripeObject):
 
@@ -501,7 +510,7 @@ def card(self):
 @python_2_unicode_compatible
 class Account(StripeObject):
 
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE, related_name="stripe_accounts")
 
     business_name = models.TextField(blank=True, null=True)
     business_url = models.TextField(blank=True, null=True)
@@ -543,6 +552,8 @@ class Account(StripeObject):
 
     stripe_publishable_key = models.CharField(null=True, blank=True, max_length=100)
 
+    stripe_publishable_key = models.CharField(null=True, blank=True, max_length=100)
+
     product_description = models.TextField(null=True, blank=True)
     statement_descriptor = models.TextField(null=True, blank=True)
     support_email = models.TextField(null=True, blank=True)