Ooops....forgot some files in previous commit

frontend/forms.py

@@ -3,6 +3,7 @@ from django.db import models
 from regluit.core.models import UserProfile
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _
+from decimal import Decimal as D
  
 class ProfileForm(forms.ModelForm):
     class Meta:
@@ -35,3 +36,6 @@ class UserData(forms.Form):
                 return username
             raise forms.ValidationError(_("Another user with that username already exists."))
         raise forms.ValidationError(_("Your username is already "+oldusername))
+
+class CampaignPledgeForm(forms.Form):
+    pledge_amount = forms.DecimalField(min_value=D('0.00'), max_value=D('10000.00'), decimal_places=2)

frontend/urls.py

@@ -1,6 +1,10 @@
 from django.conf.urls.defaults import *
 from django.views.generic.simple import direct_to_template
 from django.views.generic.base import TemplateView
+from django.views.generic import ListView, DetailView
+
+from regluit.core.models import Campaign
+from regluit.frontend.views import CampaignDetailView
 
 urlpatterns = patterns(
     "regluit.frontend.views",
@@ -12,4 +16,7 @@ urlpatterns = patterns(
     url(r"^rightsholders/$", TemplateView.as_view(template_name="rhtools.html"),
         name="rightsholders"),
     url(r"^wishlist/$", "wishlist", name="wishlist"),
+    url(r"^campaigns/$", ListView.as_view(
+        model=Campaign,template_name="campaign_list.html", context_object_name="campaign_list")),
+    url(r'^campaigns/(?P<pk>\d+)/$', CampaignDetailView.as_view(), name="campaign_by_id"),
 )

frontend/views.py

@@ -5,6 +5,7 @@ from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_POST
+from django.views.generic import ListView, DetailView
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import render, render_to_response, get_object_or_404
 
@@ -87,3 +88,10 @@ def wishlist(request):
         request.user.wishlist.works.remove(work)
         # TODO: where to redirect?
         return HttpResponseRedirect('/')
+
+class CampaignDetailView(DetailView):
+    model=models.Campaign
+    template_name="campaign_detail.html"
+    context_object_name = "campaign"
+    name="campaign_by_id"
+

payment/views.py

@@ -146,22 +146,32 @@ def testPledge(request):
     
     p = PaymentManager()
     
-    if 'campaign' in request.GET.keys():
-        campaign_id = request.GET['campaign']
+    if 'campaign' in request.REQUEST.keys():
+        campaign_id = request.REQUEST['campaign']
     else:
         campaign_id = None
         
+    # see whether there is a user logged in.
+    if request.user.is_authenticated():
+        user = request.user
+    else:
+        user = None
     
     # Note, set this to 1-5 different receivers with absolute amounts for each
     #receiver_list = [{'email':TEST_RECEIVERS[0], 'amount':20.00},{'email':TEST_RECEIVERS[1], 'amount':10.00}]
-    receiver_list = [{'email':TEST_RECEIVERS[0], 'amount':78.90}, {'email':TEST_RECEIVERS[1], 'amount':34.56}]
+    
+    if 'pledge_amount' in request.REQUEST.keys():
+        pledge_amount = request.REQUEST['pledge_amount']
+        receiver_list = [{'email':TEST_RECEIVERS[0], 'amount':pledge_amount}]
+    else:
+        receiver_list = [{'email':TEST_RECEIVERS[0], 'amount':78.90}, {'email':TEST_RECEIVERS[1], 'amount':34.56}]
     
     if campaign_id:
         campaign = Campaign.objects.get(id=int(campaign_id))
-        t, url = p.pledge('USD', TARGET_TYPE_CAMPAIGN, receiver_list, campaign=campaign, list=None, user=None)
+        t, url = p.pledge('USD', TARGET_TYPE_CAMPAIGN, receiver_list, campaign=campaign, list=None, user=user)
     
     else:
-        t, url = p.pledge('USD', TARGET_TYPE_NONE, receiver_list, campaign=None, list=None, user=None)
+        t, url = p.pledge('USD', TARGET_TYPE_NONE, receiver_list, campaign=None, list=None, user=user)
     
     if url:
         logger.info("testPledge: " + url)