fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Housekeeping.
[wolnelektury.git]
/
src
/
club
/
payment_methods.py
diff --git
a/src/club/payment_methods.py
b/src/club/payment_methods.py
index
b215b1d
..
99694ef
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
@@
-32,7
+35,7
@@
class PayU(PaymentMethod):
class PayURe(PaymentMethod):
slug='payu-re'
class PayURe(PaymentMethod):
slug='payu-re'
- name = 'PayU
Recurring
'
+ name = 'PayU
(płatność odnawialna)
'
template_name = 'club/payment/payu-re.html'
is_recurring = True
template_name = 'club/payment/payu-re.html'
is_recurring = True
@@
-45,9
+48,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
+62,7
@@
class PayURe(PaymentMethod):
class PayPal(PaymentMethod):
slug='paypal'
class PayPal(PaymentMethod):
slug='paypal'
- name = 'PayPal'
+ name = 'PayPal
(płatność odnawialna)
'
template_name = 'club/payment/paypal.html'
is_recurring = True
is_onetime = True
template_name = 'club/payment/paypal.html'
is_recurring = True
is_onetime = True
@@
-66,13
+73,6
@@
class PayPal(PaymentMethod):
methods = []
methods = []
-pos = getattr(settings, 'CLUB_PAYU_POS', None)
-if pos:
- payu_method = PayU(pos)
- methods.append(payu_method)
-else:
- payu_method = None
-
pos= getattr(settings, 'CLUB_PAYU_RECURRING_POS', None)
if pos:
payure_method = PayURe(pos)
pos= getattr(settings, 'CLUB_PAYU_RECURRING_POS', None)
if pos:
payure_method = PayURe(pos)
@@
-80,8
+80,15
@@
if pos:
else:
payure_method = None
else:
payure_method = None
+pos = getattr(settings, 'CLUB_PAYU_POS', None)
+if pos:
+ payu_method = PayU(pos)
+ methods.append(payu_method)
+else:
+ payu_method = None
+
-methods.append(PayPal())
+
#
methods.append(PayPal())
method_by_slug = {
method_by_slug = {