upgrade

[wolnelektury.git] / src / funding / forms.py

diff --git a/src/funding/forms.py b/src/funding/forms.py
index 8f1c3be..f56c087 100644 (file)
--- a/src/funding/forms.py
+++ b/src/funding/forms.py
@@ -1,9 +1,9 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms
 from django.utils import formats
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms
 from django.utils import formats

+from django.utils.safestring import mark_safe

 from django.utils.translation import ugettext_lazy as _, ugettext, get_language
 
 from newsletter.forms import NewsletterForm
 from django.utils.translation import ugettext_lazy as _, ugettext, get_language
 
 from newsletter.forms import NewsletterForm


@@ -20,13 +20,18 @@ class FundingForm(NewsletterForm):
         label=_("Name"), required=False, help_text=_("Optional name for public list of contributors"))
     email = forms.EmailField(
         label=_("Contact e-mail"),
         label=_("Name"), required=False, help_text=_("Optional name for public list of contributors"))
     email = forms.EmailField(
         label=_("Contact e-mail"),

-        help_text=_(
-            "We'll use it to contact you about the <strong>details needed for your perks</strong>,<br/>"
-            "and to send you updates about your payment and the fundraiser status (which you can always turn off).<br/>"
-            "Your e-mail won't be publicised."), required=False)
+        help_text=mark_safe(_(
+            "We'll use it to "
+            "send you updates about your payment and the fundraiser status (which you can always turn off).<br/>"
+            "Your e-mail won't be publicised.")), required=False)

 
 

-    def __init__(self, offer, *args, **kwargs):
+    data_processing_part2 = '''\
+W przypadku podania danych zostaną one wykorzystane w sposób podany powyżej, a w przypadku wyrażenia dodatkowej zgody 
+adres e-mail zostanie wykorzystany także w celu przesyłania newslettera Wolnych Lektur.'''
+
+    def __init__(self, request, offer, *args, **kwargs):

         self.offer = offer
         self.offer = offer

+        self.user = request.user if request.user.is_authenticated else None

         super(FundingForm, self).__init__(*args, **kwargs)
         self.fields['amount'].widget.form_instance = self
 
         super(FundingForm, self).__init__(*args, **kwargs)
         self.fields['amount'].widget.form_instance = self
 


@@ -53,6 +58,7 @@ class FundingForm(NewsletterForm):
             email=self.cleaned_data['email'],
             amount=self.cleaned_data['amount'],
             language_code=get_language(),
             email=self.cleaned_data['email'],
             amount=self.cleaned_data['amount'],
             language_code=get_language(),

+            user=self.user,

         )
         )

-        funding.perks = funding.offer.get_perks(funding.amount)
+        funding.perks.set(funding.offer.get_perks(funding.amount))

         return funding
         return funding