Mark order as paid immediately

src/tests/base/test_orders.py

@@ -41,7 +41,7 @@ def test_expiry_days(event):
     event.settings.set('payment_term_weekdays', False)
     order = _create_order(event, email='dummy@example.org', positions=[],
                           now_dt=today, payment_provider=FreeOrderProvider(event),
-                          locale='de')
+                          locale='de')[0]
     assert (order.expires - today).days == 5
 
 
@@ -52,14 +52,14 @@ def test_expiry_weekdays(event):
     event.settings.set('payment_term_weekdays', True)
     order = _create_order(event, email='dummy@example.org', positions=[],
                           now_dt=today, payment_provider=FreeOrderProvider(event),
-                          locale='de')
+                          locale='de')[0]
     assert (order.expires - today).days == 6
     assert order.expires.weekday() == 0
 
     today = make_aware(datetime(2016, 9, 19, 15, 0, 0, 0))
     order = _create_order(event, email='dummy@example.org', positions=[],
                           now_dt=today, payment_provider=FreeOrderProvider(event),
-                          locale='de')
+                          locale='de')[0]
     assert (order.expires - today).days == 7
     assert order.expires.weekday() == 0
 
@@ -72,12 +72,12 @@ def test_expiry_last(event):
     event.settings.set('payment_term_last', now() + timedelta(days=3))
     order = _create_order(event, email='dummy@example.org', positions=[],
                           now_dt=today, payment_provider=FreeOrderProvider(event),
-                          locale='de')
+                          locale='de')[0]
     assert (order.expires - today).days == 3
     event.settings.set('payment_term_last', now() + timedelta(days=7))
     order = _create_order(event, email='dummy@example.org', positions=[],
                           now_dt=today, payment_provider=FreeOrderProvider(event),
-                          locale='de')
+                          locale='de')[0]
     assert (order.expires - today).days == 5
 
 
@@ -93,7 +93,7 @@ def test_expiry_last_relative(event):
     ))
     order = _create_order(event, email='dummy@example.org', positions=[],
                           now_dt=today, payment_provider=FreeOrderProvider(event),
-                          locale='de')
+                          locale='de')[0]
     assert (order.expires - today).days == 3
 
 
@@ -124,7 +124,7 @@ def test_expiry_last_relative_subevents(event):
     ))
     order = _create_order(event, email='dummy@example.org', positions=[cp1, cp2],
                           now_dt=today, payment_provider=FreeOrderProvider(event),
-                          locale='de')
+                          locale='de')[0]
     assert (order.expires - today).days == 6
 
 
@@ -136,7 +136,7 @@ def test_expiry_dst(event):
     today = tz.localize(datetime(2016, 10, 29, 12, 0, 0)).astimezone(utc)
     order = _create_order(event, email='dummy@example.org', positions=[],
                           now_dt=today, payment_provider=FreeOrderProvider(event),
-                          locale='de')
+                          locale='de')[0]
     localex = order.expires.astimezone(tz)
     assert (localex.hour, localex.minute) == (23, 59)
 

src/tests/presale/test_checkout.py

@@ -907,6 +907,24 @@ class CheckoutTestCase(BaseCheckoutTestCase, TestCase):
         self.assertEqual(OrderPosition.objects.count(), 1)
         self.assertEqual(OrderPosition.objects.first().price, 42)
 
+    def test_free_order(self):
+        self.ticket.free_price = True
+        self.ticket.save()
+        cr1 = CartPosition.objects.create(
+            event=self.event, cart_id=self.session_key, item=self.ticket,
+            price=0, expires=now() + timedelta(minutes=10)
+        )
+        self._set_session('payment', 'free')
+
+        response = self.client.post('/%s/%s/checkout/confirm/' % (self.orga.slug, self.event.slug), follow=True)
+        doc = BeautifulSoup(response.rendered_content, "lxml")
+        self.assertEqual(len(doc.select(".thank-you")), 1)
+        self.assertFalse(CartPosition.objects.filter(id=cr1.id).exists())
+        self.assertEqual(Order.objects.count(), 1)
+        self.assertEqual(OrderPosition.objects.count(), 1)
+        self.assertEqual(OrderPosition.objects.first().price, 0)
+        self.assertEqual(Order.objects.first().status, Order.STATUS_PAID)
+
     def test_confirm_in_time(self):
         cr1 = CartPosition.objects.create(
             event=self.event, cart_id=self.session_key, item=self.ticket,
@@ -920,6 +938,7 @@ class CheckoutTestCase(BaseCheckoutTestCase, TestCase):
         self.assertFalse(CartPosition.objects.filter(id=cr1.id).exists())
         self.assertEqual(Order.objects.count(), 1)
         self.assertEqual(OrderPosition.objects.count(), 1)
+        self.assertEqual(Order.objects.first().status, Order.STATUS_PENDING)
 
     def test_subevent_confirm_expired_available(self):
         self.event.has_subevents = True