Merge branch 'master' into customers-create-plan-quantity

Author: paltman

.travis.yml

@@ -14,6 +14,8 @@ env:
   - DJANGO=1.9 STRIPE=128
   - DJANGO=1.10 STRIPE=127
   - DJANGO=1.10 STRIPE=128
+  - DJANGO=1.11 STRIPE=127
+  - DJANGO=1.11 STRIPE=128
   - DJANGO=master STRIPE=127
   - DJANGO=master STRIPE=128
 matrix:
@@ -26,6 +28,14 @@ matrix:
       env: DJANGO=1.10 STRIPE=127
     - python: "3.3"
       env: DJANGO=1.10 STRIPE=128
+    - python: "3.3"
+      env: DJANGO=1.11 STRIPE=127
+    - python: "3.3"
+      env: DJANGO=1.11 STRIPE=128
+    - python: "2.7"
+      env: DJANGO=master STRIPE=127
+    - python: "2.7"
+      env: DJANGO=master STRIPE=128
     - python: "3.3"
       env: DJANGO=master STRIPE=127
     - python: "3.3"
@@ -34,6 +44,11 @@ matrix:
       env: DJANGO=1.7 STRIPE=127
     - python: "3.5"
       env: DJANGO=1.7 STRIPE=128
+  allow_failures:
+    - env: DJANGO=1.11 STRIPE=128
+    - env: DJANGO=1.11 STRIPE=127
+    - env: DJANGO=master STRIPE=128
+    - env: DJANGO=master STRIPE=127
 install:
   - pip install tox coveralls
 script:

pinax/stripe/actions/charges.py

@@ -41,7 +41,7 @@ def capture(charge, amount=None):
     sync_charge_from_stripe_data(stripe_charge)
 
 
-def create(amount, customer, source=None, currency="usd", description=None, send_receipt=settings.PINAX_STRIPE_SEND_EMAIL_RECEIPTS, capture=True):
+def create(amount, customer, source=None, currency="usd", description=None, send_receipt=settings.PINAX_STRIPE_SEND_EMAIL_RECEIPTS, capture=True, email=None):
     """
     Creates a charge for the given customer.
 
@@ -71,7 +71,7 @@ def create(amount, customer, source=None, currency="usd", description=None, send
     )
     charge = sync_charge_from_stripe_data(stripe_charge)
     if send_receipt:
-        hooks.hookset.send_receipt(charge)
+        hooks.hookset.send_receipt(charge, email)
     return charge
 
 
@@ -96,11 +96,8 @@ def sync_charge_from_stripe_data(data):
     Returns:
         a pinax.stripe.models.Charge object
     """
-    customer = models.Customer.objects.get(stripe_id=data["customer"])
-    obj, _ = models.Charge.objects.get_or_create(
-        customer=customer,
-        stripe_id=data["id"]
-    )
+    obj, _ = models.Charge.objects.get_or_create(stripe_id=data["id"])
+    obj.customer = models.Customer.objects.filter(stripe_id=data["customer"]).first()
     obj.source = data["source"]["id"]
     obj.currency = data["currency"]
     obj.invoice = next(iter(models.Invoice.objects.filter(stripe_id=data["invoice"])), None)

pinax/stripe/hooks.py

@@ -25,7 +25,7 @@ def trial_period(self, user, plan):
         """
         return None
 
-    def send_receipt(self, charge):
+    def send_receipt(self, charge, email=None):
         from django.conf import settings
         if not charge.receipt_sent:
             # Import here to not add a hard dependency on the Sites framework
@@ -41,10 +41,14 @@ def send_receipt(self, charge):
             subject = render_to_string("pinax/stripe/email/subject.txt", ctx)
             subject = subject.strip()
             message = render_to_string("pinax/stripe/email/body.txt", ctx)
+
+            if not email and charge.customer:
+                email = charge.customer.user.email
+
             num_sent = EmailMessage(
                 subject,
                 message,
-                to=[charge.customer.user.email],
+                to=[email],
                 from_email=settings.PINAX_STRIPE_INVOICE_FROM_EMAIL
             ).send()
             charge.receipt_sent = num_sent > 0

pinax/stripe/migrations/0007_auto_20170108_1202.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.8 on 2017-01-08 18:02
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pinax_stripe', '0006_coupon'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='charge',
+            name='customer',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='charges', to='pinax_stripe.Customer'),
+        ),
+    ]

pinax/stripe/models.py

@@ -278,7 +278,7 @@ def plan_display(self):
 
 class Charge(StripeObject):
 
-    customer = models.ForeignKey(Customer, related_name="charges", on_delete=models.CASCADE)
+    customer = models.ForeignKey(Customer, null=True, related_name="charges", on_delete=models.CASCADE)
     invoice = models.ForeignKey(Invoice, null=True, related_name="charges", on_delete=models.CASCADE)
     source = models.CharField(max_length=100)
     currency = models.CharField(max_length=10, default="usd")

pinax/stripe/tests/hooks.py

@@ -30,7 +30,7 @@ def trial_period(self, user, plan):
         if plan is not None:
             return timezone.now() + timedelta(days=3)
 
-    def send_receipt(self, charge):
+    def send_receipt(self, charge, email=None):
         if not charge.receipt_sent:
             from django.contrib.sites.models import Site
 
@@ -44,6 +44,10 @@ def send_receipt(self, charge):
             subject = render_to_string("pinax/stripe/email/subject.txt", ctx)
             subject = subject.strip()
             message = render_to_string("pinax/stripe/email/body.txt", ctx)
+
+            if not email and charge.customer:
+                email = charge.customer.user.email
+
             num_sent = EmailMessage(
                 subject,
                 message,

setup.py

@@ -83,7 +83,7 @@
     ],
     install_requires=[
         "django-appconf>=1.0.1",
-        "jsonfield>=1.0.3",
+        "jsonfield>=1.0.3,<2.0.0",
         "stripe>=1.7.9",
         "django>=1.7",
         "pytz",

tox.ini

@@ -6,10 +6,10 @@ exclude = pinax/stripe/migrations/*,docs/*
 
 [tox]
 envlist =
-    py27-{1.7,1.8,1.9,1.10,master}-stripe{127,128},
+    py27-{1.7,1.8,1.9,1.10,1.11}-stripe{127,128},
     py33-{1.7,1.8}-stripe{127,128},
-    py34-{1.7,1.8,1.9,1.10,master}-stripe{127,128},
-    py35-{1.8,1.9,1.10,master}-stripe{127,128}
+    py34-{1.7,1.8,1.9,1.10,1.11,master}-stripe{127,128},
+    py35-{1.8,1.9,1.10,1.11,master}-stripe{127,128}
 
 [testenv]
 deps =
@@ -21,6 +21,7 @@ deps =
     1.8: Django>=1.8,<1.9
     1.9: Django>=1.9,<1.10
     1.10: Django>=1.10,<1.11
+    1.11: Django>=1.11a1,<2.0
     master: https://github.com/django/django/tarball/master
 usedevelop = True
 setenv =