minor fix

[wolnelektury.git] / src / paypal / rest.py

diff --git a/src/paypal/rest.py b/src/paypal/rest.py
index 57c150b..e70c67b 100644 (file)
--- a/src/paypal/rest.py
+++ b/src/paypal/rest.py
@@ -1,10 +1,9 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from datetime import timedelta
-
+from datetime import date, datetime, timedelta
+from decimal import Decimal

 import paypalrestsdk
 import paypalrestsdk

-import pytz

 from django.contrib.sites.models import Site
 from django.urls import reverse
 from django.utils import timezone
 from django.contrib.sites.models import Site
 from django.urls import reverse
 from django.utils import timezone


@@ -18,8 +17,8 @@ class PaypalError(Exception):
     pass
 
 
     pass
 
 

-def absolute_url(url_name):
-    return "http://%s%s" % (Site.objects.get_current().domain, reverse(url_name))
+def absolute_url(url_name, kwargs=None):
+    return "http://%s%s" % (Site.objects.get_current().domain, reverse(url_name, kwargs=kwargs))

 
 
 def create_plan(amount):
 
 
 def create_plan(amount):


@@ -28,7 +27,7 @@ def create_plan(amount):
         "description": "Cykliczna darowizna na wsparcie Wolnych Lektur",
         "merchant_preferences": {
             "auto_bill_amount": "yes",
         "description": "Cykliczna darowizna na wsparcie Wolnych Lektur",
         "merchant_preferences": {
             "auto_bill_amount": "yes",

-            "return_url": absolute_url('paypal_return'),
+            "return_url": absolute_url('paypal_return', {'key': '-'}),

             "cancel_url": absolute_url('paypal_cancel'),
             # "initial_fail_amount_action": "continue",
             "max_fail_attempts": "3",
             "cancel_url": absolute_url('paypal_cancel'),
             # "initial_fail_amount_action": "continue",
             "max_fail_attempts": "3",


@@ -63,17 +62,17 @@ def get_link(links, rel):
             return link.href
 
 
             return link.href
 
 

-def create_agreement(amount, app=False):
+def create_agreement(amount, key, app=False):

     try:
         plan = BillingPlan.objects.get(amount=amount)
     except BillingPlan.DoesNotExist:
         plan_id = create_plan(amount)
     else:
         plan_id = plan.plan_id
     try:
         plan = BillingPlan.objects.get(amount=amount)
     except BillingPlan.DoesNotExist:
         plan_id = create_plan(amount)
     else:
         plan_id = plan.plan_id

-    start = (timezone.now() + timedelta(0, 3600*24)).astimezone(pytz.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
+    start = (timezone.now() + timedelta(0, 3600*24)).astimezone(timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ')

     billing_agreement = paypalrestsdk.BillingAgreement({
     billing_agreement = paypalrestsdk.BillingAgreement({

-        "name": u"Subskrypcja klubu WL",
-        "description": u"Stałe wsparcie Wolnych Lektur kwotą %s złotych" % amount,
+        "name": "Subskrypcja klubu WL",
+        "description": "Stałe wsparcie Wolnych Lektur kwotą %s złotych" % amount,

         "start_date": start,
         "plan": {
             "id": plan_id,
         "start_date": start,
         "plan": {
             "id": plan_id,


@@ -84,8 +83,13 @@ def create_agreement(amount, app=False):
     })
     if app:
         billing_agreement['override_merchant_preferences'] = {
     })
     if app:
         billing_agreement['override_merchant_preferences'] = {

-            'return_url': absolute_url('paypal_app_return'),
+            'return_url': absolute_url('paypal_app_return', {'key': key}),

         }
         }

+    else:
+        billing_agreement['override_merchant_preferences'] = {
+            'return_url': absolute_url('paypal_return', {'key': key}),
+        }
+

 
     response = billing_agreement.create()
     if response:
 
     response = billing_agreement.create()
     if response:


@@ -94,8 +98,8 @@ def create_agreement(amount, app=False):
         raise PaypalError(billing_agreement.error)
 
 
         raise PaypalError(billing_agreement.error)
 
 

-def agreement_approval_url(amount, app=False):
-    agreement = create_agreement(amount, app=app)
+def agreement_approval_url(amount, key, app=False):
+    agreement = create_agreement(amount, key, app=app)

     return get_link(agreement.links, 'approval_url')
 
 
     return get_link(agreement.links, 'approval_url')
 
 


@@ -112,10 +116,27 @@ def check_agreement(agreement_id):
         return a.state == 'Active'
 
 
         return a.state == 'Active'
 
 

-def user_is_subscribed(user):
-    agreements = BillingAgreement.objects.filter(user=user)
-    return any(agreement.check_agreement() for agreement in agreements)
-
-

 def execute_agreement(token):
     return paypalrestsdk.BillingAgreement.execute(token)
 def execute_agreement(token):
     return paypalrestsdk.BillingAgreement.execute(token)

+
+
+def get_donations(agreement_id, year):
+    a = get_agreement(agreement_id)
+    transactions = []
+    for transaction in a.search_transactions(
+            date(year - 1, 12, 31),
+            date(year + 1, 1, 1))['agreement_transaction_list']:
+        if transaction['status'] != 'Completed':
+            continue
+        dt = datetime.strptime(
+            transaction['time_stamp'],
+            '%Y-%m-%dT%H:%M:%S%z'
+        ).astimezone()
+        if dt.year != year:
+            continue
+        assert transaction['amount']['currency'] == 'PLN'
+        transactions.append({
+            'timestamp': dt,
+            'amount': Decimal(transaction['amount']['value'])
+        })
+    return transactions