fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove machina, remove default cache config, add some upgrades and compatibility...
[wolnelektury.git]
/
src
/
club
/
models.py
diff --git
a/src/club/models.py
b/src/club/models.py
index
acf131b
..
1a78d76
100644
(file)
--- a/
src/club/models.py
+++ b/
src/club/models.py
@@
-12,8
+12,9
@@
from django.urls import reverse
from django.db import models
from django import template
from django.utils.timezone import now
from django.db import models
from django import template
from django.utils.timezone import now
-from django.utils.translation import
ugettext_lazy as _, ungettext, u
gettext, get_language
+from django.utils.translation import
gettext_lazy as _, ngettext,
gettext, get_language
from django_countries.fields import CountryField
from django_countries.fields import CountryField
+from pytz import utc
from catalogue.utils import get_random_hash
from messaging.states import Level
from reporting.utils import render_to_pdf
from catalogue.utils import get_random_hash
from messaging.states import Level
from reporting.utils import render_to_pdf
@@
-240,7
+241,7
@@
class Membership(models.Model):
Contact = apps.get_model('messaging', 'Contact')
if self.manual:
Contact = apps.get_model('messaging', 'Contact')
if self.manual:
- Contact.update(email, Level.MANUAL_MEMBER,
self.updated_at
)
+ Contact.update(email, Level.MANUAL_MEMBER,
datetime.combine(self.updated_at, datetime.min.time(), utc)
)
else:
Contact.reset(email)
else:
Contact.reset(email)
@@
-309,11
+310,6
@@
class PayUOrder(payu_models.Order):
"language": get_language(),
}
"language": get_language(),
}
- def get_continue_url(self):
- return "https://{}{}".format(
- Site.objects.get_current().domain,
- self.schedule.get_thanks_url())
-
def get_description(self):
return 'Wolne Lektury'
def get_description(self):
return 'Wolne Lektury'
@@
-328,6
+324,9
@@
class PayUOrder(payu_models.Order):
Site.objects.get_current().domain,
reverse('club_payu_notify', args=[self.pk]))
Site.objects.get_current().domain,
reverse('club_payu_notify', args=[self.pk]))
+ def get_thanks_url(self):
+ return self.schedule.get_thanks_url()
+
def status_updated(self):
if self.status == 'COMPLETED':
self.schedule.set_payed()
def status_updated(self):
if self.status == 'COMPLETED':
self.schedule.set_payed()
@@
-379,8
+378,8
@@
class PayUOrder(payu_models.Order):
except Contact.DoesNotExist:
funding = Funding.objects.filter(
email=email,
except Contact.DoesNotExist:
funding = Funding.objects.filter(
email=email,
-
pay
ed_at__year=year,
- notifications=True).order_by('
pay
ed_at').first()
+
complet
ed_at__year=year,
+ notifications=True).order_by('
complet
ed_at').first()
if funding is None:
print('no notifications')
return
if funding is None:
print('no notifications')
return
@@
-403,11
+402,11
@@
class PayUOrder(payu_models.Order):
fundings = Funding.objects.filter(
email=email,
fundings = Funding.objects.filter(
email=email,
-
pay
ed_at__year=year
- ).order_by('
pay
ed_at')
+
complet
ed_at__year=year
+ ).order_by('
complet
ed_at')
for funding in fundings:
payments.append({
for funding in fundings:
payments.append({
- 'timestamp': funding.
pay
ed_at,
+ 'timestamp': funding.
complet
ed_at,
'amount': funding.amount,
})
'amount': funding.amount,
})