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

@@ ... / @@ -12,12 +12,13 @@ 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
@@ ... / @@ -414,19 +415,28 @@ def attendee(request, form, user_id=None): @@
             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",

registrasion/urls.py

➞

Show inline comments

@@ ... / @@ -5,12 +5,13 @@ 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,
@@ ... / @@ -21,12 +22,13 @@ from .views import ( @@
 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"),

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
@@ ... / @@ -900,6 +901,18 @@ def amend_registration(request, user_id): @@
         "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)