symposion_app Changeset - 6dbc303e7c38

Changeset - 6dbc303e7c38

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Christopher Neugebauer - 8 years ago 2016-10-06 19:44:06
chrisjrn@gmail.com

Adds ability for staff to extend a user’s reservations

3 files changed with 25 insertions and 0 deletions:

registrasion/reporting/views.py

registrasion/urls.py

registrasion/views.py

0 comments (0 inline, 0 general)

registrasion/reporting/views.py

➞

Show inline comments

@@ ... / @@ -6,24 +6,25 @@ import itertools @@
 from django.conf import settings
 from django.contrib.auth.decorators import user_passes_test
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.db.models import F, Q
 from django.db.models import Count, Max, Sum
 from django.db.models import Case, When, Value
 from django.db.models.fields.related import RelatedField
 from django.shortcuts import render
 from registrasion.controllers.cart import CartController
 from registrasion.controllers.item import ItemController
 from registrasion.models import commerce
 from registrasion.models import people
 from registrasion import util
 from registrasion import views
 from symposion.schedule import models as schedule_models
 from reports import get_all_reports
 from reports import Links
 from reports import ListReport
 from reports import QuerysetReport
@@ ... / @@ -408,31 +409,40 @@ def attendee(request, form, user_id=None): @@
         attendee=attendee
+    )
     exclude = set(["attendeeprofilebase_ptr", "id"])
     for field in profile._meta.get_fields():
         if field.name in exclude:
             # Not actually important
             continue
         if not hasattr(field, "verbose_name"):
             continue  # Not a publicly visible field
         value = getattr(profile, field.name)
         profile_data.append((field.verbose_name, value))
     cart = CartController.for_user(attendee.user)
     reservation = cart.cart.reservation_duration + cart.cart.time_last_updated
     profile_data.append(("Current cart reserved until", reservation))
     reports.append(ListReport("Profile", ["", ""], profile_data))
     links = []
     links.append((
         reverse(views.amend_registration, args=[user_id]),
         "Amend current cart",
     ))
     links.append((
         reverse(views.extend_reservation, args=[user_id]),
         "Extend reservation",
     ))
     reports.append(Links("Actions for " + name, links))
     # Paid and pending  products
     ic = ItemController(attendee.user)
     reports.append(ListReport(
         "Paid Products",
         ["Product", "Quantity"],
         [(pq.product, pq.quantity) for pq in ic.items_purchased()],
     ))
     reports.append(ListReport(
         "Unpaid Products",
         ["Product", "Quantity"],

registrasion/urls.py

➞

Show inline comments

 from reporting import views as rv
 from django.conf.urls import include
 from django.conf.urls import url
 from .views import (
     amend_registration,
     checkout,
     credit_note,
     edit_profile,
     extend_reservation,
     guided_registration,
     invoice,
     invoice_access,
     manual_payment,
     product_category,
     refund,
     review,
+)
 public = [
     url(r"^amend/([0-9]+)$", amend_registration, name="amend_registration"),
     url(r"^category/([0-9]+)$", product_category, name="product_category"),
     url(r"^checkout$", checkout, name="checkout"),
     url(r"^checkout/([0-9]+)$", checkout, name="checkout"),
     url(r"^credit_note/([0-9]+)$", credit_note, name="credit_note"),
     url(r"^extend/([0-9]+)$", extend_reservation, name="extend_reservation"),
     url(r"^invoice/([0-9]+)$", invoice, name="invoice"),
     url(r"^invoice/([0-9]+)/([A-Z0-9]+)$", invoice, name="invoice"),
     url(r"^invoice/([0-9]+)/manual_payment$",
         manual_payment, name="manual_payment"),
     url(r"^invoice/([0-9]+)/refund$",
         refund, name="refund"),
     url(r"^invoice_access/([A-Z0-9]+)$", invoice_access,
         name="invoice_access"),
     url(r"^profile$", edit_profile, name="attendee_edit"),
     url(r"^register$", guided_registration, name="guided_registration"),
     url(r"^review$", review, name="review"),
     url(r"^register/([0-9]+)$", guided_registration,

registrasion/views.py

➞

Show inline comments

 import datetime
 import sys
 import util
 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.batch import BatchController
 from registrasion.controllers.cart import CartController
 from registrasion.controllers.credit_note import CreditNoteController
 from registrasion.controllers.discount import DiscountController
@@ ... / @@ -894,12 +895,24 @@ def amend_registration(request, user_id): @@
             voucher_form.add_error(None, ve)
     ic = ItemController(user)
     data = {
         "user": user,
         "paid": ic.items_purchased(),
         "cancelled": ic.items_released(),
         "form": formset,
         "voucher_form": voucher_form,
+    }
     return render(request, "registrasion/amend_registration.html", data)
 @user_passes_test(_staff_only)
 def extend_reservation(request, user_id, days=7):
     ''' Allows staff to extend the reservation on a given user's cart.
     '''
     user = User.objects.get(id=int(user_id))
     cart = CartController.for_user(user)
     cart.extend_reservation(datetime.timedelta(days=days))
     return redirect(request.META["HTTP_REFERER"])

0 comments (0 inline, 0 general)