fix for multiple agreements

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

diff --git a/src/funding/forms.py b/src/funding/forms.py
index 6feb104..1c85135 100644 (file)
--- a/src/funding/forms.py
+++ b/src/funding/forms.py
@@ -4,13 +4,16 @@
 #
 from django import forms
 from django.utils import formats
 #
 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 django.utils.translation import ugettext_lazy as _, ugettext, get_language

+
+from newsletter.forms import NewsletterForm

 from .models import Funding
 from .widgets import PerksAmountWidget
 from . import app_settings
 
 
 from .models import Funding
 from .widgets import PerksAmountWidget
 from . import app_settings
 
 

-class FundingForm(forms.Form):
+class FundingForm(NewsletterForm):

     required_css_class = 'required'
 
     amount = forms.DecimalField(label=_("Amount"), decimal_places=2, widget=PerksAmountWidget())
     required_css_class = 'required'
 
     amount = forms.DecimalField(label=_("Amount"), decimal_places=2, widget=PerksAmountWidget())


@@ -18,10 +21,14 @@ class FundingForm(forms.Form):
         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=_(
+        help_text=mark_safe(_(

             "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/>"
             "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)
+            "Your e-mail won't be publicised.")), required=False)
+
+    data_processing_part2 = u'''\
+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, offer, *args, **kwargs):
         self.offer = offer
 
     def __init__(self, offer, *args, **kwargs):
         self.offer = offer


@@ -44,6 +51,7 @@ class FundingForm(forms.Form):
         return self.cleaned_data
 
     def save(self):
         return self.cleaned_data
 
     def save(self):

+        super(FundingForm, self).save()

         funding = Funding.objects.create(
             offer=self.offer,
             name=self.cleaned_data['name'],
         funding = Funding.objects.create(
             offer=self.offer,
             name=self.cleaned_data['name'],