fixes

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

diff --git a/src/funding/forms.py b/src/funding/forms.py
index 6ed9076..e055faf 100644 (file)
--- a/src/funding/forms.py
+++ b/src/funding/forms.py
@@ -1,29 +1,42 @@
-# -*- 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.translation import ugettext_lazy as _, ugettext, get_language
+from django.utils.safestring import mark_safe
+from django.utils.translation import gettext_lazy as _, gettext, get_language
+
+from newsletter.forms import NewsletterForm
+from club.payment_methods import PayU

 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):
+payment_method = PayU(app_settings.PAYU_POS)
+
+
+class FundingForm(NewsletterForm):

     required_css_class = 'required'
 
     required_css_class = 'required'
 

-    amount = forms.DecimalField(label=_("Amount"), decimal_places=2,
-        widget=PerksAmountWidget())
-    name = forms.CharField(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)
+    amount = forms.DecimalField(label=_("Amount"), decimal_places=2, widget=PerksAmountWidget())
+    name = forms.CharField(
+        label=_("Name"), required=False, help_text=_("Optional name for public list of contributors"))
+    email = forms.EmailField(
+        label=_("Contact e-mail"),
+        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
+        self.client_ip = request.META['REMOTE_ADDR']

         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
 


@@ -33,23 +46,26 @@ class FundingForm(forms.Form):
             if isinstance(min_amount, float):
                 min_amount = formats.number_format(min_amount, 2)
             raise forms.ValidationError(
             if isinstance(min_amount, float):
                 min_amount = formats.number_format(min_amount, 2)
             raise forms.ValidationError(

-                ugettext("The minimum amount is %(amount)s PLN.") % {
+                gettext("The minimum amount is %(amount)s PLN.") % {

                     'amount': min_amount})
         return self.cleaned_data['amount']
 
     def clean(self):
         if not self.offer.is_current():
                     'amount': min_amount})
         return self.cleaned_data['amount']
 
     def clean(self):
         if not self.offer.is_current():

-            raise forms.ValidationError(ugettext("This offer is out of date."))
+            raise forms.ValidationError(gettext("This offer is out of date."))

         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'],
             email=self.cleaned_data['email'],
             amount=self.cleaned_data['amount'],
             language_code=get_language(),
         funding = Funding.objects.create(
             offer=self.offer,
             name=self.cleaned_data['name'],
             email=self.cleaned_data['email'],
             amount=self.cleaned_data['amount'],
             language_code=get_language(),

+            user=self.user,
+            pos_id=payment_method.pos_id,
+            customer_ip=self.client_ip,

         )
         )

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

         return funding
         return funding

-