symposion_app Changeset - b40505117f4c

Changeset - b40505117f4c

Parent rev.

Child rev.

[Not reviewed]

0 7 0

Christopher Neugebauer - 8 years ago 2016-04-29 01:22:56
chrisjrn@gmail.com

Fixes flake8 errors arising from rebase

7 files changed with 6 insertions and 23 deletions:

registrasion/controllers/cart.py

registrasion/controllers/category.py

registrasion/controllers/conditions.py

registrasion/controllers/discount.py

registrasion/controllers/product.py

registrasion/templatetags/registrasion_tags.py

registrasion/views.py

0 comments (0 inline, 0 general)

registrasion/controllers/cart.py

➞

Show inline comments

@@ ... / @@ -19,3 +19,2 @@ from registrasion.models import inventory @@
 from .category import CategoryController
 from .conditions import ConditionController
 from .discount import DiscountController
@@ ... / @@ -67,3 +66,2 @@ class CartController(object): @@
     # Marks the carts that are currently in batches
@@ ... / @@ -158,3 +156,2 @@ class CartController(object): @@
         self.cart.refresh_from_db()
@@ ... / @@ -252,4 +249,2 @@ class CartController(object): @@
         for category in by_cat:
             #ctrl = CategoryController(category)
             #limit = ctrl.user_quantity_remaining(self.cart.user)
             limit = with_remainders[category].remainder

registrasion/controllers/category.py

➞

Show inline comments

...		@@ -40,3 +40,2 @@ class CategoryController(object):


		@classmethod

registrasion/controllers/conditions.py

➞

Show inline comments

 import itertools
 from django.db.models import Case
@@ ... / @@ -11,4 +9,2 @@ from registrasion.models import commerce @@
 from registrasion.models import conditions
 from registrasion.models import inventory
@@ ... / @@ -136,4 +132,2 @@ class RemainderSetByFilter(object): @@
         # Mark self.condition with a remainder
@@ ... @@
 class TimeOrStockLimitConditionController(
         RemainderSetByFilter,
         ConditionController,
     ):
             RemainderSetByFilter,
             ConditionController,
         ):
     ''' Common condition tests for TimeOrStockLimit Flag and

registrasion/controllers/discount.py

➞

Show inline comments

...		@@ -52,3 +52,2 @@ class DiscountController(object):


		filtered_clauses = cls._filtered_discounts(user, categories, products)

registrasion/controllers/product.py

➞

Show inline comments

@@ ... / @@ -38,6 +38,6 @@ class ProductController(object): @@
         r = CategoryController.attach_user_remainders(user, categories)
         cat_quants = dict((c,c) for c in r)
+        cat_quants = dict((c, c) for c in r)
         r = ProductController.attach_user_remainders(user, all_products)
         prod_quants = dict((p,p) for p in r)
+        prod_quants = dict((p, p) for p in r)
@@ ... / @@ -60,3 +60,2 @@ class ProductController(object): @@
     @classmethod

registrasion/templatetags/registrasion_tags.py

➞

Show inline comments

@@ ... / @@ -105,3 +105,3 @@ def items_purchased(context, category=None): @@
     in_cart=(
+    in_cart = (
         Q(productitem__cart__user=context.request.user) &

registrasion/views.py

➞

Show inline comments

...		@@ -453,5 +453,2 @@ def _set_quantities_from_products_form(products_form, current_cart):



		# TODO: This is fundamentally dumb
		product_quantities = [

0 comments (0 inline, 0 general)