From 0d88a395cbccf0fc9ec843a0efc8176c875db197 Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Thu, 16 Aug 2012 14:11:32 -0700 Subject: [PATCH 001/107] First pass at stripe prototype --> /stripe/test will now let you type in a test credit card and display resulting stripeToken --- payment/forms.py | 7 +++ payment/templates/stripe.html | 84 +++++++++++++++++++++++++++++++++++ payment/urls.py | 2 + payment/views.py | 15 ++++++- 4 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 payment/forms.py create mode 100644 payment/templates/stripe.html diff --git a/payment/forms.py b/payment/forms.py new file mode 100644 index 00000000..6862b686 --- /dev/null +++ b/payment/forms.py @@ -0,0 +1,7 @@ +from django import forms +import logging + +logger = logging.getLogger(__name__) + +class StripePledgeForm(forms.Form): + stripeToken = forms.CharField(required=False, widget=forms.HiddenInput()) \ No newline at end of file diff --git a/payment/templates/stripe.html b/payment/templates/stripe.html new file mode 100644 index 00000000..8cc5dd01 --- /dev/null +++ b/payment/templates/stripe.html @@ -0,0 +1,84 @@ +{% extends "basepledge.html" %} +{% load humanize %} + +{% block title %}Stripe{% endblock %} + +{% block extra_extra_head %} + + + + + + + + + +{% endblock %} + +{% block doccontent %} +Stripe Test: + + +
+ {% csrf_token %} +
+ + +
+
+ + +
+
+ + + / + +
+ +
+ +{% endblock %} + diff --git a/payment/urls.py b/payment/urls.py index 47e302a7..818c8058 100644 --- a/payment/urls.py +++ b/payment/urls.py @@ -1,5 +1,6 @@ from django.conf.urls.defaults import * from django.conf import settings +from regluit.payment.views import StripeView urlpatterns = patterns( "regluit.payment.views", @@ -28,6 +29,7 @@ if settings.DEBUG: url(r"^testfinish", "testFinish"), url(r"^testrefund", "testRefund"), url(r"^testmodify", "testModify"), + url(r"^stripe/test", StripeView.as_view()), ) \ No newline at end of file diff --git a/payment/views.py b/payment/views.py index 1b94f551..bea0870d 100644 --- a/payment/views.py +++ b/payment/views.py @@ -2,6 +2,9 @@ from regluit.payment.manager import PaymentManager from regluit.payment.paypal import IPN from regluit.payment.models import Transaction from regluit.core.models import Campaign, Wishlist + +from regluit.payment.forms import StripePledgeForm + from django.conf import settings from django.core.urlresolvers import reverse from django.shortcuts import render_to_response @@ -13,6 +16,9 @@ from django.views.decorators.csrf import csrf_exempt from django.test.utils import setup_test_environment from django.template import RequestContext +from django.views.generic.edit import FormView +from django.views.generic.base import TemplateView + from unittest import TestResult from regluit.payment.tests import PledgeTest, AuthorizeTest import uuid @@ -322,5 +328,10 @@ def checkStatus(request): def _render(request, template, template_vars={}): return render_to_response(template, template_vars, RequestContext(request)) - - \ No newline at end of file +class StripeView(FormView): + template_name="stripe.html" + form_class = StripePledgeForm + + def form_valid(self, form): + stripeToken = form.cleaned_data["stripeToken"] + return HttpResponse("stripeToken: {0}".format(stripeToken)) \ No newline at end of file From e81a25b1bd060de4faa25942b3a7a3e7ab935cbe Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Thu, 16 Aug 2012 17:24:18 -0700 Subject: [PATCH 002/107] Now documenting more of what we need to do next with stripe if we go for a fullblown implementation --- payment/stripelib.py | 70 +++++++++++++++++++++++++++++++++++ payment/templates/stripe.html | 2 +- payment/views.py | 17 ++++++++- 3 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 payment/stripelib.py diff --git a/payment/stripelib.py b/payment/stripelib.py new file mode 100644 index 00000000..7428b1ce --- /dev/null +++ b/payment/stripelib.py @@ -0,0 +1,70 @@ +import stripe + +# should load the keys for Stripe from db -- but for now just hardcode here +try: + from regluit.core.models import Key + STRIPE_PK = Key.objects.get(name="STRIPE_PK").value + STRIPE_SK = Key.objects.get(name="STRIPE_SK").value + logger.info('Successful loading of STRIPE_*_KEYs') +except Exception, e: + STRIPE_PK = 'pk_0AnIkNu4WRiJYzxMKgruiUwxzXP2T' + STRIPE_SK = 'sk_0AnIvBrnrJoFpfD3YmQBVZuTUAbjs' + +stripe.api_key = STRIPE_SK + +# if you create a Customer object, then you'll be able to charge multiple times. You can create a customer with a token. + +# https://stripe.com/docs/tutorials/charges + +def create_customer (card=None, description=None, email=None, account_balance=None, plan=None, trial_end=None): + """card is a dictionary or a token""" + # https://stripe.com/docs/api?lang=python#create_customer + + customer = stripe.Customer.create( + card=card, + description=description, + email=email, + account_balance=account_balance, + plan=plan, + trial_end=trial_end + ) + + # customer.id is useful to save in db + return customer + +# if customer.id doesn't exist, create one and then charge the customer +# we probably should ask our users whether they are ok with our creating a customer id account -- or ask for credit +# card info each time.... + +def create_charge(amount, currency="usd", customer=None, card=None, description=None ): +# https://stripe.com/docs/api?lang=python#create_charge +# customer or card required but not both +# charge the Customer instead of the card +# amount in cents + charge = stripe.Charge.create( + amount=int(100*amount), # in cents + currency=currency, + customer=customer.id, + description=description + ) + + return charge + +def refund_charge(id): + # https://stripe.com/docs/api?lang=python#refund_charge + ch = stripe.Charge.retrieve(id) + ch.refund() + return ch + +def list_all_charges(count=None, offset=None, customer=None): + # https://stripe.com/docs/api?lang=python#list_charges + return stripe.Charge.all(count=count, offset=offset, customer=customer) + +# key entities: Charge, Customer, Token, Event +# IPNs/webhooks: https://stripe.com/docs/webhooks + +# charge object: https://stripe.com/docs/api?lang=python#charge_object +# need to study to figure out db schema + +# all events +# https://stripe.com/docs/api?lang=python#list_events diff --git a/payment/templates/stripe.html b/payment/templates/stripe.html index 8cc5dd01..949150bc 100644 --- a/payment/templates/stripe.html +++ b/payment/templates/stripe.html @@ -12,7 +12,7 @@ + + +{% endblock %} + diff --git a/payment/urls.py b/payment/urls.py index 818c8058..fc7dbbdd 100644 --- a/payment/urls.py +++ b/payment/urls.py @@ -1,6 +1,6 @@ from django.conf.urls.defaults import * from django.conf import settings -from regluit.payment.views import StripeView +from regluit.payment.views import StripeView, BalancedView urlpatterns = patterns( "regluit.payment.views", @@ -30,6 +30,7 @@ if settings.DEBUG: url(r"^testrefund", "testRefund"), url(r"^testmodify", "testModify"), url(r"^stripe/test", StripeView.as_view()), + url(r"^balanced/test", BalancedView.as_view()), ) \ No newline at end of file diff --git a/payment/views.py b/payment/views.py index b1017140..0c3d9425 100644 --- a/payment/views.py +++ b/payment/views.py @@ -4,7 +4,9 @@ from regluit.payment.models import Transaction from regluit.core.models import Campaign, Wishlist from regluit.payment.stripelib import STRIPE_PK -from regluit.payment.forms import StripePledgeForm +from regluit.payment.balancedlib import MARKETPLACE_URI + +from regluit.payment.forms import StripePledgeForm, BalancedPledgeForm from django.conf import settings from django.core.urlresolvers import reverse @@ -347,6 +349,24 @@ class StripeView(FormView): # e.g., tok_0C0k4jG5B2Oxox # return HttpResponse("stripeToken: {0}".format(stripeToken)) + +class BalancedView(FormView): + template_name="balanced.html" + form_class = BalancedPledgeForm + + def get_context_data(self, **kwargs): + context = super(BalancedView, self).get_context_data(**kwargs) + + context.update({ + 'MARKETPLACE_URI':MARKETPLACE_URI + }) + return context + + def form_valid(self, form): + + card_uri = form.cleaned_data["card_uri"] + return HttpResponse("card_uri: {0}".format(card_uri)) + \ No newline at end of file diff --git a/requirements.pip b/requirements.pip index 4570e060..7b45fcf0 100644 --- a/requirements.pip +++ b/requirements.pip @@ -28,3 +28,5 @@ pycrypto django-maintenancemode django-smtp-ssl django-ckeditor +stripe +balanced \ No newline at end of file From 214bc4b9e51a6f70f3f9d5430668eb7b7a115de1 Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Mon, 20 Aug 2012 15:19:27 -0700 Subject: [PATCH 004/107] A pass to get a charge iframe show up for wepay --- payment/forms.py | 5 ++++- payment/templates/wepay.html | 24 +++++++++++++++++++++++ payment/urls.py | 3 ++- payment/views.py | 22 ++++++++++++++++++++- payment/wepaylib.py | 37 ++++++++++++++++++++++++++++++++++++ requirements.pip | 3 ++- 6 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 payment/templates/wepay.html create mode 100644 payment/wepaylib.py diff --git a/payment/forms.py b/payment/forms.py index 571258fd..cb474b5e 100644 --- a/payment/forms.py +++ b/payment/forms.py @@ -7,4 +7,7 @@ class StripePledgeForm(forms.Form): stripeToken = forms.CharField(required=False, widget=forms.HiddenInput()) class BalancedPledgeForm(forms.Form): - card_uri = forms.CharField(required=False, widget=forms.HiddenInput()) \ No newline at end of file + card_uri = forms.CharField(required=False, widget=forms.HiddenInput()) + +class WepayPledgeForm(forms.Form): + pass \ No newline at end of file diff --git a/payment/templates/wepay.html b/payment/templates/wepay.html new file mode 100644 index 00000000..67e73871 --- /dev/null +++ b/payment/templates/wepay.html @@ -0,0 +1,24 @@ +{% extends "basepledge.html" %} +{% load humanize %} + +{% block title %}WePay{% endblock %} + +{% block extra_extra_head %} + + + +{% endblock %} + +{% block doccontent %} + +
+ + + + + + +{% endblock %} + diff --git a/payment/urls.py b/payment/urls.py index fc7dbbdd..7b32df85 100644 --- a/payment/urls.py +++ b/payment/urls.py @@ -1,6 +1,6 @@ from django.conf.urls.defaults import * from django.conf import settings -from regluit.payment.views import StripeView, BalancedView +from regluit.payment.views import StripeView, BalancedView, WepayView urlpatterns = patterns( "regluit.payment.views", @@ -31,6 +31,7 @@ if settings.DEBUG: url(r"^testmodify", "testModify"), url(r"^stripe/test", StripeView.as_view()), url(r"^balanced/test", BalancedView.as_view()), + url(r"^wepay/test", WepayView.as_view()), ) \ No newline at end of file diff --git a/payment/views.py b/payment/views.py index 0c3d9425..ac9d49be 100644 --- a/payment/views.py +++ b/payment/views.py @@ -5,8 +5,9 @@ from regluit.core.models import Campaign, Wishlist from regluit.payment.stripelib import STRIPE_PK from regluit.payment.balancedlib import MARKETPLACE_URI +from regluit.payment import wepaylib -from regluit.payment.forms import StripePledgeForm, BalancedPledgeForm +from regluit.payment.forms import StripePledgeForm, BalancedPledgeForm, WepayPledgeForm from django.conf import settings from django.core.urlresolvers import reverse @@ -367,6 +368,25 @@ class BalancedView(FormView): card_uri = form.cleaned_data["card_uri"] return HttpResponse("card_uri: {0}".format(card_uri)) + +class WepayView(FormView): + template_name="wepay.html" + form_class = WepayPledgeForm + + def get_context_data(self, **kwargs): + + context = super(WepayView, self).get_context_data(**kwargs) + + # compute a uri to embed in frame + # test payment of $10 + + r = wepaylib.create_checkout(10.00, "test charge of 10.00", mode='iframe') + + context.update({ + 'checkout_uri':r['checkout_uri'] + }) + return context + \ No newline at end of file diff --git a/payment/wepaylib.py b/payment/wepaylib.py new file mode 100644 index 00000000..bc4ae8e2 --- /dev/null +++ b/payment/wepaylib.py @@ -0,0 +1,37 @@ +from wepay import WePay + +# should load the keys for WePay from db -- but for now just hardcode here + +try: + from regluit.core.models import Key + WEPAY_ACCESS_TOKEN = Key.objects.get(name="WEPAY_ACCESS_TOKEN").value + WEPAY_CLIENT_SECRET = Key.objects.get(name="WEPAY_CLIENT_SECRET").value + WEPAY_ACCOUNT_ID = Key.objects.get(name="WEPAY_ACCOUNT_ID").value + logger.info('Successful loading of WEPAY_*_KEYs') +except Exception, e: + WEPAY_ACCESS_TOKEN = 'a680cfd2b814ef0e4938b865c96879136a74970ad6c9425e8c98de50b40007af' + WEPAY_CLIENT_SECRET= 'f9bf05cd50' + WEPAY_ACCOUNT_ID = 1226963 + +# set production to True for live environments +PRODUCTION = False +wepay = WePay(PRODUCTION, WEPAY_ACCESS_TOKEN) + +# collect credit card and do a delay charge to gluejar -- then to LR.... + +# Then, you can charge customers on their behalf. It?s just like charging a customer normally, except you should use their access_token and account_id instead of your own. + +def create_checkout(amount, description, account_id=WEPAY_ACCOUNT_ID, mode="iframe", type='GOODS'): + + # type: one of GOODS, SERVICE, PERSONAL, or DONATION + # create the checkout + response = wepay.call('/checkout/create', { + 'account_id': WEPAY_ACCOUNT_ID, + 'amount': amount, + 'short_description': description, + 'type': type, + 'mode': mode + }) + + # display the response + return response diff --git a/requirements.pip b/requirements.pip index 7b45fcf0..b817c5c7 100644 --- a/requirements.pip +++ b/requirements.pip @@ -29,4 +29,5 @@ django-maintenancemode django-smtp-ssl django-ckeditor stripe -balanced \ No newline at end of file +balanced +git+ssh://git@github.com/wepay/Python-SDK.git \ No newline at end of file From 599d333e34dee5e986fe428b71149b2c5a81a0d1 Mon Sep 17 00:00:00 2001 From: eric Date: Wed, 22 Aug 2012 14:38:28 -0400 Subject: [PATCH 005/107] typo --- frontend/templates/press.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/templates/press.html b/frontend/templates/press.html index 52269827..9d936c9b 100644 --- a/frontend/templates/press.html +++ b/frontend/templates/press.html @@ -105,7 +105,7 @@ Creative Commons offers a variety of other licenses, many of them with even less Die Zeit - July 9, 2012
- Unglue.it Wants to Make a Creative Commons for Ebooks
+ Unglue.it Wants to Make a Creative Commons for Ebooks
Mashable - June 14, 2012
From aa3667d260f29a219b8ba6ada19cf9830dfaecc3 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Thu, 23 Aug 2012 13:38:48 -0400 Subject: [PATCH 006/107] working on download page --- frontend/templates/work.html | 12 +++++++++++- frontend/views.py | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/frontend/templates/work.html b/frontend/templates/work.html index 6d4157d4..74e4a69a 100644 --- a/frontend/templates/work.html +++ b/frontend/templates/work.html @@ -134,6 +134,16 @@ $j(document).ready(function(){ {% else %}
{% endif %} + {% else %} + {% if status == 'SUCCESSFUL' %} +
+ {% if unglued_ebook %} + Download + {% else %} + Coming soon! + {% endif %} +
+ {% endif %} {% endif %}
@@ -415,7 +425,7 @@ $j(document).ready(function(){ {% if premium.limit == 0 or premium.limit > premium.premium_count %}
  • - ${{ premium.amount|floatformat:0|intcomma }}{% if pledged.0.premium == premium %}
    Pledged!
    {% endif %} + {% if premium.amount %}${{ premium.amount|floatformat:0|intcomma }}{% else %}Any amount{% endif %}{% if pledged.0.premium == premium %}
    Pledged!
    {% endif %} {{ premium.description }} {% ifnotequal premium.limit 0 %}
    Only {{ premium.premium_remaining }} remaining! {% endifnotequal %}
    • diff --git a/frontend/views.py b/frontend/views.py index 26bdab25..9c05f41c 100755 --- a/frontend/views.py +++ b/frontend/views.py @@ -166,6 +166,8 @@ def work(request, work_id, action='display'): countdown = "in %s minutes" % str(time_remaining.seconds/60 + 1) else: countdown = "right now" + elif work.last_campaign_status() == 'SUCCESSFUL': + unglued_ebook = work.ebooks().filter(unglued=True) if action == 'preview': work.last_campaign_status = 'ACTIVE' From 228029e8e5376c9a436c90a49c0b02d2b149159d Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Thu, 23 Aug 2012 11:08:14 -0700 Subject: [PATCH 007/107] add sysadmin/__init__.py --- sysadmin/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 sysadmin/__init__.py diff --git a/sysadmin/__init__.py b/sysadmin/__init__.py new file mode 100644 index 00000000..e69de29b From 9c602cf5306d2f58278c09043bfc94af43795701 Mon Sep 17 00:00:00 2001 From: eric Date: Thu, 23 Aug 2012 18:24:52 -0400 Subject: [PATCH 008/107] typo --- frontend/templates/press.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/templates/press.html b/frontend/templates/press.html index 52269827..9d936c9b 100644 --- a/frontend/templates/press.html +++ b/frontend/templates/press.html @@ -105,7 +105,7 @@ Creative Commons offers a variety of other licenses, many of them with even less Die Zeit - July 9, 2012
    From 4643bf4ac5609ab7e967c749f60a95ffb1b3081d Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Fri, 24 Aug 2012 15:13:29 -0400 Subject: [PATCH 009/107] tweak to be compatible with download page --- static/js/wishlist.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/static/js/wishlist.js b/static/js/wishlist.js index 47435eb6..541a5c8c 100644 --- a/static/js/wishlist.js +++ b/static/js/wishlist.js @@ -4,7 +4,7 @@ $j().ready(function() { // only do the lookup once, then cache it var contentblock = $j('#content-block'); - contentblock.on("click", "div.add-wishlist", function () { + contentblock.on("click", ".add-wishlist", function () { var span = $j(this).find("span"); var id_val = span.attr('id').substring(1); var id_type = span.attr('class'); @@ -25,6 +25,11 @@ $j().ready(function() { else { span.html('a type error occurred'); } + + // prevent perversities on download page + if ($j(this).is("a")) { + $j(this).removeClass("add-wishlist").addClass("success"); + } }); contentblock.on("click", "div.remove-wishlist", function() { From 07a50bfa45636b44547440339768e026743235e1 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Fri, 24 Aug 2012 15:14:08 -0400 Subject: [PATCH 010/107] we should have non-input-buttons that are styled the same for calls to action --- static/css/sitewide.css | 12 +++++++++--- static/less/sitewide.less | 8 ++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/static/css/sitewide.css b/static/css/sitewide.css index 50814df8..70da2be2 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -215,17 +215,22 @@ img { border: none; } input, -textarea { +textarea, +a.fakeinput { border: 2px solid #d6dde0; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; } input:focus, -textarea:focus { +textarea:focus, +a.fakeinput:focus { border: 2px solid #8dc63f; outline: none; } +a.fakeinput:hover { + text-decoration: none; +} .js-search input { -moz-border-radius: 0; -webkit-border-radius: 0; @@ -259,7 +264,8 @@ h3.jsmod-title span { padding: 26px 40px 27px 20px; display: block; } -input[type="submit"] { +input[type="submit"], +a.fakeinput { background: #8dc63f; color: white; font-weight: bold; diff --git a/static/less/sitewide.less b/static/less/sitewide.less index b549dd25..804252a0 100644 --- a/static/less/sitewide.less +++ b/static/less/sitewide.less @@ -122,7 +122,7 @@ img { border:none; } -input, textarea { +input, textarea, a.fakeinput { border: 2px solid @blue-grey; .one-border-radius(5px); @@ -132,6 +132,10 @@ input, textarea { } } +a.fakeinput:hover { + text-decoration: none; +} + .js-search input { .one-border-radius(0); } @@ -170,7 +174,7 @@ h3 { } } -input[type="submit"] { +input[type="submit"], a.fakeinput { background: @call-to-action; color: white; font-weight: bold; From a6e034a36a891c09b06b4743e9ee4f2e507c1564 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Fri, 24 Aug 2012 15:14:32 -0400 Subject: [PATCH 011/107] rudimentary download page plus logic to serve it --- frontend/templates/download.html | 53 +++++++++++++ frontend/templates/work.html | 42 +---------- frontend/urls.py | 1 + frontend/views.py | 70 ++++++++++++----- static/css/download.css | 124 +++++++++++++++++++++++++++++++ static/less/download.less | 38 ++++++++++ 6 files changed, 270 insertions(+), 58 deletions(-) create mode 100644 frontend/templates/download.html create mode 100644 static/css/download.css create mode 100644 static/less/download.less diff --git a/frontend/templates/download.html b/frontend/templates/download.html new file mode 100644 index 00000000..09b4634e --- /dev/null +++ b/frontend/templates/download.html @@ -0,0 +1,53 @@ +{% extends "base.html" %} + +{% with work.title as title %} +{% block title %} +— Downloads for {{ work.title }} +{% endblock %} + +{% block extra_css %} + +{% endblock %} + +{% block extra_js %} + +{% endblock %} + +{% block content %} +
    +

    Downloads for {{ work.title }}

    +{% if unglued_ebook %} +
    +

    Get the unglued edition!

    +
    + + {{ unglued_ebook.format }} +
    +
    +{% endif %} +{% if other_ebooks %} + {% if unglued_ebook %}

    Freely available editions

    {% endif %} + {% comment %} + the header is only necessary if we have an unglued edition we're distinguishing + non-unglued editions from + {% endcomment %} + {% for edition in other_ebooks %} +
    + {% with edition.url as url %} + + {{ edition.format }} + {% endwith %} +
    + {% endfor %} +{% endif %} +{% if unglued_ebook or other_ebooks %} +blah blah download instructions +{% else %} +

    There are no freely available downloads of {{ work.title }} right now. {% if not work in request.user.wishlist.works.all %}Would you like there to be? Add this book to your wishlist.{% else %}Ask your friends to add it to their wishlists!{% endif %}

    + +

    If you know of a Creative-Commons-licensed or US public domain edition of this book, you can add it through the Rights tab of the book page.

    +{% endif %} +
    +{% endblock %} + +{% endwith %} \ No newline at end of file diff --git a/frontend/templates/work.html b/frontend/templates/work.html index 74e4a69a..1a4d3ca4 100644 --- a/frontend/templates/work.html +++ b/frontend/templates/work.html @@ -28,16 +28,6 @@ $j(document).ready(function(){ $j(this).next().toggle(); }); }); -$j(document).ready(function(){ - $j('.show_more_ebooks').click(function(){ - if ($j(this).html() == '
    hide downloads') { - $j(this).html('
    more downloads...') - } else { - $j(this).html('
    hide downloads') - } - $j(this).next().toggle(); - }); -}); $j(document).ready(function(){ var img = $j('#book-detail-img'); var googimg = $j('#find-google img'); @@ -135,42 +125,14 @@ $j(document).ready(function(){
    {% endif %} {% else %} - {% if status == 'SUCCESSFUL' %} + {% if work.first_ebook %}
    - {% if unglued_ebook %} - Download - {% else %} - Coming soon! - {% endif %} + Download
    {% endif %} {% endif %}
    - {% if work.first_ebook %} -
    - - - {% for ebook in work.ebooks %} - {% if forloop.first %} - - {% endif %} - {% if forloop.counter == 2 %} - -
    More downloads...     - - {% endif %} - {% if not forloop.first %} -
    - {% endif %} - {{ ebook.format }} at {{ebook.provider}}{{ebook.rights}} - {% if forloop.last %} -     - {% endif %} - {% endfor %} -     -
    - {% endif %}
    diff --git a/frontend/urls.py b/frontend/urls.py index d3963b86..9f473423 100644 --- a/frontend/urls.py +++ b/frontend/urls.py @@ -44,6 +44,7 @@ urlpatterns = patterns( url(r"^work/(?P\d+)/preview/$", "work", {'action': 'preview'}, name="work_preview"), url(r"^work/(?P\d+)/acks/$", "work", {'action': 'acks'}, name="work_acks"), url(r"^work/(?P\d+)/lockss/$", "lockss", name="lockss"), + url(r"^work/(?P\d+)/download/$", "download", name="download"), url(r"^work/\d+/acks/images/(?P[\w\.]*)$", "static_redirect_view",{'dir': 'images'}), url(r"^work/(?P\d+)/librarything/$", "work_librarything", name="work_librarything"), url(r"^work/(?P\d+)/goodreads/$", "work_goodreads", name="work_goodreads"), diff --git a/frontend/views.py b/frontend/views.py index 9c05f41c..05215519 100755 --- a/frontend/views.py +++ b/frontend/views.py @@ -94,6 +94,16 @@ def next(request): return response else: return HttpResponseRedirect('/') + +def safe_get_work(work_id): + try: + work = models.Work.objects.get(id = work_id) + except models.Work.DoesNotExist: + try: + work = models.WasWork.objects.get(was = work_id).work + except models.WasWork.DoesNotExist: + raise Http404 + return work def home(request, landing=False): if request.user.is_authenticated() and landing == False: @@ -116,15 +126,10 @@ def acks(request, work): def work(request, work_id, action='display'): - try: - work = models.Work.objects.get(id = work_id) - except models.Work.DoesNotExist: - try: - work = models.WasWork.objects.get(was = work_id).work - except models.WasWork.DoesNotExist: - raise Http404 + work = safe_get_work(work_id) if action == "acks": return acks( request, work) + if request.method == 'POST' and not request.user.is_anonymous(): activetab = '4' else: @@ -135,6 +140,8 @@ def work(request, work_id, action='display'): activetab = '1'; except: activetab = '1'; + + context = {} campaign = work.last_campaign() if campaign and campaign.edition: editions = [campaign.edition] @@ -146,6 +153,12 @@ def work(request, work_id, action='display'): pledged = None countdown = "" + + try: + assert not (work.last_campaign_status() == 'ACTIVE' and work.first_ebook()) + except: + logger.warning("Campaign running for %w when ebooks are already available: why?" % work.title ) + if work.last_campaign_status() == 'ACTIVE': from math import ceil time_remaining = campaign.deadline - now() @@ -166,8 +179,8 @@ def work(request, work_id, action='display'): countdown = "in %s minutes" % str(time_remaining.seconds/60 + 1) else: countdown = "right now" - elif work.last_campaign_status() == 'SUCCESSFUL': - unglued_ebook = work.ebooks().filter(unglued=True) + context.update({ 'countdown': countdown }) + if action == 'preview': work.last_campaign_status = 'ACTIVE' @@ -175,6 +188,7 @@ def work(request, work_id, action='display'): pubdate = work.publication_date[:4] except IndexError: pubdate = 'unknown' + if not request.user.is_anonymous(): claimform = UserClaimForm( request.user, data={'claim-work':work.pk, 'claim-user': request.user.id}, prefix = 'claim') for edition in editions: @@ -193,6 +207,7 @@ def work(request, work_id, action='display'): edition.ebook_form = EbookForm( instance= models.Ebook(user = request.user, edition = edition, provider = 'x' ), prefix = 'ebook_%d'%edition.id) else: claimform = None + if campaign: # pull up premiums explicitly tied to the campaign or generic premiums premiums = campaign.effective_premiums() @@ -232,7 +247,6 @@ def work(request, work_id, action='display'): 'alert': alert, 'claimstatus': claimstatus, 'rights_holder_name': rights_holder_name, - 'countdown': countdown, }) def new_edition(request, work_id, edition_id, by=None): @@ -2030,14 +2044,34 @@ def campaign_archive_js(request): return response def lockss(request, work_id): - try: - work = models.Work.objects.get(id = work_id) - except models.Work.DoesNotExist: - try: - work = models.WasWork.objects.get(was = work_id).work - except models.WasWork.DoesNotExist: - raise Http404 + work = safe_get_work(work_id) ebook = work.ebooks().filter(unglued=True)[0] authors = list(models.Author.objects.filter(editions__work=work).all()) - return render(request, "lockss.html", {'work':work, 'ebook':ebook, 'authors':authors}) \ No newline at end of file + return render(request, "lockss.html", {'work':work, 'ebook':ebook, 'authors':authors}) + +def download(request, work_id): + context = {} + work = safe_get_work(work_id) + context.update({'work': work}) + + unglued_ebook = work.ebooks().filter(unglued=True) + other_ebooks = work.ebooks().filter(unglued=False) + + try: + ungluedcount = unglued_ebook.count() + assert (ungluedcount == 1 or ungluedcount == 0) + except: + logger.warning("There is more than one unglued edition for %w" % work.title) + + try: + unglued_ebook = unglued_ebook[0] + except: + pass + + context.update({ + 'unglued_ebook': unglued_ebook, + 'other_ebooks': other_ebooks + }) + + return render(request, "download.html", context) diff --git a/static/css/download.css b/static/css/download.css new file mode 100644 index 00000000..9bbc272e --- /dev/null +++ b/static/css/download.css @@ -0,0 +1,124 @@ +/* variables and mixins used in multiple less files go here */ +.header-text { + height: 36px; + line-height: 36px; + display: block; + text-decoration: none; + font-weight: bold; + font-size: 13px; + letter-spacing: -0.05em; +} +.panelborders { + border-width: 1px 0px; + border-style: solid none; + border-color: #FFFFFF; +} +.roundedspan { + border: 1px solid #d4d4d4; + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; + padding: 1px; + color: #fff; + margin: 0 8px 0 0; + display: inline-block; +} +.roundedspan > span { + padding: 7px 7px; + min-width: 15px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + text-align: center; + display: inline-block; +} +.roundedspan > span .hovertext { + display: none; +} +.roundedspan > span:hover .hovertext { + display: inline; +} +.mediaborder { + padding: 5px; + border: solid 5px #EDF3F4; +} +.google_signup_div { + padding: 14px 0; +} +.google_signup_div div { + height: 24px; + line-height: 24px; + float: left; + padding-left: 5px; +} +.google_signup_div img { + float: left; + height: 24px; + width: 24px; +} +.actionbuttons { + width: auto; + height: 36px; + line-height: 36px; + background: #8dc63f; + -moz-border-radius: 32px; + -webkit-border-radius: 32px; + border-radius: 32px; + color: white; + cursor: pointer; + font-size: 13px; + font-weight: bold; + padding: 0 15px; + border: none; + margin: 5px 0; +} +.errors { + -moz-border-radius: 16px 16px 0 0; + -webkit-border-radius: 16px 16px 0 0; + border-radius: 16px 16px 0 0; + border: solid #e35351 3px; + clear: both; + width: 90%; + height: auto; + line-height: 16px; + padding: 7px 0; + font-weight: bold; + font-size: 13px; + text-align: center; +} +.errors li { + list-style: none; + border: none; +} +.ebook_download { + margin-bottom: 15px; +} +.ebook_download a { + margin: auto 5px; + font-size: 15px; +} +.ebook_download img { + vertical-align: middle; +} +.unglued { + border: solid 2px #8dc63f; + margin-left: -2px; + padding: 5px; +} +.unglued h3 { + margin-top: 5px; +} +a.add-wishlist .on-wishlist, +a.success, +a.success:hover { + text-decoration: none; + color: #3d4e53; +} +a.success, +a.success:hover { + cursor: default; +} +.download_container { + width: 50%; + margin: auto; +} diff --git a/static/less/download.less b/static/less/download.less new file mode 100644 index 00000000..28ea8f65 --- /dev/null +++ b/static/less/download.less @@ -0,0 +1,38 @@ +@import "variables.less"; + +.ebook_download { + a { + margin: auto 5px; + font-size: @font-size-larger; + } + + img { + vertical-align: middle; + } + + margin-bottom: 15px; +} + +.unglued { + border: solid 2px @call-to-action; + margin-left: -2px; + padding: 5px; + + h3 { + margin-top: 5px; + } +} + +a.add-wishlist .on-wishlist, a.success, a.success:hover { + text-decoration: none; + color: @text-blue; +} + +a.success, a.success:hover { + cursor: default; +} + +.download_container { + width: 50%; + margin: auto; +} \ No newline at end of file From cc70ff1765110c7cc2f60cd10b5c504ff2d6b28e Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Fri, 24 Aug 2012 18:48:28 -0400 Subject: [PATCH 012/107] adding download instructions --- frontend/templates/download.html | 74 +++++++++++++++++++++++++++++-- static/css/download.css | 27 ++++++++--- static/css/sitewide.css | 12 +++++ static/images/aldiko_logo.png | Bin 0 -> 20895 bytes static/images/calibre_logo.png | Bin 0 -> 6508 bytes static/images/ibooks_logo.jpeg | Bin 0 -> 12721 bytes static/less/download.less | 31 ++++++++++--- static/less/sitewide.less | 16 +++++++ 8 files changed, 145 insertions(+), 15 deletions(-) create mode 100644 static/images/aldiko_logo.png create mode 100644 static/images/calibre_logo.png create mode 100644 static/images/ibooks_logo.jpeg diff --git a/frontend/templates/download.html b/frontend/templates/download.html index 09b4634e..5702fbef 100644 --- a/frontend/templates/download.html +++ b/frontend/templates/download.html @@ -18,10 +18,12 @@

    Downloads for {{ work.title }}

    {% if unglued_ebook %}
    -

    Get the unglued edition!

    +

    Read the unglued edition!

    - - {{ unglued_ebook.format }} + {% with unglued_ebook.url as url %} + + {{ unglued_ebook.format }} + {% endwith %}
    {% endif %} @@ -41,7 +43,71 @@ {% endfor %} {% endif %} {% if unglued_ebook or other_ebooks %} -blah blah download instructions +

    How to download

    +

    Ebooks you find at Unglue.it may be read on any device, and you're welcome to convert them to whatever electronic format is most useful to you. While we can't cover every possible combination of readers, software, and formats you might use, here's some help for the most common cases.

    + +

    Android devices

    + + +
      +
    • Download the free Aldiko app.
      • +
    • Download your book from this page using your device's web browser.
      • +
    • You can read HTML files right in the browser. You will be given the option of opening the file in Aldiko.
      • +
    + +

    iOS devices

    + +{% comment %}test{% endcomment %} +
      +
    • Download the free iBooks app from the App Store.
      • +
    • Download your book from this page using your device's web browser.
      • +
    • You can read HTML files right in the browser. For other formats, you will be given the option of opening the file in iBooks.
      • +
    + +

    PC, Mac, or Linux

    + + + +

    Non-Kindle ereaders

    +{% comment %}can we just use browser on web-connected device? try it +
      +
    • Download
      • +
    +{% endcomment %} +

    Kindles

    +

    Kindles can read plain text, MOBI, PDF, and HTML files. They cannot read epub books (the format unglued ebooks are released in). However, you can convert epubs to mobi files using free software.

    +
      +
    • Download the ebook to a laptop or desktop computer.
      • +
    • If necessary, convert the epub to a mobi file using Calibre (see above).
      • +
    • Plug the Kindle into your computer with a USB cable.
      • +
    • Using the Finder (Mac) or Windows Explorer (Windows), drag and drop the converted .mobi file into the Documents folder on your Kindle.
      • +
    • Eject the Kindle from the Finder or Explorer and disconnect the USB.
      • +
    • You may need to reboot your Kindle to see the new book.
      • +
    + +

    If you've set up a Kindle email account at Amazon, you can also email the .mobi file to your device as an attachment.

    + +

    Need help with something not listed here? Email us at support@gluejar.com.

    +{% comment %} +http://www.gutenberg.org/wiki/Gutenberg:MobileReader_Devices_How-To +http://www.feedbooks.com/help/devices + +android: aldiko +iOS: ibooks (built in? test handling on ipad) +desktop: calibre. + +reader apps? + +kindle: ??? "All free books on Feedbooks are available in a Kindle compatible format (for both Kindle devices and mobile applications), but due to the closed nature of the Kindle ecosystem, none of the files available on our store are compatible with the Kindle. + +To download a book in a Kindle compatible format, click on the book's name and then select the "Kindle" download option." sideloading: download to computer; attach Kindle with USB; add .mobi file to "documents" folder in Kindle. (convert epub to mobi using Calibre, which also has a send-to-Kindle function) + +i canNOT list all the possibilities. need to have a help email. +{% endcomment %} {% else %}

    There are no freely available downloads of {{ work.title }} right now. {% if not work in request.user.wishlist.works.all %}Would you like there to be? Add this book to your wishlist.{% else %}Ask your friends to add it to their wishlists!{% endif %}

    diff --git a/static/css/download.css b/static/css/download.css index 9bbc272e..aa5cb9d5 100644 --- a/static/css/download.css +++ b/static/css/download.css @@ -90,16 +90,31 @@ list-style: none; border: none; } +.download_container { + width: 50%; + margin: auto; +} .ebook_download { margin-bottom: 15px; } .ebook_download a { - margin: auto 5px; + margin: auto 5px auto 0; font-size: 15px; } .ebook_download img { vertical-align: middle; } +.logo { + font-size: 15px; +} +.logo img { + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; + height: 50px; + width: 50px; + margin-right: 5px; +} .unglued { border: solid 2px #8dc63f; margin-left: -2px; @@ -114,11 +129,13 @@ a.success:hover { text-decoration: none; color: #3d4e53; } +ul { + padding-left: 50px; +} +ul li { + margin-bottom: 4px; +} a.success, a.success:hover { cursor: default; } -.download_container { - width: 50%; - margin: auto; -} diff --git a/static/css/sitewide.css b/static/css/sitewide.css index 70da2be2..7c576261 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -211,6 +211,18 @@ a { a:hover { text-decoration: underline; } +h1 { + font-size: 22.5px; +} +h2 { + font-size: 18.75px; +} +h3 { + font-size: 17.549999999999997px; +} +h4 { + font-size: 15px; +} img { border: none; } diff --git a/static/images/aldiko_logo.png b/static/images/aldiko_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..abae63caa4d5c523811054a08506e2f86550126f GIT binary patch literal 20895 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
    qwCGJEX? zkVD`(#}gL*C!MineMp)FBxI8sZK0%^1}Cc(`i%+uHAwesxnqdl!F!WWPTxi%IQ-e+ zFC}j!!;o$mqAnaH-`U|+IApBA0YYpxL78$lXzq_D@xDuR1ZU9)YJ$%>N)i2Pp;@%3hN)&1kMEwD_*u(7M6C?CFS$DXZ46I9l8icrW z)ol_1LLfi$;WhP8n4!(dj7RJr$+5zzen)(T& zdBZBX{|=9@B|W~t$v~77-g@{>&4xRPN6;8KNi3+Aq-}?GetL;zD3THwfSKwR2|BfI z(p-LE?FOZ!M3{EtxafiUQc>epdK_mk$?CS_-h;Pr!85zOc!pJI3xy^yJp1`6&Oi7N zZ=5~C)yr2{7N@6CeEyYqv8r*3Dg8lfjNS7-7Y=~~3*(gJ$1o)8`|d|QhiMpzA_=Dk zl<1Wd+TYVcRBlK~6p9Kz=6uP^voBzt5bL*#E{O33QdgE^1+ zbbj#i8LR|NXWN7Z7ypg|MFG&XpsAu(#o_(~?1y`}_~Co#wtET119>Yl0vposvRe0CyyU(RCtS9=$n^IcyGv;#$T{yB8RO zKT?XileoF?1DQO|0JCFo=1Cp&3Z&(GtRUJ5YnlayvU{LeRDs&u@kGMqwus{%Bt%qO zwNO|}1D+vS=`%nH?0|qTK!dErx~zEp&DTKN@%X<_QMVHoS)luo3rVU2 zW{e=NpFhQe4;p^;(feq&V&80-xtTzuz+EiEZUYf+0tO^90O(zXHk|p!Ow2lVc!_Xn zs-6ePX)QdHkTiE#BYGqtBxxIozUMHkwl1%W&c(-cx_c=s!8{16p0)|-7^T0nl2gn& z=4X^C9|aGS0>aTdd2LNwm=<}wI~<6!GsAXsfgc|~1JJM@R@=6QLa_xY=BABi3)Zs( z_R|gO)sHy8{}6}s1=jL?OUIruLJI+~2sl{-vy{O0`UjCkMzti-smy8`)3PeRBm=O{ z4(rjOjc?Lz+a>)olYNX?bJBVmkf_{v2Z)|IPdWrRR}d^ir;;|&)M;@8HA3BBn0ek> zVAdvqJ&m5qU|I^Yblv~}2E|E4K~%j7Uj-tHx*c)4x&m21?6BH=;b3kpX}ODVKl_Sx zJs4%-c09pkgH{Xi&~OZA*ymC@l5l7PB>J*V?B@7j8Lnh3qB`d-Pn`^#kHn+pUI=}m zHTtKX^bc0?OLa zGue2s2&Bw}p}4jxpp?(L+rb&PNgcriQoMB6n}MxM{_~_)MOthI?)JEmI85TG-o5OcR>BkTs*JJ3Y5% z*qR-eU#{`;gSTN-E#%kD^OScMZgheu5c-mP>>#xnY#+#eYv%2)qvm|w+_aBsx}KoS zgidyAcsd}t8w-IlZdgu!C3fh0B0jY@q<}!toYYIV*3y>dIWn2z4Kxs##YsS~a-FeA zRGH50w~3K$E%KEldoJkZsXwuVO{8(iF3@Lave4a!4W{%f0Qz4>!>Q`Ua=qEptu`Fi zg$kn+I2Cnov13=Zs%X1c7B1k{VmvW=D-lof8rm_ku$yD|c^WH)CSpm7-w7s}#UoJmg)qnnUx&3hOtUNmH zy6-F2q4hS9AhoWXME62uS@hN^dR`D59yb$M6Rg*X>brq7A#0{S;G1z*;k_wRu$rhXScpA8aJoGSMM%N>f+H1yyatVo9f=F?LB+JDaA{ zGfUa2dv!2yL_lk<*KGKI3|tBb`TRLPTZH0p4$Ph^em~Cz-F@8Y%cHMqLs~yZEf%=y zJ~&mq<44d5h)IhVbHC66$htrZDcWp5Ho3mu+U?DzFK?@S_tWiX*Hyn+N`ZZMQ9pZd ze*5d+f4F{f+-tjgYUwji zZ{&vXf}eEuMl@gBLQ-u~&tS}?BV79bbz@K^-OySMIsBn(wZP2HO(~O2Vz*=&-eRT- z31p^A!bj;ZEh;+#jq!PN1n8W7Nt6#X8ei9XCf)0-Xax&Vb;r$V-%ri#1Ur2F{Q7T? zFX~?l(3aM40`T%*Pj5e6&uE87Z+`N&p0Vz_-^%WWY`a?BDx1N)kZ=WxOn5$C*&va~ zwUnMS3d8G+DWjO$0C6FQPQpmW@dK2&P3lp;Gt?NwDnu!r`Ae8$)bRt)x^{3Ng(>@d z%piRd(Pw5H-eHA0De7jUC>WDIj?!5}?E|CQWFPM>#R6x@J1nl->^+of&F@Qppwb9VL>Oi>3BWQpGi- zyZbDR<79KvCL@B^ANjAy(1*#})rIBM-O@!QY=Yw>mqAZ)Kb^RB5dmmwDnf}pfdUkB zAfK685jH8;1nCy(1`(t~V(IRXy#M}D97QdwX>gdc-Mg9Ki8&L2|;15l}M?L}MB_G2ZOigM#Z0Zp}FQJA@beWtY zDJdExIUk8uRG?BBZN*(dv1I-o~e%}^H>3nbXN^Q_o&HFv00ES){l?1wY4f^eS3lid4bgF2aVdM)TdA@l-lqf@L~U=R-7`@G(IT)AjmB25KCQfyS%EhDK4 zPmi(~L!^qNR#XFnsS3Xr0gZe~iZ2IYY*=9tp=J{YTn9HcQcb~CjE!>g?fjS66F=P|-*j32AaeX2z!04931z{857DYc5 zKL`uiOw4Q_fGMLT#z0;g)()m+?O+~GzEtHaR!L26_~;$so$H-+84G1|{`h8?)CSF; zy)`8$<>B*#UKo=l%Q|a!`aFjw>m;8b#~GN6znpcCrBzQzxz6Ogc#~+@k+c0%)2BEJ zZKrUZv}w+A%W^}<*oN|kJnuU1TJMjSx_hcLmGMpS*@VVy=G!%6kW4{*@ML}q!r&9{ zr+^XG5eZ6#nSuaK@-oP@d)ebOjUml~ZCyc~VV!QBy^XR1u15AYM7=O=0ygo%;Ut5D z-_xkau+Ca_G_{-ctyip9q8Du|xK*!J%Ijon@7(P?=KRN&)FwS=KE)*^I)xA=F_($f zXT4&sMXovu0!lc?ihfwyWg2?gEaw}&eeEn=Jt&?Bh6Xu)m-X&O)|PlioVjh7ZNS;6*i_lB*j_+wq57Y0yM@N~04oZ+~kS!d7~>~Er@zO%R$yg8{!)2W|I+Vcdw4td&%E2+`_tgIAj?(C zj=&)Ls%fKPkDxpinGg{WuMv+XqoACoxMZ7`Y+<>T zk9La|D3;O@5)o<;^yV8AtrT&wNjv*?RZ$hi9r3nTin)fgfRu=|zT&Umi7ANAk<^ex zvO&pSV>YY8nR1rxJBXZ>ravA?laNRp=N9|ab!j~-Xm8za_08JOfUh#Ra>qs4hbA!A zdXRGq+PB!BJ^&k7=s$|dj`fY^Ps-bF^WbjfCzmF7BHJc=Buir9V~J#KWZOtB`UpR> z@r!BCrAYf!`RTn*_;lEGib!_DPecx~qC$8~A3+PS8){#>B=dDSckwx5v8yrB{uw^N9psw~0HsjIBy^3|mi4 z{)+e&lN~xFJk0$o@F%N_x_*b(Q^`Z^cRJ&20v7yRtllM;<{1}d*B!T$Rm%?R=R|nq zVUII}4YCEHk2UO{>kxYUhN_7CQY&?@&ZACz+;fOJdbM~|bMH{@?FieOr&|Rb*zUOj)xcZai+f57-*#?4ncmCl4Ct?vdsR7o*Za1j3Gzh-Tb$-^bf>@C z$|}sdiE4>Do(-68nsb~>qaUChmw0H9Y3R6d9+*oY!Y6_d(I=fI#?ul>FHSkk%+D83 z>--@UC&(^MgwXx?mvA8dh4%w*&(R4#FX*V@%P%?uy?)-K8?Zdmyan^PNfy&L%E!i>Jr(ZKIZQ4p%64G^3L$S_2`|4*zWd|NpT&Xv zC-%#Ep*4Gqcb4nS<;q)0X>@asWjEFb(OW~AnsbvK?DBBB_}YQo=TA>lQD+aOo26Ui z-^dd_+I=i7T`qN#F@AJ;@ZZ1qw-=W8HMAaDfQWFeGa96UY*!( zcHI^@8+v_~y(xb2Hqw1-l`eSDZ|+{^@Ubsw8|N@8HYtGqhm3z{KudCa&FSl#h>QCj zSz;Ri0R0gG)qymB;654j)JLevNC*yOsm_$DC%OnP6pI;XL1*i|%L~&ybU0xu;P1W^ z2sOo>26b&0Pg4UeRlg7FiZYsEDJFV|p$u^@cGk@@wuhU&;ZN-RYFb7*Ffmrby;2&e zlH7K)uCfr>*r(UozOvNR)N+zSb6Kx$b_NtcVs2_=eX%rcVN~S-93zdXDqtxo5ngEd z;Pc~^lB^_HN<G$;C@RPRf#M?8>RehNI$eaC zzNR`nt4>u_>Ax1SmPf4#g{%}Z!Zg%nWk8x*a4mHukh;d%c(|$}h>(!bL>sbF4F$`A z1jT`}QsN4-Qi`%tU}Ys$1sP^$X1JQ7JWyC#luub+8YIR~MoRjI_O-gQqMDMNngU1* zs-&R|)>4P)Aym~AK^n^P+8WAQ8p@{nn%Yohn96@r30gM|g~%FeYnbRFw4llwD)I)J zP%RB5ZJ3HSR7n@EYNoFxB`&O^p`rwq78e%KH`LS9f~qRY$w^BenYICI&h#c@+&6g(O~cy8o&an$>?M0nu1* zRQ?lq9x8@!0RRH>{{-KfYXFh$TbqXvCcCnU( zu`hl9c5A8kaj{p^>G3-3(U|W~r_zlQBZm4tjp^exd8e9j%t{{pgXK%-!|S;n2XE2V z&RWmrA8*fh$9&=z?O$?Lv3xA|7)mz2C;Qn6+$4I`qc6rdf}=Yfj+kq9Ev?S`H&As| zTF6Z5>d4NXjAgcsMk%y;CS2`AO#yrkSDK@k_vIeLk$2bM-ZyJ=G!k7jaeoC@o!U6g z$Px}*60KiM@mVJXJk+ogd4lQ9bKMf3^5gukE8hF2I_h&7yY-^zlA2RFZ)sVgWVqft z7+h;x%c-Oi5NpqnDoA{l#VM-`h3FRzn|5*A2En!Th%s$?W}^e!jj_zzY41+IP+MXT zG3n5TW?A)R#&wU1Xat+~UkzIq67%@~91t4J!0ZUFcyCW|`RAR+%synCbqSU0Q$ljm z_c;kLeBRejGIVVaM~|T=&ac~Nvh21>XP%^_?-2)Pww2i z2i`byf*IV~u9^Xpcl#k;z67^HLKj?bNW^1bEM}_ZL0`*EcQbQyw?sdWA8~=I!uRM) zVT*rW4_ZLaG8|)LY5OSlD9D+7MDHHj^Q1?<;PBvO$uuj>-PL8>dB$h^i&k=Y9r4ON z`GtmtVq9K;uvWN6os6z8xg*1*jHkO8S5sS(Ph5aoD};iONFuD6gVAqR>z9HSEl~0P zst-DRN;_Z1ts~~Ieir@W(h$0$)*y&|Qyv8qOdqf`j8J4gbbRE+s-C@`!#6v1UporZ z#{s+Vot>SfgG|)J-us7x&Nm<@xI`xsfpbhO3Yj6vvnROBau9jNtbioh% z?57%Z&0Naz6ahuknE0<}Ub&haoL!xi;rrK%i&>4P=dD{ei&-NE*egB9$K&JJm8MHb zSsx!*rOa#A*HdVLib>YVGi?nP>uiD?w_g_}tPtuXJrar{FkEe)G~FNX<+>sfPzHqo zGK!*Tm#k3XxN5OkAMUhxxXsE@4p+u*Grg}MYS@~wzEPJ;`uNZwI3eePJ!Eo^CC<=+L#BK1xU+I<#0?z&S$y zi+TT*9Kox77I6OT3fyb6LMNO-LHdR+RU#c7K9?6a@7P|YsmRw2KL)NII z!~}WN=(@bS`SDS$|4~PQzWLaD!I@B^$`iHE#jLZ8b+Em$aRV0E{fypLoEa7sA%MX{ zr%n=1-gQjyQmQ(CHxDv|dtt^8J36G2{tCyki7Rf#eES(|=A8>q(tc6u3wT1SpT}A< z8}cPAG6w+slAg_(@56yd>Hq<77=$zvBv!h)Fe|YQ(**=(X}W8#`Zh_snXlDP);SDQ z;2$-0_IuJ|V0Z3*|FHBp`jhfd$_}3{k4(GkYC6vU)SE>ye{7ew&q3w!Z{ODw-C(+8U$*$P z8)wF~)S}yP$UF(ta@(rOPi`yG#}!@jI&a+99GZ*0CJMM?fJ8Su;W2Cs*>v@%eOKz8 zbP*$u>9$xqBRoxFUU8UrB7d1j&;ym{6w~!E)l^)zsEJEkMRKsri-~7%QN2ovY&0m7 zz$u$!80zkYzlUpK;v23K7;15~{`HR`fuuNzq0VlpYD8Zhn|Gc!o>f(`M({4T_>*YJ z4%6^RZxWD}CD|{Xo(P5CGrEr6KQeyS7yZ=1XwBa=M_m(=z0?qZI&MD@e(|C=IGGS=iugOksqY9L zkPOv=h>srvy(6yi%dDru_H6D8My;dd7ci#8K3B(ikSUm46+iITJZRHF$vm0CP-p=z z4U^jI0gBI!pN5j1hpFQH94|Q&YI~pS=Y;WdNk^VABM84D6BJ)&{kBpXGYk&@ZfiiArXvEC%W}J8f^UH*xbC*IlKD^ZX60-RhVuM|WKN`Y)NBYK<#etKxPm zv3=ej0QOs*sur^jPnNyhbPwCJWNf-)UY=RL3KEaq{@xbrdQ}S%C}y0 z@QvZ8J#1tBDW2Y|w#MVQ^kPS8!g(GoUCbBOR{bC1D+)v^&ZBJ&5_!j)6tZe9uH6;| zz^Z)nUuti09INr)#RYKrVJ8F~o%}_cIHNibZQm-rc(^|!s>fm-<}xd|aKA!PU5$#L zik$xq^@>B~EngoFqqYLIk!UL7%NW1;mol5E<(gI+&D-ag1=bLrBG};{z7O)_k~B3& zKd;RWB0NOy=(4A$7Pf?o#&BaKI5>D=-M<0D`9-ody!;FbKD2&|CI+cN*q_-(F#rv` z-^POQ4U*ErsV5p6kT_e!D`)eQspw9O-2g(KiZFz|T#vjqA0Ib^4W7z8t>EZ?zmZa3 zEW(TifYtyMLmyJKp&03xF|)@)mV&B7ry7)@yP9Uj(ou+|XDN1@NJX!MVgkZ1qt`Pi zNcw9cLIVD=nm2QO?hx=s{;3T@tm-BzI&b`B>Br9EUV&i|H6Nj4Dq~5hVYT%c4Klxn_UpR-D2Pig0F}x(>8AnDKt8^T|bH*sgb#MRlRR{}6ixgjHFDYBcTm zbb6!x=W9?mk3;kMq@XS3*|OnxyXtqXOh(hDDM`OI4{j$4u74+{K35>s8ytoHPbs}fP-yGuQXq^0U;qh#2RH!0*wocYQB6u6fF@Zb)%hF0e#U0@4rb6g&ptbu*_%D%9w-j?a5sly7zHQ}^{_Vg zgyLx^rm=Ikw}#>yD8{unH+BU8Skz~`o4KhK6thDys*5^A9Eybj01?&lAK2s{*v;Gv z>L&n*J34v0SX)}TQ81V?Qg8?e@KeZ`d)k@1xv{7io7x(?m{Ev3+B+FLcmu%SbAE0G zU_Wz90VSE2Lx7i;g_9LZ|G(3JTlnu<|2=qK+rMj^tNyiSApDX4*#6V@KQ_la0N}rb zaufF-o5?2tXbu5@7mNR~(c}OCMlb+0jsIgl_|JN=a&vPMWMlL6^klU*H)VY$^xx_K zSmEC_|7-A%@mQb7`!{zK66O}h?sjez&!n0<+Bv$rP`El7o0?Ow{O=)-@F16g&dBMyvql zI4%J5djx>RK>=X&v!ErQf3KSYk|yvRd0ONxiRTOsKn5@XT!0WD1E>K8fCbK7gV?37~XPE~pe#3u*;@2MvNI zKntKX&>rXvbO(k3qk?h4q+mKQ8<-y~29^h_gAKrzU}vxoI2im9oCeMVSAd(q-@(J+ z8SpCj0DK7pz@Wh3!%)Jo!0^L}!zjb(!dSq#!1%*N!lc0D!BoMt!SusS!K}g@!ra2b z!{WeFz_P#!!OFmDz?#B3!}`NU!=}TQz&645z)r!g!JfcA!lA*Dz%j!K!pXvE!&$<4 z!iB=6z!kwY!u7({ANyHt*dn8OG zS|mXvWh65sZ=_hH0;D#iailGzdt@wRdSnq~bz~dlAmlXUD&$_|CFFAy6cj2H0Tfjf zYm`8gG?W^Y0hBeATU2aRCRA}$eN=bUkEq3{-%uA&&(YA(=+IuH>7u!zeMBoo>qc8f zyFtf6XGNDqH$x9V&p>ZNpF}^xK*FHK5W_IU@WDvIsK*$`IK)K4q{9@)G{*GD%)o5L zoWs1t!olLeQpU2!ipDC#8pPVgM!=@Smc%y04#v*M?#AB0fx)515yvsb`G8Y^(~Gl( z3y({WD~oG`8--hmJBE9LhmFULr-|oR0AkQkR( zh}e`klDLj|kpxV_L;@jsN0Lu6LUKt;Mk-C}MEZ%eoAi(jpX@c64OtRdC)pl34!J0~ zHF*;GSMq%dJPI)iJBl=l9*Pr65=t3LcgkGKG0J-?dMXX7_f*wXzo?O^`Kc|alc>9> zPiV+#6lr{E%4rs9k!bm8t!Pte`)RM~=;^fR!swdmcIjWx%hLPMm(wpXpfS8+aAwG3 zm}Z1$^$st>;>#UIj}k8INo!#ah!27ahh^wa87ffaY=Cn zaJ6uqax-(Ab7yhS^Wg9(@`Ukp@%-WC<8|S!;@#t;;d{&XnQx9CmtTcHntwn5PT-9| zfIz#ztst+Un_!*bu@H-ptx%cJt}wl@xp0B-h6t62u}H4Sswjo%ThScR)mN0Sj9=xw zT7OOb+U#}F>m4yhF&nW8v7|sjR7NsqBdypPZjuk36cpntZzax&o7ei$a?sSW!+f zQE^F$R>?uBSs754RZdj?r9!Xbtnx(_UR6akLvjttFwAptY*artPOatV5(@t<$25psT4{qveXV_tcVPtGn{}%48*4whT55~&IdB&F}vL>HRPE5s3Q%w)dUYjME?U{?1 zCz$V8h*%_8>{^OgCR*-Uy|PNNI%FkN9K1%nnY<&scYLIL3g5xLGkw?POX(ZryXGh6m+KGmH}UTZpbiKQ*b0;mED1sm zvJD!2&;CB){ly2Z4{gDu!GXaWA<`k`q3EG5p>ttEVcFrZ;nv|}5nK_UA|4~nB8Q^b zqf(+CqD`ZRVmM;bVxB%)d>o7Ajm?UKk8_Bdjeiwil7N-qldzGfnAns=krbJ9k!+Ma zn8KZsor;|5p1PW*kk;~v=2P6Khjgp-nT$6X)t^Z|M|{4{G|QaKdYx63O`08*eV1dM zGoLG++muI_my!>k?~%V#FCkuWF!e_}qxo7}*4B@@_h5wrXB& z(P^1zm22&46KZSx!uqASow7Zn1Fs{t6S*_E^XaS4*UN8C-wwZ9e&6Ua>iXHO-96o- z+B4QG-#gGJ)z{rG*8g=tWT1UeaIkfVf2etwcerVUXQXkIXS8vQcdTigZ@lG)z>l^G z;fc=4SCikTB&PbNWv7Q{lx8MoHD>4M^ygOR&E|I(>=sTJJr?hO1}?!ZMgGG4m9k8- zoVUWbQoYK%+Oa0FHnOg^{&T~0<6zTu^ITtczAfI7z8iyabIBL;^97b0)m0IfrUeYgG0haLqWs+ ze@;)|04zkH8mNW=VF6$)5DXURsRtl|o@roV{&}o{1z_Od!3c=YrMj2^2nGxt86Fi0 z0Ratqm;phb04z9oN(5{UF&rvYV? z^G{A+(9qKJnl*4ss;Qg1x(6pF6?Csd`z8hfV3_AOu>T|&5EvE?9syeT3hE*V42DBM zf`|W?chHfsU@76SIh<>$IC;cWje~ITxVYnUzfYV{LtNh1t-<5c(2D21NjRl@S_Dv` zt-x3?SimdbsHZ&h*oeP%FFL4|%qLL9QwqcJG`BtC<3uQ0;9MrtOS8Dwx?ynSDW58a zbkKSCzlpf}Hd+lC6mY-CzUvC$?<7Z@O4_o|Thh2f8%#RW#drT+a=l&7lqhR47)`bO zJxM9PP54Xa7X5i>u103-_@Yi1-@I`9o7YMSq+j>aQ+11%{U`DGuV9L?Q`7>8e661V zx$4fO@|k9ld+il^ltaVsvmAsHD1%P*^SA`{2mnfJnJ7ke?0-yul%gs zEgf91!lz@dz#;;x%Bh}Lqn7TL{;pT)xYY9&J;ic3p8A5Ws^w(~zs+g!=6yE94n6T5 z?U9r0eZmAT*;Qk8BA0cP%4lx)t01;k4CNmxH;m2kY}}8_c!%e4+X^#aOqZ>d6gtbK zgJB)@AJR3{YK6ogaFw>`cfrH;>@@{Z=u}rcwwsy@A9E-5CUfPfDlM?X(2vurE92!Y zyf(7LG>DcG1}!)jt61J?s1g0pRn~T$%=GPdn))imN@Qq@na z+oP^{Ci{NGikSY3n_segN==pu(ZTrdJcYCzj|epedhxf4thZ>k99Po-jgeehU4oRY z{}LRZUWs7|^G7^}N%ze8i{uYF8X3wW)_a>&deR_RH1~4OP`V)!n@ouqMkHlb5fvc> zWLXv)?FgW7GLut`VzxJn;l_OMM&s^hSHGq9W-yGkpK(~IodWNXVyajjgq z3Tpj*_T;1MsN~su_&p_s^r%vBqRvpZB+p)^n6e1@8ziguapR{7F4-3f2>0^DCu9ok zovRDDgv(QYJ5~$f5su{f6ug7+CTln{GL~w3)`HRHnxsm^B$wUl)FIJ<>fup0f>TAv z0mZp9siChyFgeDzujpktCo*iNs88ES4s{jKsF%v5=3RTLLosV0g5#sRos}gckz(iD zI)h(6xXJi(#7CZHvD`PJ$uiPl+INO;L@<=h_1BpoWb-ODa$b7aWtSrJr7g{;Jcd}i zysqID(uVSn*0J2jMzKW|X`fz(5xTm67@8~V-4xde$sMP^no1lf*NK>U0y5ZURQ+Ym zT3`QeH7-3YD@C*7VLrg%5fL6ae!Kqp;N#|W^Uw)w9p@fvkXEOpPv1_f)f{~oa%6P^ z?i_<9sNd-~1z1L?TTRES-egh4(EfhEYxj!+C@fU7I1jLAxnB zWvhB#(r`CUy?mD#83ixJnD7t%WgGXX1G`ee2DX(-+%X1ex)|WAJ~wU3pTYQ|0H&PRng& z>XG&)ef+tMTxh&929d@_SHl{)H%6gwPO|HVVSW$-``VXCxPK}j^3ww z5%SV^Cd&uC?!p~sx$=8$?IgSJ?kjk$+7`lc)Q=)HLv_=W_(%aL?p!#=mDf`HPk`GT z8&-a8%}2M(ghS73v(W};ZEyK(`&*FlLL@p(Goi^F4NAm=euE$TFGbGq%+X1chi2<% zQj}{qM^id&-`XAlXYN0$m6dO%2e+~2f#jHPAA7BJs*__xJW<5g=+$~~6cps&upK8l z@VHYoQPOVnt8Ry9G8K$b%QzFO9YfFU*dn}z-MR&hZ!`QN^xrj5SJIm=>$0~K@UBjn2jY&3q)WLCijy01-AN>~ebC zogndzl}m{~*OC)NFGyuA(@PyqTaJslWxuKks%=*lAF?Dk{zFF6B|YwA^Mk#~-Kf?# z(!0+<#qg{OC2ngta-&afy>rv$^tG(vUgH1}I!XD6rd*8ol+s;Qzac>;|LA4;d$~B6 z0=T3VH>bw8rQDg-^R~fyTFqAQ45tb%IR3Tk+((U61$E@I77`&~=vxkqz2c3gpM7Y# zJxbSf$6C7>pJ-V-=|WazTXdRT(_!H;G2<|eQ6PB5T*KTW++m*~CHhYw>};AmGhrbP zBP(3D$6f46>Fg#B-mrwO>45XDv$1GsW-4vTp4uR@9P*6)0hrBUczSJ5a3)t)$dOct?gL5+)g`bnS_hjH4@fy99*S+(iLPu8ARL6F$WZkq} zmr1_eUa*nj%ajLCip2t}Kwu$+9f_%bomNa5<8#d?Mj&?dOO6pbO6|?e=4m>-+sKFc@0GU6WhKvSnLVo`Z{HyclPI>1iw1|(QVA7eNX5Mm)6wV{nsi5)8@k-EC`95{ z)Tt`+!Lyc>W8I6D>4|bB48j+>Nnxa<&-s8QG*;n}B`dRCh>2j&8zY!pR0{dnkPW#T z^sLpOC32q2sAD4xFlh;8mH0dpUM7S*x9H2*mGrZA?gDb(#V4KBk%jS^cDPsWxYn%Q zaPCO>j~~r#gT|NTmHCC+0A^!C$cv~CYqd4A0!3WL#J@IA>D%YZ3Z*g;_aTw;U#MdQ z6H6|Ojt1qNYE{5FXo!b|^N*fA>=mMFm@6J;%_x&ZtTeR9Yi+pv$If4wZpY8Y2@A?q zAWbfwjaPcxKCw(C#>T4Uo8jtTH_$luCs}JUg1Y|9?AZJk{4tLq_`P6Xtm#8Cl^*7e zJ=IWB!ViFMk0welhO&L4Xn|82u`LTGd9+i`kHEvMIsth%2tEEJ{B~5Qyol*GClr2P zZLFFkQl4FSIJz;_rIRsIaPgM~t|d)n)9?0zT%jJ6^T|pwh^+hjAuV%iVAIG)wChDGSw3og$ikE+FlU<#=k`eau`jBUf1O%ZR3S6{?tt#fJke>X zJk?YLuQS1SThHHY&SzY-F3w%+J3)=i4|KeViFr9~Ijk6-4B6({74Jj>L-+k=zIsb% zrUb`@*-E_9y{$z&lu zNNUdOP5HVo!h9*^A6S(|J|XV1YEr&O+mWDt`X&eNHF6*xU~QNGP%|{Al#O*KQ;ib1 zSN3JAmn;lxAM@nqGsjxq9{=N5=!cT)xqAI*oQrIO;y2X~{$J2rAzZbXVrk?oXYJe zPy0&5CzdRj?*>W)EhUarET6O%rvqn)>P@EQAndJtJG}^XpA+Z~2Z$??i+IH_> zlVk!4?Th-&b<)>2dS(vrdZ!FXjZW$d^Zi^>F0{|aS{;%8sAlJ+@BO$?S!#Jvb|>p- zmMp9SB^C^2iAarsfwWG3PUVU^7b>FQi9dWg{;Uia+R1-9$;fd+gt=qy0xWhK(f_>T z8Tj@Dq#iWvY7J{0)EpEt5AiHXKI)#Q&bzZDQW%hugvC2~I)ExBhZL6TBh5Oo_oS%t zc=s11;;Wf8+c17pHK#E%f3KrQ?bGZjWfActMz4T5PMj4~Z?=~EQynhHC!5zZwd-C} z@RC8_>HNohxrOFc)vFl`n?rtu{6C+H)OMu1BPoCT3!{-9`j_1*;!mBGvCY&Qe)MB} zCJcNj_m`sZ@9>%n8*l|BloIl?JUCirhp?4z-a8+D-IKD3x0UQOP+C%4F?=|Gp8c~% zAWbt5N!#xNrf2%cm?MhX1i!9XDogonvFz5G$GFVm+-1DdOy5`ei#(fW@-qKJo)8@a zY2ye<_k8T6q8BOoRPt9oTpxYN<1gjzb*I?S#MJ&Pd)H&qyDQto{3l@e^7>;ar7Kin zU(~*oSrKO>MV=!qE+gn^UY}A}jM{MDO7_1LYdXg1k1LeVrq)+;Tj#?d(jU>K)?}&6 ztGC^^!ys>KHqKsT!@;v!L_1<{I^5GFI2-e$mQ*NYIgXGy)Qe}D$|Ygtx7{mH%$rb% zTCCVYOWyvL>%?A4{q@`;TTZ{F>arJkX7T#OBH>EJg7*mG=(g*sZXnZqZZ}t4I@#h5 zWil=G!W}9-_bbf!N0nm+GAXxy zvFanKUxlv%US=*EXe^E7jSe3|k?S5&#rfyvI_%BLfq3kM(CPr+Z0(8}GI2`$1;WNK z>Gftl{U=});$JZv>3egmuM%44FHD#x5=)Pz>5Zf-54gT(3!gq#RU*&Yp)0P()JxH;@WE?Pa!~BM)KF_$}$= z_RsD2l^av*sjYL7w%>M-GOKS}@@Gu(8Vp_ypYqdp>->7KwV+Si^L_#pMqS(-Zy!5P zzv5S{UCw);e7scQnUTGWJad|FN1sk{?5S2z;VLA40tEfs8C^1txsBpUyKntYI0ho9 z#V1JxNT&=?*$QJL-nZTJUZV-n-2}&FI-FfT))tPs6n31_F(-U@jd4M#8_dA;>!F-x zYQT-O3Z;=p&-}Lj2|!MGRi|N9&^aqKhil=Oa4iZSeI*>b8AY^rqxHgngXh53t?8L~ z2@$EPoo|ODtWQ8}VeCCb>w(81f9m}74@1A|6JQ(p>n`TN<~l45uLPtU_*cfD=dHQj z?`rae5~q5Pu4U0Ozx)y3-A$`n^+Be=T+yWoSsDf|wp`Jz#D~E_AKlML78+;FHeR{^ zYL6EKxOR@e8CyOjT`hOJsr)zG&o!UfF|QtE2(Q z8|cE#gwsv9dSU{a%Y-<0HyRox_aV4rg@9_bMbp?({-$i z!!y~cWO7N;;h@py{os_gQVI88-9Y~|lgYYq+y4|4{y5t8n`>oZ9m`r!`WTe4b39&q+2QCXnJ+!$F?HRws zy4!(O>j+Ed38jI4!1tXy*_B}VZu+mVi||pSv@UA=8CEf*TGp~Bpiw?uu?cb}i!*^8 zs9M~)v0HKWejvv36KSI!TAIbwHxgFmnRI*p#RAVN2E|)8*VR$RL$9)12a3igfSKA4 z-gZ{Y=+|EaGX6!N;1j?u*YDCf?K}eERqs0mFI|2iQm_+oXeg*GC@5u8Cimr6<4EET zA*B>n!q4#D{OxW_!xW;xqEEvxo33M-S^ov?31A@c0OOY42E2$y;5$j36tyT5-YMGK z5j5I;M2+2K$MJ}fd;-jfL%dXtv60mn=SKylptsZ!p64$=oNKH-$VL<=`!KJN@iB{_ z!9Nc9l7lb9e#e4RQlhFDZ7Zd3Vv&Tr)z^*eVs(_{~7MCKFyXb(wW9sOC#uSSZuCz((2lVeMg^FoYaMWHo zW&6#$F}8Hn1Yun)Hs`7K^g)uEhfWG!$ zj_Y>Zq@`lROC7iOA3H?Q4CT(P-wnAw;(E!KF@`spvFTCqEWc{)*sn5ur0Siy;MTgA z4~Y@AEXI%(MYI<3=`Sus4oNv}?g}}Y#k?hFv{J96F4}js4#>Z$@p_3$&Xo5A)WIz1 zz38KD>{(B!8{-J>*Y~dKpmO8koRe9T3M~J`$J@;05Z1MUFRJ}nfoN9gXjaREUPiOK zohV<t}uhB#kJ7kXa zCFFRcmTpKoR>PVPi)#-nX`}sJ@|3SexlCj6^>TnoKx2}dqF}CUlHXUoR<$xrnYK}n z-gD8}snMzoyIAA*{!yJ^I$s@q5{X!+GonWSj!ApEUXOK2m0L%A0JtnP*0Fq9$H@_+ zy_7*m;3ty1Eoc>f5mu2K#gAusnj}!_Ekk1qO?sI;*_N zk!RDoPb~Uo=Fx@$ldc|KU_xQRTI#ZVOr1aB^^3y%lJ)hSpcKFC`}EV{_8KoSQ!I{G z2%on^af9U}k6zS;>F^;R&{(hd>q~mLCCg||G+HYD;{U>JHj%U?FEbe;X;DyT-i+Lz zv(^6L!)T8g9T#E{xrU9p4^0NBCu>d5kSc`$y=*o)K|UyKV7l5+eUJG|CtXcX(`c+c zXeVbAl}d^xxFpwASH*!VpqSD?#h-~U#@l)i)jx4__r|9CSfuk;RM+95G*ZZSq4h0q z5C32Oypr~#pOS?SD=xDqC#PB4`B-!Gt-mW*VEZ8{x;*^KKS^-yU*{>FO>tbmA?1ng z)r$Ox9g;u2JZ>Q$KA%}9Tu4*Jt6_2s#IZFtI()0QoJOtk3N%-eP@=s16& zT;-UVInb&*G-`}ndIC@mt5Y&i8@Yh*ahZJB_lm)HaQoFaQKZ5pYLQDBx5(!rh&vGb zV{1HNy#-(hi|uP>O-*htDvOdImg){Em#TRHVqq_?wlFN2{X4l%%EL%={3R{v&&d53 z9AqkGZFdfOv}~8GCA*i6Y~BNgIQP24#F`_Y1P&V+25oT4<-2p##NZrx)!s@w7h64u z*kG1#<=a-LnUr-E*D1l$kYrU45Sdgzy)k)_yeog4h zK`ACke|2x0OUfMc&gNa}z_^;UN>rWlqVV!w1kWMP|{M;ETuxB8;qF>!M z`RCI^fidbnr<+OOB3Chej+8^SKNa@D=*Th!Jf28}?f9N9V2CA*vvZcZEzTj7=4O*h z`Ksi0zrKI9jIAm6u=%i0t$RJ^am@eZkPq`Db7B3?{B5+QRSW~8Tz94gWGu*NltG|- z9rBBX(CCxu_v^F9Cq?xLzVgV3D9`W zLgoZlUWib@e$qfwu6F4C=bhmO-$kQEAVlQWjHVzudM+>-XL1-i0{!-WTSaBvW1kImU=5Cm(cGZIn(bm&ebOVpwa zYkZW$+LnGdcHAIWw5E8AQTJhVNPo}4K)z=BHe&&ymn(82@bD|$y4RWR7rWZ9Zpe$* zje%&~39m_4z4sb7VtTso+R8o);mgP3yRM#0(_X2#`c)sSs&Md=;dtN4&2eC!iL+X% za_V8F#5)YP9AiW>C*|kW{9aaaY`ePFc{diBCD^7LuWDq_3?H$om(C>@PtE;XC!}@FcRQzhHe09a=@J)JY-RHEq1_<4+ocOHUb}Rz+`c+F@K4GfM(u_fo!3iN z2DPhc!< z_|0@rLA{j-26(J^`J|HB_|tEoZxgo5PJhLZT2B9pa$1YAW78IcQIT7wb$7w#dKo zD%T8uBrku0h-#c6opZ7wIUOd{B2FWQo7|q31r-wb6X-Q9L|1G0yEL8@*R?NcJ1h%1 z6W46FhV$KZm^nFYbj$MF*qH6lgHe_`Xsut@>oy8g3@CO9{X9W3!syAO9tp*p zH5W5H&=W^^MT6hIx7;PkiudHiX1KOW2r4ytV74X6O4Gj7LO5M9Tcm1^y03eOcwjBDAFCbDe*s0xZZNZ~~`+@()x zFC#sUYbm%LvEQ>{S&Cv-b5zu5k7C$~CwmwM&911bwr;&6Dkq7@-DWsXL4?h8z_nva zCCSHYu&d5TcVzaAZJn#h(15)B_1gr`mN*^To!(n&`?^>X-wtljdRYu8TfcK&)6H#= z2X)u-;3GG7LiZfXUV4)W1gtYzk@QLJVmPO3OGo1>qmc01Jp+k8{B(pcX7`$;4Bfu6 z7|xh;dg6FbY*Cg+o7RL`F~)a!Zs^nc>J^11EbdMPgJ-X^OwzO7q-!DclOP8sphY5T z4XW}but>Um!|s?p#CgXXzkgqrN;GR(Zy<+@HY7Rvhj_(ZA|lv9Qqs@ywYh{tLQ=^= z$&{+R)$}C9ELuz4T2=O%kGC}ZQ+cRRcv8%SyS_^?qq(VIm=5N{Ow0OF<_{UNHZ48g zK1LcPF^`E1zS*4+ffw7Y3V!lJrF_$8xw%>+SeD*`%$}p_weRN9dT5g_SmNR`;$%A_ z_%0LG?1l|*>p1KwV`P^NLW}ROCl_nB=&87{GtF9Lrox3qaA^dYdT^sS=sYq#11W!u-N8goP6ie`zPnx3#9*BKQzy_$JV*0${CY;0g(Q%AKv~*; z^|fNNh!%`9#ys?Cw^U8kxoBNh&+^{NRhRu%glPuV*Ay~3Zo_A!eR z(~Q>@rqIcRcfd%Z^dOPc3;}7vAoB(GlqN<6Sg1FfDB~Scow3^OWiF#meom= z&qrr)8;nbfJ^^bQR&F>0?|aO{2qEfHzr$y9sTJf7s$m0Bf;4AWXM;m|QK#<5aaI)P zsdNIno#+UgQaV)ev-y*w*mH9i;dJNT82;D@C&zL%l4R_sI`u8^CcxxvrEr=pEfcA8 z{`}f4g5ayVPuc9q$Q2xu7aPsW2T#6|nJqm170jUUUj>)3B20T`tP3$4T*t83)vl)d zd8z~HIx@!mo%?vEJum?YdA*mCY}mXt1RJ&)zD!}*KjaU-#e_xC4pj2vis^!yvvtFW ziHJscO1CJ@N=}6LsY2uy2%$Q|nbip2wAsVeq+05MG^@)E^5Ge%K?bQ@NbdV>E1i&v z7}AOxL*AJPa=U+FGRNW_G5twa-L_GvN~Nm>A0Li+t9Y?honBe~$=nue@{~%hal^Da zuP`^BqE{im1Z!_wD>?!E#sMVKaDZxzRbb%D-SN7WLK^~J&~D`|oTqI_ zu^!#7T+qb4N^3idhckm-5XHQi*KrM{9&$n<_0nGn!6#V|Ad?UI1$UQiZXhwTEJi0^ zS-~i~Pn)OIz_2Z)sMqcs!8TxCjJfbjrL(}psHspg?l40!#)Q*MA$Soo6ewQ`n~Y{( zZEw)q5D}73pLVV&zw|ITQzNbI;eB5woYB-(CAaNDrF0s6ODd=wD)3=t1+vE;BlFXm zD4NytbrRzCpbFVTDsD~C4o(AbmX+F>q^^Qr>qg3|z!<7?Yf3*Y{0~4WSycc4 literal 0 HcmV?d00001 diff --git a/static/less/download.less b/static/less/download.less index 28ea8f65..247f5667 100644 --- a/static/less/download.less +++ b/static/less/download.less @@ -1,8 +1,13 @@ @import "variables.less"; +.download_container { + width: 50%; + margin: auto; +} + .ebook_download { a { - margin: auto 5px; + margin: auto 5px auto 0; font-size: @font-size-larger; } @@ -11,6 +16,18 @@ } margin-bottom: 15px; + +} + +.logo { + img { + .one-border-radius(7px); + height: 50px; + width: 50px; + margin-right: 5px; + } + + font-size: @font-size-larger; } .unglued { @@ -28,11 +45,13 @@ a.add-wishlist .on-wishlist, a.success, a.success:hover { color: @text-blue; } +ul { + padding-left: 50px; + + li { + margin-bottom: 4px; + } +} a.success, a.success:hover { cursor: default; -} - -.download_container { - width: 50%; - margin: auto; } \ No newline at end of file diff --git a/static/less/sitewide.less b/static/less/sitewide.less index 804252a0..ef36e47d 100644 --- a/static/less/sitewide.less +++ b/static/less/sitewide.less @@ -118,6 +118,22 @@ a { } } +h1 { + font-size: @font-size-larger*1.5; +} + +h2 { + font-size: @font-size-larger*1.25; +} + +h3 { + font-size: @font-size-larger*1.17; +} + +h4 { + font-size: @font-size-larger; +} + img { border:none; } From ec9c6d8fc039aed1dbdd7f1442e96d13bb0c7e24 Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Mon, 27 Aug 2012 07:49:43 -0700 Subject: [PATCH 013/107] add keys for partner non-profit in stripelib --- payment/manager.py | 3 +++ payment/stripelib.py | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/payment/manager.py b/payment/manager.py index 505c5f32..5a31ca9c 100644 --- a/payment/manager.py +++ b/payment/manager.py @@ -13,6 +13,9 @@ if settings.PAYMENT_PROCESSOR == 'paypal': elif settings.PAYMENT_PROCESSOR == 'amazon': from regluit.payment.amazon import Pay, Execute, Finish, Preapproval, ProcessIPN, CancelPreapproval, PaymentDetails, PreapprovalDetails, RefundPayment + + + import uuid import traceback from regluit.utils.localdatetime import now diff --git a/payment/stripelib.py b/payment/stripelib.py index 7428b1ce..1d386e0c 100644 --- a/payment/stripelib.py +++ b/payment/stripelib.py @@ -5,10 +5,14 @@ try: from regluit.core.models import Key STRIPE_PK = Key.objects.get(name="STRIPE_PK").value STRIPE_SK = Key.objects.get(name="STRIPE_SK").value + STRIPE_PARTNER_PK = Key.objects.get(name="STRIPE_PARTNER_PK").value + STRIPE_PARTNER_SK = Key.objects.get(name="STRIPE_PARTNER_SK").value logger.info('Successful loading of STRIPE_*_KEYs') except Exception, e: - STRIPE_PK = 'pk_0AnIkNu4WRiJYzxMKgruiUwxzXP2T' - STRIPE_SK = 'sk_0AnIvBrnrJoFpfD3YmQBVZuTUAbjs' + STRIPE_PK = 'pk_0EajXPn195ZdF7Gt7pCxsqRhNN5BF' + STRIPE_SK = 'sk_0EajIO4Dnh646KPIgLWGcO10f9qnH' + STRIPE_PARTNER_PK = None + STRIPE_PARTNER_SK = None stripe.api_key = STRIPE_SK From 307e0d41c74e4f4bba643b87c25b91d4831ac3a5 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Mon, 27 Aug 2012 14:13:50 -0400 Subject: [PATCH 014/107] completed first draft of download instructions --- frontend/templates/download.html | 33 ++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/frontend/templates/download.html b/frontend/templates/download.html index 5702fbef..f725cd83 100644 --- a/frontend/templates/download.html +++ b/frontend/templates/download.html @@ -52,8 +52,11 @@
    • Download the free Aldiko app.
    • Download your book from this page using your device's web browser.
      • -
    • You can read HTML files right in the browser. You will be given the option of opening the file in Aldiko.
      • +
    • You can read HTML files right in the browser. For other formats, you will be given the option of opening the file in Aldiko.
    +{% comment %} +this doesn't seem to work. i get only browser and IndieBound reader as options on my phone. perhaps I should recommend IBReader instead? +{% endcomment %}

    iOS devices

    @@ -74,23 +77,29 @@

    Non-Kindle ereaders

    {% comment %}can we just use browser on web-connected device? try it -
      -
    • Download
      • -
    + +should we just include general sideloading directions all here under ereaders and then have an extra note for Kindle? Should we recommend calibre for all? {% endcomment %} -

    Kindles

    -

    Kindles can read plain text, MOBI, PDF, and HTML files. They cannot read epub books (the format unglued ebooks are released in). However, you can convert epubs to mobi files using free software.

    • Download the ebook to a laptop or desktop computer.
      • -
    • If necessary, convert the epub to a mobi file using Calibre (see above).
      • -
    • Plug the Kindle into your computer with a USB cable.
      • -
    • Using the Finder (Mac) or Windows Explorer (Windows), drag and drop the converted .mobi file into the Documents folder on your Kindle.
      • -
    • Eject the Kindle from the Finder or Explorer and disconnect the USB.
      • -
    • You may need to reboot your Kindle to see the new book.
      • +
    • Plug the ereader into your computer with a USB cable.
      • +
    • Using the Finder (Mac) or Windows Explorer (Windows), drag and drop the ebook file into the Documents folder on your device. (It may also be called My Documents or My Stuff, depending on your ereader.)
      • +
    • Eject your device from the Finder or Explorer and disconnect the USB.
      • +
    • You may need to reboot your device to see the new book.
    -

    If you've set up a Kindle email account at Amazon, you can also email the .mobi file to your device as an attachment.

    +

    Kindles

    +

    Kindles can read plain text, MOBI, PDF, and HTML files. They cannot read epub books (the format unglued ebooks are released in). However, you can convert epubs to mobi files using free software.

    +
      +
    • Download the free Calibre app.
      • +
    • Download your book from this page using your device's web browser.
      • +
    • Open the ebook file in Calibre.
      • +
    • Convert the epub to a mobi file: select the file; click on "convert books"; and set the output format to mobi.
      • +
    • When the conversion is done, you can drag and drop the file to your device using the instructions for non-Kindle ereaders. You can also use the "Send to Device" button, if your device is plugged in.
      • +
    + +

    Need more help?

    Need help with something not listed here? Email us at support@gluejar.com.

    {% comment %} http://www.gutenberg.org/wiki/Gutenberg:MobileReader_Devices_How-To From a2586601384feec7c2e9f0a43ddbd24063feac3b Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Mon, 27 Aug 2012 15:26:40 -0400 Subject: [PATCH 015/107] moving to ajax system means these files should live in templates/ --- static/html/about_active.html | 15 --------------- static/html/about_active_empty.html | 15 --------------- static/html/about_main.html | 15 --------------- static/html/about_unglued.html | 15 --------------- static/html/about_unglued_empty.html | 15 --------------- static/html/about_wishlist.html | 15 --------------- static/html/about_wishlist_empty.html | 15 --------------- 7 files changed, 105 deletions(-) delete mode 100644 static/html/about_active.html delete mode 100644 static/html/about_active_empty.html delete mode 100644 static/html/about_main.html delete mode 100644 static/html/about_unglued.html delete mode 100644 static/html/about_unglued_empty.html delete mode 100644 static/html/about_wishlist.html delete mode 100644 static/html/about_wishlist_empty.html diff --git a/static/html/about_active.html b/static/html/about_active.html deleted file mode 100644 index 3557a8f4..00000000 --- a/static/html/about_active.html +++ /dev/null @@ -1,15 +0,0 @@ -

    - Do you have a book you love so much you'd like to give it to the world? These are the books that is helping to give to the world, right now. -

    -

    - wants everyone to be able to read these books -- for free, on their favorite devices, worldwide -- but also wants the book's creators to be paid. Traditionally, readers pay each time they buy a book. But what if it worked more like public radio? What if creators got enough money to cover their costs and make their efforts worthwhile, and then the book were free to all? That's what Unglue.it does. Creators decide what fee makes sense to them, and then, through campaigns at Unglue.it, people everywhere chip in -- people like . -

    -

    - These books have active campaigns running, right now. Ungluers like are pledging to unglue them, with no risk; their credit cards will only be charged if the campaign succeeds. And when that happens, these books will be free for you, and everyone else, to read and share. -

    -

    - What if your favorite book were on this list? -

    -

    - What if you could unglue it? -

    \ No newline at end of file diff --git a/static/html/about_active_empty.html b/static/html/about_active_empty.html deleted file mode 100644 index ffa0d1e0..00000000 --- a/static/html/about_active_empty.html +++ /dev/null @@ -1,15 +0,0 @@ -

    - Do you have a book you love so much you'd like to give it to the world? At Unglue.it, you can. -

    -

    - We want everyone to be able to read beloved books -- for free, on their favorite devices, worldwide. We also want the book creators to be paid. Traditionally, readers pay each time they buy a book. But what if it worked more like public radio? What if creators got enough money to cover their costs and make their efforts worthwhile, and then the book were free to all? That's what Unglue.it does. Creators decide what fee makes sense to them, and then, through campaigns at Unglue.it, people everywhere chip in -- people like you. -

    -

    - If 's favorite books had ungluing campaigns running right now, you'd see them here. Ungluers like could pledge to unglue them, with no risk; their credit cards are only be charged when campaigns succeed. And when that happens, the books become free for you, and everyone else, to read and share. -

    -

    - What if your favorite book were on this list? -

    -

    - What if you could unglue it? -

    \ No newline at end of file diff --git a/static/html/about_main.html b/static/html/about_main.html deleted file mode 100644 index c360f387..00000000 --- a/static/html/about_main.html +++ /dev/null @@ -1,15 +0,0 @@ -

    - What if you could give a book to everyone on earth? Get an ebook and read it on any device, in any format, forever? Give an ebook to your library, for them to share? Own DRM-free ebooks, legally? Read free ebooks, and know their creators had been fairly paid? -

    -

    - At Unglue.it, you can pledge toward creating ebooks that will be legally free, worldwide. These books have already been traditionally published, but they're stuck: legal restrictions keep you from being able to enjoy and share them. -

    -

    - Unglue.it gets them unstuck. Authors and publishers decide what amount lets them freely share their books with the world while still making a living. We raise that fee here through crowdfunding: people like you chipping in. When campaigns succeed, the rights holders get paid, and they issue a free electronic edition under a Creative Commons license. -

    -

    - What if you could give your favorite book to the world? -

    -

    - What if you could unglue it? -

    \ No newline at end of file diff --git a/static/html/about_unglued.html b/static/html/about_unglued.html deleted file mode 100644 index 1c5c07c3..00000000 --- a/static/html/about_unglued.html +++ /dev/null @@ -1,15 +0,0 @@ -

    - Imagine if you could give your favorite book to everyone on earth. Imagine if they all had a copy that they could read anywhere, anytime, on their favorite devices, with no DRM. That they could share with their friends, freely and legally. And imagine that your favorite book's creators still got paid. -

    -

    - It's possible! Here's a set of books that has given to you. All of these books are either in the public domain (in the United States, and possibly other countries as well), or they've been released to the world under a Creative Commons license. This means you're free to read, copy, and share them. Under some licenses, you're also free to remix them into new creative works. -

    -

    - Some of these books have been in the public domain all along. But others were unglued. What's that mean? First, book creators decided what amount what would make it worth their while to issue their books under Creative Commons licenses. Next, they ran pledge campaigns on Unglue.it, and anyone who wanted to give this book to the world -- including -- chipped in. When the campaign succeeded, we paid the book creators, and they issued a freely available ebook. You're free to read it now. Go ahead! -

    -

    - Now imagine, what if your favorite book were on this list? -

    -

    - What if you could unglue it? -

    \ No newline at end of file diff --git a/static/html/about_unglued_empty.html b/static/html/about_unglued_empty.html deleted file mode 100644 index 9f53b374..00000000 --- a/static/html/about_unglued_empty.html +++ /dev/null @@ -1,15 +0,0 @@ -

    - Imagine if you could give your favorite book to everyone on earth. Imagine if they all had a copy that they could read anywhere, anytime, on their favorite devices, with no DRM. That they could share with their friends, freely and legally. And imagine that your favorite book's creators still got paid. -

    -

    - It's possible! You are free to read, copy, and share books that are in the public domain or have been released to the world under a Creative Commons license. Under some licenses, you're also free to remix them into new creative works. -

    -

    - Here at Unglue.it, we help you pay creators to unglue their books. What's that mean? First, book creators say what amount would make it worth their while to issue their books under Creative Commons licenses. Next, they run pledge campaigns on Unglue.it, and anyone who wants to give their book to the world chips in. When the campaign succeeds, we pay the book creators, and they issue a freely available ebook. When books loves are unglued, you'll see them here. -

    -

    - Now imagine, what if your favorite book were on this list? -

    -

    - What if you could unglue it? -

    \ No newline at end of file diff --git a/static/html/about_wishlist.html b/static/html/about_wishlist.html deleted file mode 100644 index 0a3fdfd0..00000000 --- a/static/html/about_wishlist.html +++ /dev/null @@ -1,15 +0,0 @@ -

    - Do you have a book you love so much you'd like to give it to the world? These are the books that wants to give to the world. -

    -

    - Of course, can't do that, because books are stuck. Copyright and ebook licensing often make it illegal for individuals, and even libraries, to share digital books. DRM makes sharing hard. At Unglue.it, we respect copyright and pay book creators, while enabling book lovers to share their favorite books with everyone. -

    -

    - In short, we get books unstuck. Authors and publishers decide what amount lets them freely share their books with the world while still making a living. We raise that fee here through crowdfunding: people like you and chipping in. When campaigns succeed, the rights holders get paid, and they issue a free electronic edition under a Creative Commons license. It's like public radio: once donors have covered the station's costs, its programs are free to all. -

    -

    - What if your favorite book could be free to the world? -

    -

    - What if you could unglue it? -

    diff --git a/static/html/about_wishlist_empty.html b/static/html/about_wishlist_empty.html deleted file mode 100644 index bdb03fca..00000000 --- a/static/html/about_wishlist_empty.html +++ /dev/null @@ -1,15 +0,0 @@ -

    - Do you have a book you love so much you'd like to give it to the world? -

    -

    - We all do, but we can't, because books are stuck. Copyright and ebook licensing often make it illegal for individuals, and even libraries, to share digital books. DRM makes sharing hard. At Unglue.it, we respect copyright and pay book creators, while enabling book lovers to share their favorite books with everyone. -

    -

    - In short, we get books unstuck. Authors and publishers decide what amount lets them freely share their books with the world while still making a living. We raise that fee here through crowdfunding: people like you and chipping in. When campaigns succeed, book creators get paid, and they issue a free electronic edition under a Creative Commons license. It's like public radio: once donors have covered the station's costs, its programs are free to all. -

    -

    - hasn't nominated any favorite books yet, but you can. What if your favorite book could be free to the world? -

    -

    - What if you could unglue it? -

    From af8bb1ab6df9ecd947618fc1f34289d590d93139 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Mon, 27 Aug 2012 15:34:42 -0400 Subject: [PATCH 016/107] replaced with better hijax.js --- static/js/expand_about.js | 45 --------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 static/js/expand_about.js diff --git a/static/js/expand_about.js b/static/js/expand_about.js deleted file mode 100644 index 6b4bb48a..00000000 --- a/static/js/expand_about.js +++ /dev/null @@ -1,45 +0,0 @@ -var $j = jQuery.noConflict(); - -$j(document).ready(function(){ - $j('.about_expander').click(function(){ - // decide which about content to show - var whichbox = $j(this).attr('id'); - - // if we're on a supporter page, personalize our about box - // by writing the supporter's name in - if ($j(location).attr('pathname').slice(0,11) == '/supporter/') { - var ungluer = $j(location).attr('pathname').slice(11, -1); - } - - if (ungluer != null) { - $j('#lightbox').load('/static/html/'+whichbox+'.html'); - - // span.ungluer doesn't exist until the ajax call so we - // can't bind to the DOM on document ready; need to use - // the ajaxComplete event - $j('#lightbox').ajaxComplete(function() { - $j('#lightbox span.ungluer').replaceWith(ungluer); - }); - } else { - $j('#lightbox').load('/static/html/'+whichbox+'.html'); - } - - // fade-out (fade-in) rest of page elements on expand (collapse) - $j('#js-topsection').css({"opacity": "0.07"}); - $j('.launch_top').css({"opacity": "0.07"}); - $j('#main-container').css({"opacity": "0.07"}); - $j('#js-rightcol').css({"opacity": "0.07"}); - $j('#js-header').css({"opacity": "0.07"}); - $j('#js-header a').css({"cursor": "default"}); - $j('#about_expandable').fadeTo("slow", 1); - }); - $j('#about_collapser').click(function(){ - $j('#js-topsection').fadeTo("slow", 1); - $j('.launch_top').fadeTo("slow", 1); - $j('#main-container').fadeTo("slow", 1); - $j('#js-rightcol').fadeTo("slow", 1); - $j('#js-header').fadeTo("slow", 1); - $j('#js-header a').css({"cursor": "pointer"}); - $j('#about_expandable').css({"display": "none"}); - }); -}); From 48e20a7cdd10b4dc7765e09091c8f83515143097 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Mon, 27 Aug 2012 15:35:29 -0400 Subject: [PATCH 017/107] bringing all the lightboxes under the hijax.js system --- frontend/templates/about_active.html | 23 ++ frontend/templates/about_active_empty.html | 23 ++ frontend/templates/about_lightbox_footer.html | 8 + frontend/templates/about_main.html | 23 ++ frontend/templates/about_unglued.html | 23 ++ frontend/templates/about_unglued_empty.html | 23 ++ frontend/templates/about_wishlist.html | 23 ++ frontend/templates/about_wishlist_empty.html | 23 ++ frontend/templates/base.html | 14 +- frontend/templates/download.html | 4 +- frontend/templates/supporter.html | 12 +- frontend/templates/work.html | 3 +- frontend/urls.py | 3 +- frontend/views.py | 4 + static/css/campaign.css | 213 ++++++++++++++++++ static/css/download.css | 3 + static/js/hijax.js | 51 +++++ static/less/campaign.less | 1 + static/less/download.less | 4 + 19 files changed, 461 insertions(+), 20 deletions(-) create mode 100644 frontend/templates/about_active.html create mode 100644 frontend/templates/about_active_empty.html create mode 100644 frontend/templates/about_lightbox_footer.html create mode 100644 frontend/templates/about_main.html create mode 100644 frontend/templates/about_unglued.html create mode 100644 frontend/templates/about_unglued_empty.html create mode 100644 frontend/templates/about_wishlist.html create mode 100644 frontend/templates/about_wishlist_empty.html create mode 100644 static/js/hijax.js diff --git a/frontend/templates/about_active.html b/frontend/templates/about_active.html new file mode 100644 index 00000000..3f4b12c7 --- /dev/null +++ b/frontend/templates/about_active.html @@ -0,0 +1,23 @@ +{% extends "base.html" %} + +{% block content %} +
    +

    + Do you have a book you love so much you'd like to give it to the world? These are the books that is helping to give to the world, right now. +

    +

    + wants everyone to be able to read these books -- for free, on their favorite devices, worldwide -- but also wants the book's creators to be paid. Traditionally, readers pay each time they buy a book. But what if it worked more like public radio? What if creators got enough money to cover their costs and make their efforts worthwhile, and then the book were free to all? That's what Unglue.it does. Creators decide what fee makes sense to them, and then, through campaigns at Unglue.it, people everywhere chip in -- people like . +

    +

    + These books have active campaigns running, right now. Ungluers like are pledging to unglue them, with no risk; their credit cards will only be charged if the campaign succeeds. And when that happens, these books will be free for you, and everyone else, to read and share. +

    +

    + What if your favorite book were on this list? +

    +

    + What if you could unglue it? +

    + + {% include "about_lightbox_footer.html" %} +
    +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_active_empty.html b/frontend/templates/about_active_empty.html new file mode 100644 index 00000000..97444782 --- /dev/null +++ b/frontend/templates/about_active_empty.html @@ -0,0 +1,23 @@ +{% extends "base.html" %} + +{% block content %} +
    +

    + Do you have a book you love so much you'd like to give it to the world? At Unglue.it, you can. +

    +

    + We want everyone to be able to read beloved books -- for free, on their favorite devices, worldwide. We also want the book creators to be paid. Traditionally, readers pay each time they buy a book. But what if it worked more like public radio? What if creators got enough money to cover their costs and make their efforts worthwhile, and then the book were free to all? That's what Unglue.it does. Creators decide what fee makes sense to them, and then, through campaigns at Unglue.it, people everywhere chip in -- people like you. +

    +

    + If 's favorite books had ungluing campaigns running right now, you'd see them here. Ungluers like could pledge to unglue them, with no risk; their credit cards are only be charged when campaigns succeed. And when that happens, the books become free for you, and everyone else, to read and share. +

    +

    + What if your favorite book were on this list? +

    +

    + What if you could unglue it? +

    + + {% include "about_lightbox_footer.html" %} +
    +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_lightbox_footer.html b/frontend/templates/about_lightbox_footer.html new file mode 100644 index 00000000..9128ea49 --- /dev/null +++ b/frontend/templates/about_lightbox_footer.html @@ -0,0 +1,8 @@ +
    Read the FAQ
    +
    Read the FAQ for authors and publishers
    +
    Our press coverage
    + {% if not user.is_authenticated %} +
    Sign up today
    + {% else %} +
    Our campaigns
    + {% endif %} diff --git a/frontend/templates/about_main.html b/frontend/templates/about_main.html new file mode 100644 index 00000000..3e9d976f --- /dev/null +++ b/frontend/templates/about_main.html @@ -0,0 +1,23 @@ +{% extends "base.html" %} + +{% block content %} +
    +

    + What if you could give a book to everyone on earth? Get an ebook and read it on any device, in any format, forever? Give an ebook to your library, for them to share? Own DRM-free ebooks, legally? Read free ebooks, and know their creators had been fairly paid? +

    +

    + At Unglue.it, you can pledge toward creating ebooks that will be legally free, worldwide. These books have already been traditionally published, but they're stuck: legal restrictions keep you from being able to enjoy and share them. +

    +

    + Unglue.it gets them unstuck. Authors and publishers decide what amount lets them freely share their books with the world while still making a living. We raise that fee here through crowdfunding: people like you chipping in. When campaigns succeed, the rights holders get paid, and they issue a free electronic edition under a Creative Commons license. +

    +

    + What if you could give your favorite book to the world? +

    +

    + What if you could unglue it? +

    + + {% include "about_lightbox_footer.html" %} +
    +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_unglued.html b/frontend/templates/about_unglued.html new file mode 100644 index 00000000..6efd0151 --- /dev/null +++ b/frontend/templates/about_unglued.html @@ -0,0 +1,23 @@ +{% extends "base.html" %} + +{% block content %} +
    +

    + Imagine if you could give your favorite book to everyone on earth. Imagine if they all had a copy that they could read anywhere, anytime, on their favorite devices, with no DRM. That they could share with their friends, freely and legally. And imagine that your favorite book's creators still got paid. +

    +

    + It's possible! Here's a set of books that has given to you. All of these books are either in the public domain (in the United States, and possibly other countries as well), or they've been released to the world under a Creative Commons license. This means you're free to read, copy, and share them. Under some licenses, you're also free to remix them into new creative works. +

    +

    + Some of these books have been in the public domain all along. But others were unglued. What's that mean? First, book creators decided what amount what would make it worth their while to issue their books under Creative Commons licenses. Next, they ran pledge campaigns on Unglue.it, and anyone who wanted to give this book to the world -- including -- chipped in. When the campaign succeeded, we paid the book creators, and they issued a freely available ebook. You're free to read it now. Go ahead! +

    +

    + Now imagine, what if your favorite book were on this list? +

    +

    + What if you could unglue it? +

    + + {% include "about_lightbox_footer.html" %} +
    +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_unglued_empty.html b/frontend/templates/about_unglued_empty.html new file mode 100644 index 00000000..82af66a8 --- /dev/null +++ b/frontend/templates/about_unglued_empty.html @@ -0,0 +1,23 @@ +{% extends "base.html" %} + +{% block content %} +
    +

    + Imagine if you could give your favorite book to everyone on earth. Imagine if they all had a copy that they could read anywhere, anytime, on their favorite devices, with no DRM. That they could share with their friends, freely and legally. And imagine that your favorite book's creators still got paid. +

    +

    + It's possible! You are free to read, copy, and share books that are in the public domain or have been released to the world under a Creative Commons license. Under some licenses, you're also free to remix them into new creative works. +

    +

    + Here at Unglue.it, we help you pay creators to unglue their books. What's that mean? First, book creators say what amount would make it worth their while to issue their books under Creative Commons licenses. Next, they run pledge campaigns on Unglue.it, and anyone who wants to give their book to the world chips in. When the campaign succeeds, we pay the book creators, and they issue a freely available ebook. When books loves are unglued, you'll see them here. +

    +

    + Now imagine, what if your favorite book were on this list? +

    +

    + What if you could unglue it? +

    + + {% include "about_lightbox_footer.html" %} +
    +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_wishlist.html b/frontend/templates/about_wishlist.html new file mode 100644 index 00000000..bd0a7f56 --- /dev/null +++ b/frontend/templates/about_wishlist.html @@ -0,0 +1,23 @@ +{% extends "base.html" %} + +{% block content %} +
    +

    + Do you have a book you love so much you'd like to give it to the world? These are the books that wants to give to the world. +

    +

    + Of course, can't do that, because books are stuck. Copyright and ebook licensing often make it illegal for individuals, and even libraries, to share digital books. DRM makes sharing hard. At Unglue.it, we respect copyright and pay book creators, while enabling book lovers to share their favorite books with everyone. +

    +

    + In short, we get books unstuck. Authors and publishers decide what amount lets them freely share their books with the world while still making a living. We raise that fee here through crowdfunding: people like you and chipping in. When campaigns succeed, the rights holders get paid, and they issue a free electronic edition under a Creative Commons license. It's like public radio: once donors have covered the station's costs, its programs are free to all. +

    +

    + What if your favorite book could be free to the world? +

    +

    + What if you could unglue it? +

    + + {% include "about_lightbox_footer.html" %} +
    +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_wishlist_empty.html b/frontend/templates/about_wishlist_empty.html new file mode 100644 index 00000000..c8e26a83 --- /dev/null +++ b/frontend/templates/about_wishlist_empty.html @@ -0,0 +1,23 @@ +{% extends "base.html" %} + +{% block content %} +
    +

    + Do you have a book you love so much you'd like to give it to the world? +

    +

    + We all do, but we can't, because books are stuck. Copyright and ebook licensing often make it illegal for individuals, and even libraries, to share digital books. DRM makes sharing hard. At Unglue.it, we respect copyright and pay book creators, while enabling book lovers to share their favorite books with everyone. +

    +

    + In short, we get books unstuck. Authors and publishers decide what amount lets them freely share their books with the world while still making a living. We raise that fee here through crowdfunding: people like you and chipping in. When campaigns succeed, book creators get paid, and they issue a free electronic edition under a Creative Commons license. It's like public radio: once donors have covered the station's costs, its programs are free to all. +

    +

    + hasn't nominated any favorite books yet, but you can. What if your favorite book could be free to the world? +

    +

    + What if you could unglue it? +

    + + {% include "about_lightbox_footer.html" %} +
    +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/base.html b/frontend/templates/base.html index c3c172bb..a63d2425 100644 --- a/frontend/templates/base.html +++ b/frontend/templates/base.html @@ -22,7 +22,7 @@ {% block base_js %} {% endblock %} - + {% block extra_js %} {% endblock %} @@ -50,16 +50,8 @@
    X
    -
    Read the FAQ
    -
    Read the FAQ for authors and publishers
    -
    Our press coverage
    - {% if not user.is_authenticated %} -
    Sign up today
    - {% else %} -
    Our campaigns
    - {% endif %}
    @@ -97,7 +89,7 @@ {% else %}
  • Sign In
    • {% endif %} -
  • About
    • +
  • About
  • Home
    • {% if not user.is_authenticated %}
  • sign up
    • diff --git a/frontend/templates/download.html b/frontend/templates/download.html index f725cd83..afde968a 100644 --- a/frontend/templates/download.html +++ b/frontend/templates/download.html @@ -15,6 +15,7 @@ {% block content %}
    +

    Downloads for {{ work.title }}

    {% if unglued_ebook %}
    @@ -50,7 +51,7 @@ @@ -123,6 +124,7 @@ i canNOT list all the possibilities. need to have a help email.

    If you know of a Creative-Commons-licensed or US public domain edition of this book, you can add it through the Rights tab of the book page.

    {% endif %}
    +
    {% endblock %} {% endwith %} \ No newline at end of file diff --git a/frontend/templates/supporter.html b/frontend/templates/supporter.html index 795a1267..db139b75 100644 --- a/frontend/templates/supporter.html +++ b/frontend/templates/supporter.html @@ -321,23 +321,23 @@ there's no tab for seeing ALL my books, only the filters! huh. {% if request.user.is_anonymous %}
    {% if works_unglued %} - {{ supporter }} is sharing these books with you. Find out how. + {{ supporter }} is sharing these books with you. Find out how. {% else %} - {{ supporter }} isn't sharing any books with the world yet. Find out how you can. + {{ supporter }} isn't sharing any books with the world yet. Find out how you can. {% endif %}
    {% if works_active %} - {{ supporter }} is giving these books to you. Find out how. + {{ supporter }} is giving these books to you. Find out how. {% else %} - {{ supporter }} isn't giving any books to the world right now. Find out how you can. + {{ supporter }} isn't giving any books to the world right now. Find out how you can. {% endif %}
    {% if works_wished %} - {{ supporter }} wants to give these books to you. Find out how. + {{ supporter }} wants to give these books to you. Find out how. {% else %} - {{ supporter }} hasn't decided which books to give the world yet. Learn more. + {{ supporter }} hasn't decided which books to give the world yet. Learn more. {% endif %}
    {% endif %} diff --git a/frontend/templates/work.html b/frontend/templates/work.html index 1a4d3ca4..ecb80820 100644 --- a/frontend/templates/work.html +++ b/frontend/templates/work.html @@ -15,6 +15,7 @@ + {% endblock %} diff --git a/static/css/campaign.css b/static/css/campaign.css index 1491d469..f2ab96b1 100755 --- a/static/css/campaign.css +++ b/static/css/campaign.css @@ -400,23 +400,28 @@ ul.tabs li.active a { width: 50%; margin: auto; } -#lightbox a { +#lightbox_content a { color: #6994a3; } -.ebook_download { +#lightbox_content h2, +#lightbox_content h3, +#lightbox_content h4 { + margin: 15px auto 5px auto; +} +#lightbox_content .ebook_download { margin-bottom: 15px; } -.ebook_download a { +#lightbox_content .ebook_download a { margin: auto 5px auto 0; font-size: 15px; } -.ebook_download img { +#lightbox_content .ebook_download img { vertical-align: middle; } -.logo { +#lightbox_content .logo { font-size: 15px; } -.logo img { +#lightbox_content .logo img { -moz-border-radius: 7px; -webkit-border-radius: 7px; border-radius: 7px; @@ -427,30 +432,30 @@ ul.tabs li.active a { width: 50px; margin-right: 5px; } -.unglued { +#lightbox_content .unglued { border: solid 2px #8dc63f; margin-left: -2px; padding: 5px; } -.unglued h3 { +#lightbox_content .unglued h3 { margin-top: 5px; } -a.add-wishlist .on-wishlist, -a.success, +#lightbox_content a.add-wishlist .on-wishlist, +#lightbox_content a.success, a.success:hover { text-decoration: none; color: #3d4e53; } -ul { - padding-left: 50px; -} -ul li { - margin-bottom: 4px; -} -a.success, +#lightbox_content a.success, a.success:hover { cursor: default; } +#lightbox_content ul { + padding-left: 50px; +} +#lightbox_content ul li { + margin-bottom: 4px; +} /* Common elements of share links -- just swap in the background image */ /* Page layout */ #js-page-wrap { diff --git a/static/css/download.css b/static/css/download.css index 4c1d4a71..676f8e45 100644 --- a/static/css/download.css +++ b/static/css/download.css @@ -94,23 +94,28 @@ width: 50%; margin: auto; } -#lightbox a { +#lightbox_content a { color: #6994a3; } -.ebook_download { +#lightbox_content h2, +#lightbox_content h3, +#lightbox_content h4 { + margin: 15px auto 5px auto; +} +#lightbox_content .ebook_download { margin-bottom: 15px; } -.ebook_download a { +#lightbox_content .ebook_download a { margin: auto 5px auto 0; font-size: 15px; } -.ebook_download img { +#lightbox_content .ebook_download img { vertical-align: middle; } -.logo { +#lightbox_content .logo { font-size: 15px; } -.logo img { +#lightbox_content .logo img { -moz-border-radius: 7px; -webkit-border-radius: 7px; border-radius: 7px; @@ -118,27 +123,27 @@ width: 50px; margin-right: 5px; } -.unglued { +#lightbox_content .unglued { border: solid 2px #8dc63f; margin-left: -2px; padding: 5px; } -.unglued h3 { +#lightbox_content .unglued h3 { margin-top: 5px; } -a.add-wishlist .on-wishlist, -a.success, +#lightbox_content a.add-wishlist .on-wishlist, +#lightbox_content a.success, a.success:hover { text-decoration: none; color: #3d4e53; } -ul { - padding-left: 50px; -} -ul li { - margin-bottom: 4px; -} -a.success, +#lightbox_content a.success, a.success:hover { cursor: default; } +#lightbox_content ul { + padding-left: 50px; +} +#lightbox_content ul li { + margin-bottom: 4px; +} diff --git a/static/css/sitewide.css b/static/css/sitewide.css index 7c576261..7fc6871e 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -19,6 +19,9 @@ -moz-border-radius: 7px; -webkit-border-radius: 7px; border-radius: 7px; + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; padding: 1px; color: #fff; margin: 0 8px 0 0; @@ -30,6 +33,9 @@ -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; text-align: center; display: inline-block; } @@ -47,6 +53,8 @@ padding: 14px 0; } .google_signup_div div { + height: 24px; + line-height: 24px; height: 24px; line-height: 24px; float: left; @@ -61,10 +69,15 @@ width: auto; height: 36px; line-height: 36px; + height: 36px; + line-height: 36px; background: #8dc63f; -moz-border-radius: 32px; -webkit-border-radius: 32px; border-radius: 32px; + -moz-border-radius: 32px; + -webkit-border-radius: 32px; + border-radius: 32px; color: white; cursor: pointer; font-size: 13px; @@ -74,6 +87,9 @@ margin: 5px 0; } .errors { + -moz-border-radius: 16px 16px 0 0; + -webkit-border-radius: 16px 16px 0 0; + border-radius: 16px 16px 0 0; -moz-border-radius: 16px 16px 0 0; -webkit-border-radius: 16px 16px 0 0; border-radius: 16px 16px 0 0; @@ -91,12 +107,183 @@ list-style: none; border: none; } +/* variables and mixins used in multiple less files go here */ +.header-text { + height: 36px; + line-height: 36px; + display: block; + text-decoration: none; + font-weight: bold; + font-size: 13px; + letter-spacing: -0.05em; +} +.panelborders { + border-width: 1px 0px; + border-style: solid none; + border-color: #FFFFFF; +} +.roundedspan { + border: 1px solid #d4d4d4; + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; + padding: 1px; + color: #fff; + margin: 0 8px 0 0; + display: inline-block; +} +.roundedspan > span { + padding: 7px 7px; + min-width: 15px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + text-align: center; + display: inline-block; +} +.roundedspan > span .hovertext { + display: none; +} +.roundedspan > span:hover .hovertext { + display: inline; +} +.mediaborder { + padding: 5px; + border: solid 5px #EDF3F4; +} +.google_signup_div { + padding: 14px 0; +} +.google_signup_div div { + height: 24px; + line-height: 24px; + height: 24px; + line-height: 24px; + float: left; + padding-left: 5px; +} +.google_signup_div img { + float: left; + height: 24px; + width: 24px; +} +.actionbuttons { + width: auto; + height: 36px; + line-height: 36px; + height: 36px; + line-height: 36px; + background: #8dc63f; + -moz-border-radius: 32px; + -webkit-border-radius: 32px; + border-radius: 32px; + -moz-border-radius: 32px; + -webkit-border-radius: 32px; + border-radius: 32px; + color: white; + cursor: pointer; + font-size: 13px; + font-weight: bold; + padding: 0 15px; + border: none; + margin: 5px 0; +} +.errors { + -moz-border-radius: 16px 16px 0 0; + -webkit-border-radius: 16px 16px 0 0; + border-radius: 16px 16px 0 0; + -moz-border-radius: 16px 16px 0 0; + -webkit-border-radius: 16px 16px 0 0; + border-radius: 16px 16px 0 0; + border: solid #e35351 3px; + clear: both; + width: 90%; + height: auto; + line-height: 16px; + padding: 7px 0; + font-weight: bold; + font-size: 13px; + text-align: center; +} +.errors li { + list-style: none; + border: none; +} +.download_container { + width: 50%; + margin: auto; +} +#lightbox_content a { + color: #6994a3; +} +#lightbox_content h2, +#lightbox_content h3, +#lightbox_content h4 { + margin: 15px auto 5px auto; +} +#lightbox_content .ebook_download { + margin-bottom: 15px; +} +#lightbox_content .ebook_download a { + margin: auto 5px auto 0; + font-size: 15px; +} +#lightbox_content .ebook_download img { + vertical-align: middle; +} +#lightbox_content .logo { + font-size: 15px; +} +#lightbox_content .logo img { + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; + height: 50px; + width: 50px; + margin-right: 5px; +} +#lightbox_content .unglued { + border: solid 2px #8dc63f; + margin-left: -2px; + padding: 5px; +} +#lightbox_content .unglued h3 { + margin-top: 5px; +} +#lightbox_content a.add-wishlist .on-wishlist, +#lightbox_content a.success, +a.success:hover { + text-decoration: none; + color: #3d4e53; +} +#lightbox_content a.success, +a.success:hover { + cursor: default; +} +#lightbox_content ul { + padding-left: 50px; +} +#lightbox_content ul li { + margin-bottom: 4px; +} /* remove before beta */ .preview { border: solid 3px #e35351; -moz-border-radius: 7px; -webkit-border-radius: 7px; border-radius: 7px; + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; clear: both; padding: 5px 10px; font-size: 13px; @@ -110,6 +297,9 @@ -moz-border-radius: 7px; -webkit-border-radius: 7px; border-radius: 7px; + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; clear: both; padding: 5px 10px; font-size: 13px; @@ -130,6 +320,9 @@ -moz-border-radius: 7px; -webkit-border-radius: 7px; border-radius: 7px; + -moz-border-radius: 7px; + -webkit-border-radius: 7px; + border-radius: 7px; clear: both; padding: 5px 10px; font-size: 13px; @@ -187,6 +380,9 @@ body { -moz-border-radius: 0 0 10px 10px; -webkit-border-radius: 0 0 10px 10px; border-radius: 0 0 10px 10px; + -moz-border-radius: 0 0 10px 10px; + -webkit-border-radius: 0 0 10px 10px; + border-radius: 0 0 10px 10px; background: #8dc63f; margin-bottom: 0; text-align: center; @@ -233,6 +429,9 @@ a.fakeinput { -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; } input:focus, textarea:focus, @@ -247,6 +446,9 @@ a.fakeinput:hover { -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; } h2.content-heading { padding: 15px; @@ -261,6 +463,9 @@ h2.content-heading span { font-style: italic; } h3.jsmod-title { + -moz-border-radius: 8px 8px 0 0; + -webkit-border-radius: 8px 8px 0 0; + border-radius: 8px 8px 0 0; -moz-border-radius: 8px 8px 0 0; -webkit-border-radius: 8px 8px 0 0; border-radius: 8px 8px 0 0; @@ -300,6 +505,9 @@ ul.menu { margin: 0; } .errorlist { + -moz-border-radius: 16px 16px 0 0; + -webkit-border-radius: 16px 16px 0 0; + border-radius: 16px 16px 0 0; -moz-border-radius: 16px 16px 0 0; -webkit-border-radius: 16px 16px 0 0; border-radius: 16px 16px 0 0; @@ -312,6 +520,25 @@ ul.menu { font-weight: bold; font-size: 13px; text-align: center; + -moz-border-radius: 16px 16px 0 0; + -webkit-border-radius: 16px 16px 0 0; + border-radius: 16px 16px 0 0; + -moz-border-radius: 16px 16px 0 0; + -webkit-border-radius: 16px 16px 0 0; + border-radius: 16px 16px 0 0; + border: solid #e35351 3px; + clear: both; + width: 90%; + height: auto; + line-height: 16px; + padding: 7px 0; + font-weight: bold; + font-size: 13px; + text-align: center; +} +.errorlist li { + list-style: none; + border: none; } .errorlist li { list-style: none; @@ -367,6 +594,13 @@ ul.menu { font-weight: bold; font-size: 13px; letter-spacing: -0.05em; + height: 36px; + line-height: 36px; + display: block; + text-decoration: none; + font-weight: bold; + font-size: 13px; + letter-spacing: -0.05em; } .js-topmenu ul li span#welcome { color: #8dc63f; @@ -377,6 +611,13 @@ ul.menu { font-weight: bold; font-size: 13px; letter-spacing: -0.05em; + height: 36px; + line-height: 36px; + display: block; + text-decoration: none; + font-weight: bold; + font-size: 13px; + letter-spacing: -0.05em; overflow: auto; max-width: 240px; } @@ -385,6 +626,9 @@ ul.menu { -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; padding: 3px; line-height: 16px; width: 16px; @@ -406,6 +650,9 @@ ul.menu { background: url("/static/images/bg.png") right top no-repeat; } .js-topmenu ul li.last a span { + -moz-border-radius: 32px 0 0 32px; + -webkit-border-radius: 32px 0 0 32px; + border-radius: 32px 0 0 32px; -moz-border-radius: 32px 0 0 32px; -webkit-border-radius: 32px 0 0 32px; border-radius: 32px 0 0 32px; @@ -433,9 +680,14 @@ ul.menu { -moz-border-radius: 50px 0 0 50px; -webkit-border-radius: 50px 0 0 50px; border-radius: 50px 0 0 50px; + -moz-border-radius: 50px 0 0 50px; + -webkit-border-radius: 50px 0 0 50px; + border-radius: 50px 0 0 50px; outline: none; height: 28px; line-height: 28px; + height: 28px; + line-height: 28px; width: 156px; float: left; color: #6994a3; @@ -482,6 +734,9 @@ a#readon.down { background: url("/static/images/learnmore-uparrow.png") right center no-repeat; } a#readon span { + -moz-border-radius: 32px 0 0 32px; + -webkit-border-radius: 32px 0 0 32px; + border-radius: 32px 0 0 32px; -moz-border-radius: 32px 0 0 32px; -webkit-border-radius: 32px 0 0 32px; border-radius: 32px 0 0 32px; @@ -490,6 +745,8 @@ a#readon span { padding: 0 5px 0 20px; height: 36px; line-height: 36px; + height: 36px; + line-height: 36px; display: block; } .spread_the_word { @@ -515,6 +772,9 @@ a#readon span { -moz-border-radius: 0 0 10px 10px; -webkit-border-radius: 0 0 10px 10px; border-radius: 0 0 10px 10px; + -moz-border-radius: 0 0 10px 10px; + -webkit-border-radius: 0 0 10px 10px; + border-radius: 0 0 10px 10px; } #js-leftcol ul.level1 > li > a, #js-leftcol ul.level1 > li > span { @@ -538,10 +798,15 @@ a#readon span { -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; } #js-leftcol ul.level2 li .ungluer-name { height: 30px; line-height: 30px; + height: 30px; + line-height: 30px; } /* Main content area: top */ #js-topsection { @@ -665,6 +930,9 @@ a.nounderline { -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; border: solid 5px #d6dde0; background: white; z-index: 500; @@ -709,10 +977,15 @@ a.nounderline { float: right; height: 24px; line-height: 24px; + height: 24px; + line-height: 24px; width: 24px; -moz-border-radius: 24px; -webkit-border-radius: 24px; border-radius: 24px; + -moz-border-radius: 24px; + -webkit-border-radius: 24px; + border-radius: 24px; -moz-box-shadow: -1px 1px #3d4e53; -webkit-box-shadow: -1px 1px #3d4e53; box-shadow: -1px 1px #3d4e53; @@ -726,6 +999,9 @@ a.nounderline { margin-right: -22px; } .signuptoday { + -moz-border-radius: 32px; + -webkit-border-radius: 32px; + border-radius: 32px; -moz-border-radius: 32px; -webkit-border-radius: 32px; border-radius: 32px; @@ -733,6 +1009,8 @@ a.nounderline { padding: 0 15px; height: 36px; line-height: 36px; + height: 36px; + line-height: 36px; float: left; clear: both; margin: 10px auto; diff --git a/static/less/download.less b/static/less/download.less index b03f6da2..d96f1a55 100644 --- a/static/less/download.less +++ b/static/less/download.less @@ -5,11 +5,15 @@ margin: auto; } -#lightbox a { +#lightbox_content a { color: @medium-blue; } -.ebook_download { +#lightbox_content h2, #lightbox_content h3, #lightbox_content h4 { + margin-top: 15px; +} + +#lightbox_content .ebook_download { a { margin: auto 5px auto 0; font-size: @font-size-larger; @@ -23,7 +27,7 @@ } -.logo { +#lightbox_content .logo { img { .one-border-radius(7px); height: 50px; @@ -34,7 +38,7 @@ font-size: @font-size-larger; } -.unglued { +#lightbox_content .unglued { border: solid 2px @call-to-action; margin-left: -2px; padding: 5px; @@ -44,18 +48,19 @@ } } -a.add-wishlist .on-wishlist, a.success, a.success:hover { +#lightbox_content a.add-wishlist .on-wishlist, #lightbox_content a.success, a.success:hover { text-decoration: none; color: @text-blue; } -ul { +#lightbox_content a.success, a.success:hover { + cursor: default; +} + +#lightbox_content ul { padding-left: 50px; li { margin-bottom: 4px; } -} -a.success, a.success:hover { - cursor: default; } \ No newline at end of file diff --git a/static/less/sitewide.less b/static/less/sitewide.less index ef36e47d..20d5a395 100644 --- a/static/less/sitewide.less +++ b/static/less/sitewide.less @@ -1,6 +1,7 @@ /* For sitewide elements of unglue.it. */ @import "variables.less"; +@import "download.less"; /* remove before beta */ .preview { From 863bfe5856c84636adb7fdf7170991f85fc3bca6 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Tue, 28 Aug 2012 13:47:29 -0400 Subject: [PATCH 025/107] /about/ pages need appropriate styling and should not conflict if user clicks on About in header --- frontend/templates/about_active.html | 4 +++ frontend/templates/about_active_empty.html | 4 +++ frontend/templates/about_main.html | 4 +++ frontend/templates/about_unglued.html | 4 +++ frontend/templates/about_unglued_empty.html | 4 +++ frontend/templates/about_wishlist.html | 6 +++- frontend/templates/about_wishlist_empty.html | 4 +++ static/css/campaign.css | 5 ++- static/css/download.css | 5 ++- static/css/sitewide.css | 35 ++++++++++++++------ static/js/hijax.js | 2 ++ static/less/download.less | 5 +++ static/less/sitewide.less | 20 ++++++++--- 13 files changed, 85 insertions(+), 17 deletions(-) diff --git a/frontend/templates/about_active.html b/frontend/templates/about_active.html index 3f4b12c7..7273c916 100644 --- a/frontend/templates/about_active.html +++ b/frontend/templates/about_active.html @@ -1,7 +1,9 @@ {% extends "base.html" %} {% block content %} +
    +

    Do you have a book you love so much you'd like to give it to the world? These are the books that is helping to give to the world, right now.

    @@ -20,4 +22,6 @@ {% include "about_lightbox_footer.html" %}
    +
    +
    {% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_active_empty.html b/frontend/templates/about_active_empty.html index 97444782..e274756f 100644 --- a/frontend/templates/about_active_empty.html +++ b/frontend/templates/about_active_empty.html @@ -1,7 +1,9 @@ {% extends "base.html" %} {% block content %} +
    +

    Do you have a book you love so much you'd like to give it to the world? At Unglue.it, you can.

    @@ -20,4 +22,6 @@ {% include "about_lightbox_footer.html" %}
    +
    +
    {% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_main.html b/frontend/templates/about_main.html index 3e9d976f..aeed6ea0 100644 --- a/frontend/templates/about_main.html +++ b/frontend/templates/about_main.html @@ -1,7 +1,9 @@ {% extends "base.html" %} {% block content %} +
    +

    What if you could give a book to everyone on earth? Get an ebook and read it on any device, in any format, forever? Give an ebook to your library, for them to share? Own DRM-free ebooks, legally? Read free ebooks, and know their creators had been fairly paid?

    @@ -20,4 +22,6 @@ {% include "about_lightbox_footer.html" %}
    +
    +
    {% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_unglued.html b/frontend/templates/about_unglued.html index 6efd0151..73b42457 100644 --- a/frontend/templates/about_unglued.html +++ b/frontend/templates/about_unglued.html @@ -1,7 +1,9 @@ {% extends "base.html" %} {% block content %} +
    +

    Imagine if you could give your favorite book to everyone on earth. Imagine if they all had a copy that they could read anywhere, anytime, on their favorite devices, with no DRM. That they could share with their friends, freely and legally. And imagine that your favorite book's creators still got paid.

    @@ -20,4 +22,6 @@ {% include "about_lightbox_footer.html" %}
    +
    +
    {% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_unglued_empty.html b/frontend/templates/about_unglued_empty.html index 82af66a8..1ca1cc20 100644 --- a/frontend/templates/about_unglued_empty.html +++ b/frontend/templates/about_unglued_empty.html @@ -1,7 +1,9 @@ {% extends "base.html" %} {% block content %} +
    +

    Imagine if you could give your favorite book to everyone on earth. Imagine if they all had a copy that they could read anywhere, anytime, on their favorite devices, with no DRM. That they could share with their friends, freely and legally. And imagine that your favorite book's creators still got paid.

    @@ -20,4 +22,6 @@ {% include "about_lightbox_footer.html" %}
    +
    +
    {% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_wishlist.html b/frontend/templates/about_wishlist.html index bd0a7f56..46ab2b8d 100644 --- a/frontend/templates/about_wishlist.html +++ b/frontend/templates/about_wishlist.html @@ -1,8 +1,10 @@ {% extends "base.html" %} {% block content %} +
    -

    +

    +

    Do you have a book you love so much you'd like to give it to the world? These are the books that wants to give to the world.

    @@ -20,4 +22,6 @@ {% include "about_lightbox_footer.html" %}

    +
    +
    {% endblock %} \ No newline at end of file diff --git a/frontend/templates/about_wishlist_empty.html b/frontend/templates/about_wishlist_empty.html index c8e26a83..8db3b865 100644 --- a/frontend/templates/about_wishlist_empty.html +++ b/frontend/templates/about_wishlist_empty.html @@ -1,7 +1,9 @@ {% extends "base.html" %} {% block content %} +
    +

    Do you have a book you love so much you'd like to give it to the world?

    @@ -20,4 +22,6 @@ {% include "about_lightbox_footer.html" %}
    +
    +
    {% endblock %} \ No newline at end of file diff --git a/static/css/campaign.css b/static/css/campaign.css index f2ab96b1..4d40a79b 100755 --- a/static/css/campaign.css +++ b/static/css/campaign.css @@ -403,10 +403,13 @@ ul.tabs li.active a { #lightbox_content a { color: #6994a3; } +#lightbox_content .signuptoday a { + color: white; +} #lightbox_content h2, #lightbox_content h3, #lightbox_content h4 { - margin: 15px auto 5px auto; + margin-top: 15px; } #lightbox_content .ebook_download { margin-bottom: 15px; diff --git a/static/css/download.css b/static/css/download.css index 676f8e45..0848d2c7 100644 --- a/static/css/download.css +++ b/static/css/download.css @@ -97,10 +97,13 @@ #lightbox_content a { color: #6994a3; } +#lightbox_content .signuptoday a { + color: white; +} #lightbox_content h2, #lightbox_content h3, #lightbox_content h4 { - margin: 15px auto 5px auto; + margin-top: 15px; } #lightbox_content .ebook_download { margin-bottom: 15px; diff --git a/static/css/sitewide.css b/static/css/sitewide.css index 7fc6871e..d2367996 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -222,10 +222,13 @@ #lightbox_content a { color: #6994a3; } +#lightbox_content .signuptoday a { + color: white; +} #lightbox_content h2, #lightbox_content h3, #lightbox_content h4 { - margin: 15px auto 5px auto; + margin-top: 15px; } #lightbox_content .ebook_download { margin-bottom: 15px; @@ -943,35 +946,47 @@ a.nounderline { margin-left: 0; padding: 9px; } -#about_expandable p { +#about_expandable .collapser_x { + margin-top: -27px; + margin-right: -27px; +} +#lightbox_content p { padding: 9px 0; font-size: 15px; line-height: 20px; } -#about_expandable p a { +#lightbox_content p a { font-size: 15px; line-height: 20px; } -#about_expandable p b { +#lightbox_content p b { color: #8dc63f; } -#about_expandable p.last { +#lightbox_content p.last { border-bottom: solid 2px #d6dde0; margin-bottom: 5px; } -#about_expandable .right_border { +#lightbox_content .right_border { border-right: solid 1px #d6dde0; float: left; padding: 9px; } -#about_expandable .signuptoday { +#lightbox_content .signuptoday { float: right; margin-top: 0; clear: none; } -#about_expandable .collapser_x { - margin-top: -27px; - margin-right: -27px; +.nonlightbox .about_page { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border-radius: 5px; + border: solid 5px #d6dde0; + width: 75%; + margin: 10px auto auto auto; + padding: 9px; } .collapser_x { float: right; diff --git a/static/js/hijax.js b/static/js/hijax.js index f9c5736b..f108e5cd 100644 --- a/static/js/hijax.js +++ b/static/js/hijax.js @@ -16,6 +16,7 @@ $j(document).ready(function() { $j('#js-rightcol').css({"opacity": "0.07"}); $j('#js-header').css({"opacity": "0.07"}); $j('#js-header a').css({"cursor": "default"}); + $j('#js-page-wrap').css({"opacity": "0.07"}); $j('#footer').css({"opacity": "0.07"}); $j('#about_expandable').fadeTo("slow", 1); @@ -44,6 +45,7 @@ $j(document).ready(function() { $j('#js-rightcol').fadeTo("slow", 1); $j('#js-header').fadeTo("slow", 1); $j('#js-header a').css({"cursor": "pointer"}); + $j('#js-page-wrap').fadeTo("slow", 1); $j('#footer').fadeTo("slow", 1); $j('#about_expandable').css({"display": "none"}); }); diff --git a/static/less/download.less b/static/less/download.less index d96f1a55..0067f38d 100644 --- a/static/less/download.less +++ b/static/less/download.less @@ -7,6 +7,11 @@ #lightbox_content a { color: @medium-blue; + +} + +#lightbox_content .signuptoday a { + color: white; } #lightbox_content h2, #lightbox_content h3, #lightbox_content h4 { diff --git a/static/less/sitewide.less b/static/less/sitewide.less index 20d5a395..bcb191f0 100644 --- a/static/less/sitewide.less +++ b/static/less/sitewide.less @@ -606,6 +606,13 @@ a.nounderline { margin-left: 0; padding: 9px; + .collapser_x { + margin-top: -27px; + margin-right: -27px; + } +} + +#lightbox_content { p { padding: 9px 0; font-size: @font-size-larger; @@ -638,10 +645,15 @@ a.nounderline { clear: none; } - .collapser_x { - margin-top: -27px; - margin-right: -27px; - } +} + +// need to style /about/X pages such that they will not conflict with lightboxed About from header +.nonlightbox .about_page { + .one-border-radius(5px); + border: solid 5px @blue-grey; + width: 75%; + margin: 10px auto auto auto; + padding: 9px; } .collapser_x { From bd48fdb4370ca2052a35f528ebed66069c192caa Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Wed, 29 Aug 2012 07:34:20 -0700 Subject: [PATCH 026/107] Adding stripe payment tag use --- payment/forms.py | 2 +- payment/templates/stripe.html | 69 +---- payment/views.py | 4 +- static/stripe/tag.css | 58 ++++ static/stripe/tag.dev.js | 405 ++++++++++++++++++++++++++++ static/stripe/tag.js | 1 + static/stripe/themes/amex.png | Bin 0 -> 4308 bytes static/stripe/themes/discover.png | Bin 0 -> 3817 bytes static/stripe/themes/generic.png | Bin 0 -> 3389 bytes static/stripe/themes/mastercard.png | Bin 0 -> 3845 bytes static/stripe/themes/spinner.gif | Bin 0 -> 5461 bytes static/stripe/themes/stripe.css | 152 +++++++++++ static/stripe/themes/visa.png | Bin 0 -> 3819 bytes 13 files changed, 625 insertions(+), 66 deletions(-) create mode 100755 static/stripe/tag.css create mode 100755 static/stripe/tag.dev.js create mode 100755 static/stripe/tag.js create mode 100755 static/stripe/themes/amex.png create mode 100755 static/stripe/themes/discover.png create mode 100755 static/stripe/themes/generic.png create mode 100755 static/stripe/themes/mastercard.png create mode 100755 static/stripe/themes/spinner.gif create mode 100755 static/stripe/themes/stripe.css create mode 100755 static/stripe/themes/visa.png diff --git a/payment/forms.py b/payment/forms.py index cb474b5e..0fad6ca5 100644 --- a/payment/forms.py +++ b/payment/forms.py @@ -4,7 +4,7 @@ import logging logger = logging.getLogger(__name__) class StripePledgeForm(forms.Form): - stripeToken = forms.CharField(required=False, widget=forms.HiddenInput()) + stripe_token = forms.CharField(required=False, widget=forms.HiddenInput()) class BalancedPledgeForm(forms.Form): card_uri = forms.CharField(required=False, widget=forms.HiddenInput()) diff --git a/payment/templates/stripe.html b/payment/templates/stripe.html index 949150bc..9ab3a306 100644 --- a/payment/templates/stripe.html +++ b/payment/templates/stripe.html @@ -7,78 +7,21 @@ - + + - - - - {% endblock %} {% block doccontent %} Stripe Test: -
    + {% csrf_token %} -
    - - -
    -
    - - -
    -
    - - - / - -
    - + +
    + {% endblock %} diff --git a/payment/views.py b/payment/views.py index ac9d49be..e4f70752 100644 --- a/payment/views.py +++ b/payment/views.py @@ -346,10 +346,10 @@ class StripeView(FormView): return context def form_valid(self, form): - stripeToken = form.cleaned_data["stripeToken"] + stripe_token = form.cleaned_data["stripe_token"] # e.g., tok_0C0k4jG5B2Oxox # - return HttpResponse("stripeToken: {0}".format(stripeToken)) + return HttpResponse("stripe_token: {0}".format(stripe_token)) class BalancedView(FormView): template_name="balanced.html" diff --git a/static/stripe/tag.css b/static/stripe/tag.css new file mode 100755 index 00000000..4476ec5a --- /dev/null +++ b/static/stripe/tag.css @@ -0,0 +1,58 @@ +payment, .payment { + position: relative; + display: block; + + padding: 15px 20px; + max-width: 300px; + overflow: hidden; + + box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-sizing: border-box; +} + +payment label, .payment label { + display: block; + padding: 5px 0; + + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; +} + +payment input, .payment input { + padding: 5px 5px; + + box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-sizing: border-box; +} + +payment .number input, .payment .number input { + padding: 7px 40px 7px 7px; + width: 100%; +} + +payment .expiry input, payment .cvc input { + width: 45px; +} + +payment .expiry em { + display: none; +} + +payment .cvc, +.payment .cvc { + float: right; + text-align: right; +} + +payment .expiry, +.payment .expiry { + float: left; +} + +payment .message, +.payment .message { + display: block; +} \ No newline at end of file diff --git a/static/stripe/tag.dev.js b/static/stripe/tag.dev.js new file mode 100755 index 00000000..1bbac091 --- /dev/null +++ b/static/stripe/tag.dev.js @@ -0,0 +1,405 @@ +(function() { + var $, global, script, + __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, + __slice = [].slice; + + $ = this.jQuery || this.Zepto; + + if (!$) { + throw 'jQuery/Zepto required'; + } + + this.PaymentTag = (function() { + + PaymentTag.replaceTags = function(element) { + var _this = this; + if (element == null) { + element = document.body; + } + return $('payment, .payment-tag', element).each(function(i, tag) { + return new _this({ + el: tag + }).render(); + }); + }; + + PaymentTag.prototype.defaults = { + tokenName: 'stripe_token', + token: true, + cvc: true + }; + + function PaymentTag(options) { + var _ref, _ref1; + if (options == null) { + options = {}; + } + this.changeCardType = __bind(this.changeCardType, this); + + this.restrictNumeric = __bind(this.restrictNumeric, this); + + this.formatNumber = __bind(this.formatNumber, this); + + this.handleToken = __bind(this.handleToken, this); + + this.submit = __bind(this.submit, this); + + this.$el = options.el || ''; + this.$el = $(this.$el); + options.key || (options.key = this.$el.attr('key') || this.$el.attr('data-key')); + if ((_ref = options.cvc) == null) { + options.cvc = !((this.$el.attr('nocvc') != null) || (this.$el.attr('data-nocvc') != null)); + } + if ((_ref1 = options.token) == null) { + options.token = !((this.$el.attr('notoken') != null) || (this.$el.attr('data-notoken') != null)); + } + options.form || (options.form = this.$el.parents('form')); + this.options = $.extend({}, this.defaults, options); + if (this.options.key) { + this.setKey(this.options.key); + } + this.setForm(this.options.form); + this.$el.delegate('.number input', 'keydown', this.formatNumber); + this.$el.delegate('.number input', 'keyup', this.changeCardType); + this.$el.delegate('input[type=tel]', 'keypress', this.restrictNumeric); + } + + PaymentTag.prototype.render = function() { + this.$el.html(this.constructor.view(this)); + this.$number = this.$('.number input'); + this.$cvc = this.$('.cvc input'); + this.$expiryMonth = this.$('.expiry input.expiryMonth'); + this.$expiryYear = this.$('.expiry input.expiryYear'); + this.$message = this.$('.message'); + return this; + }; + + PaymentTag.prototype.renderToken = function(token) { + this.$token = $(''); + this.$token.attr('name', this.options.tokenName); + this.$token.val(token); + return this.$el.html(this.$token); + }; + + PaymentTag.prototype.setForm = function($form) { + this.$form = $($form); + return this.$form.bind('submit.payment', this.submit); + }; + + PaymentTag.prototype.setKey = function(key) { + this.key = key; + return Stripe.setPublishableKey(this.key); + }; + + PaymentTag.prototype.validate = function() { + var expiry, valid; + valid = true; + this.$('div').removeClass('invalid'); + this.$message.empty(); + if (!Stripe.validateCardNumber(this.$number.val())) { + valid = false; + this.handleError({ + code: 'invalid_number' + }); + } + expiry = this.expiryVal(); + if (!Stripe.validateExpiry(expiry.month, expiry.year)) { + valid = false; + this.handleError({ + code: 'expired_card' + }); + } + if (this.options.cvc && !Stripe.validateCVC(this.$cvc.val())) { + valid = false; + this.handleError({ + code: 'invalid_cvc' + }); + } + if (!valid) { + this.$('.invalid input:first').select(); + } + return valid; + }; + + PaymentTag.prototype.createToken = function(callback) { + var complete, expiry, + _this = this; + complete = function(status, response) { + if (response.error) { + return callback(response.error); + } else { + return callback(null, response); + } + }; + expiry = this.expiryVal(); + return Stripe.createToken({ + number: this.$number.val(), + cvc: this.$cvc.val() || null, + exp_month: expiry.month, + exp_year: expiry.year + }, complete); + }; + + PaymentTag.prototype.submit = function(e) { + if (e != null) { + e.preventDefault(); + } + if (e != null) { + e.stopImmediatePropagation(); + } + if (!this.validate()) { + return; + } + if (this.pending) { + return; + } + this.pending = true; + this.disableInputs(); + this.trigger('pending'); + this.$el.addClass('pending'); + return this.createToken(this.handleToken); + }; + + PaymentTag.prototype.handleToken = function(err, response) { + this.enableInputs(); + this.trigger('complete'); + this.$el.removeClass('pending'); + this.pending = false; + if (err) { + return this.handleError(err); + } else { + this.trigger('success', response); + this.$el.addClass('success'); + if (this.options.token) { + this.renderToken(response.id); + } + this.$form.unbind('submit.payment', this.submit); + return this.$form.submit(); + } + }; + + PaymentTag.prototype.formatNumber = function(e) { + var digit, lastDigits, value; + digit = String.fromCharCode(e.which); + if (!/^\d+$/.test(digit)) { + return; + } + value = this.$number.val(); + if (Stripe.cardType(value) === 'American Express') { + lastDigits = value.match(/^(\d{4}|\d{4}\s\d{6})$/); + } else { + lastDigits = value.match(/(?:^|\s)(\d{4})$/); + } + if (lastDigits) { + return this.$number.val(value + ' '); + } + }; + + PaymentTag.prototype.restrictNumeric = function(e) { + var char; + if (e.shiftKey || e.metaKey) { + return true; + } + if (e.which === 0) { + return true; + } + char = String.fromCharCode(e.which); + return !/[A-Za-z]/.test(char); + }; + + PaymentTag.prototype.cardTypes = { + 'Visa': 'visa', + 'American Express': 'amex', + 'MasterCard': 'mastercard', + 'Discover': 'discover', + 'Unknown': 'unknown' + }; + + PaymentTag.prototype.changeCardType = function(e) { + var map, name, type, _ref; + type = Stripe.cardType(this.$number.val()); + if (!this.$number.hasClass(type)) { + _ref = this.cardTypes; + for (name in _ref) { + map = _ref[name]; + this.$number.removeClass(map); + } + return this.$number.addClass(this.cardTypes[type]); + } + }; + + PaymentTag.prototype.handleError = function(err) { + if (err.message) { + this.$message.text(err.message); + } + switch (err.code) { + case 'card_declined': + this.invalidInput(this.$number); + break; + case 'invalid_number': + case 'incorrect_number': + this.invalidInput(this.$number); + break; + case 'invalid_expiry_month': + this.invalidInput(this.$expiryMonth); + break; + case 'invalid_expiry_year': + case 'expired_card': + this.invalidInput(this.$expiryYear); + break; + case 'invalid_cvc': + this.invalidInput(this.$cvc); + } + this.$('label.invalid:first input').select(); + this.trigger('error', err); + return typeof console !== "undefined" && console !== null ? console.error('Stripe error:', err) : void 0; + }; + + PaymentTag.prototype.invalidInput = function(input) { + input.parent().addClass('invalid'); + return this.trigger('invalid', [input.attr('name'), input]); + }; + + PaymentTag.prototype.expiryVal = function() { + var month, prefix, trim, year; + trim = function(s) { + return s.replace(/^\s+|\s+$/g, ''); + }; + month = trim(this.$expiryMonth.val()); + year = trim(this.$expiryYear.val()); + if (year.length === 2) { + prefix = (new Date).getFullYear(); + prefix = prefix.toString().slice(0, 2); + year = prefix + year; + } + return { + month: month, + year: year + }; + }; + + PaymentTag.prototype.enableInputs = function() { + var $elements; + $elements = this.$el.add(this.$form).find(':input'); + return $elements.each(function() { + var $item, _ref; + $item = $(this); + return $elements.attr('disabled', (_ref = $item.data('olddisabled')) != null ? _ref : false); + }); + }; + + PaymentTag.prototype.disableInputs = function() { + var $elements; + $elements = this.$el.add(this.$form).find(':input'); + return $elements.each(function() { + var $item; + $item = $(this); + $item.data('olddisabled', $item.attr('disabled')); + return $item.attr('disabled', true); + }); + }; + + PaymentTag.prototype.trigger = function() { + var data, event, _ref; + event = arguments[0], data = 2 <= arguments.length ? __slice.call(arguments, 1) : []; + return (_ref = this.$el).trigger.apply(_ref, ["" + event + ".payment"].concat(__slice.call(data))); + }; + + PaymentTag.prototype.$ = function(sel) { + return $(sel, this.$el); + }; + + return PaymentTag; + + })(); + + document.createElement('payment'); + + if (typeof module !== "undefined" && module !== null) { + module.exports = PaymentTag; + } + + global = this; + + if (global.Stripe) { + $(function() { + return typeof PaymentTag.replaceTags === "function" ? PaymentTag.replaceTags() : void 0; + }); + } else { + script = document.createElement('script'); + script.onload = script.onreadystatechange = function() { + if (!global.Stripe) { + return; + } + if (script.done) { + return; + } + script.done = true; + return typeof PaymentTag.replaceTags === "function" ? PaymentTag.replaceTags() : void 0; + }; + script.src = 'https://js.stripe.com/v1/'; + $(function() { + var sibling; + sibling = document.getElementsByTagName('script')[0]; + return sibling != null ? sibling.parentNode.insertBefore(script, sibling) : void 0; + }); + } + +}).call(this); +(function() { + this.PaymentTag || (this.PaymentTag = {}); + this.PaymentTag["view"] = function(__obj) { + if (!__obj) __obj = {}; + var __out = [], __capture = function(callback) { + var out = __out, result; + __out = []; + callback.call(this); + result = __out.join(''); + __out = out; + return __safe(result); + }, __sanitize = function(value) { + if (value && value.ecoSafe) { + return value; + } else if (typeof value !== 'undefined' && value != null) { + return __escape(value); + } else { + return ''; + } + }, __safe, __objSafe = __obj.safe, __escape = __obj.escape; + __safe = __obj.safe = function(value) { + if (value && value.ecoSafe) { + return value; + } else { + if (!(typeof value !== 'undefined' && value != null)) value = ''; + var result = new String(value); + result.ecoSafe = true; + return result; + } + }; + if (!__escape) { + __escape = __obj.escape = function(value) { + return ('' + value) + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"'); + }; + } + (function() { + (function() { + + __out.push('\n\n
    \n \n\n \n
    \n\n
    \n \n\n \n \n
    \n\n'); + + if (this.options.cvc) { + __out.push('\n
    \n \n \n
    \n'); + } + + __out.push('\n'); + + }).call(this); + + }).call(__obj); + __obj.safe = __objSafe, __obj.escape = __escape; + return __out.join(''); + }; +}).call(this); diff --git a/static/stripe/tag.js b/static/stripe/tag.js new file mode 100755 index 00000000..dcd82026 --- /dev/null +++ b/static/stripe/tag.js @@ -0,0 +1 @@ +(function(){var e,t,n,r=function(e,t){return function(){return e.apply(t,arguments)}},i=[].slice;e=this.jQuery||this.Zepto;if(!e)throw"jQuery/Zepto required";this.PaymentTag=function(){function t(t){var n,i;t==null&&(t={}),this.changeCardType=r(this.changeCardType,this),this.restrictNumeric=r(this.restrictNumeric,this),this.formatNumber=r(this.formatNumber,this),this.handleToken=r(this.handleToken,this),this.submit=r(this.submit,this),this.$el=t.el||"",this.$el=e(this.$el),t.key||(t.key=this.$el.attr("key")||this.$el.attr("data-key")),(n=t.cvc)==null&&(t.cvc=this.$el.attr("nocvc")==null&&this.$el.attr("data-nocvc")==null),(i=t.token)==null&&(t.token=this.$el.attr("notoken")==null&&this.$el.attr("data-notoken")==null),t.form||(t.form=this.$el.parents("form")),this.options=e.extend({},this.defaults,t),this.options.key&&this.setKey(this.options.key),this.setForm(this.options.form),this.$el.delegate(".number input","keydown",this.formatNumber),this.$el.delegate(".number input","keyup",this.changeCardType),this.$el.delegate("input[type=tel]","keypress",this.restrictNumeric)}return t.replaceTags=function(t){var n=this;return t==null&&(t=document.body),e("payment, .payment-tag",t).each(function(e,t){return(new n({el:t})).render()})},t.prototype.defaults={tokenName:"stripe_token",token:!0,cvc:!0},t.prototype.render=function(){return this.$el.html(this.constructor.view(this)),this.$number=this.$(".number input"),this.$cvc=this.$(".cvc input"),this.$expiryMonth=this.$(".expiry input.expiryMonth"),this.$expiryYear=this.$(".expiry input.expiryYear"),this.$message=this.$(".message"),this},t.prototype.renderToken=function(t){return this.$token=e(''),this.$token.attr("name",this.options.tokenName),this.$token.val(t),this.$el.html(this.$token)},t.prototype.setForm=function(t){return this.$form=e(t),this.$form.bind("submit.payment",this.submit)},t.prototype.setKey=function(e){return this.key=e,Stripe.setPublishableKey(this.key)},t.prototype.validate=function(){var e,t;return t=!0,this.$("div").removeClass("invalid"),this.$message.empty(),Stripe.validateCardNumber(this.$number.val())||(t=!1,this.handleError({code:"invalid_number"})),e=this.expiryVal(),Stripe.validateExpiry(e.month,e.year)||(t=!1,this.handleError({code:"expired_card"})),this.options.cvc&&!Stripe.validateCVC(this.$cvc.val())&&(t=!1,this.handleError({code:"invalid_cvc"})),t||this.$(".invalid input:first").select(),t},t.prototype.createToken=function(e){var t,n,r=this;return t=function(t,n){return n.error?e(n.error):e(null,n)},n=this.expiryVal(),Stripe.createToken({number:this.$number.val(),cvc:this.$cvc.val()||null,exp_month:n.month,exp_year:n.year},t)},t.prototype.submit=function(e){e!=null&&e.preventDefault(),e!=null&&e.stopImmediatePropagation();if(!this.validate())return;if(this.pending)return;return this.pending=!0,this.disableInputs(),this.trigger("pending"),this.$el.addClass("pending"),this.createToken(this.handleToken)},t.prototype.handleToken=function(e,t){return this.enableInputs(),this.trigger("complete"),this.$el.removeClass("pending"),this.pending=!1,e?this.handleError(e):(this.trigger("success",t),this.$el.addClass("success"),this.options.token&&this.renderToken(t.id),this.$form.unbind("submit.payment",this.submit),this.$form.submit())},t.prototype.formatNumber=function(e){var t,n,r;t=String.fromCharCode(e.which);if(!/^\d+$/.test(t))return;r=this.$number.val(),Stripe.cardType(r)==="American Express"?n=r.match(/^(\d{4}|\d{4}\s\d{6})$/):n=r.match(/(?:^|\s)(\d{4})$/);if(n)return this.$number.val(r+" ")},t.prototype.restrictNumeric=function(e){var t;return e.shiftKey||e.metaKey?!0:e.which===0?!0:(t=String.fromCharCode(e.which),!/[A-Za-z]/.test(t))},t.prototype.cardTypes={Visa:"visa","American Express":"amex",MasterCard:"mastercard",Discover:"discover",Unknown:"unknown"},t.prototype.changeCardType=function(e){var t,n,r,i;r=Stripe.cardType(this.$number.val());if(!this.$number.hasClass(r)){i=this.cardTypes;for(n in i)t=i[n],this.$number.removeClass(t);return this.$number.addClass(this.cardTypes[r])}},t.prototype.handleError=function(e){e.message&&this.$message.text(e.message);switch(e.code){case"card_declined":this.invalidInput(this.$number);break;case"invalid_number":case"incorrect_number":this.invalidInput(this.$number);break;case"invalid_expiry_month":this.invalidInput(this.$expiryMonth);break;case"invalid_expiry_year":case"expired_card":this.invalidInput(this.$expiryYear);break;case"invalid_cvc":this.invalidInput(this.$cvc)}return this.$("label.invalid:first input").select(),this.trigger("error",e),typeof console!="undefined"&&console!==null?console.error("Stripe error:",e):void 0},t.prototype.invalidInput=function(e){return e.parent().addClass("invalid"),this.trigger("invalid",[e.attr("name"),e])},t.prototype.expiryVal=function(){var e,t,n,r;return n=function(e){return e.replace(/^\s+|\s+$/g,"")},e=n(this.$expiryMonth.val()),r=n(this.$expiryYear.val()),r.length===2&&(t=(new Date).getFullYear(),t=t.toString().slice(0,2),r=t+r),{month:e,year:r}},t.prototype.enableInputs=function(){var t;return t=this.$el.add(this.$form).find(":input"),t.each(function(){var n,r;return n=e(this),t.attr("disabled",(r=n.data("olddisabled"))!=null?r:!1)})},t.prototype.disableInputs=function(){var t;return t=this.$el.add(this.$form).find(":input"),t.each(function(){var t;return t=e(this),t.data("olddisabled",t.attr("disabled")),t.attr("disabled",!0)})},t.prototype.trigger=function(){var e,t,n;return t=arguments[0],e=2<=arguments.length?i.call(arguments,1):[],(n=this.$el).trigger.apply(n,[""+t+".payment"].concat(i.call(e)))},t.prototype.$=function(t){return e(t,this.$el)},t}(),document.createElement("payment"),typeof module!="undefined"&&module!==null&&(module.exports=PaymentTag),t=this,t.Stripe?e(function(){return typeof PaymentTag.replaceTags=="function"?PaymentTag.replaceTags():void 0}):(n=document.createElement("script"),n.onload=n.onreadystatechange=function(){if(!t.Stripe)return;if(n.done)return;return n.done=!0,typeof PaymentTag.replaceTags=="function"?PaymentTag.replaceTags():void 0},n.src="https://js.stripe.com/v1/",e(function(){var e;return e=document.getElementsByTagName("script")[0],e!=null?e.parentNode.insertBefore(n,e):void 0}))}).call(this),function(){this.PaymentTag||(this.PaymentTag={}),this.PaymentTag.view=function(e){e||(e={});var t=[],n=function(e){var n=t,r;return t=[],e.call(this),r=t.join(""),t=n,i(r)},r=function(e){return e&&e.ecoSafe?e:typeof e!="undefined"&&e!=null?o(e):""},i,s=e.safe,o=e.escape;return i=e.safe=function(e){if(e&&e.ecoSafe)return e;if(typeof e=="undefined"||e==null)e="";var t=new String(e);return t.ecoSafe=!0,t},o||(o=e.escape=function(e){return(""+e).replace(/&/g,"&").replace(//g,">").replace(/"/g,""")}),function(){(function(){t.push('\n\n
    \n \n\n \n
    \n\n
    \n \n\n \n \n
    \n\n'),this.options.cvc&&t.push('\n
    \n \n \n
    \n'),t.push("\n")}).call(this)}.call(e),e.safe=s,e.escape=o,t.join("")}}.call(this); \ No newline at end of file diff --git a/static/stripe/themes/amex.png b/static/stripe/themes/amex.png new file mode 100755 index 0000000000000000000000000000000000000000..959159f33b60fb015904bea326027996d1fe6761 GIT binary patch literal 4308 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 literal 0 HcmV?d00001 diff --git a/static/stripe/themes/discover.png b/static/stripe/themes/discover.png new file mode 100755 index 0000000000000000000000000000000000000000..6d8860bd311ea3ec10614c269547f55e272650fb GIT binary patch literal 3817 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 literal 0 HcmV?d00001 diff --git a/static/stripe/themes/generic.png b/static/stripe/themes/generic.png new file mode 100755 index 0000000000000000000000000000000000000000..19e4d008880a3210c4ce5cd7f8e2d7a6afe43b85 GIT binary patch literal 3389 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 aArj}DE8JgTq>c$T=AHfKHij_J`u_nUN0oN~ literal 0 HcmV?d00001 diff --git a/static/stripe/themes/stripe.css b/static/stripe/themes/stripe.css new file mode 100755 index 00000000..916751f2 --- /dev/null +++ b/static/stripe/themes/stripe.css @@ -0,0 +1,152 @@ +payment, .payment { + position: relative; + display: block; + + border-radius: 5px; + padding: 15px 20px; + max-width: 300px; + overflow: hidden; + + box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-sizing: border-box; + + font-size: 12px; + text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; + font-family: 'Helvetica Neue', Helvetica, Arial Geneva, sans-serif; + + background: #FFF; + background-image: -o-linear-gradient(#FFF, #F9FAFA); + background-image: -ms-linear-gradient(#FFF, #F9FAFA); + background-image: -moz-linear-gradient(#FFF, #F9FAFA); + background-image: -webkit-linear-gradient(#FEFEFE, #F9FAFA); + background-image: linear-gradient(#FFF, #F9FAFA); + + -moz-box-shadow: 0 0 2px rgba(80,84,92,0.3), 0 1px 1px rgba(80,84,92,0.5); + -webkit-box-shadow: 0 0 2px rgba(80, 84, 92, 0.3), 0 1px 1px rgba(80, 84, 92, 0.5); + -ms-box-shadow: 0 0 2px rgba(80, 84, 92, 0.3), 0 1px 1px rgba(80, 84, 92, 0.5); + box-shadow: 0 0 2px rgba(80, 84, 92, 0.3), 0 1px 1px rgba(80, 84, 92, 0.5); +} + +payment ::-webkit-input-placeholder, +.payment ::-webkit-input-placeholder { + text-transform: uppercase; +} + +payment label, .payment label { + display: block; + color: #999; + font-size: 13px; + padding: 5px 0; + text-transform: uppercase; + text-shadow: 0 1px 0 #FFF; + + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; +} + +payment input, .payment input { + font-size: 13px; + padding: 5px 5px; + border: 1px solid #BBB; + border-top-color: #999; + box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1); + border-radius: 3px; + + -webkit-transition: -webkit-box-shadow 0.1s ease-in-out; + -moz-transition: -moz-box-shadow 0.1s ease-in-out; + transition: -moz-box-shadow 0.1s ease-in-out; + + box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-sizing: border-box; + + text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; + font-family: 'Helvetica Neue', Helvetica, Arial Geneva, sans-serif; + font-size: 14px; +} + +payment input:focus, .payment input:focus { + border: 1px solid #5695DB; + outline: none; + -webkit-box-shadow: inset 0 1px 2px #DDD, 0px 0 5px #5695DB; + -moz-box-shadow: 0 0 5px #5695db; + box-shadow: inset 0 1px 2px #DDD, 0px 0 5px #5695DB; +} + +payment .invalid input, .payment .invalid input { + outline: none; + border-color: rgba(255, 0, 0, 0.5); + -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,0.20), 0 1px 5px 0 rgba(255, 0, 0, 0.4); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.20), 0 1px 5px 0 rgba(255, 0, 0, 0.4); + -ms-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.20), 0 1px 5px 0 rgba(255, 0, 0, 0.4); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.20), 0 1px 5px 0 rgba(255, 0, 0, 0.4); +} + +payment input:disabled, .payment input:disabled { + opacity: 0.5; +} + +payment .number, +.payment .number { + margin-bottom: 8px; +} + +payment .number input, .payment .number input { + padding: 7px 40px 7px 7px; + background: #FFF url(generic.png) 98.5% 20% no-repeat; + width: 100%; +} + +payment .number input.visa, .payment .number input.visa { + background-image: url(visa.png); +} + +payment .number input.mastercard, .payment .number input.mastercard { + background-image: url(mastercard.png); +} + +payment .number input.discover, .payment .number input.discover { + background-image: url(discover.png); +} + +payment .number input.amex, .payment .number input.amex { + background-image: url(amex.png); +} + +payment .expiry input, payment .cvc input { + width: 45px; +} + +payment .expiry em { + font-size: 10px; + font-style: normal; + display: none; +} + +payment .cvc, +.payment .cvc { + float: right; + text-align: right; +} + +payment .expiry, +.payment .expiry { + float: left; +} + +payment .message, +.payment .message { + display: block; +} + +payment.pending, +.payment.pending, +payment.success, +.payment.success { + background: #FFF url(spinner.gif) center center no-repeat; + min-height: 130px; +} \ No newline at end of file diff --git a/static/stripe/themes/visa.png b/static/stripe/themes/visa.png new file mode 100755 index 0000000000000000000000000000000000000000..e39df455ae2d977c66f514d3f89c3c5b2153ffd1 GIT binary patch literal 3819 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 literal 0 HcmV?d00001 From 55d170e798a5aa132b1d20f4581447634048ae19 Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Wed, 29 Aug 2012 08:22:35 -0700 Subject: [PATCH 027/107] trivial change to try to trigger the display of the latest commit in github for newpayment --- payment/templates/stripe.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payment/templates/stripe.html b/payment/templates/stripe.html index 9ab3a306..c0dfbacb 100644 --- a/payment/templates/stripe.html +++ b/payment/templates/stripe.html @@ -13,7 +13,7 @@ {% endblock %} {% block doccontent %} -Stripe Test: +Stripe Test!:
    From 8c030df830f9a2417c8c20cbc58cece1104e957d Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Wed, 29 Aug 2012 15:56:14 -0400 Subject: [PATCH 028/107] adding some tests for my recent commits hooray --- core/tests.py | 49 +++++++++++++++++++++++++++++++++++++++++++++-- frontend/views.py | 7 ++++++- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/core/tests.py b/core/tests.py index 8ae5f7ef..99e78a5c 100755 --- a/core/tests.py +++ b/core/tests.py @@ -11,12 +11,14 @@ from django.conf import settings from django.contrib.comments.models import Comment from django.contrib.contenttypes.models import ContentType from django.contrib.sites.models import Site +from django.http import Http404 from regluit.payment.models import Transaction -from regluit.core.models import Campaign, Work, UnglueitError, Edition, RightsHolder, Claim, Key +from regluit.core.models import Campaign, Work, UnglueitError, Edition, RightsHolder, Claim, Key, Ebook from regluit.core import bookloader, models, search, goodreads, librarything from regluit.core import isbn from regluit.payment.parameters import PAYMENT_TYPE_AUTHORIZATION +from regluit.frontend.views import safe_get_work from regluit.core import tasks from celery.task.sets import TaskSet @@ -590,4 +592,47 @@ class EncryptedKeyTest(TestCase): self.assertEqual(Key.objects.filter(name=name)[0].value, value) # just checking that the encrypted value is not the same as the value self.assertNotEqual(key.encrypted_value, value) # is this always true? - \ No newline at end of file + +class SafeGetWorkTest(TestCase): + def test_good_work(self): + w1 = models.Work() + w1.save() + w2 = models.Work() + w2.save() + w2_id = w2.id + bookloader.merge_works(w1, w2) + + work = safe_get_work(w1.id) + self.assertEqual(work, w1) + work = safe_get_work(w2_id) + self.assertEqual(work, w1) + self.assertRaises(Http404, safe_get_work, 3) + +class DownloadPageTest(TestCase): + def test_download_page(self): + w = models.Work() + w.save() + + e1 = models.Edition() + e1.work = w + e2 = models.Edition() + e2.work = w + e1.save() + e2.save() + + eb1 = models.Ebook() + eb1.url = "http://example.com" + eb1.edition = e1 + eb1.unglued = True + + eb2 = models.Ebook() + eb2.url = "http://example2.com" + eb2.edition = e2 + + eb1.save() + eb2.save() + + anon_client = Client() + response = anon_client.get("/work/%s/download/" % w.id) + self.assertContains(response, "http://example.com", count=2) + self.assertContains(response, "http://example2.com", count=2) \ No newline at end of file diff --git a/frontend/views.py b/frontend/views.py index e74af20a..18974ad5 100755 --- a/frontend/views.py +++ b/frontend/views.py @@ -96,6 +96,9 @@ def next(request): return HttpResponseRedirect('/') def safe_get_work(work_id): + """ + use this rather than querying the db directly for a work by id + """ try: work = models.Work.objects.get(id = work_id) except models.Work.DoesNotExist: @@ -124,7 +127,6 @@ def stub(request): def acks(request, work): return render(request,'front_matter.html', {'campaign': work.last_campaign()}) - def work(request, work_id, action='display'): work = safe_get_work(work_id) if action == "acks": @@ -2044,6 +2046,9 @@ def campaign_archive_js(request): return response def lockss(request, work_id): + """ + manifest pages for lockss harvester + """ work = safe_get_work(work_id) try: ebook = work.ebooks().filter(unglued=True)[0] From e44052712c7ec735a93913491273e542ef4bc9dd Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Thu, 30 Aug 2012 09:24:42 -0700 Subject: [PATCH 029/107] Now able to wrap stripe functionality in a StripeClient object that is tied to a specific api_key. We use separate api_key for Gluejar and for partner non-profit --- payment/stripelib.py | 161 ++++++++++++++++++++++++++++++++----------- 1 file changed, 120 insertions(+), 41 deletions(-) diff --git a/payment/stripelib.py b/payment/stripelib.py index 1d386e0c..1ae422b9 100644 --- a/payment/stripelib.py +++ b/payment/stripelib.py @@ -1,5 +1,9 @@ import stripe +# if customer.id doesn't exist, create one and then charge the customer +# we probably should ask our users whether they are ok with our creating a customer id account -- or ask for credit +# card info each time.... + # should load the keys for Stripe from db -- but for now just hardcode here try: from regluit.core.models import Key @@ -11,59 +15,134 @@ try: except Exception, e: STRIPE_PK = 'pk_0EajXPn195ZdF7Gt7pCxsqRhNN5BF' STRIPE_SK = 'sk_0EajIO4Dnh646KPIgLWGcO10f9qnH' - STRIPE_PARTNER_PK = None - STRIPE_PARTNER_SK = None + STRIPE_PARTNER_PK ='pk_0AnIkNu4WRiJYzxMKgruiUwxzXP2T' + STRIPE_PARTNER_SK = 'sk_0AnIvBrnrJoFpfD3YmQBVZuTUAbjs' stripe.api_key = STRIPE_SK +# https://stripe.com/docs/testing + +TEST_CARDS = ( + ('4242424242424242', 'Visa'), + ('4012888888881881', 'Visa'), + ('5555555555554444', 'MasterCard'), + ('5105105105105100', 'MasterCard'), + ('378282246310005', 'American Express'), + ('371449635398431', 'American Express'), + ('6011111111111117', 'Discover'), + ('6011000990139424', 'Discover'), + ('30569309025904', "Diner's Club"), + ('38520000023237', "Diner's Club"), + ('3530111333300000', 'JCB'), + ('3566002020360505','JCB') +) + +ERROR_TESTING = ( + ('ADDRESS1_ZIP_FAIL', '4000000000000010', 'address_line1_check and address_zip_check will both fail'), + ('ADDRESS1_FAIL', '4000000000000028', 'address_line1_check will fail.'), + ('ADDRESS_ZIP_FAIL', '4000000000000036', 'address_zip_check will fail.'), + ('CVC_CHECK_FAIL', '4000000000000101', 'cvc_check will fail.'), + ('CHARGE_FAIL', '4000000000000341', 'Attaching this card to a Customer object will succeed, but attempts to charge the customer will fail.'), + ('CHARGE_DECLINE', '4000000000000002', 'Charges with this card will always be declined.') +) + +#card_declined: Use this special card number - 4000000000000002. +#incorrect_number: Use a number that fails the Luhn check, e.g. 4242424242424241. +#invalid_expiry_month: Use an invalid month e.g. 13. +#invalid_expiry_year: Use a year in the past e.g. 1970. +#invalid_cvc: Use a two digit number e.g. 99. + + +def filter_none(d): + return dict([(k,v) for (k,v) in d.items() if v is not None]) # if you create a Customer object, then you'll be able to charge multiple times. You can create a customer with a token. # https://stripe.com/docs/tutorials/charges -def create_customer (card=None, description=None, email=None, account_balance=None, plan=None, trial_end=None): - """card is a dictionary or a token""" - # https://stripe.com/docs/api?lang=python#create_customer - - customer = stripe.Customer.create( - card=card, - description=description, - email=email, - account_balance=account_balance, - plan=plan, - trial_end=trial_end - ) +def card (number=TEST_CARDS[0][0], exp_month='01', exp_year='2020', cvc=None, name=None, + address_line1=None, address_line2=None, address_zip=None, address_state=None, address_country=None): - # customer.id is useful to save in db - return customer - -# if customer.id doesn't exist, create one and then charge the customer -# we probably should ask our users whether they are ok with our creating a customer id account -- or ask for credit -# card info each time.... - -def create_charge(amount, currency="usd", customer=None, card=None, description=None ): -# https://stripe.com/docs/api?lang=python#create_charge -# customer or card required but not both -# charge the Customer instead of the card -# amount in cents - charge = stripe.Charge.create( - amount=int(100*amount), # in cents - currency=currency, - customer=customer.id, - description=description - ) + card = { + "number": number, + "exp_month": str(exp_month), + "exp_year": str(exp_year), + "cvc": str(cvc) if cvc is not None else None, + "name": name, + "address_line1": address_line1, + "address_line2": address_line2, + "address_zip": address_zip, + "address_state": address_state, + "address_country": address_country + } - return charge + return filter_none(card) -def refund_charge(id): - # https://stripe.com/docs/api?lang=python#refund_charge - ch = stripe.Charge.retrieve(id) - ch.refund() - return ch -def list_all_charges(count=None, offset=None, customer=None): - # https://stripe.com/docs/api?lang=python#list_charges - return stripe.Charge.all(count=count, offset=offset, customer=customer) +class StripeClient(object): + def __init__(self, api_key=STRIPE_SK): + self.api_key = api_key + @property + def charge(self): + return stripe.Charge(api_key=self.api_key) + + @property + def customer(self): + return stripe.Customer(api_key=self.api_key) + + @property + def token(self): + return stripe.Token(api_key=self.api_key) + + @property + def event(self): + return stripe.Event(api_key=self.api_key) + + def create_token(self, card): + return stripe.Token(api_key=self.api_key).create(card=card) + + def create_customer (self, card=None, description=None, email=None, account_balance=None, plan=None, trial_end=None): + """card is a dictionary or a token""" + # https://stripe.com/docs/api?lang=python#create_customer + + customer = stripe.Customer(api_key=self.api_key).create( + card=card, + description=description, + email=email, + account_balance=account_balance, + plan=plan, + trial_end=trial_end + ) + + # customer.id is useful to save in db + return customer + + + def create_charge(self, amount, currency="usd", customer=None, card=None, description=None ): + # https://stripe.com/docs/api?lang=python#create_charge + # customer or card required but not both + # charge the Customer instead of the card + # amount in cents + charge = stripe.Charge(api_key=self.api_key).create( + amount=int(100*amount), # in cents + currency=currency, + customer=customer.id, + description=description + ) + + return charge + + def refund_charge(self, charge_id): + # https://stripe.com/docs/api?lang=python#refund_charge + ch = stripe.Charge(api_key=self.api_key).retrieve(charge_id) + ch.refund() + return ch + + def list_all_charges(self, count=None, offset=None, customer=None): + # https://stripe.com/docs/api?lang=python#list_charges + return stripe.Charge(api_key=self.api_key).all(count=count, offset=offset, customer=customer) + + # key entities: Charge, Customer, Token, Event # IPNs/webhooks: https://stripe.com/docs/webhooks From 5ac4976950b8ec5c5f316317067e294f5f57b12e Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Thu, 30 Aug 2012 16:51:59 -0700 Subject: [PATCH 030/107] Basic test for creating Customer, a charge, and then deleting Customer --- payment/stripelib.py | 63 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 5 deletions(-) diff --git a/payment/stripelib.py b/payment/stripelib.py index 1ae422b9..ac397019 100644 --- a/payment/stripelib.py +++ b/payment/stripelib.py @@ -1,5 +1,16 @@ +# https://github.com/stripe/stripe-python +# https://stripe.com/docs/api?lang=python#top + import stripe +try: + import unittest + from unittest import TestCase +except: + from django.test import TestCase + from django.utils import unittest + + # if customer.id doesn't exist, create one and then charge the customer # we probably should ask our users whether they are ok with our creating a customer id account -- or ask for credit # card info each time.... @@ -13,12 +24,16 @@ try: STRIPE_PARTNER_SK = Key.objects.get(name="STRIPE_PARTNER_SK").value logger.info('Successful loading of STRIPE_*_KEYs') except Exception, e: + # currently test keys for Gluejar and for raymond.yee@gmail.com as standin for non-profit STRIPE_PK = 'pk_0EajXPn195ZdF7Gt7pCxsqRhNN5BF' STRIPE_SK = 'sk_0EajIO4Dnh646KPIgLWGcO10f9qnH' STRIPE_PARTNER_PK ='pk_0AnIkNu4WRiJYzxMKgruiUwxzXP2T' STRIPE_PARTNER_SK = 'sk_0AnIvBrnrJoFpfD3YmQBVZuTUAbjs' +# set default stripe api_key to that of unglue.it + stripe.api_key = STRIPE_SK + # https://stripe.com/docs/testing TEST_CARDS = ( @@ -82,6 +97,8 @@ class StripeClient(object): def __init__(self, api_key=STRIPE_SK): self.api_key = api_key + # key entities: Charge, Customer, Token, Event + @property def charge(self): return stripe.Charge(api_key=self.api_key) @@ -142,12 +159,48 @@ class StripeClient(object): # https://stripe.com/docs/api?lang=python#list_charges return stripe.Charge(api_key=self.api_key).all(count=count, offset=offset, customer=customer) - -# key entities: Charge, Customer, Token, Event -# IPNs/webhooks: https://stripe.com/docs/webhooks +# what to work through? -# charge object: https://stripe.com/docs/api?lang=python#charge_object -# need to study to figure out db schema +#pledge scenario +# + +class PledgeScenarioTest(TestCase): + def setUp(self): + print "in setUp" + self.sc = StripeClient(api_key=STRIPE_SK) + card0 = card() + self.good_cust = self.sc.create_customer(card=card0, description="test good customer", email="raymond.yee@gmail.com") + # set up a Customer with a good card tied to Gluejar + def test_charge_good_cust(self): + charge = self.sc.create_charge(10, customer=self.good_cust, description="$10 for good cust") + print charge + def tearDown(self): + # clean up stuff we create in test + print "in tearDown" + self.good_cust.delete() + print "list of customers", self.sc.customer.all() + print "list of charges", self.sc.charge.all() + print "list of events", self.sc.event.all() + +def suite(): + + testcases = [PledgeScenarioTest] + #testcases = [] + suites = unittest.TestSuite([unittest.TestLoader().loadTestsFromTestCase(testcase) for testcase in testcases]) + #suites.addTest(LibraryThingTest('test_cache')) + #suites.addTest(SettingsTest('test_dev_me_alignment')) # give option to test this alignment + return suites + + + +# IPNs/webhooks: https://stripe.com/docs/webhooks +# how to use pending_webhooks ? # all events # https://stripe.com/docs/api?lang=python#list_events + +if __name__ == '__main__': + #unittest.main() + suites = suite() + #suites = unittest.defaultTestLoader.loadTestsFromModule(__import__('__main__')) + unittest.TextTestRunner().run(suites) From 618eda4aa5f9e263cef89241dcfecab3ec2ea8fc Mon Sep 17 00:00:00 2001 From: eric Date: Fri, 31 Aug 2012 02:49:04 -0400 Subject: [PATCH 031/107] eliminate db skew between prod and relaunch --- ...aign_description__chg_field_campaign_de.py | 260 ------------------ payment/migrations/0008_auto__add_credit.py | 194 ------------- ..._name__add_field_transaction_ack_link__.py | 199 -------------- 3 files changed, 653 deletions(-) delete mode 100644 core/migrations/0038_auto__add_badge__chg_field_campaign_description__chg_field_campaign_de.py delete mode 100644 payment/migrations/0008_auto__add_credit.py delete mode 100644 payment/migrations/0008_auto__add_field_transaction_ack_name__add_field_transaction_ack_link__.py diff --git a/core/migrations/0038_auto__add_badge__chg_field_campaign_description__chg_field_campaign_de.py b/core/migrations/0038_auto__add_badge__chg_field_campaign_description__chg_field_campaign_de.py deleted file mode 100644 index 5b1388f8..00000000 --- a/core/migrations/0038_auto__add_badge__chg_field_campaign_description__chg_field_campaign_de.py +++ /dev/null @@ -1,260 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding model 'Badge' - db.create_table('core_badge', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('name', self.gf('django.db.models.fields.CharField')(max_length=72, blank=True)), - ('description', self.gf('django.db.models.fields.TextField')(default='', null=True)), - )) - db.send_create_signal('core', ['Badge']) - - # Changing field 'Campaign.description' - db.alter_column('core_campaign', 'description', self.gf('ckeditor.fields.RichTextField')(null=True)) - - # Changing field 'Campaign.details' - db.alter_column('core_campaign', 'details', self.gf('ckeditor.fields.RichTextField')(null=True)) - - # Adding M2M table for field badges on 'UserProfile' - db.create_table('core_userprofile_badges', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('userprofile', models.ForeignKey(orm['core.userprofile'], null=False)), - ('badge', models.ForeignKey(orm['core.badge'], null=False)) - )) - db.create_unique('core_userprofile_badges', ['userprofile_id', 'badge_id']) - - - def backwards(self, orm): - - # Deleting model 'Badge' - db.delete_table('core_badge') - - # Changing field 'Campaign.description' - db.alter_column('core_campaign', 'description', self.gf('django.db.models.fields.TextField')(null=True)) - - # Changing field 'Campaign.details' - db.alter_column('core_campaign', 'details', self.gf('django.db.models.fields.TextField')(null=True)) - - # Removing M2M table for field badges on 'UserProfile' - db.delete_table('core_userprofile_badges') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'core.author': { - 'Meta': {'object_name': 'Author'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'editions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'authors'", 'symmetrical': 'False', 'to': "orm['core.Edition']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '500'}) - }, - 'core.badge': { - 'Meta': {'object_name': 'Badge'}, - 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '72', 'blank': 'True'}) - }, - 'core.campaign': { - 'Meta': {'object_name': 'Campaign'}, - 'activated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'amazon_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'deadline': ('django.db.models.fields.DateTimeField', [], {}), - 'description': ('ckeditor.fields.RichTextField', [], {'null': 'True'}), - 'details': ('ckeditor.fields.RichTextField', [], {'null': 'True', 'blank': 'True'}), - 'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'null': 'True', 'to': "orm['core.Edition']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'left': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}), - 'license': ('django.db.models.fields.CharField', [], {'default': "'CC BY-NC-ND'", 'max_length': '255'}), - 'managers': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'campaigns'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True'}), - 'paypal_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), - 'status': ('django.db.models.fields.CharField', [], {'default': "'INITIALIZED'", 'max_length': '15', 'null': 'True'}), - 'target': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}), - 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'to': "orm['core.Work']"}) - }, - 'core.campaignaction': { - 'Meta': {'object_name': 'CampaignAction'}, - 'campaign': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'actions'", 'to': "orm['core.Campaign']"}), - 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'timestamp': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '15'}) - }, - 'core.celerytask': { - 'Meta': {'object_name': 'CeleryTask'}, - 'active': ('django.db.models.fields.NullBooleanField', [], {'default': 'True', 'null': 'True', 'blank': 'True'}), - 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 6, 16, 7, 34, 319207)', 'auto_now_add': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True'}), - 'function_args': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'function_name': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'task_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tasks'", 'null': 'True', 'to': "orm['auth.User']"}) - }, - 'core.claim': { - 'Meta': {'object_name': 'Claim'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'rights_holder': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'claim'", 'to': "orm['core.RightsHolder']"}), - 'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '7'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'claim'", 'to': "orm['auth.User']"}), - 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'claim'", 'to': "orm['core.Work']"}) - }, - 'core.ebook': { - 'Meta': {'object_name': 'Ebook'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ebooks'", 'to': "orm['core.Edition']"}), - 'format': ('django.db.models.fields.CharField', [], {'max_length': '25'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'provider': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'rights': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '1024'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}) - }, - 'core.edition': { - 'Meta': {'object_name': 'Edition'}, - 'cover_image': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'public_domain': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'publication_date': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), - 'publisher': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), - 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editions'", 'null': 'True', 'to': "orm['core.Work']"}) - }, - 'core.identifier': { - 'Meta': {'unique_together': "(('type', 'value'),)", 'object_name': 'Identifier'}, - 'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'identifiers'", 'null': 'True', 'to': "orm['core.Edition']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '4'}), - 'value': ('django.db.models.fields.CharField', [], {'max_length': '31'}), - 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'identifiers'", 'to': "orm['core.Work']"}) - }, - 'core.key': { - 'Meta': {'object_name': 'Key'}, - 'encrypted_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}) - }, - 'core.premium': { - 'Meta': {'object_name': 'Premium'}, - 'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '0'}), - 'campaign': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'premiums'", 'null': 'True', 'to': "orm['core.Campaign']"}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'limit': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '2'}) - }, - 'core.rightsholder': { - 'Meta': {'object_name': 'RightsHolder'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'email': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rights_holder'", 'to': "orm['auth.User']"}), - 'rights_holder_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'core.subject': { - 'Meta': {'ordering': "['name']", 'object_name': 'Subject'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}), - 'works': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'subjects'", 'symmetrical': 'False', 'to': "orm['core.Work']"}) - }, - 'core.userprofile': { - 'Meta': {'object_name': 'UserProfile'}, - 'badges': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'holders'", 'symmetrical': 'False', 'to': "orm['core.Badge']"}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'facebook_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}), - 'goodreads_auth_secret': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'goodreads_auth_token': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'goodreads_user_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), - 'goodreads_user_link': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), - 'goodreads_user_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), - 'home_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'librarything_id': ('django.db.models.fields.CharField', [], {'max_length': '31', 'blank': 'True'}), - 'pic_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), - 'tagline': ('django.db.models.fields.CharField', [], {'max_length': '140', 'blank': 'True'}), - 'twitter_id': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"}) - }, - 'core.waswork': { - 'Meta': {'object_name': 'WasWork'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'moved': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), - 'was': ('django.db.models.fields.IntegerField', [], {'unique': 'True'}), - 'work': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Work']"}) - }, - 'core.wishes': { - 'Meta': {'object_name': 'Wishes', 'db_table': "'core_wishlist_works'"}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'source': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}), - 'wishlist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Wishlist']"}), - 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wishes'", 'to': "orm['core.Work']"}) - }, - 'core.wishlist': { - 'Meta': {'object_name': 'Wishlist'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'wishlist'", 'unique': 'True', 'to': "orm['auth.User']"}), - 'works': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'wishlists'", 'symmetrical': 'False', 'through': "orm['core.Wishes']", 'to': "orm['core.Work']"}) - }, - 'core.work': { - 'Meta': {'ordering': "['title']", 'object_name': 'Work'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}), - 'num_wishes': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'openlibrary_lookup': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'}) - } - } - - complete_apps = ['core'] diff --git a/payment/migrations/0008_auto__add_credit.py b/payment/migrations/0008_auto__add_credit.py deleted file mode 100644 index 51167f06..00000000 --- a/payment/migrations/0008_auto__add_credit.py +++ /dev/null @@ -1,194 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding model 'Credit' - db.create_table('payment_credit', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('user', self.gf('django.db.models.fields.related.OneToOneField')(related_name='credit', unique=True, to=orm['auth.User'])), - ('balance', self.gf('django.db.models.fields.IntegerField')(default=0)), - ('pledged', self.gf('django.db.models.fields.IntegerField')(default=0)), - ('last_activity', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)), - )) - db.send_create_signal('payment', ['Credit']) - - - def backwards(self, orm): - - # Deleting model 'Credit' - db.delete_table('payment_credit') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'core.campaign': { - 'Meta': {'object_name': 'Campaign'}, - 'activated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'amazon_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'deadline': ('django.db.models.fields.DateTimeField', [], {}), - 'description': ('ckeditor.fields.RichTextField', [], {'null': 'True'}), - 'details': ('ckeditor.fields.RichTextField', [], {'null': 'True', 'blank': 'True'}), - 'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'null': 'True', 'to': "orm['core.Edition']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'left': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}), - 'license': ('django.db.models.fields.CharField', [], {'default': "'CC BY-NC-ND'", 'max_length': '255'}), - 'managers': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'campaigns'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True'}), - 'paypal_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), - 'status': ('django.db.models.fields.CharField', [], {'default': "'INITIALIZED'", 'max_length': '15', 'null': 'True'}), - 'target': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}), - 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'to': "orm['core.Work']"}) - }, - 'core.edition': { - 'Meta': {'object_name': 'Edition'}, - 'cover_image': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'public_domain': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'publication_date': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), - 'publisher': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), - 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editions'", 'null': 'True', 'to': "orm['core.Work']"}) - }, - 'core.premium': { - 'Meta': {'object_name': 'Premium'}, - 'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '0'}), - 'campaign': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'premiums'", 'null': 'True', 'to': "orm['core.Campaign']"}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'limit': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '2'}) - }, - 'core.wishes': { - 'Meta': {'object_name': 'Wishes', 'db_table': "'core_wishlist_works'"}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'source': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}), - 'wishlist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Wishlist']"}), - 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wishes'", 'to': "orm['core.Work']"}) - }, - 'core.wishlist': { - 'Meta': {'object_name': 'Wishlist'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'wishlist'", 'unique': 'True', 'to': "orm['auth.User']"}), - 'works': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'wishlists'", 'symmetrical': 'False', 'through': "orm['core.Wishes']", 'to': "orm['core.Work']"}) - }, - 'core.work': { - 'Meta': {'ordering': "['title']", 'object_name': 'Work'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}), - 'num_wishes': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'openlibrary_lookup': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'}) - }, - 'payment.credit': { - 'Meta': {'object_name': 'Credit'}, - 'balance': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'last_activity': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'pledged': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'credit'", 'unique': 'True', 'to': "orm['auth.User']"}) - }, - 'payment.paymentresponse': { - 'Meta': {'object_name': 'PaymentResponse'}, - 'api': ('django.db.models.fields.CharField', [], {'max_length': '64'}), - 'correlation_id': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'info': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True'}), - 'status': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}), - 'timestamp': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), - 'transaction': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['payment.Transaction']"}) - }, - 'payment.receiver': { - 'Meta': {'object_name': 'Receiver'}, - 'amount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), - 'currency': ('django.db.models.fields.CharField', [], {'max_length': '10'}), - 'email': ('django.db.models.fields.CharField', [], {'max_length': '64'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'local_status': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), - 'primary': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'reason': ('django.db.models.fields.CharField', [], {'max_length': '64'}), - 'status': ('django.db.models.fields.CharField', [], {'max_length': '64'}), - 'transaction': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['payment.Transaction']"}), - 'txn_id': ('django.db.models.fields.CharField', [], {'max_length': '64'}) - }, - 'payment.transaction': { - 'Meta': {'object_name': 'Transaction'}, - 'amount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), - 'anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'approved': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'campaign': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Campaign']", 'null': 'True'}), - 'currency': ('django.db.models.fields.CharField', [], {'default': "'USD'", 'max_length': '10', 'null': 'True'}), - 'date_authorized': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_executed': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'date_expired': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'date_payment': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'error': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'}), - 'execution': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'host': ('django.db.models.fields.CharField', [], {'default': "'amazon'", 'max_length': '32'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'list': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Wishlist']", 'null': 'True'}), - 'local_status': ('django.db.models.fields.CharField', [], {'default': "'NONE'", 'max_length': '32', 'null': 'True'}), - 'max_amount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), - 'pay_key': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), - 'preapproval_key': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), - 'premium': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Premium']", 'null': 'True'}), - 'reason': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), - 'receipt': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'}), - 'secret': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), - 'status': ('django.db.models.fields.CharField', [], {'default': "'None'", 'max_length': '32'}), - 'target': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'type': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}) - } - } - - complete_apps = ['payment'] diff --git a/payment/migrations/0008_auto__add_field_transaction_ack_name__add_field_transaction_ack_link__.py b/payment/migrations/0008_auto__add_field_transaction_ack_name__add_field_transaction_ack_link__.py deleted file mode 100644 index 92e7ffdb..00000000 --- a/payment/migrations/0008_auto__add_field_transaction_ack_name__add_field_transaction_ack_link__.py +++ /dev/null @@ -1,199 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'Transaction.ack_name' - db.add_column('payment_transaction', 'ack_name', - self.gf('django.db.models.fields.CharField')(max_length=64, null=True), - keep_default=False) - - # Adding field 'Transaction.ack_link' - db.add_column('payment_transaction', 'ack_link', - self.gf('django.db.models.fields.URLField')(max_length=200, null=True), - keep_default=False) - - # Adding field 'Transaction.ack_dedication' - db.add_column('payment_transaction', 'ack_dedication', - self.gf('django.db.models.fields.CharField')(max_length=140, null=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Transaction.ack_name' - db.delete_column('payment_transaction', 'ack_name') - - # Deleting field 'Transaction.ack_link' - db.delete_column('payment_transaction', 'ack_link') - - # Deleting field 'Transaction.ack_dedication' - db.delete_column('payment_transaction', 'ack_dedication') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'core.campaign': { - 'Meta': {'object_name': 'Campaign'}, - 'activated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'amazon_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'deadline': ('django.db.models.fields.DateTimeField', [], {}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'details': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'null': 'True', 'to': "orm['core.Edition']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'left': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}), - 'license': ('django.db.models.fields.CharField', [], {'default': "'CC BY-NC-ND'", 'max_length': '255'}), - 'managers': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'campaigns'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True'}), - 'paypal_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), - 'status': ('django.db.models.fields.CharField', [], {'default': "'INITIALIZED'", 'max_length': '15', 'null': 'True'}), - 'target': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}), - 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'to': "orm['core.Work']"}) - }, - 'core.edition': { - 'Meta': {'object_name': 'Edition'}, - 'cover_image': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'public_domain': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'publication_date': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), - 'publisher': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), - 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editions'", 'null': 'True', 'to': "orm['core.Work']"}) - }, - 'core.premium': { - 'Meta': {'object_name': 'Premium'}, - 'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '0'}), - 'campaign': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'premiums'", 'null': 'True', 'to': "orm['core.Campaign']"}), - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'limit': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '2'}) - }, - 'core.wishes': { - 'Meta': {'object_name': 'Wishes', 'db_table': "'core_wishlist_works'"}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'source': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}), - 'wishlist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Wishlist']"}), - 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wishes'", 'to': "orm['core.Work']"}) - }, - 'core.wishlist': { - 'Meta': {'object_name': 'Wishlist'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'wishlist'", 'unique': 'True', 'to': "orm['auth.User']"}), - 'works': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'wishlists'", 'symmetrical': 'False', 'through': "orm['core.Wishes']", 'to': "orm['core.Work']"}) - }, - 'core.work': { - 'Meta': {'ordering': "['title']", 'object_name': 'Work'}, - 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}), - 'num_wishes': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'openlibrary_lookup': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'}) - }, - 'payment.paymentresponse': { - 'Meta': {'object_name': 'PaymentResponse'}, - 'api': ('django.db.models.fields.CharField', [], {'max_length': '64'}), - 'correlation_id': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'info': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True'}), - 'status': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}), - 'timestamp': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), - 'transaction': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['payment.Transaction']"}) - }, - 'payment.receiver': { - 'Meta': {'object_name': 'Receiver'}, - 'amount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), - 'currency': ('django.db.models.fields.CharField', [], {'max_length': '10'}), - 'email': ('django.db.models.fields.CharField', [], {'max_length': '64'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'local_status': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), - 'primary': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'reason': ('django.db.models.fields.CharField', [], {'max_length': '64'}), - 'status': ('django.db.models.fields.CharField', [], {'max_length': '64'}), - 'transaction': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['payment.Transaction']"}), - 'txn_id': ('django.db.models.fields.CharField', [], {'max_length': '64'}) - }, - 'payment.transaction': { - 'Meta': {'object_name': 'Transaction'}, - 'ack_dedication': ('django.db.models.fields.CharField', [], {'max_length': '140', 'null': 'True'}), - 'ack_link': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}), - 'ack_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), - 'amount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), - 'anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'approved': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), - 'campaign': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Campaign']", 'null': 'True'}), - 'currency': ('django.db.models.fields.CharField', [], {'default': "'USD'", 'max_length': '10', 'null': 'True'}), - 'date_authorized': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_executed': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'date_expired': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), - 'date_payment': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), - 'error': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'}), - 'execution': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'host': ('django.db.models.fields.CharField', [], {'default': "'amazon'", 'max_length': '32'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'list': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Wishlist']", 'null': 'True'}), - 'local_status': ('django.db.models.fields.CharField', [], {'default': "'NONE'", 'max_length': '32', 'null': 'True'}), - 'max_amount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), - 'pay_key': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), - 'preapproval_key': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), - 'premium': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Premium']", 'null': 'True'}), - 'reason': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), - 'receipt': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'}), - 'secret': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), - 'status': ('django.db.models.fields.CharField', [], {'default': "'None'", 'max_length': '32'}), - 'target': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'type': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}) - } - } - - complete_apps = ['payment'] \ No newline at end of file From 7c4a2b94f08e7572f1a7a26243a35db6a2eed966 Mon Sep 17 00:00:00 2001 From: eric Date: Fri, 31 Aug 2012 02:50:38 -0400 Subject: [PATCH 032/107] documented up_or_down parameter on pledge_modified signal handler --- core/signals.py | 1 + 1 file changed, 1 insertion(+) diff --git a/core/signals.py b/core/signals.py index 880c438e..dce58143 100644 --- a/core/signals.py +++ b/core/signals.py @@ -173,6 +173,7 @@ def handle_pledge_modified(sender, transaction=None, up_or_down=None, **kwargs): # we need to know if pledges were modified up or down because Amazon handles the # transactions in different ways, resulting in different user-visible behavior; # we need to set expectations appropriately + # up_or_down is 'increased', 'decreased', or 'canceled' if transaction==None or up_or_down==None: return notification.queue([transaction.user], "pledge_status_change", { From 5140943ad8f98df2b6ca9c07b1758a347ccc63cc Mon Sep 17 00:00:00 2001 From: eric Date: Fri, 31 Aug 2012 02:53:29 -0400 Subject: [PATCH 033/107] django to 1.4.1 [#30997753] --- requirements.pip | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.pip b/requirements.pip index 4570e060..c0d9f83e 100644 --- a/requirements.pip +++ b/requirements.pip @@ -1,4 +1,4 @@ -Django==1.3.1 +Django==1.4.1 MySQL-python==1.2.3 south django-extensions @@ -19,8 +19,8 @@ freebase django-endless-pagination django-selectable pytz -django-notification git+ssh://git@github.com/Gluejar/boto.git@2.3.0 +https://github.com/aladagemre/django-notification/tarball/master fabric paramiko pyasn1 From f299d9ecf7bc211106efca44b6d1cd1d46822728 Mon Sep 17 00:00:00 2001 From: eric Date: Fri, 31 Aug 2012 03:12:15 -0400 Subject: [PATCH 034/107] rip out paypal and amazon code --- frontend/templates/campaign_detail.html | 24 - frontend/templates/pledge.html | 2 - frontend/views.py | 2 - payment/amazon.py | 870 ------------------- payment/baseprocessor.py | 182 ++++ payment/manager.py | 18 +- payment/paypal.py | 1023 ----------------------- payment/urls.py | 5 - payment/views.py | 1 - settings/common.py | 6 +- 10 files changed, 185 insertions(+), 1948 deletions(-) delete mode 100644 payment/amazon.py create mode 100644 payment/baseprocessor.py delete mode 100644 payment/paypal.py diff --git a/frontend/templates/campaign_detail.html b/frontend/templates/campaign_detail.html index c652c25c..dcf791fc 100644 --- a/frontend/templates/campaign_detail.html +++ b/frontend/templates/campaign_detail.html @@ -2,22 +2,6 @@ {% load humanize %} {% url privacy as privacyurl %} -{% block extra_head %} - - - {% if embedded %} - - {% endif %} - -{% endblock %} {% block content %} @@ -52,13 +36,5 @@

    No associated transactions

    {% endif %} - {% if embedded %} - - {% endif %} {% endblock %} diff --git a/frontend/templates/pledge.html b/frontend/templates/pledge.html index 03f06ffe..352913f1 100644 --- a/frontend/templates/pledge.html +++ b/frontend/templates/pledge.html @@ -108,8 +108,6 @@
    -
    (You will be sent to {{ payment_processor|capfirst }} -{% if faqmenu == 'modify' %}, if needed, to modify your pledge. We hope you won't, but of course you're also free to cancel your pledge{% else %} to complete your pledge.{% endif %}.)
    {% if transaction.ack_name %} diff --git a/frontend/views.py b/frontend/views.py index 6987a0a6..b51d934a 100755 --- a/frontend/views.py +++ b/frontend/views.py @@ -52,7 +52,6 @@ from regluit.payment.manager import PaymentManager from regluit.payment.models import Transaction from regluit.payment.parameters import TARGET_TYPE_CAMPAIGN, TARGET_TYPE_DONATION, PAYMENT_TYPE_AUTHORIZATION from regluit.payment.parameters import TRANSACTION_STATUS_ACTIVE, TRANSACTION_STATUS_COMPLETE, TRANSACTION_STATUS_CANCELED, TRANSACTION_STATUS_ERROR, TRANSACTION_STATUS_FAILED, TRANSACTION_STATUS_INCOMPLETE -from regluit.payment.paypal import Preapproval from regluit.core import goodreads from tastypie.models import ApiKey from regluit.payment.models import Transaction @@ -584,7 +583,6 @@ class DonationView(TemplateView): class PledgeView(FormView): template_name="pledge.html" form_class = CampaignPledgeForm - embedded = False def get(self, request, *args, **kwargs): # change the default behavior from https://code.djangoproject.com/browser/django/tags/releases/1.3.1/django/views/generic/edit.py#L129 diff --git a/payment/amazon.py b/payment/amazon.py deleted file mode 100644 index 0349f075..00000000 --- a/payment/amazon.py +++ /dev/null @@ -1,870 +0,0 @@ -from regluit.payment.parameters import * -from django.core.urlresolvers import reverse -from django.conf import settings -from regluit.payment.models import Transaction, PaymentResponse -from boto.fps.connection import FPSConnection -from django.http import HttpResponse, HttpRequest, HttpResponseRedirect, HttpResponseBadRequest, HttpResponseForbidden -from datetime import timedelta -from regluit.utils.localdatetime import now, zuluformat -from boto import handler -from boto.resultset import ResultSet -from boto.exception import FPSResponseError -import xml.sax - -import traceback -import datetime -import logging -import urlparse -import time -import urllib - -logger = logging.getLogger(__name__) - -AMAZON_STATUS_SUCCESS_ABT = 'SA' -AMAZON_STATUS_SUCCESS_ACH = 'SB' -AMAZON_STATUS_SUCCESS_CREDIT = 'SC' -AMAZON_STATUS_ERROR = 'SE' -AMAZON_STATUS_ADBANDONED = 'A' -AMAZON_STATUS_EXCEPTION = 'CE' -AMAZON_STATUS_PAYMENT_MISMATCH = 'PE' -AMAZON_STATUS_INCOMPLETE = 'NP' -AMAZON_STATUS_NOT_REGISTERED = 'NM' - -AMAZON_STATUS_CANCELED = 'Canceled' -AMAZON_STATUS_FAILURE = 'Failure' -AMAZON_STATUS_PENDING = 'Pending' -AMAZON_STATUS_RESERVED = 'Reserved' -AMAZON_STATUS_SUCCESS = 'Success' - -AMAZON_IPN_STATUS_CANCELED = 'CANCELED' -AMAZON_IPN_STATUS_FAILURE = 'FAILURE' -AMAZON_IPN_STATUS_PENDING = 'PENDING' -AMAZON_IPN_STATUS_RESERVED = 'RESERVED' -AMAZON_IPN_STATUS_SUCCESS = 'SUCCESS' - -AMAZON_NOTIFICATION_TYPE_STATUS = 'TransactionStatus' -AMAZON_NOTIFICATION_TYPE_CANCEL = 'TokenCancellation' - -AMAZON_OPERATION_TYPE_PAY = 'PAY' -AMAZON_OPERATION_TYPE_REFUND = 'REFUND' -AMAZON_OPERATION_TYPE_CANCEL = 'CANCEL' - -# load FPS_ACCESS_KEY and FPS_SECRET_KEY from the database if possible -try: - from regluit.core.models import Key - FPS_ACCESS_KEY = Key.objects.get(name="FPS_ACCESS_KEY").value - FPS_SECRET_KEY = Key.objects.get(name="FPS_SECRET_KEY").value - logger.info('Successful loading of FPS_*_KEYs') -except Exception, e: - logger.info('EXCEPTION: unsuccessful loading of FPS_*_KEYs: {0}'.format(e)) - -def get_ipn_url(): - - if settings.IPN_SECURE_URL: - return settings.BASE_URL_SECURE + reverse('HandleIPN', args=["amazon"]) - else: - return settings.BASE_URL + reverse('HandleIPN', args=["amazon"]) - -def ProcessIPN(request): - ''' - IPN handler for amazon. Here is a litle background on amazon IPNS - http://docs.amazonwebservices.com/AmazonFPS/latest/FPSAdvancedGuide/APPNDX_IPN.html - - notificationType: Can either be TransactionStatus of TokenCancellation - status: One of the defined IPN status codes - operation: The type of operation - callerReference: The reference to find the transaction - - The IPN is called for the following cases: - - A payment or reserve succeeds - A payment or reserve fails - A payment or reserve goes into a pending state - A reserved payment is settled successfully - A reserved payment is not settled successfully - A refund succeeds - A refund fails - A refund goes into a pending state - A payment is canceled - A reserve is canceled - A token is canceled successfully - - ''' - try: - logging.debug("Amazon IPN called") - logging.debug(request.POST) - - uri = request.build_absolute_uri() - parsed_url = urlparse.urlparse(uri) - - connection = FPSConnection(FPS_ACCESS_KEY, FPS_SECRET_KEY, host=settings.AMAZON_FPS_HOST) - - # Check the validity of the IPN - resp = connection.verify_signature("%s://%s%s" %(parsed_url.scheme, - parsed_url.netloc, - parsed_url.path), - request.raw_post_data) - - if not resp[0].VerificationStatus == "Success": - # Error, ignore this IPN - logging.error("Amazon IPN cannot be verified with post data: ") - logging.error(request.raw_post_data) - return HttpResponseForbidden() - - logging.debug("Amazon IPN post data:") - logging.debug(request.POST) - - reference = request.POST['callerReference'] - type = request.POST['notificationType'] - - # In the case of cancelling a token, there is no transaction, so this info is not set - transactionId = request.POST.get('transactionId', None) - date = request.POST.get('transactionDate', None) - operation = request.POST.get('operation', None) - status = request.POST.get('transactionStatus', None) - - logging.info("Received Amazon IPN with the following data:") - logging.info("type = %s" % type) - logging.info("operation = %s" % operation) - logging.info("reference = %s" % reference) - logging.info("status = %s" % status) - - # We should always find the transaction by the token - transaction = Transaction.objects.get(secret=reference) - - if type == AMAZON_NOTIFICATION_TYPE_STATUS: - - - # status update for the token, save the actual value - transaction.local_status = status - - # Now map our local status to the global status codes - if operation == AMAZON_OPERATION_TYPE_PAY: - - - if status == AMAZON_IPN_STATUS_SUCCESS: - transaction.status = TRANSACTION_STATUS_COMPLETE - - elif status == AMAZON_IPN_STATUS_PENDING: - - if transaction.status == TRANSACTION_STATUS_CREATED: - # - # Per the amazon documentation: - # If your IPN receiving service is down for some time, it is possible that our retry mechanism will deliver the IPNs out of order. - # If you receive an IPN for TransactionStatus (IPN), as SUCCESS or FAILURE or RESERVED, - # then after that time ignore any IPN that gives the PENDING status for the transaction - # - transaction.status = TRANSACTION_STATUS_PENDING - else: - transaction.status = TRANSACTION_STATUS_ERROR - - elif operation == AMAZON_OPERATION_TYPE_REFUND: - - if status == AMAZON_IPN_STATUS_SUCCESS: - transaction.status = TRANSACTION_STATUS_REFUNDED - elif status == AMAZON_IPN_STATUS_PENDING: - transaction.status = TRANSACTION_STATUS_PENDING - else: - transaction.status = TRANSACTION_STATUS_ERROR - - elif operation == AMAZON_OPERATION_TYPE_CANCEL: - - if status == AMAZON_IPN_STATUS_SUCCESS: - transaction.status = TRANSACTION_STATUS_COMPLETE - else: - transaction.status = TRANSACTION_STATUS_ERROR - - - elif type == AMAZON_NOTIFICATION_TYPE_CANCEL: - # - # The cancel IPN does not have a transaction ID or transaction status, so make them up - # - transaction.local_status = AMAZON_IPN_STATUS_CANCELED - transaction.status = TRANSACTION_STATUS_CANCELED - status = AMAZON_IPN_STATUS_CANCELED - - - transaction.save() - - # - # This is currently not done in paypal land, but log this IPN since the amazon IPN has good info - # - PaymentResponse.objects.create(api="IPN", - correlation_id = transactionId, - timestamp = date, - info = str(request.POST), - status=status, - transaction=transaction) - - return HttpResponse("Complete") - - except: - traceback.print_exc() - return HttpResponseForbidden() - - -def amazonPaymentReturn(request): - ''' - This is the complete view called after the co-branded API completes. It is called whenever the user - approves a preapproval or a pledge. This URL is set via the PAY api. - ''' - try: - transaction = None - - # pick up all get and post parameters and display - output = "payment complete" - output += request.method + "\n" + str(request.REQUEST.items()) - - - signature = request.GET['signature'] - status = request.GET['status'] - reference = request.GET['callerReference'] - token = request.GET['tokenID'] - - # validate the signature - - uri = request.build_absolute_uri() - parsed_url = urlparse.urlparse(uri) - - connection = FPSConnection(FPS_ACCESS_KEY, FPS_SECRET_KEY, host=settings.AMAZON_FPS_HOST) - - # Check the validity of the IPN - resp = connection.verify_signature("%s://%s%s" %(parsed_url.scheme, - parsed_url.netloc, - parsed_url.path), - urllib.urlencode(request.GET)) - - if not resp[0].VerificationStatus == "Success": - # Error, ignore this - logging.error("amazonPaymentReturn cannot be verified with get data: ") - logging.error(request.GET) - return HttpResponseForbidden() - - logging.debug("amazonPaymentReturn sig verified:") - logging.debug(request.GET) - - # validation of signature ok - # Find the transaction by reference, there should only be one - try: - transaction = Transaction.objects.get(secret=reference) - except: - logging.info("transaction with secret {0}".format(reference)) - return HttpResponseForbidden() - - logging.info("Amazon Co-branded Return URL called for transaction id: %d" % transaction.id) - logging.info(request.GET) - - # - # BUGBUG, for now lets map amazon status code to paypal, just to keep things uninform - # - if transaction.type == PAYMENT_TYPE_INSTANT: - # Instant payments need to be executed now - - # Log the authorize transaction - r = PaymentResponse.objects.create(api="Authorize", - correlation_id = "None", - timestamp = str(datetime.datetime.now()), - info = str(request.GET), - status=status, - transaction=transaction) - - if status == AMAZON_STATUS_SUCCESS_ABT or status == AMAZON_STATUS_SUCCESS_ACH or status == AMAZON_STATUS_SUCCESS_CREDIT: - # The above status code are unique to the return URL and are different than the pay API codes - - # Store the token, we need this for the IPN. - transaction.pay_key = token - - # - # BUGBUG, need to handle multiple recipients - # Send the pay request now to ourselves - # - e = Execute(transaction=transaction) - - if e.success() and not e.error(): - # Success case, save the ID. Our IPN will update the status - print "Amazon Execute returned succesfully" - - else: - logging.error("Amazon payment execution failed: ") - logging.error(e.envelope()) - transaction.status = TRANSACTION_STATUS_ERROR - - # Log the pay transaction - r = PaymentResponse.objects.create(api="Pay", - correlation_id = e.correlation_id(), - timestamp = e.timestamp(), - info = e.envelope(), - status = e.status, - transaction=transaction) - - else: - # We may never see an IPN, set the status here - logging.error("Amazon payment authorization failed: ") - logging.error(request.GET) - transaction.status = TRANSACTION_STATUS_ERROR - - - elif transaction.type == PAYMENT_TYPE_AUTHORIZATION: - # - # Future payments, we only need to store the token. The authorization was requested with the default expiration - # date set in our settings. When we are ready, we can call execute on this - # - transaction.local_status = status - - if status == AMAZON_STATUS_SUCCESS_ABT or status == AMAZON_STATUS_SUCCESS_ACH or status == AMAZON_STATUS_SUCCESS_CREDIT: - - # The above status code are unique to the return URL and are different than the pay API codes - transaction.status = TRANSACTION_STATUS_ACTIVE - transaction.approved = True - transaction.pay_key = token - transaction.save() - - print "Calling CANCEL RELATED" - - # clear out any other active transactions for this user and this campaign - from regluit.payment.manager import PaymentManager - p = PaymentManager() - p.cancel_related_transaction(transaction, status=TRANSACTION_STATUS_ACTIVE, campaign=transaction.campaign) - - else: - # We may never see an IPN, set the status here - transaction.status = TRANSACTION_STATUS_ERROR - - # Log the trasaction - r = PaymentResponse.objects.create(api="Authorize", - correlation_id = "None", - timestamp = str(datetime.datetime.now()), - info = str(request.GET), - status = status, - transaction=transaction) - - else: - # Corrupt transaciton, unknown type - transaction.status = TRANSACTION_STATUS_ERROR - - transaction.save() - - if transaction.status == TRANSACTION_STATUS_ERROR: - # We failed, redirect to a page to allow the user to try again - return_path = "{0}?{1}".format(reverse('pledge_nevermind'), - urllib.urlencode({'tid':transaction.id})) - return_url = urlparse.urljoin(settings.BASE_URL, return_path) - return HttpResponseRedirect(return_url) - - else: - # Not a failure, exact status will be updated by IPN - # Redirect to our pledge success URL - return_path = "{0}?{1}".format(reverse('pledge_complete'), - urllib.urlencode({'tid':transaction.id})) - return_url = urlparse.urljoin(settings.BASE_URL, return_path) - return HttpResponseRedirect(return_url) - - except Exception, e: - logging.error("Amazon co-branded return-url FAILED with exception:") - traceback.print_exc() - - - if transaction: - - # We failed, redirect to a page to allow the user to try again - return_path = "{0}?{1}".format(reverse('pledge_nevermind'), - urllib.urlencode({'tid':transaction.id})) - return_url = urlparse.urljoin(settings.BASE_URL, return_path) - return HttpResponseRedirect(return_url) - - else: - - # - # If we are here, amazon did not give us a caller reference, so we don't know what transaction was cancelled. - # Some kind of cleanup is required. This can happen if there is an error in the amazon API or if the user clicks - # the cancel button. If the case where the user closes the co-branded window or hits the back button, we will never arrive here. - # - return HttpResponseRedirect(settings.BASE_URL) - -class AmazonRequest: - ''' - Handles common information that is processed from the response envelope of the amazon request. - - ''' - - # Global values for the class - response = None - raw_response = None - errorMessage = None - status = None - url = None - - def ack( self ): - return None - - def success(self): - - if self.errorMessage: - return False - else: - return True - - def error(self): - if self.errorMessage: - return True - else: - return False - - def error_data(self): - return None - - def error_id(self): - return None - - def error_string(self): - - return self.errorMessage - - def envelope(self): - - # The envelope is used to store info about this request - if self.response: - return str(self.response) - else: - return None - - def correlation_id(self): - # The correlation ID is unique to each API call - if self.response: - return self.response.TransactionId - else: - return None - - def timestamp(self): - return str(datetime.datetime.now()) - - -class Pay( AmazonRequest ): - - ''' - The pay function generates a redirect URL to approve the transaction - ''' - - def __init__( self, transaction, return_url=None, nevermind_url=None, amount=None, paymentReason=""): - - try: - logging.debug("Amazon PAY operation for transaction ID %d" % transaction.id) - - # Replace our return URL with a redirect through our internal URL - self.original_return_url = return_url - return_url = settings.BASE_URL + reverse('AmazonPaymentReturn') - - self.connection = FPSConnection(FPS_ACCESS_KEY, FPS_SECRET_KEY, host=settings.AMAZON_FPS_HOST) - - receiver_list = [] - receivers = transaction.receiver_set.all() - - if not amount: - amount = 0 - for r in receivers: - amount += r.amount - - logger.info(receiver_list) - - # Data fields for amazon - - expiry = now() + timedelta( days=settings.PREAPPROVAL_PERIOD ) - - data = { - 'amountType':'Maximum', # The transaction amount is the maximum amount - 'callerReference': transaction.secret, - 'currencyCode': 'USD', - 'globalAmountLimit': str(amount), - 'validityExpiry': str(int(time.mktime(expiry.timetuple()))), # use the preapproval date by default - } - - self.url = self.connection.make_url(return_url, paymentReason, "MultiUse", str(amount), **data) - - logging.debug("Amazon PAY redirect url was: %s" % self.url) - - except FPSResponseError as (responseStatus, responseReason, body): - logging.error("Amazon PAY api failed with status: %s, reason: %s and data:" % (responseStatus, responseReason)) - logging.error(body) - self.errorMessage = body - - except: - logging.error("Amazon PAY FAILED with exception:") - traceback.print_exc() - self.errorMessage = "Error: Server Error" - - def api(self): - return "Amazon Co-branded PAY request" - - def exec_status( self ): - return None - - def amount( self ): - return None - - def key( self ): - return None - - def next_url( self ): - return self.url - - def embedded_url(self): - return None - -class Preapproval(Pay): - - def __init__( self, transaction, amount, expiry=None, return_url=None, nevermind_url=None, paymentReason=""): - - # set the expiration date for the preapproval if not passed in. This is what the paypal library does - now_val = now() - if expiry is None: - expiry = now_val + timedelta( days=settings.PREAPPROVAL_PERIOD ) - transaction.date_authorized = now_val - transaction.date_expired = expiry - transaction.save() - - # Call into our parent class - Pay.__init__(self, transaction, return_url=return_url, nevermind_url=nevermind_url, amount=amount, paymentReason=paymentReason) - - -class Execute(AmazonRequest): - - ''' - The Execute function sends an existing token(generated via the URL from the pay operation), and collects - the money. - ''' - - def __init__(self, transaction=None): - - try: - logging.debug("Amazon EXECUTE action for transaction id: %d" % transaction.id) - - # Use the boto class top open a connection - self.connection = FPSConnection(FPS_ACCESS_KEY, FPS_SECRET_KEY, host=settings.AMAZON_FPS_HOST) - self.transaction = transaction - - # BUGBUG, handle multiple receivers! For now we just send the money to ourselves - global_params = {"OverrideIPNURL": get_ipn_url()} - self.raw_response = self.connection.pay(transaction.amount, - transaction.pay_key, - recipientTokenId=None, - callerReference=transaction.secret, - senderReference=None, - recipientReference=None, - senderDescription=None, - recipientDescription=None, - callerDescription=None, - metadata=None, - transactionDate=None, - reserve=False, - extra_params=global_params) - - # - # BUGBUG: - # The boto FPS library throws an exception if an error is generated, we need to do a better - # job of reporting the error when this occurs - # - - self.response = self.raw_response[0] - logging.debug("Amazon EXECUTE response for transaction id: %d" % transaction.id) - logging.debug(str(self.response)) - - self.status = self.response.TransactionStatus - - # - # For amazon, the transactionID is per transaction, not per receiver. For now we will store it in the preapproval key field - # so we can use it to refund or get status later - # - transaction.preapproval_key = self.response.TransactionId - - logging.debug("Amazon EXECUTE API returning with variables:") - logging.debug(locals()) - - except FPSResponseError as (responseStatus, responseReason, body): - - logging.error("Amazon EXECUTE api failed with status: %s, reason: %s and data:" % (responseStatus, responseReason)) - logging.error(body) - self.errorMessage = body - - except: - logging.error("Amazon EXECUTE FAILED with exception:") - traceback.print_exc() - self.errorMessage = "Error: Server Error" - - def api(self): - return "Amazon API Pay" - - def key(self): - # IN paypal land, our key is updated from a preapproval to a pay key here, just return the existing key - return self.transaction.pay_key - - - -class Finish(AmazonRequest): - ''' - The Finish function handles the secondary receiver in a chained payment. Currently not implemented - for amazon - ''' - def __init__(self, transaction): - - try: - - print "Finish" - - except: - traceback.print_exc() - self.errorMessage = "Error: Server Error" - -class PaymentDetails(AmazonRequest): - ''' - Get details about executed PAY operation - - This api must set the following class variables to work with the code in manager.py - - status - one of the global transaction status codes - transactions -- Not supported for amazon, used by paypal - - ''' - def __init__(self, transaction=None): - - try: - logging.debug("Amazon PAYMENTDETAILS API for transaction id: %d" % transaction.id) - - # Use the boto class top open a connection - self.connection = FPSConnection(FPS_ACCESS_KEY, FPS_SECRET_KEY, host=settings.AMAZON_FPS_HOST) - self.transaction = transaction - - if not transaction.preapproval_key: - # This is where we store the transaction ID - self.errorMessage = "No Valid Transaction ID" - return - - # - # We need to reference the transaction ID here, this is stored in the preapproval_key as this - # field is not used for amazon - # - self.raw_response = self.connection.get_transaction_status(transaction.preapproval_key) - self.response = self.raw_response[0] - - logging.debug("Amazon PAYMENTDETAILS API for transaction id: %d returned response:") - logging.debug(self.response) - - # - # Now we need to build values to match the paypal response. - # The two we need are status and and array of transactions. - # - - # Check our status codes, note that these are different than the IPN status codes - self.local_status = self.response.StatusCode - self.message = self.response.StatusMessage - - - if self.local_status == 'Canceled': - self.status = TRANSACTION_STATUS_CANCELED - - elif self.local_status == 'Success': - # - # Note, there is a limitation here. If the current status is refunded, this API will return "Success". - # We must be careful to not overwrite refunded status codes. There is no way that I can find to poll - # to see if a transaction is refunded. I need to investigate all of the data fields and see if we can find - # that information - # - if transaction.status != TRANSACTION_STATUS_REFUNDED: - self.status = TRANSACTION_STATUS_COMPLETE - else: - self.status = TRANSACTION_STATUS_REFUNDED - - elif self.local_status == 'PendingNetworkResponse' or self.local_status == 'PendingVerification': - self.status = TRANSACTION_STATUS_PENDING - elif self.local_status == 'TransactionDenied': - self.status = TRANSACTION_STATUS_FAILED - else: - self.status = TRANSACTION_STATUS_ERROR - - # Amazon does not support receivers at this point - self.transactions = [] - - logging.debug("Amazon PAYMENTDETAILS API returning with variables:") - logging.debug(locals()) - - except FPSResponseError as (responseStatus, responseReason, body): - - logging.error("Amazon PAYMENTDETAILS api failed with status: %s, reason: %s and data:" % (responseStatus, responseReason)) - logging.error(body) - self.errorMessage = body - - except: - logging.error("Amazon PAYMENTDETAILS FAILED with exception:") - self.errorMessage = "Error: ServerError" - traceback.print_exc() - - - -class CancelPreapproval(AmazonRequest): - ''' - Cancels an exisiting token. The current boto FPS library does not directly support - the CancelToken API, just the Cancel API(for real money in-flight or reserved). - ''' - - def __init__(self, transaction): - - try: - logging.debug("Amazon CANCELPREAPPROVAL api called for transaction id: %d" % transaction.id) - - # Use the boto class top open a connection - self.connection = FPSConnection(FPS_ACCESS_KEY, FPS_SECRET_KEY, host=settings.AMAZON_FPS_HOST) - self.transaction = transaction - - global_params = {"OverrideIPNURL": get_ipn_url()} - params = global_params - params['TokenId'] = transaction.pay_key - params['ReasonText'] = "Cancel Reason" - - fps_response = self.connection.make_request("CancelToken", params) - - body = fps_response.read() - - if(fps_response.status == 200): - - rs = ResultSet() - h = handler.XmlHandler(rs, self) - xml.sax.parseString(body, h) - - if rs: - self.raw_response = rs - self.response = self.raw_response[0] - self.status = self.response.TransactionStatus - self.errorMessage = None - - else: - # - # Set an error message and failure status for - # our success() and error() functions - # - self.status = AMAZON_STATUS_FAILURE - self.errorMessage = "%s - %s" % (fps_response.reason, body) - - logging.debug("Amazon CANCELPREAPPROVAL API returning with variables:") - logging.debug(locals()) - - except FPSResponseError as (responseStatus, responseReason, body): - - logging.error("Amazon CANCELPREAPPROVAL api failed with status: %s, reason: %s and data:" % (responseStatus, responseReason)) - logging.error(body) - self.errorMessage = body - - except: - logging.error("Amazon CANCELPREAPPROVAL FAILED with exception:") - traceback.print_exc() - self.errorMessage = "Error: Server Error" - - -class RefundPayment(AmazonRequest): - - def __init__(self, transaction): - - try: - logging.debug("Amazon REFUNDPAYMENT API called for transaction id: %d", transaction.id) - - # Use the boto class top open a connection - self.connection = FPSConnection(FPS_ACCESS_KEY, FPS_SECRET_KEY, host=settings.AMAZON_FPS_HOST) - self.transaction = transaction - - if not transaction.preapproval_key: - # This is where we store the transaction ID - self.errorMessage = "No Valid Transaction ID" - return - - # - # We need to reference the transaction ID here, this is stored in the preapproval_key as this - # field is not used for amazon - # - global_params = {"OverrideIPNURL": get_ipn_url()} - self.raw_response = self.connection.refund(transaction.secret, transaction.preapproval_key, extra_params=global_params) - self.response = self.raw_response[0] - - logging.debug("Amazon REFUNDPAYMENT response was:") - logging.debug(str(self.response)) - - self.status = self.response.TransactionStatus - - logging.debug("Amazon REFUNDPAYMENT API returning with variables:") - logging.debug(locals()) - - except FPSResponseError as (responseStatus, responseReason, body): - - logging.error("Amazon REFUNDPAYMENT api failed with status: %s, reason: %s and data:" % (responseStatus, responseReason)) - logging.error(body) - self.errorMessage = body - - except: - logging.error("Amazon REFUNDPAYMENT FAILED with exception:") - traceback.print_exc() - self.errorMessage = "Error: Server Error" - - -class PreapprovalDetails(AmazonRequest): - ''' - Get details about an authorized token - - This api must set 4 different class variables to work with the code in manager.py - - status - one of the global transaction status codes - approved - boolean value - currency - not used in this API, but we can get some more info via other APIs - TODO - amount - not used in this API, but we can get some more info via other APIs - TODO - - ''' - def __init__(self, transaction=None): - - try: - logging.debug("Amazon PREAPPROVALDETAILS API called for transaction id: %d", transaction.id) - - # Use the boto class top open a connection - self.connection = FPSConnection(FPS_ACCESS_KEY, FPS_SECRET_KEY, host=settings.AMAZON_FPS_HOST) - self.transaction = transaction - - - # - # We need to reference the caller reference here, we may not have a token if the return URL failed - # - self.raw_response = self.connection.get_token_by_caller_reference(transaction.secret) - self.response = self.raw_response - - logging.debug("Amazon PREAPPROVALDETAILS response:") - logging.debug(str(self.response)) - - # - # Look for a token, we store this in the pay_key field - # - self.pay_key = self.response.TokenId - self.local_status = self.response.TokenStatus - - # Possible status for the Token object are Active and Inactive - if self.local_status == 'Active': - self.status = TRANSACTION_STATUS_ACTIVE - self.approved = True - else: - # It is not clear here if this should be failed or cancelled, but we have no way to know - # the token is only active or now, so we will assume it is canceled. - self.status = TRANSACTION_STATUS_CANCELED - self.approved = False - - # Set the other fields that are expected. We don't have values for these now, so just copy the transaction - self.currency = transaction.currency - self.amount = transaction.amount - - logging.debug("Amazon PREAPPROVALDETAILS API returning with variables:") - logging.debug(locals()) - - except FPSResponseError as (responseStatus, responseReason, body): - - logging.error("Amazon PREAPPROVALDETAILS api failed with status: %s, reason: %s and data:" % (responseStatus, responseReason)) - logging.error(body) - self.errorMessage = body - - except: - # If the boto API fails, it also throws an exception and we end up here - logging.error("Amazon PREAPPROVALDETAILS FAILED with exception:") - self.errorMessage = "Error: ServerError" - traceback.print_exc() - \ No newline at end of file diff --git a/payment/baseprocessor.py b/payment/baseprocessor.py new file mode 100644 index 00000000..138c3ec0 --- /dev/null +++ b/payment/baseprocessor.py @@ -0,0 +1,182 @@ +from regluit.payment.models import Transaction, PaymentResponse +from django.http import HttpResponseForbidden +from datetime import timedelta +from regluit.utils.localdatetime import now, zuluformat + +import datetime +import time + + + +def ProcessIPN(request): + return HttpResponseForbidden() + + +class BasePaymentRequest: + ''' + Handles common information incident to payment processing + + ''' + + # Global values for the class + response = None + raw_response = None + errorMessage = None + status = None + url = None + + def ack( self ): + return None + + def success(self): + + if self.errorMessage: + return False + else: + return True + + def error(self): + if self.errorMessage: + return True + else: + return False + + def error_data(self): + return None + + def error_id(self): + return None + + def error_string(self): + return self.errorMessage + + def envelope(self): + # The envelope is used to store info about this request + if self.response: + return str(self.response) + else: + return None + + def correlation_id(self): + return None + + def timestamp(self): + return str(datetime.datetime.now()) + + +class Pay( BasePaymentRequest ): + + ''' + The pay function generates a redirect URL to approve the transaction + ''' + + def __init__( self, transaction, return_url=None, amount=None, paymentReason=""): + self.transaction=transaction + + def api(self): + return "null api" + + def exec_status( self ): + return None + + def amount( self ): + return None + + def key( self ): + return None + + def next_url( self ): + return self.url + +class Preapproval(Pay): + + def __init__( self, transaction, amount, expiry=None, return_url=None, paymentReason=""): + + # set the expiration date for the preapproval if not passed in. This is what the paypal library does + now_val = now() + if expiry is None: + expiry = now_val + timedelta( days=settings.PREAPPROVAL_PERIOD ) + transaction.date_authorized = now_val + transaction.date_expired = expiry + transaction.save() + + # Call into our parent class + Pay.__init__(self, transaction, return_url=return_url, amount=amount, paymentReason=paymentReason) + + +class Execute(BasePaymentRequest): + + ''' + The Execute function sends an existing token(generated via the URL from the pay operation), and collects + the money. + ''' + + def __init__(self, transaction=None): + self.transaction = transaction + + def api(self): + return "Base Pay" + + def key(self): + # IN paypal land, our key is updated from a preapproval to a pay key here, just return the existing key + return self.transaction.pay_key + + + +class Finish(BasePaymentRequest): + ''' + The Finish function handles the secondary receiver in a chained payment. + ''' + def __init__(self, transaction): + + print "Finish" + + +class PaymentDetails(BasePaymentRequest): + ''' + Get details about executed PAY operation + + This api must set the following class variables to work with the code in manager.py + + status - one of the global transaction status codes + transactions -- Not supported for amazon, used by paypal + + ''' + def __init__(self, transaction=None): + self.transaction = transaction + + + +class CancelPreapproval(BasePaymentRequest): + ''' + Cancels an exisiting token. + ''' + + def __init__(self, transaction): + self.transaction = transaction + + +class RefundPayment(BasePaymentRequest): + + def __init__(self, transaction): + self.transaction = transaction + + + + + +class PreapprovalDetails(BasePaymentRequest): + ''' + Get details about an authorized token + + This api must set 4 different class variables to work with the code in manager.py + + status - one of the global transaction status codes + approved - boolean value + currency - not used in this API, but we can get some more info via other APIs - TODO + amount - not used in this API, but we can get some more info via other APIs - TODO + + ''' + def __init__(self, transaction=None): + self.transaction = transaction + \ No newline at end of file diff --git a/payment/manager.py b/payment/manager.py index 505c5f32..27e742a5 100644 --- a/payment/manager.py +++ b/payment/manager.py @@ -4,15 +4,8 @@ from django.contrib.auth.models import User from django.core.urlresolvers import reverse from django.conf import settings from regluit.payment.parameters import * -from regluit.payment.paypal import IPN_SENDER_STATUS_COMPLETED from regluit.payment.signals import transaction_charged, pledge_modified, pledge_created -if settings.PAYMENT_PROCESSOR == 'paypal': - from regluit.payment.paypal import Pay, Finish, Preapproval, ProcessIPN, CancelPreapproval, PaymentDetails, PreapprovalDetails, RefundPayment - from regluit.payment.paypal import Pay as Execute - -elif settings.PAYMENT_PROCESSOR == 'amazon': - from regluit.payment.amazon import Pay, Execute, Finish, Preapproval, ProcessIPN, CancelPreapproval, PaymentDetails, PreapprovalDetails, RefundPayment import uuid import traceback from regluit.utils.localdatetime import now @@ -37,10 +30,7 @@ def append_element(doc, parent, name, text): # at this point, there is no internal context and therefore, the methods of PaymentManager can be recast into static methods class PaymentManager( object ): - - def __init__( self, embedded=False): - self.embedded = embedded - + def processIPN(self, request, module): # Forward to our payment processor @@ -903,11 +893,7 @@ class PaymentManager( object ): t.status = TRANSACTION_STATUS_CREATED t.save() - if self.embedded: - url = p.embedded_url() - logger.info(url) - else: - url = p.next_url() + url = p.next_url() logger.info("Pledge Success: " + url) return t, url diff --git a/payment/paypal.py b/payment/paypal.py deleted file mode 100644 index 0d3dd26a..00000000 --- a/payment/paypal.py +++ /dev/null @@ -1,1023 +0,0 @@ -from regluit.payment.parameters import * -from django.core.urlresolvers import reverse -from django.conf import settings -from regluit.payment.models import Transaction, Receiver -from django.contrib.auth.models import User -from django.utils import simplejson as json -from django.utils.xmlutils import SimplerXMLGenerator -from django.db import IntegrityError -from django.db.models.query_utils import Q -from django.shortcuts import render_to_response -from django.template import RequestContext - -from datetime import timedelta -from regluit.utils.localdatetime import now, zuluformat -import dateutil - -import dateutil.parser -import hashlib -import httplib -import traceback -import uuid -import os -import urllib -import urllib2 -import logging -import random -import commands -import smtplib -import urlparse -import decimal -import sys - -logger = logging.getLogger(__name__) - -# transaction_type constants -IPN_TYPE_PAYMENT = 'Adaptive Payment PAY' -IPN_TYPE_ADJUSTMENT = 'Adjustment' -IPN_TYPE_PREAPPROVAL = 'Adaptive Payment PREAPPROVAL' - -#pay API status constants -# NONE' is not something the API produces but is particular to our implementation -IPN_PAY_STATUS_NONE = 'NONE' - - -#The following apply to INSTANT PAYMENTS -#https://cms.paypal.com/us/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_api_APPayAPI -#CREATED - The payment request was received; funds will be transferred once the payment is approved -#COMPLETED - The payment was successful -#INCOMPLETE - Some transfers succeeded and some failed for a parallel payment or, for a delayed chained payment, secondary receivers have not been paid -#ERROR - The payment failed and all attempted transfers failed or all completed transfers were successfully reversed -#REVERSALERROR - One or more transfers failed when attempting to reverse a payment -#PROCESSING - The payment is in progress -#PENDING - The payment is awaiting processing - -IPN_PAY_STATUS_CREATED = 'CREATED' -IPN_PAY_STATUS_COMPLETED = 'COMPLETED' -IPN_PAY_STATUS_INCOMPLETE = 'INCOMPLETE' -IPN_PAY_STATUS_ERROR = 'ERROR' -IPN_PAY_STATUS_REVERSALERROR = 'REVERSALERROR' -IPN_PAY_STATUS_PROCESSING = 'PROCESSING' -IPN_PAY_STATUS_PENDING = 'PENDING' - -# particular to preapprovals -# https://cms.paypal.com/us/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_api_APPreapprovalDetails -#ACTIVE - The preapproval is active -#CANCELED - The preapproval was explicitly canceled by the sender or by PayPal -#DEACTIVED - The preapproval is not active; you can be reactivate it by resetting the personal identification number (PIN) or by contacting PayPal - -IPN_PREAPPROVAL_STATUS_ACTIVE = "ACTIVE" -IPN_PREAPPROVAL_STATUS_CANCELED = "CANCELED" -IPN_PREAPPROVAL_STATUS_DEACTIVED = "DEACTIVED" - -# https://cms.paypal.com/us/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_api_APIPN -#COMPLETED - The sender's transaction has completed -#PENDING - The transaction is awaiting further processing -#CREATED - The payment request was received; funds will be transferred once approval is received -#PARTIALLY_REFUNDED - Transaction was partially refunded -#DENIED - The transaction was rejected by the receiver -#PROCESSING - The transaction is in progress -#REVERSED - The payment was returned to the sender -#REFUNDED - The payment was refunded -#FAILED - The payment failed - -IPN_SENDER_STATUS_COMPLETED = 'COMPLETED' -IPN_SENDER_STATUS_PENDING = 'PENDING' -IPN_SENDER_STATUS_CREATED = 'CREATED' -IPN_SENDER_STATUS_PARTIALLY_REFUNDED = 'PARTIALLY_REFUNDED' -IPN_SENDER_STATUS_DENIED = 'DENIED' -IPN_SENDER_STATUS_PROCESSING = 'PROCESSING' -IPN_SENDER_STATUS_REVERSED = 'REVERSED' -IPN_SENDER_STATUS_REFUNDED = 'REFUNDED' -IPN_SENDER_STATUS_FAILED = 'FAILED' - -# action_type constants -IPN_ACTION_TYPE_PAY = 'PAY' -IPN_ACTION_TYPE_CREATE = 'CREATE' - -# individual sender transaction constants (???) -IPN_TXN_STATUS_COMPLETED = 'Completed' -IPN_TXN_STATUS_PENDING = 'Pending' -IPN_TXN_STATUS_REFUNDED = 'Refunded' - -# adaptive payment adjusted IPN reason codes -IPN_REASON_CODE_CHARGEBACK_SETTLEMENT = 'Chargeback Settlement' -IPN_REASON_CODE_ADMIN_REVERSAL = 'Admin reversal' -IPN_REASON_CODE_REFUND = 'Refund' - -def PaypalStatusToGlobalStatus(status): - ''' - This represents the default mapping of paypal status codes to global status codes - There are cases where this mapping will not apply and the individual API calls must do - additional processing - ''' - - if status == IPN_PAY_STATUS_CREATED: - return TRANSACTION_STATUS_CREATED - - elif status == IPN_PAY_STATUS_COMPLETED: - return TRANSACTION_STATUS_COMPLETE - - elif status == IPN_PAY_STATUS_INCOMPLETE: - return TRANSACTION_STATUS_INCOMPLETE - - elif status == IPN_PAY_STATUS_ERROR: - return TRANSACTION_STATUS_ERROR - - elif status == IPN_PAY_STATUS_REVERSALERROR: - return TRANSACTION_STATUS_ERROR - - elif status == IPN_PAY_STATUS_PROCESSING: - return TRANSACTION_STATUS_PENDING - - elif status == IPN_PAY_STATUS_PENDING: - return TRANSACTION_STATUS_PENDING - - elif status == IPN_PREAPPROVAL_STATUS_ACTIVE: - return TRANSACTION_STATUS_ACTIVE - - elif status == IPN_PREAPPROVAL_STATUS_CANCELED: - return TRANSACTION_STATUS_CANCELED - - elif status == IPN_PREAPPROVAL_STATUS_DEACTIVED: - return TRANSACTION_STATUS_CANCELED - - elif status == IPN_SENDER_STATUS_COMPLETED: - return TRANSACTION_STATUS_COMPLETE - - elif status == IPN_SENDER_STATUS_PENDING: - return TRANSACTION_STATUS_CPENDING - - elif status == IPN_SENDER_STATUS_CREATED: - return TRANSACTION_STATUS_CREATED - - elif status == IPN_SENDER_STATUS_PARTIALLY_REFUNDED: - return TRANSACTION_STATUS_REFUNDED - - elif status == IPN_SENDER_STATUS_DENIED: - return TRANSACTION_STATUS_FAILED - - elif status == IPN_SENDER_STATUS_PROCESSING: - return TRANSACTION_STATUS_PENDING - - elif status == IPN_SENDER_STATUS_REVERSED: - return TRANSACTION_STATUS_REFUNDED - - elif status == IPN_SENDER_STATUS_REFUNDED: - return TRANSACTION_STATUS_REFUNDED - - elif status == IPN_SENDER_STATUS_FAILED: - return TRANSACTION_STATUS_FAILED - - else: - return TRANSACTION_STATUS_ERRROR - - -def ProcessIPN(request): - ''' - processIPN - - Turns a request from Paypal into an IPN, and extracts info. We support 2 types of IPNs: - - 1) Payment - Used for instant payments and to execute pre-approved payments - 2) Preapproval - Used for comfirmation of a preapproval - - ''' - try: - ipn = IPN(request) - - if ipn.success(): - logger.info("Valid IPN") - logger.info("IPN Transaction Type: %s" % ipn.transaction_type) - - if ipn.transaction_type == IPN_TYPE_PAYMENT: - # payment IPN. we use our unique reference for the transaction as the key - # is only valid for 3 hours - - uniqueID = ipn.uniqueID() - t = Transaction.objects.get(secret=uniqueID) - - # The local_status is always one of the IPN_PAY_STATUS codes defined in paypal.py - t.local_status = ipn.status - t.status = PaypalStatusToGlobalStatus(ipn.status) - - for item in ipn.transactions: - - try: - r = Receiver.objects.get(transaction=t, email=item['receiver']) - logger.info(item) - # one of the IPN_SENDER_STATUS codes defined in paypal.py, If we are doing delayed chained - # payments, then there is no status or id for non-primary receivers. Leave their status alone - r.status = item['status_for_sender_txn'] - r.txn_id = item['id_for_sender_txn'] - r.save() - except: - # Log an exception if we have a receiver that is not found. This will be hit - # for delayed chained payments as there is no status or id for the non-primary receivers yet - traceback.print_exc() - - t.save() - - logger.info("Final transaction status: %s" % t.status) - - elif ipn.transaction_type == IPN_TYPE_ADJUSTMENT: - # a chargeback, reversal or refund for an existng payment - - uniqueID = ipn.uniqueID() - if uniqueID: - t = Transaction.objects.get(secret=uniqueID) - else: - key = ipn.pay_key - t = Transaction.objects.get(pay_key=key) - - # The status is always one of the IPN_PAY_STATUS codes defined in paypal.py - t.local_status = ipn.status - t.status = PaypalStatusToGlobalStatus(ipn.status) - - # Reason code indicates more details of the adjustment type - t.reason = ipn.reason_code - - # Update the receiver status codes - for item in ipn.transactions: - - try: - r = Receiver.objects.get(transaction=t, email=item['receiver']) - logger.info(item) - # one of the IPN_SENDER_STATUS codes defined in paypal.py, If we are doing delayed chained - # payments, then there is no status or id for non-primary receivers. Leave their status alone - r.status = item['status_for_sender_txn'] - r.save() - except: - # Log an exception if we have a receiver that is not found. This will be hit - # for delayed chained payments as there is no status or id for the non-primary receivers yet - traceback.print_exc() - - t.save() - - - elif ipn.transaction_type == IPN_TYPE_PREAPPROVAL: - - # IPN for preapproval always uses the key to ref the transaction as this is always valid - key = ipn.preapproval_key - t = Transaction.objects.get(preapproval_key=key) - - # The status is always one of the IPN_PREAPPROVAL_STATUS codes defined in paypal.py - t.local_status = ipn.status - t.status = PaypalStatusToGlobalStatus(ipn.status) - - # capture whether the transaction has been approved - t.approved = ipn.approved - - t.save() - logger.info("IPN: Preapproval transaction: " + str(t.id) + " Status: " + ipn.status) - - else: - logger.info("IPN: Unknown Transaction Type: " + ipn.transaction_type) - - - else: - logger.info("ERROR: INVALID IPN") - logger.info(ipn.error) - - except: - traceback.print_exc() - - -class PaypalError(RuntimeError): - pass - -class url_request( object ): - - def __init__( self, request): - - conn = httplib.HTTPSConnection(settings.PAYPAL_ENDPOINT) - conn.request("POST", request.url, request.raw_request, request.headers) - - #Check the response - should be 200 OK. - self.response = conn.getresponse() - - def content( self ): - return self.response.read() - - def code( self ): - return self.response.status - -class PaypalEnvelopeRequest: - ''' - Handles common information that is processed from the response envelope of the paypal request. - - All of our requests have a response envelope of the following format: - - ack common:AckCode - Acknowledgement code. It is one of the following values: - Success - The operation completed successfully. - Failure - The operation failed. - Warning - Warning. - SuccessWithWarning - The operation completed successfully; however, there is a warning message. - FailureWithWarning - The operation failed with a warning message. - build Build number; it is used only by Developer Technical Support. - correlationId Correlation ID; it is used only by Developer Technical Support. - timestamp Date on which the response was sent. The time is currently not supported. - - Additionally, our subclasses may set the error_message field if an undetermined error occurs. Examples of undertmined errors are: - HTTP error codes(not 200) - Invalid parameters - Python exceptions during processing - - All clients should check both the success() and the error() functions to determine the result of the operation - - ''' - - # Global values for the class - response = None - raw_response = None - errorMessage = None - raw_request = None - url = None - - def ack( self ): - - if self.response and self.response.has_key( 'responseEnvelope' ) and self.response['responseEnvelope'].has_key( 'ack' ): - return self.response['responseEnvelope']['ack'] - else: - return None - - def success(self): - status = self.ack() - - # print status - if status == "Success" or status == "SuccessWithWarning": - return True - else: - return False - - def error(self): - message = self.errorMessage - # print message - if message: - return True - else: - return False - - def error_data(self): - - if self.response and self.response.has_key('error'): - return self.response['error'] - else: - return None - - def error_id(self): - - if self.response and self.response.has_key('error'): - return self.response['error'][0]['errorId'] - else: - return None - - def error_string(self): - - if self.response and self.response.has_key('error'): - return self.response['error'][0]['message'] - - elif self.errorMessage: - return self.errorMessage - - else: - return None - - def envelope(self): - - if self.response and self.response.has_key('responseEnvelope'): - return self.response['responseEnvelope'] - else: - return None - - def correlation_id(self): - if self.response and self.response.has_key('responseEnvelope') and self.response['responseEnvelope'].has_key('correlationId'): - return self.response['responseEnvelope']['correlationId'] - else: - return None - - def timestamp(self): - if self.response and self.response.has_key('responseEnvelope') and self.response['responseEnvelope'].has_key('timestamp'): - return self.response['responseEnvelope']['timestamp'] - else: - return None - -class Pay( PaypalEnvelopeRequest ): - def __init__( self, transaction, return_url=None, nevermind_url=None, paymentReason=""): - - #BUGBUG: though I'm passing in paymentReason (to make it signature compatible with Amazon, it's not being wired in properly yet) - try: - - headers = { - 'X-PAYPAL-SECURITY-USERID':settings.PAYPAL_USERNAME, - 'X-PAYPAL-SECURITY-PASSWORD':settings.PAYPAL_PASSWORD, - 'X-PAYPAL-SECURITY-SIGNATURE':settings.PAYPAL_SIGNATURE, - 'X-PAYPAL-APPLICATION-ID':settings.PAYPAL_APPID, - 'X-PAYPAL-REQUEST-DATA-FORMAT':'JSON', - 'X-PAYPAL-RESPONSE-DATA-FORMAT':'JSON' - } - - if return_url is None: - return_url = settings.BASE_URL + COMPLETE_URL - if nevermind_url is None: - nevermind_url = settings.BASE_URL + nevermind_url - - logger.info("Return URL: " + return_url) - logger.info("Cancel URL: " + nevermind_url) - - receiver_list = [] - receivers = transaction.receiver_set.all() - - if len(receivers) == 0: - raise Exception - - # by setting primary_string of the first receiver to 'true', we are doing a Chained payment - for r in receivers: - if len(receivers) > 1: - if r.primary and (transaction.execution == EXECUTE_TYPE_CHAINED_INSTANT or transaction.execution == EXECUTE_TYPE_CHAINED_DELAYED): - # Only set a primary if we are using chained payments - primary_string = 'true' - else: - primary_string = 'false' - - receiver_list.append({'email':r.email,'amount':str(r.amount), 'primary':primary_string}) - else: - receiver_list.append({'email':r.email,'amount':str(r.amount)}) - - logger.info(receiver_list) - - # actionType can be 'PAY', 'CREATE', or 'PAY_PRIMARY' - # PAY_PRIMARY': "For chained payments only, specify this value to delay payments to the secondary receivers; only the payment to the primary receiver is processed" - - if transaction.execution == EXECUTE_TYPE_CHAINED_DELAYED: - self.actionType = 'PAY_PRIMARY' - else: - self.actionType = 'PAY' - - # feesPayer: SENDER, PRIMARYRECEIVER, EACHRECEIVER, SECONDARYONLY - # The PayPal documentation says that fees for delayed chain payments cannot be set to secondaryonly - # but the sandbox seems to show the secondary recipient paying all the fees. - # if only one receiver, set to EACHRECEIVER, otherwise set to SECONDARYONLY - - if len(receivers) == 1: - feesPayer = 'EACHRECEIVER' - else: - feesPayer = 'SECONDARYONLY' - - data = { - 'actionType': self.actionType, - 'receiverList': { 'receiver': receiver_list }, - 'currencyCode': transaction.currency, - 'returnUrl': return_url, - 'cancelUrl': nevermind_url, - 'requestEnvelope': { 'errorLanguage': 'en_US' }, - 'ipnNotificationUrl': settings.BASE_URL + reverse('HandleIPN', args=["paypal"]), - 'feesPayer': feesPayer, - 'trackingId': transaction.secret - } - - logging.info("paypal PAY data: %s" % data) - #print >> sys.stderr, "paypal PAY data:", data - # Is ipnNotificationUrl being computed properly - #print >> sys.stderr, 'ipnNotificationUrl', settings.BASE_URL + reverse('PayPalIPN') - - # a Pay operation can be for a payment that goes through immediately or for setting up a preapproval. - # transaction.reference is not null if it represents a preapproved payment, which has a preapprovalKey. - if transaction.preapproval_key: - data['preapprovalKey'] = transaction.preapproval_key - - self.raw_request = json.dumps(data) - self.url = "/AdaptivePayments/Pay" - self.headers = headers - self.connection = url_request(self) - self.code = self.connection.code() - - if self.code != 200: - self.errorMessage = 'PayPal response code was %i' % self.code - return - - self.raw_response = self.connection.content() - #print >> sys.stderr, "PAY request", settings.PAYPAL_ENDPOINT, "/AdaptivePayments/Pay", self.raw_request, headers - logger.info("paypal PAY response was: %s" % self.raw_response) - #print >> sys.stderr, "paypal PAY response was:", self.raw_response - self.response = json.loads( self.raw_response ) - logger.info(self.response) - - except: - traceback.print_exc() - self.errorMessage = "Error: Server Error" - - def api(self): - return self.actionType - - def exec_status( self ): - if self.response.has_key( 'paymentExecStatus' ): - return self.response['paymentExecStatus'] - else: - return None - - def amount( self ): - if self.response.has_key('payment_gross'): - return self.response['payment_gross'] - else: - return None - - def key( self ): - if self.response.has_key('payKey'): - return self.response['payKey'] - else: - return None - - def next_url( self ): - return '%s?cmd=_ap-payment&paykey=%s' % (settings.PAYPAL_PAYMENT_HOST, self.response['payKey'] ) - - def embedded_url(self): - return '%s/webapps/adaptivepayment/flow/pay?paykey=%s&expType=light' % ( settings.PAYPAL_PAYMENT_HOST, self.response['payKey'] ) - - -class Execute(Pay): - ''' - For payapl, execute is the same as pay. The pay funciton detects whether an execute or a co-branded operation - is called for. - ''' - def __init__(self, transaction, return_url=None, nevermind_url=None): - # Call our super class. In python 2.2+, we can't use super here, so just call init directly - Pay.__init__(self, transaction, return_url, nevermind_url) - -class Finish(PaypalEnvelopeRequest): - - def __init__(self, transaction=None): - - try: - - self.errorMessage = None - self.response = None - - headers = { - 'X-PAYPAL-SECURITY-USERID':settings.PAYPAL_USERNAME, - 'X-PAYPAL-SECURITY-PASSWORD':settings.PAYPAL_PASSWORD, - 'X-PAYPAL-SECURITY-SIGNATURE':settings.PAYPAL_SIGNATURE, - 'X-PAYPAL-APPLICATION-ID':settings.PAYPAL_APPID, - 'X-PAYPAL-REQUEST-DATA-FORMAT':'JSON', - 'X-PAYPAL-RESPONSE-DATA-FORMAT':'JSON' - } - - - if transaction.execution != EXECUTE_TYPE_CHAINED_DELAYED: - self.errorMessage = "Invalid transaction type for execution" - return - - if not transaction.pay_key: - self.errorMessage = "No Paykey Found in transaction" - return - - data = { - 'payKey': transaction.pay_key, - 'requestEnvelope': { 'errorLanguage': 'en_US' } - } - - logging.info("paypal EXECUTE data: %s" % data) - self.raw_request = json.dumps(data) - self.url = "/AdaptivePayments/ExecutePayment" - self.headers = headers - self.connection = url_request(self) - self.code = self.connection.code() - - if self.code != 200: - self.errorMessage = 'PayPal response code was %i' % self.code - return - - self.raw_response = self.connection.content() - - logger.info("paypal EXECUTE response was: %s" % self.raw_response) - self.response = json.loads( self.raw_response ) - - except: - traceback.print_exc() - self.errorMessage = "Error: Server error occurred" - - -class PaymentDetails(PaypalEnvelopeRequest): - - ''' - Get details about executed PAY operation - - This api must set the following class variables to work with the code in manager.py - - status - one of the global transaction status codes - transactions -- A list of all receiver transactions associated with this payment - status - the status of the receiver transaction - txn_id - the id of the receiver transaction - - ''' - - def __init__(self, transaction=None): - - try: - self.transaction = transaction - - headers = { - 'X-PAYPAL-SECURITY-USERID':settings.PAYPAL_USERNAME, - 'X-PAYPAL-SECURITY-PASSWORD':settings.PAYPAL_PASSWORD, - 'X-PAYPAL-SECURITY-SIGNATURE':settings.PAYPAL_SIGNATURE, - 'X-PAYPAL-APPLICATION-ID':settings.PAYPAL_APPID, - 'X-PAYPAL-REQUEST-DATA-FORMAT':'JSON', - 'X-PAYPAL-RESPONSE-DATA-FORMAT':'JSON' - } - - # we can feed any of payKey, transactionId, and trackingId to identify transaction in question - # I think we've been tracking payKey. We might want to use our own trackingId (what's Transaction.secret for?) - data = { - 'requestEnvelope': { 'errorLanguage': 'en_US' }, - 'trackingId':transaction.secret - } - - self.raw_request = json.dumps(data) - self.headers = headers - self.url = "/AdaptivePayments/PaymentDetails" - self.connection = url_request(self) - - self.code = self.connection.code() - - if self.code != 200: - self.errorMessage = 'PayPal response code was %i' % self.code - return - - self.raw_response = self.connection.content() - - logger.info("paypal PaymentDetails response was: %s" % self.raw_response) - self.response = json.loads( self.raw_response ) - logger.info(self.response) - - self.local_status = self.response.get("status", None) - self.status = PaypalStatusToGlobalStatus(self.local_status) - - self.trackingId = self.response.get("trackingId", None) - self.feesPayer = self.response.get("feesPayer", None) - payment_info_list = self.response.get("paymentInfoList", None) - payment_info = payment_info_list.get("paymentInfo", None) - - self.transactions = [] - for payment in payment_info: - receiver = {} - receiver['status'] = payment.get("transactionStatus", None) - receiver['txn_id'] = payment.get("transactionId") - - r = payment.get("receiver", None) - if r: - receiver['email'] = r.get('email') - - - self.transactions.append(receiver) - - except: - self.errorMessage = "Error: ServerError" - traceback.print_exc() - - - def compare(self): - """compare current status information from what's in the current transaction object""" - # I don't think we do anything with fundingtypeList, memo - # status can be: - # transaction.type should be PAYMENT_TYPE_INSTANT - # actionType can be: 'PAY', 'CREATE', 'PAY_PRIMARY' -- I think we are doing only 'PAY' right now - - comp = [(self.transaction.status, self.response.get('status')), - (self.transaction.type, self.response.get('actionType')), - (self.transaction.currency, self.response.get('currencyCode')), - ('EACHRECEIVER' if len(self.transaction.receiver_set.all()) == 1 else 'SECONDARYONLY',self.response.get('feesPayer')), - (self.transaction.reference, self.response.get('payKey')), # payKey supposedly expires after 3 hours - ('false', self.response.get('reverseAllParallelPaymentsOnError')), - (None, self.response.get('sender')) - ] - - # loop through recipients - - return comp - - # also getting sender / senderEmail info too here that we don't currently hold in transaction. Want to save? Does that info come in IPN? - # responseEnvelope - - # reverseAllParallelPaymentsOnError - # self.response.get('responseEnvelope')['ack'] should be 'Success' Can also be 'Failure', 'Warning', 'SuccessWithWarning', 'FailureWithWarning' - # can possibly use self.response.get('responseEnvelope')['timestamp'] to update self.transaction.date_modified - # preapprovalKey -- self.transaction doesn't hold that info right now - # paymentInfoList -- holds info for each recipient - - -class CancelPreapproval(PaypalEnvelopeRequest): - - def __init__(self, transaction): - - try: - - headers = { - 'X-PAYPAL-SECURITY-USERID':settings.PAYPAL_USERNAME, - 'X-PAYPAL-SECURITY-PASSWORD':settings.PAYPAL_PASSWORD, - 'X-PAYPAL-SECURITY-SIGNATURE':settings.PAYPAL_SIGNATURE, - 'X-PAYPAL-APPLICATION-ID':settings.PAYPAL_APPID, - 'X-PAYPAL-REQUEST-DATA-FORMAT':'JSON', - 'X-PAYPAL-RESPONSE-DATA-FORMAT':'JSON', - } - - data = { - 'preapprovalKey':transaction.preapproval_key, - 'requestEnvelope': { 'errorLanguage': 'en_US' } - } - - self.raw_request = json.dumps(data) - self.headers = headers - self.url = "/AdaptivePayments/CancelPreapproval" - self.connection = url_request(self) - self.code = self.connection.code() - - if self.code != 200: - self.errorMessage = 'PayPal response code was %i' % self.code - return - - self.raw_response = self.connection.content() - logger.info("paypal CANCEL PREAPPROBAL response was: %s" % self.raw_response) - self.response = json.loads( self.raw_response ) - logger.info(self.response) - - except: - traceback.print_exc() - self.errorMessage = "Error: Server Error" - - -class RefundPayment(PaypalEnvelopeRequest): - - def __init__(self, transaction): - - try: - - headers = { - 'X-PAYPAL-SECURITY-USERID':settings.PAYPAL_USERNAME, - 'X-PAYPAL-SECURITY-PASSWORD':settings.PAYPAL_PASSWORD, - 'X-PAYPAL-SECURITY-SIGNATURE':settings.PAYPAL_SIGNATURE, - 'X-PAYPAL-APPLICATION-ID':settings.PAYPAL_APPID, - 'X-PAYPAL-REQUEST-DATA-FORMAT':'JSON', - 'X-PAYPAL-RESPONSE-DATA-FORMAT':'JSON', - } - - data = { - 'payKey':transaction.pay_key, - 'requestEnvelope': { 'errorLanguage': 'en_US' } - } - - self.raw_request = json.dumps(data) - self.headers = headers - self.url = "/AdaptivePayments/Refund" - self.connection = url_request(self) - self.code = self.connection.code() - - if self.code != 200: - self.errorMessage = 'PayPal response code was %i' % self.code - return - - self.raw_response = self.connection.content() - logger.info("paypal Refund response was: %s" % self.raw_response) - self.response = json.loads( self.raw_response ) - logger.info(self.response) - - except: - traceback.print_exc() - self.errorMessage = "Error: Server Error" - - -class Preapproval( PaypalEnvelopeRequest ): - def __init__( self, transaction, amount, expiry=None, return_url=None, nevermind_url=None, paymentReason=""): - - # BUGBUG: though I'm passing in paymentReason (to make it signature compatible with Amazon, it's not being wired in properly yet) - - try: - - headers = { - 'X-PAYPAL-SECURITY-USERID':settings.PAYPAL_USERNAME, - 'X-PAYPAL-SECURITY-PASSWORD':settings.PAYPAL_PASSWORD, - 'X-PAYPAL-SECURITY-SIGNATURE':settings.PAYPAL_SIGNATURE, - 'X-PAYPAL-APPLICATION-ID':settings.PAYPAL_APPID, - 'X-PAYPAL-REQUEST-DATA-FORMAT':'JSON', - 'X-PAYPAL-RESPONSE-DATA-FORMAT':'JSON', - } - - if return_url is None: - return_url = settings.BASE_URL + COMPLETE_URL - if nevermind_url is None: - nevermind_url = settings.BASE_URL + NEVERMIND_URL - - # set the expiration date for the preapproval if not passed in - now_val = now() - if expiry is None: - expiry = now_val + timedelta( days=settings.PREAPPROVAL_PERIOD ) - transaction.date_authorized = now_val - transaction.date_expired = expiry - transaction.save() - - data = { - 'endingDate': zuluformat(expiry), - 'startingDate': zuluformat(now_val), - 'maxTotalAmountOfAllPayments': '%.2f' % transaction.amount, - 'maxNumberOfPayments':1, - 'maxAmountPerPayment': '%.2f' % transaction.amount, - 'currencyCode': transaction.currency, - 'returnUrl': return_url, - 'cancelUrl': nevermind_url, - 'requestEnvelope': { 'errorLanguage': 'en_US' }, - 'ipnNotificationUrl': settings.BASE_URL + reverse('HandleIPN', args=["paypal"]) - } - - # Is ipnNotificationUrl being computed properly - # print >> sys.stderr, 'ipnNotificationUrl', settings.BASE_URL + reverse('PayPalIPN') - - self.raw_request = json.dumps(data) - self.url = "/AdaptivePayments/Preapproval" - self.headers = headers - self.connection = url_request(self) - self.code = self.connection.code() - - if self.code != 200: - self.errorMessage = 'PayPal response code was %i' % self.code - return - - self.raw_response = self.connection.content() - logger.info("paypal PREAPPROVAL response was: %s" % self.raw_response) - # print >> sys.stderr, "paypal PREAPPROVAL response was:", self.raw_response - self.response = json.loads( self.raw_response ) - logger.info(self.response) - - except: - traceback.print_exc() - self.errorMessage = "Error: Server Error Occurred" - - def key( self ): - if self.response.has_key( 'preapprovalKey' ): - return self.response['preapprovalKey'] - else: - return None - - def next_url( self ): - return '%s?cmd=_ap-preapproval&preapprovalkey=%s' % ( settings.PAYPAL_PAYMENT_HOST, self.response['preapprovalKey'] ) - - -class PreapprovalDetails(PaypalEnvelopeRequest): - - ''' - Get details about an authorized token - - This api must set 4 different class variables to work with the code in manager.py - - status - one of the global transaction status codes - approved - boolean value - currency - - amount - - - ''' - - def __init__(self, transaction): - - try: - self.transaction = transaction - - headers = { - 'X-PAYPAL-SECURITY-USERID':settings.PAYPAL_USERNAME, - 'X-PAYPAL-SECURITY-PASSWORD':settings.PAYPAL_PASSWORD, - 'X-PAYPAL-SECURITY-SIGNATURE':settings.PAYPAL_SIGNATURE, - 'X-PAYPAL-APPLICATION-ID':settings.PAYPAL_APPID, - 'X-PAYPAL-REQUEST-DATA-FORMAT':'JSON', - 'X-PAYPAL-RESPONSE-DATA-FORMAT':'JSON' - } - - # we can feed any of payKey, transactionId, and trackingId to identify transaction in question - # I think we've been tracking payKey. We might want to use our own trackingId (what's Transaction.secret for?) - data = { - 'requestEnvelope': { 'errorLanguage': 'en_US' }, - 'preapprovalKey':transaction.preapproval_key - } - - self.raw_request = json.dumps(data) - self.headers = headers - self.url = "/AdaptivePayments/PreapprovalDetails" - self.connection = url_request(self) - self.code = self.connection.code() - - if self.code != 200: - self.errorMessage = 'PayPal response code was %i' % self.code - return - - self.raw_response = self.connection.content() - logger.info("paypal PreapprovalDetails response was: %s" % self.raw_response) - self.response = json.loads( self.raw_response ) - logger.info(self.response) - - self.local_status = self.response.get("status", None) - self.status = PaypalStatusToGlobalStatus(self.local_status) - - self.amount = self.response.get("maxTotalAmountOfAllPayments", None) - self.currency = self.response.get("currencyCode", None) - - # a bit uncertain about how well PayPal sticks to a standard case - approved = self.response.get("approved", 'None') - if approved.lower() == 'true': - self.approved = True - elif approved.lower() == 'false': - self.approved = False - else: - self.approved = None - - try: - self.expiration = dateutil.parser.parse(self.response.get("endingDate")) - except: - self.expiration = None - - try: - self.date = dateutil.parser.parse(self.response.get("startingDate", None)) - except: - self.date = None - - except: - self.errorMessage = "Error: ServerError" - traceback.print_exc() - - -class IPN( object ): - - def __init__( self, request ): - - try: - # verify that the request is paypal's - self.error = None - - url = "%s?cmd=_notify-validate" % settings.PAYPAL_PAYMENT_HOST - data=urllib.urlencode(request.POST.copy()) - req = urllib2.Request(url, data) - response = urllib2.urlopen(req) - raw_response = response.read() - status = response.code - - # check code - if status != 200: - self.error = 'PayPal response code was %i' % verify_response.code() - return - - # check response - if raw_response != 'VERIFIED': - self.error = 'PayPal response was "%s"' % raw_response - return - - # Process the details - self.status = request.POST.get('status', None) - self.sender_email = request.POST.get('sender_email', None) - self.action_type = request.POST.get('action_type', None) - self.pay_key = request.POST.get('pay_key', None) - self.preapproval_key = request.POST.get('preapproval_key', None) - self.transaction_type = request.POST.get('transaction_type', None) - self.reason_code = request.POST.get('reason_code', None) - self.trackingId = request.POST.get('tracking_id', None) - - # a bit uncertain about how well PayPal sticks to a standard case - approved = request.POST.get("approved", 'None') - if approved.lower() == 'true': - self.approved = True - elif approved.lower() == 'false': - self.approved = False - else: - self.approved = None - - self.process_transactions(request) - - except: - self.error = "Error: ServerError" - traceback.print_exc() - - def uniqueID(self): - - if self.trackingId: - return self.trackingId - else: - return None - - - def success( self ): - return self.error == None - - - @classmethod - def slicedict(cls, d, s): - return dict((str(k.replace(s, '', 1)), v) for k,v in d.iteritems() if k.startswith(s)) - - def process_transactions(self, request): - - self.transactions = [] - - transaction_nums = range(6) - for transaction_num in transaction_nums: - transdict = IPN.slicedict(request.POST, 'transaction[%s].' % transaction_num) - if len(transdict) > 0: - self.transactions.append(transdict) - logger.info(transdict) - - - - diff --git a/payment/urls.py b/payment/urls.py index 47e302a7..d50a346e 100644 --- a/payment/urls.py +++ b/payment/urls.py @@ -6,11 +6,6 @@ urlpatterns = patterns( url(r"^handleipn/(?P\w+)$", "handleIPN", name="HandleIPN"), ) -# Amazon payment URLs -urlpatterns += patterns( - "regluit.payment.amazon", - url(r"^amazonpaymentreturn", "amazonPaymentReturn", name="AmazonPaymentReturn"), -) # this should be on only if DEBUG is on diff --git a/payment/views.py b/payment/views.py index 1b94f551..33e5b384 100644 --- a/payment/views.py +++ b/payment/views.py @@ -1,5 +1,4 @@ from regluit.payment.manager import PaymentManager -from regluit.payment.paypal import IPN from regluit.payment.models import Transaction from regluit.core.models import Campaign, Wishlist from django.conf import settings diff --git a/settings/common.py b/settings/common.py index 23053eb9..644478f5 100644 --- a/settings/common.py +++ b/settings/common.py @@ -271,12 +271,8 @@ EBOOK_NOTIFICATIONS_JOB = { # by default, in common, we don't turn any of the celerybeat jobs on -- turn them on in the local settings file -# set -- sandbox or production Amazon FPS? -AMAZON_FPS_HOST = "fps.sandbox.amazonaws.com" -#AMAZON_FPS_HOST = "fps.amazonaws.com" - # amazon or paypal for now. -PAYMENT_PROCESSOR = 'amazon' +PAYMENT_PROCESSOR = 'test' # a SECRET_KEY to be used for encrypting values in core.models.Key -- you should store in settings/local.py SECRET_KEY = '' From 94270f33c643191e508cc854833937e2c221bffe Mon Sep 17 00:00:00 2001 From: eric Date: Fri, 31 Aug 2012 03:16:04 -0400 Subject: [PATCH 035/107] add in credi processing; overhaul the PledgeView forms and partition authorize fn in Manager also removed unused target, lists, ack-link, --- core/migrations/0039_payment.py | 250 ++++++++++ frontend/forms.py | 17 +- frontend/templates/pledge.html | 2 + frontend/urls.py | 5 +- frontend/views.py | 445 +++++------------- payment/credit.py | 56 +++ payment/manager.py | 210 +++++---- ...__del_field_transaction_target__del_fie.py | 224 +++++++++ payment/models.py | 53 ++- payment/parameters.py | 11 +- payment/tests.py | 10 +- payment/urls.py | 2 - payment/views.py | 50 +- 13 files changed, 841 insertions(+), 494 deletions(-) create mode 100644 core/migrations/0039_payment.py create mode 100644 payment/credit.py create mode 100644 payment/migrations/0008_auto__add_credit__add_creditlog__del_field_transaction_target__del_fie.py diff --git a/core/migrations/0039_payment.py b/core/migrations/0039_payment.py new file mode 100644 index 00000000..1e030aae --- /dev/null +++ b/core/migrations/0039_payment.py @@ -0,0 +1,250 @@ +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Adding model 'Badge' + # first drop tables created by syncdb + db.create_table('core_badge', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('name', self.gf('django.db.models.fields.CharField')(max_length=72, blank=True)), + ('description', self.gf('django.db.models.fields.TextField')(default='', null=True)), + )) + db.send_create_signal('core', ['Badge']) + + # Adding M2M table for field badges on 'UserProfile' + db.create_table('core_userprofile_badges', ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('userprofile', models.ForeignKey(orm['core.userprofile'], null=False)), + ('badge', models.ForeignKey(orm['core.badge'], null=False)) + )) + db.create_unique('core_userprofile_badges', ['userprofile_id', 'badge_id']) + + + def backwards(self, orm): + + # Deleting model 'Badge' + db.delete_table('core_badge') + + # Removing M2M table for field badges on 'UserProfile' + db.delete_table('core_userprofile_badges') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 31, 2, 9, 51, 31703)'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 31, 2, 9, 51, 31561)'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'core.author': { + 'Meta': {'object_name': 'Author'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'editions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'authors'", 'symmetrical': 'False', 'to': "orm['core.Edition']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'core.badge': { + 'Meta': {'object_name': 'Badge'}, + 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '72', 'blank': 'True'}) + }, + 'core.campaign': { + 'Meta': {'object_name': 'Campaign'}, + 'activated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'amazon_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'deadline': ('django.db.models.fields.DateTimeField', [], {}), + 'description': ('ckeditor.fields.RichTextField', [], {'null': 'True'}), + 'details': ('ckeditor.fields.RichTextField', [], {'null': 'True', 'blank': 'True'}), + 'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'null': 'True', 'to': "orm['core.Edition']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'left': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}), + 'license': ('django.db.models.fields.CharField', [], {'default': "'CC BY-NC-ND'", 'max_length': '255'}), + 'managers': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'campaigns'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True'}), + 'paypal_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'status': ('django.db.models.fields.CharField', [], {'default': "'INITIALIZED'", 'max_length': '15', 'null': 'True'}), + 'target': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'to': "orm['core.Work']"}) + }, + 'core.campaignaction': { + 'Meta': {'object_name': 'CampaignAction'}, + 'campaign': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'actions'", 'to': "orm['core.Campaign']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'timestamp': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '15'}) + }, + 'core.celerytask': { + 'Meta': {'object_name': 'CeleryTask'}, + 'active': ('django.db.models.fields.NullBooleanField', [], {'default': 'True', 'null': 'True', 'blank': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 31, 2, 9, 50, 804173)', 'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True'}), + 'function_args': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'function_name': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'task_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tasks'", 'null': 'True', 'to': "orm['auth.User']"}) + }, + 'core.claim': { + 'Meta': {'object_name': 'Claim'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'rights_holder': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'claim'", 'to': "orm['core.RightsHolder']"}), + 'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '7'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'claim'", 'to': "orm['auth.User']"}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'claim'", 'to': "orm['core.Work']"}) + }, + 'core.ebook': { + 'Meta': {'object_name': 'Ebook'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ebooks'", 'to': "orm['core.Edition']"}), + 'format': ('django.db.models.fields.CharField', [], {'max_length': '25'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'provider': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'rights': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), + 'unglued': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'url': ('django.db.models.fields.URLField', [], {'max_length': '1024'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}) + }, + 'core.edition': { + 'Meta': {'object_name': 'Edition'}, + 'cover_image': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'public_domain': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'publication_date': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'publisher': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editions'", 'null': 'True', 'to': "orm['core.Work']"}) + }, + 'core.identifier': { + 'Meta': {'unique_together': "(('type', 'value'),)", 'object_name': 'Identifier'}, + 'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'identifiers'", 'null': 'True', 'to': "orm['core.Edition']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '4'}), + 'value': ('django.db.models.fields.CharField', [], {'max_length': '31'}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'identifiers'", 'to': "orm['core.Work']"}) + }, + 'core.key': { + 'Meta': {'object_name': 'Key'}, + 'encrypted_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}) + }, + 'core.premium': { + 'Meta': {'object_name': 'Premium'}, + 'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '0'}), + 'campaign': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'premiums'", 'null': 'True', 'to': "orm['core.Campaign']"}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'limit': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '2'}) + }, + 'core.rightsholder': { + 'Meta': {'object_name': 'RightsHolder'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rights_holder'", 'to': "orm['auth.User']"}), + 'rights_holder_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'core.subject': { + 'Meta': {'ordering': "['name']", 'object_name': 'Subject'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}), + 'works': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'subjects'", 'symmetrical': 'False', 'to': "orm['core.Work']"}) + }, + 'core.userprofile': { + 'Meta': {'object_name': 'UserProfile'}, + 'badges': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'holders'", 'symmetrical': 'False', 'to': "orm['core.Badge']"}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'facebook_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}), + 'goodreads_auth_secret': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'goodreads_auth_token': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'goodreads_user_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), + 'goodreads_user_link': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'goodreads_user_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'home_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'librarything_id': ('django.db.models.fields.CharField', [], {'max_length': '31', 'blank': 'True'}), + 'pic_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), + 'tagline': ('django.db.models.fields.CharField', [], {'max_length': '140', 'blank': 'True'}), + 'twitter_id': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"}) + }, + 'core.waswork': { + 'Meta': {'object_name': 'WasWork'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'moved': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'was': ('django.db.models.fields.IntegerField', [], {'unique': 'True'}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Work']"}) + }, + 'core.wishes': { + 'Meta': {'object_name': 'Wishes', 'db_table': "'core_wishlist_works'"}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'source': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}), + 'wishlist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Wishlist']"}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'wishes'", 'to': "orm['core.Work']"}) + }, + 'core.wishlist': { + 'Meta': {'object_name': 'Wishlist'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'wishlist'", 'unique': 'True', 'to': "orm['auth.User']"}), + 'works': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'wishlists'", 'symmetrical': 'False', 'through': "orm['core.Wishes']", 'to': "orm['core.Work']"}) + }, + 'core.work': { + 'Meta': {'ordering': "['title']", 'object_name': 'Work'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}), + 'num_wishes': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'openlibrary_lookup': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'}) + } + } + + complete_apps = ['core'] diff --git a/frontend/forms.py b/frontend/forms.py index 2cd4577d..3f76ab1f 100644 --- a/frontend/forms.py +++ b/frontend/forms.py @@ -296,16 +296,15 @@ class CampaignPledgeForm(forms.Form): ) anonymous = forms.BooleanField(required=False, label=_("Don't display my name in the acknowledgements")) ack_name = forms.CharField(required=False, max_length=64, label=_("What name should we display?")) - ack_link = forms.URLField(required=False, label=_("Your web site:")) ack_dedication = forms.CharField(required=False, max_length=140, label=_("Your dedication:")) premium_id = forms.IntegerField(required=False) def clean_preapproval_amount(self): - data = self.cleaned_data['preapproval_amount'] - if data is None: + preapproval_amount = self.cleaned_data['preapproval_amount'] + if preapproval_amount is None: raise forms.ValidationError(_("Please enter a pledge amount.")) - return data + return preapproval_amount # should we do validation on the premium_id here? # can see whether it corresponds to a real premium -- do that here? @@ -317,11 +316,6 @@ class CampaignPledgeForm(forms.Form): try: preapproval_amount = cleaned_data.get("preapproval_amount") premium_id = int(cleaned_data.get("premium_id")) - premium_amount = Premium.objects.get(id=premium_id).amount - logger.info("preapproval_amount: {0}, premium_id: {1}, premium_amount:{2}".format(preapproval_amount, premium_id, premium_amount)) - if preapproval_amount < premium_amount: - logger.info("raising form validating error") - raise forms.ValidationError(_("Sorry, you must pledge at least $%s to select that premium." % (premium_amount))) try: premium= Premium.objects.get(id=premium_id) if premium.limit>0: @@ -329,6 +323,11 @@ class CampaignPledgeForm(forms.Form): raise forms.ValidationError(_("Sorry, that premium is fully subscribed.")) except Premium.DoesNotExist: raise forms.ValidationError(_("Sorry, that premium is not valid.")) + premium_amount = premium.amount + logger.info("preapproval_amount: {0}, premium_id: {1}, premium_amount:{2}".format(preapproval_amount, premium_id, premium_amount)) + if preapproval_amount < premium_amount: + logger.info("raising form validating error") + raise forms.ValidationError(_("Sorry, you must pledge at least $%s to select that premium." % (premium_amount))) except Exception, e: if isinstance(e, forms.ValidationError): diff --git a/frontend/templates/pledge.html b/frontend/templates/pledge.html index 352913f1..ac34377f 100644 --- a/frontend/templates/pledge.html +++ b/frontend/templates/pledge.html @@ -108,6 +108,8 @@
    +
    +{% if faqmenu == 'modify' %}We hope you won't, but of course you're also free to cancel your pledge.{% endif %}
    {% if transaction.ack_name %} diff --git a/frontend/urls.py b/frontend/urls.py index 8436a444..1b2c4ce8 100644 --- a/frontend/urls.py +++ b/frontend/urls.py @@ -7,7 +7,7 @@ from django.conf import settings from regluit.core.feeds import SupporterWishlistFeed from regluit.core.models import Campaign -from regluit.frontend.views import GoodreadsDisplayView, LibraryThingView, PledgeView, PledgeCompleteView, PledgeModifyView, PledgeCancelView, PledgeNeverMindView, PledgeRechargeView, FAQView +from regluit.frontend.views import GoodreadsDisplayView, LibraryThingView, PledgeView, PledgeCompleteView, PledgeCancelView, PledgeRechargeView, FAQView from regluit.frontend.views import CampaignListView, DonateView, WorkListView, UngluedListView, InfoPageView, InfoLangView, DonationView urlpatterns = patterns( @@ -55,8 +55,7 @@ urlpatterns = patterns( url(r"^pledge/(?P\d+)/$", login_required(PledgeView.as_view()), name="pledge"), url(r"^pledge/cancel/(?P\d+)$", login_required(PledgeCancelView.as_view()), name="pledge_cancel"), url(r"^pledge/complete/$", login_required(PledgeCompleteView.as_view()), name="pledge_complete"), - url(r"^pledge/nevermind/$", login_required(PledgeNeverMindView.as_view()), name="pledge_nevermind"), - url(r"^pledge/modify/(?P\d+)$", login_required(PledgeModifyView.as_view()), name="pledge_modify"), + url(r"^pledge/modify/(?P\d+)$", login_required(PledgeView.as_view()), name="pledge_modify"), url(r"^pledge/recharge/(?P\d+)$", login_required(PledgeRechargeView.as_view()), name="pledge_recharge"), url(r"^subjects/$", "subjects", name="subjects"), url(r"^librarything/$", LibraryThingView.as_view(), name="librarything"), diff --git a/frontend/views.py b/frontend/views.py index b51d934a..0944a2f3 100755 --- a/frontend/views.py +++ b/frontend/views.py @@ -50,8 +50,8 @@ from regluit.frontend.forms import EbookForm, CustomPremiumForm, EditManagersFor from regluit.frontend.forms import getTransferCreditForm from regluit.payment.manager import PaymentManager from regluit.payment.models import Transaction -from regluit.payment.parameters import TARGET_TYPE_CAMPAIGN, TARGET_TYPE_DONATION, PAYMENT_TYPE_AUTHORIZATION from regluit.payment.parameters import TRANSACTION_STATUS_ACTIVE, TRANSACTION_STATUS_COMPLETE, TRANSACTION_STATUS_CANCELED, TRANSACTION_STATUS_ERROR, TRANSACTION_STATUS_FAILED, TRANSACTION_STATUS_INCOMPLETE +from regluit.payment.parameters import PAYMENT_TYPE_AUTHORIZATION from regluit.core import goodreads from tastypie.models import ApiKey from regluit.payment.models import Transaction @@ -583,280 +583,142 @@ class DonationView(TemplateView): class PledgeView(FormView): template_name="pledge.html" form_class = CampaignPledgeForm + transaction = None + campaign = None + work = None + premiums = None + data = None - def get(self, request, *args, **kwargs): - # change the default behavior from https://code.djangoproject.com/browser/django/tags/releases/1.3.1/django/views/generic/edit.py#L129 - # don't automatically bind the data to the form on GET, only on POST - # compare with https://code.djangoproject.com/browser/django/tags/releases/1.3.1/django/views/generic/edit.py#L34 - form_class = self.get_form_class() - form = form_class() - - context_data = self.get_context_data(form=form) - # if there is already an active campaign pledge for user, redirect to the pledge modify page - if context_data.get('redirect_to_modify_pledge'): - work = context_data['work'] - return HttpResponseRedirect(reverse('pledge_modify', args=[work.id])) - else: - return self.render_to_response(context_data) - - def get_context_data(self, **kwargs): - """set up the pledge page""" - - # the following should be true since PledgeModifyView.as_view is wrapped in login_required + def get_form_kwargs(self): assert self.request.user.is_authenticated() - user = self.request.user - - context = super(PledgeView, self).get_context_data(**kwargs) - - work = get_object_or_404(models.Work, id=self.kwargs["work_id"]) - campaign = work.last_campaign() + self.work = get_object_or_404(models.Work, id=self.kwargs["work_id"]) # if there is no campaign or if campaign is not active, we should raise an error - - if campaign is None or campaign.status != 'ACTIVE': - raise Http404 - - custom_premiums = campaign.custom_premiums() - # need to also include the no-premiums default in the queryset we send the page - premiums = custom_premiums | models.Premium.objects.filter(id=150) - premium_id = self.request.REQUEST.get('premium_id', None) - preapproval_amount = self.request.REQUEST.get('preapproval_amount', None) + try: + self.campaign = self.work.last_campaign() + # TODO need to sort the premiums + self.premiums = self.campaign.custom_premiums() | models.Premium.objects.filter(id=150) + # Campaign must be ACTIVE + assert self.campaign.status == 'ACTIVE' + except Exception, e: + raise e + + transactions = self.campaign.transactions().filter(user=self.request.user, status=TRANSACTION_STATUS_ACTIVE, type=PAYMENT_TYPE_AUTHORIZATION) + if transactions.count() == 0: + premium_id = self.request.REQUEST.get('premium_id', None) + preapproval_amount = self.request.REQUEST.get('preapproval_amount', None) + premium_description = None + ack_name='' + ack_dedication='' + anonymous='' + + else: + self.transaction = transactions[0] + # what stuff do we need to pull out to populate form? + # preapproval_amount, premium_id (which we don't have stored yet) + if self.transaction.premium is not None: + premium_id = self.transaction.premium.id + premium_description = self.transaction.premium.description + else: + premium_id = None + premium_description = None + preapproval_amount = self.transaction.amount + ack_name=self.transaction.ack_name + ack_dedication=self.transaction.ack_dedication + anonymous=self.transaction.anonymous if premium_id is not None and preapproval_amount is None: try: preapproval_amount = D(models.Premium.objects.get(id=premium_id).amount) except: preapproval_amount = None - - data = {'preapproval_amount':preapproval_amount, 'premium_id':premium_id} - - form_class = self.get_form_class() - - # no validation errors, please, when we're only doing a GET - # to avoid validation errors, don't bind the form - - if preapproval_amount is not None: - form = form_class(data) + self.data = {'preapproval_amount':preapproval_amount, + 'premium_id':premium_id, 'premium_description':premium_description, + 'ack_name':ack_name, 'ack_dedication':ack_dedication, 'anonymous':anonymous} + if self.request.method == 'POST': + self.data.update(self.request.POST.dict()) + if self.request.method == 'POST' or premium_id: + return {'data':self.data} else: - form = form_class() - + return {} + + def get_context_data(self, **kwargs): + """set up the pledge page""" + + context = super(PledgeView, self).get_context_data(**kwargs) + try: - pubdate = work.publication_date[:4] + pubdate = self.work.publication_date[:4] except IndexError: pubdate = 'unknown' context.update({ - 'redirect_to_modify_pledge':False, - 'work':work,'campaign':campaign, - 'premiums':premiums, 'form':form, - 'premium_id':premium_id, - 'faqmenu': 'pledge', + 'work':self.work, + 'campaign':self.campaign, + 'premiums':self.premiums, + 'premium_id':self.data['premium_id'], + 'faqmenu': 'modify' if self.transaction else 'pledge', 'pubdate':pubdate, - 'payment_processor':settings.PAYMENT_PROCESSOR, - }) + 'transaction': self.transaction, + 'tid': self.transaction.id if self.transaction else None, + 'premium_description': self.data['premium_description'], + 'preapproval_amount':self.data['preapproval_amount'], + 'payment_processor':self.transaction.host if self.transaction else None, + }) - # check whether the user already has an ACTIVE transaction for the given campaign. - # if so, we should redirect the user to modify pledge page - # BUGBUG: but what about Completed Transactions? - transactions = campaign.transactions().filter(user=user, status=TRANSACTION_STATUS_ACTIVE) - if transactions.count() > 0: - context.update({'redirect_to_modify_pledge':True}) - else: - context.update({'redirect_to_modify_pledge':False}) - return context - def form_valid(self, form): - work_id = self.kwargs["work_id"] - preapproval_amount = form.cleaned_data["preapproval_amount"] - anonymous = form.cleaned_data["anonymous"] - ack_name = form.cleaned_data["ack_name"] - ack_link = form.cleaned_data["ack_link"] - ack_dedication = form.cleaned_data["ack_dedication"] + def get_premium(self,form): + premium_id = form.cleaned_data["premium_id"] + # confirm that the premium_id is a valid one for the campaign in question + try: + premium = models.Premium.objects.get(id=premium_id) + if not (premium.campaign is None or premium.campaign == self.campaign): + premium = None + except models.Premium.DoesNotExist, e: + premium = None + return premium + def form_valid(self, form): # right now, if there is a non-zero pledge amount, go with that. otherwise, do the pre_approval - campaign = models.Work.objects.get(id=int(work_id)).last_campaign() - premium_id = form.cleaned_data["premium_id"] - # confirm that the premium_id is a valid one for the campaign in question - try: - premium = models.Premium.objects.get(id=premium_id) - if not (premium.campaign is None or premium.campaign == campaign): - premium = None - except models.Premium.DoesNotExist, e: - premium = None - - p = PaymentManager(embedded=self.embedded) - - # PledgeView is wrapped in login_required -- so in theory, user should never be None -- but I'll keep this logic here for now. - if self.request.user.is_authenticated(): - user = self.request.user + p = PaymentManager() + if self.transaction: + # modifying the transaction... + assert self.transaction.type == PAYMENT_TYPE_AUTHORIZATION and self.transaction.status == TRANSACTION_STATUS_ACTIVE + status, url = p.modify_transaction(self.transaction, form.cleaned_data["preapproval_amount"], + premium=self.get_premium(form), + paymentReason="Unglue.it Pledge for {0}".format(self.campaign.name), + ack_name=form.cleaned_data["ack_name"], + ack_dedication=form.cleaned_data["ack_dedication"], + anonymous=form.cleaned_data["anonymous"], + ) + logger.info("status: {0}, url:{1}".format(status, url)) + + if status and url is not None: + logger.info("PledgeView (Modify): " + url) + return HttpResponseRedirect(url) + elif status and url is None: + return HttpResponseRedirect("{0}?tid={1}".format(reverse('pledge_complete'), self.transaction.id)) + else: + return HttpResponse("No modification made") else: - user = None - - if not self.embedded: - - return_url = None - nevermind_url = None - - # the recipients of this authorization is not specified here but rather by the PaymentManager. - # set the expiry date based on the campaign deadline - expiry = campaign.deadline + timedelta( days=settings.PREAPPROVAL_PERIOD_AFTER_CAMPAIGN ) - - paymentReason = "Unglue.it Pledge for {0}".format(campaign.name) - t, url = p.authorize('USD', TARGET_TYPE_CAMPAIGN, preapproval_amount, expiry=expiry, campaign=campaign, list=None, user=user, - return_url=return_url, nevermind_url=nevermind_url, anonymous=anonymous, premium=premium, - paymentReason=paymentReason, ack_name=ack_name, ack_link=ack_link, ack_dedication=ack_dedication) - else: # embedded view -- which we're not actively using right now. - # embedded view triggerws instant payment: send to the partnering RH - receiver_list = [{'email':settings.PAYPAL_NONPROFIT_PARTNER_EMAIL, 'amount':preapproval_amount}] - - return_url = None - nevermind_url = None - - t, url = p.pledge('USD', TARGET_TYPE_CAMPAIGN, receiver_list, campaign=campaign, list=None, user=user, - return_url=return_url, nevermind_url=nevermind_url, anonymous=anonymous, premium=premium, - ack_name=ack_name, ack_link=ack_link, ack_dedication=ack_dedication) - - if url: - logger.info("PledgeView url: " + url) - return HttpResponseRedirect(url) - else: - logger.error("Attempt to produce transaction id {0} failed".format(t.id)) - return HttpResponse("Our attempt to enable your transaction failed. We have logged this error.") - -class PledgeModifyView(FormView): - """ - A view to handle request to change an existing pledge - """ - - template_name="pledge.html" - form_class = CampaignPledgeForm - embedded = False - - def get_context_data(self, **kwargs): - - context = super(PledgeModifyView, self).get_context_data(**kwargs) - - # the following should be true since PledgeModifyView.as_view is wrapped in login_required - assert self.request.user.is_authenticated() - user = self.request.user - - work = get_object_or_404(models.Work, id=self.kwargs["work_id"]) - - try: - campaign = work.last_campaign() - premiums = campaign.custom_premiums() | models.Premium.objects.filter(id=150) - - # which combination of campaign and transaction status required? - # Campaign must be ACTIVE - assert campaign.status == 'ACTIVE' - - transactions = campaign.transactions().filter(user=user, status=TRANSACTION_STATUS_ACTIVE) - assert transactions.count() == 1 - transaction = transactions[0] - assert transaction.type == PAYMENT_TYPE_AUTHORIZATION and transaction.status == TRANSACTION_STATUS_ACTIVE - - except Exception, e: - raise e - - # what stuff do we need to pull out to populate form? - # preapproval_amount, premium_id (which we don't have stored yet) - if transaction.premium is not None: - premium_id = transaction.premium.id - premium_description = transaction.premium.description - else: - premium_id = None - premium_description = None - - # is there a Transaction for an ACTIVE campaign for this - # should make sure Transaction is modifiable. - - preapproval_amount = transaction.amount - data = {'preapproval_amount':preapproval_amount, 'premium_id':premium_id} - - # initialize form with the current state of the transaction if the current values empty - form = kwargs['form'] - - if not(form.is_bound): - form_class = self.get_form_class() - form = form_class(initial=data) - - context.update({ - 'work':work, - 'campaign':campaign, - 'premiums':premiums, - 'form':form, - 'preapproval_amount':preapproval_amount, - 'premium_id':premium_id, - 'premium_description': premium_description, - 'faqmenu': 'modify', - 'tid': transaction.id, - 'payment_processor':settings.PAYMENT_PROCESSOR, - 'transaction': transaction, - }) - return context - - - def form_invalid(self, form): - logger.info("form.non_field_errors: {0}".format(form.non_field_errors())) - response = self.render_to_response(self.get_context_data(form=form)) - return response - - def form_valid(self, form): - - # What are the situations we need to deal with? - # 2 main situations: if the new amount is less than max_amount, no need to go out to PayPal again - # if new amount is greater than max_amount...need to go out and get new approval. - # to start with, we can use the standard pledge_complete, pledge_cancel machinery - # might have to modify the pledge_complete, pledge_cancel because the messages are going to be - # different because we're modifying a pledge rather than a new one. - - work_id = self.kwargs["work_id"] - preapproval_amount = form.cleaned_data["preapproval_amount"] - ack_name = form.cleaned_data["ack_name"] - ack_link = form.cleaned_data["ack_link"] - ack_dedication = form.cleaned_data["ack_dedication"] - anonymous = form.cleaned_data["anonymous"] - - assert self.request.user.is_authenticated() - user = self.request.user - - # right now, if there is a non-zero pledge amount, go with that. otherwise, do the pre_approval - campaign = models.Work.objects.get(id=int(work_id)).last_campaign() - assert campaign.status == 'ACTIVE' - - premium_id = form.cleaned_data["premium_id"] - # confirm that the premium_id is a valid one for the campaign in question - try: - premium = models.Premium.objects.get(id=premium_id) - if not (premium.campaign is None or premium.campaign == campaign): - premium = None - except models.Premium.DoesNotExist, e: - premium = None - - transactions = campaign.transactions().filter(user=user, status=TRANSACTION_STATUS_ACTIVE) - assert transactions.count() == 1 - transaction = transactions[0] - assert transaction.type == PAYMENT_TYPE_AUTHORIZATION and transaction.status == TRANSACTION_STATUS_ACTIVE - - p = PaymentManager(embedded=self.embedded) - paymentReason = "Unglue.it Pledge for {0}".format(campaign.name) - status, url = p.modify_transaction(transaction=transaction, amount=preapproval_amount, premium=premium, - paymentReason=paymentReason, ack_name=ack_name, ack_link=ack_link, - ack_dedication=ack_dedication, anonymous=anonymous) - - logger.info("status: {0}, url:{1}".format(status, url)) - - if status and url is not None: - logger.info("PledgeModifyView paypal: " + url) - return HttpResponseRedirect(url) - elif status and url is None: - # let's use the pledge_complete template for now and maybe look into customizing it. - return HttpResponseRedirect("{0}?tid={1}".format(reverse('pledge_complete'), transaction.id)) - else: - return HttpResponse("No modification made") - + t, url = p.process_transaction('USD', form.cleaned_data["preapproval_amount"], + host = None, + campaign=self.campaign, + user=self.request.user, + premium=premium, + paymentReason="Unglue.it Pledge for {0}".format(self.campaign.name), + ack_name=form.cleaned_data["ack_name"], + ack_dedication=form.cleaned_data["ack_dedication"], + anonymous=form.cleaned_data["anonymous"], + ) + if url: + logger.info("PledgeView url: " + url) + return HttpResponseRedirect(url) + else: + logger.error("Attempt to produce transaction id {0} failed".format(t.id)) + return HttpResponse("Our attempt to enable your transaction failed. We have logged this error.") class PledgeRechargeView(TemplateView): @@ -869,7 +731,7 @@ class PledgeRechargeView(TemplateView): context = super(PledgeRechargeView, self).get_context_data(**kwargs) - # the following should be true since PledgeModifyView.as_view is wrapped in login_required + # the following should be true since PledgeView.as_view is wrapped in login_required assert self.request.user.is_authenticated() user = self.request.user @@ -888,18 +750,15 @@ class PledgeRechargeView(TemplateView): if transaction is not None: # the recipients of this authorization is not specified here but rather by the PaymentManager. - # set the expiry date based on the campaign deadline - expiry = campaign.deadline + timedelta( days=settings.PREAPPROVAL_PERIOD_AFTER_CAMPAIGN ) ack_name = transaction.ack_name - ack_link = transaction.ack_link ack_dedication = transaction.ack_dedication paymentReason = "Unglue.it Recharge for {0}".format(campaign.name) - p = PaymentManager(embedded=False) - t, url = p.authorize('USD', TARGET_TYPE_CAMPAIGN, transaction.amount, expiry=expiry, campaign=campaign, list=None, user=user, - return_url=return_url, nevermind_url=nevermind_url, anonymous=transaction.anonymous, premium=transaction.premium, - paymentReason=paymentReason, ack_name=ack_name, ack_link=ack_link, ack_dedication=ack_dedication) + p = PaymentManager() + t, url = p.authorize('USD', transaction.amount, campaign=campaign, list=None, user=user, + return_url=return_url, anonymous=transaction.anonymous, premium=transaction.premium, + paymentReason=paymentReason, ack_name=ack_name, ack_dedication=ack_dedication) logger.info("Recharge url: {0}".format(url)) else: url = None @@ -1090,73 +949,11 @@ class PledgeCancelView(FormView): except Exception, e: logger.error("Exception from attempt to cancel pledge for campaign id {0} for username {1}: {2}".format(campaign_id, user.username, e)) return HttpResponse("Sorry, something went wrong in canceling your campaign pledge. We have logged this error.") - - -class PledgeNeverMindView(TemplateView): - """A callback for PayPal to tell unglue.it that a payment transaction has been canceled by the user""" - template_name="pledge_nevermind.html" - - def get_context_data(self): - context = super(PledgeNeverMindView, self).get_context_data() - - if self.request.user.is_authenticated(): - user = self.request.user - else: - user = None - - # pull out the transaction id and try to get the corresponding Transaction - transaction_id = self.request.REQUEST.get("tid") - transaction = Transaction.objects.get(id=transaction_id) - - # work and campaign in question - try: - campaign = transaction.campaign - work = campaign.work - except Exception, e: - campaign = None - work = None - - # we need to check whether the user tied to the transaction is indeed the authenticated user. - - correct_user = False - try: - if user.id == transaction.user.id: - correct_user = True - except Exception, e: - pass - - # check that the user had not already approved the transaction - # do we need to first run PreapprovalDetails to check on the status - - # is it of type=PAYMENT_TYPE_AUTHORIZATION and status is NONE or ACTIVE (but approved is false) - - if transaction.type == PAYMENT_TYPE_AUTHORIZATION: - correct_transaction_type = True - else: - correct_transaction_type = False - - # status? - - # give the user an opportunity to approved the transaction again - # provide a URL to click on. - # https://www.sandbox.paypal.com/?cmd=_ap-preapproval&preapprovalkey=PA-6JV656290V840615H - try_again_url = '%s?cmd=_ap-preapproval&preapprovalkey=%s' % (settings.PAYPAL_PAYMENT_HOST, transaction.preapproval_key) - - context["transaction"] = transaction - context["correct_user"] = correct_user - context["correct_transaction_type"] = correct_transaction_type - context["try_again_url"] = try_again_url - context["work"] = work - context["campaign"] = campaign - context["faqmenu"] = "cancel" - - return context class DonateView(FormView): template_name="donate.html" form_class = DonateForm - embedded = False #def get_context_data(self, **kwargs): # context = super(DonateView, self).get_context_data(**kwargs) @@ -1173,7 +970,7 @@ class DonateView(FormView): # right now, if there is a non-zero pledge amount, go with that. otherwise, do the pre_approval campaign = None - p = PaymentManager(embedded=self.embedded) + p = PaymentManager() # we should force login at this point -- or if no account, account creation, login, and return to this spot if self.request.user.is_authenticated(): @@ -1187,8 +984,8 @@ class DonateView(FormView): #redirect the page back to campaign page on success return_url = self.request.build_absolute_uri(reverse('donate')) - t, url = p.pledge('USD', TARGET_TYPE_DONATION, receiver_list, campaign=campaign, list=None, user=user, - return_url=return_url, anonymous=anonymous, ack_name=ack_name, ack_link=ack_link, + t, url = p.pledge('USD', receiver_list, campaign=campaign, list=None, user=user, + return_url=return_url, anonymous=anonymous, ack_name=ack_name, ack_dedication=ack_dedication) if url: diff --git a/payment/credit.py b/payment/credit.py new file mode 100644 index 00000000..c5987d5b --- /dev/null +++ b/payment/credit.py @@ -0,0 +1,56 @@ +from datetime import timedelta + +from django.contrib.auth.models import User +from django.conf import settings + +from regluit.payment.parameters import * +from regluit.utils.localdatetime import now +from regluit.payment.baseprocessor import BasePaymentRequest + + +def pledge_transaction(t,user,amount): + """commit from a 's credit to a specified transaction """ + + if t.amount and t.host == PAYMENT_HOST_CREDIT: + #changing the pledge_transaction + user.credit.add_to_pledged(amount-t.amount) + else: + user.credit.add_to_pledged(amount) + t.amount=amount + t.max_amount=amount + t.host = PAYMENT_HOST_CREDIT + t.type = PAYMENT_TYPE_AUTHORIZATION + t.status=TRANSACTION_STATUS_ACTIVE + t.approved=True + now_val = now() + t.date_authorized = now_val + t.date_expired = now_val + timedelta( days=settings.PREAPPROVAL_PERIOD ) + + t.save() + + +class CancelPreapproval(BasePaymentRequest): + ''' + Cancels an exisiting token. + ''' + + def __init__(self, transaction): + self.transaction = transaction + if transaction.user.credit.add_to_pledged(-transaction.amount): + #success + transaction.status=TRANSACTION_STATUS_CANCELED + transaction.save() + else: + self.errorMessage="couldn't cancel the transaction" + self.status = 'Credit Cancel Failure' + +class PreapprovalDetails(BasePaymentRequest): + status = None + approved = None + currency = None + amount = None + def __init__(self, transaction): + self.status = transaction.status + self.approved = transaction.approved + self.currency = transaction.currency + self.amount = transaction.amount diff --git a/payment/manager.py b/payment/manager.py index 27e742a5..017bfe2a 100644 --- a/payment/manager.py +++ b/payment/manager.py @@ -5,6 +5,9 @@ from django.core.urlresolvers import reverse from django.conf import settings from regluit.payment.parameters import * from regluit.payment.signals import transaction_charged, pledge_modified, pledge_created +from regluit.payment import credit + +from regluit.payment.baseprocessor import Pay, Finish, Preapproval, ProcessIPN, CancelPreapproval, PaymentDetails, PreapprovalDetails, RefundPayment import uuid import traceback @@ -14,6 +17,8 @@ import logging from decimal import Decimal as D from xml.dom import minidom import urllib, urlparse +from datetime import timedelta + from django.conf import settings @@ -531,58 +536,28 @@ class PaymentManager( object ): logger.info("Cancel Transaction " + str(transaction.id) + " Failed with error: " + p.error_string()) return False - def authorize(self, currency, target, amount, expiry=None, campaign=None, list=None, user=None, - return_url=None, nevermind_url=None, anonymous=False, premium=None, - paymentReason="unglue.it Pledge", ack_name=None, ack_link=None, ack_dedication=None, - modification=False): + def authorize(self, transaction, expiry= None, return_url=None, paymentReason="unglue.it Pledge", modification=False): ''' authorize authorizes a set amount of money to be collected at a later date - currency: a 3-letter paypal currency code, i.e. USD - target: a defined target type, i.e. TARGET_TYPE_CAMPAIGN, TARGET_TYPE_LIST, TARGET_TYPE_NONE - amount: the amount to authorize - campaign: optional campaign object(to be set with TARGET_TYPE_CAMPAIGN) - list: optional list object(to be set with TARGET_TYPE_LIST) - user: optional user object return_url: url to redirect supporter to after a successful PayPal transaction - nevermind_url: url to send supporter to if support hits cancel while in middle of PayPal transaction - anonymous: whether this pledge is anonymous - premium: the premium selected by the supporter for this transaction paymentReason: a memo line that will show up in the Payer's Amazon (and Paypal?) account modification: whether this authorize call is part of a modification of an existing pledge - ack_name, ack_link, ack_dedication: how the user will be credited in the unglued ebook, if applicable return value: a tuple of the new transaction object and a re-direct url. If the process fails, the redirect url will be None - ''' - - t = Transaction.objects.create(amount=amount, - max_amount=amount, - type=PAYMENT_TYPE_AUTHORIZATION, - execution = EXECUTE_TYPE_CHAINED_DELAYED, - target=target, - currency=currency, - status='NONE', - campaign=campaign, - list=list, - user=user, - anonymous=anonymous, - premium=premium, - ack_name=ack_name, - ack_link=ack_link, - ack_dedication=ack_dedication - ) + ''' - # we might want to not allow for a return_url or nevermind_url to be passed in but calculated + if host==None: + #TODO send user to select a payment processor + pass + + # we might want to not allow for a return_url to be passed in but calculated # here because we have immediate access to the Transaction object. - if nevermind_url is None: - nevermind_path = "{0}?{1}".format(reverse('pledge_nevermind'), - urllib.urlencode({'tid':t.id})) - nevermind_url = urlparse.urljoin(settings.BASE_URL, nevermind_path) if return_url is None: return_path = "{0}?{1}".format(reverse('pledge_complete'), @@ -590,7 +565,7 @@ class PaymentManager( object ): return_url = urlparse.urljoin(settings.BASE_URL, return_path) method = getattr(t.get_payment_class(), "Preapproval") - p = method(t, amount, expiry, return_url=return_url, nevermind_url=nevermind_url, paymentReason=paymentReason) + p = method(transaction, transaction.max_amount, expiry, return_url=return_url, paymentReason=paymentReason) # Create a response for this envelope = p.envelope() @@ -600,11 +575,11 @@ class PaymentManager( object ): correlation_id = p.correlation_id(), timestamp = p.timestamp(), info = p.raw_response, - transaction=t) + transaction=transaction) if p.success() and not p.error(): - t.preapproval_key = p.key() - t.save() + transaction.preapproval_key = p.key() + transaction.save() url = p.next_url() @@ -624,16 +599,69 @@ class PaymentManager( object ): # send the notice here for now # this is actually premature since we're only about to send the user off to the payment system to # authorize a charge - pledge_created.send(sender=self, transaction=t) + pledge_created.send(sender=self, transaction=transaction) - return t, url + return transaction, url else: - t.error = p.error_string() - t.save() + transaction.error = p.error_string() + transaction.save() logger.info("Authorize Error: " + p.error_string()) + return transaction, None + + def process_transaction(self, currency, amount, host=None, campaign=None, user=None, + return_url=None, anonymous=False, premium=None, + paymentReason="unglue.it Pledge", ack_name=None, ack_dedication=None, + modification=False): + ''' + process + + saves and processes a proposed transaction; decides if the transaction should be processed immediately. + + currency: a 3-letter currency code, i.e. USD + amount: the amount to authorize + host: the name of the processing module; if none, send user back to decide! + campaign: required campaign object + user: optional user object + return_url: url to redirect supporter to after a successful transaction + anonymous: whether this pledge is anonymous + premium: the premium selected by the supporter for this transaction + paymentReason: a memo line that will show up in the Payer's Amazon (and Paypal?) account + modification: whether this authorize call is part of a modification of an existing pledge + ack_name, ack_dedication: how the user will be credited in the unglued ebook, if applicable + + return value: a tuple of the new transaction object and a re-direct url. If the process fails, + the redirect url will be None + ''' + # set the expiry date based on the campaign deadline + expiry = campaign.deadline + timedelta( days=settings.PREAPPROVAL_PERIOD_AFTER_CAMPAIGN ) + + t = Transaction.objects.create(amount=0, + max_amount=amount, + currency=currency, + status='NONE', + campaign=campaign, + user=user, + anonymous=anonymous, + premium=premium, + ack_name=ack_name, + ack_dedication=ack_dedication + ) + + # does user have enough credit to pledge now? + if user.credit.available >= amount : + # YES! + credit.pledge_transaction(t,user,amount) + return_path = "{0}?{1}".format(reverse('pledge_complete'), + urllib.urlencode({'tid':t.id})) + return_url = urlparse.urljoin(settings.BASE_URL, return_path) + pledge_created.send(sender=self, transaction=t) + return t, return_url + else: + #TODO send user to choose payment path return t, None + def cancel_related_transaction(self, transaction, status=TRANSACTION_STATUS_ACTIVE, campaign=None): ''' @@ -677,26 +705,29 @@ class PaymentManager( object ): return canceled - def modify_transaction(self, transaction, amount, expiry=None, anonymous=None, premium=None, + def modify_transaction(self, transaction, amount, expiry=None, premium=None, return_url=None, nevermind_url=None, paymentReason=None, - ack_name=None, ack_link=None, ack_dedication=None): + ack_name=None, ack_dedication=None, anonymous=None): ''' modify - Modifies a transaction. The only type of modification allowed is to the amount and expiration date + Modifies a transaction. + 2 main situations: if the new amount is less than max_amount, no need to go out to PayPal again + if new amount is greater than max_amount...need to go out and get new approval. + to start with, we can use the standard pledge_complete, pledge_cancel machinery + might have to modify the pledge_complete, pledge_cancel because the messages are going to be + different because we're modifying a pledge rather than a new one. amount: the new amount expiry: the new expiration date, or if none the current expiration date will be used anonymous: new anonymous value; if None, then keep old value premium: new premium selected; if None, then keep old value return_url: the return URL after the preapproval(if needed) - nevermind_url: the cancel url after the preapproval(if needed) paymentReason: a memo line that will show up in the Payer's Amazon (and Paypal?) account return value: True if successful, False otherwise. An optional second parameter for the forward URL if a new authorhization is needed ''' - # Can only modify the amount of a preapproval for now if transaction.type != PAYMENT_TYPE_AUTHORIZATION: logger.info("Error, attempt to modify an invalid transaction type") return False, None @@ -707,34 +738,50 @@ class PaymentManager( object ): logger.info("Error, attempt to modify a transaction that is not active") return False, None - # if any of expiry, anonymous, or premium is None, use the existing value - if expiry is None: - expiry = transaction.date_expired - if anonymous is None: - anonymous = transaction.anonymous - if premium is None: - premium = transaction.premium - - if amount > transaction.max_amount or expiry != transaction.date_expired: + if transaction.host == PAYMENT_HOST_CREDIT: + # does user have enough credit to pledge now? + if transaction.user.credit.available >= amount-transaction.amount : + # YES! + transaction.anonymous = anonymous + transaction.premium = premium + transaction.ack_name = ack_name + transaction.ack_dedication = ack_dedication + credit.pledge_transaction(transaction,transaction.user,amount) + return_path = "{0}?{1}".format(reverse('pledge_complete'), + urllib.urlencode({'tid':transaction.id})) + return_url = urlparse.urljoin(settings.BASE_URL, return_path) - # Start a new authorization for the new amount + logger.info("Updated amount of transaction to %f" % amount) + pledge_modified.send(sender=self, transaction=transaction,up_or_down="decreased" if amount-transaction.amount<0 else "increased") + return transaction, return_url + else: + #TODO send user to choose payment path + return t, None + elif amount > transaction.max_amount or expiry != transaction.date_expired: + + # set the expiry date based on the campaign deadline + expiry = transaction.campaign.deadline + timedelta( days=settings.PREAPPROVAL_PERIOD_AFTER_CAMPAIGN ) + + # Start a new transaction for the new amount + t = Transaction.objects.create(amount=amount, + max_amount=amount, + host=transaction.host, + currency=currency, + status=TRANSACTION_STATUS_CREATED, + campaign=transaction.campaign, + user=transaction.user, + anonymous=anonymous if anonymous!=None else transaction.anonymous, + premium=premium if premium != None else transaction.premium, + ack_name=ack_name, + ack_dedication=ack_dedication + ) - t, url = self.authorize(transaction.currency, - transaction.target, - amount, - expiry, - transaction.campaign, - transaction.list, - transaction.user, - return_url, - nevermind_url, - anonymous, - premium, - paymentReason, - ack_name, - ack_link, - ack_dedication, - True) + t, url = self.authorize(transaction, + expiry=expiry if expiry else transaction.date_expired, + return_url=return_url, + paymentReason=paymentReason, + modification=True + ) if t and url: # Need to re-direct to approve the transaction @@ -762,7 +809,6 @@ class PaymentManager( object ): transaction.anonymous = anonymous transaction.premium = premium transaction.ack_name = ack_name - transaction.ack_link = ack_link transaction.ack_dedication = ack_dedication transaction.save() @@ -820,16 +866,15 @@ class PaymentManager( object ): logger.info("Refund Transaction " + str(transaction.id) + " Failed with error: " + p.error_string()) return False - def pledge(self, currency, target, receiver_list, campaign=None, list=None, user=None, + def pledge(self, currency, receiver_list, campaign=None, user=None, return_url=None, nevermind_url=None, anonymous=False, premium=None, ack_name=None, - ack_link=None, ack_dedication=None): + ack_dedication=None): ''' pledge Performs an instant payment currency: a 3-letter paypal currency code, i.e. USD - target: a defined target type, i.e. TARGET_TYPE_CAMPAIGN, TARGET_TYPE_LIST, TARGET_TYPE_NONE receiver_list: a list of receivers for the transaction, in this format: [ @@ -837,8 +882,7 @@ class PaymentManager( object ): {'email':'email-2', 'amount':amount2} ] - campaign: optional campaign object(to be set with TARGET_TYPE_CAMPAIGN) - list: optional list object(to be set with TARGET_TYPE_LIST) + campaign: required campaign object user: optional user object return_url: url to redirect supporter to after a successful PayPal transaction nevermind_url: url to send supporter to if support hits cancel while in middle of PayPal transaction @@ -863,13 +907,11 @@ class PaymentManager( object ): currency=currency, status='NONE', campaign=campaign, - list=list, user=user, date_payment=now(), anonymous=anonymous, premium=premium, ack_name=ack_name, - ack_link=ack_link, ack_dedication=ack_dedication ) diff --git a/payment/migrations/0008_auto__add_credit__add_creditlog__del_field_transaction_target__del_fie.py b/payment/migrations/0008_auto__add_credit__add_creditlog__del_field_transaction_target__del_fie.py new file mode 100644 index 00000000..664f4ec6 --- /dev/null +++ b/payment/migrations/0008_auto__add_credit__add_creditlog__del_field_transaction_target__del_fie.py @@ -0,0 +1,224 @@ +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Adding model 'Credit' + db.create_table('payment_credit', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('user', self.gf('django.db.models.fields.related.OneToOneField')(related_name='credit', unique=True, to=orm['auth.User'])), + ('balance', self.gf('django.db.models.fields.DecimalField')(default='0.00', max_digits=14, decimal_places=2)), + ('pledged', self.gf('django.db.models.fields.DecimalField')(default='0.00', max_digits=14, decimal_places=2)), + ('last_activity', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)), + )) + db.send_create_signal('payment', ['Credit']) + + # Adding model 'CreditLog' + db.create_table('payment_creditlog', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True)), + ('amount', self.gf('django.db.models.fields.DecimalField')(default='0.00', max_digits=14, decimal_places=2)), + ('timestamp', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)), + ('action', self.gf('django.db.models.fields.CharField')(max_length=16)), + )) + db.send_create_signal('payment', ['CreditLog']) + + # Deleting field 'Transaction.target' + db.delete_column('payment_transaction', 'target') + + # Deleting field 'Transaction.list' + db.delete_column('payment_transaction', 'list_id') + + # Adding field 'Transaction.ack_name' + db.add_column('payment_transaction', 'ack_name', self.gf('django.db.models.fields.CharField')(max_length=64, null=True), keep_default=False) + + # Adding field 'Transaction.ack_dedication' + db.add_column('payment_transaction', 'ack_dedication', self.gf('django.db.models.fields.CharField')(max_length=140, null=True), keep_default=False) + + + def backwards(self, orm): + + # Deleting model 'Credit' + db.delete_table('payment_credit') + + # Deleting model 'CreditLog' + db.delete_table('payment_creditlog') + + # Adding field 'Transaction.target' + db.add_column('payment_transaction', 'target', self.gf('django.db.models.fields.IntegerField')(default=0), keep_default=False) + + # Adding field 'Transaction.list' + db.add_column('payment_transaction', 'list', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['core.Wishlist'], null=True), keep_default=False) + + # Deleting field 'Transaction.ack_name' + db.delete_column('payment_transaction', 'ack_name') + + # Deleting field 'Transaction.ack_dedication' + db.delete_column('payment_transaction', 'ack_dedication') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 31, 2, 10, 24, 467332)'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 8, 31, 2, 10, 24, 467190)'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'core.campaign': { + 'Meta': {'object_name': 'Campaign'}, + 'activated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'amazon_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'deadline': ('django.db.models.fields.DateTimeField', [], {}), + 'description': ('ckeditor.fields.RichTextField', [], {'null': 'True'}), + 'details': ('ckeditor.fields.RichTextField', [], {'null': 'True', 'blank': 'True'}), + 'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'null': 'True', 'to': "orm['core.Edition']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'left': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}), + 'license': ('django.db.models.fields.CharField', [], {'default': "'CC BY-NC-ND'", 'max_length': '255'}), + 'managers': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'campaigns'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True'}), + 'paypal_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'status': ('django.db.models.fields.CharField', [], {'default': "'INITIALIZED'", 'max_length': '15', 'null': 'True'}), + 'target': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'to': "orm['core.Work']"}) + }, + 'core.edition': { + 'Meta': {'object_name': 'Edition'}, + 'cover_image': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'public_domain': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'publication_date': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'publisher': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editions'", 'null': 'True', 'to': "orm['core.Work']"}) + }, + 'core.premium': { + 'Meta': {'object_name': 'Premium'}, + 'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '0'}), + 'campaign': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'premiums'", 'null': 'True', 'to': "orm['core.Campaign']"}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'limit': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '2'}) + }, + 'core.work': { + 'Meta': {'ordering': "['title']", 'object_name': 'Work'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}), + 'num_wishes': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'openlibrary_lookup': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'}) + }, + 'payment.credit': { + 'Meta': {'object_name': 'Credit'}, + 'balance': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_activity': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'pledged': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'credit'", 'unique': 'True', 'to': "orm['auth.User']"}) + }, + 'payment.creditlog': { + 'Meta': {'object_name': 'CreditLog'}, + 'action': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'amount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'timestamp': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}) + }, + 'payment.paymentresponse': { + 'Meta': {'object_name': 'PaymentResponse'}, + 'api': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'correlation_id': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'info': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True'}), + 'status': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}), + 'timestamp': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), + 'transaction': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['payment.Transaction']"}) + }, + 'payment.receiver': { + 'Meta': {'object_name': 'Receiver'}, + 'amount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), + 'currency': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'email': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'local_status': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), + 'primary': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'reason': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'status': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'transaction': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['payment.Transaction']"}), + 'txn_id': ('django.db.models.fields.CharField', [], {'max_length': '64'}) + }, + 'payment.transaction': { + 'Meta': {'object_name': 'Transaction'}, + 'ack_dedication': ('django.db.models.fields.CharField', [], {'max_length': '140', 'null': 'True'}), + 'ack_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), + 'amount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), + 'anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'approved': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'campaign': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Campaign']", 'null': 'True'}), + 'currency': ('django.db.models.fields.CharField', [], {'default': "'USD'", 'max_length': '10', 'null': 'True'}), + 'date_authorized': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_executed': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'date_expired': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'date_payment': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'error': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'}), + 'execution': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'host': ('django.db.models.fields.CharField', [], {'default': "'none'", 'max_length': '32'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'local_status': ('django.db.models.fields.CharField', [], {'default': "'NONE'", 'max_length': '32', 'null': 'True'}), + 'max_amount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), + 'pay_key': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), + 'preapproval_key': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), + 'premium': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Premium']", 'null': 'True'}), + 'reason': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), + 'receipt': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'}), + 'secret': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), + 'status': ('django.db.models.fields.CharField', [], {'default': "'None'", 'max_length': '32'}), + 'type': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}) + } + } + + complete_apps = ['payment'] diff --git a/payment/models.py b/payment/models.py index e339d567..1016f5e7 100644 --- a/payment/models.py +++ b/payment/models.py @@ -4,8 +4,11 @@ from django.conf import settings from regluit.core.models import Campaign, Wishlist, Premium from regluit.payment.parameters import * from regluit.payment.signals import credit_balance_added -from decimal import Decimal +from decimal import Decimal, NaN import uuid +import urllib +import logging +logger = logging.getLogger(__name__) class Transaction(models.Model): @@ -14,16 +17,13 @@ class Transaction(models.Model): type = models.IntegerField(default=PAYMENT_TYPE_NONE, null=False) # host: the payment processor. Named after the payment module that hosts the payment processing functions - host = models.CharField(default=settings.PAYMENT_PROCESSOR, max_length=32, null=False) - - # target: e.g, TARGET_TYPE_CAMPAIGN, TARGET_TYPE_LIST -- defined in parameters.py - target = models.IntegerField(default=TARGET_TYPE_NONE, null=False) - + host = models.CharField(default=PAYMENT_HOST_NONE, max_length=32, null=False) + #execution: e.g. EXECUTE_TYPE_CHAINED_INSTANT, EXECUTE_TYPE_CHAINED_DELAYED, EXECUTE_TYPE_PARALLEL execution = models.IntegerField(default=EXECUTE_TYPE_NONE, null=False) # status: general status constants defined in parameters.py - status = models.CharField(max_length=32, default='None', null=False) + status = models.CharField(max_length=32, default=TRANSACTION_STATUS_NONE, null=False) # local_status: status code specific to the payment processor local_status = models.CharField(max_length=32, default='NONE', null=True) @@ -75,14 +75,14 @@ class Transaction(models.Model): # how to acknowledge the user on the supporter page of the campaign ebook ack_name = models.CharField(max_length=64, null=True) - ack_link = models.URLField(null=True) ack_dedication = models.CharField(max_length=140, null=True) # whether the user wants to be not listed publicly anonymous = models.BooleanField(null=False) - - # list: makes allowance for pledging against a Wishlist: not currently in use - list = models.ForeignKey(Wishlist, null=True) + + @property + def ack_link(self): + return 'https://unglue.it/supporter/%s'%urllib.urlencode(self.user.username) def save(self, *args, **kwargs): if not self.secret: @@ -149,10 +149,17 @@ class Receiver(models.Model): def __unicode__(self): return u"Receiver -- email: {0} status: {1} transaction: {2}".format(self.email, self.status, unicode(self.transaction)) +class CreditLog(models.Model): + # a write only record of Donation Credit Transactions + user = models.ForeignKey(User, null=True) + amount = models.DecimalField(default=Decimal('0.00'), max_digits=14, decimal_places=2) # max 999,999,999,999.99 + timestamp = models.DateTimeField(auto_now=True) + action = models.CharField(max_length=16) + class Credit(models.Model): user = models.OneToOneField(User, related_name='credit') - balance = models.IntegerField(default=0) - pledged = models.IntegerField(default=0) + balance = models.DecimalField(default=Decimal('0.00'), max_digits=14, decimal_places=2) # max 999,999,999,999.99 + pledged = models.DecimalField(default=Decimal('0.00'), max_digits=14, decimal_places=2) # max 999,999,999,999.99 last_activity = models.DateTimeField(auto_now=True) @property @@ -165,17 +172,29 @@ class Credit(models.Model): else: self.balance = self.balance + num_credits self.save() - credit_balance_added.send(sender=self, amount=num_credits) + try: # bad things can happen here if you don't return True + CreditLog(user = self.user, amount = num_credits, action="add_to_balance").save() + except: + logger.exception("failed to log add_to_balance of %s", num_credits) + try: + credit_balance_added.send(sender=self, amount=num_credits) + except: + logger.exception("credit_balance_added failed of %s", num_credits) return True def add_to_pledged(self, num_credits): - if not isinstance( num_credits, int): + num_credits=Decimal(num_credits) + if num_credits is NaN: return False if self.balance - self.pledged < num_credits : return False else: self.pledged=self.pledged + num_credits self.save() + try: # bad things can happen here if you don't return True + CreditLog(user = self.user, amount = num_credits, action="add_to_pledged").save() + except: + logger.exception("failed to log add_to_pledged of %s", num_credits) return True def use_pledge(self, num_credits): @@ -187,6 +206,10 @@ class Credit(models.Model): self.pledged=self.pledged - num_credits self.balance = self.balance - num_credits self.save() + try: + CreditLog(user = self.user, amount = - num_credits, action="use_pledge").save() + except: + logger.exception("failed to log use_pledge of %s", num_credits) return True def transfer_to(self, receiver, num_credits): diff --git a/payment/parameters.py b/payment/parameters.py index 872f07a6..829afa3a 100644 --- a/payment/parameters.py +++ b/payment/parameters.py @@ -5,17 +5,15 @@ PAYMENT_TYPE_AUTHORIZATION = 2 PAYMENT_HOST_NONE = "none" PAYMENT_HOST_PAYPAL = "paypal" PAYMENT_HOST_AMAZON = "amazon" +PAYMENT_HOST_TEST = "test" +PAYMENT_HOST_CREDIT = "credit" +PAYMENT_HOST_STRIPE = "stripe" EXECUTE_TYPE_NONE = 0 EXECUTE_TYPE_CHAINED_INSTANT = 1 EXECUTE_TYPE_CHAINED_DELAYED = 2 EXECUTE_TYPE_PARALLEL = 3 -TARGET_TYPE_NONE = 0 -TARGET_TYPE_CAMPAIGN = 1 -TARGET_TYPE_LIST = 2 -TARGET_TYPE_DONATION = 3 - # The default status for a transaction that is newly created TRANSACTION_STATUS_NONE = 'None' @@ -47,6 +45,3 @@ TRANSACTION_STATUS_REFUNDED = 'Refunded' # The transaction was refused/denied TRANSACTION_STATUS_FAILED = 'Failed' -# these two following parameters are probably extraneous since I think we will compute dynamically where to return each time. -COMPLETE_URL = '/paymentcomplete' -NEVERMIND_URL = '/paymentnevermind' diff --git a/payment/tests.py b/payment/tests.py index b86e3eed..0edd5d1f 100644 --- a/payment/tests.py +++ b/payment/tests.py @@ -190,7 +190,7 @@ class PledgeTest(TestCase): # Note, set this to 1-5 different receivers with absolute amounts for each receiver_list = [{'email':settings.PAYPAL_GLUEJAR_EMAIL, 'amount':20.00}] - t, url = p.pledge('USD', TARGET_TYPE_NONE, receiver_list, campaign=None, list=None, user=None) + t, url = p.pledge('USD', receiver_list, campaign=None, list=None, user=None) self.validateRedirect(t, url, 1) @@ -220,7 +220,7 @@ class PledgeTest(TestCase): receiver_list = [{'email':settings.PAYPAL_GLUEJAR_EMAIL, 'amount':20.00}, {'email':settings.PAYPAL_TEST_RH_EMAIL, 'amount':10.00}] - t, url = p.pledge('USD', TARGET_TYPE_NONE, receiver_list, campaign=None, list=None, user=None) + t, url = p.pledge('USD', receiver_list, campaign=None, list=None, user=None) self.validateRedirect(t, url, 2) @@ -244,7 +244,7 @@ class PledgeTest(TestCase): # Note, set this to 1-5 different receivers with absolute amounts for each receiver_list = [{'email':settings.PAYPAL_GLUEJAR_EMAIL, 'amount':50000.00}] - t, url = p.pledge('USD', TARGET_TYPE_NONE, receiver_list, campaign=None, list=None, user=None) + t, url = p.pledge('USD', receiver_list, campaign=None, list=None, user=None) self.validateRedirect(t, url, 1) @@ -284,7 +284,7 @@ class AuthorizeTest(TestCase): # Note, set this to 1-5 different receivers with absolute amounts for each - t, url = p.authorize('USD', TARGET_TYPE_NONE, 100.0, campaign=None, list=None, user=None) + t, url = p.authorize('USD', 100.0, campaign=None, list=None, user=None) self.validateRedirect(t, url) @@ -388,7 +388,7 @@ class BasicGuiTest(TestCase): def suite(): #testcases = [PledgeTest, AuthorizeTest, TransactionTest] - testcases = [TransactionTest] + testcases = [TransactionTest, CreditTest] suites = unittest.TestSuite([unittest.TestLoader().loadTestsFromTestCase(testcase) for testcase in testcases]) return suites diff --git a/payment/urls.py b/payment/urls.py index d50a346e..c91c6dd4 100644 --- a/payment/urls.py +++ b/payment/urls.py @@ -17,8 +17,6 @@ if settings.DEBUG: url(r"^testexecute", "testExecute"), url(r"^testcancel", "testCancel"), url(r"^querycampaign", "queryCampaign"), - url(r"^runtests", "runTests"), - url(r"^paymentcomplete","paymentcomplete"), url(r"^checkstatus", "checkStatus"), url(r"^testfinish", "testFinish"), url(r"^testrefund", "testRefund"), diff --git a/payment/views.py b/payment/views.py index 33e5b384..b3bdb12d 100644 --- a/payment/views.py +++ b/payment/views.py @@ -13,7 +13,8 @@ from django.test.utils import setup_test_environment from django.template import RequestContext from unittest import TestResult -from regluit.payment.tests import PledgeTest, AuthorizeTest + + import uuid from decimal import Decimal as D @@ -112,12 +113,8 @@ def testAuthorize(request): receiver_list = [{'email': TEST_RECEIVERS[0], 'amount':20.00}, {'email': TEST_RECEIVERS[1], 'amount':10.00}] - if campaign_id: - campaign = Campaign.objects.get(id=int(campaign_id)) - t, url = p.authorize('USD', TARGET_TYPE_CAMPAIGN, amount, campaign=campaign, return_url=None, list=None, user=None) - - else: - t, url = p.authorize('USD', TARGET_TYPE_NONE, amount, campaign=None, return_url=None, list=None, user=None) + campaign = Campaign.objects.get(id=int(campaign_id)) + t, url = p.authorize('USD', amount, campaign=campaign, return_url=None, list=None, user=None) if url: logger.info("testAuthorize: " + url) @@ -248,12 +245,9 @@ def testPledge(request): 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=user, return_url=None) + campaign = Campaign.objects.get(id=int(campaign_id)) + t, url = p.pledge('USD', receiver_list, campaign=campaign, list=None, user=user, return_url=None) - else: - t, url = p.pledge('USD', TARGET_TYPE_NONE, receiver_list, campaign=None, list=None, user=user, return_url=None) if url: logger.info("testPledge: " + url) @@ -264,33 +258,6 @@ def testPledge(request): logger.info("testPledge: Error " + str(t.error)) return HttpResponse(response) -def runTests(request): - - try: - # Setup the test environement. We need to run these tests on a live server - # so our code can receive IPN notifications from paypal - setup_test_environment() - result = TestResult() - - # Run the authorize test - test = AuthorizeTest('test_authorize') - test.run(result) - - # Run the pledge test - test = PledgeTest('test_pledge_single_receiver') - test.run(result) - - # Run the pledge failure test - test = PledgeTest('test_pledge_too_much') - test.run(result) - - output = "Tests Run: " + str(result.testsRun) + str(result.errors) + str(result.failures) - logger.info(output) - - return HttpResponse(output) - - except: - traceback.print_exc() @csrf_exempt def handleIPN(request, module): @@ -303,11 +270,6 @@ def handleIPN(request, module): return HttpResponse("ipn") -def paymentcomplete(request): - # pick up all get and post parameters and display - output = "payment complete" - output += request.method + "\n" + str(request.REQUEST.items()) - return HttpResponse(output) def checkStatus(request): # Check the status of all PAY transactions and flag any errors From 7afedcd0b6b89d80b67eadffc9148e8ea9823915 Mon Sep 17 00:00:00 2001 From: eric Date: Fri, 31 Aug 2012 10:58:57 -0400 Subject: [PATCH 036/107] ack_link now considers anonymous [#16582483] --- payment/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payment/models.py b/payment/models.py index 1016f5e7..54015824 100644 --- a/payment/models.py +++ b/payment/models.py @@ -82,7 +82,7 @@ class Transaction(models.Model): @property def ack_link(self): - return 'https://unglue.it/supporter/%s'%urllib.urlencode(self.user.username) + return 'https://unglue.it/supporter/%s'%urllib.urlencode(self.user.username) if self.anonymous else '' def save(self, *args, **kwargs): if not self.secret: From c20e6299bb728d37f986248f848489d798236375 Mon Sep 17 00:00:00 2001 From: eric Date: Fri, 31 Aug 2012 11:05:00 -0400 Subject: [PATCH 037/107] off to a great start this morning [#16582483] --- payment/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payment/models.py b/payment/models.py index 54015824..486b24fc 100644 --- a/payment/models.py +++ b/payment/models.py @@ -82,7 +82,7 @@ class Transaction(models.Model): @property def ack_link(self): - return 'https://unglue.it/supporter/%s'%urllib.urlencode(self.user.username) if self.anonymous else '' + return 'https://unglue.it/supporter/%s'%urllib.urlencode(self.user.username) if not self.anonymous else '' def save(self, *args, **kwargs): if not self.secret: From f2e9559a3ab0fb59872b2356bcec74ad32b0a60d Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Fri, 31 Aug 2012 13:41:16 -0400 Subject: [PATCH 038/107] beginning of a notification to RHs when someone wishlists their work --- core/models.py | 3 +- core/signals.py | 77 +++++-------------- .../notification/new_wisher/full.txt | 4 + .../notification/new_wisher/notice.html | 9 +++ .../notification/new_wisher/notice.txt | 3 + .../notification/new_wisher/short.txt | 1 + 6 files changed, 39 insertions(+), 58 deletions(-) create mode 100644 frontend/templates/notification/new_wisher/full.txt create mode 100644 frontend/templates/notification/new_wisher/notice.html create mode 100644 frontend/templates/notification/new_wisher/notice.txt create mode 100644 frontend/templates/notification/new_wisher/short.txt diff --git a/core/models.py b/core/models.py index a7b1faf3..db8924ce 100755 --- a/core/models.py +++ b/core/models.py @@ -790,7 +790,8 @@ class Wishlist(models.Model): w = Wishes.objects.get(wishlist=self,work=work) except: Wishes.objects.create(source=source,wishlist=self,work=work) - work.update_num_wishes() + work.update_num_wishes() + wishlist_added.send(sender=self, work=work, supporter=self.user) def remove_work(self, work): w = Wishes.objects.filter(wishlist=self, work=work) diff --git a/core/signals.py b/core/signals.py index 01f7a262..a3713eb5 100644 --- a/core/signals.py +++ b/core/signals.py @@ -96,6 +96,11 @@ def create_notice_types(app, created_models, verbosity, **kwargs): notification.create_notice_type("rights_holder_created", _("Agreement Accepted"), _("You have become a verified Unglue.it rights holder.")) notification.create_notice_type("rights_holder_claim_approved", _("Claim Accepted"), _("A claim you've entered has been accepted.")) notification.create_notice_type("wishlist_unsuccessful_amazon", _("Campaign shut down"), _("An ungluing campaign that you supported had to be shut down due to an Amazon Payments policy change.")) +<<<<<<< HEAD +======= + notification.create_notice_type("pledge_donation_credit", _("Donation Credit Balance"), _("You have a donation credit balance")) + notification.create_notice_type("new_wisher", _("New wisher"), _("Someone new has wished for a book that you're the rightsholder for")) +>>>>>>> 2da4ba6... starting a notification for RHs when their books are wished for signals.post_syncdb.connect(create_notice_types, sender=notification) @@ -212,60 +217,18 @@ def handle_wishlist_unsuccessful_amazon(campaign, **kwargs): amazon_suspension.connect(handle_wishlist_unsuccessful_amazon) -# The notification templates need some context; I'm making a note of that here -# This can be removed as the relevant functions are written -# RIGHTS_HOLDER_CLAIM_APPROVED: -# 'site': (site) -# 'claim': (claim) -# RIGHTS_HOLDER_CREATED: (no context needed) -# note -- it might be that wishlist_near_target and wishlist_near_deadline would -# both be triggered at about the same time -- do we want to prevent supporters -# from getting both within a small time frame? if so which supersedes? -# WISHLIST_NEAR_DEADLINE: -# 'site': (site) -# 'campaign': (the campaign) -# 'pledged': (true if the supporter has pledged, false otherwise) -# 'amount': (amount the supporter has pledged; only needed if pledged is true) -# WISHLIST_NEAR_TARGET: -# 'site': (site) -# 'campaign': (the campaign) -# 'pledged': (true if the supporter has pledged, false otherwise) -# 'amount': (amount the supporter has pledged; only needed if pledged is true) -# WISHLIST_PREMIUM_LIMITED_SUPPLY: -# (note we should not send this to people who have already claimed this premium) -# should we only send this to people who haven't pledged at all, or whose pledge -# is smaller than the amount of this premium? (don't want to encourage people to -# lower their pledge) -# the text assumes there is only 1 left -- if we're going to send at some other -# threshhold this will need to be revised -# 'campaign': (campaign) -# 'premium': (the premium in question) -# 'site': (site) -# WISHLIST_PRICE_DROP: -# 'campaign' -# 'pledged': (true if recipient has pledged to campaign, otherwise false) -# 'amount': (amount recipient has pledged, only needed if pledged=True) -# 'site' -# WISHLIST_SUCCESSFUL: -# 'pledged' -# 'campaign' -# 'site' -# WISHLIST_UNSUCCESSFUL: -# 'campaign' -# 'site' -# WISHLIST_UPDATED: -# I'd like to provide the actual text of the update in the message but I don't think -# we can reasonably do that, since campaign.description may contain HTML and we are -# sending notifications in plaintext. If we can send the update information in the -# email, though, let's do that. -# 'campaign' -# 'site' -# WISHLIST_WORK_CLAIMED -# does this trigger when someone claims a work, or when the claim is approved? -# I've written the text assuming it is the latter (sending notifications on the -# former seems too sausage-making, and might make people angry if they get -# notifications about claims they believe are false). If it's the former, the -# text should be revisited. -# 'claim' -# 'site' -# 'rightsholder' (the name of the rightsholder) \ No newline at end of file +wishlist_added = Signal(providing_args=["supporter", "work"]) + +def handle_wishlist_added(supporter, work, **kwargs): + """send notification to confirmed rights holder when someone wishes for their work""" + claim = work.claim.filter(status="active") + if claim: + notification.queue([claim.user], "new_wisher", { + 'supporter': supporter, + 'work': work + }, True) + + from regluit.core.tasks import emit_notifications + emit_notifications.delay() + +wishlist_added.connect(handle_wishlist_added) diff --git a/frontend/templates/notification/new_wisher/full.txt b/frontend/templates/notification/new_wisher/full.txt new file mode 100644 index 00000000..56b6fe04 --- /dev/null +++ b/frontend/templates/notification/new_wisher/full.txt @@ -0,0 +1,4 @@ +{{ supporter }} has wished for a work you hold rights to, {{ work.title }}. Hooray! There are now {{ work.num_wishes }} people wishing for this work. + + +The Unglue.it team \ No newline at end of file diff --git a/frontend/templates/notification/new_wisher/notice.html b/frontend/templates/notification/new_wisher/notice.html new file mode 100644 index 00000000..0a11d20c --- /dev/null +++ b/frontend/templates/notification/new_wisher/notice.html @@ -0,0 +1,9 @@ +{% extends "notification/notice_template.html" %} + +{% block comments_book %} + cover image for {{ work.title }} +{% endblock %} + +{% block comments_graphical %} + {{ supporter }} has wished for a work you hold rights to, {{ work.title }}. Hooray! +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/notification/new_wisher/notice.txt b/frontend/templates/notification/new_wisher/notice.txt new file mode 100644 index 00000000..ebd00571 --- /dev/null +++ b/frontend/templates/notification/new_wisher/notice.txt @@ -0,0 +1,3 @@ +{{ supporter }} has wished for a work you hold rights to, {{ work.title }}. Hooray! There are now {{ work.num_wishes }} people wishing for this work. + + diff --git a/frontend/templates/notification/new_wisher/short.txt b/frontend/templates/notification/new_wisher/short.txt new file mode 100644 index 00000000..9233e50b --- /dev/null +++ b/frontend/templates/notification/new_wisher/short.txt @@ -0,0 +1 @@ +Someone new has wished for your work at Unglue.it \ No newline at end of file From 49f36e659e57999f1d216136ff91ed4e36842ad4 Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Fri, 31 Aug 2012 13:47:31 -0400 Subject: [PATCH 039/107] whoops resolving merge --- core/signals.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/signals.py b/core/signals.py index a3713eb5..3c2711f0 100644 --- a/core/signals.py +++ b/core/signals.py @@ -96,11 +96,8 @@ def create_notice_types(app, created_models, verbosity, **kwargs): notification.create_notice_type("rights_holder_created", _("Agreement Accepted"), _("You have become a verified Unglue.it rights holder.")) notification.create_notice_type("rights_holder_claim_approved", _("Claim Accepted"), _("A claim you've entered has been accepted.")) notification.create_notice_type("wishlist_unsuccessful_amazon", _("Campaign shut down"), _("An ungluing campaign that you supported had to be shut down due to an Amazon Payments policy change.")) -<<<<<<< HEAD -======= notification.create_notice_type("pledge_donation_credit", _("Donation Credit Balance"), _("You have a donation credit balance")) notification.create_notice_type("new_wisher", _("New wisher"), _("Someone new has wished for a book that you're the rightsholder for")) ->>>>>>> 2da4ba6... starting a notification for RHs when their books are wished for signals.post_syncdb.connect(create_notice_types, sender=notification) From cc8c0758426a5fb3e897daadba58e5af2937ee16 Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Fri, 31 Aug 2012 11:19:05 -0700 Subject: [PATCH 040/107] show error from bad card with stripe call --- payment/stripelib.py | 59 ++++++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/payment/stripelib.py b/payment/stripelib.py index ac397019..3179ba5c 100644 --- a/payment/stripelib.py +++ b/payment/stripelib.py @@ -51,14 +51,14 @@ TEST_CARDS = ( ('3566002020360505','JCB') ) -ERROR_TESTING = ( - ('ADDRESS1_ZIP_FAIL', '4000000000000010', 'address_line1_check and address_zip_check will both fail'), - ('ADDRESS1_FAIL', '4000000000000028', 'address_line1_check will fail.'), - ('ADDRESS_ZIP_FAIL', '4000000000000036', 'address_zip_check will fail.'), - ('CVC_CHECK_FAIL', '4000000000000101', 'cvc_check will fail.'), - ('CHARGE_FAIL', '4000000000000341', 'Attaching this card to a Customer object will succeed, but attempts to charge the customer will fail.'), - ('CHARGE_DECLINE', '4000000000000002', 'Charges with this card will always be declined.') -) +ERROR_TESTING = dict(( + ('ADDRESS1_ZIP_FAIL', ('4000000000000010', 'address_line1_check and address_zip_check will both fail')), + ('ADDRESS1_FAIL', ('4000000000000028', 'address_line1_check will fail.')), + ('ADDRESS_ZIP_FAIL', ('4000000000000036', 'address_zip_check will fail.')), + ('CVC_CHECK_FAIL', ('4000000000000101', 'cvc_check will fail.')), + ('CHARGE_FAIL', ('4000000000000341', 'Attaching this card to a Customer object will succeed, but attempts to charge the customer will fail.')), + ('CHARGE_DECLINE', ('4000000000000002', 'Charges with this card will always be declined.')) +)) #card_declined: Use this special card number - 4000000000000002. #incorrect_number: Use a number that fails the Luhn check, e.g. 4242424242424241. @@ -162,25 +162,46 @@ class StripeClient(object): # what to work through? #pledge scenario -# +# bad card -- what types of erros to handle? +# https://stripe.com/docs/api#errors + +# what errors are handled in the python library and how? + + +# pending payments? +# how to tell whether money transferred to bank account yet +# best practices for calling Events -- not too often. class PledgeScenarioTest(TestCase): - def setUp(self): + @classmethod + def setUpClass(cls): print "in setUp" - self.sc = StripeClient(api_key=STRIPE_SK) + cls._sc = StripeClient(api_key=STRIPE_SK) + + # valid card card0 = card() - self.good_cust = self.sc.create_customer(card=card0, description="test good customer", email="raymond.yee@gmail.com") - # set up a Customer with a good card tied to Gluejar + cls._good_cust = cls._sc.create_customer(card=card0, description="test good customer", email="raymond.yee@gmail.com") + + # bad card + test_card_num_to_get_charge_fail = ERROR_TESTING['CHARGE_FAIL'][0] + card1 = card(number=test_card_num_to_get_charge_fail) + cls._cust_bad_card = cls._sc.create_customer(card=card1, description="test bad customer", email="rdhyee@gluejar.com") + def test_charge_good_cust(self): - charge = self.sc.create_charge(10, customer=self.good_cust, description="$10 for good cust") + charge = self._sc.create_charge(10, customer=self._good_cust, description="$10 for good cust") print charge - def tearDown(self): + + def test_charge_bad_cust(self): + self.assertRaises(stripe.CardError, self._sc.create_charge, 10, + customer = self._cust_bad_card, description="$10 for bad cust") + @classmethod + def tearDownClass(cls): # clean up stuff we create in test print "in tearDown" - self.good_cust.delete() - print "list of customers", self.sc.customer.all() - print "list of charges", self.sc.charge.all() - print "list of events", self.sc.event.all() + cls._good_cust.delete() + print "list of customers", cls._sc.customer.all() + print "list of charges", cls._sc.charge.all() + print "list of events", cls._sc.event.all() def suite(): From e8e6a510684c56801bedfa72c9208441a3f9d8e2 Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Fri, 31 Aug 2012 22:59:22 -0700 Subject: [PATCH 041/107] added a bit of handling of stripe Transfers --- payment/stripelib.py | 47 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/payment/stripelib.py b/payment/stripelib.py index 3179ba5c..027b54e3 100644 --- a/payment/stripelib.py +++ b/payment/stripelib.py @@ -1,6 +1,9 @@ # https://github.com/stripe/stripe-python # https://stripe.com/docs/api?lang=python#top +from datetime import datetime +from pytz import utc + import stripe try: @@ -56,10 +59,12 @@ ERROR_TESTING = dict(( ('ADDRESS1_FAIL', ('4000000000000028', 'address_line1_check will fail.')), ('ADDRESS_ZIP_FAIL', ('4000000000000036', 'address_zip_check will fail.')), ('CVC_CHECK_FAIL', ('4000000000000101', 'cvc_check will fail.')), - ('CHARGE_FAIL', ('4000000000000341', 'Attaching this card to a Customer object will succeed, but attempts to charge the customer will fail.')), + ('BAD_ATTACHED_CARD', ('4000000000000341', 'Attaching this card to a Customer object will succeed, but attempts to charge the customer will fail.')), ('CHARGE_DECLINE', ('4000000000000002', 'Charges with this card will always be declined.')) )) +# types of errors / when they can be handled + #card_declined: Use this special card number - 4000000000000002. #incorrect_number: Use a number that fails the Luhn check, e.g. 4242424242424241. #invalid_expiry_month: Use an invalid month e.g. 13. @@ -67,6 +72,7 @@ ERROR_TESTING = dict(( #invalid_cvc: Use a two digit number e.g. 99. + def filter_none(d): return dict([(k,v) for (k,v) in d.items() if v is not None]) @@ -110,10 +116,15 @@ class StripeClient(object): @property def token(self): return stripe.Token(api_key=self.api_key) + + @property + def transfer(self): + return stripe.Transfer(api_key=self.api_key) @property def event(self): return stripe.Event(api_key=self.api_key) + def create_token(self, card): return stripe.Token(api_key=self.api_key).create(card=card) @@ -161,12 +172,23 @@ class StripeClient(object): # what to work through? +# can't test Transfer in test mode: "There are no transfers in test mode." + #pledge scenario # bad card -- what types of erros to handle? # https://stripe.com/docs/api#errors # what errors are handled in the python library and how? +# Account? + +# events of interest +# charge.succeeded, charge.failed, charge.refunded, charge.disputed +# customer.created, customer.updated, customer.deleted +# transfer.created, transfer.updated, transfer.failed + +# When will the money I charge with Stripe end up in my bank account? +# Every day, we transfer the money that you charged seven days previously?that is, you receive the money for your March 1st charges on March 8th. # pending payments? # how to tell whether money transferred to bank account yet @@ -183,15 +205,22 @@ class PledgeScenarioTest(TestCase): cls._good_cust = cls._sc.create_customer(card=card0, description="test good customer", email="raymond.yee@gmail.com") # bad card - test_card_num_to_get_charge_fail = ERROR_TESTING['CHARGE_FAIL'][0] - card1 = card(number=test_card_num_to_get_charge_fail) + test_card_num_to_get_BAD_ATTACHED_CARD = ERROR_TESTING['BAD_ATTACHED_CARD'][0] + card1 = card(number=test_card_num_to_get_BAD_ATTACHED_CARD) cls._cust_bad_card = cls._sc.create_customer(card=card1, description="test bad customer", email="rdhyee@gluejar.com") def test_charge_good_cust(self): charge = self._sc.create_charge(10, customer=self._good_cust, description="$10 for good cust") - print charge + print charge.id + + def test_error_creating_customer_with_declined_card(self): + # should get a CardError upon attempt to create Customer with this card + _card = card(number=card(ERROR_TESTING['CHARGE_DECLINE'][0])) + self.assertRaises(stripe.CardError, self._sc.create_customer, card=_card) + def test_charge_bad_cust(self): + # expect the card to be declined -- and for us to get CardError self.assertRaises(stripe.CardError, self._sc.create_charge, 10, customer = self._cust_bad_card, description="$10 for bad cust") @classmethod @@ -199,9 +228,15 @@ class PledgeScenarioTest(TestCase): # clean up stuff we create in test print "in tearDown" cls._good_cust.delete() - print "list of customers", cls._sc.customer.all() - print "list of charges", cls._sc.charge.all() + print "list of customers" + print [(i, c.id, c.description, datetime.fromtimestamp(c.created, tz=utc), c.account_balance) for(i, c) in enumerate(cls._sc.customer.all()["data"])] + + print "list of charges" + print [(i, c.id, c.amount, c.currency, c.description, datetime.fromtimestamp(c.created, tz=utc), c.paid, c.fee, c.disputed, c.amount_refunded, c.failure_message, c.card.fingerprint, c.card.last4) for (i, c) in enumerate(cls._sc.charge.all()['data'])] + + # can retrieve events since a certain time print "list of events", cls._sc.event.all() + # [(i, e.id, e.type, e.created, e.pending_webhooks, e.data) for (i,e) in enumerate(s.event.all()['data'])] def suite(): From 9ccfb4be48f2f857e8e943e4ff616dc1d42696e6 Mon Sep 17 00:00:00 2001 From: eric Date: Wed, 5 Sep 2012 11:17:27 -0400 Subject: [PATCH 042/107] Ed's tired of getting unglue.it bug reports --- settings/dev.py | 4 +++- settings/jenkins.py | 4 +++- settings/just.py | 1 - settings/please.py | 1 - settings/prod.py | 1 - 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/settings/dev.py b/settings/dev.py index 4ad6a07a..51db212a 100644 --- a/settings/dev.py +++ b/settings/dev.py @@ -10,7 +10,9 @@ IS_PREVIEW = False SITE_ID = 3 ADMINS = ( - ('Ed Summers', 'ehs@pobox.com'), + ('Raymond Yee', 'rdhyee+ungluebugs@gluejar.com'), + ('Eric Hellman', 'eric@gluejar.com'), + ('Andromeda Yelton', 'andromeda@gluejar.com'), ) MANAGERS = ADMINS diff --git a/settings/jenkins.py b/settings/jenkins.py index 00eabf02..975da099 100644 --- a/settings/jenkins.py +++ b/settings/jenkins.py @@ -4,7 +4,9 @@ DEBUG = True TEMPLATE_DEBUG = DEBUG ADMINS = ( - ('Ed Summers', 'ehs@pobox.com'), + ('Raymond Yee', 'rdhyee+ungluebugs@gluejar.com'), + ('Eric Hellman', 'eric@gluejar.com'), + ('Andromeda Yelton', 'andromeda@gluejar.com'), ) MANAGERS = ADMINS diff --git a/settings/just.py b/settings/just.py index 05f2d051..c071108e 100644 --- a/settings/just.py +++ b/settings/just.py @@ -6,7 +6,6 @@ TEMPLATE_DEBUG = DEBUG SITE_ID = 5 ADMINS = ( - ('Ed Summers', 'ed.summers@gmail.com'), ('Raymond Yee', 'rdhyee+ungluebugs@gluejar.com'), ('Eric Hellman', 'eric@gluejar.com'), ('Andromeda Yelton', 'andromeda@gluejar.com'), diff --git a/settings/please.py b/settings/please.py index b5738930..7da2c37d 100644 --- a/settings/please.py +++ b/settings/please.py @@ -6,7 +6,6 @@ TEMPLATE_DEBUG = DEBUG SITE_ID = 2 ADMINS = ( - ('Ed Summers', 'ed.summers@gmail.com'), ('Raymond Yee', 'rdhyee+ungluebugs@gluejar.com'), ('Eric Hellman', 'eric@gluejar.com'), ('Andromeda Yelton', 'andromeda@gluejar.com'), diff --git a/settings/prod.py b/settings/prod.py index 94627192..6f93aedd 100644 --- a/settings/prod.py +++ b/settings/prod.py @@ -8,7 +8,6 @@ IS_PREVIEW = False SITE_ID = 1 ADMINS = ( - ('Ed Summers', 'ed.summers@gmail.com'), ('Raymond Yee', 'rdhyee+ungluebugs@gluejar.com'), ('Eric Hellman', 'eric@gluejar.com'), ('Andromeda Yelton', 'andromeda@gluejar.com'), From bcbc75ed3d303800c8dd6b74eac291c6fbd49816 Mon Sep 17 00:00:00 2001 From: Raymond Yee Date: Wed, 5 Sep 2012 16:11:32 -0700 Subject: [PATCH 043/107] More analysis of what we need to figure out still about stripe. --- payment/stripelib.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/payment/stripelib.py b/payment/stripelib.py index 027b54e3..db01753a 100644 --- a/payment/stripelib.py +++ b/payment/stripelib.py @@ -13,12 +13,14 @@ except: from django.test import TestCase from django.utils import unittest - # if customer.id doesn't exist, create one and then charge the customer # we probably should ask our users whether they are ok with our creating a customer id account -- or ask for credit # card info each time.... # should load the keys for Stripe from db -- but for now just hardcode here +# moving towards not having the stripe api key for the non profit partner in the unglue.it code -- but in a logically +# distinct application + try: from regluit.core.models import Key STRIPE_PK = Key.objects.get(name="STRIPE_PK").value @@ -179,13 +181,18 @@ class StripeClient(object): # https://stripe.com/docs/api#errors # what errors are handled in the python library and how? +# # Account? -# events of interest -# charge.succeeded, charge.failed, charge.refunded, charge.disputed +# https://stripe.com/docs/api#event_types +# events of interest -- especially ones that do not directly arise immediately (synchronously) from something we do -- I think +# especially: charge.disputed +# I think following (charge.succeeded, charge.failed, charge.refunded) pretty much sychronous to our actions # customer.created, customer.updated, customer.deleted -# transfer.created, transfer.updated, transfer.failed + +# transfer +# I expect the ones related to transfers all happen asynchronously: transfer.created, transfer.updated, transfer.failed # When will the money I charge with Stripe end up in my bank account? # Every day, we transfer the money that you charged seven days previously?that is, you receive the money for your March 1st charges on March 8th. @@ -248,7 +255,6 @@ def suite(): return suites - # IPNs/webhooks: https://stripe.com/docs/webhooks # how to use pending_webhooks ? From 8eeadc99d3d9efe100b217c383272d60ee578b7e Mon Sep 17 00:00:00 2001 From: eric Date: Thu, 6 Sep 2012 01:01:17 -0400 Subject: [PATCH 044/107] woo hoo, credit and donation scaffolding works end to end [#21784207] --- frontend/forms.py | 24 ++- frontend/templates/donation_credit.html | 42 ++++ frontend/templates/fund_the_pledge.html | 57 +++++ frontend/templates/nonprofit.html | 46 ++++ frontend/templates/nonprofit_base.html | 200 ++++++++++++++++++ frontend/urls.py | 7 +- frontend/views.py | 107 +++++++++- payment/credit.py | 21 +- payment/manager.py | 6 +- ...uto__add_sent__add_field_creditlog_sent.py | 200 ++++++++++++++++++ payment/models.py | 25 ++- settings/common.py | 6 +- 12 files changed, 709 insertions(+), 32 deletions(-) create mode 100644 frontend/templates/donation_credit.html create mode 100644 frontend/templates/fund_the_pledge.html create mode 100644 frontend/templates/nonprofit.html create mode 100644 frontend/templates/nonprofit_base.html create mode 100644 payment/migrations/0009_auto__add_sent__add_field_creditlog_sent.py diff --git a/frontend/forms.py b/frontend/forms.py index 3f76ab1f..041bab07 100644 --- a/frontend/forms.py +++ b/frontend/forms.py @@ -335,20 +335,26 @@ class CampaignPledgeForm(forms.Form): return cleaned_data -class DonateForm(forms.Form): - donation_amount = forms.DecimalField( +class CCForm(forms.Form): + username = forms.CharField(max_length=30, required=True ) + work_id = forms.IntegerField(required=False, widget=forms.HiddenInput() ) + preapproval_amount= forms.DecimalField( required=False, min_value=D('1.00'), max_value=D('100000.00'), - decimal_places=2, - label="Donation", + decimal_places=0, + label="Pledge", ) - anonymous = forms.BooleanField(required=False, label=_("Don't display my username in the donors' list")) - - def clean(self): - cleaned_data = self.cleaned_data - return cleaned_data + + +class DonateForm(forms.Form): + preapproval_amount = forms.DecimalField( widget=forms.HiddenInput() ) + username = forms.CharField(max_length=30, required=True, widget=forms.HiddenInput() ) + work_id = forms.IntegerField(required=False, widget=forms.HiddenInput() ) + title = forms.CharField(max_length=30, required=False, widget=forms.HiddenInput() ) + + class GoodreadsShelfLoadingForm(forms.Form): goodreads_shelf_name_number = forms.CharField(widget=forms.Select(choices=( ('all','all'), diff --git a/frontend/templates/donation_credit.html b/frontend/templates/donation_credit.html new file mode 100644 index 00000000..09db1dde --- /dev/null +++ b/frontend/templates/donation_credit.html @@ -0,0 +1,42 @@ +{% extends "basepledge.html" %} +{% load humanize %} + +{% block title %}Fund Your Pledge{% endblock %} + +{% block extra_extra_head %} + + + + +{% endblock %} + +{% block doccontent %} +
    + +
    +
    + +

    Congratulations, your donation credits have been registered!

    +
    + + {{ envelope.amount }}
    + {{ envelope.username }}
    + {{ envelope.work_id }}
    + {{ envelope.sent }}
    + {{ error }}
    + {{ transaction }}
    +

    +You have a balance of {{ request.user.credit.balance }} donation credits.
    +You have pledged {{ request.user.credit.pledged }} donation credits to ungluing campaigns.
    +You have {{ request.user.credit.available }} donation credits available to pledge or transfer.
    +

    + + +
    +
    + +
    +
    +{% endblock %} + + diff --git a/frontend/templates/fund_the_pledge.html b/frontend/templates/fund_the_pledge.html new file mode 100644 index 00000000..feb422a0 --- /dev/null +++ b/frontend/templates/fund_the_pledge.html @@ -0,0 +1,57 @@ +{% extends "basepledge.html" %} +{% load humanize %} + +{% block title %}Fund Your Pledge{% endblock %} + +{% block extra_extra_head %} + + + + +{% endblock %} + +{% block doccontent %} +
    + +
    +
    + +

    Funding Your Pledge

    +
    We're so happy that you've decided to join this campaign. We have two ways we can fund your pledge of ${{preapproval_amount|intcomma}}. +
      +
    1. You can make a donation now to {{nonprofit.name}}, a non-profit charity that's working with Unglue.it to give books to the world.
      2. +
    2. You can give us your credit card information now; we'll charge your card only if the campaign succeeds.
      3. +
    +
    +
    + +
    +

    Pledge by Credit Card

    +

    Unglue.it uses Stripe to securely manage your Credit Card information. +

    +
    +
    + {% csrf_token %} + {{ form.non_field_errors }} + {{form}} + +
    +
    +
    + +
    +
    +{% endblock %} + + diff --git a/frontend/templates/nonprofit.html b/frontend/templates/nonprofit.html new file mode 100644 index 00000000..a2d4c48c --- /dev/null +++ b/frontend/templates/nonprofit.html @@ -0,0 +1,46 @@ +{% extends "nonprofit_base.html" %} +{% load humanize %} + +{% block title %}Donate to {{nonprofit.name}}{% endblock %} + +{% block extra_extra_head %} + + + + +{% endblock %} + +{% block doccontent %} +
    + +
    +
    + +

    Supporting {{ get.title }} through {{nonprofit.name}}

    +

    {{nonprofit.name}} is cooperating with Unglue.it to make books free to the world. On this page, you can make a donation to us, and we'll hold the money until the ungluing campaign you've selected succeeds. Then we'll make a payment to the rightsholder along side unglue.it. Once you've made the donation, we'll ad donation credits to your unglue.it account, {{get.username}}. +

    +

    + To fund the pledge of ${{get.preapproval_amount|intcomma}} that you've made at unglue.it, you'll need to make a donation of at least that amount. You can donate more than that of course- you'll get additional donation credits to use on other campaigns. The larger your donation, the less percentage-wise that gets eaten up by processing fees. +

    +

    Any interest we earn will be used for our public purpose of helping libraries remain relevant into the future. If your unglue.it donation credits don't get used for 5 years, we'll use it in the same way. Your donation to {{nonprofit.name}} is deductible as a Charitable donation in the US.

    +
    +
    + + +
    +
    +{% endblock %} + + diff --git a/frontend/templates/nonprofit_base.html b/frontend/templates/nonprofit_base.html new file mode 100644 index 00000000..9e1b29cf --- /dev/null +++ b/frontend/templates/nonprofit_base.html @@ -0,0 +1,200 @@ + + + + + + + + + +{% block title %}Join the Movement | Library Renewal{% endblock %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +{% block extra_extra_head %}{% endblock %} + + + + + + + + +
    +
    + + + + +
    + +{% block doccontent %}{% endblock %} + +
    +
      +
    • Delicious
      • +
    • Digg
      • +
    • E-Mail
      • +
    • Facebook
      • +
    • Google Buzz
      • +
    • LinkedIn
      • +
    • StumbleUpon
      • +
    • Twitter
      • + +
    +
    + +
    + +
    +
    + + + + + + + +
    + +
    + +
      + +
      • + +
      • + +
      • + +
    + +
    + +
    + + + + + + + + + + + + + + + + + + diff --git a/frontend/urls.py b/frontend/urls.py index 1b2c4ce8..02115ea7 100644 --- a/frontend/urls.py +++ b/frontend/urls.py @@ -3,12 +3,14 @@ from django.views.generic.simple import direct_to_template from django.views.generic.base import TemplateView from django.views.generic import ListView, DetailView from django.contrib.auth.decorators import login_required +from django.views.decorators.csrf import csrf_exempt from django.conf import settings from regluit.core.feeds import SupporterWishlistFeed from regluit.core.models import Campaign from regluit.frontend.views import GoodreadsDisplayView, LibraryThingView, PledgeView, PledgeCompleteView, PledgeCancelView, PledgeRechargeView, FAQView -from regluit.frontend.views import CampaignListView, DonateView, WorkListView, UngluedListView, InfoPageView, InfoLangView, DonationView +from regluit.frontend.views import CampaignListView, DonateView, WorkListView, UngluedListView, InfoPageView, InfoLangView, DonationView, FundPledgeView +from regluit.frontend.views import NonprofitCampaign, DonationCredit urlpatterns = patterns( "regluit.frontend.views", @@ -52,11 +54,14 @@ urlpatterns = patterns( url(r"^new_edition/(?P\d*)/(?P\d*)$", "new_edition", name="new_edition"), url(r"^googlebooks/(?P.+)/$", "googlebooks", name="googlebooks"), url(r"^donation/$", login_required(DonationView.as_view()), name="donation"), + url(r"^donation/credit/(?P.+)/$", login_required(DonationCredit.as_view()), name="donation_credit"), url(r"^pledge/(?P\d+)/$", login_required(PledgeView.as_view()), name="pledge"), url(r"^pledge/cancel/(?P\d+)$", login_required(PledgeCancelView.as_view()), name="pledge_cancel"), url(r"^pledge/complete/$", login_required(PledgeCompleteView.as_view()), name="pledge_complete"), url(r"^pledge/modify/(?P\d+)$", login_required(PledgeView.as_view()), name="pledge_modify"), + url(r"^pledge/fund/(?P\d+)$", login_required(FundPledgeView.as_view()), name="fund_pledge"), url(r"^pledge/recharge/(?P\d+)$", login_required(PledgeRechargeView.as_view()), name="pledge_recharge"), + url(r"^donate_to_campaign/$", csrf_exempt(NonprofitCampaign.as_view()), name="nonprofit"), url(r"^subjects/$", "subjects", name="subjects"), url(r"^librarything/$", LibraryThingView.as_view(), name="librarything"), url(r"^librarything/load/$","librarything_load", name="librarything_load"), diff --git a/frontend/views.py b/frontend/views.py index 0944a2f3..18718210 100755 --- a/frontend/views.py +++ b/frontend/views.py @@ -17,6 +17,7 @@ import oauth2 as oauth from django import forms from django.conf import settings from django.contrib.auth.models import User +from django.core import signing from django.core.urlresolvers import reverse from django.core.exceptions import ObjectDoesNotExist from django.contrib import messages @@ -47,14 +48,15 @@ from regluit.frontend.forms import UserData, UserEmail, ProfileForm, CampaignPle from regluit.frontend.forms import RightsHolderForm, UserClaimForm, LibraryThingForm, OpenCampaignForm from regluit.frontend.forms import getManageCampaignForm, DonateForm, CampaignAdminForm, EmailShareForm, FeedbackForm from regluit.frontend.forms import EbookForm, CustomPremiumForm, EditManagersForm, EditionForm, PledgeCancelForm -from regluit.frontend.forms import getTransferCreditForm +from regluit.frontend.forms import getTransferCreditForm, CCForm from regluit.payment.manager import PaymentManager from regluit.payment.models import Transaction -from regluit.payment.parameters import TRANSACTION_STATUS_ACTIVE, TRANSACTION_STATUS_COMPLETE, TRANSACTION_STATUS_CANCELED, TRANSACTION_STATUS_ERROR, TRANSACTION_STATUS_FAILED, TRANSACTION_STATUS_INCOMPLETE +from regluit.payment.parameters import TRANSACTION_STATUS_ACTIVE, TRANSACTION_STATUS_COMPLETE, TRANSACTION_STATUS_CANCELED, TRANSACTION_STATUS_ERROR, TRANSACTION_STATUS_FAILED, TRANSACTION_STATUS_INCOMPLETE, TRANSACTION_STATUS_NONE from regluit.payment.parameters import PAYMENT_TYPE_AUTHORIZATION +from regluit.payment.credit import credit_transaction from regluit.core import goodreads from tastypie.models import ApiKey -from regluit.payment.models import Transaction +from regluit.payment.models import Transaction, Sent, CreditLog from notification import models as notification @@ -707,7 +709,7 @@ class PledgeView(FormView): host = None, campaign=self.campaign, user=self.request.user, - premium=premium, + premium=self.get_premium(form), paymentReason="Unglue.it Pledge for {0}".format(self.campaign.name), ack_name=form.cleaned_data["ack_name"], ack_dedication=form.cleaned_data["ack_dedication"], @@ -720,7 +722,104 @@ class PledgeView(FormView): logger.error("Attempt to produce transaction id {0} failed".format(t.id)) return HttpResponse("Our attempt to enable your transaction failed. We have logged this error.") +class FundPledgeView(FormView): + template_name="fund_the_pledge.html" + form_class = CCForm + transaction = None + def get_form_kwargs(self): + assert self.request.user.is_authenticated() + if self.transaction is None: + self.transaction = get_object_or_404(Transaction, id=self.kwargs["t_id"]) + return {'data':{'preapproval_amount':self.transaction.max_amount, + 'username':self.request.user.username, + 'work_id':self.transaction.campaign.work.id, + 'title':self.transaction.campaign.work.title} } + + def get_context_data(self, **kwargs): + context = super(FundPledgeView, self).get_context_data(**kwargs) + context['preapproval_amount']=self.transaction.max_amount + context['transaction']=self.transaction + context['nonprofit'] = settings.NONPROFIT + context['donate_form'] = DonateForm(**self.get_form_kwargs()) + return context + +class NonprofitCampaign(FormView): + template_name="nonprofit.html" + form_class = CCForm + + def get_context_data(self, **kwargs): + context = super(NonprofitCampaign, self).get_context_data(**kwargs) + context['nonprofit'] = settings.NONPROFIT + context['get'] = self.request.GET + return context + + def get_form_kwargs(self): + if self.request.method == 'POST': + return {'data':self.request.POST} + else: + return {'initial':self.request.GET } + + + + def form_valid(self, form): + username=form.cleaned_data['username'] + forward={'username':username} + forward['work_id']= form.cleaned_data['work_id'] + forward['amount']= int(form.cleaned_data['preapproval_amount']) + forward['sent']= Sent.objects.create(user=username,amount=form.cleaned_data['preapproval_amount']).pk + token=signing.dumps(forward) + return HttpResponseRedirect(settings.BASE_URL + reverse('donation_credit',kwargs={'token':token})) + +class DonationCredit(TemplateView): + template_name="donation_credit.html" + + def get_context_data(self, **kwargs): + context = super(DonationCredit, self).get_context_data(**kwargs) + try: + envelope=signing.loads(kwargs['token']) + context['envelope']=envelope + except signing.BadSignature: + self.template_name="donation_error.html" + return context + try: + work = models.Work.objects.get(id=envelope['work_id']) + campaign=work.last_campaign() + except models.Work.DoesNotExist: + campaign = None + context['work']=work + try: + user = User.objects.get(username=envelope['username']) + except User.DoesNotExist: + self.template_name="donation_user_error.html" + context['error']='user does not exist' + return context + if user != self.request.user: + self.template_name="donation_user_error.html" + context['error']='wrong user logged in' + return context + try: + # check token not used + CreditLog.objects.get(sent=envelope['sent']) + context['error']='credit already registered' + return context + except CreditLog.DoesNotExist: + #not used yet! + CreditLog.objects.create(user=user,amount=envelope['amount'],action='deposit',sent=envelope['sent']) + ts=Transaction.objects.filter(user=user,campaign=campaign,status=TRANSACTION_STATUS_NONE) + if ts.count()>0: + t=ts[0] + credit_transaction(t,user, envelope['amount']) + for t in ts[1:]: + t.status=TRANSACTION_STATUS_CANCELED + t.save() + context['transaction']=t + return context + else: + user.credit.add_to_balance(envelope['amount']) + return context + + class PledgeRechargeView(TemplateView): """ a view to allow for recharge of a transaction for failed transactions or ones with errors diff --git a/payment/credit.py b/payment/credit.py index c5987d5b..d4c8b712 100644 --- a/payment/credit.py +++ b/payment/credit.py @@ -4,7 +4,6 @@ from django.contrib.auth.models import User from django.conf import settings from regluit.payment.parameters import * -from regluit.utils.localdatetime import now from regluit.payment.baseprocessor import BasePaymentRequest @@ -16,19 +15,19 @@ def pledge_transaction(t,user,amount): user.credit.add_to_pledged(amount-t.amount) else: user.credit.add_to_pledged(amount) - t.amount=amount t.max_amount=amount - t.host = PAYMENT_HOST_CREDIT - t.type = PAYMENT_TYPE_AUTHORIZATION - t.status=TRANSACTION_STATUS_ACTIVE - t.approved=True - now_val = now() - t.date_authorized = now_val - t.date_expired = now_val + timedelta( days=settings.PREAPPROVAL_PERIOD ) - - t.save() + t.set_credit_approved(amount) +def credit_transaction(t,user,amount): + '''user has new credit, use it to fund the transaction''' + # first, credit the user's account + user.credit.add_to_balance(amount) + # now pledge to the transaction + pledge_amount = t.max_amount if t.max_amount <= amount else amount + user.credit.add_to_pledged(pledge_amount) + t.set_credit_approved(pledge_amount) + class CancelPreapproval(BasePaymentRequest): ''' Cancels an exisiting token. diff --git a/payment/manager.py b/payment/manager.py index 017bfe2a..00029ca5 100644 --- a/payment/manager.py +++ b/payment/manager.py @@ -640,7 +640,7 @@ class PaymentManager( object ): t = Transaction.objects.create(amount=0, max_amount=amount, currency=currency, - status='NONE', + status=TRANSACTION_STATUS_NONE, campaign=campaign, user=user, anonymous=anonymous, @@ -659,8 +659,8 @@ class PaymentManager( object ): pledge_created.send(sender=self, transaction=t) return t, return_url else: - #TODO send user to choose payment path - return t, None + # send user to choose payment path + return t, reverse('fund_pledge', args=[t.id]) def cancel_related_transaction(self, transaction, status=TRANSACTION_STATUS_ACTIVE, campaign=None): diff --git a/payment/migrations/0009_auto__add_sent__add_field_creditlog_sent.py b/payment/migrations/0009_auto__add_sent__add_field_creditlog_sent.py new file mode 100644 index 00000000..f6cc1c11 --- /dev/null +++ b/payment/migrations/0009_auto__add_sent__add_field_creditlog_sent.py @@ -0,0 +1,200 @@ +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Adding model 'Sent' + db.create_table('payment_sent', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('user', self.gf('django.db.models.fields.CharField')(max_length=32, null=True)), + ('amount', self.gf('django.db.models.fields.DecimalField')(default='0.00', max_digits=14, decimal_places=2)), + ('timestamp', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)), + )) + db.send_create_signal('payment', ['Sent']) + + # Adding field 'CreditLog.sent' + db.add_column('payment_creditlog', 'sent', self.gf('django.db.models.fields.IntegerField')(null=True), keep_default=False) + + + def backwards(self, orm): + + # Deleting model 'Sent' + db.delete_table('payment_sent') + + # Deleting field 'CreditLog.sent' + db.delete_column('payment_creditlog', 'sent') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 5, 23, 7, 10, 823074)'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 9, 5, 23, 7, 10, 822938)'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'core.campaign': { + 'Meta': {'object_name': 'Campaign'}, + 'activated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'amazon_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'deadline': ('django.db.models.fields.DateTimeField', [], {}), + 'description': ('ckeditor.fields.RichTextField', [], {'null': 'True'}), + 'details': ('ckeditor.fields.RichTextField', [], {'null': 'True', 'blank': 'True'}), + 'edition': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'null': 'True', 'to': "orm['core.Edition']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'left': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}), + 'license': ('django.db.models.fields.CharField', [], {'default': "'CC BY-NC-ND'", 'max_length': '255'}), + 'managers': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'campaigns'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True'}), + 'paypal_receiver': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'status': ('django.db.models.fields.CharField', [], {'default': "'INITIALIZED'", 'max_length': '15', 'null': 'True'}), + 'target': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '14', 'decimal_places': '2'}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'campaigns'", 'to': "orm['core.Work']"}) + }, + 'core.edition': { + 'Meta': {'object_name': 'Edition'}, + 'cover_image': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'public_domain': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'publication_date': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'publisher': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), + 'work': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'editions'", 'null': 'True', 'to': "orm['core.Work']"}) + }, + 'core.premium': { + 'Meta': {'object_name': 'Premium'}, + 'amount': ('django.db.models.fields.DecimalField', [], {'max_digits': '10', 'decimal_places': '0'}), + 'campaign': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'premiums'", 'null': 'True', 'to': "orm['core.Campaign']"}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'limit': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '2'}) + }, + 'core.work': { + 'Meta': {'ordering': "['title']", 'object_name': 'Work'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}), + 'num_wishes': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'openlibrary_lookup': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1000'}) + }, + 'payment.credit': { + 'Meta': {'object_name': 'Credit'}, + 'balance': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_activity': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'pledged': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'credit'", 'unique': 'True', 'to': "orm['auth.User']"}) + }, + 'payment.creditlog': { + 'Meta': {'object_name': 'CreditLog'}, + 'action': ('django.db.models.fields.CharField', [], {'max_length': '16'}), + 'amount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'sent': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'timestamp': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}) + }, + 'payment.paymentresponse': { + 'Meta': {'object_name': 'PaymentResponse'}, + 'api': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'correlation_id': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'info': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True'}), + 'status': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}), + 'timestamp': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), + 'transaction': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['payment.Transaction']"}) + }, + 'payment.receiver': { + 'Meta': {'object_name': 'Receiver'}, + 'amount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), + 'currency': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'email': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'local_status': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), + 'primary': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'reason': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'status': ('django.db.models.fields.CharField', [], {'max_length': '64'}), + 'transaction': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['payment.Transaction']"}), + 'txn_id': ('django.db.models.fields.CharField', [], {'max_length': '64'}) + }, + 'payment.sent': { + 'Meta': {'object_name': 'Sent'}, + 'amount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'timestamp': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}) + }, + 'payment.transaction': { + 'Meta': {'object_name': 'Transaction'}, + 'ack_dedication': ('django.db.models.fields.CharField', [], {'max_length': '140', 'null': 'True'}), + 'ack_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), + 'amount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), + 'anonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'approved': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'campaign': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Campaign']", 'null': 'True'}), + 'currency': ('django.db.models.fields.CharField', [], {'default': "'USD'", 'max_length': '10', 'null': 'True'}), + 'date_authorized': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_executed': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'date_expired': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'date_payment': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'error': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'}), + 'execution': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'host': ('django.db.models.fields.CharField', [], {'default': "'none'", 'max_length': '32'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'local_status': ('django.db.models.fields.CharField', [], {'default': "'NONE'", 'max_length': '32', 'null': 'True'}), + 'max_amount': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '14', 'decimal_places': '2'}), + 'pay_key': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), + 'preapproval_key': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}), + 'premium': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Premium']", 'null': 'True'}), + 'reason': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), + 'receipt': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'}), + 'secret': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), + 'status': ('django.db.models.fields.CharField', [], {'default': "'None'", 'max_length': '32'}), + 'type': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}) + } + } + + complete_apps = ['payment'] diff --git a/payment/models.py b/payment/models.py index 486b24fc..15a901c5 100644 --- a/payment/models.py +++ b/payment/models.py @@ -4,6 +4,7 @@ from django.conf import settings from regluit.core.models import Campaign, Wishlist, Premium from regluit.payment.parameters import * from regluit.payment.signals import credit_balance_added +from regluit.utils.localdatetime import now from decimal import Decimal, NaN import uuid import urllib @@ -108,8 +109,18 @@ class Transaction(models.Model): else: mod = __import__("regluit.payment." + self.host, fromlist=[str(self.host)]) return mod - - + + def set_credit_approved(self, amount): + self.amount=amount + self.host = PAYMENT_HOST_CREDIT + self.type = PAYMENT_TYPE_AUTHORIZATION + self.status=TRANSACTION_STATUS_ACTIVE + self.approved=True + now_val = now() + self.date_authorized = now_val + self.date_expired = now_val + timedelta( days=settings.PREAPPROVAL_PERIOD ) + self.save() + class PaymentResponse(models.Model): # The API used api = models.CharField(max_length=64, null=False) @@ -155,6 +166,8 @@ class CreditLog(models.Model): amount = models.DecimalField(default=Decimal('0.00'), max_digits=14, decimal_places=2) # max 999,999,999,999.99 timestamp = models.DateTimeField(auto_now=True) action = models.CharField(max_length=16) + # used to record the sent id when action = 'deposit' + sent=models.IntegerField(null=True) class Credit(models.Model): user = models.OneToOneField(User, related_name='credit') @@ -224,7 +237,13 @@ class Credit(models.Model): return False else: return False - + +class Sent(models.Model): + '''used by donation view to record donations it has sent''' + user = models.CharField(max_length=32, null=True) + amount = models.DecimalField(default=Decimal('0.00'), max_digits=14, decimal_places=2) # max 999,999,999,999.99 + timestamp = models.DateTimeField(auto_now=True) + from django.db.models.signals import post_save, post_delete import regluit.payment.manager diff --git a/settings/common.py b/settings/common.py index 644478f5..50715f4c 100644 --- a/settings/common.py +++ b/settings/common.py @@ -49,7 +49,7 @@ STATIC_URL = '/static/' # URL prefix for admin static files -- CSS, JavaScript and images. # Make sure to use a trailing slash. # Examples: "http://foo.com/static/admin/", "/static/admin/". -ADMIN_MEDIA_PREFIX = '/static/admin/' +# ADMIN_MEDIA_PREFIX = '/static/admin/' # Additional locations of static files STATICFILES_DIRS = ( @@ -282,3 +282,7 @@ SECRET_KEY = '' MAINTENANCE_MODE = False # Sequence of URL path regexes to exclude from the maintenance mode. MAINTENANCE_IGNORE_URLS = {} + +class NONPROFIT: + name = 'Library Renewal' + link = 'http://127.0.0.1:8000/donate_to_campaign/' \ No newline at end of file From 9395cd058b6a97ef59b37168d9477a76a0a02e8f Mon Sep 17 00:00:00 2001 From: eric Date: Thu, 6 Sep 2012 11:36:13 -0400 Subject: [PATCH 045/107] now donating cents works, too --- frontend/forms.py | 2 +- frontend/templates/donation_credit.html | 2 +- frontend/templates/fund_the_pledge.html | 4 ++-- frontend/views.py | 11 +++++++---- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/frontend/forms.py b/frontend/forms.py index 041bab07..c096ef64 100644 --- a/frontend/forms.py +++ b/frontend/forms.py @@ -342,7 +342,7 @@ class CCForm(forms.Form): required=False, min_value=D('1.00'), max_value=D('100000.00'), - decimal_places=0, + decimal_places=2, label="Pledge", ) diff --git a/frontend/templates/donation_credit.html b/frontend/templates/donation_credit.html index 09db1dde..94f8af27 100644 --- a/frontend/templates/donation_credit.html +++ b/frontend/templates/donation_credit.html @@ -19,7 +19,7 @@

    Congratulations, your donation credits have been registered!

    - {{ envelope.amount }}
    + {{ envelope.amount }}.{{ envelope.cents }}
    {{ envelope.username }}
    {{ envelope.work_id }}
    {{ envelope.sent }}
    diff --git a/frontend/templates/fund_the_pledge.html b/frontend/templates/fund_the_pledge.html index feb422a0..abff2f6d 100644 --- a/frontend/templates/fund_the_pledge.html +++ b/frontend/templates/fund_the_pledge.html @@ -17,7 +17,7 @@

    Funding Your Pledge

    -
    We're so happy that you've decided to join this campaign. We have two ways we can fund your pledge of ${{preapproval_amount|intcomma}}. +
    We're so happy that you've decided to join this campaign. We have two ways we can fund your pledge of ${{preapproval_amount}}.
    1. You can make a donation now to {{nonprofit.name}}, a non-profit charity that's working with Unglue.it to give books to the world.
    2. You can give us your credit card information now; we'll charge your card only if the campaign succeeds.
      3. @@ -26,7 +26,7 @@