symposion_app Changeset - 3ab5ac32cadc

Changeset - 3ab5ac32cadc

Parent rev.

Child rev.

[Not reviewed]

0 1 0

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

Part of CartController->BatchController memoisation

1 file changed with 25 insertions and 23 deletions:

registrasion/views.py

0 comments (0 inline, 0 general)

registrasion/views.py

➞

Show inline comments

 import sys
 from registrasion import forms
 from registrasion import util
 from registrasion.models import commerce
 from registrasion.models import inventory
 from registrasion.models import people
-from registrasion.controllers.discount import DiscountController
+from registrasion.controllers.batch import BatchController
 from registrasion.controllers.cart import CartController
 from registrasion.controllers.credit_note import CreditNoteController
 from registrasion.controllers.discount import DiscountController
 from registrasion.controllers.invoice import InvoiceController
 from registrasion.controllers.product import ProductController
 from registrasion.exceptions import CartValidationError
 from collections import namedtuple
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.decorators import user_passes_test
 from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.exceptions import ValidationError
@@ ... / @@ -161,36 +162,36 @@ def guided_registration(request): @@
             title = "Select ticket type"
             current_step = 2
             cats = [cats[0]]
         else:
             # Set title appropriately for remaining categories
             current_step = 3
             title = "Additional items"
         all_products = inventory.Product.objects.filter(
             category__in=cats,
         ).select_related("category")
         available_products = set(ProductController.available_products(
             request.user,
             products=all_products,
         ))
         with BatchController.batch(request.user):
             available_products = set(ProductController.available_products(
                 request.user,
                 products=all_products,
             ))
         if len(available_products) == 0:
             # We've filled in every category
             attendee.completed_registration = True
             attendee.save()
             return next_step
             if len(available_products) == 0:
                 # We've filled in every category
                 attendee.completed_registration = True
                 attendee.save()
                 return next_step
         with CartController.operations_batch(request.user):
             for category in cats:
                 products = [
                     i for i in available_products
                     if i.category == category
+                ]
                 prefix = "category_" + str(category.id)
                 p = _handle_products(request, category, products, prefix)
                 products_form, discounts, products_handled = p
                 section = GuidedRegistrationSection(
                     title=category.name,
@@ ... / @@ -336,38 +337,39 @@ def product_category(request, category_id): @@
     PRODUCTS_FORM_PREFIX = "products"
     VOUCHERS_FORM_PREFIX = "vouchers"
     # Handle the voucher form *before* listing products.
     # Products can change as vouchers are entered.
     v = _handle_voucher(request, VOUCHERS_FORM_PREFIX)
     voucher_form, voucher_handled = v
     category_id = int(category_id)  # Routing is [0-9]+
     category = inventory.Category.objects.get(pk=category_id)
     products = ProductController.available_products(
         request.user,
         category=category,
+    )
     if not products:
         messages.warning(
             request,
             "There are no products available from category: " + category.name,
     with BatchController.batch(request.user):
         products = ProductController.available_products(
             request.user,
             category=category,
+        )
         return redirect("dashboard")
     p = _handle_products(request, category, products, PRODUCTS_FORM_PREFIX)
     products_form, discounts, products_handled = p
         if not products:
             messages.warning(
                 request,
                 "There are no products available from category: " + category.name,
+            )
             return redirect("dashboard")
         p = _handle_products(request, category, products, PRODUCTS_FORM_PREFIX)
         products_form, discounts, products_handled = p
     if request.POST and not voucher_handled and not products_form.errors:
         # Only return to the dashboard if we didn't add a voucher code
         # and if there's no errors in the products form
         messages.success(
             request,
             "Your reservations have been updated.",
+        )
         return redirect("dashboard")
     data = {
         "category": category,

0 comments (0 inline, 0 general)