symposion_app Changeset - d2d2a1b0ecdd

Changeset - d2d2a1b0ecdd

Parent rev.

Child rev.

[Not reviewed]

0 2 0

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

Work for making invoices contain complete profile information

2 files changed with 11 insertions and 2 deletions:

registrasion/models.py

registrasion/views.py

0 comments (0 inline, 0 general)

registrasion/models.py

➞

Show inline comments

@@ ... / @@ -52,16 +52,21 @@ class BadgeAndProfile(models.Model): @@
     def get_instance(attendee):
         ''' Returns either None, or the instance that belongs
         to this attendee. '''
         try:
             return BadgeAndProfile.objects.get(attendee=attendee)
         except ObjectDoesNotExist:
             return None
     def save(self):
         if not self.name_per_invoice:
             self.name_per_invoice = self.name
         super(BadgeAndProfile, self).save()
     attendee = models.OneToOneField(Attendee, on_delete=models.CASCADE)
     # Things that appear on badge
     name = models.CharField(
         verbose_name="Your name (for your conference nametag)",
         max_length=64,
         help_text="Your name, as you'd like it to appear on your badge. ",
+    )

registrasion/views.py

➞

Show inline comments

@@ ... @@
 from collections import namedtuple
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.http import Http404
 from django.shortcuts import redirect
 from django.shortcuts import render
 GuidedRegistrationSection = namedtuple(
     "GuidedRegistrationSection",
+    (
         "title",
@@ ... / @@ -330,31 +331,34 @@ def checkout(request): @@
 @login_required
 def invoice(request, invoice_id):
     ''' Displays an invoice for a given invoice id. '''
     invoice_id = int(invoice_id)
     inv = rego.Invoice.objects.get(pk=invoice_id)
     if request.user != inv.cart.user and not request.user.is_staff:
         raise Http404()
     current_invoice = InvoiceController(inv)
     data = {
         "invoice": current_invoice.invoice,
+    }
     return render(request, "registrasion/invoice.html", data)
 @login_required
 def pay_invoice(request, invoice_id):
     ''' Marks the invoice with the given invoice id as paid.
     WORK IN PROGRESS FUNCTION. Must be replaced with real payment workflow.
     '''
     invoice_id = int(invoice_id)
     inv = rego.Invoice.objects.get(pk=invoice_id)
     current_invoice = InvoiceController(inv)
-    if not inv.paid and current_invoice.is_valid():
+    if not current_invoice.invoice.paid and not current_invoice.invoice.void:
         current_invoice.pay("Demo invoice payment", inv.value)
     return redirect("invoice", current_invoice.invoice.id)

0 comments (0 inline, 0 general)