Merge pull request #1988 from onepercentclub/feature/django-packages

Upgrade django packages
onepercentclub · May 17, 2016 · 9a91075 · 9a91075
2 parents 55ac85b + e728f62
commit 9a91075
Show file tree

Hide file tree

Showing 220 changed files with 1,602 additions and 2,782 deletions.
diff --git a/bluebottle/accounting/admin_forms.py b/bluebottle/accounting/admin_forms.py
@@ -3,7 +3,7 @@
 from django.contrib.admin.widgets import ForeignKeyRawIdWidget
 from django.utils.translation import ugettext_lazy as _
 
-from bluebottle.utils.model_dispatcher import get_donation_model
+from bluebottle.donations.models import Donation
 from bluebottle.journals.models import ProjectPayoutJournal
 from bluebottle.bb_payouts.models import PayoutBase
 
@@ -44,7 +44,6 @@ def journalform_factory(model, rel_field):
 
 
 def donationform_factory(fields=None):
-    Donation = get_donation_model()
     widgets = {
         'project': ForeignKeyRawIdWidget(Donation._meta.get_field('project').rel, admin.site),
         'fundraiser': ForeignKeyRawIdWidget(Donation._meta.get_field('fundraiser').rel, admin.site),

diff --git a/bluebottle/accounting/admin_views.py b/bluebottle/accounting/admin_views.py
@@ -8,12 +8,12 @@
 from django.views.generic import FormView, CreateView, DetailView
 from django.views.generic.detail import SingleObjectMixin
 
+from bluebottle.donations.models import Donation
 from bluebottle.journals.models import ProjectPayoutJournal, OrganizationPayoutJournal
+from bluebottle.orders.models import Order
 from bluebottle.payments.models import OrderPayment
 from bluebottle.payments_manual.models import ManualPayment
-from bluebottle.utils.model_dispatcher import (
-    get_order_model, get_donation_model, get_project_payout_model, get_model_mapping
-)
+from bluebottle.payouts.models import ProjectPayout
 from bluebottle.utils.utils import StatusDefinition
 from .models import BankTransaction, RemoteDocdataPayment
 from .admin_forms import journalform_factory, donationform_factory, RetryPayoutForm
@@ -139,7 +139,7 @@ class CreateOrganizationPayoutJournalView(JournalCreateMixin, BaseManualEntryVie
 
 
 class CreateManualDonationView(AdminOptsMixin, BaseManualEntryView):
-    model = get_donation_model()
+    model = Donation
     form_class = donationform_factory(fields=('amount', 'project', 'fundraiser'))
     template_name = 'admin/accounting/banktransaction/manual_donation.html'
 
@@ -154,7 +154,7 @@ def get_initial(self):
 
     def form_valid(self, form):
         with db_transaction.atomic():
-            order = get_order_model().objects.create(
+            order = Order.objects.create(
                 user=self.request.user,
                 order_type='manual',
                 total=form.cleaned_data['amount']
@@ -184,7 +184,6 @@ def form_valid(self, form):
             payment.save()
 
             # update/create the required payout
-            ProjectPayout = get_project_payout_model()
             project = donation.project
             project.update_amounts()
             payouts = ProjectPayout.objects.filter(project=project)
@@ -249,7 +248,7 @@ def form_valid(self, form):
 
 class RetryPayoutView(TransactionMixin, AdminOptsMixin, FormView):
     template_name = 'admin/accounting/banktransaction/retry_payout.html'
-    model = get_project_payout_model()
+    model = ProjectPayout
     form_class = RetryPayoutForm
 
     def get_form_kwargs(self):
@@ -274,9 +273,7 @@ def form_valid(self, form):
         return redirect(self.get_success_url(journal.payout))
 
     def get_success_url(self, payout):
-        model_mapping = get_model_mapping()
-        admin_url_name = model_mapping['project_payout']['model_lower'].replace('.', '_')
-        return reverse('admin:%s_change' % admin_url_name, args=[payout.pk])
+        return reverse('admin:payouts_projectpayout_change', args=[payout.pk])
 
 
 class RDPTakeCutView(AdminOptsMixin, DetailView):
@@ -304,7 +301,6 @@ def get_queryset(self):
         if not payout_ids:
             messages.warn(_('There were no payouts for this payment - aborting.'))
 
-        ProjectPayout = get_project_payout_model()
         payouts_to_ignore = list(ProjectPayout.objects.filter(id__in=payout_ids).exclude(
             status=StatusDefinition.NEW,
             protected=False
@@ -321,7 +317,6 @@ def get_affected_records(self):
         """
         Retrieve the donations and payouts that will be affected by taking a cut.
         """
-        ProjectPayout = get_project_payout_model()
         affected = {}
 
         donations = self.object.local_payment.order_payment.order.donations.select_related(
@@ -365,6 +360,5 @@ def get_affected_records(self):
     def get_context_data(self, **kwargs):
         context = super(RDPTakeCutView, self).get_context_data(**kwargs)
         context['affected'] = self.get_affected_records()
-        model_mapping = get_model_mapping()
-        context['admin_payout'] = u'admin:%s_change' % model_mapping['project_payout']['model_lower'].replace('.', '_')
+        context['admin_payout'] = u'admin:payouts_projectpayout_change'
         return context
diff --git a/bluebottle/accounting/migrations/0001_initial.py b/bluebottle/accounting/migrations/0001_initial.py
@@ -259,7 +259,7 @@ def backwards(self, orm):
             'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'order_type': ('django.db.models.fields.CharField', [], {'default': "'one-off'", 'max_length': "'100'"}),
-            'status': ('django_fsm.db.fields.fsmfield.FSMField', [], {'default': "'created'", 'max_length': '50'}),
+            'status': ('django_fsm.FSMField', [], {'default': "'created'", 'max_length': '50'}),
             'total': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '16', 'decimal_places': '2'}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']", 'null': 'True', 'blank': 'True'})
@@ -311,7 +311,7 @@ def backwards(self, orm):
             'integration_data': ('django.db.models.fields.TextField', [], {'default': "'{}'", 'max_length': '5000', 'blank': 'True'}),
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'order_payments'", 'to': u"orm['orders.Order']"}),
             'payment_method': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}),
-            'status': ('django_fsm.db.fields.fsmfield.FSMField', [], {'default': "'created'", 'max_length': '50'}),
+            'status': ('django_fsm.FSMField', [], {'default': "'created'", 'max_length': '50'}),
             'transaction_fee': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '16', 'decimal_places': '2'}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']", 'null': 'True', 'blank': 'True'})
@@ -330,7 +330,7 @@ def backwards(self, orm):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'order_payment': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['payments.OrderPayment']", 'unique': 'True'}),
             'polymorphic_ctype': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'polymorphic_payments.payment_set'", 'null': 'True', 'to': u"orm['contenttypes.ContentType']"}),
-            'status': ('django_fsm.db.fields.fsmfield.FSMField', [], {'default': "'started'", 'max_length': '50'}),
+            'status': ('django_fsm.FSMField', [], {'default': "'started'", 'max_length': '50'}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'})
         },
         u'payouts.projectpayout': {

diff --git a/bluebottle/accounting/migrations/0002_auto__add_bankaccount.py b/bluebottle/accounting/migrations/0002_auto__add_bankaccount.py
@@ -193,7 +193,7 @@ def backwards(self, orm):
             'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'order_type': ('django.db.models.fields.CharField', [], {'default': "'one-off'", 'max_length': "'100'"}),
-            'status': ('django_fsm.db.fields.fsmfield.FSMField', [], {'default': "'created'", 'max_length': '50'}),
+            'status': ('django_fsm.FSMField', [], {'default': "'created'", 'max_length': '50'}),
             'total': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '16', 'decimal_places': '2'}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']", 'null': 'True', 'blank': 'True'})
@@ -245,7 +245,7 @@ def backwards(self, orm):
             'integration_data': ('django.db.models.fields.TextField', [], {'default': "'{}'", 'max_length': '5000', 'blank': 'True'}),
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'order_payments'", 'to': u"orm['orders.Order']"}),
             'payment_method': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}),
-            'status': ('django_fsm.db.fields.fsmfield.FSMField', [], {'default': "'created'", 'max_length': '50'}),
+            'status': ('django_fsm.FSMField', [], {'default': "'created'", 'max_length': '50'}),
             'transaction_fee': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '16', 'decimal_places': '2'}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']", 'null': 'True', 'blank': 'True'})
