Revert "Extend webhooks required for ideal (source status) and add re…

…levant fields to model"

This reverts commit bae60ab.

docs/reference/webhooks.md

@@ -112,10 +112,6 @@ details on how to wire those up.
 * `recipient.created` - Occurs whenever a recipient is created.
 * `recipient.deleted` - Occurs whenever a recipient is deleted.
 * `recipient.updated` - Occurs whenever a recipient is updated.
-* `source.chargeable` - A Source object becomes chargeable after a customer has authenticated and verified a payment
-* `source.canceled` - A Source object expired and cannot be used to create a charge
-* `source.consumed` - A Source object that was single-use has already been charged
-* `source.failed` - A Source object failed to become chargeable as your customer declined to authenticate the payment
 * `sku.created` - Occurs whenever a SKU is created.
 * `sku.updated` - Occurs whenever a SKU is updated.
 * `transfer.created` - Occurs whenever a new transfer is created.

pinax/stripe/actions/customers.py

@@ -144,7 +144,7 @@ def set_default_source(customer, source):
 
 def sync_customer(customer, cu=None):
     """
-    Synchronizes a local Customer object with details from the Stripe API
+    Syncronizes a local Customer object with details from the Stripe API
 
     Args:
         customer: a Customer object

pinax/stripe/actions/sources.py

@@ -119,9 +119,6 @@ def sync_ideal(customer, source):
     """
     defaults = dict(
         customer=customer,
-        status = source["status"] or "",
-        type = source["type"] or "",
-        usage = source["usage"] or "",
         amount = utils.convert_amount_for_db(source["amount"], source["currency"]),  # currency is in but in fact it's always eur
         flow = source["flow"] or "",
         livemode = source["livemode"],
@@ -136,6 +133,8 @@ def sync_ideal(customer, source):
         redirect_return_url = source["redirect"]["return_url"] or "",
         redirect_status = source["redirect"]["status"] or "",
         redirect_url = source["redirect"]["url"] or "",
+        status = source["status"] or "",
+        usage =source["usage"] or "",
         ideal_bank = source["ideal"]["bank"] or "",
     )
     o, created = models.Ideal.objects.get_or_create(
@@ -155,8 +154,7 @@ def sync_payment_source_from_stripe_data(customer, source):
     """
     if source["id"].startswith("card_"):
         return sync_card(customer, source)
-    elif source.get("type", None) == "ideal":
-        # ideal is created using Sources, only then will it have a type attribute
+    elif source["type"] == "ideal":
         return sync_ideal(customer, source)
     else:
         return sync_bitcoin(customer, source)

pinax/stripe/migrations/0008_ideal.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10 on 2017-04-20 13:25
+# Generated by Django 1.10 on 2017-04-19 14:32
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -20,9 +20,6 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('stripe_id', models.CharField(max_length=255, unique=True)),
                 ('created_at', models.DateTimeField(default=django.utils.timezone.now)),
-                ('status', models.CharField(blank=True, max_length=32)),
-                ('type', models.CharField(blank=True, max_length=32)),
-                ('usage', models.CharField(blank=True, max_length=32)),
                 ('amount', models.DecimalField(decimal_places=2, max_digits=9, null=True)),
                 ('flow', models.CharField(max_length=32)),
                 ('livemode', models.BooleanField(default=False)),
@@ -37,6 +34,8 @@ class Migration(migrations.Migration):
                 ('redirect_return_url', models.URLField(max_length=1024)),
                 ('redirect_status', models.TextField(blank=True)),
                 ('redirect_url', models.URLField(max_length=1024)),
+                ('status', models.TextField(blank=True)),
+                ('usage', models.TextField(blank=True)),
                 ('ideal_bank', models.TextField(blank=True)),
                 ('customer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='pinax_stripe.Customer')),
             ],

pinax/stripe/models.py

@@ -185,9 +185,6 @@ class BitcoinReceiver(StripeObject):
 class Ideal(StripeObject):
 
     customer = models.ForeignKey(Customer, on_delete=models.CASCADE)
-    status = models.CharField(max_length=32, blank=True)
-    type = models.CharField(max_length=32, blank=True)
-    usage = models.CharField(max_length=32, blank=True)
     amount = models.DecimalField(decimal_places=2, max_digits=9, null=True)
     flow = models.CharField(max_length=32)
     livemode = models.BooleanField(default=False)
@@ -202,6 +199,8 @@ class Ideal(StripeObject):
     redirect_return_url = models.URLField(max_length=1024)
     redirect_status = models.TextField(blank=True)
     redirect_url = models.URLField(max_length=1024)
+    status = models.TextField(blank=True)
+    usage = models.TextField(blank=True)
     ideal_bank = models.TextField(blank=True)
 
 

pinax/stripe/webhooks.py

@@ -447,35 +447,6 @@ class SKUUpdatedWebhook(Webhook):
     description = "Occurs whenever a SKU is updated."
 
 
-class SourceWebhook(Webhook):
-
-    def process_webhook(self):
-        sources.sync_payment_source_from_stripe_data(
-            self.event.customer,
-            self.event.validated_message["data"]["object"]
-        )
-
-
-class SourceChargeableWebhook(SourceWebhook):
-    name = "source.chargeable"
-    description = "A Source object becomes chargeable after a customer has authenticated and verified a payment."
-
-
-class SourceCanceledWebhook(SourceWebhook):
-    name = "source.canceled"
-    description = "A Source object expired and cannot be used to create a charge."
-
-
-class SourceConsumedWebhook(SourceWebhook):
-    name = "source.consumed"
-    description = "A Source object that was single-use has already been charged."
-
-
-class SourceFailedWebhook(SourceWebhook):
-    name = "source.failed"
-    description = "A Source object failed to become chargeable as your customer declined to authenticate the payment."
-
-
 class TransferWebhook(Webhook):
 
     def process_webhook(self):