Merge in master
jonahmania
commit
52957407ad
|
|
@ -0,0 +1,9 @@
|
|||
https://www.ubiquitypress.com/sitemap.xml
|
||||
https://www.kriterium.se/sitemap.xml
|
||||
https://oa.finlit.fi/sitemap.xml
|
||||
https://www.humanities-map.net/sitemap.xml
|
||||
https://oa.psupress.org/sitemap.xml
|
||||
https://www.larcommons.net/sitemap.xml
|
||||
https://www.uwestminsterpress.co.uk/sitemap.xml
|
||||
https://www.stockholmuniversitypress.se/sitemap.xml
|
||||
https://www.luminosoa.org/sitemap.xml
|
||||
|
|
@ -18,7 +18,7 @@ class UbiquityScraper(BaseScraper):
|
|||
for desc in descs:
|
||||
if desc.find(string=HAS_EDS):
|
||||
return 'editor'
|
||||
return super(self, UbiquityScraper).get_role()
|
||||
return super(UbiquityScraper, self).get_role()
|
||||
|
||||
def get_language(self):
|
||||
langlabel = self.doc.find(string='Language')
|
||||
|
|
@ -28,4 +28,4 @@ class UbiquityScraper(BaseScraper):
|
|||
if lang:
|
||||
self.set('language', lang)
|
||||
else:
|
||||
super(self, UbiquityScraper).get_language()
|
||||
super(UbiquityScraper, self).get_language()
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
import os
|
||||
from django.core.management.base import BaseCommand
|
||||
|
||||
from regluit.core.loaders import add_by_sitemap
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = "load books based on a website sitemap"
|
||||
help = "load books based on a website sitemap; use url=all to load from sitemap list"
|
||||
|
||||
def add_arguments(self, parser):
|
||||
# Positional arguments
|
||||
|
|
@ -20,5 +21,20 @@ class Command(BaseCommand):
|
|||
)
|
||||
|
||||
def handle(self, url, max=None, **options):
|
||||
if url == 'all':
|
||||
file_name = "../../../bookdata/sitemaps.txt"
|
||||
command_dir = os.path.dirname(os.path.realpath(__file__))
|
||||
file_path = os.path.join(command_dir, file_name)
|
||||
with open(file_path) as f:
|
||||
content = f.readlines()
|
||||
books = []
|
||||
for sitemap in content:
|
||||
added = add_by_sitemap(sitemap.strip(), maxnum=max)
|
||||
max = max - len(added)
|
||||
books = books + added
|
||||
if max < 0:
|
||||
break
|
||||
else:
|
||||
books = add_by_sitemap(url, maxnum=max)
|
||||
|
||||
print "loaded {} books".format(len(books))
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ def create_notice_types( **kwargs):
|
|||
notification.create_notice_type("rights_holder_accepted", _("Agreement Accepted"), _("You have become a verified Unglue.it rights holder."))
|
||||
notification.create_notice_type("rights_holder_claim", _("Claim Entered"), _("A claim has been entered."))
|
||||
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."))
|
||||
notification.create_notice_type("pledge_gift_credit", _("Gift Credit Balance"), _("You have a gift credit balance"))
|
||||
notification.create_notice_type("pledge_gift_credit", _("Credit Balance"), _("You have a credit balance"))
|
||||
notification.create_notice_type("new_wisher", _("New wisher"), _("Someone new has faved a book that you're the rightsholder for"))
|
||||
notification.create_notice_type("account_expiring", _("Credit Card Expiring Soon"), _("Your credit card is about to expire."))
|
||||
notification.create_notice_type("account_expired", _("Credit Card Has Expired"), _("Your credit card has expired."))
|
||||
|
|
|
|||
|
|
@ -384,7 +384,7 @@ class CampaignPledgeForm(forms.Form):
|
|||
preapproval_amount = forms.DecimalField(
|
||||
required = False,
|
||||
min_value=D('1.00'),
|
||||
max_value=D('2000.00'),
|
||||
max_value=D('5000.00'),
|
||||
decimal_places=2,
|
||||
label="Support Amount",
|
||||
)
|
||||
|
|
|
|||
|
|
@ -13,24 +13,24 @@
|
|||
{% endblock %}
|
||||
|
||||
{% block doccontent %}
|
||||
<h2>gift Credits</h2>
|
||||
<h2>Unglue.it Credits</h2>
|
||||
<p>
|
||||
You have a balance of {{ user.credit.balance }} gift credits. <br />
|
||||
You have pledged {{ user.credit.pledged }} gift credits to ungluing campaigns.<br />
|
||||
You have {{ user.credit.available }} gift credits available to pledge or transfer.<br />
|
||||
You have a balance of {{ user.credit.balance }} Unglue.it credits. <br />
|
||||
You have pledged {{ user.credit.pledged }} Unglue.it credits to ungluing campaigns.<br />
|
||||
You have {{ user.credit.available }} Unglue.it credits available to pledge or transfer.<br />
|
||||
</p>
|
||||
<div class="clearfix">
|
||||
<h2>Gift Credit Transfers</h2>
|
||||
<h2>Unglue.it Credit Transfers</h2>
|
||||
{% if transfer_message %}
|
||||
<p>{{ transfer_message }}
|
||||
{% if transfer_amount %}
|
||||
<br /> Recipient: <a href="{% url 'supporter' recipient %}">{{ recipient }}</a>
|
||||
<br /> Amount: {{ transfer_amount }} gift credits
|
||||
<br /> Amount: {{ transfer_amount }} Unglue.it credits
|
||||
{% endif %}
|
||||
</p>
|
||||
{% endif %}
|
||||
<p>
|
||||
You may transfer up to {{ user.credit.available }} gift credits to another Unglue.it user.<br />
|
||||
You may transfer up to {{ user.credit.available }} Unglue.it credits to another Unglue.it user.<br />
|
||||
</p>
|
||||
<form action="#" method="POST">
|
||||
{% csrf_token %}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{% load humanize %}
|
||||
|
||||
{% block title %}You Have Gift Credits{% endblock %}
|
||||
{% block title %}You Have Unglue.it Credits{% endblock %}
|
||||
|
||||
{% block doccontent %}
|
||||
<div style="height:15px"></div>
|
||||
|
|
@ -13,9 +13,9 @@
|
|||
<div>
|
||||
<h2> Gift Credited </h2>
|
||||
<p>{% if error %}
|
||||
Your gift credit of ${{ envelope.amount }}.{{ envelope.cents }} has already been registered! {% if work %} If you want to contribute more to <a href="{% url 'work' work.id %}">{{ work.title }}</a>, you can! {% endif %}
|
||||
Your Unglue.it credit of ${{ envelope.amount }}.{{ envelope.cents }} has already been registered! {% if work %} If you want to contribute more to <a href="{% url 'work' work.id %}">{{ work.title }}</a>, you can! {% endif %}
|
||||
{% else %}
|
||||
Congratulations, your gift credit of ${{ envelope.amount }}.{{ envelope.cents }} has been registered! {% if transaction.campaign %} ${{transaction.amount}} of that had been pledged to {{ transaction.campaign.name }}. If you want to contribute more to <a href="{% url 'work' work.id %}">{{ work.title }}</a>, you can! {% endif %}
|
||||
Congratulations, your Unglue.it credit of ${{ envelope.amount }}.{{ envelope.cents }} has been registered! {% if transaction.campaign %} ${{transaction.amount}} of that had been pledged to {{ transaction.campaign.name }}. If you want to contribute more to <a href="{% url 'work' work.id %}">{{ work.title }}</a>, you can! {% endif %}
|
||||
{% endif %}
|
||||
</p>
|
||||
<!-- sent log: {{ envelope.sent }} -->
|
||||
|
|
@ -24,9 +24,9 @@
|
|||
<div>
|
||||
<h2> Your gift credits </h2>
|
||||
<p>
|
||||
You have a balance of {{ request.user.credit.balance }} gift credits. <br />
|
||||
You have pledged {{ request.user.credit.pledged }} gift credits to ungluing campaigns.<br />
|
||||
You have {{ request.user.credit.available }} gift credits available to pledge or <a href="{% url 'gift' %}">transfer</a>.<br />
|
||||
You have a balance of {{ request.user.credit.balance }} Unglue.it credits. <br />
|
||||
You have pledged {{ request.user.credit.pledged }} Unglue.it credits to ungluing campaigns.<br />
|
||||
You have {{ request.user.credit.available }} Unglue.it credits available to pledge or <a href="{% url 'gift' %}">transfer</a>.<br />
|
||||
</p>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@
|
|||
<div class="jsmodule rounded clearfix">
|
||||
<div class="jsmod-content">
|
||||
|
||||
<div><h2>Wrong user for gift credit</h2>
|
||||
<div><h2>Wrong user for Unglue.it credit</h2>
|
||||
<div>
|
||||
<p>Unglue.it would like to process your gift credit, but you are currently logged in as <code>{{request.user.username}}</code>. Your gift credit for ${{ envelope.amount }}.{{ envelope.cents }} is designated for <code>{{ envelope.username }}</code>. To record your credit, you need to <a href='{% url 'auth_logout' %}?next={{ request.get_full_path|urlencode }}'>log out</a>, and then <a href='{% url 'superlogin' %}?next={{ request.get_full_path|urlencode }}'>log in</a> as <code>{{ envelope.username }}</code>. If you have any problem, don't hesitate to <a href="{% url 'feedback' %}?page={{request.build_absolute_uri|urlencode:""}}">contact us</a>.
|
||||
<p>Unglue.it would like to process your Unglue.it credit, but you are currently logged in as <code>{{request.user.username}}</code>. Your Unglue.it credit for ${{ envelope.amount }}.{{ envelope.cents }} is designated for <code>{{ envelope.username }}</code>. To record your credit, you need to <a href='{% url 'auth_logout' %}?next={{ request.get_full_path|urlencode }}'>log out</a>, and then <a href='{% url 'superlogin' %}?next={{ request.get_full_path|urlencode }}'>log in</a> as <code>{{ envelope.username }}</code>. If you have any problem, don't hesitate to <a href="{% url 'feedback' %}?page={{request.build_absolute_uri|urlencode:""}}">contact us</a>.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{% extends 'notification/base.html' %}
|
||||
|
||||
{% load sass_tags %}
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
{% block title %}{% trans "Notices" %}{% endblock %}
|
||||
|
||||
{% block extra_css %}
|
||||
<link type="text/css" rel="stylesheet" href="/static/css/notices.css" />
|
||||
<link type="text/css" rel="stylesheet" href="{% sass_src 'scss/notices.scss' %}" />
|
||||
{% endblock %}
|
||||
|
||||
{% block doccontent %}
|
||||
|
|
@ -23,24 +23,28 @@
|
|||
<div class="notices_menu">
|
||||
<a href="{% url 'notification_mark_all_seen' %}">{% trans "Mark all notices seen" %}</a>
|
||||
</div>
|
||||
{% elif notice.unseen or request.GET.mode != 'seen' %}
|
||||
<div class="notices_menu">
|
||||
<a href="{% url 'notification_notices' %}?mode=seen">{% trans "Show seen notices" %}</a>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="notices_menu">
|
||||
<a href="{% url 'notification_notices' %}">{% trans "Show only unseen notices" %}</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div class="comments"></div>
|
||||
<br />
|
||||
|
||||
{% if unseen_count > 0 %}
|
||||
{% if unseen_count > 0 or request.GET.mode == 'seen' %}
|
||||
{% for notice in notices %}
|
||||
{% if notice.unseen %}
|
||||
{% comment %}
|
||||
Note: do not call is_unseen because it will mark the notification as seen,
|
||||
and we're leaving that up to the user.
|
||||
{% endcomment %}
|
||||
{% if notice.unseen or request.GET.mode == 'seen' %}
|
||||
<div class="notice">
|
||||
{{ notice.message|safe }}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
<p>{% trans "You have no unseen notices." %}</p>
|
||||
<p>You have no {% if unseen_count == 0 %}unseen {% endif %} notices.</p>
|
||||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{% load humanize %}{% if transaction.donation %}{% ifequal transaction.host 'credit' %}Your Unglue.it transaction has completed and ${{transaction.max_amount|default:"0"}} has been deducted from your Unglue.it credit balance. You have ${{transaction.user.credit.available|default:"0"}} of credit left. {% else %}{% if transaction.max_amount > transaction.amount %}Your transaction for ${{transaction.max_amount|default:"0"}} has completed. Your credit card has been charged ${{transaction.amount}} and the rest has been deducted from your unglue.it credit balance. You have ${{transaction.user.credit.available|default:"0"}} of credit left. {% else %}Your Unglue.it credit card transaction has completed and your credit card has been charged ${{ transaction.amount|default:"0" }}. {% endif %}{% endifequal %}
|
||||
{% load humanize %}{% if transaction.donation %}{% if transaction.host == 'credit' %}Your Unglue.it transaction has completed and ${{transaction.max_amount|default:"0"}} has been deducted from your Unglue.it credit balance. You have ${{transaction.user.credit.available|default:"0"}} of credit left. {% elif transaction.max_amount > transaction.amount %}Your transaction for ${{transaction.max_amount|default:"0"}} has completed. Your credit card has been charged ${{transaction.amount}} and the rest has been deducted from your unglue.it credit balance. You have ${{transaction.user.credit.available|default:"0"}} of credit left. {% else %}Your Unglue.it credit card transaction has completed and your credit card has been charged ${{ transaction.amount|default:"0" }}. {% endif %}
|
||||
|
||||
Your donation of ${{transaction.max_amount|default:"0"}} to the Free Ebook Foundation will support our effort to release {{ transaction.campaign.work.title }} to the world in an unglued ebook edition. We'll email you if the campaign succeeds, and when the ebook is available for download. If you'd like to visit the campaign page, click here:
|
||||
https://{{ current_site.domain }}{% url 'work' transaction.campaign.work_id %}
|
||||
|
|
@ -15,7 +15,7 @@ Thank you again for your generous support.
|
|||
|
||||
{% else %}An Ungluing!
|
||||
|
||||
Thanks to you and other ungluers, {{ transaction.campaign.work.title }} will be released to the world in an unglued ebook edition. Your credit card has been charged ${{ transaction.amount|floatformat:2|intcomma }}.
|
||||
Thanks to you and other ungluers, {{ transaction.campaign.work.title }} will be released to the world in an unglued ebook edition. Your {% if transaction.host == 'credit' %}Unglue.it credit account{% else %}credit card{% endif %} has been charged ${{ transaction.amount|floatformat:2|intcomma }}.
|
||||
|
||||
Pledge summary
|
||||
{% include "notification/pledge_summary.txt" %}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
{% else %}
|
||||
<p>Congratulations!</p>
|
||||
|
||||
<p>Thanks to you and other ungluers, {{ transaction.campaign.work.title }} will be released to the world in an unglued ebook edition. {{ transaction.host|capfirst }} has been charged to your credit card.</p>
|
||||
<p>Thanks to you and other ungluers, {{ transaction.campaign.work.title }} will be released to the world in an unglued ebook edition. Your {% if transaction.host == 'credit' %}Unglue.it credit account{% else %}credit card{% endif %} has been charged ${{ transaction.amount|floatformat:2|intcomma }}.</p>
|
||||
|
||||
<p><b>Pledge Summary</b><br />
|
||||
Amount pledged: {{ transaction.amount|floatformat:2|intcomma }}<br />
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{% if amount > 0 %}
|
||||
{% if amount == 1 %}
|
||||
{{ user.username }}, 1 gift credit has been added to your unglue.it gift credit account.
|
||||
{{ user.username }}, 1 Unglue.it credit has been added to your unglue.it gift credit account.
|
||||
{% else %}
|
||||
{{ user.username }}, {{ amount }} gift credits have been added to your unglue.it gift credit account.
|
||||
{{ user.username }}, {{ amount }} Unglue.it credits have been added to your unglue.it gift credit account.
|
||||
{% endif %}
|
||||
{% else %}
|
||||
{% if amount == 1 %}
|
||||
{{ user.username }}, 1 gift credit has been deducted from your unglue.it gift credit account.
|
||||
{{ user.username }}, 1 Unglue.it credit has been deducted from your unglue.it gift credit account.
|
||||
{% else %}
|
||||
{{ user.username }}, {{ minus_amount }} gift credits have been deducted from your unglue.it gift credit account.
|
||||
{{ user.username }}, {{ minus_amount }} Unglue.it credits have been deducted from your unglue.it gift credit account.
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
You have a balance of {{ user.credit.balance }} gift credits.
|
||||
You have pledged {{ user.credit.pledged }} gift credits to ungluing campaigns.
|
||||
You have {{ user.credit.available }} gift credits available to pledge or transfer.
|
||||
You can manage your gift credit account at https://unglue.it/gift/
|
||||
You have a balance of {{ user.credit.balance }} Unglue.it credits.
|
||||
You have pledged {{ user.credit.pledged }} Unglue.it credits to ungluing campaigns.
|
||||
You have {{ user.credit.available }} Unglue.it credits available to pledge or transfer.
|
||||
You can manage your Unglue.it credit account at https://unglue.it/gift/
|
||||
|
||||
Gift credits can be used in support of any type of ungluing campaign.
|
||||
Unglue.it credits can be used in support of any type of ungluing campaign.
|
||||
|
|
@ -2,26 +2,26 @@
|
|||
|
||||
{% block comments_graphical %}
|
||||
{% if amount > 0 %}
|
||||
{{ user.username }}, {{ amount }} gift credits have been added to your unglue.it gift credit account.
|
||||
{{ user.username }}, {{ amount }} Unglue.it credits have been added to your unglue.it Unglue.it credit account.
|
||||
{% else %}
|
||||
{{ user.username }}, {{ minus_amount }} gift credits have been deducted from your unglue.it gift credit account.
|
||||
{{ user.username }}, {{ minus_amount }} Unglue.it credits have been deducted from your unglue.it Unglue.it credit account.
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
{% block comments_textual %}
|
||||
<p>
|
||||
You have a balance of {{ user.credit.balance }} gift credits.
|
||||
You have a balance of {{ user.credit.balance }} Unglue.it credits.
|
||||
</p>
|
||||
<p>
|
||||
You have pledged {{ user.credit.pledged }} gift credits to ungluing campaigns.
|
||||
You have pledged {{ user.credit.pledged }} Unglue.it credits to ungluing campaigns.
|
||||
</p>
|
||||
<p>
|
||||
You have {{ user.credit.available }} gift credits available to pledge or transfer.
|
||||
You have {{ user.credit.available }} Unglue.it credits available to pledge or transfer.
|
||||
</p>
|
||||
<p>
|
||||
You can manage your gift credit account <a href="https://unglue.it/gift/">here</a>
|
||||
You can manage your Unglue.it credit account <a href="https://unglue.it/gift/">here</a>
|
||||
</p>
|
||||
<p>
|
||||
|
||||
Gift credits can be used in support of ungluing campaigns.
|
||||
Unglue.it credits can be used in support of ungluing campaigns.
|
||||
</p>
|
||||
{% endblock %}
|
||||
|
|
@ -1 +1 @@
|
|||
{% if amount > 0 %}{{ amount }} gift credits have been added to your unglue.it gift credit account.{% else %}{{ minus_amount }} gift credits have been deducted from your unglue.it gift credit account.{% endif %}
|
||||
{% if amount > 0 %}{{ amount }} Unglue.it credits have been added to your unglue.it credit account.{% else %}{{ minus_amount }} Unglue.it credits have been deducted from your unglue.it credit account.{% endif %}
|
||||
|
|
@ -1,20 +1,13 @@
|
|||
{% if work.last_campaign_status == 'SUCCESSFUL' %}
|
||||
{{ work.title }}, which is on your ungluing list, is now available for download as an Unglued Ebook.
|
||||
New ebook files for "{{ work.title }}", which is on your ungluing list, are available for download.
|
||||
|
||||
{% else %}
|
||||
{{ work.title }}, which is on your ungluing list, is available for download as a {{ work.ebooks.0.get_rights_display }} ebook.
|
||||
|
||||
{% if work.ebooks.0.user %}
|
||||
We'd like to thank Ungluer {{work.ebooks.0.user}} for adding the link(s).
|
||||
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
Here are the files available for download:
|
||||
Here are the files now available:
|
||||
{% for ebook in work.ebooks %}
|
||||
File type: {{ ebook.get_format_display }}
|
||||
License: {{ ebook.get_rights_display }}
|
||||
{% if ebook.version_label %}Version: {{ ebook.version_label }}
|
||||
{% endif %}License: {{ ebook.get_rights_display }}
|
||||
Host Site: {{ ebook.provider }}
|
||||
URL: {{ ebook.download_url }}
|
||||
Date Added: {{ ebook.created|date:"M d, Y" }}
|
||||
|
||||
{% endfor %}
|
||||
{% if work.ebooks.0.rights == 'PD-US' %}
|
||||
|
|
|
|||
|
|
@ -11,35 +11,26 @@
|
|||
{% endblock %}
|
||||
|
||||
{% block comments_textual %}
|
||||
{% if work.last_campaign_status == 'SUCCESSFUL' %}
|
||||
<p>
|
||||
Great News! <a href="{% url 'work' work.id %}">{{ work.title }}</a> which is on your ungluing list is now available for download as an Unglued Ebook.
|
||||
New ebook files for <a href="{% url 'work' work.id %}">{{ work.title }}</a>, are available for download.
|
||||
</p>
|
||||
{% else %}
|
||||
<p>
|
||||
Good News! <a href="{% url 'work' work.id %}">{{ work.title }}</a> which is on your ungluing list is available for download as a {{ work.ebooks.0.get_rights_display }} ebook.
|
||||
</p>
|
||||
{% if work.ebooks.0.user %}
|
||||
<p>
|
||||
We'd like to thank Ungluer {{work.ebooks.0.user}} for adding the link(s).
|
||||
</p>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
<p>Here are the files available for download:</p>
|
||||
<p>Here are the files now available for download:</p>
|
||||
<table>
|
||||
<tr>
|
||||
<th>File type</th>
|
||||
<th>Version</th>
|
||||
<th>License</th>
|
||||
<th>Host Site</th>
|
||||
<th>URL</th>
|
||||
<th>Date Added</th>
|
||||
</tr>
|
||||
{% for ebook in work.ebooks %}
|
||||
<tr>
|
||||
<td>{{ ebook.get_format_display }}</td>
|
||||
<td>{{ ebook.version_label }}</td>
|
||||
<td>{{ ebook.get_rights_display }}</td>
|
||||
<td>{{ ebook.provider }}</td>
|
||||
<td><a href="{{ ebook.download_url }}">{{ ebook.download_url|truncatechars:30 }}</a></td>
|
||||
<td>{{ ebook.created|date:"M d, Y" }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{{ work.title }} is available for download!
|
||||
New ebook files for {{ work.title }} are available for download!
|
||||
|
|
@ -177,7 +177,7 @@
|
|||
<input name="pledge" type="submit" value="Buy Now" id="pledgesubmit" class="loader-gif" />
|
||||
<input name="decoy" type="submit" id="fakepledgesubmit" disabled="disabled" />
|
||||
{% if request.user.credit.available > 0 %}
|
||||
<div class="bigger" style="height:45px;clear:both"> You have an available gift credit of ${{ request.user.credit.available|intcomma }} which will be applied to your purchase.</div>
|
||||
<div class="bigger" style="height:45px;clear:both"> You have an available Unglue.it credit of ${{ request.user.credit.available|intcomma }} which will be applied to your purchase.</div>
|
||||
{% endif %}
|
||||
</form>
|
||||
|
||||
|
|
|
|||
|
|
@ -1063,7 +1063,7 @@ class PledgeView(FormView):
|
|||
host = PAYMENT_HOST_NONE,
|
||||
campaign=self.campaign,
|
||||
user=self.request.user,
|
||||
paymentReason="Unglue.it Pledge for {0}".format(self.campaign.name),
|
||||
paymentReason=u"Unglue.it Pledge for {0}".format(self.campaign.name),
|
||||
pledge_extra=form.trans_extra,
|
||||
donation = donation
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,11 +1,15 @@
|
|||
from datetime import timedelta
|
||||
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import User
|
||||
from datetime import datetime
|
||||
|
||||
from regluit.payment import baseprocessor
|
||||
from regluit.payment.baseprocessor import BasePaymentRequest
|
||||
from regluit.payment.parameters import *
|
||||
from regluit.payment.parameters import (
|
||||
PAYMENT_HOST_CREDIT,
|
||||
PAYMENT_TYPE_AUTHORIZATION,
|
||||
PAYMENT_TYPE_INSTANT,
|
||||
TRANSACTION_STATUS_COMPLETE,
|
||||
TRANSACTION_STATUS_CANCELED,
|
||||
)
|
||||
from regluit.payment.signals import transaction_charged
|
||||
|
||||
def pledge_transaction(t, user, amount):
|
||||
"""commit <amount> from a <user>'s credit to a specified transaction <t>"""
|
||||
|
|
@ -67,3 +71,25 @@ class Processor(baseprocessor.Processor):
|
|||
self.approved = transaction.approved
|
||||
self.currency = transaction.currency
|
||||
self.amount = transaction.amount
|
||||
|
||||
class Execute(BasePaymentRequest):
|
||||
'''
|
||||
This Execute function debits the user credits and pledge and credits the recipient.
|
||||
'''
|
||||
def __init__(self, transaction=None):
|
||||
self.transaction = transaction
|
||||
amount = transaction.amount
|
||||
# make sure transaction hasn't already been executed
|
||||
if transaction.status == TRANSACTION_STATUS_COMPLETE:
|
||||
return
|
||||
|
||||
used = transaction.user.credit.use_pledge(amount)
|
||||
if used:
|
||||
user_to_pay = transaction.campaign.user_to_pay
|
||||
credited = user_to_pay.credit.add_to_balance(amount, notify=False)
|
||||
transaction.status = TRANSACTION_STATUS_COMPLETE
|
||||
transaction.date_payment = datetime.now()
|
||||
transaction.save()
|
||||
|
||||
# fire signal for sucessful transaction
|
||||
transaction_charged.send(sender=self, transaction=transaction)
|
||||
|
|
|
|||
|
|
@ -2,15 +2,23 @@ from django.core.management.base import BaseCommand
|
|||
from django.contrib.auth.models import User
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = "grant credit to a user"
|
||||
help = "grant (or debit or redeem) credit to a user. \
|
||||
Usage: grant_user_credit <username> <amount> <action>\
|
||||
amount is dollars or 'all' "
|
||||
args = "<username> <amount> <action>"
|
||||
|
||||
def handle(self, username, amount, action="credit", *args, **kwargs):
|
||||
if action=="debit":
|
||||
amount=-int(amount)
|
||||
else:
|
||||
amount= int(amount)
|
||||
if action not in ("debit", "redeem", "credit"):
|
||||
print 'action should be in ("debit", "redeem", "credit")'
|
||||
return
|
||||
user = User.objects.get(username=username)
|
||||
user.credit.add_to_balance(amount)
|
||||
print "%s now has a balance of %s gift credits" % (username, user.credit.balance)
|
||||
|
||||
if amount == 'all':
|
||||
amount = user.credit.available
|
||||
if action in ("debit", "redeem" ):
|
||||
amount = -int(amount)
|
||||
elif action == "credit":
|
||||
amount = int(amount)
|
||||
notify = action != "redeem"
|
||||
user.credit.add_to_balance(amount, notify=notify)
|
||||
print "{}ed ${} from {}".format(action, amount, username)
|
||||
print "{} now has a balance of {} credits".format(username, user.credit.balance)
|
||||
|
|
|
|||
|
|
@ -461,8 +461,6 @@ class PaymentManager( object ):
|
|||
# Mark as payment attempted so we will poll this periodically for status changes
|
||||
transaction.set_payment()
|
||||
|
||||
# here's where we need to add handling for credit transactions in pledge campaigns
|
||||
|
||||
p = transaction.get_payment_class().Execute(transaction)
|
||||
|
||||
# Create a response for this
|
||||
|
|
|
|||
|
|
@ -3,41 +3,52 @@ external library imports
|
|||
"""
|
||||
import datetime
|
||||
import uuid
|
||||
|
||||
from django.utils.http import urlquote
|
||||
import logging
|
||||
|
||||
from decimal import Decimal
|
||||
|
||||
from jsonfield import JSONField
|
||||
|
||||
"""
|
||||
django imports
|
||||
"""
|
||||
## django imports
|
||||
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import User
|
||||
from django.db import models
|
||||
from django.db.models import Q
|
||||
from django.contrib.sites.models import Site
|
||||
from django.db.models.signals import post_save, post_delete, pre_save
|
||||
from django.db.models.signals import post_save, post_delete
|
||||
from django.utils.http import urlquote
|
||||
|
||||
## django module imports
|
||||
|
||||
"""
|
||||
django module imports
|
||||
"""
|
||||
from notification import models as notification
|
||||
|
||||
|
||||
"""
|
||||
regluit imports
|
||||
"""
|
||||
from regluit.payment.parameters import *
|
||||
## regluit imports
|
||||
|
||||
from regluit.payment.parameters import (
|
||||
PAYMENT_TYPE_NONE,
|
||||
PAYMENT_TYPE_AUTHORIZATION,
|
||||
|
||||
PAYMENT_HOST_NONE,
|
||||
|
||||
PAYMENT_HOST_CREDIT,
|
||||
|
||||
EXECUTE_TYPE_NONE,
|
||||
TRANSACTION_STATUS_NONE,
|
||||
TRANSACTION_STATUS_ACTIVE,
|
||||
TRANSACTION_STATUS_ERROR,
|
||||
TRANSACTION_STATUS_FAILED,
|
||||
)
|
||||
|
||||
from regluit.payment.signals import credit_balance_added, pledge_created
|
||||
from regluit.utils.localdatetime import now, date_today
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# in fitting stripe -- here are possible fields to fit in with Transaction
|
||||
# c.id, c.amount, c.amount_refunded, c.currency, c.description, datetime.fromtimestamp(c.created, tz=utc), c.paid,
|
||||
# c.id, c.amount, c.amount_refunded, 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.type, c.card.last4, c.card.exp_month, c.card.exp_year
|
||||
|
||||
|
|
@ -48,7 +59,8 @@ class Transaction(models.Model):
|
|||
# type e.g., PAYMENT_TYPE_INSTANT or PAYMENT_TYPE_AUTHORIZATION -- defined in parameters.py
|
||||
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: the payment processor.
|
||||
#Named after the payment module that hosts the payment processing functions
|
||||
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
|
||||
|
|
@ -74,7 +86,8 @@ class Transaction(models.Model):
|
|||
# a preapproval key that Paypal generates to identify this transaction
|
||||
preapproval_key = models.CharField(max_length=128, null=True)
|
||||
|
||||
# (RY is not sure what receipt is for; t4u has hijacked this to be an email address for user.is_anonymous to send a receipt to)
|
||||
# (RY is not sure what receipt is for; t4u has hijacked this to be an email address for
|
||||
# user.is_anonymous to send a receipt to)
|
||||
receipt = models.CharField(max_length=256, null=True)
|
||||
|
||||
# whether a Preapproval has been approved or not
|
||||
|
|
@ -121,28 +134,25 @@ class Transaction(models.Model):
|
|||
return 1
|
||||
if self.amount < 100:
|
||||
return 2
|
||||
else:
|
||||
return 3
|
||||
|
||||
@property
|
||||
def deadline_or_now(self):
|
||||
if self.campaign and self.campaign.deadline:
|
||||
return self.campaign.deadline
|
||||
else:
|
||||
return now()
|
||||
|
||||
@property
|
||||
def needed_amount(self):
|
||||
if self.user == None or self.user.is_anonymous():
|
||||
if self.user is None or self.user.is_anonymous():
|
||||
return self.max_amount
|
||||
if self.user.credit.available >= self.max_amount:
|
||||
return 0
|
||||
else:
|
||||
return self.max_amount - self.user.credit.available
|
||||
|
||||
@property
|
||||
def credit_amount(self):
|
||||
if self.user == None or self.user.is_anonymous():
|
||||
if self.user is None or self.user.is_anonymous():
|
||||
return 0
|
||||
if self.user.credit.available >= self.max_amount:
|
||||
return self.max_amount
|
||||
|
|
@ -164,7 +174,14 @@ class Transaction(models.Model):
|
|||
|
||||
primary = True
|
||||
for r in receiver_list:
|
||||
receiver = Receiver.objects.create(email=r['email'], amount=r['amount'], currency=self.currency, status="None", primary=primary, transaction=self)
|
||||
receiver = Receiver.objects.create(
|
||||
email=r['email'],
|
||||
amount=r['amount'],
|
||||
currency=self.currency,
|
||||
status="None",
|
||||
primary=primary,
|
||||
transaction=self
|
||||
)
|
||||
primary = False
|
||||
|
||||
def get_payment_class(self):
|
||||
|
|
@ -173,7 +190,6 @@ class Transaction(models.Model):
|
|||
'''
|
||||
if self.host == PAYMENT_HOST_NONE:
|
||||
return None
|
||||
else:
|
||||
mod = __import__("regluit.payment." + self.host, fromlist=[str(self.host)])
|
||||
return mod.Processor()
|
||||
|
||||
|
|
@ -251,7 +267,11 @@ class PaymentResponse(models.Model):
|
|||
transaction = models.ForeignKey(Transaction, null=False)
|
||||
|
||||
def __unicode__(self):
|
||||
return u"PaymentResponse -- api: {0} correlation_id: {1} transaction: {2}".format(self.api, self.correlation_id, unicode(self.transaction))
|
||||
return u"PaymentResponse -- api: {0} correlation_id: {1} transaction: {2}".format(
|
||||
self.api,
|
||||
self.correlation_id,
|
||||
unicode(self.transaction)
|
||||
)
|
||||
|
||||
|
||||
class Receiver(models.Model):
|
||||
|
|
@ -269,10 +289,14 @@ class Receiver(models.Model):
|
|||
transaction = models.ForeignKey(Transaction)
|
||||
|
||||
def __unicode__(self):
|
||||
return u"Receiver -- email: {0} status: {1} transaction: {2}".format(self.email, self.status, unicode(self.transaction))
|
||||
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 Gift Credit Transactions
|
||||
# a write only record of Unglue.it Credit Transactions
|
||||
user = models.ForeignKey(settings.AUTH_USER_MODEL, 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)
|
||||
|
|
@ -290,7 +314,7 @@ class Credit(models.Model):
|
|||
def available(self):
|
||||
return self.balance - self.pledged
|
||||
|
||||
def add_to_balance(self, num_credits):
|
||||
def add_to_balance(self, num_credits, notify=True):
|
||||
if self.pledged - self.balance > num_credits: # negative to withdraw
|
||||
return False
|
||||
else:
|
||||
|
|
@ -300,10 +324,11 @@ class Credit(models.Model):
|
|||
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)
|
||||
if notify:
|
||||
try:
|
||||
credit_balance_added.send(sender=self, amount=num_credits)
|
||||
except:
|
||||
logger.exception("credit_balance_added failed of %s", num_credits)
|
||||
logger.exception("credit_balance_added notification failed of %s", num_credits)
|
||||
return True
|
||||
|
||||
def add_to_pledged(self, num_credits):
|
||||
|
|
@ -312,7 +337,6 @@ class Credit(models.Model):
|
|||
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
|
||||
|
|
@ -327,7 +351,6 @@ class Credit(models.Model):
|
|||
return False
|
||||
if self.pledged < num_credits:
|
||||
return False
|
||||
else:
|
||||
self.pledged = self.pledged - num_credits
|
||||
self.balance = self.balance - num_credits
|
||||
self.save()
|
||||
|
|
@ -337,19 +360,17 @@ class Credit(models.Model):
|
|||
logger.exception("failed to log use_pledge of %s", num_credits)
|
||||
return True
|
||||
|
||||
def transfer_to(self, receiver, num_credits):
|
||||
def transfer_to(self, receiver, num_credits, notify=True):
|
||||
num_credits = Decimal(num_credits)
|
||||
if num_credits is Decimal('NaN') or not isinstance(receiver, User):
|
||||
logger.info('fail: %s, %s' % (num_credits, receiver))
|
||||
return False
|
||||
if self.add_to_balance(-num_credits):
|
||||
if receiver.credit.add_to_balance(num_credits):
|
||||
if receiver.credit.add_to_balance(num_credits, notify):
|
||||
return True
|
||||
else:
|
||||
# unwind transfer
|
||||
self.add_to_balance(num_credits)
|
||||
self.add_to_balance(num_credits, notify)
|
||||
return False
|
||||
else:
|
||||
return False
|
||||
|
||||
class Sent(models.Model):
|
||||
|
|
@ -361,9 +382,12 @@ class Sent(models.Model):
|
|||
class Account(models.Model):
|
||||
"""holds references to accounts at third party payment gateways, especially for representing credit cards"""
|
||||
|
||||
# the following fields from stripe Customer might be relevant to Account -- we need to pick good selection
|
||||
# c.id, c.description, c.email, datetime.fromtimestamp(c.created, tz=utc), c.account_balance, c.delinquent,
|
||||
# c.active_card.fingerprint, c.active_card.type, c.active_card.last4, c.active_card.exp_month, c.active_card.exp_year,
|
||||
# the following fields from stripe Customer might be relevant to Account
|
||||
# -- we need to pick good selection
|
||||
# c.id, c.description, c.email, datetime.fromtimestamp(c.created, tz=utc),
|
||||
# c.account_balance, c.delinquent,
|
||||
# c.active_card.fingerprint, c.active_card.type, c.active_card.last4,
|
||||
# c.active_card.exp_month, c.active_card.exp_year,
|
||||
# c.active_card.country
|
||||
|
||||
# ACTIVE, DEACTIVATED, EXPIRED, EXPIRING, or ERROR
|
||||
|
|
@ -375,7 +399,8 @@ class Account(models.Model):
|
|||
('ERROR', 'ERROR')
|
||||
)
|
||||
|
||||
# host: the payment processor. Named after the payment module that hosts the payment processing functions
|
||||
# host: the payment processor. Named after the payment module that
|
||||
# hosts the payment processing functions
|
||||
host = models.CharField(default=PAYMENT_HOST_NONE, max_length=32, null=False)
|
||||
account_id = models.CharField(max_length=128, null=True)
|
||||
|
||||
|
|
@ -401,7 +426,8 @@ class Account(models.Model):
|
|||
status = models.CharField(max_length=11, choices=STATUS_CHOICES, null=False, default='ACTIVE')
|
||||
|
||||
def deactivate(self):
|
||||
"""Don't allow more than one active Account of given host to be associated with a given user"""
|
||||
"""Don't allow more than one active Account of given host to
|
||||
be associated with a given user"""
|
||||
self.date_deactivated = now()
|
||||
self.status = 'DEACTIVATED'
|
||||
self.save()
|
||||
|
|
@ -418,21 +444,23 @@ class Account(models.Model):
|
|||
|
||||
# is it expired?
|
||||
|
||||
elif self.card_exp_year < today.year or (self.card_exp_year == today.year and self.card_exp_month < today.month):
|
||||
elif self.card_exp_year < today.year or (
|
||||
self.card_exp_year == today.year and self.card_exp_month < today.month
|
||||
):
|
||||
return 'EXPIRED'
|
||||
|
||||
# about to expire? do I want to distinguish from 'ACTIVE'?
|
||||
|
||||
elif (self.card_exp_year == today.year and self.card_exp_month == today.month):
|
||||
elif self.card_exp_year == today.year and self.card_exp_month == today.month:
|
||||
return 'EXPIRING'
|
||||
|
||||
# any transactions w/ errors after the account date?
|
||||
# Transaction.objects.filter(host='stripelib', status='Error', approved=True).count()
|
||||
|
||||
elif Transaction.objects.filter(host='stripelib',
|
||||
status='Error', approved=True, user=self.user).filter(date_payment__gt=self.date_created):
|
||||
status='Error', approved=True, user=self.user
|
||||
).filter(date_payment__gt=self.date_created):
|
||||
return 'ERROR'
|
||||
else:
|
||||
return 'ACTIVE'
|
||||
|
||||
|
||||
|
|
@ -494,10 +522,13 @@ class Account(models.Model):
|
|||
pass
|
||||
|
||||
def recharge_failed_transactions(self):
|
||||
"""When a new Account is saved, check whether this is the new active account for a user. If so, recharge any
|
||||
outstanding failed transactions
|
||||
"""When a new Account is saved, check whether this is the new active account for a user.
|
||||
If so, recharge any outstanding failed transactions
|
||||
"""
|
||||
transactions_to_recharge = self.user.transaction_set.filter((Q(status=TRANSACTION_STATUS_FAILED) | Q(status=TRANSACTION_STATUS_ERROR)) & Q(campaign__status='SUCCESSFUL')).all()
|
||||
transactions_to_recharge = self.user.transaction_set.filter(
|
||||
(Q(status=TRANSACTION_STATUS_FAILED) | Q(status=TRANSACTION_STATUS_ERROR)) &
|
||||
Q(campaign__status='SUCCESSFUL')
|
||||
).all()
|
||||
|
||||
if transactions_to_recharge:
|
||||
from regluit.payment.manager import PaymentManager
|
||||
|
|
@ -505,7 +536,10 @@ class Account(models.Model):
|
|||
for transaction in transactions_to_recharge:
|
||||
# check whether we are still within the window to recharge
|
||||
if (now() - transaction.deadline_or_now) < datetime.timedelta(settings.RECHARGE_WINDOW):
|
||||
logger.info("Recharging transaction {0} w/ status {1}".format(transaction.id, transaction.status))
|
||||
logger.info("Recharging transaction {0} w/ status {1}".format(
|
||||
transaction.id,
|
||||
transaction.status
|
||||
))
|
||||
pm.execute_transaction(transaction, [])
|
||||
|
||||
|
||||
|
|
@ -529,5 +563,3 @@ post_save.connect(handle_transaction_change,sender=Transaction)
|
|||
post_delete.connect(handle_transaction_delete, sender=Transaction)
|
||||
|
||||
# handle recharging failed transactions
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -72,6 +72,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
.btn_wishlist span {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.find-book label {
|
||||
float:left;
|
||||
line-height:31px;
|
||||
|
|
@ -125,8 +129,9 @@
|
|||
background: -o-linear-gradient(left, $greener-than-alert, $call-to-action);
|
||||
background: linear-gradient(left, $greener-than-alert, $call-to-action);
|
||||
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='@alert', endColorstr='$call-to-action'); /* IE6 & IE7 */
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='@alert', endColorstr='$call-to-action')"; /* IE8+ */
|
||||
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$alert', endColorstr='$call-to-action'); /* IE6 & IE7 */
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='$alert', endColorstr='$call-to-action')"; /* IE8+ */
|
||||
|
||||
&.successful {
|
||||
border-color: $bright-blue;
|
||||
|
|
|
|||
Loading…
Reference in New Issue