Format eboutic

eboutic/models.py

@@ -27,9 +27,9 @@ from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 
 from accounting.models import CurrencyField
-from counter.models import Counter, Product, Customer, Selling, Refilling
+from counter.models import Counter, Product, Selling, Refilling
 from core.models import User
-from subscription.models import Subscription
+
 
 class Basket(models.Model):
     """
@@ -38,7 +38,7 @@ class Basket(models.Model):
     user = models.ForeignKey(User, related_name='baskets', verbose_name=_('user'), blank=False)
     date = models.DateTimeField(_('date'), auto_now=True)
 
-    def add_product(self, p, q = 1):
+    def add_product(self, p, q=1):
         item = self.items.filter(product_id=p.id).first()
         if item is None:
             BasketItem(basket=self, product_id=p.id, product_name=p.name, type_id=p.product_type.id,
@@ -47,7 +47,7 @@ class Basket(models.Model):
             item.quantity += q
             item.save()
 
-    def del_product(self, p, q = 1):
+    def del_product(self, p, q=1):
         item = self.items.filter(product_id=p.id).first()
         if item is not None:
             item.quantity -= q
@@ -64,6 +64,7 @@ class Basket(models.Model):
     def __str__(self):
         return "%s's basket (%d items)" % (self.user, self.items.all().count())
 
+
 class Invoice(models.Model):
     """
     Invoices are generated once the payment has been validated
@@ -120,6 +121,7 @@ class Invoice(models.Model):
         self.validated = True
         self.save()
 
+
 class AbstractBaseItem(models.Model):
     product_id = models.IntegerField(_('product id'))
     product_name = models.CharField(_('product name'), max_length=255)
@@ -133,8 +135,10 @@ class AbstractBaseItem(models.Model):
     def __str__(self):
         return "Item: %s (%s) x%d" % (self.product_name, self.product_unit_price, self.quantity)
 
+
 class BasketItem(AbstractBaseItem):
     basket = models.ForeignKey(Basket, related_name='items', verbose_name=_('basket'))
 
+
 class InvoiceItem(AbstractBaseItem):
     invoice = models.ForeignKey(Invoice, related_name='items', verbose_name=_('invoice'))

eboutic/tests.py

@@ -34,7 +34,8 @@ from django.core.management import call_command
 from django.conf import settings
 
 from core.models import User
-from counter.models import Customer, ProductType, Product, Counter, Refilling
+from counter.models import Product, Counter, Refilling
+
 
 class EbouticTest(TestCase):
     def setUp(self):
@@ -93,7 +94,6 @@ class EbouticTest(TestCase):
                         "        <td>Barbar</td>\\n        <td>1</td>\\n        <td>1.70 \\xe2\\x82\\xac</td>\\n"
                         "        <td>Compte utilisateur</td>" in str(response.content))
 
