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

@@ ... / @@ -57,6 +57,11 @@ class BadgeAndProfile(models.Model): @@
         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

registrasion/views.py

➞

Show inline comments

@@ ... / @@ -12,6 +12,7 @@ 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
@@ ... / @@ -335,6 +336,10 @@ def invoice(request, 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 = {
@@ ... / @@ -350,11 +355,10 @@ def pay_invoice(request, invoice_id): @@
     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)