@@ -264,7 +264,7 @@ def backwards(self, orm):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'order_payment': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['payments.OrderPayment']", 'unique': 'True'}),
             'polymorphic_ctype': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'polymorphic_payments.payment_set'", 'null': 'True', 'to': u"orm['contenttypes.ContentType']"}),
-            'status': ('django_fsm.db.fields.fsmfield.FSMField', [], {'default': "'started'", 'max_length': '50'}),
+            'status': ('django_fsm.FSMField', [], {'default': "'started'", 'max_length': '50'}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'})
         },
         u'payouts.projectpayout': {

diff --git a/bluebottle/accounting/migrations/0003_mark_problematic_refund_chargebacks.py b/bluebottle/accounting/migrations/0003_mark_problematic_refund_chargebacks.py
@@ -201,7 +201,7 @@ def backwards(self, orm):
             'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'order_type': ('django.db.models.fields.CharField', [], {'default': "'one-off'", 'max_length': "'100'"}),
-            'status': ('django_fsm.db.fields.fsmfield.FSMField', [], {'default': "'created'", 'max_length': '50'}),
+            'status': ('django_fsm.FSMField', [], {'default': "'created'", 'max_length': '50'}),
             'total': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '16', 'decimal_places': '2'}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']", 'null': 'True', 'blank': 'True'})
@@ -253,7 +253,7 @@ def backwards(self, orm):
             'integration_data': ('django.db.models.fields.TextField', [], {'default': "'{}'", 'max_length': '5000', 'blank': 'True'}),
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'order_payments'", 'to': u"orm['orders.Order']"}),
             'payment_method': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}),
