fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove ssify.
[wolnelektury.git]
/
src
/
club
/
payment_methods.py
diff --git
a/src/club/payment_methods.py
b/src/club/payment_methods.py
index
29221ee
..
a71a67b
100644
(file)
--- a/
src/club/payment_methods.py
+++ b/
src/club/payment_methods.py
@@
-3,6
+3,7
@@
from django.urls import reverse
class PaymentMethod(object):
class PaymentMethod(object):
+ is_onetime = False
is_recurring = False
def initiate(self, request, schedule):
is_recurring = False
def initiate(self, request, schedule):
@@
-10,6
+11,7
@@
class PaymentMethod(object):
class PayU(PaymentMethod):
class PayU(PaymentMethod):
+ is_onetime = True
slug = 'payu'
name = 'PayU'
template_name = 'club/payment/payu.html'
slug = 'payu'
name = 'PayU'
template_name = 'club/payment/payu.html'
@@
-30,7
+32,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
@@
-43,19
+45,24
@@
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()
-class PayPal
Re
(PaymentMethod):
- slug='paypal
-re
'
- name = 'PayPal
Recurring
'
- template_name = 'club/payment/paypal
-re
.html'
+class PayPal(PaymentMethod):
+ slug='paypal'
+ name = 'PayPal
(płatność odnawialna)
'
+ template_name = 'club/payment/paypal.html'
is_recurring = True
is_recurring = True
+ is_onetime = True
def initiate(self, request, schedule):
return reverse('club_dummy_payment', args=[schedule.key])
def initiate(self, request, schedule):
return reverse('club_dummy_payment', args=[schedule.key])
@@
-63,13
+70,6
@@
class PayPalRe(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)
@@
-77,8
+77,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(PayPalRe
())
+
#methods.append(PayPal
())
method_by_slug = {
method_by_slug = {