symposion_app Changeset - 6a5e4ff92db8

Changeset - 6a5e4ff92db8

Parent rev.

Child rev.

[Not reviewed]

Merge

0 4 0

Christopher Neugebauer - 8 years ago 2016-10-13 16:37:26
chrisjrn@gmail.com

Merge branch 'chrisjrn/20161013'

4 files changed with 54 insertions and 3 deletions:

registrasion/controllers/invoice.py

registrasion/reporting/views.py

registrasion/tests/test_invoice.py

registrasion/urls.py

0 comments (0 inline, 0 general)

registrasion/controllers/invoice.py

➞

Show inline comments

@@ ... / @@ -348,26 +348,36 @@ class InvoiceController(ForId, object): @@
         ''' Returns true if there is no cart, or if the revision of this
         invoice matches the current revision of the cart. '''
         self._refresh()
         cart = self.invoice.cart
         if not cart:
             return True
         return cart.revision == self.invoice.cart_revision
     def update_validity(self):
         ''' Voids this invoice if the cart it is attached to has updated. '''
         if not self._invoice_matches_cart():
         ''' Voids this invoice if the attached cart is no longer valid because
         the cart revision has changed, or the reservations have expired. '''
         is_valid = self._invoice_matches_cart()
         cart = self.invoice.cart
         if self.invoice.is_unpaid and is_valid and cart:
             try:
                 CartController(cart).validate_cart()
             except ValidationError:
                 is_valid = False
         if not is_valid:
             if self.invoice.total_payments() > 0:
                 # Free up the payments made to this invoice
                 self.refund()
             else:
                 self.void()
     def void(self):
         ''' Voids the invoice if it is valid to do so. '''
         if self.invoice.total_payments() > 0:
             raise ValidationError("Invoices with payments must be refunded.")
         elif self.invoice.is_refunded:
             raise ValidationError("Refunded invoices may not be voided.")

registrasion/reporting/views.py

➞

Show inline comments

@@ ... / @@ -373,24 +373,39 @@ def credit_notes(request, form): @@
         "invoice__user__attendee__attendeeprofilebase",
+    )
     return QuerysetReport(
         "Credit Notes",
         ["id", "invoice__user__attendee__attendeeprofilebase__invoice_recipient", "status", "value"],  # NOQA
         notes,
         headings=["id", "Owner", "Status", "Value"],
         link_view=views.credit_note,
+    )
 @report_view("Invoices")
 def invoices(request,form):
     ''' Shows all of the invoices in the system. '''
     invoices = commerce.Invoice.objects.all().order_by("status")
     return QuerysetReport(
         "Invoices",
         ["id", "recipient", "value", "get_status_display"],
         invoices,
         headings=["id", "Recipient", "Value", "Status"],
         link_view=views.invoice,
+    )
 class AttendeeListReport(ListReport):
     def get_link(self, argument):
         return reverse(self._link_view) + "?user=%d" % int(argument)
 @report_view("Attendee", form_type=forms.UserIdForm)
 def attendee(request, form, user_id=None):
     ''' Returns a list of all manifested attendees if no attendee is specified,
     else displays the attendee manifest. '''
     if user_id is None and not form.has_changed():

registrasion/tests/test_invoice.py

➞

Show inline comments

@@ ... @@
             quantity=1
+        )
         current_cart = TestingCartController.for_user(self.USER_1)
         current_cart.apply_voucher(voucher.code)
         # Should be able to create an invoice after the product is added
         current_cart.add_to_cart(self.PROD_1, 1)
         invoice_1 = TestingInvoiceController.for_cart(current_cart.cart)
         self.assertTrue(invoice_1.invoice.is_paid)
-    def test_invoice_voids_self_if_cart_is_invalid(self):
+    def test_invoice_voids_self_if_cart_changes(self):
         current_cart = TestingCartController.for_user(self.USER_1)
         # Should be able to create an invoice after the product is added
         current_cart.add_to_cart(self.PROD_1, 1)
         invoice_1 = TestingInvoiceController.for_cart(current_cart.cart)
         self.assertFalse(invoice_1.invoice.is_void)
         # Adding item to cart should produce a new invoice
         current_cart.add_to_cart(self.PROD_2, 1)
         invoice_2 = TestingInvoiceController.for_cart(current_cart.cart)
         self.assertNotEqual(invoice_1.invoice, invoice_2.invoice)
         # Viewing invoice_1's invoice should show it as void
         invoice_1_new = TestingInvoiceController(invoice_1.invoice)
         self.assertTrue(invoice_1_new.invoice.is_void)
         # Viewing invoice_2's invoice should *not* show it as void
         invoice_2_new = TestingInvoiceController(invoice_2.invoice)
         self.assertFalse(invoice_2_new.invoice.is_void)
     def test_invoice_voids_self_if_cart_becomes_invalid(self):
         ''' Invoices should be void if cart becomes invalid over time '''
         self.make_ceiling("Limit ceiling", limit=1)
         self.set_time(datetime.datetime(
             year=2015, month=1, day=1, hour=0, minute=0, tzinfo=UTC,
         ))
         cart1 = TestingCartController.for_user(self.USER_1)
         cart2 = TestingCartController.for_user(self.USER_2)
         # Create a valid invoice for USER_1
         cart1.add_to_cart(self.PROD_1, 1)
         inv1 = TestingInvoiceController.for_cart(cart1.cart)
         # Expire the reservations, and have USER_2 take up PROD_1's ceiling
         # generate an invoice
         self.add_timedelta(self.RESERVATION * 2)
         cart2.add_to_cart(self.PROD_2, 1)
         inv2 = TestingInvoiceController.for_cart(cart2.cart)
         # Re-get inv1's invoice; it should void itself on loading.
         inv1 = TestingInvoiceController(inv1.invoice)
         self.assertTrue(inv1.invoice.is_void)
     def test_voiding_invoice_creates_new_invoice(self):
         invoice_1 = self._invoice_containing_prod_1(1)
         self.assertFalse(invoice_1.invoice.is_void)
         invoice_1.void()
         invoice_2 = TestingInvoiceController.for_cart(invoice_1.invoice.cart)
         self.assertNotEqual(invoice_1.invoice, invoice_2.invoice)
     def test_cannot_pay_void_invoice(self):
         invoice_1 = self._invoice_containing_prod_1(1)

registrasion/urls.py

➞

Show inline comments

@@ ... / @@ -40,24 +40,25 @@ public = [ @@
     url(r"^register/([0-9]+)$", guided_registration,
         name="guided_registration"),
+]
 reports = [
     url(r"^$", rv.reports_list, name="reports_list"),
     url(r"^attendee/?$", rv.attendee, name="attendee"),
     url(r"^attendee_data/?$", rv.attendee_data, name="attendee_data"),
     url(r"^attendee/([0-9]*)$", rv.attendee, name="attendee"),
     url(r"^credit_notes/?$", rv.credit_notes, name="credit_notes"),
     url(r"^discount_status/?$", rv.discount_status, name="discount_status"),
     url(r"^invoices/?$", rv.invoices, name="invoices"),
     url(
         r"^paid_invoices_by_date/?$",
         rv.paid_invoices_by_date,
         name="paid_invoices_by_date"
     ),
     url(r"^product_status/?$", rv.product_status, name="product_status"),
     url(r"^reconciliation/?$", rv.reconciliation, name="reconciliation"),
     url(
         r"^speaker_registrations/?$",
         rv.speaker_registrations,
         name="speaker_registrations",
     ),

0 comments (0 inline, 0 general)