Fixes #4076: Recommendations from collections.

[wolnelektury.git] / src / club / payment_methods.py

diff --git a/src/club/payment_methods.py b/src/club/payment_methods.py
index b215b1d..1b27bd3 100644 (file)
--- a/src/club/payment_methods.py
+++ b/src/club/payment_methods.py
@@ -1,3 +1,6 @@
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.conf import settings
 from django.urls import reverse
 
 from django.conf import settings
 from django.urls import reverse
 


@@ -13,7 +16,6 @@ class PaymentMethod(object):
 class PayU(PaymentMethod):
     is_onetime = True
     slug = 'payu'
 class PayU(PaymentMethod):
     is_onetime = True
     slug = 'payu'

-    name = 'PayU'

     template_name = 'club/payment/payu.html'
 
     def __init__(self, pos_id):
     template_name = 'club/payment/payu.html'
 
     def __init__(self, pos_id):


@@ -32,7 +34,6 @@ class PayU(PaymentMethod):
 
 class PayURe(PaymentMethod):
     slug='payu-re'
 
 class PayURe(PaymentMethod):
     slug='payu-re'

-    name = 'PayU Recurring'

     template_name = 'club/payment/payu-re.html'
     is_recurring = True
 
     template_name = 'club/payment/payu-re.html'
     is_recurring = True
 


@@ -45,9 +46,13 @@ class PayURe(PaymentMethod):
     def pay(self, request, schedule):
         # Create order, put it and see what happens next.
         from .models import PayUOrder
     def pay(self, request, schedule):
         # Create order, put it and see what happens next.
         from .models import PayUOrder

+        if request is not None:
+            ip = request.META['REMOTE_ADDR']
+        else:
+            ip = '127.0.0.1'

         order = PayUOrder.objects.create(
             pos_id=self.pos_id,
         order = PayUOrder.objects.create(
             pos_id=self.pos_id,

-            customer_ip=request.META['REMOTE_ADDR'],
+            customer_ip=ip,

             schedule=schedule,
         )
         return order.put()
             schedule=schedule,
         )
         return order.put()


@@ -55,7 +60,6 @@ class PayURe(PaymentMethod):
 
 class PayPal(PaymentMethod):
     slug='paypal'
 
 class PayPal(PaymentMethod):
     slug='paypal'

-    name = 'PayPal'

     template_name = 'club/payment/paypal.html'
     is_recurring = True
     is_onetime = True
     template_name = 'club/payment/paypal.html'
     is_recurring = True
     is_onetime = True


@@ -64,27 +68,14 @@ class PayPal(PaymentMethod):
         return reverse('club_dummy_payment', args=[schedule.key])
 
 
         return reverse('club_dummy_payment', args=[schedule.key])
 
 

-methods = []
-
-pos = getattr(settings, 'CLUB_PAYU_POS', None)
+pos = getattr(settings, 'CLUB_PAYU_RECURRING_POS', None)

 if pos:
 if pos:

-    payu_method = PayU(pos)
-    methods.append(payu_method)
+    recurring_payment_method = PayURe(pos)

 else:
 else:

-    payu_method = None
+    recurring_payment_method = None

 
 

-pos= getattr(settings, 'CLUB_PAYU_RECURRING_POS', None)
+pos = getattr(settings, 'CLUB_PAYU_POS', None)

 if pos:
 if pos:

-    payure_method = PayURe(pos)
-    methods.append(payure_method)
+    single_payment_method = PayU(pos)

 else:
 else:

-    payure_method = None
-
-
-methods.append(PayPal())
-
-
-method_by_slug = {
-    m.slug: m
-    for m in methods
-}
+    single_payment_method = None