Fix #571 -- Partial payments and refunds

src/tests/plugins/banktransfer/test_actions.py

@@ -25,13 +25,13 @@ def env():
         code='1Z3AS', event=event,
         status=Order.STATUS_PENDING,
         datetime=now(), expires=now() + timedelta(days=10),
-        total=23, payment_provider='banktransfer'
+        total=23,
     )
     o2 = Order.objects.create(
         code='6789Z', event=event,
         status=Order.STATUS_CANCELED,
         datetime=now(), expires=now() + timedelta(days=10),
-        total=23, payment_provider='banktransfer'
+        total=23,
     )
     quota = Quota.objects.create(name="Test", size=2, event=event)
     item1 = Item.objects.create(event=event, name="Ticket", default_price=23)
@@ -56,23 +56,6 @@ def test_discard(env, client):
     assert trans.payer == ''
 
 
-@pytest.mark.django_db
-def test_accept_wrong_amount(env, client):
-    job = BankImportJob.objects.create(event=env[0])
-    trans = BankTransaction.objects.create(event=env[0], import_job=job, payer='Foo',
-                                           state=BankTransaction.STATE_INVALID,
-                                           amount=12, date='unknown', order=env[2])
-    client.login(email='dummy@dummy.dummy', password='dummy')
-    r = json.loads(client.post('/control/event/{}/{}/banktransfer/action/'.format(env[0].organizer.slug, env[0].slug), {
-        'action_{}'.format(trans.pk): 'accept',
-    }).content.decode('utf-8'))
-    assert r['status'] == 'ok'
-    trans.refresh_from_db()
-    assert trans.state == BankTransaction.STATE_VALID
-    env[2].refresh_from_db()
-    assert env[2].status == Order.STATUS_PAID
-
-
 @pytest.mark.django_db
 def test_assign_order(env, client):
     job = BankImportJob.objects.create(event=env[0])

src/tests/plugins/banktransfer/test_api.py

@@ -28,13 +28,13 @@ def env():
         code='1Z3AS', event=event,
         status=Order.STATUS_PENDING,
         datetime=now(), expires=now() + timedelta(days=10),
-        total=23, payment_provider='banktransfer'
+        total=23
     )
     o2 = Order.objects.create(
         code='6789Z', event=event,
         status=Order.STATUS_CANCELED,
         datetime=now(), expires=now() + timedelta(days=10),
-        total=23, payment_provider='banktransfer'
+        total=23
     )
     quota = Quota.objects.create(name="Test", size=2, event=event)
     item1 = Item.objects.create(event=event, name="Ticket", default_price=23)

src/tests/plugins/banktransfer/test_import.py

@@ -7,7 +7,8 @@ from django.core.files.uploadedfile import SimpleUploadedFile
 from django.utils.timezone import now
 
 from pretix.base.models import (
-    Event, Item, Order, OrderPosition, Organizer, Quota, Team, User,
+    Event, Item, Order, OrderPayment, OrderPosition, Organizer, Quota, Team,
+    User,
 )
 from pretix.plugins.banktransfer.models import BankImportJob
 from pretix.plugins.banktransfer.tasks import process_banktransfers
@@ -28,19 +29,19 @@ def env():
         code='1Z3AS', event=event,
         status=Order.STATUS_PENDING,
         datetime=now(), expires=now() + timedelta(days=10),
-        total=23, payment_provider='banktransfer'
+        total=23
     )
     o2 = Order.objects.create(
         code='6789Z', event=event,
         status=Order.STATUS_CANCELED,
         datetime=now(), expires=now() + timedelta(days=10),
-        total=23, payment_provider='banktransfer'
+        total=23
     )
     Order.objects.create(
         code='GS89Z', event=event,
         status=Order.STATUS_CANCELED,
         datetime=now(), expires=now() + timedelta(days=10),
-        total=23, payment_provider='banktransfer'
+        total=23
     )
     quota = Quota.objects.create(name="Test", size=2, event=event)
     item1 = Item.objects.create(event=event, name="Ticket", default_price=23)
@@ -110,7 +111,43 @@ def test_mark_paid(env, job):
 
 
 @pytest.mark.django_db
-def test_check_amount(env, job):
+def test_underpaid(env, job):
+    process_banktransfers(job, [{
+        'payer': 'Karla Kundin',
+        'reference': 'Bestellung DUMMY1Z3AS',
+        'date': '2016-01-26',
+        'amount': '22.50'
+    }])
+    env[2].refresh_from_db()
+    assert env[2].status == Order.STATUS_PENDING
+    p = env[2].payments.last()
+    assert p.amount == Decimal('22.50')
+    assert p.state == OrderPayment.PAYMENT_STATE_CONFIRMED
+    assert env[2].pending_sum == Decimal('0.50')
+
+
+@pytest.mark.django_db
+def test_in_parts(env, job):
+    process_banktransfers(job, [{
+        'payer': 'Karla Kundin',
+        'reference': 'Bestellung DUMMY1Z3AS',
+        'date': '2016-01-26',
+        'amount': '10.00'
+    }])
+    process_banktransfers(job, [{
+        'payer': 'Karla Kundin',
+        'reference': 'Bestellung DUMMY1Z3AS',
+        'date': '2016-01-26',
+        'amount': '13.00'
+    }])
+    env[2].refresh_from_db()
+    assert env[2].status == Order.STATUS_PAID
+    assert env[2].payments.count() == 2
+    assert env[2].pending_sum == Decimal('0.00')
+
+
+@pytest.mark.django_db
+def test_overpaid(env, job):
     process_banktransfers(job, [{
         'payer': 'Karla Kundin',
         'reference': 'Bestellung DUMMY1Z3AS',
@@ -118,7 +155,11 @@ def test_check_amount(env, job):
         'amount': '23.50'
     }])
     env[2].refresh_from_db()
-    assert env[2].status == Order.STATUS_PENDING
+    assert env[2].status == Order.STATUS_PAID
+    p = env[2].payments.last()
+    assert p.amount == Decimal('23.50')
+    assert p.state == OrderPayment.PAYMENT_STATE_CONFIRMED
+    assert env[2].pending_sum == Decimal('-0.50')
 
 
 @pytest.mark.django_db