-
     def test_buy_simple_product_with_credit_card(self):
         self.client.login(username='subscriber', password='plop')
         response = self.client.post(reverse("eboutic:main"), {
@@ -171,6 +171,3 @@ class EbouticTest(TestCase):
                         "        <td>15.00 \\xe2\\x82\\xac</td>" in str(response.content))
         response = self.client.get(reverse("core:user_profile", kwargs={"user_id": self.old_subscriber.id}))
         self.assertTrue("Cotisant jusqu\\'au" in str(response.content))
-
-
-

eboutic/urls.py

@@ -22,7 +22,7 @@
 #
 #
 
-from django.conf.urls import url, include
+from django.conf.urls import url
 
 from eboutic.views import *
 
@@ -33,6 +33,3 @@ urlpatterns = [
     url(r'^pay$', EbouticPayWithSith.as_view(), name='pay_with_sith'),
     url(r'^et_autoanswer$', EtransactionAutoAnswer.as_view(), name='etransation_autoanswer'),
 ]
-
-
-

eboutic/views.py

@@ -24,23 +24,21 @@
 
 from collections import OrderedDict
 from datetime import datetime
-import pytz
 import hmac
 import base64
 from OpenSSL import crypto
 
-from django.shortcuts import render
 from django.core.urlresolvers import reverse_lazy
 from django.views.generic import TemplateView, View
 from django.http import HttpResponse, HttpResponseRedirect
 from django.core.exceptions import SuspiciousOperation
-from django.shortcuts import render
 from django.db import transaction, DataError
 from django.utils.translation import ugettext as _
 from django.conf import settings
 
 from counter.models import Customer, Counter, ProductType, Selling
-from eboutic.models import Basket, Invoice, BasketItem, InvoiceItem
+from eboutic.models import Basket, Invoice, InvoiceItem
+
 
 class EbouticMain(TemplateView):
     template_name = 'eboutic/eboutic_main.jinja'
@@ -77,7 +75,6 @@ class EbouticMain(TemplateView):
             self.del_product(request)
         return self.render_to_response(self.get_context_data(**kwargs))
 
-
     def add_product(self, request):
         """ Add a product to the basket """
         try:
@@ -108,6 +105,7 @@ class EbouticMain(TemplateView):
             kwargs['categories'] = kwargs['categories'].exclude(id=settings.SITH_PRODUCTTYPE_SUBSCRIPTION)
         return kwargs
 
+
 class EbouticCommand(TemplateView):
     template_name = 'eboutic/eboutic_makecommand.jinja'
 
@@ -136,7 +134,7 @@ class EbouticCommand(TemplateView):
         kwargs['et_request']['PBX_SITE'] = settings.SITH_EBOUTIC_PBX_SITE
         kwargs['et_request']['PBX_RANG'] = settings.SITH_EBOUTIC_PBX_RANG
         kwargs['et_request']['PBX_IDENTIFIANT'] = settings.SITH_EBOUTIC_PBX_IDENTIFIANT
-        kwargs['et_request']['PBX_TOTAL'] = int(self.basket.get_total()*100)
+        kwargs['et_request']['PBX_TOTAL'] = int(self.basket.get_total() * 100)
         kwargs['et_request']['PBX_DEVISE'] = 978  # This is Euro. ET support only this value anyway
         kwargs['et_request']['PBX_CMD'] = self.basket.id
         kwargs['et_request']['PBX_PORTEUR'] = self.basket.user.email
@@ -146,10 +144,11 @@ class EbouticCommand(TemplateView):
         kwargs['et_request']['PBX_TYPECARTE'] = "CB"
         kwargs['et_request']['PBX_TIME'] = str(datetime.now().replace(microsecond=0).isoformat('T'))
         kwargs['et_request']['PBX_HMAC'] = hmac.new(settings.SITH_EBOUTIC_HMAC_KEY,
-                bytes("&".join(["%s=%s"%(k,v) for k,v in kwargs['et_request'].items()]), 'utf-8'),
+                                                    bytes("&".join(["%s=%s" % (k, v) for k, v in kwargs['et_request'].items()]), 'utf-8'),
                                                     "sha512").hexdigest().upper()
         return kwargs
 
+
 class EbouticPayWithSith(TemplateView):
     template_name = 'eboutic/eboutic_payment_result.jinja'
 
@@ -189,6 +188,7 @@ class EbouticPayWithSith(TemplateView):
             kwargs['not_enough'] = True
         return self.render_to_response(self.get_context_data(**kwargs))
 
+
 class EtransactionAutoAnswer(View):
     def get(self, request, *args, **kwargs):
         if (not 'Amount' in request.GET.keys() or
@@ -221,8 +221,7 @@ class EtransactionAutoAnswer(View):
                     i.validate()
                     b.delete()
             except Exception as e:
-                return HttpResponse("Payment failed with error: "+repr(e), status=400)
+                return HttpResponse("Payment failed with error: " + repr(e), status=400)
             return HttpResponse()
         else:
-            return HttpResponse("Payment failed with error: "+request.GET['Error'], status=400)
-
+            return HttpResponse("Payment failed with error: " + request.GET['Error'], status=400)