symposion_app Changeset - 83b11cd7224d

Changeset - 83b11cd7224d

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Christopher Neugebauer - 8 years ago 2016-03-24 03:20:29
chrisjrn@gmail.com

Fixes invoicing payment logic

3 files changed with 16 insertions and 2 deletions:

registrasion/controllers/invoice.py

registrasion/templates/invoice.html

registrasion/views.py

0 comments (0 inline, 0 general)

registrasion/controllers/invoice.py

➞

Show inline comments

@@ ... / @@ -122,7 +122,7 @@ class InvoiceController(object): @@
+        )
         payment.save()
-        payments = rego.Payment.objects .filter(invoice=self.invoice)
         payments = rego.Payment.objects.filter(invoice=self.invoice)
         agg = payments.aggregate(Sum("amount"))
         total = agg["amount__sum"]

registrasion/templates/invoice.html

➞

Show inline comments

@@ ... / @@ -33,5 +33,19 @@ @@
   </tr>
 </table>
 <table>
   <tr>
     <th>Payment time</th>
     <th>Reference</th>
     <th>Amount</th>
   </tr>
   {% for payment in invoice.payment_set.all %}
     <tr>
       <td>{{payment.time}}</td>
       <td>{{payment.reference}}</td>
       <td>{{payment.amount}}</td>
     </tr>
   {% endfor %}
 </table>
 {% endblock %}

registrasion/views.py

➞

Show inline comments

@@ ... / @@ -217,7 +217,7 @@ def pay_invoice(request, invoice_id): @@
     invoice_id = int(invoice_id)
     inv = rego.Invoice.objects.get(pk=invoice_id)
     current_invoice = InvoiceController(inv)
-    if not inv.paid and not current_invoice.is_valid():
     if not inv.paid and current_invoice.is_valid():
         current_invoice.pay("Demo invoice payment", inv.value)
     return redirect("invoice", current_invoice.invoice.id)

0 comments (0 inline, 0 general)