-            'status': ('django_fsm.db.fields.fsmfield.FSMField', [], {'default': "'created'", 'max_length': '50'}),
+            'status': ('django_fsm.FSMField', [], {'default': "'created'", 'max_length': '50'}),
             'transaction_fee': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '16', 'decimal_places': '2'}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']", 'null': 'True', 'blank': 'True'})
@@ -272,7 +272,7 @@ def backwards(self, orm):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'order_payment': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['payments.OrderPayment']", 'unique': 'True'}),
             'polymorphic_ctype': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'polymorphic_payments.payment_set'", 'null': 'True', 'to': u"orm['contenttypes.ContentType']"}),
-            'status': ('django_fsm.db.fields.fsmfield.FSMField', [], {'default': "'started'", 'max_length': '50'}),
+            'status': ('django_fsm.FSMField', [], {'default': "'started'", 'max_length': '50'}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'})
         },
         u'payouts.projectpayout': {
@@ -299,7 +299,7 @@ def backwards(self, orm):
             'receiver_account_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'receiver_account_number': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
             'sender_account_number': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'status': ('django_fsm.db.fields.fsmfield.FSMField', [], {'default': "'new'", 'max_length': '20'}),
+            'status': ('django_fsm.FSMField', [], {'default': "'new'", 'max_length': '20'}),
             'submitted': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'})
         },

diff --git a/...ting/migrations/0004_auto__add_banktransactiontenant__add_field_banktransaction_tenant.py b/...ting/migrations/0004_auto__add_banktransactiontenant__add_field_banktransaction_tenant.py
@@ -222,7 +222,7 @@ def backwards(self, orm):
             'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'order_type': ('django.db.models.fields.CharField', [], {'default': "'one-off'", 'max_length': "'100'"}),
-            'status': ('django_fsm.db.fields.fsmfield.FSMField', [], {'default': "'created'", 'max_length': '50'}),
+            'status': ('django_fsm.FSMField', [], {'default': "'created'", 'max_length': '50'}),
             'total': ('django.db.models.fields.DecimalField', [], {'default': '0', 'max_digits': '16', 'decimal_places': '2'}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']", 'null': 'True', 'blank': 'True'})
@@ -257,7 +257,7 @@ def backwards(self, orm):
             'integration_data': ('django.db.models.fields.TextField', [], {'default': "'{}'", 'max_length': '5000', 'blank': 'True'}),
             'order': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'order_payments'", 'to': u"orm['orders.Order']"}),
             'payment_method': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}),
-            'status': ('django_fsm.db.fields.fsmfield.FSMField', [], {'default': "'created'", 'max_length': '50'}),
+            'status': ('django_fsm.FSMField', [], {'default': "'created'", 'max_length': '50'}),
             'transaction_fee': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '16', 'decimal_places': '2'}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']", 'null': 'True', 'blank': 'True'})
@@ -276,7 +276,7 @@ def backwards(self, orm):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'order_payment': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['payments.OrderPayment']", 'unique': 'True'}),
             'polymorphic_ctype': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'polymorphic_payments.payment_set'", 'null': 'True', 'to': u"orm['contenttypes.ContentType']"}),
-            'status': ('django_fsm.db.fields.fsmfield.FSMField', [], {'default': "'started'", 'max_length': '50'}),
+            'status': ('django_fsm.FSMField', [], {'default': "'started'", 'max_length': '50'}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'})
         },
         u'payouts.projectpayout': {
@@ -303,7 +303,7 @@ def backwards(self, orm):
             'receiver_account_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'receiver_account_number': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
             'sender_account_number': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'status': ('django_fsm.db.fields.fsmfield.FSMField', [], {'default': "'new'", 'max_length': '20'}),
+            'status': ('django_fsm.FSMField', [], {'default': "'new'", 'max_length': '20'}),
             'submitted': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'})
         },

diff --git a/bluebottle/accounting/tests/__init__.py b/bluebottle/accounting/tests/__init__.py
@@ -1 +0,0 @@
-__author__ = 'jos'

diff --git a/bluebottle/accounting/tests/test_accounting_statistics.py b/bluebottle/accounting/tests/test_accounting_statistics.py
@@ -70,12 +70,15 @@ def setUp(self):
         self.assertEqual(self.order1.status, 'locked')
         self.assertEqual(Payment.objects.all().count(), 0)
         self.order_payment.started()
+        self.order_payment.save()
         self.payment = PaymentFactory.create(order_payment=self.order_payment)
         self.assertEqual(Payment.objects.all().count(), 1)
         self.assertEqual(self.order1.status, StatusDefinition.LOCKED)
         self.order_payment.authorized()
+        self.order_payment.save()
         self.assertEqual(self.order1.status, StatusDefinition.PENDING)
         self.order_payment.settled()
+        self.order_payment.save()
         self.assertEqual(self.order1.status, StatusDefinition.SUCCESS)
         # #####