Implement recurring payments on The Pay

Depends on cuchac/thepay#4

Signed-off-by: Michal Čihař <michal@cihar.com>

Author: nijel

wlhosted/integrations/tasks.py

@@ -52,26 +52,26 @@ def pending_payments():
 
 @app.task
 def recurring_payments():
-    with transaction.atomic(using='payments_db'):
-        cutoff = timezone.now().date() + timedelta(days=1)
-        for billing in Billing.objects.filter(state=Billing.STATE_ACTIVE):
-            if 'recurring' not in billing.payment:
-                continue
-            last_invoice = billing.invoice_set.order_by('-start')[0]
-            if last_invoice.end > cutoff:
-                continue
-
-            original = Payment.objects.get(pk=billing.payment['recurring'])
-
-            # Check if backend is still valid
-            try:
-                get_backend(original.backend)
-            except KeyError:
-                # Remove recurring flag
-                del billing.payment['recurring']
-                billing.save()
-                continue
-
+    cutoff = timezone.now().date() + timedelta(days=1)
+    for billing in Billing.objects.filter(state=Billing.STATE_ACTIVE):
+        if 'recurring' not in billing.payment:
+            continue
+        last_invoice = billing.invoice_set.order_by('-start')[0]
+        if last_invoice.end > cutoff:
+            continue
+
+        original = Payment.objects.get(pk=billing.payment['recurring'])
+
+        # Check if backend is still valid
+        try:
+            get_backend(original.backend)
+        except KeyError:
+            # Remove recurring flag
+            del billing.payment['recurring']
+            billing.save()
+            continue
+
+        with transaction.atomic(using='payments_db'):
             # Check for failed payments
             previous = Payment.objects.filter(repeat=original)
             if previous.exists():
@@ -103,18 +103,18 @@ def recurring_payments():
                 }
             )
 
-            # Trigger payment processing
-            request = Request(get_payment_url(payment))
-            request.add_header('User-Agent', USER_AGENT)
-            handle = urlopen(
-                request,
-                urlencode({
-                    'method': original.details['backend'],
-                    'secret': settings.PAYMENT_SECRET,
-                }).encode('utf-8')
-            )
-            handle.read()
-            handle.close()
+        # Trigger payment processing
+        request = Request(get_payment_url(payment))
+        request.add_header('User-Agent', USER_AGENT)
+        handle = urlopen(
+            request,
+            urlencode({
+                'method': original.backend,
+                'secret': settings.PAYMENT_SECRET,
+            }).encode('utf-8')
+        )
+        handle.read()
+        handle.close()
 
     # We have created bunch of pending payments, process them now
     pending_payments()

wlhosted/payments/backends.py

@@ -26,14 +26,19 @@
 
 from django.conf import settings
 from django.core.mail import EmailMessage
+from django.core.serializers.json import DjangoJSONEncoder
 from django.shortcuts import redirect
 from django.utils.translation import ugettext as _, ugettext_lazy
 
 from fakturace.storage import WebStorage
 
 import thepay.config
+import thepay.gateApi
+import thepay.dataApi
 import thepay.payment
 
+from zeep.helpers import serialize_object
+
 from wlhosted.payments.models import Payment
 
 BACKENDS = {}
@@ -143,7 +148,9 @@ def generate_invoice(self):
         invoice = storage.get(invoice_file)
         invoice.write_tex()
         invoice.build_pdf()
-        invoice.mark_paid(json.dumps(self.payment.details, indent=2))
+        invoice.mark_paid(
+            json.dumps(self.payment.details, indent=2, cls=DjangoJSONEncoder)
+        )
 
         self.payment.invoice = invoice.invoiceid
 
@@ -299,6 +306,14 @@ def __init__(self, payment):
             )
 
     def perform(self, request, back_url, complete_url):
+        if self.payment.repeat:
+            api = thepay.gateApi.GateApi(self.config)
+            api.cardCreateRecurrentPayment(
+                str(self.payment.repeat.pk),
+                str(self.payment.pk),
+                self.payment.vat_amount,
+            )
+            return None
 
         payment = thepay.payment.Payment(self.config)
 
@@ -311,13 +326,16 @@ def perform(self, request, back_url, complete_url):
         payment.setMerchantData(str(self.payment.pk))
         if self.payment.recurring:
             payment.setIsRecurring(1)
-        elif self.payment.repeat:
-            # TODO: invoce recurring payment API
-            pass
-
         return redirect(payment.getCreateUrl())
 
     def collect(self, request):
+        if self.payment.repeat:
+            data = thepay.dataApi.DataApi(self.config)
+            payment = data.getPayments(
+                merchant_data=str(self.payment.pk)
+            ).payments.payment[0]
+            self.payment.details = serialize_object(payment)
+            return True
         return_payment = thepay.payment.ReturnPayment(self.config)
         return_payment.parseData(request.GET)